Clean up some uncollectable garbage in the test suite.