Better tests and functionality for ThreadQueue spikes.
Merged fixes of post-big-reorg