Refactored and added streams support
Removed old tests due the new streams support