Cleanup the last use of our own thread tests stuff