Merge pull request #1726 from Kami/fix_integration_tests

Try fixing integration tests