Add getFieldsWithMap tests