- Change Stream class name
- Add stream Test