Fixex country tokenizer synonyms and regression tests