refactor cities spec to be much faster