Fixup tests.