Add HPtest and crit clusters.