diff --git a/BDZDelays.xcodeproj/xcshareddata/xcschemes/BDZDelays.xcscheme b/BDZDelays.xcodeproj/xcshareddata/xcschemes/BDZDelays.xcscheme
index 908cbea..68d7de3 100644
--- a/BDZDelays.xcodeproj/xcshareddata/xcschemes/BDZDelays.xcscheme
+++ b/BDZDelays.xcodeproj/xcshareddata/xcschemes/BDZDelays.xcscheme
@@ -7,7 +7,7 @@
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
-            buildForTesting = "YES"
+            buildForTesting = "NO"
             buildForRunning = "YES"
             buildForProfiling = "YES"
             buildForArchiving = "YES"
@@ -28,6 +28,36 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "ROVRTests"
+               BuildableName = "ROVRTests"
+               BlueprintName = "ROVRTests"
+               ReferencedContainer = "container:BDZDelays/bdz-delays">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "SearchStationDomainTests"
+               BuildableName = "SearchStationDomainTests"
+               BlueprintName = "SearchStationDomainTests"
+               ReferencedContainer = "container:BDZDelays/bdz-delays">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "StationDomainTests"
+               BuildableName = "StationDomainTests"
+               BlueprintName = "StationDomainTests"
+               ReferencedContainer = "container:BDZDelays/bdz-delays">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index aa51a9d..9e8881e 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -32,20 +32,12 @@ platform :ios do
 
   desc "Run all tests"
   lane :tests do
-    sh('rm -rf "$(pwd)/test_output"')
-    for scheme in [
-      "StationDomain", 
-      "SearchStationDomain",
-      "ROVR",
-    ] do
-      run_tests(
-        package_path: "BDZDelays/bdz-delays",
-        scheme: scheme,
-        device: "iPhone 13 Pro Max",
-        result_bundle: true,
-        output_directory: Dir.pwd + "/test_output"  # https://github.com/fastlane/fastlane/issues/20012
-      )
-    end
+    run_tests(
+      scheme: "BDZDelays",
+      device: "iPhone 13 Pro Max",
+      result_bundle: true,
+      skip_build: true
+    )
   end
 end