Moved to streams2 for sexy tests =3
Added fix for vanilla read