JCLOUDS-417: Remove ConsumeOnClose and add test