ES-149 final ClusterTest fix
ES-149 final ClusterTest fix