Eliminated the need for domains in tests.