* Fixing stream unit tests