Updated MapToRow/RowToMap test