Fix failing integration tests
Merge pull request #2097 from guardian/fix-integration-tests

Fix failing integration tests