i18n fixes and tests