KRACOEUS-8249 : Fix Integration Tests
Merge pull request #1173 from blackcathacker/test_fixes

KRACOEUS-8249 : Fix Integration Tests