Fixup broken tests