Cleanup of integration test dependencies
Merge branch 'test-cleanup'