Added more unit tests to increase code coverage