Update test_threading with a couple changes from trunk that got lost due, I

presume, to merge conflicts.