fixed unit tests
Merge remote-tracking branch 'origin/otj' into otj

Conflicts:
	types/src/main/resources/addresses/abbrev_full.txt
	types/src/main/resources/addresses/city_abbrev.csv
	types/src/main/resources/addresses/city_nicknames.csv
	types/src/main/resources/addresses/country_code_fixes.csv
	types/src/main/resources/addresses/directions.csv
	types/src/main/resources/addresses/distance.txt
	types/src/main/resources/addresses/secondary_unit_designators.txt
	types/src/main/resources/addresses/state_codes.txt
	types/src/main/resources/addresses/street_suffixes.txt
	types/src/main/resources/addresses/zip3fix.csv