Improve tree
Add new unit test, improve tree node