Move out the queue logic
That guard file keeps catching my eye
Moving some queue tests