Avoid vestigial files in test suite

test7.20 was always leaving vestigial batch output files and lacked
job time limits (which could leave vestigial jobs on test failure).

bug 6973