dont use mock for producer
Get rid of most of the mocks in ConsumerTest
Merge branch 'master' into acknowledge