Revert "Revert "Folder Test""

This reverts commit 3ab3b3298133c0f4b3ceed35e48ff8cee5c2d2cf.