fix i18n and tests