Adding UnderscoreMappingResolver with test