NH-3657
Added unit test
Merge pull request #297 from rjperes/NH-3657

NH-3657