Make generated filenames different from target filenames.
Fix filenames to allow paralled testing.