 
     // Smoketest
     func testPromptPassCodeUponReentry() {
-        navigator.goto(URLBarOpen)
-        navigator.back()
+        waitForExistence(app.textFields["url"], timeout: 5)
+        waitForExistence(app.buttons["urlBar-cancel"], timeout: 5)
+        navigator.performAction(Action.CloseURLBarOpen)        
+        navigator.nowAt(NewTabScreen)
         navigator.performAction(Action.SetPasscode)
         navigator.goto(SettingsScreen)
         navigator.performAction(Action.UnlockLoginsSettings)

    }

    func testChangedPasswordMustBeNew() {
        navigator.performAction(Action.SetPasscode)
        userState.newPasscode = "111111"


    }

    func testChangingIntervalResetsValidationTimer() {
        waitForExistence(app.textFields["url"], timeout: 5)
        navigator.performAction(Action.CloseURLBarOpen)
        navigator.nowAt(NewTabScreen)
        navigator.performAction(Action.SetPasscode)

        // Enter login, since the default is 'set immediately,' it will ask for passcode
