PR fixup: improve unit test