Fixing integration tests regressions