Test reorg
Dead queues and detector refactoring