Added interface for map, fixed test.