Fixed cityTest error and other errors