Refactored tests.
Cleanup.