Finished off ClusterCoordinator and tests