More unit test cases