Move cluster-related unittest to cluster_unittest