More fixup for tests.