             return success
         })
 
-        if BrowserUtils.iPad() {
-            EarlGrey.selectElement(with: grey_accessibilityLabel("Menu")).perform(grey_tap())
-            let settings_button = grey_allOf([grey_accessibilityLabel("Settings"),
-                                              grey_accessibilityID("menu-Settings")])
-            EarlGrey.selectElement(with: settings_button).perform(grey_tap())
-        } else {
-            let menu_button = grey_allOf([grey_accessibilityLabel("Menu"),
+        let menu_button = grey_allOf([grey_accessibilityLabel("Menu"),
                                           grey_accessibilityID("TabToolbar.menuButton")])
-            EarlGrey.selectElement(with: menu_button).perform(grey_tap())
-            EarlGrey.selectElement(with: grey_text("Settings")).perform(grey_tap())
-        }
+        EarlGrey.selectElement(with: menu_button).perform(grey_tap())
+        EarlGrey.selectElement(with: grey_text("Settings")).perform(grey_tap())
 
         let success = menuAppeared.wait(withTimeout: 20)
         GREYAssertTrue(success, reason: "Failed to display settings dialog")

        }

        if BrowserUtils.iPad() {
            EarlGrey.selectElement(with: grey_accessibilityLabel("Logins"))
                .using(searchAction: grey_scrollInDirection(.down, 200),
                       onElementWithMatcher: grey_accessibilityID("AppSettingsTableViewController.tableView"))
                .assert(grey_notNil())
        }
        EarlGrey.selectElement(with: grey_accessibilityLabel("Logins")).perform(grey_tap())

        tester().waitForView(withAccessibilityLabel: "a0@email.com, http://a0.com")
        tester().tapView(withAccessibilityLabel: "a0@email.com, http://a0.com")

        var passwordField = passwordCell.descriptionLabel

        tester().tapView(withAccessibilityLabel: "Next")
        tester().waitForAnimationsToFinish()
        tester().clearTextFromAndThenEnterText(intoCurrentFirstResponder: "")
        tester().tapView(withAccessibilityLabel: "Done")

