Updates for MultiMap changes and also add tests