EHO-431 fixed brittle tests