[#33] Added scope and tests for city