More functional tests and fixes for node.py