Change test-file names to be descriptive, avoid dups.