Comment
Removed some 'dead' code
Improved mocked test coverage