Refining the tests