Small corrections.
Minor corrections.
Adding tests for Stream that do not pass yet.