Changes to support WebTestCase