Fixed tests following HoloMap to Map renaming