Issue #3310446: Fix failing tests

Stefanos Petrakis requested to merge issue/pagedesigner-3310446:3310446-fix-failing-tests-for-2.x-dev into 2.x Sep 19, 2022