added enrichment facility to context usage
moved source fac test constructors into implementation file
moved sink fac test constructors into implementation file