More refinement of tests.