Merge pull request #2694 from shykes/separate-integration-tests

Separate integration tests