Cleaned up tests.
Cleaned up tests.