updated NodeWrapper class and testing