fix tests
Merge pull request #5931 from guardian/test-fixes

fix tests