NH-2140 and unit tests