Fixup the tests