Incorporated feedback on stream tests.