Added unit test coverage