Changed constructor to organize the data when creating the Map
Created test for constructor