Better test coverage for the tree along with a small change to the options returned to the dataSource
Merge pull request #747 from dwaltz/master

Better test coverage for the tree +