EZP-20530: fixed failing the tests