Simplified the tests.