I18N & tests fix