Fixup tests