Added missing file and dir cleanup to generic file test 20b.