Improve tree node
Add new unit tests