[SD-974] fixing the flake errors.