[FOLD] streams fixes
[FOLD] unit_test fixes