Remove ConsumeOnClose and add test