Remove leftover methods from subclass
Update test to make order of return values explicit

This seems to be more stable in rspec than giving #and_yield multiple
times.
Refactor HTTP streaming to reuse base implementations