added more unit test cases.