For ENG-5962, fix test bugs caused by network fast path