Refactor and tree extends node
Fixed tests and tree no longer extends node