Merge "Improve test for DictionaryService."