fix problematic tests related to multimap client
organize imports
fix compilation error
Merge pull request #2183 from eminn/fix/MultiMapProblematicTests

fix problematic tests related to multimap client