Changes and more test with streams