Fixing integration tests so they work on the CI server