Added more unit test coverage