fix regression in consumer
move Consumer test
return null if queue is empty