Stream integration tests: fix review comments