Clean up some test code.