Fix tests based on enrich_language refactoring