Combine two independent tests for thread stress/cleanup.

For the bug fixed in #500.