fix: #3632617 Fix the failing 2.x tests

Jonathan Sacksickrequested to merge
issue/commerce-3632617:3632617-fix-the-failing into 8.x-2.x

Closes #3632617

Merge request reports