Added folder support for a set of folders + tests