Request an unbounded stream (#344)
Tidy tests up