Add context remove of fields to map_eqc test