Clean up the tests a little so what they do is clear.