Various updates.  Code refactoring and new test variants for add nodes