Improved automated unit test coverage
Extended unit test coverage using mock