Clean up some test nastiness