Nodes tests and improved Nodes