cleanup of tests... pushing context for subqueries