diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 48f2c46..137bb7c 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -64,7 +64,7 @@ end
 platform :ios do
   desc "Runs all tests"
   lane :test do
-    run_tests()
+    run_tests(scheme: "pass")
   end
 
   desc "Submit a new Beta Build to Apple TestFlight"
diff --git a/pass.xcodeproj/xcshareddata/xcschemes/passAutoFillExtension.xcscheme b/pass.xcodeproj/xcshareddata/xcschemes/passAutoFillExtension.xcscheme
index 1a738c1..6111608 100644
--- a/pass.xcodeproj/xcshareddata/xcschemes/passAutoFillExtension.xcscheme
+++ b/pass.xcodeproj/xcshareddata/xcschemes/passAutoFillExtension.xcscheme
@@ -7,20 +7,6 @@
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "A239F5942158C08B00576CBF"
-               BuildableName = "passAutoFillExtension.appex"
-               BlueprintName = "passAutoFillExtension"
-               ReferencedContainer = "container:pass.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"
@@ -57,8 +43,12 @@
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES"
       launchAutomaticallySubstyle = "2">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <RemoteRunnable
+         runnableDebuggingMode = "1"
+         BundleIdentifier = "com.apple.mobilesafari"
+         RemotePath = "/Applications/MobileSafari.app">
+      </RemoteRunnable>
+      <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "DC917BD21E2E8231000FDF54"
@@ -66,7 +56,7 @@
             BlueprintName = "pass"
             ReferencedContainer = "container:pass.xcodeproj">
          </BuildableReference>
-      </BuildableProductRunnable>
+      </MacroExpansion>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"