Add some more tests and make sure no java collections are returned by MultiMap