changed city and its tests, now the use of it is more handy