[#102] added tests, simplified in_city scope