Tweaks to the node moving functionality, passes tests