Rip out old testing code that was inlined in threading.

Partially closes issue 9346. Thanks Brian Brazil for the patch.