[SD-1216] fixing flake errors.