PR fixup: fix broken tests