Adding cleanup to the test methods