More tests
Cleanup