Merge "tests: Clean up the temporary dirs post-run."