Clean up tests a bit