Work on test coverage
Increase test coverage