Added slightly more support for tests.