Issue #3240458: Fix broken tests

David Olah requested to merge issue/commerce_otpsp-3240458:3240458-fix-broken-tests into 8.x-2.x Oct 03, 2021