         if app.label == "Firefox Focus" {
             XCTAssert(app.staticTexts["Firefox Focus is not enabled."].exists)
             XCTAssert(app.staticTexts["Enable Firefox Focus"].exists)
-            app.navigationBars["Firefox_Focus.SafariInstructionsView"].buttons["Settings"].tap()
+            app.navigationBars.buttons.element(boundBy: 0).tap()
         } else {
             XCTAssert(app.staticTexts["Firefox Klar is not enabled."].exists)
             XCTAssert(app.staticTexts["Enable Firefox Klar"].exists)
-            app.navigationBars["Firefox_Klar.SafariInstructionsView"].buttons["Settings"].tap()
+            app.navigationBars.buttons.element(boundBy: 0).tap()
         }
         
-        // Swipe up
-        waitforExistence(element: app.tables.switches["BlockerToggle.BlockAds"])
-        app.tables.firstMatch.swipeUp()
+        XCTAssertEqual(app.tables.switches["BlockerToggle.BlockFonts"].value as! String, "0")
+        if app.label == "Firefox Focus" {
+            XCTAssertEqual(app.tables.switches["BlockerToggle.SendAnonymousUsageData"].value as! String, "1")
+        } else {
+            XCTAssertEqual(app.tables.switches["BlockerToggle.SendAnonymousUsageData"].value as! String, "0")
+        }
+        
+        // Check Tracking Protection Settings page
+        app.tables.firstMatch.swipeDown()
+        let trackingProtectionCell = app.cells["settingsViewController.trackingCell"]
+        waitforHittable(element: trackingProtectionCell)
+        trackingProtectionCell.tap()
         
         XCTAssertEqual(app.tables.switches["BlockerToggle.BlockAds"].value as! String, "1")
         XCTAssertEqual(app.tables.switches["BlockerToggle.BlockAnalytics"].value as! String, "1")
         XCTAssertEqual(app.tables.switches["BlockerToggle.BlockSocial"].value as! String, "1")
+        let otherContentSwitch = app.tables.switches["BlockerToggle.BlockOther"]
         XCTAssertEqual(otherContentSwitch.value as! String, "0")
-        XCTAssertEqual(app.tables.switches["BlockerToggle.BlockFonts"].value as! String, "0")
-        if app.label == "Firefox Focus" {
-            XCTAssertEqual(app.tables.switches["Send usage data"].value as! String, "1")
-        } else {
-            XCTAssertEqual(app.tables.switches["Send usage data"].value as! String, "0")
-        }
         
         otherContentSwitch.tap()
         let alertsQuery = app.alerts

        
        // Now back to Focus
        waitForWebPageLoad()
        app.buttons["ERASE"].tap()
        waitforExistence(element: app.staticTexts["Your browsing history has been erased."])
    }
    

        
        //Check the initial state of the switch values
        let safariSwitch = app.tables.switches["Safari"]
        
        XCTAssertEqual(safariSwitch.value as! String, "0")
        safariSwitch.tap()
