Fixup tests I broke