HH-38247  tests fix