         app.textFields["URLBar.urlText"].tap()
         app.textFields["URLBar.urlText"].typeText("bugzilla.mozilla.org\n")
         waitForValueContains(app.textFields["URLBar.urlText"], value: "bugzilla.mozilla.org")
-        app.buttons["URLBar.pageActionsButton"].tap()
+        app.buttons["HomeView.settingsButton"].tap()
         app.tables["Context Menu"].cells["icon_openwith_active"].tap()
         snapshot("14ShareMenu")
     }
 
     func test05SafariIntegration() {
+        dismissURLBarFocused()
         app.buttons["HomeView.settingsButton"].tap()
+        app.tables.cells["icon_settings"].tap()
         app.tables.switches["BlockerToggle.Safari"].tap()
         snapshot("15SafariIntegrationInstructions")
     }

class SnapshotTests: XCTestCase {

    let app = XCUIApplication()
    let testRunningFirstRun = ["test01Screenshots"]

    override func setUp() {
        super.setUp()

    }
    
    func test10CustomSearchEngines() {
        dismissURLBarFocused()
        app.buttons["HomeView.settingsButton"].tap()
        app.tables.cells["icon_settings"].tap()
        app.cells["SettingsViewController.searchCell"].tap()
        snapshot("20CustomSearchEngines")
    }

    func test11WebsiteView() {
        app.textFields.firstMatch.tap()
        app.textFields.firstMatch.typeText("bugzilla.mozilla.org")
        snapshot("04SearchFor")

        app.typeText("\n")
        waitForValueContains(app.textFields["URLBar.urlText"], value: "bugzilla.mozilla.org")
        snapshot("05EraseButton")

        app.buttons["URLBar.deleteButton"].tap()
        snapshot("07YourBrowsingHistoryHasBeenErased")
    }

//    Run it only for EN locales for now
//    func test12HomePageTipsCarrousel() {
//        dismissURLBarFocused()
//        snapshot("1stTip")
//        app.staticTexts["Select Add to Shortcuts from the Focus menu"].swipeLeft()
//        snapshot("2ndTip")
//        app.staticTexts["Site missing content or acting strange?"].swipeLeft()
//        snapshot("3rdTip")
//        app.staticTexts["Page Actions > Request Desktop Site"].swipeLeft()
//        snapshot("4thTip")
//        app.staticTexts["“Siri, open my favorite site.”"].swipeLeft()
//        snapshot("5thTip")
//        app.staticTexts["“Siri, erase my Firefox Focus session.”"].swipeLeft()
//        snapshot("6thTip")
//    }

    private func dismissURLBarFocused() {
        waitForExistence(app.buttons["URLBar.cancelButton"], timeout: 15)
        app.buttons["URLBar.cancelButton"].tap()
    }

    func waitForValueContains(_ element: XCUIElement, value: String, file: String = #file, line: UInt = #line) {
