Add cleanup to test