diff --git a/.github/workflows/beta-deployment.yml b/.github/workflows/beta-deployment.yml
index 2f342621..7b8e00cb 100644
--- a/.github/workflows/beta-deployment.yml
+++ b/.github/workflows/beta-deployment.yml
@@ -18,14 +18,12 @@ jobs:
   buildandtest:
     name: Build and Test
     uses: ./.github/workflows/build-and-test.yml
-    secrets: inherit
   iosapptestflightdeployment:
     name: iOS App TestFlight Deployment
     needs: buildandtest
-    uses: CS342/.github/.github/workflows/xcodebuild-or-fastlane.yml@v1
+    uses: CS342/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2
     secrets: inherit
     with:
       artifactname: PAWS.xcresult
-      runsonlabels: '["macos-latest"]'
       fastlanelane: beta
       setupsigning: true
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 3ef53ad7..f05987ff 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -22,10 +22,10 @@ jobs:
     uses: StanfordBDHG/.github/.github/workflows/swiftlint.yml@v2
   buildandtest:
     name: Build and Test
-    uses: CS342/.github/.github/workflows/xcodebuild-or-fastlane.yml@v1
+    uses: CS342/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2
     with:
+      codeql: true
       artifactname: PAWS.xcresult
-      runsonlabels: '["macos-latest"]'
       setupfirebaseemulator: true
       customcommand: "firebase emulators:exec 'fastlane test'"
   uploadcoveragereport:
diff --git a/.swiftlint.yml b/.swiftlint.yml
index 9f4e076f..87c022c1 100644
--- a/.swiftlint.yml
+++ b/.swiftlint.yml
@@ -141,8 +141,6 @@ only_rules:
   - implicitly_unwrapped_optional
   # Identifiers should use inclusive language that avoids discrimination against groups of people based on race, gender, or socioeconomic status
   - inclusive_language
-  # If defer is at the end of its parent scope, it will be executed right where it is anyway.
-  - inert_defer
   # Prefer using Set.isDisjoint(with:) over Set.intersection(_:).isEmpty.
   - is_disjoint
   # Discouraged explicit usage of the default separator.
@@ -331,8 +329,6 @@ only_rules:
   - unowned_variable_capture
   # Catch statements should not declare error variables without type casting.
   - untyped_error_in_catch
-  # Unused reference in a capture list should be removed.
-  - unused_capture_list
   # Unused parameter in a closure should be replaced with _.
   - unused_closure_parameter
   # Unused control flow label should be removed.
@@ -373,6 +369,9 @@ only_rules:
   # The variable should be placed on the left, the constant on the right of a comparison operator.
   - yoda_condition
 
+attributes:
+  attributes_with_arguments_always_on_line_above: false
+
 deployment_target: # Availability checks or attributes shouldn’t be using older versions that are satisfied by the deployment target.
   iOSApplicationExtension_deployment_target: 16.0
   iOS_deployment_target: 16.0
@@ -380,6 +379,7 @@ deployment_target: # Availability checks or attributes shouldn’t be using olde
 excluded: # paths to ignore during linting. Takes precedence over `included`.
   - .build
   - .swiftpm
+  - .derivedData
 
 closure_body_length: # Closure bodies should not span too many lines.
   - 35 # warning - default: 20
diff --git a/PAWS.xcodeproj/project.pbxproj b/PAWS.xcodeproj/project.pbxproj
index a9aa59ca..a878c5b8 100644
--- a/PAWS.xcodeproj/project.pbxproj
+++ b/PAWS.xcodeproj/project.pbxproj
@@ -20,7 +20,6 @@
 		2F4E23812989C5930013F3D9 /* XCTHealthKit in Frameworks */ = {isa = PBXBuildFile; productRef = 2F4E23802989C5930013F3D9 /* XCTHealthKit */; };
 		2F4E23832989D51F0013F3D9 /* PAWSAppTestingSetup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F4E23822989D51F0013F3D9 /* PAWSAppTestingSetup.swift */; };
 		2F4E23872989DB360013F3D9 /* ContactsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F4E23862989DB360013F3D9 /* ContactsTests.swift */; };
-		2F4E23892989DB400013F3D9 /* HealthKitUploadTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F4E23882989DB400013F3D9 /* HealthKitUploadTests.swift */; };
 		2F59B93D298C628800C5107F /* PAWSContacts in Frameworks */ = {isa = PBXBuildFile; productRef = 2F59B93C298C628800C5107F /* PAWSContacts */; };
 		2F59B93F298C628800C5107F /* PAWSMockDataStorageProvider in Frameworks */ = {isa = PBXBuildFile; productRef = 2F59B93E298C628800C5107F /* PAWSMockDataStorageProvider */; };
 		2F59B941298C628800C5107F /* PAWSOnboardingFlow in Frameworks */ = {isa = PBXBuildFile; productRef = 2F59B940298C628800C5107F /* PAWSOnboardingFlow */; };
@@ -64,7 +63,6 @@
 		2F4E237D2989A2FE0013F3D9 /* OnboardingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingTests.swift; sourceTree = "<group>"; };
 		2F4E23822989D51F0013F3D9 /* PAWSAppTestingSetup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PAWSAppTestingSetup.swift; sourceTree = "<group>"; };
 		2F4E23862989DB360013F3D9 /* ContactsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactsTests.swift; sourceTree = "<group>"; };
-		2F4E23882989DB400013F3D9 /* HealthKitUploadTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HealthKitUploadTests.swift; sourceTree = "<group>"; };
 		2F5E32BC297E05EA003432F8 /* PAWSAppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PAWSAppDelegate.swift; sourceTree = "<group>"; };
 		2F9056D9299E1C97003D3802 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
 		2FAEC07F297F583900C11C42 /* PAWS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = PAWS.entitlements; sourceTree = "<group>"; };
@@ -185,7 +183,6 @@
 				2F4E237D2989A2FE0013F3D9 /* OnboardingTests.swift */,
 				2F4E23862989DB360013F3D9 /* ContactsTests.swift */,
 				2F36AD23299D93E200B1077C /* NotificationsTests.swift */,
-				2F4E23882989DB400013F3D9 /* HealthKitUploadTests.swift */,
 			);
 			path = PAWSUITests;
 			sourceTree = "<group>";
@@ -402,7 +399,6 @@
 			files = (
 				2F4E23872989DB360013F3D9 /* ContactsTests.swift in Sources */,
 				2F36AD24299D93E200B1077C /* NotificationsTests.swift in Sources */,
-				2F4E23892989DB400013F3D9 /* HealthKitUploadTests.swift in Sources */,
 				2F4E237E2989A2FE0013F3D9 /* OnboardingTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -423,7 +419,7 @@
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
-		2FE8D00A2A42722400A00A22 /* Test */ = {
+		2F82DB262A80C04F0029346E /* Test */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
@@ -483,7 +479,7 @@
 			};
 			name = Test;
 		};
-		2FE8D00B2A42722400A00A22 /* Test */ = {
+		2F82DB272A80C04F0029346E /* Test */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
@@ -529,7 +525,7 @@
 			};
 			name = Test;
 		};
-		2FE8D00C2A42722400A00A22 /* Test */ = {
+		2F82DB282A80C04F0029346E /* Test */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
@@ -549,7 +545,7 @@
 			};
 			name = Test;
 		};
-		2FE8D00D2A42722400A00A22 /* Test */ = {
+		2F82DB292A80C04F0029346E /* Test */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
@@ -861,7 +857,7 @@
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				653A256F28338800005D4D48 /* Debug */,
-				2FE8D00A2A42722400A00A22 /* Test */,
+				2F82DB262A80C04F0029346E /* Test */,
 				653A257028338800005D4D48 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
@@ -871,7 +867,7 @@
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				653A257228338800005D4D48 /* Debug */,
-				2FE8D00B2A42722400A00A22 /* Test */,
+				2F82DB272A80C04F0029346E /* Test */,
 				653A257328338800005D4D48 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
@@ -881,7 +877,7 @@
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				653A257528338800005D4D48 /* Debug */,
-				2FE8D00C2A42722400A00A22 /* Test */,
+				2F82DB282A80C04F0029346E /* Test */,
 				653A257628338800005D4D48 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
@@ -891,7 +887,7 @@
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				653A257828338800005D4D48 /* Debug */,
-				2FE8D00D2A42722400A00A22 /* Test */,
+				2F82DB292A80C04F0029346E /* Test */,
 				653A257928338800005D4D48 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
@@ -905,7 +901,7 @@
 			repositoryURL = "https://github.com/StanfordBDHG/XCTestExtensions";
 			requirement = {
 				kind = upToNextMinorVersion;
-				minimumVersion = 0.4.3;
+				minimumVersion = 0.4.6;
 			};
 		};
 		2F49B7742980407B00BCB272 /* XCRemoteSwiftPackageReference "CardinalKit" */ = {
@@ -921,7 +917,7 @@
 			repositoryURL = "https://github.com/StanfordBDHG/XCTHealthKit";
 			requirement = {
 				kind = upToNextMinorVersion;
-				minimumVersion = 0.3.3;
+				minimumVersion = 0.3.5;
 			};
 		};
 		2F9F4D8129B7FFAE00ABE259 /* XCRemoteSwiftPackageReference "CardinalKitHealthKitToFHIRAdapter" */ = {
diff --git a/PAWS.xcodeproj/xcshareddata/xcschemes/PAWS.xcscheme b/PAWS.xcodeproj/xcshareddata/xcschemes/PAWS.xcscheme
index 253ae20e..81291d56 100644
--- a/PAWS.xcodeproj/xcshareddata/xcschemes/PAWS.xcscheme
+++ b/PAWS.xcodeproj/xcshareddata/xcschemes/PAWS.xcscheme
@@ -6,6 +6,90 @@
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "PAWSLandingScreen"
+               BuildableName = "PAWSLandingScreen"
+               BlueprintName = "PAWSLandingScreen"
+               ReferencedContainer = "container:PAWSModules">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "PAWSMockDataStorageProvider"
+               BuildableName = "PAWSMockDataStorageProvider"
+               BlueprintName = "PAWSMockDataStorageProvider"
+               ReferencedContainer = "container:PAWSModules">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "PAWSSharedContext"
+               BuildableName = "PAWSSharedContext"
+               BlueprintName = "PAWSSharedContext"
+               ReferencedContainer = "container:PAWSModules">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "PAWSNotificationScreen"
+               BuildableName = "PAWSNotificationScreen"
+               BlueprintName = "PAWSNotificationScreen"
+               ReferencedContainer = "container:PAWSModules">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "PAWSContacts"
+               BuildableName = "PAWSContacts"
+               BlueprintName = "PAWSContacts"
+               ReferencedContainer = "container:PAWSModules">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "PAWSOnboardingFlow"
+               BuildableName = "PAWSOnboardingFlow"
+               BlueprintName = "PAWSOnboardingFlow"
+               ReferencedContainer = "container:PAWSModules">
+            </BuildableReference>
+         </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"
diff --git a/PAWS.xctestplan b/PAWS.xctestplan
index 388d2482..e46dee1e 100644
--- a/PAWS.xctestplan
+++ b/PAWS.xctestplan
@@ -9,6 +9,45 @@
     }
   ],
   "defaultOptions" : {
+    "codeCoverage" : {
+      "targets" : [
+        {
+          "containerPath" : "container:PAWS.xcodeproj",
+          "identifier" : "653A254C283387FE005D4D48",
+          "name" : "PAWS"
+        },
+        {
+          "containerPath" : "container:PAWSModules",
+          "identifier" : "PAWSContacts",
+          "name" : "PAWSContacts"
+        },
+        {
+          "containerPath" : "container:PAWSModules",
+          "identifier" : "PAWSLandingScreen",
+          "name" : "PAWSLandingScreen"
+        },
+        {
+          "containerPath" : "container:PAWSModules",
+          "identifier" : "PAWSMockDataStorageProvider",
+          "name" : "PAWSMockDataStorageProvider"
+        },
+        {
+          "containerPath" : "container:PAWSModules",
+          "identifier" : "PAWSNotificationScreen",
+          "name" : "PAWSNotificationScreen"
+        },
+        {
+          "containerPath" : "container:PAWSModules",
+          "identifier" : "PAWSOnboardingFlow",
+          "name" : "PAWSOnboardingFlow"
+        },
+        {
+          "containerPath" : "container:PAWSModules",
+          "identifier" : "PAWSSharedContext",
+          "name" : "PAWSSharedContext"
+        }
+      ]
+    },
     "targetForVariableExpansion" : {
       "containerPath" : "container:PAWS.xcodeproj",
       "identifier" : "653A254C283387FE005D4D48",
diff --git a/PAWSModules/Sources/PAWSMockDataStorageProvider/MockDataStorageProvider.swift b/PAWSModules/Sources/PAWSMockDataStorageProvider/MockDataStorageProvider.swift
index 6b855db4..091269f4 100644
--- a/PAWSModules/Sources/PAWSMockDataStorageProvider/MockDataStorageProvider.swift
+++ b/PAWSModules/Sources/PAWSMockDataStorageProvider/MockDataStorageProvider.swift
@@ -25,8 +25,7 @@ public actor MockDataStorageProvider: DataStorageProvider, ObservableObjectProvi
         encoder.outputFormatting = [.prettyPrinted, .sortedKeys, .withoutEscapingSlashes]
         return encoder
     }()
-    @MainActor @Published
-    private (set) var mockUploads: [MockUpload] = []
+    @MainActor @Published private (set) var mockUploads: [MockUpload] = []
     
     
     public init() { }
diff --git a/PAWSModules/Sources/PAWSOnboardingFlow/AccountSetup/AccountSetup.swift b/PAWSModules/Sources/PAWSOnboardingFlow/AccountSetup/AccountSetup.swift
index 468bb0b1..b07c76dd 100644
--- a/PAWSModules/Sources/PAWSOnboardingFlow/AccountSetup/AccountSetup.swift
+++ b/PAWSModules/Sources/PAWSOnboardingFlow/AccountSetup/AccountSetup.swift
@@ -72,8 +72,7 @@ struct AccountSetup: View {
             }
     }
     
-    @ViewBuilder
-    private var accountImage: some View {
+    @ViewBuilder private var accountImage: some View {
         Group {
             if account.signedIn {
                 backgroundGradient
@@ -93,8 +92,7 @@ struct AccountSetup: View {
             .foregroundColor(.accentColor)
     }
     
-    @ViewBuilder
-    private var accountDescription: some View {
+    @ViewBuilder private var accountDescription: some View {
         VStack {
             Group {
                 if account.signedIn {
@@ -112,8 +110,7 @@ struct AccountSetup: View {
         }
     }
     
-    @ViewBuilder
-    private var actionView: some View {
+    @ViewBuilder private var actionView: some View {
         if account.signedIn {
             OnboardingActionsView(
                 "ACCOUNT_NEXT".moduleLocalized,
diff --git a/PAWSModules/Sources/PAWSOnboardingFlow/AccountSetup/UserView.swift b/PAWSModules/Sources/PAWSOnboardingFlow/AccountSetup/UserView.swift
index 46eb250b..89abc2e7 100644
--- a/PAWSModules/Sources/PAWSOnboardingFlow/AccountSetup/UserView.swift
+++ b/PAWSModules/Sources/PAWSOnboardingFlow/AccountSetup/UserView.swift
@@ -29,8 +29,7 @@ struct UserView: View {
     }
     
     
-    @ViewBuilder
-    private var userInformation: some View {
+    @ViewBuilder private var userInformation: some View {
         HStack(spacing: 16) {
             if account.signedIn,
                let user = firebaseAccountConfiguration.user,
diff --git a/PAWSModules/Sources/PAWSOnboardingFlow/Resources/en.lproj/Localizable.strings b/PAWSModules/Sources/PAWSOnboardingFlow/Resources/en.lproj/Localizable.strings
index 747c52ae..b54998d7 100644
--- a/PAWSModules/Sources/PAWSOnboardingFlow/Resources/en.lproj/Localizable.strings
+++ b/PAWSModules/Sources/PAWSOnboardingFlow/Resources/en.lproj/Localizable.strings
@@ -77,7 +77,7 @@ reported symptoms, and any detected abnormalities. ";
 "HEALTHKIT_PERMISSIONS_BUTTON" = "Grant Access";
 
 // MARK: NOTIFICATIONS VIEW
-"ALLOW_NOTIFICATIONS_BUTTON" = "Allow notifications";
+"ALLOW_NOTIFICATIONS_BUTTON" = "Allow Notifications";
 "NOTIFICATION_SETUP_TITLE" = "Notifications";
 "NOTIFICATION_SETUP_SUBTITLE" = "Want to receive friendly reminders for the first week of the PAWS study? Choose your preferred time of day to receive notifications below and click allow.";
 
diff --git a/PAWSUITests/ContactsTests.swift b/PAWSUITests/ContactsTests.swift
index b7f7a4c7..791734a9 100644
--- a/PAWSUITests/ContactsTests.swift
+++ b/PAWSUITests/ContactsTests.swift
@@ -9,7 +9,7 @@
 import XCTest
 
 
-class ContactsTests: XCTestCase {
+class StudyInformationTests: XCTestCase {
     override func setUpWithError() throws {
         try super.setUpWithError()
         
@@ -21,16 +21,10 @@ class ContactsTests: XCTestCase {
     }
     
     
-    func testContacts() throws {
+    func testStudyInformation() throws {
         let app = XCUIApplication()
         
         XCTAssertTrue(app.tabBars["Tab Bar"].buttons["Study Information"].waitForExistence(timeout: 2))
         app.tabBars["Tab Bar"].buttons["Study Information"].tap()
-        
-        XCTAssertTrue(app.staticTexts["Scott Ceresnak"].waitForExistence(timeout: 2))
-        
-        app.swipeUp(velocity: .fast)
-        
-        XCTAssertTrue(app.staticTexts["Aydin Zahedivash"].waitForExistence(timeout: 2))
     }
 }
diff --git a/PAWSUITests/HealthKitUploadTests.swift b/PAWSUITests/HealthKitUploadTests.swift
deleted file mode 100644
index a90936a6..00000000
--- a/PAWSUITests/HealthKitUploadTests.swift
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// This source file is part of the CS342 2023 PAWS Team Application project
-//
-// SPDX-FileCopyrightText: 2023 Stanford University
-//
-// SPDX-License-Identifier: MIT
-//
-
-import XCTest
-import XCTestExtensions
-import XCTHealthKit
-
-
-class HealthKitUploadTests: XCTestCase {
-    override func setUpWithError() throws {
-        try super.setUpWithError()
-        
-        try disablePasswordAutofill()
-        
-        continueAfterFailure = false
-        
-        let app = XCUIApplication()
-        app.launchArguments = ["--showOnboarding"]
-        app.deleteAndLaunch(withSpringboardAppName: "PAWS")
-    }
-}
-
-extension XCUIApplication {
-    fileprivate func navigateToMockUpload() throws {
-        XCTAssertTrue(tabBars["Tab Bar"].buttons["Reports"].waitForExistence(timeout: 2))
-        tabBars["Tab Bar"].buttons["Reports"].tap()
-    }
-}
diff --git a/PAWSUITests/OnboardingTests.swift b/PAWSUITests/OnboardingTests.swift
index f393bf6b..1b4c2edd 100644
--- a/PAWSUITests/OnboardingTests.swift
+++ b/PAWSUITests/OnboardingTests.swift
@@ -30,7 +30,8 @@ class OnboardingTests: XCTestCase {
         
         try app.navigateOnboardingFlow(assertThatHealthKitConsentIsShown: true)
 
-        let tabBar = app.tabBars["Tab Bar"]
+        XCTAssertTrue(app.tabBars["Tab Bar"].waitForExistence(timeout: 2))
+        XCTAssertTrue(app.tabBars["Tab Bar"].isHittable)
     }
 }
 
@@ -50,6 +51,8 @@ extension XCUIApplication {
             try navigateOnboardingFlowConsent()
         }
         try navigateOnboardingAccount()
+        try healthKitPermissions()
+        try notificationPermissions()
     }
     
     private func navigateOnboardingGetStarted() throws {
@@ -84,14 +87,10 @@ extension XCUIApplication {
         swipeUp(velocity: .fast)
         
         XCTAssertTrue(staticTexts["First Name"].waitForExistence(timeout: 2))
-        staticTexts["First Name"].tap()
-        textFields["Enter your first name ..."].typeText("Leland")
+        try textFields["Enter your first name ..."].enter(value: "Leland")
         
         XCTAssertTrue(staticTexts["Last Name"].waitForExistence(timeout: 2))
-        staticTexts["Last Name"].tap()
-        textFields["Enter your last name ..."].typeText("Stanford")
-        
-        textFields["Enter your last name ..."].typeText("\n")
+        try textFields["Enter your last name ..."].enter(value: "Stanford")
         swipeUp()
         
         XCTAssertTrue(staticTexts["Leland Stanford"].waitForExistence(timeout: 2))
@@ -121,11 +120,9 @@ extension XCUIApplication {
         try textFields["Enter your email ..."].enter(value: "leland@stanford.edu")
         swipeUp()
         
-        secureTextFields["Enter your password ..."].tap()
-        secureTextFields["Enter your password ..."].typeText("StanfordRocks")
+        try secureTextFields["Enter your password ..."].enter(value: "StanfordRocks")
         swipeUp()
-        secureTextFields["Repeat your password ..."].tap()
-        secureTextFields["Repeat your password ..."].typeText("StanfordRocks")
+        try secureTextFields["Repeat your password ..."].enter(value: "StanfordRocks")
         swipeUp()
         
         try textFields["Enter your first name ..."].enter(value: "Leland")
@@ -134,27 +131,34 @@ extension XCUIApplication {
         try textFields["Enter your last name ..."].enter(value: "Stanford")
         staticTexts["Repeat\nPassword"].swipeUp()
         
+        XCTAssertTrue(collectionViews.buttons["Sign Up"].waitForExistence(timeout: 2))
         collectionViews.buttons["Sign Up"].tap()
         
-        sleep(3)
+        sleep(5)
+    }
+    
+    private func healthKitPermissions() throws {
+        XCTAssertTrue(buttons["Grant Access"].waitForExistence(timeout: 2))
+        buttons["Grant Access"].tap()
         
-        if staticTexts["HealthKit Access"].waitForExistence(timeout: 5) && navigationBars.buttons["Back"].waitForExistence(timeout: 5) {
-            navigationBars.buttons["Back"].tap()
-            
-            XCTAssertTrue(staticTexts["Leland Stanford"].waitForExistence(timeout: 2))
-            XCTAssertTrue(staticTexts["leland@stanford.edu"].waitForExistence(timeout: 2))
-            
-            XCTAssertTrue(scrollViews.otherElements.buttons["Next"].waitForExistence(timeout: 2))
-            scrollViews.otherElements.buttons["Next"].tap()
-        }
+        try handleHealthKitAuthorization()
     }
     
     private func notificationPermissions() throws {
-        XCTAssertTrue(staticTexts["Notifications"].waitForExistence(timeout: 2))
+        XCTAssertTrue(staticTexts["Notifications"].waitForExistence(timeout: 5))
         
         swipeUp()
         
         XCTAssertTrue(buttons["Allow Notifications"].waitForExistence(timeout: 2))
         buttons["Allow Notifications"].tap()
+        
+        
+        let springboard = XCUIApplication(bundleIdentifier: "com.apple.springboard")
+        let alertAllowButton = springboard.buttons["Allow"]
+        if alertAllowButton.waitForExistence(timeout: 5) {
+            alertAllowButton.tap()
+        } else {
+            print("Did not observe the notification permissions alert. Permissions might have already been provided.")
+        }
     }
 }