Remove ConsumeOnClose and add test

> Sorry, I don't know.

/cc @adriancole Ping..? ;-)