Updated unittes for ostream
Fixed istream wrapper