Trash
Update tests
Update node class