Updated unit tests to clean up after themselves.