Added city & init test