Fix subfolder name of archives with single files

Archives which are not single folder should not suggest a subfolder name.
Otherwise archives which contain only a single file would report that file's
name as the subfolder name.

The archivetest is now updated to assert this.