Merge "Properly delete temp files during run-test"