more tests should work.
undone the clusterId <-> clusterName thingy.