ES-149 ClusterTest fix