Added more things on i18n and tests