Merge pull request #405 from dwaltz/3.0.0-wip

tree unit test update
reverting dev