Refine test cases
Update test cases