HH-41345 rename other part of source
HH-41345  fix tests