hyphenation -> langid in tests
Merged langid changes in tests into ms branch