Intermediate clean-up of tests to appease jenkins