Adding some more changes to archieve 100% unit test coverage