Added additional cleanup to tests.