Added stream-based test