Added more unit test cases