Add proper data structure to locations, map is causing issues with writing tests