Fix
Add tests
Update node class
Update node class
Update tests