Clean up some webdriver tests to hopefully fix intermittent problems.