Make tempdir clean test more robust

This test can leave behind broken state in testdata, which it wouldn't self-repair the next time you run it.

With these changes, we do do self-repair.