Fixed parenting test for nodes
Started on CPT finalizatioin
More finalization