Change streaming to use DeferredQueue

It seems that our test dataset only has 2 items.