Cleaned up the tests.