added test combined foldersandfolder subfolder single files