EHO-373 broken tests fix