Consumer cleanup in tests

[sobychacko]

    So this reminders me, in all of the consumer tests we close/stop/cleanup at the end of a **successful** test - but not during a failed one. 

I don't think we need to fix that in this PR, but do you mind adding an issue for us to cleanup properly so we don't forget to come back to this?

Originally posted by @onobc in #162 (comment)

[sobychacko]

Closing this issue as this is not critical, and we are cleaning up many such tests.