US586: AT review, removed use of WebDriver