Refine the tests