Can now combine maps. Updated unit tests