splified the test cleanup process