Refine some tests