Merge "Enforce test tree hierarchy in TestNode."