[PATCH conductor 8/8] Fix failing tests after i18n