Continue reworking on stream implementation.
Reenable cleanup on test.