Cleanup
Extending test coverage