Add token in QueueItem.Ack + a few useless renaming in tests