HSTJ-36: failed tests fixed