Add new tests, improve tree node
Add test