Selenium tests refactored