simpler and fuller regexp for matching archive file names, added test