Revert "Started to separate streaming for unit test fakes"

This reverts commit 708c285e7ffd8654995712f2a5e74adf800397ac.