Merged some changes to WebTestBase into BrowserTestBase