NH-3670
Created additional tests with generic properties for NH-1796, NH-1039, NH-3571 and NH-2664
NH-3670
Added more unit tests
Added unit test