added #stream and tests, update rspec