Rename all the test output files to tree rather than pick, move the containing directory to a tree.expected-output and fix up the references in the test.
