Added more structure to the map file and added automated testing for the map.