More defensive StepScope schlepping in tests