Revert "Fix integration tests"

This reverts commit c1528a891be449e36a172353e2c8b773f635dc23.
Fix integration tests v2
Fix integration tests v2