fix problematic tests related to multimap client