Follow-up to #c2ef45c - now produce context for each test - no need to store