EZP-20948: Fixed tests failing after rebasing

Were affected by https://github.com/ezsystems/ezpublish-kernel/pull/429.