Cleaning up some test code.