added new test data and case handled incorrectly.
fixed wrong zipcode issue caused by middle tokens