Modified to be consistent with graph only based representation of NetworkPlan.  Tests now pass