More tests
Cleanup in code...