Cleanup some testing code