improving the i18n
fixing the i18n tests