Added cleanup to tests