task: #3620883 Make tests pass on 6.3.x

Liam Morlandrequested to merge
issue/webform-3620883:3620883-make-tests-pass into 6.3.x

Closes #3620883

Merge request reports