Created Tests for Stream functionality and cleaned up stream implementations