Fixed unit test and code to properly crawl through subfolders