Added code coverage
Added tests