NH-3727 unit tests showing bug and bugfix proposition