Refine queues
Increase tests timeout