Further rearranging in SeleniumTest.java