Multimap test fixes, cleanup