Clean up some test code names