Started to clean up tests.