Move some tiered spec functionality to Cluster.hs