diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index d27bb8e802..fb8c997417 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -18,7 +18,7 @@ updates:
     directory: /
     schedule:
       interval: weekly
-    open-pull-requests-limit: 100
+    open-pull-requests-limit: 10
     rebase-strategy: disabled
     ignore:
       - dependency-name: "com.android.application"
@@ -27,3 +27,19 @@ updates:
         update-types: ["version-update:semver-major", "version-update:semver-minor"]
     cooldown:
       default-days: 7
+  - package-ecosystem: pre-commit
+    directory: /
+    schedule:
+      interval: weekly
+    open-pull-requests-limit: 10
+    rebase-strategy: disabled
+    cooldown:
+      default-days: 7
+  - package-ecosystem: swift
+    directory: /iosApp
+    schedule:
+      interval: weekly
+    open-pull-requests-limit: 10
+    rebase-strategy: disabled
+    cooldown:
+      default-days: 7
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 89908ee4b4..6c7c2a5bdc 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -28,7 +28,7 @@ repos:
         entry: gradle-task :buildSrc:spotlessCheck :buildSrc:spotlessApply -w
         files: ^buildSrc/.*\.(kt|kts)$
   - repo: https://github.com/nicklockwood/SwiftFormat
-    rev: 0.57.2
+    rev: 0.61.1
     hooks:
       - id: swiftformat
         stages: [pre-commit]
diff --git a/config.swiftformat b/config.swiftformat
index d563fddef3..46cf2bae7c 100644
--- a/config.swiftformat
+++ b/config.swiftformat
@@ -1,2 +1,6 @@
 --disable wrapMultilineStatementBraces
+--disable trailingCommas
+--disable redundantViewBuilder
+--disable wrapFunctionBodies
+--disable wrapPropertyBodies
 --maxwidth 120
diff --git a/iosApp/iosApp.xcworkspace/xcshareddata/swiftpm/Package.resolved b/iosApp/iosApp.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 6021c1c019..ec1ac9e2a9 100644
--- a/iosApp/iosApp.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/iosApp/iosApp.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -33,8 +33,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/firebase/firebase-ios-sdk",
       "state" : {
-        "revision" : "d10045cace0b4c335c4efa8f7df7e9a9fc5a7c60",
-        "version" : "12.13.0"
+        "revision" : "8d5b4189f1f482df8d5c58c9985ea70491ef5382",
+        "version" : "12.14.0"
       }
     },
     {
@@ -42,8 +42,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/googleads/google-ads-on-device-conversion-ios-sdk",
       "state" : {
-        "revision" : "19dffda9a9caf8d86570ff846535902d8509d7bf",
-        "version" : "3.5.0"
+        "revision" : "9bfcc6cf435b2e7c5562c1900b8680c594fa9a64",
+        "version" : "3.6.0"
       }
     },
     {
@@ -51,8 +51,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/GoogleAppMeasurement.git",
       "state" : {
-        "revision" : "c2c76bebcfbb90d90ea10599f934f9af160e1604",
-        "version" : "12.13.0"
+        "revision" : "219e564a8510e983e675c94f77f7f7c50049f22d",
+        "version" : "12.14.0"
       }
     },
     {
@@ -78,8 +78,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/grpc-binary.git",
       "state" : {
-        "revision" : "cc0001a0cf963aa40501d9c2b181e7fc9fd8ec71",
-        "version" : "1.69.0"
+        "revision" : "75b31c842f664a0f46a2e590a570e370249fd8f6",
+        "version" : "1.69.1"
       }
     },
     {
@@ -87,8 +87,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/gtm-session-fetcher.git",
       "state" : {
-        "revision" : "c756a29784521063b6a1202907e2cc47f41b667c",
-        "version" : "4.5.0"
+        "revision" : "c0ac7575d70050c2973ba2318bd5af47f8e8153a",
+        "version" : "5.3.0"
       }
     },
     {
@@ -132,8 +132,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/mapbox/mapbox-common-ios.git",
       "state" : {
-        "revision" : "47aae9d6f49154805ef890bba6d26c6bae198332",
-        "version" : "24.23.0"
+        "revision" : "0903177afad61e293d420de4f0032a0d09a73f26",
+        "version" : "24.24.3"
       }
     },
     {
@@ -141,8 +141,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/mapbox/mapbox-core-maps-ios.git",
       "state" : {
-        "revision" : "f4ec6c2c00a4d72737823cb02c57a7d1a0fa506c",
-        "version" : "11.23.0"
+        "revision" : "62e6c66055e66f34e0e80b75e9b8cd18a6bba7ec",
+        "version" : "11.24.3"
       }
     },
     {
@@ -150,8 +150,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/mapbox/mapbox-maps-ios.git",
       "state" : {
-        "revision" : "19cb3f3e81a5e3a3cc454b8985cba2816fe49dd2",
-        "version" : "11.23.0"
+        "revision" : "90c6b2e36a8e8118c67236974d57d96cfbdc44c0",
+        "version" : "11.24.3"
       }
     },
     {
@@ -159,8 +159,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/firebase/nanopb.git",
       "state" : {
-        "revision" : "b7e1104502eca3a213b46303391ca4d3bc8ddec1",
-        "version" : "2.30910.0"
+        "revision" : "3851d94a41890dea16dc3db34caf60e585cb4163",
+        "version" : "2.30910.1"
       }
     },
     {
@@ -168,8 +168,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/promises.git",
       "state" : {
-        "revision" : "540318ecedd63d883069ae7f1ed811a2df00b6ac",
-        "version" : "2.4.0"
+        "revision" : "f4a19a3c313dc2616c70bb49d29a799fb16be837",
+        "version" : "2.4.1"
       }
     },
     {
@@ -186,8 +186,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-collections.git",
       "state" : {
-        "revision" : "8c0c0a8b49e080e54e5e328cc552821ff07cd341",
-        "version" : "1.2.1"
+        "revision" : "a0cb0954ecb21e4e31b0070e6ed5674e8556685a",
+        "version" : "1.6.0"
       }
     },
     {
diff --git a/iosApp/iosApp/ComponentViews/OptionalNavigationLink.swift b/iosApp/iosApp/ComponentViews/OptionalNavigationLink.swift
index 631c80efcf..15e1ca3d68 100644
--- a/iosApp/iosApp/ComponentViews/OptionalNavigationLink.swift
+++ b/iosApp/iosApp/ComponentViews/OptionalNavigationLink.swift
@@ -11,7 +11,7 @@ import SwiftUI
 /// In the filtered stop details state, non-vehicle-based upcoming trips should not link to the trip details page.
 /// This will render a button if there there is a SheetNavigationStackEntry to navigate to, otherwise it renders a
 /// regular label.
-struct OptionalNavigationLink<Label>: View where Label: View {
+struct OptionalNavigationLink<Label: View>: View {
     @ObserveInjection var inject
 
     let value: SheetNavigationStackEntry?
diff --git a/iosApp/iosApp/ComponentViews/RouteCard/RouteCardDepartures.swift b/iosApp/iosApp/ComponentViews/RouteCard/RouteCardDepartures.swift
index 6396382477..91d6c51d92 100644
--- a/iosApp/iosApp/ComponentViews/RouteCard/RouteCardDepartures.swift
+++ b/iosApp/iosApp/ComponentViews/RouteCard/RouteCardDepartures.swift
@@ -57,8 +57,6 @@ struct RouteCardDepartures: View {
                     if index < stopData.data.count - 1 {
                         HaloSeparator()
                     }
-                } else {
-                    EmptyView()
                 }
             }
         }
diff --git a/iosApp/iosApp/ComponentViews/SheetNavigationLink.swift b/iosApp/iosApp/ComponentViews/SheetNavigationLink.swift
index cb1ab5c5ac..8722508e95 100644
--- a/iosApp/iosApp/ComponentViews/SheetNavigationLink.swift
+++ b/iosApp/iosApp/ComponentViews/SheetNavigationLink.swift
@@ -9,7 +9,7 @@
 import Foundation
 import SwiftUI
 
-struct SheetNavigationLink<Label>: View where Label: View {
+struct SheetNavigationLink<Label: View>: View {
     @ObserveInjection var inject
     let value: SheetNavigationStackEntry
     let action: (SheetNavigationStackEntry) -> Void
diff --git a/iosApp/iosApp/IOSApp.swift b/iosApp/iosApp/IOSApp.swift
index 867812d064..120de6be02 100644
--- a/iosApp/iosApp/IOSApp.swift
+++ b/iosApp/iosApp/IOSApp.swift
@@ -95,10 +95,10 @@ class AppDelegate: NSObject, UIApplicationDelegate, UNUserNotificationCenterDele
 
 @main
 struct IOSApp: App {
-    // register app delegate for Firebase setup
+    /// register app delegate for Firebase setup
     @UIApplicationDelegateAdaptor(AppDelegate.self) var delegate
 
-    // When running unit tests or previews, don't mount the entire app which makes real API requests.
+    /// When running unit tests or previews, don't mount the entire app which makes real API requests.
     private let isTestOrPreview = ProcessInfo.processInfo.arguments.contains("--dummy-test-app")
         || ProcessInfo.processInfo.environment["XCODE_RUNNING_FOR_PREVIEWS"] != nil
 
diff --git a/iosApp/iosApp/LocationDataManager.swift b/iosApp/iosApp/LocationDataManager.swift
index 7e6e501156..fa0cae1529 100644
--- a/iosApp/iosApp/LocationDataManager.swift
+++ b/iosApp/iosApp/LocationDataManager.swift
@@ -63,7 +63,7 @@ extension LocationDataManager: CLLocationManagerDelegate {
     }
 }
 
-// https://developer.apple.com/videos/play/wwdc2018/417/
+/// https://developer.apple.com/videos/play/wwdc2018/417/
 public protocol LocationFetcher: AnyObject {
     var locationFetcherDelegate: LocationFetcherDelegate? { get set }
     var authorizationStatus: CLAuthorizationStatus { get }
diff --git a/iosApp/iosApp/Network/MockSocket.swift b/iosApp/iosApp/Network/MockSocket.swift
index 3180aaf3c6..6dacf1bed7 100644
--- a/iosApp/iosApp/Network/MockSocket.swift
+++ b/iosApp/iosApp/Network/MockSocket.swift
@@ -12,7 +12,7 @@ import SwiftPhoenixClient
 
 open class MockSocket: PhoenixSocket {
     public var channels: [PhoenixChannel] = []
-    // Channel.socket is weak, so we need to maintain a reference to the Socket
+    /// Channel.socket is weak, so we need to maintain a reference to the Socket
     private let socket = Socket(endPoint: "/socket", transport: { _ in PhoenixTransportMock() })
 
     public func attach() {}
diff --git a/iosApp/iosApp/Network/Socket.swift b/iosApp/iosApp/Network/Socket.swift
index dfe775107f..ae9259dc4f 100644
--- a/iosApp/iosApp/Network/Socket.swift
+++ b/iosApp/iosApp/Network/Socket.swift
@@ -67,7 +67,7 @@ class PhoenixTransportMock: PhoenixTransport {
     func send(data _: Data) {}
 }
 
-/*
+/**
  Return the decoded message in the expected [Any?] format:
  [joinReference, messageReference, topic, eventName, eventPayload]
 
diff --git a/iosApp/iosApp/Pages/AlertDetails/AlertDetails.swift b/iosApp/iosApp/Pages/AlertDetails/AlertDetails.swift
index 8b9e5c65e0..0a2a873ed9 100644
--- a/iosApp/iosApp/Pages/AlertDetails/AlertDetails.swift
+++ b/iosApp/iosApp/Pages/AlertDetails/AlertDetails.swift
@@ -20,7 +20,7 @@ struct AlertDetails: View {
     var stopId: String?
     var now: EasternTimeInstant
 
-    @ScaledMetric()
+    @ScaledMetric
     private var iconSize = 16
 
     @State var areStopsExpanded = false
diff --git a/iosApp/iosApp/Pages/Map/HomeMapViewHandlerExtension.swift b/iosApp/iosApp/Pages/Map/HomeMapViewHandlerExtension.swift
index 37d65a4c57..d59896058a 100644
--- a/iosApp/iosApp/Pages/Map/HomeMapViewHandlerExtension.swift
+++ b/iosApp/iosApp/Pages/Map/HomeMapViewHandlerExtension.swift
@@ -11,7 +11,7 @@ import Combine
 import Shared
 import SwiftUI
 
-/*
+/**
  Functions for handling interactions with the map, like prop change, navigation, and tapping.
  */
 extension HomeMapView {
diff --git a/iosApp/iosApp/Pages/Map/HomeMapViewLayerExtension.swift b/iosApp/iosApp/Pages/Map/HomeMapViewLayerExtension.swift
index 7e95303e50..f6d7ffd119 100644
--- a/iosApp/iosApp/Pages/Map/HomeMapViewLayerExtension.swift
+++ b/iosApp/iosApp/Pages/Map/HomeMapViewLayerExtension.swift
@@ -10,7 +10,7 @@
 import Shared
 import SwiftUI
 
-/*
+/**
  Functions for manipulating the layers displayed on the map.
  */
 extension HomeMapView {
diff --git a/iosApp/iosApp/Pages/Map/MapLayerManager.swift b/iosApp/iosApp/Pages/Map/MapLayerManager.swift
index 57faeb85e1..d8e0e5775b 100644
--- a/iosApp/iosApp/Pages/Map/MapLayerManager.swift
+++ b/iosApp/iosApp/Pages/Map/MapLayerManager.swift
@@ -121,7 +121,7 @@ class MapLayerManager: iosApp.IMapLayerManager {
         try map.addPersistentLayer(routeAnchorLayer, layerPosition: .below(stopAnchorLayerId))
     }
 
-    /*
+    /**
      Adds persistent layers so that they are persisted even if the underlying map style changes.
 
      https://docs.mapbox.com/ios/maps/api/11.5.0/documentation/mapboxmaps/stylemanager/addpersistentlayer(_:layerposition:)
diff --git a/iosApp/iosApp/Pages/Onboarding/OnboardingPieces.swift b/iosApp/iosApp/Pages/Onboarding/OnboardingPieces.swift
index 4d63cb8e4b..17db0e678c 100644
--- a/iosApp/iosApp/Pages/Onboarding/OnboardingPieces.swift
+++ b/iosApp/iosApp/Pages/Onboarding/OnboardingPieces.swift
@@ -87,7 +87,7 @@ enum OnboardingPieces {
         @ViewBuilder let background: () -> Background
 
         private var screenHeight: CGFloat { UIScreen.current?.bounds.height ?? 852.0 }
-        // Use less padding on smaller screens
+        /// Use less padding on smaller screens
         private var bottomPadding: CGFloat { screenHeight < 812 ? 16 : 28 }
 
         var body: some View {
diff --git a/iosApp/iosApp/Pages/SaveFavorite/NotificationSettingsWidget.swift b/iosApp/iosApp/Pages/SaveFavorite/NotificationSettingsWidget.swift
index c8639c3b0c..c8bcd014ca 100644
--- a/iosApp/iosApp/Pages/SaveFavorite/NotificationSettingsWidget.swift
+++ b/iosApp/iosApp/Pages/SaveFavorite/NotificationSettingsWidget.swift
@@ -14,8 +14,7 @@ private extension DateComponents {
         get {
             let calendar = Calendar(identifier: .iso8601)
             let beforeDayStart = calendar.startOfDay(for: .now).addingTimeInterval(-0.01)
-            let result = calendar.nextDate(after: beforeDayStart, matching: self, matchingPolicy: .strict)!
-            return result
+            return calendar.nextDate(after: beforeDayStart, matching: self, matchingPolicy: .strict)!
         }
         set {
             // in this file, we only use hour/minute/second
diff --git a/iosApp/iosApp/Pages/Search/SearchInput.swift b/iosApp/iosApp/Pages/Search/SearchInput.swift
index 18b3a4b9eb..3be3f96a17 100644
--- a/iosApp/iosApp/Pages/Search/SearchInput.swift
+++ b/iosApp/iosApp/Pages/Search/SearchInput.swift
@@ -14,9 +14,9 @@ struct SearchInput: View {
     var hint: String
     var onClear: (() -> Void)?
 
-    // Don't update this FocusState isFocused directly, only toggle through searchObserver.isFocused,
-    // otherwise it's possible for the update in searchObserver to get skipped. It's also not
-    // possible to test state variable changes, while testing this will stay set to false.
+    /// Don't update this FocusState isFocused directly, only toggle through searchObserver.isFocused,
+    /// otherwise it's possible for the update in searchObserver to get skipped. It's also not
+    /// possible to test state variable changes, while testing this will stay set to false.
     @FocusState var isFocused: Bool
 
     @ScaledMetric var searchIconSize: CGFloat = 16
diff --git a/iosApp/iosApp/Pages/StopDetails/DepartureTile.swift b/iosApp/iosApp/Pages/StopDetails/DepartureTile.swift
index e26ad2066f..4fe787e131 100644
--- a/iosApp/iosApp/Pages/StopDetails/DepartureTile.swift
+++ b/iosApp/iosApp/Pages/StopDetails/DepartureTile.swift
@@ -21,12 +21,12 @@ struct DepartureTile: View {
         case onPrediction(route: Route)
     }
 
-    // Store the size that the tile should be for text to wrap properly.
-    // In order for wrapped text not to get cut off in the horizontal ScrollView, we need to set the fixed width
-    // rather than just using `maxWidth` (see https://stackoverflow.com/a/75331082)
-    // Calculating the size based on an approach taken in
-    // https://nilcoalescing.com/blog/AdaptiveLayoutsWithViewThatFits/#expandable-text-with-line-limit
-    // the ideal width is measured on the background in the initial render, then used on subsequent renders.
+    /// Store the size that the tile should be for text to wrap properly.
+    /// In order for wrapped text not to get cut off in the horizontal ScrollView, we need to set the fixed width
+    /// rather than just using `maxWidth` (see https://stackoverflow.com/a/75331082)
+    /// Calculating the size based on an approach taken in
+    /// https://nilcoalescing.com/blog/AdaptiveLayoutsWithViewThatFits/#expandable-text-with-line-limit
+    /// the ideal width is measured on the background in the initial render, then used on subsequent renders.
     @State var computedMultilineWidth: CGFloat? = nil
 
     let maxTileWidth: CGFloat = 195.0
diff --git a/iosApp/iosApp/Pages/StopDetails/DirectionPicker.swift b/iosApp/iosApp/Pages/StopDetails/DirectionPicker.swift
index dc404f36d9..375606f239 100644
--- a/iosApp/iosApp/Pages/StopDetails/DirectionPicker.swift
+++ b/iosApp/iosApp/Pages/StopDetails/DirectionPicker.swift
@@ -17,20 +17,6 @@ struct DirectionPicker: View {
     let selectedDirectionId: Int32?
     let updateDirectionId: (Int32) -> Void
 
-    init(
-        availableDirections: [Int32],
-        directions: [Direction],
-        route: Route,
-        selectedDirectionId: Int32?,
-        updateDirectionId: @escaping (Int32) -> Void
-    ) {
-        self.availableDirections = availableDirections
-        self.directions = directions
-        self.route = route
-        self.selectedDirectionId = selectedDirectionId
-        self.updateDirectionId = updateDirectionId
-    }
-
     var body: some View {
         if availableDirections.count > 1 {
             HStack(alignment: .center, spacing: 2) {
diff --git a/iosApp/iosApp/Pages/StopDetails/StopDetailsView.swift b/iosApp/iosApp/Pages/StopDetails/StopDetailsView.swift
index ef184d72b6..6c027f7853 100644
--- a/iosApp/iosApp/Pages/StopDetails/StopDetailsView.swift
+++ b/iosApp/iosApp/Pages/StopDetails/StopDetailsView.swift
@@ -7,7 +7,6 @@
 //
 
 import Foundation
-
 import OrderedCollections
 import Shared
 import SwiftPhoenixClient
@@ -35,36 +34,6 @@ struct StopDetailsView: View {
 
     let inspection = Inspection<Self>()
 
-    init(
-        filters: StopDetailsPageFilters,
-        routeData: StopDetailsViewModel.RouteData?,
-        favorites: Favorites,
-        global: GlobalResponse?,
-        now: Date,
-        onUpdateFavorites: @escaping () -> Void,
-        setStopFilter: @escaping (StopDetailsFilter?) -> Void,
-        setTripFilter: @escaping (TripDetailsFilter?) -> Void,
-        navCallbacks: NavigationCallbacks,
-        errorBannerVM: IErrorBannerViewModel,
-        nearbyVM: NearbyViewModel,
-        mapVM: IMapViewModel,
-        stopDetailsVM: IStopDetailsViewModel,
-    ) {
-        self.filters = filters
-        self.routeData = routeData
-        self.favorites = favorites
-        self.global = global
-        self.now = now
-        self.onUpdateFavorites = onUpdateFavorites
-        self.setStopFilter = setStopFilter
-        self.setTripFilter = setTripFilter
-        self.navCallbacks = navCallbacks
-        self.errorBannerVM = errorBannerVM
-        self.nearbyVM = nearbyVM
-        self.mapVM = mapVM
-        self.stopDetailsVM = stopDetailsVM
-    }
-
     var body: some View {
         if let stopFilter = filters.stopFilter {
             StopDetailsFilteredView(
diff --git a/iosApp/iosApp/Pages/StopDetails/TripHeaderCard.swift b/iosApp/iosApp/Pages/StopDetails/TripHeaderCard.swift
index f938c070bc..7faab391f6 100644
--- a/iosApp/iosApp/Pages/StopDetails/TripHeaderCard.swift
+++ b/iosApp/iosApp/Pages/StopDetails/TripHeaderCard.swift
@@ -125,8 +125,6 @@ struct TripHeaderCard: View {
                 .accessibilityElement(children: .contain)
                 .padding(.top, 16)
                 .environment(\.layoutDirection, layoutDirection == .leftToRight ? .rightToLeft : .leftToRight)
-            } else {
-                EmptyView()
             }
         default: EmptyView()
         }
@@ -159,8 +157,6 @@ struct TripHeaderCard: View {
                     Image(crowdingImage).resizable().frame(width: 16, height: 12, alignment: .center).scaledToFit()
                     Text(crowdingText(crowding)).font(.footnote).foregroundStyle(Color.text.opacity(0.6))
                 }
-            } else {
-                EmptyView()
             }
         default: EmptyView()
         }
diff --git a/iosApp/iosApp/Pages/StopDetails/TripStatus.swift b/iosApp/iosApp/Pages/StopDetails/TripStatus.swift
index bf75ebb574..54a50bf10d 100644
--- a/iosApp/iosApp/Pages/StopDetails/TripStatus.swift
+++ b/iosApp/iosApp/Pages/StopDetails/TripStatus.swift
@@ -23,8 +23,6 @@ struct TripStatus: View {
                     routeType: trip.routeType,
                     hideDisruptionIcon: true
                 ).enableInjection()
-            } else {
-                EmptyView()
             }
         case let .disruption(alert):
             UpcomingTripView(prediction: .disruption(.init(alert: alert.alert), iconName: alert.iconName))
diff --git a/iosApp/iosApp/Utils/HaloScrollView.swift b/iosApp/iosApp/Utils/HaloScrollView.swift
index bbcb7e1cb0..2f9ddbeb4e 100644
--- a/iosApp/iosApp/Utils/HaloScrollView.swift
+++ b/iosApp/iosApp/Utils/HaloScrollView.swift
@@ -15,7 +15,7 @@ struct ScrollOffsetPreferenceKey: PreferenceKey {
     }
 }
 
-struct HaloScrollView<Content>: View where Content: View {
+struct HaloScrollView<Content: View>: View {
     @ObserveInjection var inject
 
     var content: Content
diff --git a/iosApp/iosApp/Utils/Modifiers/NonNilModifier.swift b/iosApp/iosApp/Utils/Modifiers/NonNilModifier.swift
index 619597b7a1..f562534f5a 100644
--- a/iosApp/iosApp/Utils/Modifiers/NonNilModifier.swift
+++ b/iosApp/iosApp/Utils/Modifiers/NonNilModifier.swift
@@ -8,7 +8,7 @@
 
 import SwiftUI
 
-struct NonNilReplaceModifier<Value, NonNilContent>: ViewModifier where NonNilContent: View {
+struct NonNilReplaceModifier<Value, NonNilContent: View>: ViewModifier {
     @ObserveInjection var inject
     var value: Value?
     var contentBuilder: (Value) -> NonNilContent
@@ -22,7 +22,7 @@ struct NonNilReplaceModifier<Value, NonNilContent>: ViewModifier where NonNilCon
     }
 }
 
-struct NonNilAboveModifier<Value, NonNilContent>: ViewModifier where NonNilContent: View {
+struct NonNilAboveModifier<Value, NonNilContent: View>: ViewModifier {
     @ObserveInjection var inject
     var value: Value?
     var contentBuilder: (Value) -> NonNilContent
@@ -38,7 +38,7 @@ struct NonNilAboveModifier<Value, NonNilContent>: ViewModifier where NonNilConte
     }
 }
 
-struct NonNilBelowModifier<Value, NonNilContent>: ViewModifier where NonNilContent: View {
+struct NonNilBelowModifier<Value, NonNilContent: View>: ViewModifier {
     @ObserveInjection var inject
     var value: Value?
     var contentBuilder: (Value) -> NonNilContent
diff --git a/iosApp/iosApp/Utils/NotificationPermissionUtil.swift b/iosApp/iosApp/Utils/NotificationPermissionUtil.swift
index 7c5d3b4213..f479c9ea6f 100644
--- a/iosApp/iosApp/Utils/NotificationPermissionUtil.swift
+++ b/iosApp/iosApp/Utils/NotificationPermissionUtil.swift
@@ -28,8 +28,8 @@ class NotificationPermissionManager: INotificationPermissionManager {
         }
     }
 
-    // Note: The first time we make this authorization request, the system prompts the user to grant or deny the request
-    // and records that response. Subsequent authorization requests do not prompt the user.
+    /// Note: The first time we make this authorization request, the system prompts the user to grant or deny the
+    /// request and records that response. Subsequent authorization requests do not prompt the user.
     /// Returns true if  granted, false if not
     @MainActor
     func requestPermission() async -> Bool {
diff --git a/iosApp/iosApp/Utils/SelectedTab.swift b/iosApp/iosApp/Utils/SelectedTab.swift
index 1116145699..90ac27a685 100644
--- a/iosApp/iosApp/Utils/SelectedTab.swift
+++ b/iosApp/iosApp/Utils/SelectedTab.swift
@@ -19,7 +19,7 @@ enum SelectedTab: Hashable {
         lhs.hashValue == rhs.hashValue
     }
 
-    // Implement hashable to ignore the highlighted more category
+    /// Implement hashable to ignore the highlighted more category
     func hash(into hasher: inout Hasher) {
         let hashString = switch self {
         case .favorites: "favorites"
diff --git a/iosApp/iosApp/Utils/SheetNavigationStackEntry.swift b/iosApp/iosApp/Utils/SheetNavigationStackEntry.swift
index 1ae07fdbf6..06cba2816e 100644
--- a/iosApp/iosApp/Utils/SheetNavigationStackEntry.swift
+++ b/iosApp/iosApp/Utils/SheetNavigationStackEntry.swift
@@ -101,7 +101,7 @@ enum SheetNavigationStackEntry: Hashable, Identifiable {
         return item.id == "" ? nil : item
     }
 
-    /*
+    /**
      Convert this SheetNavigationStackEntry into the shared SheetRoute type. SheetRoute represents only routes displayed
      in a MapSheetPage. Any other nav stack entries that are displayed as full screen modals (like alertDetails
      and more) do not have a corresponding SheetRoute, and therefore return nil.
diff --git a/iosApp/iosApp/Utils/TripRouteAccents.swift b/iosApp/iosApp/Utils/TripRouteAccents.swift
index 79642b4e1b..9f7e910475 100644
--- a/iosApp/iosApp/Utils/TripRouteAccents.swift
+++ b/iosApp/iosApp/Utils/TripRouteAccents.swift
@@ -9,8 +9,8 @@
 import Shared
 import SwiftUI
 
-// A subset of route attributes only for displaying as UI accents,
-// this is split out to allow defaults for when a route may not exist
+/// A subset of route attributes only for displaying as UI accents,
+/// this is split out to allow defaults for when a route may not exist
 struct TripRouteAccents: Hashable {
     let color: Color
     let textColor: Color
diff --git a/iosApp/iosApp/ViewModels/NearbyViewModel.swift b/iosApp/iosApp/ViewModels/NearbyViewModel.swift
index adefef394f..d14b7b4cc0 100644
--- a/iosApp/iosApp/ViewModels/NearbyViewModel.swift
+++ b/iosApp/iosApp/ViewModels/NearbyViewModel.swift
@@ -41,7 +41,7 @@ class NearbyViewModel: ObservableObject {
     @Published var routeCardData: [RouteCardData]?
 
     @Published var isTargeting = false
-    // Distinct from nearbyState.loadedLocation because it's also set when nearby favorites load
+    /// Distinct from nearbyState.loadedLocation because it's also set when nearby favorites load
     @Published var lastLoadedLocation: CLLocationCoordinate2D?
 
     private let alertsUsecase: AlertsUsecase
@@ -93,7 +93,7 @@ class NearbyViewModel: ObservableObject {
         navigationStack.lastSafe() == .favorites
     }
 
-    /*
+    /**
      Directly append the given entry to the stack without considering the previous entries.
      This should be done with caution as it can result in multiple entries of the same type within the stack,
      typically `pushNavEntry` should be used instead.
@@ -110,8 +110,8 @@ class NearbyViewModel: ObservableObject {
         }
     }
 
-    // Adding a second bool argument here is a hack until we can remove the feature flag and set the new stop details
-    // entry directly, until then, we need a way to distinguish between entries coming from the map or not.
+    /// Adding a second bool argument here is a hack until we can remove the feature flag and set the new stop details
+    /// entry directly, until then, we need a way to distinguish between entries coming from the map or not.
     /**
      Updates the stack so that the given entry is the last entry.
      Optionally pops the previous entry to prevent the stack from building too deep. For example, when pushing
diff --git a/iosApp/iosAppTests/Fetchers/ViewportProviderTest.swift b/iosApp/iosAppTests/Fetchers/ViewportProviderTest.swift
index c58965f9c9..607d63f86f 100644
--- a/iosApp/iosAppTests/Fetchers/ViewportProviderTest.swift
+++ b/iosApp/iosAppTests/Fetchers/ViewportProviderTest.swift
@@ -16,14 +16,14 @@ final class ViewportProviderTest: XCTestCase {
         executionTimeAllowance = 60
     }
 
-    func testDefaultViewport() throws {
+    func testDefaultViewport() {
         let provider = ViewportProvider()
         XCTAssertNotNil(provider.viewport.camera)
         XCTAssertEqual(provider.viewport.camera?.center, ViewportProvider.Defaults.center)
         XCTAssertEqual(provider.viewport.camera?.zoom, ViewportProvider.Defaults.zoom)
     }
 
-    func testFollowViewport() async throws {
+    func testFollowViewport() async {
         let provider = ViewportProvider()
         XCTAssertNotNil(provider.viewport.camera)
         await provider.follow()
@@ -31,14 +31,14 @@ final class ViewportProviderTest: XCTestCase {
         XCTAssertNotNil(provider.viewport.followPuck)
     }
 
-    func testUpdateViewport() throws {
+    func testUpdateViewport() {
         let provider = ViewportProvider()
         XCTAssertNotNil(provider.viewport.camera)
         provider.viewport = .camera(center: .init(latitude: 0, longitude: 0))
         XCTAssertEqual(provider.viewport.camera?.center, .init(latitude: 0, longitude: 0))
     }
 
-    func testAnimateToPreservesZoomIfNotGiven() async throws {
+    func testAnimateToPreservesZoomIfNotGiven() async {
         let provider = ViewportProvider(viewport: .camera(center: .init(latitude: 0, longitude: 0), zoom: 14.0))
 
         await provider.animateTo(coordinates: .init(latitude: 1, longitude: 1))
@@ -46,7 +46,7 @@ final class ViewportProviderTest: XCTestCase {
         XCTAssertEqual(provider.viewport.camera?.zoom, 14.0)
     }
 
-    func testAnimateToSetsZoom() async throws {
+    func testAnimateToSetsZoom() async {
         let provider = ViewportProvider(viewport: .camera(center: .init(latitude: 0, longitude: 0), zoom: 14.0))
 
         await provider.animateTo(coordinates: .init(latitude: 1, longitude: 1), zoom: 17.0)
@@ -86,7 +86,7 @@ final class ViewportProviderTest: XCTestCase {
         XCTAssertEqual(provider.viewport.camera?.zoom, newZoom)
     }
 
-    func testUpdateCameraLocationFromCoordinate() throws {
+    func testUpdateCameraLocationFromCoordinate() {
         let updatedExp = expectation(description: "updated camera")
         let startCenter: CLLocationCoordinate2D = .init(latitude: 0, longitude: 0)
         let provider = ViewportProvider(viewport: .camera(center: startCenter, zoom: 16.0))
@@ -126,7 +126,7 @@ final class ViewportProviderTest: XCTestCase {
         XCTAssertEqual(provider.viewport.camera?.center, .init(latitude: 0, longitude: 0))
     }
 
-    func testSetIsManuallyCentering() throws {
+    func testSetIsManuallyCentering() {
         let provider = ViewportProvider()
 
         XCTAssertFalse(provider.isManuallyCentering)
@@ -142,7 +142,7 @@ final class ViewportProviderTest: XCTestCase {
 
         let viewport = ViewportProvider.viewportAround(center: center, inView: [point1, point2])
 
-        if case let .multiPoint(points) = viewport.overview!.geometry.geometry {
+        if case let .multiPoint(points) = try XCTUnwrap(viewport.overview?.geometry.geometry) {
             XCTAssertEqual(
                 points,
                 MultiPoint([
@@ -158,7 +158,7 @@ final class ViewportProviderTest: XCTestCase {
         }
     }
 
-    func testViewportIsDefault() async throws {
+    func testViewportIsDefault() async {
         let provider = ViewportProvider()
         XCTAssert(provider.isDefault())
         await provider.animateTo(coordinates: .init(latitude: 0.0, longitude: 0.0))
@@ -168,7 +168,7 @@ final class ViewportProviderTest: XCTestCase {
         XCTAssertFalse(initializedProvider.isDefault())
     }
 
-    func testViewportSaving() throws {
+    func testViewportSaving() {
         let provider = ViewportProvider()
         provider.viewport = .idle
         provider.updateCameraState(.init(
diff --git a/iosApp/iosAppTests/IosAppTests.swift b/iosApp/iosAppTests/IosAppTests.swift
index 569e2ee95a..70a85a4723 100644
--- a/iosApp/iosAppTests/IosAppTests.swift
+++ b/iosApp/iosAppTests/IosAppTests.swift
@@ -13,9 +13,9 @@ final class IosAppTests: XCTestCase {
         executionTimeAllowance = 60
     }
 
-    func testSampleGreeting() throws {}
+    func testSampleGreeting() {}
 
-    func testPerformanceExample() throws {
+    func testPerformanceExample() {
         // This is an example of a performance test case.
         measure {
             // Put the code you want to measure the time of here.
diff --git a/iosApp/iosAppTests/LocationDataManagerTests.swift b/iosApp/iosAppTests/LocationDataManagerTests.swift
index 4062fdc881..70d514bf07 100644
--- a/iosApp/iosAppTests/LocationDataManagerTests.swift
+++ b/iosApp/iosAppTests/LocationDataManagerTests.swift
@@ -20,7 +20,7 @@ final class LocationDataManagerTests: XCTestCase {
         // Put teardown code here. This method is called after the invocation of each test method in the class.
     }
 
-    func testInit() async throws {
+    func testInit() async {
         let locationFetcher = MockLocationFetcher()
 
         XCTAssertEqual(locationFetcher.distanceFilter, 0)
@@ -51,7 +51,7 @@ final class LocationDataManagerTests: XCTestCase {
         XCTAssertEqual(manager.currentLocation, location)
     }
 
-    func testCustomDistanceFilter() async throws {
+    func testCustomDistanceFilter() {
         let locationFetcher = MockLocationFetcher()
 
         XCTAssertEqual(locationFetcher.distanceFilter, 0)
diff --git a/iosApp/iosAppTests/Network/SocketTests.swift b/iosApp/iosAppTests/Network/SocketTests.swift
index ba2f041b79..2e9f532897 100644
--- a/iosApp/iosAppTests/Network/SocketTests.swift
+++ b/iosApp/iosAppTests/Network/SocketTests.swift
@@ -15,12 +15,12 @@ final class SocketTests: XCTestCase {
         executionTimeAllowance = 60
     }
 
-    func testDecodeMessageWithObjectEvent() {
+    func testDecodeMessageWithObjectEvent() throws {
         let body: [Any] = ["join_ref", "ref", "topic", "event", ["user_id": "abc123"]]
         let data = Defaults.encode(body)
         let jsonParts = decodeWithRawMessage(data: data) as? [Any]
 
-        let message = Message(json: jsonParts!)
+        let message = try Message(json: XCTUnwrap(jsonParts))
         XCTAssertEqual(message?.joinRef, "join_ref")
         XCTAssertEqual(message?.ref, "ref")
         XCTAssertEqual(message?.topic, "topic")
@@ -31,12 +31,12 @@ final class SocketTests: XCTestCase {
         XCTAssertEqual(payload?["jsonPayload"] as? String, "{\"user_id\":\"abc123\"}")
     }
 
-    func testDecodeMessageWithResponseBody() {
+    func testDecodeMessageWithResponseBody() throws {
         let body: [Any] = ["join_ref", "ref", "topic", "event", ["status": "ok", "response": ["user_id": "abc123"]]]
         let data = Defaults.encode(body)
         let jsonParts = decodeWithRawMessage(data: data) as? [Any]
 
-        let message = Message(json: jsonParts!)
+        let message = try Message(json: XCTUnwrap(jsonParts))
         XCTAssertEqual(message?.joinRef, "join_ref")
         XCTAssertEqual(message?.ref, "ref")
         XCTAssertEqual(message?.topic, "topic")
diff --git a/iosApp/iosAppTests/Pages/AlertDetails/AlertDetailsPageTests.swift b/iosApp/iosAppTests/Pages/AlertDetails/AlertDetailsPageTests.swift
index 0cf0465e7e..40dda085cf 100644
--- a/iosApp/iosAppTests/Pages/AlertDetails/AlertDetailsPageTests.swift
+++ b/iosApp/iosAppTests/Pages/AlertDetails/AlertDetailsPageTests.swift
@@ -14,7 +14,7 @@ import ViewInspector
 import XCTest
 
 final class AlertDetailsPageTests: XCTestCase {
-    @MainActor func testAlertDetailsPageParentStopResolution() throws {
+    @MainActor func testAlertDetailsPageParentStopResolution() {
         let objects = ObjectCollectionBuilder()
 
         let stop1 = objects.stop { stop in
diff --git a/iosApp/iosAppTests/Pages/Favorites/EditFavoritesPageTests.swift b/iosApp/iosAppTests/Pages/Favorites/EditFavoritesPageTests.swift
index 537c4ffc18..1a12f755ee 100644
--- a/iosApp/iosAppTests/Pages/Favorites/EditFavoritesPageTests.swift
+++ b/iosApp/iosAppTests/Pages/Favorites/EditFavoritesPageTests.swift
@@ -93,7 +93,7 @@ final class EditFavoritesPageTests: XCTestCase {
         XCTAssertEqual(expectedRsd, editRsd)
     }
 
-    @MainActor func testNotificationIcon() throws {
+    @MainActor func testNotificationIcon() {
         let objects = TestData.clone()
 
         let route: Route = objects.getRoute(id: "Red")
@@ -144,7 +144,7 @@ final class EditFavoritesPageTests: XCTestCase {
         XCTAssertNotNil(try? sut.inspect().find(imageName: "fa-bell-filled"))
     }
 
-    @MainActor func testDeleteFavorite() throws {
+    @MainActor func testDeleteFavorite() {
         let objects = TestData.clone()
         let globalData = GlobalResponse(objects: objects)
 
@@ -228,7 +228,7 @@ final class EditFavoritesPageTests: XCTestCase {
         wait(for: [exp, updateFavoritesExp], timeout: 3)
     }
 
-    @MainActor func testUndoToast() throws {
+    @MainActor func testUndoToast() {
         let objects = TestData.clone()
         let globalData = GlobalResponse(objects: objects)
 
diff --git a/iosApp/iosAppTests/Pages/Favorites/FavoritesViewTests.swift b/iosApp/iosAppTests/Pages/Favorites/FavoritesViewTests.swift
index a14de10c95..2767c7ac97 100644
--- a/iosApp/iosAppTests/Pages/Favorites/FavoritesViewTests.swift
+++ b/iosApp/iosAppTests/Pages/Favorites/FavoritesViewTests.swift
@@ -277,7 +277,7 @@ final class FavoritesViewTests: XCTestCase {
         wait(for: [expActive], timeout: 1)
     }
 
-    @MainActor func testSetsAlerts() throws {
+    @MainActor func testSetsAlerts() {
         let objects = ObjectCollectionBuilder()
         objects.alert { _ in }
         let alertsResponse = AlertsStreamDataResponse(objects: objects)
@@ -304,7 +304,7 @@ final class FavoritesViewTests: XCTestCase {
         wait(for: [appearExp, setAlertExp], timeout: 1)
     }
 
-    @MainActor func testSetsLocation() throws {
+    @MainActor func testSetsLocation() {
         let firstLocation = CLLocationCoordinate2D(latitude: 0, longitude: 0)
         let secondLocation = CLLocationCoordinate2D(latitude: 1, longitude: 1)
         let locationBinding = Binding<CLLocationCoordinate2D?>(wrappedValue: firstLocation)
@@ -333,7 +333,7 @@ final class FavoritesViewTests: XCTestCase {
         wait(for: [setSecondExp], timeout: 1)
     }
 
-    @MainActor func testSetsNow() throws {
+    @MainActor func testSetsNow() {
         let setFirstExp = expectation(description: "sets a time")
         var firstTime: EasternTimeInstant?
         let setSecondExp = expectation(description: "sets a different time later")
@@ -360,7 +360,7 @@ final class FavoritesViewTests: XCTestCase {
         wait(for: [setSecondExp], timeout: 10)
     }
 
-    @MainActor func testShowsToast() throws {
+    @MainActor func testShowsToast() {
         let setToastShownExp = expectation(description: "showToast called")
         let hideToast = expectation(description: "hideToast called")
         // Expect one hideToast when the toast is closed, and another when FavoritesView disappears
@@ -401,7 +401,7 @@ final class FavoritesViewTests: XCTestCase {
         wait(for: [setToastShownExp, hideToast, isFirstExposureToFavoritesSet], timeout: 2)
     }
 
-    @MainActor func testShowsNotificationHint() throws {
+    @MainActor func testShowsNotificationHint() {
         let dismissHint = expectation(description: "hint dismissed")
 
         let favoritesVM = MockFavoritesViewModel(
@@ -436,7 +436,7 @@ final class FavoritesViewTests: XCTestCase {
         wait(for: [dismissHint], timeout: 2)
     }
 
-    @MainActor func testDismissesNotificationHintWhenFavoritesEmpty() throws {
+    @MainActor func testDismissesNotificationHintWhenFavoritesEmpty() {
         let dismissHint = expectation(description: "hint dismissed")
 
         let favoritesVM = MockFavoritesViewModel(
diff --git a/iosApp/iosAppTests/Pages/Map/MapHttpInterceptorTests.swift b/iosApp/iosAppTests/Pages/Map/MapHttpInterceptorTests.swift
index 49c99deb4a..94e9f35f99 100644
--- a/iosApp/iosAppTests/Pages/Map/MapHttpInterceptorTests.swift
+++ b/iosApp/iosAppTests/Pages/Map/MapHttpInterceptorTests.swift
@@ -20,7 +20,7 @@ final class MapHttpInterceptorTests: XCTestCase {
                                          sdkInformation: .init(name: "name", version: "v", packageName: nil),
                                          body: nil)
 
-    func testOnRequest() throws {
+    func testOnRequest() {
         var requestUnchanged = false
         let interceptor = MapHttpInterceptor(updateLastErrorTimestamp: {})
         interceptor.onRequest(for: fakeRequest) { requstOrResponse in
@@ -32,7 +32,7 @@ final class MapHttpInterceptorTests: XCTestCase {
         XCTAssertTrue(requestUnchanged)
     }
 
-    func testOnResponse200DoesNothing() throws {
+    func testOnResponse200DoesNothing() {
         let fake200Response: HttpResponse = .init(identifier: 1, request: fakeRequest,
                                                   result: .success(.init(headers: [:], code: 200, data: .init())))
         var responseUnchanged = false
@@ -49,7 +49,7 @@ final class MapHttpInterceptorTests: XCTestCase {
         XCTAssertFalse(updateLastErrorCalled)
     }
 
-    func testOnResponse401UpdatesLastError() throws {
+    func testOnResponse401UpdatesLastError() {
         let fake401Response: HttpResponse = .init(identifier: 1, request: fakeRequest,
                                                   result: .success(.init(headers: [:], code: 401, data: .init())))
         var responseUnchanged = false
@@ -66,7 +66,7 @@ final class MapHttpInterceptorTests: XCTestCase {
         XCTAssertTrue(updateLastErrorCalled)
     }
 
-    func testOnRequestCancelledDoesNothing() throws {
+    func testOnRequestCancelledDoesNothing() {
         let fakeErrorResponse: HttpResponse = .init(identifier: 1, request: fakeRequest,
                                                     result: .failure(.init(type: .requestCancelled,
                                                                            message: "Cancelled")))
diff --git a/iosApp/iosAppTests/Pages/NearbyTransit/NearbyTransitPageTests.swift b/iosApp/iosAppTests/Pages/NearbyTransit/NearbyTransitPageTests.swift
index 630e584380..38ce7f6b25 100644
--- a/iosApp/iosAppTests/Pages/NearbyTransit/NearbyTransitPageTests.swift
+++ b/iosApp/iosAppTests/Pages/NearbyTransit/NearbyTransitPageTests.swift
@@ -45,7 +45,7 @@ final class NearbyTransitPageTests: XCTestCase {
         XCTAssertNil(nearbyVM.routeCardData)
     }
 
-    @MainActor func testReloadsWhenLocationChanges() throws {
+    @MainActor func testReloadsWhenLocationChanges() {
         class FakeNearbyVM: NearbyViewModel {
             let expectation: XCTestExpectation
             let closure: (CLLocationCoordinate2D) -> Void
@@ -107,7 +107,7 @@ final class NearbyTransitPageTests: XCTestCase {
         wait(for: [hasAppeared, getNearbyExpectation], timeout: 10)
     }
 
-    @MainActor func testNoReloadWhenNotVisbleAndLocationChanges() throws {
+    @MainActor func testNoReloadWhenNotVisbleAndLocationChanges() {
         class FakeNearbyVM: NearbyViewModel {
             let expectation: XCTestExpectation
 
diff --git a/iosApp/iosAppTests/Pages/NearbyTransit/NearbyTransitViewTests.swift b/iosApp/iosAppTests/Pages/NearbyTransit/NearbyTransitViewTests.swift
index d08524d100..5da01b1dd2 100644
--- a/iosApp/iosAppTests/Pages/NearbyTransit/NearbyTransitViewTests.swift
+++ b/iosApp/iosAppTests/Pages/NearbyTransit/NearbyTransitViewTests.swift
@@ -64,7 +64,7 @@ final class NearbyTransitViewTests: XCTestCase {
         }
     }
 
-    func testLoading() throws {
+    func testLoading() {
         let getNearbyExpectation = expectation(description: "getNearby")
 
         var sut = NearbyTransitView(
@@ -91,7 +91,7 @@ final class NearbyTransitViewTests: XCTestCase {
 
     var mockLocation = CLLocationCoordinate2D(latitude: 12.34, longitude: -56.78)
 
-    func testSchedulesFetchedOnAppear() throws {
+    func testSchedulesFetchedOnAppear() {
         let objects = ObjectCollectionBuilder()
         objects.route { _ in }
         objects.stop { _ in }
@@ -117,7 +117,7 @@ final class NearbyTransitViewTests: XCTestCase {
     }
 
     @MainActor func testWithPredictions() throws {
-        NSTimeZone.default = TimeZone(identifier: "America/New_York")!
+        NSTimeZone.default = try XCTUnwrap(TimeZone(identifier: "America/New_York"))
         let now = EasternTimeInstant.now()
         let distantMinutes = 10
         let objects = TestData.clone()
@@ -258,7 +258,7 @@ final class NearbyTransitViewTests: XCTestCase {
         wait(for: [reorderedJoinExp], timeout: 2)
     }
 
-    func testFetchesPredictionsWhenNoStops() throws {
+    func testFetchesPredictionsWhenNoStops() {
         let joinsPredictionsExpectation = expectation(description: "joins predictions")
 
         let objects = ObjectCollectionBuilder()
@@ -300,7 +300,7 @@ final class NearbyTransitViewTests: XCTestCase {
     }
 
     @MainActor func testLoadsRouteCardDataOnPredictionChange() throws {
-        NSTimeZone.default = TimeZone(identifier: "America/New_York")!
+        NSTimeZone.default = try XCTUnwrap(TimeZone(identifier: "America/New_York"))
         let loadRouteCardExp = XCTestExpectation(description: "loadRouteCard called")
 
         let objects = TestData.clone()
@@ -525,7 +525,7 @@ final class NearbyTransitViewTests: XCTestCase {
         XCTAssertNotNil(try sut.inspect().find(text: "You’re outside the MBTA service area."))
     }
 
-    @MainActor func testFilterChangesWithAlerts() throws {
+    @MainActor func testFilterChangesWithAlerts() {
         let objects = TestData.clone()
 
         let harvardNorthbound = objects.getStop(id: "70068")
diff --git a/iosApp/iosAppTests/Pages/Onboarding/OnboardingPageTests.swift b/iosApp/iosAppTests/Pages/Onboarding/OnboardingPageTests.swift
index 5337266c57..acce1039d6 100644
--- a/iosApp/iosAppTests/Pages/Onboarding/OnboardingPageTests.swift
+++ b/iosApp/iosAppTests/Pages/Onboarding/OnboardingPageTests.swift
@@ -13,7 +13,7 @@ import ViewInspector
 import XCTest
 
 final class OnboardingPageTests: XCTestCase {
-    @MainActor func testFlow() async throws {
+    @MainActor func testFlow() async {
         let onboardingRepository = MockOnboardingRepository()
         let finishExp = expectation(description: "calls onFinish")
         let stepChannel = PassthroughSubject<Void, Never>()
diff --git a/iosApp/iosAppTests/Pages/Onboarding/OnboardingScreenViewTests.swift b/iosApp/iosAppTests/Pages/Onboarding/OnboardingScreenViewTests.swift
index a62b2bcd8a..2551b75827 100644
--- a/iosApp/iosAppTests/Pages/Onboarding/OnboardingScreenViewTests.swift
+++ b/iosApp/iosAppTests/Pages/Onboarding/OnboardingScreenViewTests.swift
@@ -13,7 +13,7 @@ import ViewInspector
 import XCTest
 
 final class OnboardingScreenViewTests: XCTestCase {
-    @MainActor func testLocationFlow() throws {
+    @MainActor func testLocationFlow() {
         let requestExp = expectation(description: "requests location permission")
         let advanceExp = expectation(description: "calls advance()")
         let locationFetcher = MockOnboardingLocationFetcher(requestExp: requestExp)
diff --git a/iosApp/iosAppTests/Pages/Promo/PromoScreenViewTests.swift b/iosApp/iosAppTests/Pages/Promo/PromoScreenViewTests.swift
index 5a2af221cf..bc38d01cfb 100644
--- a/iosApp/iosAppTests/Pages/Promo/PromoScreenViewTests.swift
+++ b/iosApp/iosAppTests/Pages/Promo/PromoScreenViewTests.swift
@@ -13,7 +13,7 @@ import ViewInspector
 import XCTest
 
 final class PromoScreenViewTests: XCTestCase {
-    @MainActor func testCombinedStopPromoFlow() throws {
+    @MainActor func testCombinedStopPromoFlow() {
         let advanceExp = expectation(description: "calls advance()")
         let sut = PromoScreenView(
             screen: .combinedStopAndTrip,
@@ -32,7 +32,7 @@ final class PromoScreenViewTests: XCTestCase {
         wait(for: [exp], timeout: 5)
     }
 
-    @MainActor func testEnhancedFavorites() throws {
+    @MainActor func testEnhancedFavorites() {
         let advanceExp = expectation(description: "calls advance()")
         let sut = PromoScreenView(
             screen: .enhancedFavorites,
diff --git a/iosApp/iosAppTests/Pages/RouteDetails/RouteStopListViewTests.swift b/iosApp/iosAppTests/Pages/RouteDetails/RouteStopListViewTests.swift
index 729b2c69ca..12baeb57ec 100644
--- a/iosApp/iosAppTests/Pages/RouteDetails/RouteStopListViewTests.swift
+++ b/iosApp/iosAppTests/Pages/RouteDetails/RouteStopListViewTests.swift
@@ -14,7 +14,7 @@ import ViewInspector
 import XCTest
 
 final class RouteStopListViewTests: XCTestCase {
-    @MainActor func testDisplaysEverything() throws {
+    @MainActor func testDisplaysEverything() {
         let objects = ObjectCollectionBuilder()
         let stop1 = objects.stop { $0.name = "Stop 1" }
         let stop2 = objects.stop { $0.name = "Stop 2" }
@@ -107,7 +107,7 @@ final class RouteStopListViewTests: XCTestCase {
         wait(for: [exp], timeout: 2)
     }
 
-    @MainActor func testSelectsWithinLine() throws {
+    @MainActor func testSelectsWithinLine() {
         let objects = ObjectCollectionBuilder()
         let line = objects.line()
         let route1 = objects.route { route in
@@ -170,7 +170,7 @@ final class RouteStopListViewTests: XCTestCase {
         wait(for: [exp1, exp2, exp3], timeout: 5)
     }
 
-    @MainActor func testCollapsesNonTypicalStops() throws {
+    @MainActor func testCollapsesNonTypicalStops() {
         let objects = ObjectCollectionBuilder()
         let stop1 = objects.stop { $0.name = "Stop 1" }
         let stop2 = objects.stop { $0.name = "Stop 2" }
@@ -243,7 +243,7 @@ final class RouteStopListViewTests: XCTestCase {
         wait(for: [exp], timeout: 2)
     }
 
-    @MainActor func testDoesntCollapseWhenOnlyNonTypical() throws {
+    @MainActor func testDoesntCollapseWhenOnlyNonTypical() {
         let objects = ObjectCollectionBuilder()
         let stop1 = objects.stop { $0.name = "Stop 1" }
         let stop2 = objects.stop { $0.name = "Stop 2" }
diff --git a/iosApp/iosAppTests/Pages/SaveFavorite/NotificationSettingsWidgetTests.swift b/iosApp/iosAppTests/Pages/SaveFavorite/NotificationSettingsWidgetTests.swift
index 115813573b..9ebdfeef8c 100644
--- a/iosApp/iosAppTests/Pages/SaveFavorite/NotificationSettingsWidgetTests.swift
+++ b/iosApp/iosAppTests/Pages/SaveFavorite/NotificationSettingsWidgetTests.swift
@@ -93,18 +93,18 @@ final class NotificationSettingsWidgetTests: XCTestCase {
         )
 
         try sut.inspect().find(ViewType.DatePicker.self, where: { try $0.labelView().text().string() == "From" })
-            .select(date: Calendar(identifier: .iso8601).nextDate(
+            .select(date: XCTUnwrap(Calendar(identifier: .iso8601).nextDate(
                 after: .now,
                 matching: .init(hour: 7, minute: 45),
                 matchingPolicy: .strict
-            )!)
+            )))
         XCTAssertEqual(settings.windows[0].startTime, .init(hour: 7, minute: 45, second: 0))
         try sut.inspect().find(ViewType.DatePicker.self, where: { try $0.labelView().text().string() == "To" })
-            .select(date: Calendar(identifier: .iso8601).nextDate(
+            .select(date: XCTUnwrap(Calendar(identifier: .iso8601).nextDate(
                 after: .now,
                 matching: .init(hour: 9, minute: 10),
                 matchingPolicy: .strict
-            )!)
+            )))
         XCTAssertEqual(settings.windows[0].endTime, .init(hour: 9, minute: 10, second: 0))
     }
 
@@ -145,11 +145,11 @@ final class NotificationSettingsWidgetTests: XCTestCase {
         let calendar = Calendar(identifier: .iso8601)
         let dayStart = calendar.startOfDay(for: .now)
         try sut.inspect().find(ViewType.DatePicker.self, where: { try $0.labelView().text().string() == "From" })
-            .select(date: calendar.nextDate(
+            .select(date: XCTUnwrap(calendar.nextDate(
                 after: dayStart,
                 matching: .init(hour: 10, minute: 45),
                 matchingPolicy: .strict
-            )!)
+            )))
         XCTAssertEqual(settings.windows[0].startTime, .init(hour: 10, minute: 45, second: 0))
         try sut.inspect().findAndCallOnChange(newValue: settings.windows[0].startTime)
         XCTAssertEqual(settings.windows[0].endTime, .init(hour: 11, minute: 45, second: 0))
diff --git a/iosApp/iosAppTests/Pages/Settings/MorePageTests.swift b/iosApp/iosAppTests/Pages/Settings/MorePageTests.swift
index 37eeb54650..16e9fb6ae5 100644
--- a/iosApp/iosAppTests/Pages/Settings/MorePageTests.swift
+++ b/iosApp/iosAppTests/Pages/Settings/MorePageTests.swift
@@ -13,7 +13,7 @@ import ViewInspector
 import XCTest
 
 final class MorePageTests: XCTestCase {
-    @MainActor func testLoadsState() async throws {
+    @MainActor func testLoadsState() async {
         let sut = MorePage(highlight: nil)
         let exp = sut.inspection.inspect(after: 1) { view in
             XCTAssertTrue(try view.find(text: "Debug Mode").parent().parent().find(ViewType.Toggle.self).isOn())
@@ -27,7 +27,7 @@ final class MorePageTests: XCTestCase {
         await fulfillment(of: [exp], timeout: 2)
     }
 
-    @MainActor func testSavesState() async throws {
+    @MainActor func testSavesState() async {
         let savedExp = expectation(description: "saved state")
 
         let settingsRepository = MockSettingsRepository(
@@ -48,7 +48,7 @@ final class MorePageTests: XCTestCase {
         await fulfillment(of: [tapExp, savedExp], timeout: 5)
     }
 
-    @MainActor func testAccessibilityToggleUpdatesSubscriptions() async throws {
+    @MainActor func testAccessibilityToggleUpdatesSubscriptions() async {
         let savedExp = expectation(description: "saved state")
         let updateExp = expectation(description: "updated subscription accessibility")
 
@@ -86,7 +86,7 @@ final class MorePageTests: XCTestCase {
         await fulfillment(of: [tapExp, savedExp, updateExp], timeout: 5)
     }
 
-    @MainActor func testLinksExist() async throws {
+    @MainActor func testLinksExist() async {
         let sut = MorePage(highlight: nil)
         let exp = sut.inspection.inspect(after: 2) { view in
             try XCTAssertNotNil(view.find(text: "Send App Feedback"))
diff --git a/iosApp/iosAppTests/Pages/StopDetails/StopDetailsFilterPillsTests.swift b/iosApp/iosAppTests/Pages/StopDetails/StopDetailsFilterPillsTests.swift
index 8667b3442f..0b704107af 100644
--- a/iosApp/iosAppTests/Pages/StopDetails/StopDetailsFilterPillsTests.swift
+++ b/iosApp/iosAppTests/Pages/StopDetails/StopDetailsFilterPillsTests.swift
@@ -41,8 +41,8 @@ final class StopDetailsFilterPillsTests: XCTestCase {
         )
 
         let pills = try sut.inspect().findAll(RoutePill.self)
-        XCTAssertTrue(try pills.first!.actualView().isActive)
-        XCTAssertFalse(try pills.last!.actualView().isActive)
+        XCTAssertTrue(try XCTUnwrap(try pills.first?.actualView().isActive))
+        XCTAssertFalse(try XCTUnwrap(try pills.last?.actualView().isActive))
     }
 
     func testRoutePillTap() throws {
diff --git a/iosApp/iosAppTests/Pages/StopDetails/StopDetailsFilteredDepartureDetailsTests.swift b/iosApp/iosAppTests/Pages/StopDetails/StopDetailsFilteredDepartureDetailsTests.swift
index 57e503f596..f069e4853e 100644
--- a/iosApp/iosAppTests/Pages/StopDetails/StopDetailsFilteredDepartureDetailsTests.swift
+++ b/iosApp/iosAppTests/Pages/StopDetails/StopDetailsFilteredDepartureDetailsTests.swift
@@ -78,7 +78,7 @@ final class StopDetailsFilteredDepartureDetailsTests: XCTestCase {
         let patterns = patterns ?? [objects.routePattern(route: route) { _ in }]
         let upcomingTrips = upcomingTrips ?? []
 
-        let leaf = RouteCardData.Leaf(
+        return RouteCardData.Leaf(
             lineOrRoute: lineOrRoute,
             stop: stop,
             directionId: 0,
@@ -92,8 +92,6 @@ final class StopDetailsFilteredDepartureDetailsTests: XCTestCase {
             alertsDownstream: alertsDownstream,
             context: .stopDetailsFiltered
         )
-
-        return leaf
     }
 
     func testDisplaysTrips() throws {
@@ -143,7 +141,7 @@ final class StopDetailsFilteredDepartureDetailsTests: XCTestCase {
     }
 
     @MainActor
-    func testShowsHeadsignAndPillsWhenBranchingLine() throws {
+    func testShowsHeadsignAndPillsWhenBranchingLine() {
         let objects = ObjectCollectionBuilder()
         let now = EasternTimeInstant.now()
         let stop = objects.stop { _ in }
@@ -438,7 +436,7 @@ final class StopDetailsFilteredDepartureDetailsTests: XCTestCase {
     }
 
     @MainActor
-    func testSetsAlertSummaries() throws {
+    func testSetsAlertSummaries() {
         let objects = ObjectCollectionBuilder()
         let now = EasternTimeInstant.now()
         let stop = objects.stop { _ in }
@@ -499,7 +497,7 @@ final class StopDetailsFilteredDepartureDetailsTests: XCTestCase {
     }
 
     @MainActor
-    func testShowsSuspensionFallback() throws {
+    func testShowsSuspensionFallback() {
         let objects = ObjectCollectionBuilder()
         let now = EasternTimeInstant.now()
         let stop = objects.stop { _ in }
@@ -563,7 +561,7 @@ final class StopDetailsFilteredDepartureDetailsTests: XCTestCase {
     }
 
     @MainActor
-    func testShowsDownstreamAlertFallback() throws {
+    func testShowsDownstreamAlertFallback() {
         let objects = ObjectCollectionBuilder()
         let now = EasternTimeInstant.now()
         let stop = objects.stop { _ in }
@@ -683,7 +681,7 @@ final class StopDetailsFilteredDepartureDetailsTests: XCTestCase {
         XCTAssertNotNil(try sut.inspect().find(DepartureTile.self))
         XCTAssertNotNil(try sut.inspect().find(AlertCard.self))
         XCTAssertNil(try? sut.inspect().find(text: "Elevator Closure"))
-        XCTAssertNotNil(try sut.inspect().find(text: alert.header!))
+        XCTAssertNotNil(try sut.inspect().find(text: XCTUnwrap(alert.header)))
         try sut.inspect().find(AlertCard.self).find(ViewType.Button.self).tap()
         XCTAssertEqual(
             nearbyVM.navigationStack.last,
@@ -727,7 +725,7 @@ final class StopDetailsFilteredDepartureDetailsTests: XCTestCase {
     }
 
     @MainActor
-    func testShowsSubwayDelayAlertFallback() throws {
+    func testShowsSubwayDelayAlertFallback() {
         let objects = ObjectCollectionBuilder()
         let now = EasternTimeInstant.now()
         let stop = objects.stop { _ in }
@@ -845,8 +843,8 @@ final class StopDetailsFilteredDepartureDetailsTests: XCTestCase {
             now: now,
             context: .stopDetailsFiltered
         )!.first!
-        let routeStopData = routeCardData.stopData.first!
-        let leaf = routeStopData.data.first { $0.directionId == 0 }!
+        let routeStopData = try XCTUnwrap(routeCardData.stopData.first)
+        let leaf = try XCTUnwrap(routeStopData.data.first { $0.directionId == 0 })
 
         let sut = StopDetailsFilteredDepartureDetails(
             stopId: stop.id,
@@ -883,7 +881,7 @@ final class StopDetailsFilteredDepartureDetailsTests: XCTestCase {
         await fulfillment(of: [exp], timeout: 3)
     }
 
-    @MainActor func testLoadsNextTrip() throws {
+    @MainActor func testLoadsNextTrip() {
         let objects = ObjectCollectionBuilder()
         let stop = objects.stop { _ in }
         let route = objects.route { route in route.id = "Red" }
@@ -933,7 +931,7 @@ final class StopDetailsFilteredDepartureDetailsTests: XCTestCase {
         wait(for: [exp], timeout: 2)
     }
 
-    func testHidesEarlyMorningCardWhenPredictionExists() throws {
+    func testHidesEarlyMorningCardWhenPredictionExists() {
         let now = EasternTimeInstant(year: 2025, month: .november, day: 17, hour: 3, minute: 30, second: 0)
         let subwayStartTime = EasternTimeInstant(year: 2025, month: .november, day: 17, hour: 9, minute: 44, second: 0)
         let objects = ObjectCollectionBuilder()
diff --git a/iosApp/iosAppTests/Pages/StopDetails/StopDetailsFilteredViewTests.swift b/iosApp/iosAppTests/Pages/StopDetails/StopDetailsFilteredViewTests.swift
index 14025b984d..f6e76624ff 100644
--- a/iosApp/iosAppTests/Pages/StopDetails/StopDetailsFilteredViewTests.swift
+++ b/iosApp/iosAppTests/Pages/StopDetails/StopDetailsFilteredViewTests.swift
@@ -6,9 +6,8 @@
 //  Copyright © 2025 MBTA. All rights reserved.
 //
 
-@testable import iosApp
-
 import Combine
+@testable import iosApp
 import Shared
 import SwiftUI
 import ViewInspector
@@ -19,7 +18,7 @@ final class StopDetailsFilteredViewTests: XCTestCase {
         executionTimeAllowance = 60
     }
 
-    @MainActor func testSaveEnhancedFavoriteTriggersSaveFlow() throws {
+    @MainActor func testSaveEnhancedFavoriteTriggersSaveFlow() {
         let objects = ObjectCollectionBuilder()
         let stop = objects.stop { _ in }
         let route = objects.route()
@@ -62,7 +61,7 @@ final class StopDetailsFilteredViewTests: XCTestCase {
         wait(for: [tapButtonExp, confirmationDialogExp], timeout: 4)
     }
 
-    @MainActor func testShowsDataWhenStopAndRouteMatchFilterButDirectionDoesnt() throws {
+    @MainActor func testShowsDataWhenStopAndRouteMatchFilterButDirectionDoesnt() {
         let objects = ObjectCollectionBuilder()
         let stop = objects.stop { _ in }
         let route = objects.route()
@@ -177,7 +176,7 @@ final class StopDetailsFilteredViewTests: XCTestCase {
         wait(for: [exp], timeout: 4)
     }
 
-    @MainActor func testCanSeeDirectionLabelsBeforeRealtimeDataLoads() throws {
+    @MainActor func testCanSeeDirectionLabelsBeforeRealtimeDataLoads() {
         let objects = ObjectCollectionBuilder()
         let stop = objects.stop { _ in }
         let otherStop = objects.stop { _ in }
@@ -317,9 +316,12 @@ final class StopDetailsFilteredViewTests: XCTestCase {
         )],
         globalData: GlobalResponse(objects: objects))
 
-        let routeData = StopDetailsViewModel.RouteDataFiltered(
-            filteredWith: .init(stopId: stop.id, stopFilter: .init(routeId: route.lineId!, directionId: 0),
-                                tripFilter: nil),
+        let routeData = try StopDetailsViewModel.RouteDataFiltered(
+            filteredWith: .init(
+                stopId: stop.id,
+                stopFilter: .init(routeId: XCTUnwrap(route.lineId), directionId: 0),
+                tripFilter: nil
+            ),
             stopData: stopData
         )
 
@@ -329,9 +331,9 @@ final class StopDetailsFilteredViewTests: XCTestCase {
 
         let setStopFilterExp = XCTestExpectation(description: "setStopFilter called for GL direction 1")
 
-        let sut = StopDetailsFilteredView(
+        let sut = try StopDetailsFilteredView(
             stopId: stop.id,
-            stopFilter: .init(routeId: route.lineId!, directionId: directionId),
+            stopFilter: .init(routeId: XCTUnwrap(route.lineId), directionId: directionId),
             tripFilter: nil,
             routeData: nil,
             favorites: .init(routeStopDirection: [:]),
diff --git a/iosApp/iosAppTests/Pages/StopDetails/StopDetailsUnfilteredViewTests.swift b/iosApp/iosAppTests/Pages/StopDetails/StopDetailsUnfilteredViewTests.swift
index 9c03a8859e..6f80067fc3 100644
--- a/iosApp/iosAppTests/Pages/StopDetails/StopDetailsUnfilteredViewTests.swift
+++ b/iosApp/iosAppTests/Pages/StopDetails/StopDetailsUnfilteredViewTests.swift
@@ -109,27 +109,27 @@ import XCTest
     @MainActor
     func testGroupsByDirection() async throws {
         let routeCardData = try await RouteCardData.companion.routeCardsForStopList(
-            stopIds: [stop!.id] + stop!.childStopIds,
-            globalData: globalResponse!,
+            stopIds: [XCTUnwrap(stop?.id)] + stop!.childStopIds,
+            globalData: XCTUnwrap(globalResponse),
             sortByDistanceFrom: nil,
             schedules: nil,
-            predictions: .init(objects: builder!),
+            predictions: .init(objects: XCTUnwrap(builder)),
             alerts: .init(alerts: [:]),
-            now: now!,
+            now: XCTUnwrap(now),
             context: .stopDetailsUnfiltered
         )!
 
         let nearbyVM = NearbyViewModel()
 
-        let sut = StopDetailsUnfilteredView(
-            stopId: stop!.id,
+        let sut = try StopDetailsUnfilteredView(
+            stopId: XCTUnwrap(stop?.id),
             routeData: StopDetailsViewModel.RouteDataUnfiltered(
-                filteredWith: .init(stopId: stop!.id, stopFilter: nil, tripFilter: nil),
+                filteredWith: .init(stopId: XCTUnwrap(stop?.id), stopFilter: nil, tripFilter: nil),
                 routeCards: routeCardData
             ),
             favorites: .init(routeStopDirection: [:]),
-            global: .init(objects: builder!),
-            now: now!,
+            global: .init(objects: XCTUnwrap(builder)),
+            now: XCTUnwrap(now),
             setStopFilter: { _ in },
             navCallbacks: .companion.empty,
             errorBannerVM: errorBannerViewModel,
@@ -149,27 +149,27 @@ import XCTest
 
     func testInaccessibleByDirection() async throws {
         let routeCardData = try await RouteCardData.companion.routeCardsForStopList(
-            stopIds: [inaccessibleStop!.id] + inaccessibleStop!.childStopIds,
-            globalData: globalResponse!,
+            stopIds: [XCTUnwrap(inaccessibleStop?.id)] + inaccessibleStop!.childStopIds,
+            globalData: XCTUnwrap(globalResponse),
             sortByDistanceFrom: nil,
             schedules: nil,
-            predictions: .init(objects: builder!),
+            predictions: .init(objects: XCTUnwrap(builder)),
             alerts: .init(alerts: [:]),
-            now: now!,
+            now: XCTUnwrap(now),
             context: .stopDetailsUnfiltered
         )!
 
         let nearbyVM = NearbyViewModel()
 
-        let sut = StopDetailsUnfilteredView(
-            stopId: inaccessibleStop!.id,
+        let sut = try StopDetailsUnfilteredView(
+            stopId: XCTUnwrap(inaccessibleStop?.id),
             routeData: StopDetailsViewModel.RouteDataUnfiltered(
-                filteredWith: .init(stopId: inaccessibleStop!.id, stopFilter: nil, tripFilter: nil),
+                filteredWith: .init(stopId: XCTUnwrap(inaccessibleStop?.id), stopFilter: nil, tripFilter: nil),
                 routeCards: routeCardData
             ),
             favorites: .init(routeStopDirection: [:]),
-            global: .init(objects: builder!),
-            now: now!,
+            global: .init(objects: XCTUnwrap(builder)),
+            now: XCTUnwrap(now),
             setStopFilter: { _ in },
             navCallbacks: .companion.empty,
             errorBannerVM: errorBannerViewModel,
@@ -184,7 +184,7 @@ import XCTest
     }
 
     func testShowsElevatorAlertsWhenGroupedByDirection() async throws {
-        let alert = builder!.clone().alert { alert in
+        let alert = try XCTUnwrap(builder?.clone().alert { alert in
             alert.header = "Elevator alert"
             alert.activePeriod(start: Date(timeIntervalSince1970: 0).toEasternInstant(), end: nil)
             alert.effect = .elevatorClosure
@@ -197,30 +197,30 @@ import XCTest
                 stop: self.stop!.id,
                 trip: nil
             )
-        }
+        })
 
         let routeCardData = try await RouteCardData.companion.routeCardsForStopList(
-            stopIds: [stop!.id] + stop!.childStopIds,
-            globalData: globalResponse!,
+            stopIds: [XCTUnwrap(stop?.id)] + stop!.childStopIds,
+            globalData: XCTUnwrap(globalResponse),
             sortByDistanceFrom: nil,
             schedules: nil,
-            predictions: .init(objects: builder!),
+            predictions: .init(objects: XCTUnwrap(builder)),
             alerts: .init(alerts: [alert.id: alert]),
-            now: now!,
+            now: XCTUnwrap(now),
             context: .stopDetailsUnfiltered
         )!
 
         let nearbyVM = NearbyViewModel()
 
-        let unfilteredView = StopDetailsUnfilteredView(
-            stopId: stop!.id,
+        let unfilteredView = try StopDetailsUnfilteredView(
+            stopId: XCTUnwrap(stop?.id),
             routeData: StopDetailsViewModel.RouteDataUnfiltered(
-                filteredWith: .init(stopId: stop!.id, stopFilter: nil, tripFilter: nil),
+                filteredWith: .init(stopId: XCTUnwrap(stop?.id), stopFilter: nil, tripFilter: nil),
                 routeCards: routeCardData
             ),
             favorites: .init(routeStopDirection: [:]),
-            global: .init(objects: builder!),
-            now: now!,
+            global: .init(objects: XCTUnwrap(builder)),
+            now: XCTUnwrap(now),
             setStopFilter: { _ in },
             navCallbacks: .companion.empty,
             errorBannerVM: errorBannerViewModel,
diff --git a/iosApp/iosAppTests/Pages/StopDetails/StopDetailsViewTests.swift b/iosApp/iosAppTests/Pages/StopDetails/StopDetailsViewTests.swift
index 48c1aca4e9..da962fbab4 100644
--- a/iosApp/iosAppTests/Pages/StopDetails/StopDetailsViewTests.swift
+++ b/iosApp/iosAppTests/Pages/StopDetails/StopDetailsViewTests.swift
@@ -6,9 +6,8 @@
 //  Copyright © 2024 MBTA. All rights reserved.
 //
 
-@testable import iosApp
-
 import Combine
+@testable import iosApp
 import Shared
 import SwiftUI
 import ViewInspector
@@ -74,7 +73,7 @@ final class StopDetailsViewTests: XCTestCase {
         XCTAssertNotNil(try routePills[1].find(text: "Should be second"))
     }
 
-    func testSkipsPillsIfOneRoute() throws {
+    func testSkipsPillsIfOneRoute() {
         let objects = ObjectCollectionBuilder()
         let route = objects.route { route in
             route.shortName = "57"
@@ -171,10 +170,10 @@ final class StopDetailsViewTests: XCTestCase {
 
         ViewHosting.host(view: sut.withFixedSettings([:]))
         XCTAssertNil(try? sut.inspect().find(AlertCard.self))
-        XCTAssertNil(try? sut.inspect().find(text: alert.header!))
+        XCTAssertNil(try? sut.inspect().find(text: try XCTUnwrap(alert.header)))
     }
 
-    func testDisplaysVehicleData() throws {
+    func testDisplaysVehicleData() {
         let now = EasternTimeInstant.now()
         let objects = ObjectCollectionBuilder()
         let route = objects.route { route in
diff --git a/iosApp/iosAppTests/Pages/StopDetails/TripDetailsViewTests.swift b/iosApp/iosAppTests/Pages/StopDetails/TripDetailsViewTests.swift
index 607da46676..5f6ff04363 100644
--- a/iosApp/iosAppTests/Pages/StopDetails/TripDetailsViewTests.swift
+++ b/iosApp/iosAppTests/Pages/StopDetails/TripDetailsViewTests.swift
@@ -18,7 +18,7 @@ final class TripDetailsViewTests: XCTestCase {
     }
 
     @MainActor
-    func testDisplaysVehicleCard() throws {
+    func testDisplaysVehicleCard() {
         let now = EasternTimeInstant.now()
         let objects = ObjectCollectionBuilder()
         let route = objects.route { _ in }
@@ -100,7 +100,7 @@ final class TripDetailsViewTests: XCTestCase {
     }
 
     @MainActor
-    func testDisplaysScheduleCard() throws {
+    func testDisplaysScheduleCard() {
         let now = EasternTimeInstant.now()
         let objects = ObjectCollectionBuilder()
         let route = objects.route { _ in }
@@ -190,7 +190,7 @@ final class TripDetailsViewTests: XCTestCase {
     }
 
     @MainActor
-    func testDisplaysStopList() throws {
+    func testDisplaysStopList() {
         let now = EasternTimeInstant.now()
         let objects = ObjectCollectionBuilder()
         let route = objects.route { _ in }
@@ -271,7 +271,7 @@ final class TripDetailsViewTests: XCTestCase {
     }
 
     @MainActor
-    func testTappingDownstreamStopAppendsToNavStack() throws {
+    func testTappingDownstreamStopAppendsToNavStack() {
         let now = EasternTimeInstant.now()
         let objects = ObjectCollectionBuilder()
         let route = objects.route { _ in }
@@ -360,7 +360,7 @@ final class TripDetailsViewTests: XCTestCase {
     }
 
     @MainActor
-    func testDisplaysFollowButton() throws {
+    func testDisplaysFollowButton() {
         let now = EasternTimeInstant.now()
         let objects = ObjectCollectionBuilder()
         let route = objects.route { _ in }
@@ -446,7 +446,7 @@ final class TripDetailsViewTests: XCTestCase {
     }
 
     @MainActor
-    func testDoesntDisplayFollowButtonOnTripDetails() throws {
+    func testDoesntDisplayFollowButtonOnTripDetails() {
         let now = EasternTimeInstant.now()
         let objects = ObjectCollectionBuilder()
         let route = objects.route { _ in }
@@ -527,7 +527,7 @@ final class TripDetailsViewTests: XCTestCase {
     }
 
     @MainActor
-    func testDisplaysTripCompleteCard() throws {
+    func testDisplaysTripCompleteCard() {
         let now = EasternTimeInstant.now()
         let objects = ObjectCollectionBuilder()
         let route = objects.route { _ in }
@@ -608,7 +608,7 @@ final class TripDetailsViewTests: XCTestCase {
     }
 
     @MainActor
-    func testDisplaysTripNotAvailableCard() throws {
+    func testDisplaysTripNotAvailableCard() {
         let now = EasternTimeInstant.now()
         let objects = ObjectCollectionBuilder()
         let route = objects.route { _ in }
diff --git a/iosApp/iosAppTests/Pages/StopDetails/TripStopsTests.swift b/iosApp/iosAppTests/Pages/StopDetails/TripStopsTests.swift
index 8a954de971..a97259c92c 100644
--- a/iosApp/iosAppTests/Pages/StopDetails/TripStopsTests.swift
+++ b/iosApp/iosAppTests/Pages/StopDetails/TripStopsTests.swift
@@ -348,7 +348,7 @@ final class TripStopsTests: XCTestCase {
             global: .init(objects: objects)
         ).withFixedSettings([:])
 
-        let firstRow = try sut.inspect().findAll(TripStopRow.self).first!
+        let firstRow = try XCTUnwrap(try sut.inspect().findAll(TripStopRow.self).first)
         XCTAssertNotNil(try firstRow.find(text: stop1.name))
         XCTAssert(try firstRow.actualView().firstStop)
         XCTAssertNotNil(try sut.inspect().find(text: "1 stop away"))
diff --git a/iosApp/iosAppTests/Pages/TripDetails/TripDetailsPageTests.swift b/iosApp/iosAppTests/Pages/TripDetails/TripDetailsPageTests.swift
index d213a6bfe1..909c2fc259 100644
--- a/iosApp/iosAppTests/Pages/TripDetails/TripDetailsPageTests.swift
+++ b/iosApp/iosAppTests/Pages/TripDetails/TripDetailsPageTests.swift
@@ -18,7 +18,7 @@ final class TripDetailsPageTests: XCTestCase {
     }
 
     @MainActor
-    func testDisplaysRouteHeader() throws {
+    func testDisplaysRouteHeader() {
         let now = EasternTimeInstant.now()
         let objects = TestData.clone()
         let stop = objects.getStop(id: "17863")
diff --git a/iosApp/iosAppTests/Utils/FetchApiTests.swift b/iosApp/iosAppTests/Utils/FetchApiTests.swift
index ba661e480f..9fba619c3e 100644
--- a/iosApp/iosAppTests/Utils/FetchApiTests.swift
+++ b/iosApp/iosAppTests/Utils/FetchApiTests.swift
@@ -23,7 +23,7 @@ final class FetchApiTests: XCTestCase {
         }
     }
 
-    func testCallsSuccessAndClearsError() async throws {
+    func testCallsSuccessAndClearsError() async {
         let errorBannerRepo = ErrorBannerStateRepository()
         try? await errorBannerRepo.setDataError(key: "a", details: "", action: {})
         XCTAssertNotNil(errorBannerRepo.state.value)
@@ -42,7 +42,7 @@ final class FetchApiTests: XCTestCase {
         XCTAssertNil(errorBannerRepo.state.value)
     }
 
-    func testStoresApiError() async throws {
+    func testStoresApiError() async {
         let errorBannerRepo = ErrorBannerStateRepository()
         XCTAssertNil(errorBannerRepo.state.value)
         let expRefresh = expectation(description: "can refresh after error")
@@ -63,7 +63,7 @@ final class FetchApiTests: XCTestCase {
         await fulfillment(of: [expRefresh], timeout: 1)
     }
 
-    func testHandlesThrownError() async throws {
+    func testHandlesThrownError() async {
         struct AdHocError: Error {}
         let errorBannerRepo = ErrorBannerStateRepository()
         await fetchApi(
diff --git a/iosApp/iosAppTests/Utils/FormattedAlertTests.swift b/iosApp/iosAppTests/Utils/FormattedAlertTests.swift
index 10303806a1..3b37fab904 100644
--- a/iosApp/iosAppTests/Utils/FormattedAlertTests.swift
+++ b/iosApp/iosAppTests/Utils/FormattedAlertTests.swift
@@ -6,15 +6,14 @@
 //  Copyright © 2026 MBTA. All rights reserved.
 //
 
+@testable import iosApp
 import Shared
 import SwiftUI
 import ViewInspector
 import XCTest
 
-@testable import iosApp
-
 final class FormattedAlertTests: XCTestCase {
-    func testTripShuttle() throws {
+    func testTripShuttle() {
         let formatted = FormattedAlert(
             alert: nil,
             alertSummary: TripShuttleAlertSummary(
@@ -41,7 +40,7 @@ final class FormattedAlertTests: XCTestCase {
         )
     }
 
-    func testDownstreamTripShuttle() throws {
+    func testDownstreamTripShuttle() {
         let formatted = FormattedAlert(
             alert: nil,
             alertSummary: TripShuttleAlertSummary(
@@ -68,7 +67,7 @@ final class FormattedAlertTests: XCTestCase {
         )
     }
 
-    func testThisTripShuttle() throws {
+    func testThisTripShuttle() {
         let formatted = FormattedAlert(
             alert: nil,
             alertSummary: TripShuttleAlertSummary(
@@ -86,7 +85,7 @@ final class FormattedAlertTests: XCTestCase {
         )
     }
 
-    func testDownstreamTripShuttleRecurrence() throws {
+    func testDownstreamTripShuttleRecurrence() {
         let formatted = FormattedAlert(
             alert: nil,
             alertSummary: TripShuttleAlertSummary(
@@ -124,7 +123,7 @@ final class FormattedAlertTests: XCTestCase {
         )
     }
 
-    func testThisTripShuttleRecurrence() throws {
+    func testThisTripShuttleRecurrence() {
         let formatted = FormattedAlert(
             alert: nil,
             alertSummary: TripShuttleAlertSummary(
@@ -153,7 +152,7 @@ final class FormattedAlertTests: XCTestCase {
         )
     }
 
-    func testTripSuspension() throws {
+    func testTripSuspension() {
         let formatted = FormattedAlert(
             alert: nil,
             alertSummary: TripSpecificAlertSummary(
@@ -181,7 +180,7 @@ final class FormattedAlertTests: XCTestCase {
         )
     }
 
-    func testThisTripSuspension() throws {
+    func testThisTripSuspension() {
         let formatted = FormattedAlert(
             alert: nil,
             alertSummary: TripSpecificAlertSummary(
@@ -200,7 +199,7 @@ final class FormattedAlertTests: XCTestCase {
         )
     }
 
-    func testDownstreamTripSuspension() throws {
+    func testDownstreamTripSuspension() {
         let formatted = FormattedAlert(
             alert: nil,
             alertSummary: TripSpecificAlertSummary(
@@ -228,7 +227,7 @@ final class FormattedAlertTests: XCTestCase {
         )
     }
 
-    func testThisDownstreamTripSuspension() throws {
+    func testThisDownstreamTripSuspension() {
         let formatted = FormattedAlert(
             alert: nil,
             alertSummary: TripSpecificAlertSummary(
@@ -247,7 +246,7 @@ final class FormattedAlertTests: XCTestCase {
         )
     }
 
-    func testTripStopSkipped() throws {
+    func testTripStopSkipped() {
         let formatted = FormattedAlert(
             alert: nil,
             alertSummary: TripSpecificAlertSummary(
@@ -275,7 +274,7 @@ final class FormattedAlertTests: XCTestCase {
         )
     }
 
-    func testThisTripStopSkipped() throws {
+    func testThisTripStopSkipped() {
         let formatted = FormattedAlert(
             alert: nil,
             alertSummary: TripSpecificAlertSummary(
@@ -295,7 +294,7 @@ final class FormattedAlertTests: XCTestCase {
         )
     }
 
-    func testOneStopSkipped() throws {
+    func testOneStopSkipped() {
         let formatted = FormattedAlert(
             alert: nil,
             alertSummary: AlertSummary.Standard(
@@ -312,7 +311,7 @@ final class FormattedAlertTests: XCTestCase {
         )
     }
 
-    func testTwoStopsSkipped() throws {
+    func testTwoStopsSkipped() {
         let formatted = FormattedAlert(
             alert: nil,
             alertSummary: AlertSummary.Standard(
@@ -329,7 +328,7 @@ final class FormattedAlertTests: XCTestCase {
         )
     }
 
-    func testThreeStopsSkipped() throws {
+    func testThreeStopsSkipped() {
         let formatted = FormattedAlert(
             alert: nil,
             alertSummary: AlertSummary.Standard(
@@ -346,7 +345,7 @@ final class FormattedAlertTests: XCTestCase {
         )
     }
 
-    func testMultipleStopsSkipped() throws {
+    func testMultipleStopsSkipped() {
         let formatted = FormattedAlert(
             alert: nil,
             alertSummary: AlertSummary.Standard(
diff --git a/iosApp/iosAppTests/Utils/Modifiers/FavoritesModifierTests.swift b/iosApp/iosAppTests/Utils/Modifiers/FavoritesModifierTests.swift
index 4d8bd6025c..8df37f5ded 100644
--- a/iosApp/iosAppTests/Utils/Modifiers/FavoritesModifierTests.swift
+++ b/iosApp/iosAppTests/Utils/Modifiers/FavoritesModifierTests.swift
@@ -19,7 +19,7 @@ final class FavoritesModifierTests: XCTestCase {
     }
 
     @MainActor
-    func testLoadsFromRepo() throws {
+    func testLoadsFromRepo() {
         let repoExp = expectation(description: "favorites loaded from repo")
         let setExp = expectation(description: "favorites binding was set")
 
@@ -54,7 +54,7 @@ final class FavoritesModifierTests: XCTestCase {
     }
 
     @MainActor
-    func testSetsPreviouslyLoadedValueWhileFetching() throws {
+    func testSetsPreviouslyLoadedValueWhileFetching() {
         let setExp = expectation(description: "favorites binding set to previously loaded value")
 
         let previouslyLoaded = buildFavorites {
diff --git a/iosApp/iosAppTests/Utils/Modifiers/FcmSubscriptionModifierTests.swift b/iosApp/iosAppTests/Utils/Modifiers/FcmSubscriptionModifierTests.swift
index a8758cf89e..963eb3c444 100644
--- a/iosApp/iosAppTests/Utils/Modifiers/FcmSubscriptionModifierTests.swift
+++ b/iosApp/iosAppTests/Utils/Modifiers/FcmSubscriptionModifierTests.swift
@@ -18,7 +18,7 @@ final class FcmSubscriptionModifierTests: XCTestCase {
         executionTimeAllowance = 60
     }
 
-    func testUpdatesSubscriptions() throws {
+    func testUpdatesSubscriptions() {
         let updateExp = expectation(description: "subscriptions updated")
 
         let objects = ObjectCollectionBuilder()
@@ -65,7 +65,7 @@ final class FcmSubscriptionModifierTests: XCTestCase {
         wait(for: [updateExp], timeout: 1)
     }
 
-    func testDoesNothingWithNoToken() throws {
+    func testDoesNothingWithNoToken() {
         let updateExp = expectation(description: "subscriptions updated")
         updateExp.isInverted = true
 
diff --git a/iosApp/iosAppTests/Utils/Modifiers/GlobalModifierTests.swift b/iosApp/iosAppTests/Utils/Modifiers/GlobalModifierTests.swift
index a8a0572874..bdcb1840b0 100644
--- a/iosApp/iosAppTests/Utils/Modifiers/GlobalModifierTests.swift
+++ b/iosApp/iosAppTests/Utils/Modifiers/GlobalModifierTests.swift
@@ -18,7 +18,7 @@ final class GlobalModifierTests: XCTestCase {
         executionTimeAllowance = 60
     }
 
-    func testLoadsFromRepo() throws {
+    func testLoadsFromRepo() {
         let repoExp = expectation(description: "favorites loaded from repo")
         let setExp = expectation(description: "favorites binding was set")
 
diff --git a/iosApp/iosAppTests/Utils/Modifiers/NotificationsBetaModifierTests.swift b/iosApp/iosAppTests/Utils/Modifiers/NotificationsBetaModifierTests.swift
index 450e6c9753..469fb8db0f 100644
--- a/iosApp/iosAppTests/Utils/Modifiers/NotificationsBetaModifierTests.swift
+++ b/iosApp/iosAppTests/Utils/Modifiers/NotificationsBetaModifierTests.swift
@@ -19,7 +19,7 @@ final class NotificationsBetaModifierTests: XCTestCase {
     }
 
     @MainActor
-    func testDisplaysToast() throws {
+    func testDisplaysToast() {
         let toastDisplayedExp = expectation(description: "toast displayed")
 
         let viewModel = MockNotificationsBetaViewModel(initialState: .init(showBetaToast: true, showBetaDialog: false))
@@ -43,7 +43,7 @@ final class NotificationsBetaModifierTests: XCTestCase {
     }
 
     @MainActor
-    func testSetsVMState() throws {
+    func testSetsVMState() {
         let instanceIdSetExp = expectation(description: "set instance id")
         instanceIdSetExp.expectedFulfillmentCount = 2
         let sheetRouteSetExp = expectation(description: "set sheet route")
diff --git a/iosApp/iosAppTests/Utils/RouteModeLabelTests.swift b/iosApp/iosAppTests/Utils/RouteModeLabelTests.swift
index c244a6c0bb..10d3997669 100644
--- a/iosApp/iosAppTests/Utils/RouteModeLabelTests.swift
+++ b/iosApp/iosAppTests/Utils/RouteModeLabelTests.swift
@@ -13,37 +13,37 @@ import ViewInspector
 import XCTest
 
 final class RouteModeLabelTests: XCTestCase {
-    func testNameAndType() throws {
+    func testNameAndType() {
         let name = "1"
         let type = RouteType.bus
 
         XCTAssertEqual("1 bus", routeModeLabel(name: name, type: type))
     }
 
-    func testPlural() throws {
+    func testPlural() {
         let name = "Red Line"
         let type = RouteType.heavyRail
 
         XCTAssertEqual("Red Line trains", routeModeLabel(name: name, type: type, isOnly: false))
     }
 
-    func testNameOnly() throws {
+    func testNameOnly() {
         let name = "Needham Line"
 
         XCTAssertEqual("Needham Line", routeModeLabel(name: name, type: nil))
     }
 
-    func testTypeOnly() throws {
+    func testTypeOnly() {
         let type = RouteType.ferry
 
         XCTAssertEqual("ferry", routeModeLabel(name: nil, type: type))
     }
 
-    func testEmpty() throws {
+    func testEmpty() {
         XCTAssertEqual("", routeModeLabel(name: nil, type: nil))
     }
 
-    func testRoute() throws {
+    func testRoute() {
         let route = ObjectCollectionBuilder.Single.shared.route { route in
             route.longName = "Orange Line"
             route.type = .heavyRail
@@ -51,7 +51,7 @@ final class RouteModeLabelTests: XCTestCase {
         XCTAssertEqual("Orange Line train", routeModeLabel(route: route))
     }
 
-    func testLineAndRoute() throws {
+    func testLineAndRoute() {
         let line = ObjectCollectionBuilder.Single.shared.line { line in
             line.longName = "Green Line"
         }
@@ -62,7 +62,7 @@ final class RouteModeLabelTests: XCTestCase {
         XCTAssertEqual("Green Line train", routeModeLabel(line: line, route: route))
     }
 
-    func testLineOrRoute() throws {
+    func testLineOrRoute() {
         let line = ObjectCollectionBuilder.Single.shared.line { line in
             line.longName = "Silver Line"
         }
diff --git a/iosApp/iosAppTests/Utils/SheetNavigationStackEntryTests.swift b/iosApp/iosAppTests/Utils/SheetNavigationStackEntryTests.swift
index 1d86853fa3..b8f629d15f 100644
--- a/iosApp/iosAppTests/Utils/SheetNavigationStackEntryTests.swift
+++ b/iosApp/iosAppTests/Utils/SheetNavigationStackEntryTests.swift
@@ -11,7 +11,7 @@ import Shared
 import XCTest
 
 final class SheetNavigationStackEntryTests: XCTestCase {
-    func testLastFilterEmpty() throws {
+    func testLastFilterEmpty() {
         var stack: [SheetNavigationStackEntry] = []
 
         XCTAssertNil(stack.lastStopDetailsFilter)
@@ -21,22 +21,22 @@ final class SheetNavigationStackEntryTests: XCTestCase {
         XCTAssertEqual(stack, [])
     }
 
-    func testNavStackEntryIdentifables() throws {
+    func testNavStackEntryIdentifables() {
         let stop = ObjectCollectionBuilder.Single.shared.stop { _ in }
         let stopEntry: SheetNavigationStackEntry = .stopDetails(stopId: stop.id, stopFilter: nil, tripFilter: nil)
         let nearbyEntry: SheetNavigationStackEntry = .nearby
         let alertEntry: SheetNavigationStackEntry = .alertDetails(alertId: "0", line: nil, routes: nil, stop: nil)
 
-        XCTAssertEqual(stopEntry.sheetItemIdentifiable()!.id, stop.id)
-        XCTAssertEqual(nearbyEntry.sheetItemIdentifiable()!.id, "nearby")
+        XCTAssertEqual(stopEntry.sheetItemIdentifiable()?.id, stop.id)
+        XCTAssertEqual(nearbyEntry.sheetItemIdentifiable()?.id, "nearby")
         XCTAssertNil(alertEntry.sheetItemIdentifiable())
 
         XCTAssertNil(stopEntry.coverItemIdentifiable())
         XCTAssertNil(nearbyEntry.coverItemIdentifiable())
-        XCTAssertEqual(alertEntry.coverItemIdentifiable()!.id, "0")
+        XCTAssertEqual(alertEntry.coverItemIdentifiable()?.id, "0")
     }
 
-    func testNavStackLastStopId() throws {
+    func testNavStackLastStopId() {
         let stop = ObjectCollectionBuilder.Single.shared.stop { _ in }
         let stopEntry: SheetNavigationStackEntry = .stopDetails(stopId: stop.id, stopFilter: nil, tripFilter: nil)
         let alertEntry: SheetNavigationStackEntry = .alertDetails(alertId: "0", line: nil, routes: nil, stop: nil)
@@ -57,7 +57,7 @@ final class SheetNavigationStackEntryTests: XCTestCase {
         XCTAssertEqual(stop.id, stack.lastStopId)
     }
 
-    func testLastFilterSet() throws {
+    func testLastFilterSet() {
         let stop = ObjectCollectionBuilder.Single.shared.stop { _ in }
         var stack: [SheetNavigationStackEntry] = [.stopDetails(stopId: stop.id, stopFilter: nil, tripFilter: nil)]
 
diff --git a/iosApp/iosAppTests/Views/ActionButtonTests.swift b/iosApp/iosAppTests/Views/ActionButtonTests.swift
index 77ba08f8bb..047b0f2cd3 100644
--- a/iosApp/iosAppTests/Views/ActionButtonTests.swift
+++ b/iosApp/iosAppTests/Views/ActionButtonTests.swift
@@ -7,7 +7,6 @@
 //
 
 import Foundation
-
 @testable import iosApp
 import Shared
 import SwiftUI
diff --git a/iosApp/iosAppTests/Views/AlertCardTests.swift b/iosApp/iosAppTests/Views/AlertCardTests.swift
index 49856df153..d9b1fc2083 100644
--- a/iosApp/iosAppTests/Views/AlertCardTests.swift
+++ b/iosApp/iosAppTests/Views/AlertCardTests.swift
@@ -6,13 +6,12 @@
 //  Copyright © 2025 MBTA. All rights reserved.
 //
 
+@testable import iosApp
 import Shared
 import SwiftUI
 import ViewInspector
 import XCTest
 
-@testable import iosApp
-
 final class AlertCardTests: XCTestCase {
     override func setUp() {
         executionTimeAllowance = 60
diff --git a/iosApp/iosAppTests/Views/ContentViewTests.swift b/iosApp/iosAppTests/Views/ContentViewTests.swift
index 13b7c1c3c6..742a82fb91 100644
--- a/iosApp/iosAppTests/Views/ContentViewTests.swift
+++ b/iosApp/iosAppTests/Views/ContentViewTests.swift
@@ -104,7 +104,7 @@ final class ContentViewTests: XCTestCase {
         wait(for: [leavesAlertsExp], timeout: 5)
     }
 
-    func testFetchesConfig() throws {
+    func testFetchesConfig() {
         let configFetchedExpectation = XCTestExpectation(description: "config fetched")
 
         let fakeVM = FakeContentVM(
@@ -117,7 +117,7 @@ final class ContentViewTests: XCTestCase {
         wait(for: [configFetchedExpectation], timeout: 6)
     }
 
-    @MainActor func testFetchesConfigOnMapboxError() throws {
+    @MainActor func testFetchesConfigOnMapboxError() {
         let loadConfigCallback = XCTestExpectation(description: "load config called")
         loadConfigCallback.expectedFulfillmentCount = 2
 
@@ -206,7 +206,7 @@ final class ContentViewTests: XCTestCase {
         XCTAssertThrowsError(try sut.inspect().find(NearbyTransitView.self))
     }
 
-    @MainActor func testBack() throws {
+    @MainActor func testBack() {
         let sut = ContentView(contentVM: .init())
         let stopFilter = StopDetailsFilter(routeId: Route.Id("route"), directionId: 0)
         let tripFilter = TripDetailsFilter(
@@ -242,7 +242,7 @@ final class ContentViewTests: XCTestCase {
         wait(for: [exp1, exp2, exp3], timeout: 5)
     }
 
-    @MainActor func testBackAppearanceWhileSearching() throws {
+    @MainActor func testBackAppearanceWhileSearching() {
         let sut = ContentView(contentVM: .init())
         let stopFilter = StopDetailsFilter(routeId: Route.Id("route"), directionId: 0)
         let tripFilter = TripDetailsFilter(
diff --git a/iosApp/iosAppTests/Views/ErrorBannerTests.swift b/iosApp/iosAppTests/Views/ErrorBannerTests.swift
index 43dc8bd561..e42e45bb55 100644
--- a/iosApp/iosAppTests/Views/ErrorBannerTests.swift
+++ b/iosApp/iosAppTests/Views/ErrorBannerTests.swift
@@ -15,7 +15,7 @@ import XCTest
 
 final class ErrorBannerTests: XCTestCase {
     @MainActor
-    func testRespondsToState() throws {
+    func testRespondsToState() {
         let repo = MockErrorBannerStateRepository(state: nil)
         let errorBannerVM = ErrorBannerViewModel(
             errorRepository: repo,
@@ -53,7 +53,7 @@ final class ErrorBannerTests: XCTestCase {
         wait(for: [callsAction], timeout: 1)
     }
 
-    @MainActor func testWhenNetworkError() throws {
+    @MainActor func testWhenNetworkError() {
         let sut = ErrorBanner(MockErrorBannerViewModel(initialState: .init(loadingWhenPredictionsStale: false,
                                                                            errorState: .NetworkError())))
 
@@ -66,7 +66,7 @@ final class ErrorBannerTests: XCTestCase {
         wait(for: [showedError], timeout: 1)
     }
 
-    @MainActor func testWhenDataError() throws {
+    @MainActor func testWhenDataError() {
         let sut = ErrorBanner(MockErrorBannerViewModel(initialState: .init(loadingWhenPredictionsStale: false,
                                                                            errorState: .DataError(messages: [],
                                                                                                   details: [],
@@ -81,7 +81,7 @@ final class ErrorBannerTests: XCTestCase {
         wait(for: [showedError], timeout: 1)
     }
 
-    @MainActor func testLoadingWhenPredictionsStale() throws {
+    @MainActor func testLoadingWhenPredictionsStale() {
         let sut = ErrorBanner(MockErrorBannerViewModel(initialState: .init(loadingWhenPredictionsStale: true,
                                                                            errorState: .StalePredictions(
                                                                                lastUpdated: Date.distantPast
diff --git a/iosApp/iosAppTests/Views/HomeMapViewTests.swift b/iosApp/iosAppTests/Views/HomeMapViewTests.swift
index 08ff850aeb..7c1be92dea 100644
--- a/iosApp/iosAppTests/Views/HomeMapViewTests.swift
+++ b/iosApp/iosAppTests/Views/HomeMapViewTests.swift
@@ -45,7 +45,7 @@ final class HomeMapViewTests: XCTestCase {
         }
     }
 
-    @MainActor func testAppears() throws {
+    @MainActor func testAppears() {
         let viewportProvider: ViewportProvider = .init(viewport: .followPuck(zoom: 1))
         let sheetHeight: Binding<CGFloat> = .constant(100)
 
@@ -67,7 +67,7 @@ final class HomeMapViewTests: XCTestCase {
         wait(for: [exp], timeout: 2)
     }
 
-    func testNoLocationDefaultCenter() throws {
+    func testNoLocationDefaultCenter() {
         let locationDataManager: LocationDataManager = .init(locationFetcher: MockLocationFetcher())
         let sut = HomeMapView(
             contentVM: .init(),
@@ -82,8 +82,8 @@ final class HomeMapViewTests: XCTestCase {
         XCTAssertEqual(sut.viewportProvider.viewport.camera?.center, ViewportProvider.Defaults.center)
     }
 
-    // Test is ignored in the test plan
-    func testFollowsPuckWhenUserLocationIsKnown() throws {
+    /// Test is ignored in the test plan
+    func testFollowsPuckWhenUserLocationIsKnown() {
         let locationFetcher = MockLocationFetcher()
         locationFetcher.authorizationStatus = .authorizedAlways
 
@@ -180,9 +180,9 @@ final class HomeMapViewTests: XCTestCase {
         let routeCardDataVM = MockRouteCardDataViewModel(initialState: .init(data: routeCardData))
         let nearbyVM: NearbyViewModel = .init(routeCardData: routeCardData)
 
-        let initialNav: SheetNavigationStackEntry = .stopDetails(
+        let initialNav: SheetNavigationStackEntry = try .stopDetails(
             stopId: stop.id,
-            stopFilter: .init(routeId: vehicle.routeId!, directionId: vehicle.directionId),
+            stopFilter: .init(routeId: XCTUnwrap(vehicle.routeId), directionId: vehicle.directionId),
             tripFilter: nil
         )
         nearbyVM.navigationStack = [initialNav]
@@ -223,7 +223,7 @@ final class HomeMapViewTests: XCTestCase {
         }
     }
 
-    func testUpdatesViewportOnCameraChangeBeforeLayersLoad() throws {
+    func testUpdatesViewportOnCameraChangeBeforeLayersLoad() {
         let updateCameraExpectation = XCTestExpectation(description: "updateCameraState called")
 
         class FakeViewportProvider: ViewportProvider {
diff --git a/iosApp/iosAppTests/Views/NonNilModifierTests.swift b/iosApp/iosAppTests/Views/NonNilModifierTests.swift
index db4007f59e..343f1b190a 100644
--- a/iosApp/iosAppTests/Views/NonNilModifierTests.swift
+++ b/iosApp/iosAppTests/Views/NonNilModifierTests.swift
@@ -43,8 +43,8 @@ final class NonNilModifierTests: XCTestCase {
         }
 
         let modifier = try sut.inspect().find(ViewType.Text.self).modifier(NonNilAboveModifier<String, Text>.self)
-        XCTAssertNotNil(try modifier.find(ViewType.VStack.self).first!.isAbsent)
-        XCTAssertNotNil(try modifier.find(ViewType.VStack.self).last!.viewModifierContent())
+        XCTAssertNotNil(try XCTUnwrap(try modifier.find(ViewType.VStack.self).first?.isAbsent))
+        XCTAssertNotNil(try XCTUnwrap(try modifier.find(ViewType.VStack.self).last?.viewModifierContent()))
         XCTAssertThrowsError(try modifier.find(text: "not nil content"))
     }
 
@@ -54,8 +54,8 @@ final class NonNilModifierTests: XCTestCase {
             Text("not nil content")
         }
         let modifier = try sut.inspect().find(ViewType.Text.self).modifier(NonNilAboveModifier<String, Text>.self)
-        XCTAssertNotNil(try modifier.find(ViewType.VStack.self).first!.text())
-        XCTAssertNotNil(try modifier.find(ViewType.VStack.self).last!.viewModifierContent())
+        XCTAssertNotNil(try XCTUnwrap(try modifier.find(ViewType.VStack.self).first?.text()))
+        XCTAssertNotNil(try XCTUnwrap(try modifier.find(ViewType.VStack.self).last?.viewModifierContent()))
         XCTAssertNotNil(try modifier.find(text: "not nil content"))
     }
 
@@ -65,8 +65,8 @@ final class NonNilModifierTests: XCTestCase {
             Text("not nil content")
         }
         let modifier = try sut.inspect().find(ViewType.Text.self).modifier(NonNilBelowModifier<String, Text>.self)
-        XCTAssertNotNil(try modifier.find(ViewType.VStack.self).first!.viewModifierContent())
-        XCTAssertNotNil(try modifier.find(ViewType.VStack.self).last!.isAbsent)
+        XCTAssertNotNil(try XCTUnwrap(try modifier.find(ViewType.VStack.self).first?.viewModifierContent()))
+        XCTAssertNotNil(try XCTUnwrap(try modifier.find(ViewType.VStack.self).last?.isAbsent))
         XCTAssertThrowsError(try modifier.find(text: "not nil content"))
     }
 
@@ -76,8 +76,8 @@ final class NonNilModifierTests: XCTestCase {
             Text("not nil content")
         }
         let modifier = try sut.inspect().find(ViewType.Text.self).modifier(NonNilBelowModifier<String, Text>.self)
-        XCTAssertNotNil(try modifier.find(ViewType.VStack.self).first!.viewModifierContent())
-        XCTAssertNotNil(try modifier.find(ViewType.VStack.self).last!.text())
+        XCTAssertNotNil(try XCTUnwrap(try modifier.find(ViewType.VStack.self).first?.viewModifierContent()))
+        XCTAssertNotNil(try XCTUnwrap(try modifier.find(ViewType.VStack.self).last?.text()))
         XCTAssertNotNil(try modifier.find(text: "not nil content"))
     }
 }
diff --git a/iosApp/iosAppTests/Views/SaveFavoritesFlowTest.swift b/iosApp/iosAppTests/Views/SaveFavoritesFlowTest.swift
index c5742e493b..4d532d707d 100644
--- a/iosApp/iosAppTests/Views/SaveFavoritesFlowTest.swift
+++ b/iosApp/iosAppTests/Views/SaveFavoritesFlowTest.swift
@@ -6,9 +6,8 @@
 //  Copyright © 2025 MBTA. All rights reserved.
 //
 
-@testable import iosApp
-
 import Combine
+@testable import iosApp
 import Shared
 import SwiftUI
 import ViewInspector
@@ -75,7 +74,7 @@ final class SaveFavoritesFlowTest: XCTestCase {
     }
 
     @MainActor
-    func testFavoritingOnlyDirectionPresentsDialogWhenNonBus() throws {
+    func testFavoritingOnlyDirectionPresentsDialogWhenNonBus() {
         var updateFavoritesCalledFor: [RouteStopDirection: FavoriteSettings?] = [:]
 
         let sut = SaveFavoritesFlow(
@@ -100,7 +99,7 @@ final class SaveFavoritesFlowTest: XCTestCase {
         wait(for: [exp], timeout: 2)
     }
 
-    func testFavoritingOnlyDirectionSkipsDialogWhenBus() throws {
+    func testFavoritingOnlyDirectionSkipsDialogWhenBus() {
         var updateFavoritesCalledFor: [RouteStopDirection: FavoriteSettings?] = [:]
         let onCloseExp = XCTestExpectation(description: "On close called")
 
@@ -127,7 +126,7 @@ final class SaveFavoritesFlowTest: XCTestCase {
         XCTAssertEqual(updateFavoritesCalledFor, [.init(route: route.id, stop: stop.id, direction: 0): .init()])
     }
 
-    func testUnfavoritingOnlyDirectionUpdatesFavoritesWithoutDialog() throws {
+    func testUnfavoritingOnlyDirectionUpdatesFavoritesWithoutDialog() {
         var updateFavoritesCalledFor: [RouteStopDirection: FavoriteSettings?] = [:]
         let onCloseExp = XCTestExpectation(description: "On close called")
 
@@ -155,7 +154,7 @@ final class SaveFavoritesFlowTest: XCTestCase {
     }
 
     @MainActor
-    func testFavoritingWhenOnlyDirectionIsOppositePresentsDialog() throws {
+    func testFavoritingWhenOnlyDirectionIsOppositePresentsDialog() {
         let sut = SaveFavoritesFlow(
             lineOrRoute: line,
             stop: stop,
@@ -206,7 +205,7 @@ final class SaveFavoritesFlowTest: XCTestCase {
         try XCTAssertNotNil(sut.inspect().find(text: "This stop is drop-off only"))
     }
 
-    func testFavoritingDisplaysToast() throws {
+    func testFavoritingDisplaysToast() {
         var updateFavoritesCalledFor: [RouteStopDirection: FavoriteSettings?] = [:]
         let onToastExp = XCTestExpectation(description: "Toast displayed with expected text")
 
@@ -240,7 +239,7 @@ final class SaveFavoritesFlowTest: XCTestCase {
         XCTAssertEqual(updateFavoritesCalledFor, [.init(route: route.id, stop: stop.id, direction: 0): .init()])
     }
 
-    func testOpensSavePageWhenNotificationsFlagIsOnForSingleDirection() throws {
+    func testOpensSavePageWhenNotificationsFlagIsOnForSingleDirection() {
         let onCloseExp = XCTestExpectation(description: "On close called")
         let onPushNavExp = XCTestExpectation(description: "Navigation pushed")
         var pushedNav: SheetNavigationStackEntry?
@@ -275,7 +274,7 @@ final class SaveFavoritesFlowTest: XCTestCase {
     }
 
     @MainActor
-    func testOpensSavePageWhenNotificationsFlagIsOnForMultiDirection() throws {
+    func testOpensSavePageWhenNotificationsFlagIsOnForMultiDirection() {
         let onCloseExp = XCTestExpectation(description: "On close called")
         let onPushNavExp = XCTestExpectation(description: "Navigation pushed")
         var pushedNav: SheetNavigationStackEntry?
diff --git a/iosApp/iosAppTests/Views/SearchResultViewTests.swift b/iosApp/iosAppTests/Views/SearchResultViewTests.swift
index c8812af1f4..89ae40dfc0 100644
--- a/iosApp/iosAppTests/Views/SearchResultViewTests.swift
+++ b/iosApp/iosAppTests/Views/SearchResultViewTests.swift
@@ -37,7 +37,7 @@ final class SearchResultViewTests: XCTestCase {
         XCTAssertNotNil(try sut.inspect().view(SearchResultsView.self).find(LoadingResultsView.self))
     }
 
-    @MainActor func testQuerySet() throws {
+    @MainActor func testQuerySet() {
         let setQueryExp = expectation(description: "setQuery")
         let searchVM = MockSearchViewModel()
         searchVM.onSetQuery = { _ in setQueryExp.fulfill() }
diff --git a/iosApp/iosAppTests/Views/ToastViewTests.swift b/iosApp/iosAppTests/Views/ToastViewTests.swift
index f92f6fb796..e282b91bf4 100644
--- a/iosApp/iosAppTests/Views/ToastViewTests.swift
+++ b/iosApp/iosAppTests/Views/ToastViewTests.swift
@@ -7,7 +7,6 @@
 //
 
 import Foundation
-
 @testable import iosApp
 import Shared
 import SwiftUI
diff --git a/iosApp/iosAppTests/Views/WorldCupBlurbTests.swift b/iosApp/iosAppTests/Views/WorldCupBlurbTests.swift
index db966d310f..6ce8422342 100644
--- a/iosApp/iosAppTests/Views/WorldCupBlurbTests.swift
+++ b/iosApp/iosAppTests/Views/WorldCupBlurbTests.swift
@@ -7,7 +7,6 @@
 //
 
 import Foundation
-
 @testable import iosApp
 import Shared
 import SwiftUI
diff --git a/iosApp/iosAppUITests/IosAppUITests.swift b/iosApp/iosAppUITests/IosAppUITests.swift
index 041780fd13..60188d20b3 100644
--- a/iosApp/iosAppUITests/IosAppUITests.swift
+++ b/iosApp/iosAppUITests/IosAppUITests.swift
@@ -20,7 +20,7 @@ final class IosAppUITests: XCTestCase {
         continueAfterFailure = false
     }
 
-    func testLaunchPerformance() throws {
+    func testLaunchPerformance() {
         if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 7.0, *) {
             let opts = XCTMeasureOptions()
             opts.iterationCount = 1
diff --git a/iosApp/iosAppUITests/IosAppUITestsLaunchTests.swift b/iosApp/iosAppUITests/IosAppUITestsLaunchTests.swift
index e484d7e5c6..329dbee71d 100644
--- a/iosApp/iosAppUITests/IosAppUITestsLaunchTests.swift
+++ b/iosApp/iosAppUITests/IosAppUITestsLaunchTests.swift
@@ -17,7 +17,7 @@ final class IosAppUITestsLaunchTests: XCTestCase {
         continueAfterFailure = false
     }
 
-    func testLaunch() throws {
+    func testLaunch() {
         let app = XCUIApplication()
         app.activate()
         app.launch()
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
index 2d69e423c3..01c271d001 100644
--- a/shared/build.gradle.kts
+++ b/shared/build.gradle.kts
@@ -342,7 +342,7 @@ tasks.register<Download>("bomCycloneDxCliDownload") {
                 else -> throw IllegalStateException("can't download CycloneDX CLI for $it")
             }
         }
-    src("https://github.com/CycloneDX/cyclonedx-cli/releases/download/v0.29.1/cyclonedx-$os-$arch")
+    src("https://github.com/CycloneDX/cyclonedx-cli/releases/download/v0.32.0/cyclonedx-$os-$arch")
     dest(layout.buildDirectory.file("boms/cyclonedx-cli"))
     onlyIfModified(true)
     doLast { layout.buildDirectory.file("boms/cyclonedx-cli").get().asFile.setExecutable(true) }