Added i18n dictionaries + Fixed tests.