Fixup tests after 67002b0