Revert to develop enrich_language module and test