Some cleanup for the test suite.