Add tests and fixup generic 'complex' Enrichment