Cleans up some test code.