make cpplint happier
move EmptyChild to Node
Correctly reconciled nodes and tidy up tests