Changes to selenium_test and selenium_test_xvfb