PDI-10869: fix tests.