Refine testcase again