Refactor node parent/child structure; begin updating tests