More temp file testsuite cleanup