fix test
make Streams generic