Adding some comments
Sync before EnrichContext
Adding some basic tests for context enrichment