Refine tests