[#71775660] add city to organizations and fix tests