Integration tests refactored
Merge branch 'integration_tests'