Updates to tests
WIP Tree
Updates to tree