Simplify webdriver tests