More i18n
fix tests