fixed tree and tree tests a little more