added include subfolders and tags test