Fixup more tests