Clean up some leaks in the test suite