update test helpers to use stream
update tests