Fixup test failures