Added more unit tests

Added more unit tests to increase test coverage