Fixed HierarchyTest