More cleanup of tests.