Issue #2280501 by alexpott: Fixed Ensure web tests are encapsulated.