Merge "Change tests to use a temporary dir for files."