Cleanup the test suite (just a little)