Add code coverage and unit tests
Add code coverage and unit tests