added test folders in folders
added test combined foldersandfolder subfolder single files
Merge branch 'dev'