NH-3659 and unit tests