Add more unit test cases