Change test file names

Change the temporary file names used by two tests to include the
test ID number, so we can see where they came from if left around.