Refine test cases