Clean up some of the test code.