renamed i18n resource locations, fixed Expression test