Cleanup in testsuites