Added some more tests around building a tree of files and subdirectories