Revert "Revert "Fixing integration test""

This reverts commit 64b411f624194d8b365cae7fc77c0539097a30e5.