Folder debugging and test fixes.
Merge pull request #662 from jcushman/dev-folder_debug

Folder debugging and test fixes.