City module completed with tests