fix user dictionary and tests