Issue #3505391 by adamps: Fix problems arising from "Consolidate tests"

Adam Shepherdrequested to merge
issue/gift_aid-3505391:3505391-fix-problems-arising into 1.x

Closes #3505391

Merge request reports