Folder debugging and test fixes.