fix streams drain control

[mkrzemien]

• Use new streams in original IntegrationTest
• Fix a bug in handling DrainControl in streams which results in IntegrationTest timeout.