Refine test suite