PR fixup: fix tests