GDS-1183 Messaging tests: Modify closing of consumers