Clean up tests and remove all sorts of nonsense that didn't belong