Merge "Fixing so-csit-integration tests"