Merge test_queue clean up from 3.2.