Adding some stream wrapper tests and more wrapper cleanup