Unit test for NH-3589
Merge pull request #354 from rjperes/NH-3589

NH-3589 - Add tests