Fix issues with streaming test cases after yarn branch merge

This is an attempt to isolate and resolve issues which surfaced with streaming testcases after yarn branch merge.