Fix up utils and node
Complete tests