Subhas | Added more unit test coverage