streaming tests refactoring and prep for multiple downstream testing