[michael] Moved cleanup to own test file