Zip postal code is being returned as city in test emails