More refining of tests.