Clean up multimap a bit, add test for it