Fixup of tests.