Add timeout to stream with testing

Fixes Issue #1803
Fix styling issues with add timeout to stream with testing
Merge pull request #1935 from cjstapleton/master

Add timeout to stream with testing