Remove assumptions in test consumer and producer to allow for use in other tests.