EZP-20948: fixed integration tests