Refine test statements