Fixed soap
Added city map factory
Fixed tests