some simple cleanup in the tests