Context enrichment unit tests OK