support kmeans and hclust in htmap_ard_gf
add tests
other commits