Hierarchical Clusterer with test and bug fix