clean up the test suite a bit