Fix some CD test that need to be overriding ContextAsync instead of Context