Fix broken tests for resources & i18nService