Streams - testing and fixing bugs