Re-add accidentally-removed functional Tree tests
Tree: Minor formatting/comment/naming tweaks