JUnit setup; fixed addNode special cases