Added a value check on consumer side
re-added original queues, re-structured test