changet MultiMap and tests