Cleaning up more tests.