revison per Nathan's comments on ReqContext/testing, and use wait-for-condition