doing some clean up in the test suite