Added city entity
Fixed tests