Fix misc test failures stream and non-stream builds

What prompts this?