more cleanup of the test suite