Correcting stream tests.
Small corrections for Stream
Stream: more optimal upstream handling.