Es-149 final ClusterTest fix