Added some tests and changed id to stream_id