Updated street & city tests