Cleanup
Improved test coverage