Fixed equals in City model, adjusted DAO test