Cleaning up some testing code