Adding more unit test cases