Issue #3392323: Fix failing tests

Jeroen Tubex requested to merge issue/pluginreference-3392323:3392323-fix-failing-tests into 3.0.x Oct 07, 2023