diff --git a/CriticalMapsKit/Tests/AppFeatureTests/AppFeatureFeatureTests.swift b/CriticalMapsKit/Tests/AppFeatureTests/AppFeatureFeatureTests.swift
index 9e29166f..2acca275 100644
--- a/CriticalMapsKit/Tests/AppFeatureTests/AppFeatureFeatureTests.swift
+++ b/CriticalMapsKit/Tests/AppFeatureTests/AppFeatureFeatureTests.swift
@@ -586,6 +586,5 @@ struct AppFeatureTests {
     
     // assert
     await store.receive(\.map.focusNextRide)
-//    await store.receive(.set(\.$bottomSheetPosition, .relative(0.3)))
   }
 }
diff --git a/CriticalMapsKit/Tests/SettingsFeatureTests/SettingsFeatureFeatureTests.swift b/CriticalMapsKit/Tests/SettingsFeatureTests/SettingsFeatureTests.swift
similarity index 69%
rename from CriticalMapsKit/Tests/SettingsFeatureTests/SettingsFeatureFeatureTests.swift
rename to CriticalMapsKit/Tests/SettingsFeatureTests/SettingsFeatureTests.swift
index 491fbbe5..8a044a91 100644
--- a/CriticalMapsKit/Tests/SettingsFeatureTests/SettingsFeatureFeatureTests.swift
+++ b/CriticalMapsKit/Tests/SettingsFeatureTests/SettingsFeatureTests.swift
@@ -146,72 +146,6 @@ struct SettingsFeatureCoreTests {
     }
   }
   
-//  @MainActor
-//  func test_didSaveUserSettings_onRideEventSettingsChange() async throws {
-//    let didSaveUserSettings = LockIsolated(false)
-//    let testQueue = DispatchQueue.immediate
-//
-//    let testClock = TestClock()
-//    let store = TestStore(
-//      initialState: SettingsFeature.State(),
-//      reducer: { SettingsFeature() },
-//      withDependencies: {
-//        $0.continuousClock = testClock
-//        $0.mainQueue = testQueue.eraseToAnyScheduler()
-//        $0.fileClient.save = { @Sendable _, _ in
-//          didSaveUserSettings.setValue(true)
-//        }
-//        $0.feedbackGenerator.selectionChanged = {}
-//      }
-//    )
-//    
-//    // act
-//    await store.send(.rideevent(.binding(.set(\.eventSearchRadius, .far))) {
-//      $0.rideEventSettings.eventSearchRadius = .far
-//    }
-//
-//    await testClock.advance(by: .seconds(2))
-//    // assert
-//    didSaveUserSettings.withValue { val in
-//      XCTAssertTrue(val, "Expected that save is invoked")
-//    }
-//  }
-  
-//  @MainActor
-//  func test_didSaveUserSettings_onAppearanceSettingsChange() async throws {
-//    let didSaveUserSettings = LockIsolated(false)
-//
-//    let store = TestStore(
-//      initialState: SettingsFeature.State(
-//        userSettings: .init(
-//          appearanceSettings: .init(
-//            appIcon: .appIcon1,
-//            colorScheme: .light
-//          )
-//        )
-//      ),
-//      reducer: { SettingsFeature() }
-//    )
-//    let testClock = TestClock()
-//    store.dependencies.continuousClock = testClock
-//    store.dependencies.mainQueue = .immediate
-//    store.dependencies.fileClient.save = { @Sendable _, _ in
-//      didSaveUserSettings.setValue(true)
-//    }
-//    
-//    // act
-//    await store.send(.appearance(.set(\.$colorScheme, .dark))) {
-//      $0.appearanceSettings.colorScheme = .dark
-//    }
-//
-//    await testClock.advance(by: .seconds(2))
-//    // assert
-//    didSaveUserSettings.withValue { val in
-//      XCTAssertTrue(val, "Expected that save is invoked")
-//    }
-//    await store.finish()
-//  }
-  
   @Test
   func didSaveUserSettings_onSettingsChange() async throws {
     @Shared(.userSettings)