* fix main stream * update unit tests --------- Co-authored-by: mertalev <101130780+mertalev@users.noreply.github.com>