Fixup tests now