Revert "Revert "FolderTesting""

This reverts commit 33e44701d42a34e0b338628affef946bb00edbb4.