Extract to new class Stream
Extract Stream class tests