Enrich container tests