Issue #3308288: Fix broken tests

Nejc Koporec requested to merge issue/purge-3308288:3308288-fix-broken-tests into 8.x-3.x Sep 08, 2022