Nodes tests and improved Nodes
Nodes and tests