More cleanup on the tests.