NH-3404
Unit tests
Merge pull request #295 from rjperes/NH-3404

NH-3404