integration tests
more integration tests
Merge branch 'master' into integration_tests