Added new Error Enrichment and various unit tests.