beef up testing for legacy format and file names