Cleaned up tests.