Rolled back changes to WebTestBase