Consumer Close test and edge case fixes