Further clean up tests.