Fixed regressions in unit tests related to i18n refactoring