Cleanup and tests.