Test tweaks
Some node implementations (not all complete)