Tests for Folder, and some other work.