fix test errors; move enrichment logic into the enrichers