move org lookups out of test_queue