Issue #3280603: Fix tests in 8.x-1.x

Kirill Roskolii requested to merge issue/cloudflare-3280603:3280603-fix-tests into 8.x-1.x May 16, 2022