Clean up some testing nonsense