Some work on restructuring Node and testing