GPII-177: Updated integration tests according to Yuras fixes