Started to separate streaming for unit test fakes