Fixed test failing due to empty test class, fixed NPE when deconstructing NodeBranchPart