Cleanup, add utils for getting streams for unit tests