Make sure AddQueue message is played on init so that we  consume
from the queue on re-start
Add a test consumer, re-factor test publisher to support this