@webex/calling 3.11.0-webex-services-ready.1 → 3.12.0-llmrefactor.1

package/dist/CallingClient/calling/call.test.js

@@ -1,18 +1,24 @@
 "use strict";
 
 var _typeof = require("@babel/runtime-corejs2/helpers/typeof");
-var _WeakMap = require("@babel/runtime-corejs2/core-js/weak-map");
-var _Object$defineProperty = require("@babel/runtime-corejs2/core-js/object/define-property");
+var _Object$keys2 = require("@babel/runtime-corejs2/core-js/object/keys");
+var _Object$getOwnPropertySymbols = require("@babel/runtime-corejs2/core-js/object/get-own-property-symbols");
 var _Object$getOwnPropertyDescriptor = require("@babel/runtime-corejs2/core-js/object/get-own-property-descriptor");
+var _Object$getOwnPropertyDescriptors = require("@babel/runtime-corejs2/core-js/object/get-own-property-descriptors");
+var _Object$defineProperties = require("@babel/runtime-corejs2/core-js/object/define-properties");
+var _Object$defineProperty = require("@babel/runtime-corejs2/core-js/object/define-property");
+var _WeakMap = require("@babel/runtime-corejs2/core-js/weak-map");
 var _interopRequireDefault = require("@babel/runtime-corejs2/helpers/interopRequireDefault");
 var _regenerator = _interopRequireDefault(require("@babel/runtime-corejs2/regenerator"));
 var _keys = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/object/keys"));
 var _promise = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/promise"));
 var _now = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/date/now"));
 var _stringify = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/json/stringify"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/defineProperty"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/slicedToArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/asyncToGenerator"));
 var InternalMediaCoreModule = _interopRequireWildcard(require("@webex/internal-media-core"));
-var _webMediaEffects = require("@webex/web-media-effects");
+var _mediaHelpers = require("@webex/media-helpers");
 var _types = require("../../Errors/types");
 var _Utils = _interopRequireWildcard(require("../../common/Utils"));
 var Utils = _Utils;
@@ -27,11 +33,17 @@ var _callManager = require("./callManager");
 var _Logger = _interopRequireDefault(require("../../Logger"));
 var _Errors = require("../../Errors");
 var _constants2 = require("../../common/constants");
+var _request = require("../utils/request");
 function _interopRequireWildcard(e, t) { if ("function" == typeof _WeakMap) var r = new _WeakMap(), n = new _WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t2 in e) "default" !== _t2 && {}.hasOwnProperty.call(e, _t2) && ((i = (o = _Object$defineProperty) && _Object$getOwnPropertyDescriptor(e, _t2)) && (i.get || i.set) ? o(f, _t2, i) : f[_t2] = e[_t2]); return f; })(e, t); }
-/* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable dot-notation */
-/* eslint-disable @typescript-eslint/no-shadow */
-
+function ownKeys(e, r) { var t = _Object$keys2(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; } /* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable dot-notation */ /* eslint-disable @typescript-eslint/no-shadow */
+jest.mock('../../mobius-socket', function () {
+  return {
+    getMobiusSocketInstance: jest.fn().mockReturnValue({
+      sendWssRequest: jest.fn()
+    })
+  };
+});
 jest.mock('@webex/internal-media-core');
 var uploadLogsSpy = jest.spyOn(Utils, 'uploadLogs').mockResolvedValue(undefined);
 var webex = (0, _testUtil.getTestUtilsWebex)();
@@ -116,6 +128,11 @@ describe('Call Tests', function () {
     webex.request = jest.fn();
   });
   beforeEach(function () {
+    _request.APIRequest.resetInstance();
+    _request.APIRequest.getInstance({
+      webex: webex,
+      isMobiusSocketEnabled: false
+    });
     callManager = (0, _callManager.getCallManager)(webex, defaultServiceIndicator);
   });
   it('create call object', function () {
@@ -428,10 +445,305 @@ describe('Call Tests', function () {
       }
     }, _callee8);
   })));
-  it('testing enabling/disabling the BNR on an active call', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee9() {
-    var mockStream, localAudioStream, onStreamSpy, onEffectSpy, offStreamSpy, offEffectSpy, call, updateLocalTracksSpy, bnrMetricSpy;
+  it('registers and unregisters media connection listeners with stable handlers', function () {
+    var mockStream = {
+      outputStream: {
+        getAudioTracks: jest.fn().mockReturnValue([mockTrack])
+      },
+      on: jest.fn(),
+      getEffectByKind: jest.fn().mockReturnValue(undefined)
+    };
+    var localAudioStream = mockStream;
+    var call = (0, _call.createCall)(activeUrl, webex, _types3.CallDirection.OUTBOUND, deviceId, mockLineId, deleteCallFromCollection, defaultServiceIndicator, dest);
+    call.dial(localAudioStream);
+    var mediaOnMock = call['mediaConnection'].on;
+    var mediaOffSpy = jest.spyOn(call['mediaConnection'], 'off');
+    expect(mediaOnMock).toBeCalledWith(InternalMediaCoreModule.MediaConnectionEventNames.ROAP_MESSAGE_TO_SEND, expect.any(Function));
+    expect(mediaOnMock).toBeCalledWith(InternalMediaCoreModule.MediaConnectionEventNames.ROAP_FAILURE, expect.any(Function));
+    expect(mediaOnMock).toBeCalledWith(InternalMediaCoreModule.MediaConnectionEventNames.REMOTE_TRACK_ADDED, expect.any(Function));
+    expect(mediaOnMock).toBeCalledWith(InternalMediaCoreModule.MediaConnectionEventNames.ICE_GATHERING_STATE_CHANGED, expect.any(Function));
+    expect(mediaOnMock).toBeCalledWith(InternalMediaCoreModule.MediaConnectionEventNames.PEER_CONNECTION_STATE_CHANGED, expect.any(Function));
+    expect(mediaOnMock).toBeCalledWith(InternalMediaCoreModule.MediaConnectionEventNames.ICE_CONNECTION_STATE_CHANGED, expect.any(Function));
+    expect(mediaOnMock).toBeCalledWith(InternalMediaCoreModule.MediaConnectionEventNames.ICE_CANDIDATE_ERROR, expect.any(Function));
+    call['unregisterMediaConnectionListeners']();
+    expect(mediaOffSpy).toBeCalledWith(InternalMediaCoreModule.MediaConnectionEventNames.ROAP_MESSAGE_TO_SEND, expect.any(Function));
+    expect(mediaOffSpy).toBeCalledWith(InternalMediaCoreModule.MediaConnectionEventNames.ROAP_FAILURE, expect.any(Function));
+    expect(mediaOffSpy).toBeCalledWith(InternalMediaCoreModule.MediaConnectionEventNames.REMOTE_TRACK_ADDED, expect.any(Function));
+    expect(mediaOffSpy).toBeCalledWith(InternalMediaCoreModule.MediaConnectionEventNames.ICE_GATHERING_STATE_CHANGED, expect.any(Function));
+    expect(mediaOffSpy).toBeCalledWith(InternalMediaCoreModule.MediaConnectionEventNames.PEER_CONNECTION_STATE_CHANGED, expect.any(Function));
+    expect(mediaOffSpy).toBeCalledWith(InternalMediaCoreModule.MediaConnectionEventNames.ICE_CONNECTION_STATE_CHANGED, expect.any(Function));
+    expect(mediaOffSpy).toBeCalledWith(InternalMediaCoreModule.MediaConnectionEventNames.ICE_CANDIDATE_ERROR, expect.any(Function));
+  });
+  it('handles ICE listener payloads and submits metrics with event names', function () {
+    var mockStream = {
+      outputStream: {
+        getAudioTracks: jest.fn().mockReturnValue([mockTrack])
+      },
+      on: jest.fn(),
+      getEffectByKind: jest.fn().mockReturnValue(undefined)
+    };
+    var localAudioStream = mockStream;
+    var call = (0, _call.createCall)(activeUrl, webex, _types3.CallDirection.OUTBOUND, deviceId, mockLineId, deleteCallFromCollection, defaultServiceIndicator, dest);
+    call.dial(localAudioStream);
+    var metricSpy = jest.spyOn(call['metricManager'], 'submitMediaMetric');
+    var warnSpy = jest.spyOn(_Logger.default, 'warn');
+    var getHandlerForEvent = function getHandlerForEvent(eventName) {
+      var _mock$calls$find;
+      return (_mock$calls$find = call['mediaConnection'].on.mock.calls.find(function (_ref9) {
+        var _ref0 = (0, _slicedToArray2.default)(_ref9, 1),
+          name = _ref0[0];
+        return name === eventName;
+      })) === null || _mock$calls$find === void 0 ? void 0 : _mock$calls$find[1];
+    };
+    var iceGatheringHandler = getHandlerForEvent(InternalMediaCoreModule.MediaConnectionEventNames.ICE_GATHERING_STATE_CHANGED);
+    var peerConnectionHandler = getHandlerForEvent(InternalMediaCoreModule.MediaConnectionEventNames.PEER_CONNECTION_STATE_CHANGED);
+    var iceConnectionHandler = getHandlerForEvent(InternalMediaCoreModule.MediaConnectionEventNames.ICE_CONNECTION_STATE_CHANGED);
+    var iceCandidateErrorHandler = getHandlerForEvent(InternalMediaCoreModule.MediaConnectionEventNames.ICE_CANDIDATE_ERROR);
+    iceGatheringHandler({
+      iceGatheringState: 'gathering'
+    });
+    peerConnectionHandler({
+      connectionState: 'connected'
+    });
+    iceConnectionHandler({
+      iceConnectionState: 'completed'
+    });
+    iceCandidateErrorHandler({
+      errorCode: 701,
+      errorText: 'STUN host lookup failed',
+      url: 'stun:example.org:3478'
+    });
+    expect(metricSpy).toHaveBeenNthCalledWith(1, _types4.METRIC_EVENT.MEDIA, _types4.MEDIA_CONNECTION_ACTION.ICE_GATHERING_STATE_CHANGED, _types4.METRIC_TYPE.BEHAVIORAL, call.getCallId(), call.getCorrelationId(), undefined, undefined, 'gathering');
+    expect(metricSpy).toHaveBeenNthCalledWith(2, _types4.METRIC_EVENT.MEDIA, _types4.MEDIA_CONNECTION_ACTION.PEER_CONNECTION_STATE_CHANGED, _types4.METRIC_TYPE.BEHAVIORAL, call.getCallId(), call.getCorrelationId(), undefined, undefined, 'connected');
+    expect(metricSpy).toHaveBeenNthCalledWith(3, _types4.METRIC_EVENT.MEDIA, _types4.MEDIA_CONNECTION_ACTION.ICE_CONNECTION_STATE_CHANGED, _types4.METRIC_TYPE.BEHAVIORAL, call.getCallId(), call.getCorrelationId(), undefined, undefined, 'completed');
+    expect(metricSpy).toHaveBeenNthCalledWith(4, _types4.METRIC_EVENT.MEDIA_ERROR, _types4.MEDIA_CONNECTION_ACTION.ICE_CANDIDATE_ERROR, _types4.METRIC_TYPE.BEHAVIORAL, call.getCallId(), call.getCorrelationId(), undefined, undefined, undefined, expect.any(_Errors.CallError));
+    var mediaErrorCall = metricSpy.mock.calls[3];
+    expect(mediaErrorCall[mediaErrorCall.length - 1].getCallError().message).toBe('ICE candidate error occurred: {"address":null,"errorCode":701,"errorText":"STUN host lookup failed","port":null,"url":"stun:example.org:3478"}');
+    expect(warnSpy).toHaveBeenCalledWith('ICE candidate error occurred: {"address":null,"errorCode":701,"errorText":"STUN host lookup failed","port":null,"url":"stun:example.org:3478"}', {
+      file: 'call',
+      method: 'mediaIceEventsListener'
+    });
+  });
+  it('handles ROAP failure listener and submits media error metric', function () {
+    var _mock$calls$find2;
+    var mockStream = {
+      outputStream: {
+        getAudioTracks: jest.fn().mockReturnValue([mockTrack])
+      },
+      on: jest.fn(),
+      getEffectByKind: jest.fn().mockReturnValue(undefined)
+    };
+    var localAudioStream = mockStream;
+    var call = (0, _call.createCall)(activeUrl, webex, _types3.CallDirection.OUTBOUND, deviceId, mockLineId, deleteCallFromCollection, defaultServiceIndicator, dest);
+    call.dial(localAudioStream);
+    var metricSpy = jest.spyOn(call['metricManager'], 'submitMediaMetric');
+    var warnSpy = jest.spyOn(_Logger.default, 'warn');
+    var roapFailureHandler = (_mock$calls$find2 = call['mediaConnection'].on.mock.calls.find(function (_ref1) {
+      var _ref10 = (0, _slicedToArray2.default)(_ref1, 1),
+        name = _ref10[0];
+      return name === InternalMediaCoreModule.MediaConnectionEventNames.ROAP_FAILURE;
+    })) === null || _mock$calls$find2 === void 0 ? void 0 : _mock$calls$find2[1];
+    var roapFailure = new Error('Failed to process remote SDP');
+    roapFailureHandler(roapFailure);
+    expect(metricSpy).toHaveBeenCalledWith(_types4.METRIC_EVENT.MEDIA_ERROR, _types4.MEDIA_CONNECTION_ACTION.ROAP_FAILURE, _types4.METRIC_TYPE.BEHAVIORAL, call.getCallId(), call.getCorrelationId(), undefined, undefined, undefined, expect.any(_Errors.CallError));
+    var roapFailureMetricCall = metricSpy.mock.calls.find(function (_ref11) {
+      var _ref12 = (0, _slicedToArray2.default)(_ref11, 2),
+        name = _ref12[0],
+        metricAction = _ref12[1];
+      return name === _types4.METRIC_EVENT.MEDIA_ERROR && metricAction === _types4.MEDIA_CONNECTION_ACTION.ROAP_FAILURE;
+    });
+    expect(roapFailureMetricCall).toBeDefined();
+    expect((roapFailureMetricCall === null || roapFailureMetricCall === void 0 ? void 0 : roapFailureMetricCall[roapFailureMetricCall.length - 1]).getCallError().message).toBe('ROAP failure occurred: Failed to process remote SDP');
+    expect(warnSpy).toHaveBeenCalledWith('ROAP failure occurred: Failed to process remote SDP', {
+      file: 'call',
+      method: 'mediaRoapEventsListener'
+    });
+  });
+  it('sends connect before ROAP answer when inbound offer is delayed', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee9() {
+    var _mock$calls$find3;
+    var mockStream, localAudioStream, call, handleOutgoingCallConnectSpy, delayedOffer, sendCallStateMachineEvtSpy, sendMediaStateMachineEvtSpy, roapListener;
     return _regenerator.default.wrap(function (_context9) {
       while (1) switch (_context9.prev = _context9.next) {
+        case 0:
+          mockStream = {
+            outputStream: {
+              getAudioTracks: jest.fn().mockReturnValue([mockTrack])
+            },
+            on: jest.fn(),
+            getEffectByKind: jest.fn().mockImplementation(function () {
+              return mockEffect;
+            })
+          };
+          localAudioStream = mockStream;
+          call = (0, _call.createCall)(activeUrl, webex, _types3.CallDirection.INBOUND, deviceId, mockLineId, deleteCallFromCollection, defaultServiceIndicator, dest);
+          webex.request.mockReturnValue({
+            statusCode: 200,
+            body: {
+              callId: 'mock-call-id'
+            }
+          });
+          call.sendCallStateMachineEvt({
+            type: 'E_RECV_CALL_SETUP',
+            data: {
+              seq: 1,
+              messageType: 'OFFER'
+            }
+          });
+          expect(call['callStateMachine'].state.value).toBe('S_SEND_CALL_PROGRESS');
+          _context9.next = 1;
+          return call.answer(localAudioStream);
+        case 1:
+          expect(call['callStateMachine'].state.value).toBe('S_SEND_CALL_CONNECT');
+
+          // Connect is attempted by answer(), but is deferred because offer is not buffered yet.
+          handleOutgoingCallConnectSpy = jest.spyOn(call, 'handleOutgoingCallConnect');
+          expect(call['connectPending']).toBe(true);
+          expect(call['mediaConnection'].roapMessageReceived).not.toHaveBeenCalled();
+          delayedOffer = {
+            seq: 1,
+            messageType: 'OFFER',
+            sdp: 'v=0',
+            version: 1
+          };
+          call.sendMediaStateMachineEvt({
+            type: 'E_RECV_ROAP_OFFER',
+            data: delayedOffer
+          });
+          _context9.next = 2;
+          return (0, _testUtil.flushPromises)(2);
+        case 2:
+          expect(call['mediaConnection'].roapMessageReceived).toHaveBeenCalledWith(delayedOffer);
+          sendCallStateMachineEvtSpy = jest.spyOn(call, 'sendCallStateMachineEvt');
+          sendMediaStateMachineEvtSpy = jest.spyOn(call, 'sendMediaStateMachineEvt');
+          roapListener = (_mock$calls$find3 = call['mediaConnection'].on.mock.calls.find(function (_ref14) {
+            var _ref15 = (0, _slicedToArray2.default)(_ref14, 1),
+              eventName = _ref15[0];
+            return eventName === InternalMediaCoreModule.MediaConnectionEventNames.ROAP_MESSAGE_TO_SEND;
+          })) === null || _mock$calls$find3 === void 0 ? void 0 : _mock$calls$find3[1];
+          expect(roapListener).toBeDefined();
+          _context9.next = 3;
+          return roapListener({
+            roapMessage: {
+              messageType: 'ANSWER',
+              sdp: 'v=0',
+              seq: 1,
+              version: 2
+            }
+          });
+        case 3:
+          _context9.next = 4;
+          return (0, _testUtil.flushPromises)(2);
+        case 4:
+          // On ANSWER from media layer, connect is retried first, then ROAP answer is posted.
+          expect(sendCallStateMachineEvtSpy).toHaveBeenNthCalledWith(1, {
+            type: 'E_SEND_CALL_CONNECT'
+          });
+          expect(sendMediaStateMachineEvtSpy).toHaveBeenNthCalledWith(1, {
+            type: 'E_SEND_ROAP_ANSWER',
+            data: expect.objectContaining({
+              messageType: 'ANSWER'
+            })
+          });
+          expect(handleOutgoingCallConnectSpy).toHaveBeenCalled();
+          expect(call['mediaConnection'].roapMessageReceived).toHaveBeenLastCalledWith(delayedOffer);
+          expect(call['connectPending']).toBe(false);
+        case 5:
+        case "end":
+          return _context9.stop();
+      }
+    }, _callee9);
+  })));
+  var iceLiteOfferSdp = 'v=0\r\no=- 0 0 IN IP4 127.0.0.1\r\ns=-\r\nt=0 0\r\n' + 'a=ice-lite\r\nm=audio 19564 UDP/TLS/RTP/SAVPF 0\r\na=sendrecv\r\n';
+  var fullIceOfferSdp = 'v=0\r\no=- 0 0 IN IP4 127.0.0.1\r\ns=-\r\nt=0 0\r\n' + 'm=audio 19564 UDP/TLS/RTP/SAVPF 0\r\na=sendrecv\r\na=ice-ufrag:mLbW\r\n';
+  describe.each([{
+    name: 'reduced timeout when the offer is ice-lite and reduceTimeoutForIceLite is enabled',
+    sdp: iceLiteOfferSdp,
+    iceGatheringConfig: {
+      reduceTimeoutForIceLite: true
+    },
+    expectedTimeout: _constants.ICE_LITE_CANDIDATES_TIMEOUT
+  }, {
+    name: 'custom reduced timeout when the offer is ice-lite and iceLiteTimeout is overridden',
+    sdp: iceLiteOfferSdp,
+    iceGatheringConfig: {
+      reduceTimeoutForIceLite: true,
+      iceLiteTimeout: 750
+    },
+    expectedTimeout: 750
+  }, {
+    name: 'default timeout when the offer is ice-lite but reduceTimeoutForIceLite is disabled',
+    sdp: iceLiteOfferSdp,
+    iceGatheringConfig: {
+      reduceTimeoutForIceLite: false
+    },
+    expectedTimeout: _constants.ICE_CANDIDATES_TIMEOUT
+  }, {
+    name: 'default timeout when the offer is ice-lite but no iceGathering config is provided',
+    sdp: iceLiteOfferSdp,
+    iceGatheringConfig: undefined,
+    expectedTimeout: _constants.ICE_CANDIDATES_TIMEOUT
+  }, {
+    name: 'default timeout when reduceTimeoutForIceLite is enabled but the offer is not ice-lite',
+    sdp: fullIceOfferSdp,
+    iceGatheringConfig: {
+      reduceTimeoutForIceLite: true
+    },
+    expectedTimeout: _constants.ICE_CANDIDATES_TIMEOUT
+  }])('ICE candidates timeout selection', function (_ref16) {
+    var name = _ref16.name,
+      sdp = _ref16.sdp,
+      iceGatheringConfig = _ref16.iceGatheringConfig,
+      expectedTimeout = _ref16.expectedTimeout;
+    it("uses ".concat(name), /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee0() {
+      var mockStream, localAudioStream, call;
+      return _regenerator.default.wrap(function (_context0) {
+        while (1) switch (_context0.prev = _context0.next) {
+          case 0:
+            mockStream = {
+              outputStream: {
+                getAudioTracks: jest.fn().mockReturnValue([mockTrack])
+              },
+              on: jest.fn(),
+              getEffectByKind: jest.fn().mockImplementation(function () {
+                return mockEffect;
+              })
+            };
+            localAudioStream = mockStream;
+            call = (0, _call.createCall)(activeUrl, webex, _types3.CallDirection.INBOUND, deviceId, mockLineId, deleteCallFromCollection, defaultServiceIndicator, dest, iceGatheringConfig);
+            webex.request.mockReturnValue({
+              statusCode: 200,
+              body: {
+                callId: 'mock-call-id'
+              }
+            });
+
+            /* Buffer the remote offer before answering so it is available at media connection init. */
+            call.sendMediaStateMachineEvt({
+              type: 'E_RECV_ROAP_OFFER',
+              data: {
+                seq: 1,
+                messageType: 'OFFER',
+                version: 1,
+                sdp: sdp
+              }
+            });
+            _context0.next = 1;
+            return call.answer(localAudioStream);
+          case 1:
+            expect(mockInternalMediaCoreModule.RoapMediaConnection).toBeCalledOnceWith(_objectSpread(_objectSpread({}, roapMediaConnectionConfig), {}, {
+              iceCandidatesTimeout: expectedTimeout
+            }), roapMediaConnectionOptions, expect.any(String), expect.any(Function), expect.any(Function), expect.any(Function));
+          case 2:
+          case "end":
+            return _context0.stop();
+        }
+      }, _callee0);
+    })));
+  });
+  it('testing enabling/disabling the BNR on an active call', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee1() {
+    var mockStream, localAudioStream, onStreamSpy, onEffectSpy, offStreamSpy, offEffectSpy, call, updateLocalTracksSpy, bnrMetricSpy;
+    return _regenerator.default.wrap(function (_context1) {
+      while (1) switch (_context1.prev = _context1.next) {
         case 0:
           mockStream = {
             outputStream: {
@@ -463,8 +775,8 @@ describe('Call Tests', function () {
           bnrMetricSpy.mockClear();
           /* Invoking the callback function to trigger EffectAdded event to simulate adding effect to the stream */
           onStreamSpy.mock.calls[1][1](mockEffect);
-          expect(onEffectSpy).toBeCalledWith(_webMediaEffects.EffectEvent.Enabled, expect.any(Function));
-          expect(onEffectSpy).toBeCalledWith(_webMediaEffects.EffectEvent.Disabled, expect.any(Function));
+          expect(onEffectSpy).toBeCalledWith(_mediaHelpers.EffectEvent.Enabled, expect.any(Function));
+          expect(onEffectSpy).toBeCalledWith(_mediaHelpers.EffectEvent.Disabled, expect.any(Function));
 
           /* Send Enabled event on the effect, update track and send metrics for BNR disabled */
           onStreamSpy.mock.calls[0][1](mockTrack);
@@ -487,25 +799,43 @@ describe('Call Tests', function () {
           });
           expect(bnrMetricSpy).toBeCalledOnceWith(_types4.METRIC_EVENT.BNR_DISABLED, _types4.METRIC_TYPE.BEHAVIORAL, call.getCallId(), call.getCorrelationId());
           call.end();
-          _context9.next = 1;
+          _context1.next = 1;
           return (0, _Utils.waitForMsecs)(50);
         case 1:
           /* Checks for switching off the listeners on call disconnect */
           expect(offStreamSpy).toBeCalledTimes(2);
           expect(offStreamSpy).toBeCalledWith(InternalMediaCoreModule.LocalStreamEventNames.OutputTrackChange, expect.any(Function));
           expect(offStreamSpy).toBeCalledWith(InternalMediaCoreModule.LocalStreamEventNames.EffectAdded, expect.any(Function));
-          expect(offEffectSpy).toBeCalledWith(_webMediaEffects.EffectEvent.Enabled, expect.any(Function));
-          expect(offEffectSpy).toBeCalledWith(_webMediaEffects.EffectEvent.Disabled, expect.any(Function));
+          expect(offEffectSpy).toBeCalledWith(_mediaHelpers.EffectEvent.Enabled, expect.any(Function));
+          expect(offEffectSpy).toBeCalledWith(_mediaHelpers.EffectEvent.Disabled, expect.any(Function));
         case 2:
         case "end":
-          return _context9.stop();
+          return _context1.stop();
       }
-    }, _callee9);
+    }, _callee1);
   })));
-  it('answer fails if localAudioTrack is empty', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee0() {
+  it('does not register effect listeners when the added effect cannot be resolved', function () {
+    var mockStream = {
+      outputStream: {
+        getAudioTracks: jest.fn().mockReturnValue([mockTrack])
+      },
+      on: jest.fn(),
+      getEffectByKind: jest.fn().mockReturnValue(undefined)
+    };
+    var localAudioStream = mockStream;
+    var onStreamSpy = jest.spyOn(localAudioStream, 'on');
+    var onEffectSpy = jest.spyOn(mockEffect, 'on');
+    var call = (0, _call.createCall)(activeUrl, webex, _types3.CallDirection.OUTBOUND, deviceId, mockLineId, deleteCallFromCollection, defaultServiceIndicator, dest);
+    call.dial(localAudioStream);
+    expect(function () {
+      return onStreamSpy.mock.calls[1][1](undefined);
+    }).not.toThrow();
+    expect(onEffectSpy).not.toHaveBeenCalled();
+  });
+  it('answer fails if localAudioTrack is empty', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee10() {
     var mockStream, localAudioStream, warnSpy, call;
-    return _regenerator.default.wrap(function (_context0) {
-      while (1) switch (_context0.prev = _context0.next) {
+    return _regenerator.default.wrap(function (_context10) {
+      while (1) switch (_context10.prev = _context10.next) {
         case 0:
           mockStream = {
             outputStream: {
@@ -529,7 +859,7 @@ describe('Call Tests', function () {
           warnSpy = jest.spyOn(_Logger.default, 'warn');
           call = (0, _call.createCall)(activeUrl, webex, _types3.CallDirection.OUTBOUND, deviceId, mockLineId, deleteCallFromCollection, defaultServiceIndicator, dest);
           call.answer(localAudioStream);
-          _context0.next = 1;
+          _context10.next = 1;
           return (0, _Utils.waitForMsecs)(50);
         case 1:
           expect(warnSpy).toBeCalledTimes(2);
@@ -544,14 +874,14 @@ describe('Call Tests', function () {
           expect(webex.request.mock.calls[0][0].body.metrics).toStrictEqual(disconnectStats);
         case 2:
         case "end":
-          return _context0.stop();
+          return _context10.stop();
       }
-    }, _callee0);
+    }, _callee10);
   })));
-  it('dial fails if localAudioTrack is empty', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee1() {
+  it('dial fails if localAudioTrack is empty', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee11() {
     var mockStream, localAudioStream, warnSpy, call;
-    return _regenerator.default.wrap(function (_context1) {
-      while (1) switch (_context1.prev = _context1.next) {
+    return _regenerator.default.wrap(function (_context11) {
+      while (1) switch (_context11.prev = _context11.next) {
         case 0:
           mockStream = {
             outputStream: {
@@ -563,7 +893,7 @@ describe('Call Tests', function () {
           warnSpy = jest.spyOn(_Logger.default, 'warn');
           call = (0, _call.createCall)(activeUrl, webex, _types3.CallDirection.OUTBOUND, deviceId, mockLineId, deleteCallFromCollection, defaultServiceIndicator, dest);
           call.dial(localAudioStream);
-          _context1.next = 1;
+          _context11.next = 1;
           return (0, _Utils.waitForMsecs)(50);
         case 1:
           expect(warnSpy).toBeCalledTimes(1);
@@ -576,9 +906,9 @@ describe('Call Tests', function () {
           expect(webex.request).not.toBeCalledOnceWith();
         case 2:
         case "end":
-          return _context1.stop();
+          return _context11.stop();
       }
-    }, _callee1);
+    }, _callee11);
   })));
   it('update media after call creation with valid stream', function () {
     var callManager = (0, _callManager.getCallManager)(webex, defaultServiceIndicator);
@@ -652,10 +982,10 @@ describe('Call Tests', function () {
       method: 'dial'
     });
   });
-  it('test system mute and user mute different scnearios', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee10() {
+  it('test system mute and user mute different scnearios', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee12() {
     var logSpy, callManager, mockStream, localAudioStream, call;
-    return _regenerator.default.wrap(function (_context10) {
-      while (1) switch (_context10.prev = _context10.next) {
+    return _regenerator.default.wrap(function (_context12) {
+      while (1) switch (_context12.prev = _context12.next) {
         case 0:
           logSpy = jest.spyOn(_Logger.default, 'info');
           webex.request.mockReturnValue({
@@ -731,9 +1061,9 @@ describe('Call Tests', function () {
           expect(mockStream.setUserMuted).toBeCalledOnceWith(false);
         case 1:
         case "end":
-          return _context10.stop();
+          return _context12.stop();
       }
-    }, _callee10);
+    }, _callee12);
   })));
   describe('Guest Calling Flow Tests', function () {
     var dummyEvent = {
@@ -741,10 +1071,10 @@ describe('Call Tests', function () {
       data: undefined
     };
     var call;
-    it('outgoing call without guest calling must have callee', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee11() {
+    it('outgoing call without guest calling must have callee', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee13() {
       var requestSpy, requestArgs;
-      return _regenerator.default.wrap(function (_context11) {
-        while (1) switch (_context11.prev = _context11.next) {
+      return _regenerator.default.wrap(function (_context13) {
+        while (1) switch (_context13.prev = _context13.next) {
           case 0:
             call = new _call.Call(activeUrl, webex, _types3.CallDirection.OUTBOUND, deviceId, mockLineId, function () {
               // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -757,14 +1087,14 @@ describe('Call Tests', function () {
             expect('callee' in requestArgs.body).toBe(true);
           case 1:
           case "end":
-            return _context11.stop();
+            return _context13.stop();
         }
-      }, _callee11);
+      }, _callee13);
     })));
-    it('outgoing call for guest calling must not have callee', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee12() {
+    it('outgoing call for guest calling must not have callee', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee14() {
       var requestSpy, requestArgs;
-      return _regenerator.default.wrap(function (_context12) {
-        while (1) switch (_context12.prev = _context12.next) {
+      return _regenerator.default.wrap(function (_context14) {
+        while (1) switch (_context14.prev = _context14.next) {
           case 0:
             call = new _call.Call(activeUrl, webex, _types3.CallDirection.OUTBOUND, deviceId, mockLineId, function () {
               // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -777,9 +1107,9 @@ describe('Call Tests', function () {
             expect('callee' in requestArgs.body).toBe(false);
           case 1:
           case "end":
-            return _context12.stop();
+            return _context14.stop();
         }
-      }, _callee12);
+      }, _callee14);
     })));
   });
 });
@@ -799,6 +1129,11 @@ describe('State Machine handler tests', function () {
   var call;
   var dtmfMock;
   beforeEach(function () {
+    _request.APIRequest.resetInstance();
+    _request.APIRequest.getInstance({
+      webex: webex,
+      isMobiusSocketEnabled: false
+    });
     call = new _call.Call(activeUrl, webex, _types3.CallDirection.OUTBOUND, deviceId, mockLineId, function () {
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
       var dummy = 10;
@@ -812,10 +1147,10 @@ describe('State Machine handler tests', function () {
 
   // afterEach(() => call.removeAllListeners());
 
-  it('successful session refresh', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee13() {
+  it('successful session refresh', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee15() {
     var statusPayload, dummyEvent, funcSpy, logSpy;
-    return _regenerator.default.wrap(function (_context13) {
-      while (1) switch (_context13.prev = _context13.next) {
+    return _regenerator.default.wrap(function (_context15) {
+      while (1) switch (_context15.prev = _context15.next) {
         case 0:
           statusPayload = {
             statusCode: 200,
@@ -835,7 +1170,7 @@ describe('State Machine handler tests', function () {
           /* This is to flush all the promises from the Promise queue so that
            * Jest.fakeTimers can advance time and also clear the promise Queue
            */
-          _context13.next = 1;
+          _context15.next = 1;
           return (0, _testUtil.flushPromises)(3);
         case 1:
           expect(setInterval).toHaveBeenCalledTimes(1);
@@ -851,14 +1186,14 @@ describe('State Machine handler tests', function () {
           });
         case 2:
         case "end":
-          return _context13.stop();
+          return _context15.stop();
       }
-    }, _callee13);
+    }, _callee15);
   })));
-  it('session refresh 401 emits token error and ends the call', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee14() {
+  it('session refresh 401 emits token error and ends the call', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee16() {
     var statusPayload, emitSpy, funcSpy;
-    return _regenerator.default.wrap(function (_context14) {
-      while (1) switch (_context14.prev = _context14.next) {
+    return _regenerator.default.wrap(function (_context16) {
+      while (1) switch (_context16.prev = _context16.next) {
         case 0:
           expect.assertions(4);
           statusPayload = {
@@ -873,25 +1208,27 @@ describe('State Machine handler tests', function () {
           funcSpy = jest.spyOn(call, 'postStatus').mockRejectedValue(statusPayload);
           call['handleCallEstablished']({});
           jest.advanceTimersByTime(_constants.DEFAULT_SESSION_TIMER);
-          _context14.next = 1;
+          _context16.next = 1;
           return _promise.default.resolve();
         case 1:
-          _context14.next = 2;
+          _context16.next = 2;
           return _promise.default.resolve();
         case 2:
-          expect(clearInterval).toHaveBeenCalledTimes(1);
+          // clearInterval is called twice: once in scheduleCallKeepaliveInterval (at start)
+          // and once in handleCallKeepaliveError when clearing timer due to error
+          expect(clearInterval).toHaveBeenCalledTimes(2);
           expect(funcSpy).toBeCalledTimes(1);
           expect(emitSpy).toHaveBeenCalledWith(_types2.CALL_EVENT_KEYS.DISCONNECT, call.getCorrelationId());
         case 3:
         case "end":
-          return _context14.stop();
+          return _context16.stop();
       }
-    }, _callee14);
+    }, _callee16);
   })));
-  it('session refresh failure', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee15() {
+  it('session refresh failure', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee17() {
     var statusPayload, funcSpy;
-    return _regenerator.default.wrap(function (_context15) {
-      while (1) switch (_context15.prev = _context15.next) {
+    return _regenerator.default.wrap(function (_context17) {
+      while (1) switch (_context17.prev = _context17.next) {
         case 0:
           expect.assertions(4);
           statusPayload = {
@@ -910,21 +1247,23 @@ describe('State Machine handler tests', function () {
           /* This is to flush all the promises from the Promise queue so that
            * Jest.fakeTimers can advance time and also clear the promise Queue
            */
-          _context15.next = 1;
+          _context17.next = 1;
           return (0, _testUtil.flushPromises)(2);
         case 1:
-          expect(clearInterval).toHaveBeenCalledTimes(1);
+          // clearInterval is called twice: once in scheduleCallKeepaliveInterval (at start)
+          // and once in handleCallKeepaliveError when clearing timer due to error
+          expect(clearInterval).toHaveBeenCalledTimes(2);
           expect(funcSpy).toBeCalledTimes(1);
         case 2:
         case "end":
-          return _context15.stop();
+          return _context17.stop();
       }
-    }, _callee15);
+    }, _callee17);
   })));
-  it('session refresh 500 schedules retry via retry-after or default interval', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee16() {
+  it('session refresh 500 schedules retry via retry-after or default interval', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee18() {
     var errorPayload, okPayload, scheduleKeepaliveSpy, postStatusSpy;
-    return _regenerator.default.wrap(function (_context16) {
-      while (1) switch (_context16.prev = _context16.next) {
+    return _regenerator.default.wrap(function (_context18) {
+      while (1) switch (_context18.prev = _context18.next) {
         case 0:
           errorPayload = {
             statusCode: 500,
@@ -942,28 +1281,63 @@ describe('State Machine handler tests', function () {
             call['handleCallEstablished']({});
           }
           jest.advanceTimersByTime(_constants.DEFAULT_SESSION_TIMER);
-          _context16.next = 1;
+          _context18.next = 1;
           return (0, _testUtil.flushPromises)(2);
         case 1:
           expect(postStatusSpy).toHaveBeenCalledTimes(1);
 
           // Now advance by 1 second for the retry-after interval
           jest.advanceTimersByTime(1000);
-          _context16.next = 2;
+          _context18.next = 2;
           return (0, _testUtil.flushPromises)(2);
         case 2:
           expect(postStatusSpy).toHaveBeenCalledTimes(2);
           expect(scheduleKeepaliveSpy).toHaveBeenCalledTimes(2);
         case 3:
         case "end":
-          return _context16.stop();
+          return _context18.stop();
       }
-    }, _callee16);
+    }, _callee18);
+  })));
+  it('scheduleCallKeepaliveInterval clears existing interval before creating new one', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee19() {
+    var firstTimer, secondTimer;
+    return _regenerator.default.wrap(function (_context19) {
+      while (1) switch (_context19.prev = _context19.next) {
+        case 0:
+          jest.spyOn(global, 'setInterval');
+          jest.spyOn(global, 'clearInterval');
+
+          // Setup the first keepalive interval
+          call['handleCallEstablished']({});
+
+          // At this point, scheduleCallKeepaliveInterval was called once
+          // It should have called clearInterval once (at the start) and setInterval once
+          expect(clearInterval).toHaveBeenCalledTimes(1);
+          expect(setInterval).toHaveBeenCalledTimes(1);
+          firstTimer = call['sessionTimer'];
+          expect(firstTimer).toBeDefined();
+
+          // Manually call scheduleCallKeepaliveInterval again to simulate a retry scenario
+          call['scheduleCallKeepaliveInterval']();
+
+          // clearInterval should have been called again to clear the previous timer
+          expect(clearInterval).toHaveBeenCalledTimes(2);
+          // A new interval should have been created
+          expect(setInterval).toHaveBeenCalledTimes(2);
+
+          // The sessionTimer should be different (new timer)
+          secondTimer = call['sessionTimer'];
+          expect(secondTimer).toBeDefined();
+        case 1:
+        case "end":
+          return _context19.stop();
+      }
+    }, _callee19);
   })));
-  it('keepalive ends after reaching max retry count', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee17() {
+  it('keepalive ends after reaching max retry count', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee20() {
     var errorPayload, warnSpy, postStatusSpy;
-    return _regenerator.default.wrap(function (_context17) {
-      while (1) switch (_context17.prev = _context17.next) {
+    return _regenerator.default.wrap(function (_context20) {
+      while (1) switch (_context20.prev = _context20.next) {
         case 0:
           errorPayload = {
             statusCode: 500,
@@ -982,25 +1356,25 @@ describe('State Machine handler tests', function () {
 
           // Advance timer to trigger the first failure (uses DEFAULT_SESSION_TIMER)
           jest.advanceTimersByTime(_constants.DEFAULT_SESSION_TIMER);
-          _context17.next = 1;
+          _context20.next = 1;
           return (0, _testUtil.flushPromises)(2);
         case 1:
           // Now advance by 1 second for each of the 4 retry attempts (retry-after: 1 second each)
           // Need to do this separately to allow state machine to process and create new intervals
           jest.advanceTimersByTime(1000);
-          _context17.next = 2;
+          _context20.next = 2;
           return (0, _testUtil.flushPromises)(2);
         case 2:
           jest.advanceTimersByTime(1000);
-          _context17.next = 3;
+          _context20.next = 3;
           return (0, _testUtil.flushPromises)(2);
         case 3:
           jest.advanceTimersByTime(1000);
-          _context17.next = 4;
+          _context20.next = 4;
           return (0, _testUtil.flushPromises)(2);
         case 4:
           jest.advanceTimersByTime(1000);
-          _context17.next = 5;
+          _context20.next = 5;
           return (0, _testUtil.flushPromises)(2);
         case 5:
           // The error handler should detect we're at max retry count and stop
@@ -1012,14 +1386,14 @@ describe('State Machine handler tests', function () {
           expect(call['callKeepaliveRetryCount']).toBe(4);
         case 6:
         case "end":
-          return _context17.stop();
+          return _context20.stop();
       }
-    }, _callee17);
+    }, _callee20);
   })));
-  it('state changes during successful incoming call', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee18() {
+  it('state changes during successful incoming call', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee21() {
     var statusPayload, dummyEvent, postMediaSpy, deleteSpy, dummyOkEvent;
-    return _regenerator.default.wrap(function (_context18) {
-      while (1) switch (_context18.prev = _context18.next) {
+    return _regenerator.default.wrap(function (_context21) {
+      while (1) switch (_context21.prev = _context21.next) {
         case 0:
           statusPayload = {
             statusCode: 200,
@@ -1075,14 +1449,14 @@ describe('State Machine handler tests', function () {
           expect(call['callStateMachine'].state.value).toBe('S_RECV_CALL_DISCONNECT');
         case 1:
         case "end":
-          return _context18.stop();
+          return _context21.stop();
       }
-    }, _callee18);
+    }, _callee21);
   })));
-  it('state changes during unsuccessful incoming call due to no offer', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee19() {
+  it('state changes during unsuccessful incoming call due to no offer', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee22() {
     var statusPayload, dummyEvent;
-    return _regenerator.default.wrap(function (_context19) {
-      while (1) switch (_context19.prev = _context19.next) {
+    return _regenerator.default.wrap(function (_context22) {
+      while (1) switch (_context22.prev = _context22.next) {
         case 0:
           call['direction'] = _types3.CallDirection.INBOUND;
           statusPayload = {
@@ -1100,7 +1474,7 @@ describe('State Machine handler tests', function () {
           webex.request.mockReturnValue(statusPayload);
           call.sendCallStateMachineEvt(dummyEvent);
           expect(call['callStateMachine'].state.value).toBe('S_SEND_CALL_PROGRESS');
-          _context19.next = 1;
+          _context22.next = 1;
           return call['handleOutgoingCallConnect']({
             type: 'E_SEND_CALL_CONNECT'
           });
@@ -1114,14 +1488,14 @@ describe('State Machine handler tests', function () {
           expect(call['callStateMachine'].state.value).toBe('S_RECV_CALL_DISCONNECT');
         case 2:
         case "end":
-          return _context19.stop();
+          return _context22.stop();
       }
-    }, _callee19);
+    }, _callee22);
   })));
-  it('processes callerId on received progress event in established state without emitting PROGRESS', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee20() {
+  it('processes callerId on received progress event in established state without emitting PROGRESS', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee23() {
     var callManager, statusPayload, call, dummyEvent, dummyOkEvent, emitSpy, startCallerIdSpy, mobiusProgressEvent;
-    return _regenerator.default.wrap(function (_context20) {
-      while (1) switch (_context20.prev = _context20.next) {
+    return _regenerator.default.wrap(function (_context23) {
+      while (1) switch (_context23.prev = _context23.next) {
         case 0:
           callManager = (0, _callManager.getCallManager)(webex, defaultServiceIndicator);
           statusPayload = {
@@ -1215,14 +1589,14 @@ describe('State Machine handler tests', function () {
           expect(call.earlyMedia).not.toBe(true);
         case 1:
         case "end":
-          return _context20.stop();
+          return _context23.stop();
       }
-    }, _callee20);
+    }, _callee23);
   })));
-  it('state changes during unsuccessful incoming call due error in call connect', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee21() {
+  it('state changes during unsuccessful incoming call due error in call connect', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee24() {
     var warnSpy, errorSpy, stateMachineSpy, statusPayload, roapMessage;
-    return _regenerator.default.wrap(function (_context21) {
-      while (1) switch (_context21.prev = _context21.next) {
+    return _regenerator.default.wrap(function (_context24) {
+      while (1) switch (_context24.prev = _context24.next) {
         case 0:
           warnSpy = jest.spyOn(_Logger.default, 'warn');
           errorSpy = jest.spyOn(_Logger.default, 'error');
@@ -1249,7 +1623,7 @@ describe('State Machine handler tests', function () {
           webex.request.mockRejectedValueOnce({
             statusCode: 403
           }).mockResolvedValue(statusPayload);
-          _context21.next = 1;
+          _context24.next = 1;
           return call['handleOutgoingCallConnect']({
             type: 'E_SEND_CALL_CONNECT'
           });
@@ -1260,14 +1634,14 @@ describe('State Machine handler tests', function () {
           expect(errorSpy).toBeCalledTimes(1);
         case 2:
         case "end":
-          return _context21.stop();
+          return _context24.stop();
       }
-    }, _callee21);
+    }, _callee24);
   })));
-  it('state changes during successful outgoing call', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee22() {
+  it('state changes during successful outgoing call', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee25() {
     var statusPayload, dummyEvent, postMediaSpy, logSpy, dummyOkEvent;
-    return _regenerator.default.wrap(function (_context22) {
-      while (1) switch (_context22.prev = _context22.next) {
+    return _regenerator.default.wrap(function (_context25) {
+      while (1) switch (_context25.prev = _context25.next) {
         case 0:
           statusPayload = {
             statusCode: 200,
@@ -1343,14 +1717,14 @@ describe('State Machine handler tests', function () {
           expect(call['callStateMachine'].state.value).toBe('S_SEND_CALL_DISCONNECT');
         case 1:
         case "end":
-          return _context22.stop();
+          return _context25.stop();
       }
-    }, _callee22);
+    }, _callee25);
   })));
-  it('outgoing call where we receive connect directly after setup. Media established before connect. test call and media state changes', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee23() {
+  it('outgoing call where we receive connect directly after setup. Media established before connect. test call and media state changes', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee26() {
     var statusPayload, dummySetupEvent, dummyConnectEvent, dummyOfferEvent, dummyAnswerEvent, dummyOkEvent, postMediaSpy;
-    return _regenerator.default.wrap(function (_context23) {
-      while (1) switch (_context23.prev = _context23.next) {
+    return _regenerator.default.wrap(function (_context26) {
+      while (1) switch (_context26.prev = _context26.next) {
         case 0:
           statusPayload = {
             statusCode: 200,
@@ -1418,14 +1792,14 @@ describe('State Machine handler tests', function () {
           expect(call['callStateMachine'].state.value).toBe('S_SEND_CALL_DISCONNECT');
         case 1:
         case "end":
-          return _context23.stop();
+          return _context26.stop();
       }
-    }, _callee23);
+    }, _callee26);
   })));
-  it('state changes during successful outgoing call with early media', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee24() {
+  it('state changes during successful outgoing call with early media', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee27() {
     var statusPayload, dummyEvent;
-    return _regenerator.default.wrap(function (_context24) {
-      while (1) switch (_context24.prev = _context24.next) {
+    return _regenerator.default.wrap(function (_context27) {
+      while (1) switch (_context27.prev = _context27.next) {
         case 0:
           statusPayload = {
             statusCode: 200,
@@ -1464,14 +1838,14 @@ describe('State Machine handler tests', function () {
           expect(call['callStateMachine'].state.value).toBe('S_RECV_CALL_DISCONNECT');
         case 1:
         case "end":
-          return _context24.stop();
+          return _context27.stop();
       }
-    }, _callee24);
+    }, _callee27);
   })));
-  it('state changes during unsuccessful outgoing call due to error in call setup', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee25() {
+  it('state changes during unsuccessful outgoing call due to error in call setup', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee28() {
     var statusPayload, dummyEvent, errorSpy;
-    return _regenerator.default.wrap(function (_context25) {
-      while (1) switch (_context25.prev = _context25.next) {
+    return _regenerator.default.wrap(function (_context28) {
+      while (1) switch (_context28.prev = _context28.next) {
         case 0:
           statusPayload = {
             statusCode: 403,
@@ -1488,25 +1862,31 @@ describe('State Machine handler tests', function () {
           webex.request.mockRejectedValueOnce(statusPayload);
           errorSpy = jest.spyOn(_Logger.default, 'error');
           call.sendCallStateMachineEvt(dummyEvent);
-          _context25.next = 1;
+          _context28.next = 1;
           return (0, _testUtil.flushPromises)(3);
         case 1:
+          _context28.next = 2;
+          return _promise.default.resolve();
+        case 2:
+          _context28.next = 3;
+          return _promise.default.resolve();
+        case 3:
           expect(call['callStateMachine'].state.value).toBe('S_UNKNOWN');
           expect(errorSpy).toHaveBeenCalled();
           expect(uploadLogsSpy).toHaveBeenCalledWith({
             correlationId: call.getCorrelationId(),
             callId: call.getCallId()
           });
-        case 2:
+        case 4:
         case "end":
-          return _context25.stop();
+          return _context28.stop();
       }
-    }, _callee25);
+    }, _callee28);
   })));
-  it('state changes during unsuccessful outgoing call due to error in media ok', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee26() {
+  it('state changes during unsuccessful outgoing call due to error in media ok', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee29() {
     var statusPayload, dummyEvent, warnSpy;
-    return _regenerator.default.wrap(function (_context26) {
-      while (1) switch (_context26.prev = _context26.next) {
+    return _regenerator.default.wrap(function (_context29) {
+      while (1) switch (_context29.prev = _context29.next) {
         case 0:
           statusPayload = {
             statusCode: 403,
@@ -1525,12 +1905,18 @@ describe('State Machine handler tests', function () {
           webex.request.mockRejectedValue(statusPayload);
           warnSpy = jest.spyOn(_Logger.default, 'warn');
           jest.spyOn(Utils, 'uploadLogs').mockResolvedValue(undefined);
-          _context26.next = 1;
+          _context29.next = 1;
           return call['handleRoapEstablished']({}, dummyEvent);
         case 1:
-          _context26.next = 2;
+          _context29.next = 2;
           return (0, _testUtil.flushPromises)(2);
         case 2:
+          _context29.next = 3;
+          return _promise.default.resolve();
+        case 3:
+          _context29.next = 4;
+          return _promise.default.resolve();
+        case 4:
           expect(call.isConnected()).toBe(false);
           expect(call['mediaStateMachine'].state.value).toBe('S_ROAP_TEARDOWN');
           expect(call['callStateMachine'].state.value).toBe('S_CALL_CLEARED');
@@ -1542,16 +1928,16 @@ describe('State Machine handler tests', function () {
             file: 'call',
             method: 'handleRoapError'
           });
-        case 3:
+        case 5:
         case "end":
-          return _context26.stop();
+          return _context29.stop();
       }
-    }, _callee26);
+    }, _callee29);
   })));
-  it('state changes during unsuccessful outgoing call since no sdp in offer', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee27() {
+  it('state changes during unsuccessful outgoing call since no sdp in offer', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee30() {
     var statusPayload, dummyEvent;
-    return _regenerator.default.wrap(function (_context27) {
-      while (1) switch (_context27.prev = _context27.next) {
+    return _regenerator.default.wrap(function (_context30) {
+      while (1) switch (_context30.prev = _context30.next) {
         case 0:
           statusPayload = {
             statusCode: 403,
@@ -1574,14 +1960,14 @@ describe('State Machine handler tests', function () {
           expect(_testUtil.mediaConnection.initiateOffer).toBeCalledOnceWith();
         case 1:
         case "end":
-          return _context27.stop();
+          return _context30.stop();
       }
-    }, _callee27);
+    }, _callee30);
   })));
-  it('Outgoing Roap offer retry-after error case during midcall', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee28() {
+  it('Outgoing Roap offer retry-after error case during midcall', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee31() {
     var statusPayload, funcSpy, stateMachineSpy, dummyEvent;
-    return _regenerator.default.wrap(function (_context28) {
-      while (1) switch (_context28.prev = _context28.next) {
+    return _regenerator.default.wrap(function (_context31) {
+      while (1) switch (_context31.prev = _context31.next) {
         case 0:
           statusPayload = {
             statusCode: 503,
@@ -1603,7 +1989,7 @@ describe('State Machine handler tests', function () {
             }
           };
           call['connected'] = true;
-          _context28.next = 1;
+          _context31.next = 1;
           return call['handleOutgoingRoapOffer']({}, dummyEvent);
         case 1:
           jest.advanceTimersByTime(1005);
@@ -1615,14 +2001,14 @@ describe('State Machine handler tests', function () {
           expect(stateMachineSpy).toBeCalledOnceWith(dummyEvent);
         case 2:
         case "end":
-          return _context28.stop();
+          return _context31.stop();
       }
-    }, _callee28);
+    }, _callee31);
   })));
-  it('Outgoing Roap offer retry-after error case during call establishment', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee29() {
+  it('Outgoing Roap offer retry-after error case during call establishment', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee32() {
     var statusPayload, funcSpy, stateMachineSpy, dummyEvent;
-    return _regenerator.default.wrap(function (_context29) {
-      while (1) switch (_context29.prev = _context29.next) {
+    return _regenerator.default.wrap(function (_context32) {
+      while (1) switch (_context32.prev = _context32.next) {
         case 0:
           statusPayload = {
             statusCode: 503,
@@ -1644,7 +2030,7 @@ describe('State Machine handler tests', function () {
             }
           };
           call['connected'] = false;
-          _context29.next = 1;
+          _context32.next = 1;
           return call['handleOutgoingRoapOffer']({}, dummyEvent);
         case 1:
           jest.advanceTimersByTime(1005);
@@ -1655,14 +2041,14 @@ describe('State Machine handler tests', function () {
           expect(stateMachineSpy).not.toBeCalled();
         case 2:
         case "end":
-          return _context29.stop();
+          return _context32.stop();
       }
-    }, _callee29);
+    }, _callee32);
   })));
-  it('Outgoing Roap Answer retry-after error case during midcall', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee30() {
+  it('Outgoing Roap Answer retry-after error case during midcall', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee33() {
     var statusPayload, funcSpy, stateMachineSpy, dummyEvent;
-    return _regenerator.default.wrap(function (_context30) {
-      while (1) switch (_context30.prev = _context30.next) {
+    return _regenerator.default.wrap(function (_context33) {
+      while (1) switch (_context33.prev = _context33.next) {
         case 0:
           statusPayload = {
             statusCode: 503,
@@ -1684,7 +2070,7 @@ describe('State Machine handler tests', function () {
           };
           call['connected'] = true;
           call['mediaStateMachine'].state.value = 'S_RECV_ROAP_OFFER';
-          _context30.next = 1;
+          _context33.next = 1;
           return call['handleOutgoingRoapAnswer']({}, dummyEvent);
         case 1:
           jest.advanceTimersByTime(1005);
@@ -1696,14 +2082,14 @@ describe('State Machine handler tests', function () {
           expect(stateMachineSpy).toBeCalledOnceWith(dummyEvent);
         case 2:
         case "end":
-          return _context30.stop();
+          return _context33.stop();
       }
-    }, _callee30);
+    }, _callee33);
   })));
-  it('Outgoing Roap answer retry-after error case during call establishment', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee31() {
+  it('Outgoing Roap answer retry-after error case during call establishment', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee34() {
     var statusPayload, funcSpy, stateMachineSpy, dummyEvent;
-    return _regenerator.default.wrap(function (_context31) {
-      while (1) switch (_context31.prev = _context31.next) {
+    return _regenerator.default.wrap(function (_context34) {
+      while (1) switch (_context34.prev = _context34.next) {
         case 0:
           statusPayload = {
             statusCode: 503,
@@ -1724,7 +2110,7 @@ describe('State Machine handler tests', function () {
             }
           };
           call['connected'] = false;
-          _context31.next = 1;
+          _context34.next = 1;
           return call['handleOutgoingRoapAnswer']({}, dummyEvent);
         case 1:
           jest.advanceTimersByTime(1005);
@@ -1736,14 +2122,14 @@ describe('State Machine handler tests', function () {
           expect(stateMachineSpy).not.toBeCalled();
         case 2:
         case "end":
-          return _context31.stop();
+          return _context34.stop();
       }
-    }, _callee31);
+    }, _callee34);
   })));
-  it('ROAP error during mid call', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee32() {
+  it('ROAP error during mid call', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee35() {
     var statusPayload, warnSpy, stateMachineSpy, funcSpy, errorEvent;
-    return _regenerator.default.wrap(function (_context32) {
-      while (1) switch (_context32.prev = _context32.next) {
+    return _regenerator.default.wrap(function (_context35) {
+      while (1) switch (_context35.prev = _context35.next) {
         case 0:
           statusPayload = {
             statusCode: 200,
@@ -1768,14 +2154,14 @@ describe('State Machine handler tests', function () {
           expect(stateMachineSpy).not.toHaveBeenCalled();
         case 1:
         case "end":
-          return _context32.stop();
+          return _context35.stop();
       }
-    }, _callee32);
+    }, _callee35);
   })));
-  it('ROAP ok retry-after during mid call', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee33() {
+  it('ROAP ok retry-after during mid call', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee36() {
     var statusPayload, funcSpy, stateMachineSpy, dummyEvent;
-    return _regenerator.default.wrap(function (_context33) {
-      while (1) switch (_context33.prev = _context33.next) {
+    return _regenerator.default.wrap(function (_context36) {
+      while (1) switch (_context36.prev = _context36.next) {
         case 0:
           statusPayload = {
             statusCode: 503,
@@ -1797,7 +2183,7 @@ describe('State Machine handler tests', function () {
           };
           call['connected'] = true;
           call['mediaStateMachine'].state.value = 'S_RECV_ROAP_ANSWER';
-          _context33.next = 1;
+          _context36.next = 1;
           return call['handleRoapEstablished']({}, dummyEvent);
         case 1:
           jest.advanceTimersByTime(1005);
@@ -1809,14 +2195,14 @@ describe('State Machine handler tests', function () {
           expect(stateMachineSpy).toBeCalledOnceWith(dummyEvent);
         case 2:
         case "end":
-          return _context33.stop();
+          return _context36.stop();
       }
-    }, _callee33);
+    }, _callee36);
   })));
-  it('Unable to communicate roap error with mobius', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee34() {
+  it('Unable to communicate roap error with mobius', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee37() {
     var statusPayload, stateMachineSpy, funcSpy, errorEvent;
-    return _regenerator.default.wrap(function (_context34) {
-      while (1) switch (_context34.prev = _context34.next) {
+    return _regenerator.default.wrap(function (_context37) {
+      while (1) switch (_context37.prev = _context37.next) {
         case 0:
           statusPayload = {
             statusCode: 403,
@@ -1839,14 +2225,14 @@ describe('State Machine handler tests', function () {
           expect(stateMachineSpy).not.toHaveBeenCalled();
         case 1:
         case "end":
-          return _context34.stop();
+          return _context37.stop();
       }
-    }, _callee34);
+    }, _callee37);
   })));
-  it('ROAP error during call establishment', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee35() {
+  it('ROAP error during call establishment', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee38() {
     var statusPayload, warnSpy, stateMachineSpy, funcSpy, errorEvent;
-    return _regenerator.default.wrap(function (_context35) {
-      while (1) switch (_context35.prev = _context35.next) {
+    return _regenerator.default.wrap(function (_context38) {
+      while (1) switch (_context38.prev = _context38.next) {
         case 0:
           statusPayload = {
             statusCode: 200,
@@ -1864,7 +2250,7 @@ describe('State Machine handler tests', function () {
             }
           };
           call['connected'] = false;
-          _context35.next = 1;
+          _context38.next = 1;
           return call['handleRoapError']({}, errorEvent);
         case 1:
           expect(funcSpy).toBeCalledOnceWith(errorEvent.data);
@@ -1880,14 +2266,14 @@ describe('State Machine handler tests', function () {
           });
         case 2:
         case "end":
-          return _context35.stop();
+          return _context38.stop();
       }
-    }, _callee35);
+    }, _callee38);
   })));
-  it('incoming call: failing ROAP_ANSWER posts error path and tears down', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee36() {
+  it('incoming call: failing ROAP_ANSWER posts error path and tears down', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee39() {
     var statusPayload, warnSpy, postMediaSpy, setupEvent, connectEvent, offerEvent, answerEvent;
-    return _regenerator.default.wrap(function (_context36) {
-      while (1) switch (_context36.prev = _context36.next) {
+    return _regenerator.default.wrap(function (_context39) {
+      while (1) switch (_context39.prev = _context39.next) {
         case 0:
           statusPayload = {
             statusCode: 403,
@@ -1925,12 +2311,18 @@ describe('State Machine handler tests', function () {
               messageType: 'ANSWER'
             }
           };
-          _context36.next = 1;
+          _context39.next = 1;
           return call.sendMediaStateMachineEvt(answerEvent);
         case 1:
-          _context36.next = 2;
+          _context39.next = 2;
           return (0, _testUtil.flushPromises)(2);
         case 2:
+          _context39.next = 3;
+          return _promise.default.resolve();
+        case 3:
+          _context39.next = 4;
+          return _promise.default.resolve();
+        case 4:
           expect(postMediaSpy).toBeCalledOnceWith(answerEvent.data);
           expect(warnSpy).toHaveBeenCalledWith('Failed to send MediaAnswer request', {
             file: 'call',
@@ -1944,16 +2336,16 @@ describe('State Machine handler tests', function () {
           // Final state should be torn down and cleared for unconnected call
           expect(call['mediaStateMachine'].state.value).toBe('S_ROAP_TEARDOWN');
           expect(call['callStateMachine'].state.value).toBe('S_CALL_CLEARED');
-        case 3:
+        case 5:
         case "end":
-          return _context36.stop();
+          return _context39.stop();
       }
-    }, _callee36);
+    }, _callee39);
   })));
-  it('state changes during successful incoming call with out of order events', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee37() {
+  it('state changes during successful incoming call with out of order events', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee40() {
     var statusPayload, dummyEvent, postMediaSpy, dummyOkEvent, dummyOfferEvent;
-    return _regenerator.default.wrap(function (_context37) {
-      while (1) switch (_context37.prev = _context37.next) {
+    return _regenerator.default.wrap(function (_context40) {
+      while (1) switch (_context40.prev = _context40.next) {
         case 0:
           statusPayload = {
             statusCode: 200,
@@ -1986,7 +2378,7 @@ describe('State Machine handler tests', function () {
             seq: 1,
             messageType: 'ANSWER'
           };
-          _context37.next = 1;
+          _context40.next = 1;
           return call.sendMediaStateMachineEvt(dummyEvent);
         case 1:
           expect(postMediaSpy).toBeCalledOnceWith(dummyEvent.data);
@@ -2008,7 +2400,7 @@ describe('State Machine handler tests', function () {
             seq: 2,
             messageType: 'OFFER_REQUEST'
           };
-          _context37.next = 2;
+          _context40.next = 2;
           return call.sendMediaStateMachineEvt(dummyEvent);
         case 2:
           expect(call['receivedRoapOKSeq']).toBe(0);
@@ -2058,7 +2450,7 @@ describe('State Machine handler tests', function () {
           };
           call.sendCallStateMachineEvt(dummyEvent);
           dummyEvent.type = 'E_RECV_ROAP_OFFER';
-          _context37.next = 3;
+          _context40.next = 3;
           return call.sendMediaStateMachineEvt(dummyEvent);
         case 3:
           expect(_testUtil.mediaConnection.roapMessageReceived).toHaveBeenLastCalledWith(dummyEvent.data);
@@ -2067,7 +2459,7 @@ describe('State Machine handler tests', function () {
             seq: 3,
             messageType: 'ANSWER'
           };
-          _context37.next = 4;
+          _context40.next = 4;
           return call.sendMediaStateMachineEvt(dummyEvent);
         case 4:
           expect(postMediaSpy).toHaveBeenLastCalledWith(dummyEvent.data);
@@ -2086,7 +2478,7 @@ describe('State Machine handler tests', function () {
               messageType: 'OK'
             }
           };
-          _context37.next = 5;
+          _context40.next = 5;
           return call.sendMediaStateMachineEvt(dummyOkEvent);
         case 5:
           expect(_testUtil.mediaConnection.roapMessageReceived).toHaveBeenNthCalledWith(6, dummyOkEvent.data.message);
@@ -2101,14 +2493,14 @@ describe('State Machine handler tests', function () {
           expect(postMediaSpy).toHaveBeenLastCalledWith(dummyEvent.data);
         case 6:
         case "end":
-          return _context37.stop();
+          return _context40.stop();
       }
-    }, _callee37);
+    }, _callee40);
   })));
-  it('successfully handles out of order events when ROAP OK is received while executing outgoingRoapAnswer', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee38() {
+  it('successfully handles out of order events when ROAP OK is received while executing outgoingRoapAnswer', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee41() {
     var mockStatusBody, statusPayload, dummyEvent, postMediaSpy, dummyOkEvent, dummyOfferEvent;
-    return _regenerator.default.wrap(function (_context38) {
-      while (1) switch (_context38.prev = _context38.next) {
+    return _regenerator.default.wrap(function (_context41) {
+      while (1) switch (_context41.prev = _context41.next) {
         case 0:
           mockStatusBody = {
             device: {
@@ -2148,7 +2540,7 @@ describe('State Machine handler tests', function () {
             seq: 1,
             messageType: 'ANSWER'
           };
-          _context38.next = 1;
+          _context41.next = 1;
           return call.sendMediaStateMachineEvt(dummyEvent);
         case 1:
           expect(postMediaSpy).toBeCalledOnceWith(dummyEvent.data);
@@ -2170,7 +2562,7 @@ describe('State Machine handler tests', function () {
             seq: 2,
             messageType: 'OFFER_REQUEST'
           };
-          _context38.next = 2;
+          _context41.next = 2;
           return call.sendMediaStateMachineEvt(dummyEvent);
         case 2:
           expect(call['receivedRoapOKSeq']).toBe(0);
@@ -2220,7 +2612,7 @@ describe('State Machine handler tests', function () {
           };
           call.sendCallStateMachineEvt(dummyEvent);
           dummyEvent.type = 'E_RECV_ROAP_OFFER';
-          _context38.next = 3;
+          _context41.next = 3;
           return call.sendMediaStateMachineEvt(dummyEvent);
         case 3:
           expect(_testUtil.mediaConnection.roapMessageReceived).toHaveBeenLastCalledWith(dummyEvent.data);
@@ -2229,7 +2621,7 @@ describe('State Machine handler tests', function () {
             seq: 3,
             messageType: 'ANSWER'
           };
-          _context38.next = 4;
+          _context41.next = 4;
           return call.sendMediaStateMachineEvt(dummyEvent);
         case 4:
           expect(postMediaSpy).toHaveBeenLastCalledWith(dummyEvent.data);
@@ -2246,7 +2638,7 @@ describe('State Machine handler tests', function () {
             }
           };
           call.sendMediaStateMachineEvt(dummyEvent);
-          _context38.next = 5;
+          _context41.next = 5;
           return call.sendMediaStateMachineEvt(dummyOkEvent);
         case 5:
           expect(call['receivedRoapOKSeq']).toBe(3);
@@ -2262,14 +2654,14 @@ describe('State Machine handler tests', function () {
           expect(postMediaSpy).toHaveBeenLastCalledWith(dummyEvent.data);
         case 6:
         case "end":
-          return _context38.stop();
+          return _context41.stop();
       }
-    }, _callee38);
+    }, _callee41);
   })));
-  it('handle hold event successfully when media received after progress but before connect', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee39() {
+  it('handle hold event successfully when media received after progress but before connect', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee42() {
     var statusPayload, dummyEvent, postMediaSpy, infoSpy, dummyOkEvent;
-    return _regenerator.default.wrap(function (_context39) {
-      while (1) switch (_context39.prev = _context39.next) {
+    return _regenerator.default.wrap(function (_context42) {
+      while (1) switch (_context42.prev = _context42.next) {
         case 0:
           statusPayload = {
             statusCode: 200,
@@ -2330,20 +2722,20 @@ describe('State Machine handler tests', function () {
           dummyEvent.data = undefined;
           call.sendCallStateMachineEvt(dummyEvent);
           expect(call['callStateMachine'].state.value).toBe('S_CALL_HOLD');
-          expect(infoSpy).toHaveBeenLastCalledWith("".concat(_constants2.METHOD_START_MESSAGE, " with: ").concat(call.getCorrelationId()), {
+          expect(infoSpy).toHaveBeenCalledWith("".concat(_constants2.METHOD_START_MESSAGE, " with: ").concat(call.getCorrelationId()), {
             file: 'call',
             method: 'handleCallHold'
           });
         case 1:
         case "end":
-          return _context39.stop();
+          return _context42.stop();
       }
-    }, _callee39);
+    }, _callee42);
   })));
-  it('emits DISCONNECT before mobius delete request is invoked', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee40() {
+  it('emits DISCONNECT before mobius delete request is invoked', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee43() {
     var emitSpy, deleteSpy;
-    return _regenerator.default.wrap(function (_context40) {
-      while (1) switch (_context40.prev = _context40.next) {
+    return _regenerator.default.wrap(function (_context43) {
+      while (1) switch (_context43.prev = _context43.next) {
         case 0:
           emitSpy = jest.spyOn(call, 'emit');
           deleteSpy = jest.spyOn(call, 'delete').mockResolvedValue({
@@ -2352,7 +2744,7 @@ describe('State Machine handler tests', function () {
           call.sendCallStateMachineEvt({
             type: 'E_RECV_CALL_DISCONNECT'
           });
-          _context40.next = 1;
+          _context43.next = 1;
           return (0, _testUtil.flushPromises)(1);
         case 1:
           expect(emitSpy).toHaveBeenCalledWith(_types2.CALL_EVENT_KEYS.DISCONNECT, call.getCorrelationId());
@@ -2360,9 +2752,9 @@ describe('State Machine handler tests', function () {
           expect(emitSpy.mock.invocationCallOrder[0]).toBeLessThan(deleteSpy.mock.invocationCallOrder[0]);
         case 2:
         case "end":
-          return _context40.stop();
+          return _context43.stop();
       }
-    }, _callee40);
+    }, _callee43);
   })));
   describe('Call event timers tests', function () {
     var callManager;
@@ -2373,10 +2765,10 @@ describe('State Machine handler tests', function () {
     afterEach(function () {
       jest.clearAllTimers();
     });
-    it('times out if the next event is not received - 60 seconds timeout', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee41() {
+    it('times out if the next event is not received - 60 seconds timeout', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee44() {
       var statusPayload, dummyEvent, logSpy, emitSpy, deleteSpy, dummyOkEvent;
-      return _regenerator.default.wrap(function (_context41) {
-        while (1) switch (_context41.prev = _context41.next) {
+      return _regenerator.default.wrap(function (_context44) {
+        while (1) switch (_context44.prev = _context44.next) {
           case 0:
             statusPayload = {
               statusCode: 200,
@@ -2393,7 +2785,7 @@ describe('State Machine handler tests', function () {
             webex.request.mockReturnValue(statusPayload);
 
             // handleOutgoingCallSetup is asynchronous
-            _context41.next = 1;
+            _context44.next = 1;
             return call.sendCallStateMachineEvt(dummyEvent);
           case 1:
             expect(call['callStateMachine'].state.value).toBe('S_SEND_CALL_SETUP');
@@ -2436,14 +2828,14 @@ describe('State Machine handler tests', function () {
             expect(callManager.callCollection).toStrictEqual({});
           case 2:
           case "end":
-            return _context41.stop();
+            return _context44.stop();
         }
-      }, _callee41);
+      }, _callee44);
     })));
-    it('times out if the next event is not received - 10 seconds timeout', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee42() {
+    it('times out if the next event is not received - 10 seconds timeout', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee45() {
       var statusPayload, dummyEvent, call, emitSpy, deleteSpy, logSpy;
-      return _regenerator.default.wrap(function (_context42) {
-        while (1) switch (_context42.prev = _context42.next) {
+      return _regenerator.default.wrap(function (_context45) {
+        while (1) switch (_context45.prev = _context45.next) {
           case 0:
             statusPayload = {
               statusCode: 200,
@@ -2462,7 +2854,7 @@ describe('State Machine handler tests', function () {
             expect((0, _keys.default)(callManager.callCollection)[0]).toBe(call.getCorrelationId());
 
             // handleOutgoingCallSetup is asynchronous
-            _context42.next = 1;
+            _context45.next = 1;
             return call.sendCallStateMachineEvt(dummyEvent);
           case 1:
             expect(call['callStateMachine'].state.value).toBe('S_SEND_CALL_SETUP');
@@ -2474,9 +2866,9 @@ describe('State Machine handler tests', function () {
             expect(callManager.callCollection).toStrictEqual({});
           case 2:
           case "end":
-            return _context42.stop();
+            return _context45.stop();
         }
-      }, _callee42);
+      }, _callee45);
     })));
   });
 });
@@ -2495,6 +2887,11 @@ describe('Supplementary Services tests', function () {
   };
   var call;
   beforeEach(function () {
+    _request.APIRequest.resetInstance();
+    _request.APIRequest.getInstance({
+      webex: webex,
+      isMobiusSocketEnabled: false
+    });
     /* Since we are not actually testing from the start of a call , so it's good to set the below
      * parameters manually
      */
@@ -2536,10 +2933,10 @@ describe('Supplementary Services tests', function () {
     beforeEach(function () {
       call.removeAllListeners();
     });
-    it('Handle successful Call hold case without delayed http response', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee44() {
+    it('Handle successful Call hold case without delayed http response', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee47() {
       var responsePayload, warnSpy, roapEvent;
-      return _regenerator.default.wrap(function (_context44) {
-        while (1) switch (_context44.prev = _context44.next) {
+      return _regenerator.default.wrap(function (_context47) {
+        while (1) switch (_context47.prev = _context47.next) {
           case 0:
             expect.assertions(7);
             responsePayload = {
@@ -2552,25 +2949,25 @@ describe('Supplementary Services tests', function () {
             warnSpy = jest.spyOn(_Logger.default, 'warn');
             call['held'] = false;
             call.on(_types2.CALL_EVENT_KEYS.HELD, /*#__PURE__*/function () {
-              var _ref44 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee43(correlationId) {
-                return _regenerator.default.wrap(function (_context43) {
-                  while (1) switch (_context43.prev = _context43.next) {
+              var _ref56 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee46(correlationId) {
+                return _regenerator.default.wrap(function (_context46) {
+                  while (1) switch (_context46.prev = _context46.next) {
                     case 0:
                       expect(correlationId).toStrictEqual(call.getCorrelationId());
                     case 1:
                     case "end":
-                      return _context43.stop();
+                      return _context46.stop();
                   }
-                }, _callee43);
+                }, _callee46);
               }));
               return function (_x) {
-                return _ref44.apply(this, arguments);
+                return _ref56.apply(this, arguments);
               };
             }());
-            _context44.next = 1;
+            _context47.next = 1;
             return call.doHoldResume();
           case 1:
-            _context44.next = 2;
+            _context47.next = 2;
             return (0, _testUtil.flushPromises)(2);
           case 2:
             expect(setTimeout).toHaveBeenCalledTimes(1);
@@ -2586,11 +2983,11 @@ describe('Supplementary Services tests', function () {
             call['handleIncomingRoapOffer']({}, dummyEvent);
             roapEvent = JSON.parse((0, _stringify.default)(dummyEvent));
             roapEvent.data.type = 'ANSWER';
-            _context44.next = 3;
+            _context47.next = 3;
             return call['handleOutgoingRoapAnswer']({}, dummyEvent);
           case 3:
             roapEvent.data.type = 'OK';
-            _context44.next = 4;
+            _context47.next = 4;
             return call['handleRoapEstablished']({}, dummyEvent);
           case 4:
             expect(clearTimeout).toHaveBeenCalledTimes(1);
@@ -2605,14 +3002,14 @@ describe('Supplementary Services tests', function () {
             });
           case 5:
           case "end":
-            return _context44.stop();
+            return _context47.stop();
         }
-      }, _callee44);
+      }, _callee47);
     })));
-    it('Handle successful Call hold case with delayed http response', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee46() {
+    it('Handle successful Call hold case with delayed http response', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee49() {
       var responsePayload, warnSpy, roapEvent;
-      return _regenerator.default.wrap(function (_context46) {
-        while (1) switch (_context46.prev = _context46.next) {
+      return _regenerator.default.wrap(function (_context49) {
+        while (1) switch (_context49.prev = _context49.next) {
           case 0:
             expect.assertions(8);
             responsePayload = {
@@ -2625,26 +3022,26 @@ describe('Supplementary Services tests', function () {
             warnSpy = jest.spyOn(_Logger.default, 'warn');
             call['held'] = false;
             call.on(_types2.CALL_EVENT_KEYS.HELD, /*#__PURE__*/function () {
-              var _ref46 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee45(correlationId) {
-                return _regenerator.default.wrap(function (_context45) {
-                  while (1) switch (_context45.prev = _context45.next) {
+              var _ref58 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee48(correlationId) {
+                return _regenerator.default.wrap(function (_context48) {
+                  while (1) switch (_context48.prev = _context48.next) {
                     case 0:
                       expect(correlationId).toStrictEqual(call.getCorrelationId());
                     case 1:
                     case "end":
-                      return _context45.stop();
+                      return _context48.stop();
                   }
-                }, _callee45);
+                }, _callee48);
               }));
               return function (_x2) {
-                return _ref46.apply(this, arguments);
+                return _ref58.apply(this, arguments);
               };
             }());
             call.doHoldResume();
-            _context46.next = 1;
+            _context49.next = 1;
             return _promise.default.resolve();
           case 1:
-            _context46.next = 2;
+            _context49.next = 2;
             return _promise.default.resolve();
           case 2:
             expect(setTimeout).not.toHaveBeenCalled();
@@ -2660,11 +3057,11 @@ describe('Supplementary Services tests', function () {
             call['handleIncomingRoapOffer']({}, dummyEvent);
             roapEvent = JSON.parse((0, _stringify.default)(dummyEvent));
             roapEvent.data.type = 'ANSWER';
-            _context46.next = 3;
+            _context49.next = 3;
             return call['handleOutgoingRoapAnswer']({}, dummyEvent);
           case 3:
             roapEvent.data.type = 'OK';
-            _context46.next = 4;
+            _context49.next = 4;
             return call['handleRoapEstablished']({}, dummyEvent);
           case 4:
             expect(clearTimeout).not.toHaveBeenCalled();
@@ -2679,14 +3076,14 @@ describe('Supplementary Services tests', function () {
             });
           case 5:
           case "end":
-            return _context46.stop();
+            return _context49.stop();
         }
-      }, _callee46);
+      }, _callee49);
     })));
-    it('Handle failure Call Hold case during signalling', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee48() {
+    it('Handle failure Call Hold case during signalling', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee51() {
       var responsePayload;
-      return _regenerator.default.wrap(function (_context48) {
-        while (1) switch (_context48.prev = _context48.next) {
+      return _regenerator.default.wrap(function (_context51) {
+        while (1) switch (_context51.prev = _context51.next) {
           case 0:
             expect.assertions(4);
             responsePayload = {
@@ -2696,26 +3093,26 @@ describe('Supplementary Services tests', function () {
             jest.spyOn(webex, 'request').mockRejectedValue(responsePayload);
             call['held'] = false;
             call.on(_types2.CALL_EVENT_KEYS.HOLD_ERROR, /*#__PURE__*/function () {
-              var _ref48 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee47(errObj) {
-                return _regenerator.default.wrap(function (_context47) {
-                  while (1) switch (_context47.prev = _context47.next) {
+              var _ref60 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee50(errObj) {
+                return _regenerator.default.wrap(function (_context50) {
+                  while (1) switch (_context50.prev = _context50.next) {
                     case 0:
                       expect(errObj.type).toStrictEqual(_types.ERROR_TYPE.SERVICE_UNAVAILABLE);
                       expect(errObj.message).toStrictEqual('An unknown error occurred. Wait a moment and try again.');
                     case 1:
                     case "end":
-                      return _context47.stop();
+                      return _context50.stop();
                   }
-                }, _callee47);
+                }, _callee50);
               }));
               return function (_x3) {
-                return _ref48.apply(this, arguments);
+                return _ref60.apply(this, arguments);
               };
             }());
-            _context48.next = 1;
+            _context51.next = 1;
             return call.doHoldResume();
           case 1:
-            _context48.next = 2;
+            _context51.next = 2;
             return (0, _testUtil.flushPromises)(2);
           case 2:
             expect(call.isHeld()).toStrictEqual(false);
@@ -2725,14 +3122,14 @@ describe('Supplementary Services tests', function () {
             expect(call['callStateMachine'].state.value).toStrictEqual('S_CALL_ESTABLISHED');
           case 3:
           case "end":
-            return _context48.stop();
+            return _context51.stop();
         }
-      }, _callee48);
+      }, _callee51);
     })));
-    it('Handle failure Call Hold case during offer/answer exchange', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee50() {
+    it('Handle failure Call Hold case during offer/answer exchange', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee53() {
       var responsePayload, rejectPayload, roapEvent;
-      return _regenerator.default.wrap(function (_context50) {
-        while (1) switch (_context50.prev = _context50.next) {
+      return _regenerator.default.wrap(function (_context53) {
+        while (1) switch (_context53.prev = _context53.next) {
           case 0:
             expect.assertions(5);
             responsePayload = {
@@ -2746,24 +3143,24 @@ describe('Supplementary Services tests', function () {
             jest.spyOn(webex, 'request').mockResolvedValueOnce(responsePayload).mockRejectedValueOnce(rejectPayload);
             call['held'] = false;
             call.on(_types2.CALL_EVENT_KEYS.HOLD_ERROR, /*#__PURE__*/function () {
-              var _ref50 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee49(errObj) {
-                return _regenerator.default.wrap(function (_context49) {
-                  while (1) switch (_context49.prev = _context49.next) {
+              var _ref62 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee52(errObj) {
+                return _regenerator.default.wrap(function (_context52) {
+                  while (1) switch (_context52.prev = _context52.next) {
                     case 0:
                       expect(errObj.type).toStrictEqual(_types.ERROR_TYPE.SERVICE_UNAVAILABLE);
                       expect(errObj.message).toStrictEqual('An unknown error occurred. Wait a moment and try again.');
                     case 1:
                     case "end":
-                      return _context49.stop();
+                      return _context52.stop();
                   }
-                }, _callee49);
+                }, _callee52);
               }));
               return function (_x4) {
-                return _ref50.apply(this, arguments);
+                return _ref62.apply(this, arguments);
               };
             }());
             call.doHoldResume();
-            _context50.next = 1;
+            _context53.next = 1;
             return (0, _testUtil.flushPromises)(2);
           case 1:
             /* the Call State should transition to S_CALL_ESTABLISHED
@@ -2773,7 +3170,7 @@ describe('Supplementary Services tests', function () {
             roapEvent = JSON.parse((0, _stringify.default)(dummyEvent));
             /* We are intentionally failing the ROAP ANSWER */
             roapEvent.data.type = 'ANSWER';
-            _context50.next = 2;
+            _context53.next = 2;
             return call['handleOutgoingRoapAnswer']({}, dummyEvent);
           case 2:
             expect(call.isHeld()).toStrictEqual(false);
@@ -2781,14 +3178,14 @@ describe('Supplementary Services tests', function () {
             expect(call['callStateMachine'].state.value).toStrictEqual('S_CALL_ESTABLISHED');
           case 3:
           case "end":
-            return _context50.stop();
+            return _context53.stop();
         }
-      }, _callee50);
+      }, _callee53);
     })));
-    it('Handle failure Call Hold case during roap ok out', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee51() {
+    it('Handle failure Call Hold case during roap ok out', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee54() {
       var responsePayload, warnSpy, roapEvent;
-      return _regenerator.default.wrap(function (_context51) {
-        while (1) switch (_context51.prev = _context51.next) {
+      return _regenerator.default.wrap(function (_context54) {
+        while (1) switch (_context54.prev = _context54.next) {
           case 0:
             responsePayload = {
               statusCode: 200,
@@ -2799,10 +3196,10 @@ describe('Supplementary Services tests', function () {
             jest.spyOn(global, 'clearTimeout');
             warnSpy = jest.spyOn(_Logger.default, 'warn');
             call['held'] = false;
-            _context51.next = 1;
+            _context54.next = 1;
             return call.doHoldResume();
           case 1:
-            _context51.next = 2;
+            _context54.next = 2;
             return (0, _testUtil.flushPromises)(2);
           case 2:
             expect(setTimeout).toHaveBeenCalledTimes(1);
@@ -2817,19 +3214,19 @@ describe('Supplementary Services tests', function () {
             call['handleIncomingRoapOffer']({}, dummyEvent);
             roapEvent = JSON.parse((0, _stringify.default)(dummyEvent));
             roapEvent.data.type = 'ANSWER';
-            _context51.next = 3;
+            _context54.next = 3;
             return call['handleOutgoingRoapAnswer']({}, dummyEvent);
           case 3:
             jest.spyOn(webex, 'request').mockRejectedValue({
               statusCode: 403
             });
             roapEvent.data.type = 'OK';
-            _context51.next = 4;
+            _context54.next = 4;
             return call['handleRoapEstablished']({}, dummyEvent);
           case 4:
             /* this is for coverage */
             call['callStateMachine'].state.value = 'S_CALL_HOLD';
-            _context51.next = 5;
+            _context54.next = 5;
             return call['handleRoapEstablished']({}, dummyEvent);
           case 5:
             expect(call.isHeld()).toStrictEqual(false);
@@ -2841,14 +3238,14 @@ describe('Supplementary Services tests', function () {
             });
           case 6:
           case "end":
-            return _context51.stop();
+            return _context54.stop();
         }
-      }, _callee51);
+      }, _callee54);
     })));
-    it('Handle failure Call resume case during roap ok out', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee52() {
+    it('Handle failure Call resume case during roap ok out', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee55() {
       var responsePayload, warnSpy, roapEvent;
-      return _regenerator.default.wrap(function (_context52) {
-        while (1) switch (_context52.prev = _context52.next) {
+      return _regenerator.default.wrap(function (_context55) {
+        while (1) switch (_context55.prev = _context55.next) {
           case 0:
             responsePayload = {
               statusCode: 200,
@@ -2859,10 +3256,10 @@ describe('Supplementary Services tests', function () {
             jest.spyOn(global, 'clearTimeout');
             warnSpy = jest.spyOn(_Logger.default, 'warn');
             call['held'] = true;
-            _context52.next = 1;
+            _context55.next = 1;
             return call.doHoldResume();
           case 1:
-            _context52.next = 2;
+            _context55.next = 2;
             return (0, _testUtil.flushPromises)(2);
           case 2:
             expect(setTimeout).toHaveBeenCalledTimes(1);
@@ -2877,14 +3274,14 @@ describe('Supplementary Services tests', function () {
             call['handleIncomingRoapOffer']({}, dummyEvent);
             roapEvent = JSON.parse((0, _stringify.default)(dummyEvent));
             roapEvent.data.type = 'ANSWER';
-            _context52.next = 3;
+            _context55.next = 3;
             return call['handleOutgoingRoapAnswer']({}, dummyEvent);
           case 3:
             jest.spyOn(webex, 'request').mockRejectedValue({
               statusCode: 403
             });
             roapEvent.data.type = 'OK';
-            _context52.next = 4;
+            _context55.next = 4;
             return call['handleRoapEstablished']({}, dummyEvent);
           case 4:
             expect(call.isHeld()).toStrictEqual(true);
@@ -2896,14 +3293,14 @@ describe('Supplementary Services tests', function () {
             });
           case 5:
           case "end":
-            return _context52.stop();
+            return _context55.stop();
         }
-      }, _callee52);
+      }, _callee55);
     })));
-    it('Handle Call hold case where successful Held response does not come', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee54() {
+    it('Handle Call hold case where successful Held response does not come', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee57() {
       var responsePayload, roapEvent;
-      return _regenerator.default.wrap(function (_context54) {
-        while (1) switch (_context54.prev = _context54.next) {
+      return _regenerator.default.wrap(function (_context57) {
+        while (1) switch (_context57.prev = _context57.next) {
           case 0:
             expect.assertions(5);
             responsePayload = {
@@ -2913,25 +3310,25 @@ describe('Supplementary Services tests', function () {
             jest.spyOn(webex, 'request').mockResolvedValue(responsePayload);
             call['held'] = false;
             call.on(_types2.CALL_EVENT_KEYS.HOLD_ERROR, /*#__PURE__*/function () {
-              var _ref54 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee53(errObj) {
-                return _regenerator.default.wrap(function (_context53) {
-                  while (1) switch (_context53.prev = _context53.next) {
+              var _ref66 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee56(errObj) {
+                return _regenerator.default.wrap(function (_context56) {
+                  while (1) switch (_context56.prev = _context56.next) {
                     case 0:
                       expect(errObj.type).toStrictEqual(_types.ERROR_TYPE.TIMEOUT);
                       expect(errObj.message).toStrictEqual('An error occurred while placing the call on hold. Wait a moment and try again.');
                     case 1:
                     case "end":
-                      return _context53.stop();
+                      return _context56.stop();
                   }
-                }, _callee53);
+                }, _callee56);
               }));
               return function (_x5) {
-                return _ref54.apply(this, arguments);
+                return _ref66.apply(this, arguments);
               };
             }());
             jest.runAllTimers();
             call.doHoldResume();
-            _context54.next = 1;
+            _context57.next = 1;
             return (0, _testUtil.flushPromises)(2);
           case 1:
             /* At this point, the Call State should be S_CALL_HOLD
@@ -2944,11 +3341,11 @@ describe('Supplementary Services tests', function () {
             call['handleIncomingRoapOffer']({}, dummyEvent);
             roapEvent = JSON.parse((0, _stringify.default)(dummyEvent));
             roapEvent.data.type = 'ANSWER';
-            _context54.next = 2;
+            _context57.next = 2;
             return call['handleOutgoingRoapAnswer']({}, dummyEvent);
           case 2:
             roapEvent.data.type = 'OK';
-            _context54.next = 3;
+            _context57.next = 3;
             return call['handleRoapEstablished']({}, dummyEvent);
           case 3:
             /* Advancing timer by 12 seconds so that it gets timed out */
@@ -2960,14 +3357,14 @@ describe('Supplementary Services tests', function () {
             expect(call['callStateMachine'].state.value).toStrictEqual('S_CALL_ESTABLISHED');
           case 4:
           case "end":
-            return _context54.stop();
+            return _context57.stop();
         }
-      }, _callee54);
+      }, _callee57);
     })));
-    it('Handle successful Call Resume case without delayed http response', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee56() {
+    it('Handle successful Call Resume case without delayed http response', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee59() {
       var responsePayload, warnSpy, roapEvent;
-      return _regenerator.default.wrap(function (_context56) {
-        while (1) switch (_context56.prev = _context56.next) {
+      return _regenerator.default.wrap(function (_context59) {
+        while (1) switch (_context59.prev = _context59.next) {
           case 0:
             expect.assertions(7);
             responsePayload = {
@@ -2980,25 +3377,25 @@ describe('Supplementary Services tests', function () {
             warnSpy = jest.spyOn(_Logger.default, 'warn');
             call['held'] = true;
             call.on(_types2.CALL_EVENT_KEYS.RESUMED, /*#__PURE__*/function () {
-              var _ref56 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee55(correlationId) {
-                return _regenerator.default.wrap(function (_context55) {
-                  while (1) switch (_context55.prev = _context55.next) {
+              var _ref68 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee58(correlationId) {
+                return _regenerator.default.wrap(function (_context58) {
+                  while (1) switch (_context58.prev = _context58.next) {
                     case 0:
                       expect(correlationId).toStrictEqual(call.getCorrelationId());
                     case 1:
                     case "end":
-                      return _context55.stop();
+                      return _context58.stop();
                   }
-                }, _callee55);
+                }, _callee58);
               }));
               return function (_x6) {
-                return _ref56.apply(this, arguments);
+                return _ref68.apply(this, arguments);
               };
             }());
-            _context56.next = 1;
+            _context59.next = 1;
             return call.doHoldResume();
           case 1:
-            _context56.next = 2;
+            _context59.next = 2;
             return (0, _testUtil.flushPromises)(2);
           case 2:
             expect(setTimeout).toHaveBeenCalledTimes(1);
@@ -3014,11 +3411,11 @@ describe('Supplementary Services tests', function () {
             call['handleIncomingRoapOffer']({}, dummyEvent);
             roapEvent = JSON.parse((0, _stringify.default)(dummyEvent));
             roapEvent.data.type = 'ANSWER';
-            _context56.next = 3;
+            _context59.next = 3;
             return call['handleOutgoingRoapAnswer']({}, dummyEvent);
           case 3:
             roapEvent.data.type = 'OK';
-            _context56.next = 4;
+            _context59.next = 4;
             return call['handleRoapEstablished']({}, dummyEvent);
           case 4:
             expect(clearTimeout).toHaveBeenCalledTimes(1);
@@ -3033,14 +3430,14 @@ describe('Supplementary Services tests', function () {
             });
           case 5:
           case "end":
-            return _context56.stop();
+            return _context59.stop();
         }
-      }, _callee56);
+      }, _callee59);
     })));
-    it('Handle successful Call Resume case with delayed http response', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee58() {
+    it('Handle successful Call Resume case with delayed http response', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee61() {
       var responsePayload, warnSpy, roapEvent;
-      return _regenerator.default.wrap(function (_context58) {
-        while (1) switch (_context58.prev = _context58.next) {
+      return _regenerator.default.wrap(function (_context61) {
+        while (1) switch (_context61.prev = _context61.next) {
           case 0:
             expect.assertions(7);
             responsePayload = {
@@ -3053,26 +3450,26 @@ describe('Supplementary Services tests', function () {
             warnSpy = jest.spyOn(_Logger.default, 'warn');
             call['held'] = true;
             call.on(_types2.CALL_EVENT_KEYS.RESUMED, /*#__PURE__*/function () {
-              var _ref58 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee57(correlationId) {
-                return _regenerator.default.wrap(function (_context57) {
-                  while (1) switch (_context57.prev = _context57.next) {
+              var _ref70 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee60(correlationId) {
+                return _regenerator.default.wrap(function (_context60) {
+                  while (1) switch (_context60.prev = _context60.next) {
                     case 0:
                       expect(correlationId).toStrictEqual(call.getCorrelationId());
                     case 1:
                     case "end":
-                      return _context57.stop();
+                      return _context60.stop();
                   }
-                }, _callee57);
+                }, _callee60);
               }));
               return function (_x7) {
-                return _ref58.apply(this, arguments);
+                return _ref70.apply(this, arguments);
               };
             }());
             call.doHoldResume();
-            _context58.next = 1;
+            _context61.next = 1;
             return _promise.default.resolve();
           case 1:
-            _context58.next = 2;
+            _context61.next = 2;
             return _promise.default.resolve();
           case 2:
             expect(setTimeout).not.toHaveBeenCalled();
@@ -3088,11 +3485,11 @@ describe('Supplementary Services tests', function () {
             call['handleIncomingRoapOffer']({}, dummyEvent);
             roapEvent = JSON.parse((0, _stringify.default)(dummyEvent));
             roapEvent.data.type = 'ANSWER';
-            _context58.next = 3;
+            _context61.next = 3;
             return call['handleOutgoingRoapAnswer']({}, dummyEvent);
           case 3:
             roapEvent.data.type = 'OK';
-            _context58.next = 4;
+            _context61.next = 4;
             return call['handleRoapEstablished']({}, dummyEvent);
           case 4:
             expect(clearTimeout).not.toHaveBeenCalled();
@@ -3107,14 +3504,14 @@ describe('Supplementary Services tests', function () {
             });
           case 5:
           case "end":
-            return _context58.stop();
+            return _context61.stop();
         }
-      }, _callee58);
+      }, _callee61);
     })));
-    it('Handle failure Call Resume case during signalling', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee60() {
+    it('Handle failure Call Resume case during signalling', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee63() {
       var responsePayload;
-      return _regenerator.default.wrap(function (_context60) {
-        while (1) switch (_context60.prev = _context60.next) {
+      return _regenerator.default.wrap(function (_context63) {
+        while (1) switch (_context63.prev = _context63.next) {
           case 0:
             expect.assertions(4);
             responsePayload = {
@@ -3124,26 +3521,26 @@ describe('Supplementary Services tests', function () {
             jest.spyOn(webex, 'request').mockRejectedValue(responsePayload);
             call['held'] = true;
             call.on(_types2.CALL_EVENT_KEYS.RESUME_ERROR, /*#__PURE__*/function () {
-              var _ref60 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee59(errObj) {
-                return _regenerator.default.wrap(function (_context59) {
-                  while (1) switch (_context59.prev = _context59.next) {
+              var _ref72 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee62(errObj) {
+                return _regenerator.default.wrap(function (_context62) {
+                  while (1) switch (_context62.prev = _context62.next) {
                     case 0:
                       expect(errObj.type).toStrictEqual(_types.ERROR_TYPE.SERVICE_UNAVAILABLE);
                       expect(errObj.message).toStrictEqual('An unknown error occurred. Wait a moment and try again.');
                     case 1:
                     case "end":
-                      return _context59.stop();
+                      return _context62.stop();
                   }
-                }, _callee59);
+                }, _callee62);
               }));
               return function (_x8) {
-                return _ref60.apply(this, arguments);
+                return _ref72.apply(this, arguments);
               };
             }());
-            _context60.next = 1;
+            _context63.next = 1;
             return call.doHoldResume();
           case 1:
-            _context60.next = 2;
+            _context63.next = 2;
             return (0, _testUtil.flushPromises)(2);
           case 2:
             expect(call.isHeld()).toStrictEqual(true);
@@ -3154,14 +3551,14 @@ describe('Supplementary Services tests', function () {
             expect(call['callStateMachine'].state.value).toStrictEqual('S_CALL_ESTABLISHED');
           case 3:
           case "end":
-            return _context60.stop();
+            return _context63.stop();
         }
-      }, _callee60);
+      }, _callee63);
     })));
-    it('Handle failure Call Resume case during offer/answer exchange', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee62() {
+    it('Handle failure Call Resume case during offer/answer exchange', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee65() {
       var responsePayload, rejectPayload, roapEvent;
-      return _regenerator.default.wrap(function (_context62) {
-        while (1) switch (_context62.prev = _context62.next) {
+      return _regenerator.default.wrap(function (_context65) {
+        while (1) switch (_context65.prev = _context65.next) {
           case 0:
             expect.assertions(5);
             responsePayload = {
@@ -3175,24 +3572,24 @@ describe('Supplementary Services tests', function () {
             jest.spyOn(webex, 'request').mockResolvedValueOnce(responsePayload).mockRejectedValueOnce(rejectPayload);
             call['held'] = true;
             call.on(_types2.CALL_EVENT_KEYS.RESUME_ERROR, /*#__PURE__*/function () {
-              var _ref62 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee61(errObj) {
-                return _regenerator.default.wrap(function (_context61) {
-                  while (1) switch (_context61.prev = _context61.next) {
+              var _ref74 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee64(errObj) {
+                return _regenerator.default.wrap(function (_context64) {
+                  while (1) switch (_context64.prev = _context64.next) {
                     case 0:
                       expect(errObj.type).toStrictEqual(_types.ERROR_TYPE.SERVICE_UNAVAILABLE);
                       expect(errObj.message).toStrictEqual('An unknown error occurred. Wait a moment and try again.');
                     case 1:
                     case "end":
-                      return _context61.stop();
+                      return _context64.stop();
                   }
-                }, _callee61);
+                }, _callee64);
               }));
               return function (_x9) {
-                return _ref62.apply(this, arguments);
+                return _ref74.apply(this, arguments);
               };
             }());
             call.doHoldResume();
-            _context62.next = 1;
+            _context65.next = 1;
             return (0, _testUtil.flushPromises)(2);
           case 1:
             /* At this point , the Call State should transition to S_CALL_ESTABLISHED
@@ -3203,7 +3600,7 @@ describe('Supplementary Services tests', function () {
             roapEvent = JSON.parse((0, _stringify.default)(dummyEvent));
             /* We are intentionally failing the ROAP ANSWER */
             roapEvent.data.type = 'ANSWER';
-            _context62.next = 2;
+            _context65.next = 2;
             return call['handleOutgoingRoapAnswer']({}, dummyEvent);
           case 2:
             expect(call.isHeld()).toStrictEqual(true);
@@ -3211,14 +3608,14 @@ describe('Supplementary Services tests', function () {
             expect(call['callStateMachine'].state.value).toStrictEqual('S_CALL_ESTABLISHED');
           case 3:
           case "end":
-            return _context62.stop();
+            return _context65.stop();
         }
-      }, _callee62);
+      }, _callee65);
     })));
-    it('Handle Call resume case where successful response does not come', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee64() {
+    it('Handle Call resume case where successful response does not come', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee67() {
       var responsePayload, roapEvent;
-      return _regenerator.default.wrap(function (_context64) {
-        while (1) switch (_context64.prev = _context64.next) {
+      return _regenerator.default.wrap(function (_context67) {
+        while (1) switch (_context67.prev = _context67.next) {
           case 0:
             expect.assertions(5);
             responsePayload = {
@@ -3228,24 +3625,24 @@ describe('Supplementary Services tests', function () {
             jest.spyOn(webex, 'request').mockResolvedValue(responsePayload);
             call['held'] = true;
             call.on(_types2.CALL_EVENT_KEYS.RESUME_ERROR, /*#__PURE__*/function () {
-              var _ref64 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee63(errObj) {
-                return _regenerator.default.wrap(function (_context63) {
-                  while (1) switch (_context63.prev = _context63.next) {
+              var _ref76 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee66(errObj) {
+                return _regenerator.default.wrap(function (_context66) {
+                  while (1) switch (_context66.prev = _context66.next) {
                     case 0:
                       expect(errObj.type).toStrictEqual(_types.ERROR_TYPE.TIMEOUT);
                       expect(errObj.message).toStrictEqual('An error occurred while resuming the call. Wait a moment and try again.');
                     case 1:
                     case "end":
-                      return _context63.stop();
+                      return _context66.stop();
                   }
-                }, _callee63);
+                }, _callee66);
               }));
               return function (_x0) {
-                return _ref64.apply(this, arguments);
+                return _ref76.apply(this, arguments);
               };
             }());
             call.doHoldResume();
-            _context64.next = 1;
+            _context67.next = 1;
             return (0, _testUtil.flushPromises)(2);
           case 1:
             /* At this point ,the Call State should be S_CALL_RESUME
@@ -3258,11 +3655,11 @@ describe('Supplementary Services tests', function () {
             call['handleIncomingRoapOffer']({}, dummyEvent);
             roapEvent = JSON.parse((0, _stringify.default)(dummyEvent));
             roapEvent.data.type = 'ANSWER';
-            _context64.next = 2;
+            _context67.next = 2;
             return call['handleOutgoingRoapAnswer']({}, dummyEvent);
           case 2:
             roapEvent.data.type = 'OK';
-            _context64.next = 3;
+            _context67.next = 3;
             return call['handleRoapEstablished']({}, dummyEvent);
           case 3:
             /* Advancing timer by 12 seconds so that it gets timed out */
@@ -3272,9 +3669,9 @@ describe('Supplementary Services tests', function () {
             expect(call['callStateMachine'].state.value).toStrictEqual('S_CALL_ESTABLISHED');
           case 4:
           case "end":
-            return _context64.stop();
+            return _context67.stop();
         }
-      }, _callee64);
+      }, _callee67);
     })));
   });
   describe('Call transfer tests', function () {
@@ -3307,10 +3704,10 @@ describe('Supplementary Services tests', function () {
       secondCall.removeAllListeners(_types2.CALL_EVENT_KEYS.CALL_ERROR);
       secondCall['held'] = false;
     });
-    it('Handle successful consult transfer case ', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee67() {
+    it('Handle successful consult transfer case ', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee70() {
       var responsePayload, requestSpy, warnSpy, infoSpy, metricSpy;
-      return _regenerator.default.wrap(function (_context67) {
-        while (1) switch (_context67.prev = _context67.next) {
+      return _regenerator.default.wrap(function (_context70) {
+        while (1) switch (_context70.prev = _context70.next) {
           case 0:
             expect.assertions(12); // Updated to match actual assertion count
             responsePayload = {
@@ -3322,41 +3719,41 @@ describe('Supplementary Services tests', function () {
             infoSpy = jest.spyOn(_Logger.default, 'info');
             metricSpy = jest.spyOn(call['metricManager'], 'submitCallMetric');
             call.on(_types2.CALL_EVENT_KEYS.DISCONNECT, /*#__PURE__*/function () {
-              var _ref66 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee65(correlationId) {
-                return _regenerator.default.wrap(function (_context65) {
-                  while (1) switch (_context65.prev = _context65.next) {
+              var _ref78 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee68(correlationId) {
+                return _regenerator.default.wrap(function (_context68) {
+                  while (1) switch (_context68.prev = _context68.next) {
                     case 0:
                       expect(correlationId).toStrictEqual(call.getCorrelationId());
                     case 1:
                     case "end":
-                      return _context65.stop();
+                      return _context68.stop();
                   }
-                }, _callee65);
+                }, _callee68);
               }));
               return function (_x1) {
-                return _ref66.apply(this, arguments);
+                return _ref78.apply(this, arguments);
               };
             }());
             secondCall.on(_types2.CALL_EVENT_KEYS.DISCONNECT, /*#__PURE__*/function () {
-              var _ref67 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee66(correlationId) {
-                return _regenerator.default.wrap(function (_context66) {
-                  while (1) switch (_context66.prev = _context66.next) {
+              var _ref79 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee69(correlationId) {
+                return _regenerator.default.wrap(function (_context69) {
+                  while (1) switch (_context69.prev = _context69.next) {
                     case 0:
                       expect(correlationId).toStrictEqual(secondCall.getCorrelationId());
                     case 1:
                     case "end":
-                      return _context66.stop();
+                      return _context69.stop();
                   }
-                }, _callee66);
+                }, _callee69);
               }));
               return function (_x10) {
-                return _ref67.apply(this, arguments);
+                return _ref79.apply(this, arguments);
               };
             }());
-            _context67.next = 1;
+            _context70.next = 1;
             return call.completeTransfer(_types5.TransferType.CONSULT, secondCall.getCallId(), undefined);
           case 1:
-            _context67.next = 2;
+            _context70.next = 2;
             return (0, _testUtil.flushPromises)(2);
           case 2:
             expect(requestSpy).toBeCalled();
@@ -3379,14 +3776,14 @@ describe('Supplementary Services tests', function () {
             expect(warnSpy).not.toHaveBeenCalledWith("Consult Transfer failed for correlationId ".concat(call.getCorrelationId()), transferLoggingContext);
           case 3:
           case "end":
-            return _context67.stop();
+            return _context70.stop();
         }
-      }, _callee67);
+      }, _callee70);
     })));
-    it('Handle successful blind transfer case ', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee69() {
+    it('Handle successful blind transfer case ', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee72() {
       var responsePayload, requestSpy, warnSpy, infoSpy, metricSpy;
-      return _regenerator.default.wrap(function (_context69) {
-        while (1) switch (_context69.prev = _context69.next) {
+      return _regenerator.default.wrap(function (_context72) {
+        while (1) switch (_context72.prev = _context72.next) {
           case 0:
             expect.assertions(10); // Updated to match actual assertion count
             responsePayload = {
@@ -3398,25 +3795,25 @@ describe('Supplementary Services tests', function () {
             infoSpy = jest.spyOn(_Logger.default, 'info');
             metricSpy = jest.spyOn(call['metricManager'], 'submitCallMetric');
             call.on(_types2.CALL_EVENT_KEYS.DISCONNECT, /*#__PURE__*/function () {
-              var _ref69 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee68(correlationId) {
-                return _regenerator.default.wrap(function (_context68) {
-                  while (1) switch (_context68.prev = _context68.next) {
+              var _ref81 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee71(correlationId) {
+                return _regenerator.default.wrap(function (_context71) {
+                  while (1) switch (_context71.prev = _context71.next) {
                     case 0:
                       expect(correlationId).toStrictEqual(call.getCorrelationId());
                     case 1:
                     case "end":
-                      return _context68.stop();
+                      return _context71.stop();
                   }
-                }, _callee68);
+                }, _callee71);
               }));
               return function (_x11) {
-                return _ref69.apply(this, arguments);
+                return _ref81.apply(this, arguments);
               };
             }());
-            _context69.next = 1;
+            _context72.next = 1;
             return call.completeTransfer(_types5.TransferType.BLIND, undefined, transfereeNumber);
           case 1:
-            _context69.next = 2;
+            _context72.next = 2;
             return (0, _testUtil.flushPromises)(2);
           case 2:
             expect(requestSpy).toBeCalled();
@@ -3435,14 +3832,14 @@ describe('Supplementary Services tests', function () {
             expect(warnSpy).not.toHaveBeenCalledWith("Blind Transfer failed for correlationId ".concat(call.getCorrelationId()), transferLoggingContext);
           case 3:
           case "end":
-            return _context69.stop();
+            return _context72.stop();
         }
-      }, _callee69);
+      }, _callee72);
     })));
-    it('Handle unsuccessful blind transfer case', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee70() {
+    it('Handle unsuccessful blind transfer case', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee73() {
       var responsePayload, emitSpy, requestSpy, warnSpy, metricSpy;
-      return _regenerator.default.wrap(function (_context70) {
-        while (1) switch (_context70.prev = _context70.next) {
+      return _regenerator.default.wrap(function (_context73) {
+        while (1) switch (_context73.prev = _context73.next) {
           case 0:
             responsePayload = {
               statusCode: 403,
@@ -3453,10 +3850,10 @@ describe('Supplementary Services tests', function () {
             warnSpy = jest.spyOn(_Logger.default, 'warn');
             metricSpy = jest.spyOn(call['metricManager'], 'submitCallMetric');
             call['broadworksCorrelationInfo'] = 'dummy-broadworks-correlation-info';
-            _context70.next = 1;
+            _context73.next = 1;
             return call.completeTransfer(_types5.TransferType.BLIND, undefined, transfereeNumber);
           case 1:
-            _context70.next = 2;
+            _context73.next = 2;
             return (0, _testUtil.flushPromises)(1);
           case 2:
             expect(requestSpy).toBeCalled();
@@ -3477,14 +3874,14 @@ describe('Supplementary Services tests', function () {
             expect(metricSpy).toHaveBeenCalledWith(_types4.METRIC_EVENT.CALL_ERROR, _types4.TRANSFER_ACTION.BLIND, _types4.METRIC_TYPE.BEHAVIORAL, call.getCallId(), call.getCorrelationId(), expect.any(_Errors.CallError));
           case 3:
           case "end":
-            return _context70.stop();
+            return _context73.stop();
         }
-      }, _callee70);
+      }, _callee73);
     })));
-    it('Handle unsuccessful consult transfer case', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee71() {
+    it('Handle unsuccessful consult transfer case', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee74() {
       var responsePayload, emitSpy, requestSpy, warnSpy, metricSpy;
-      return _regenerator.default.wrap(function (_context71) {
-        while (1) switch (_context71.prev = _context71.next) {
+      return _regenerator.default.wrap(function (_context74) {
+        while (1) switch (_context74.prev = _context74.next) {
           case 0:
             responsePayload = {
               statusCode: 403,
@@ -3494,10 +3891,10 @@ describe('Supplementary Services tests', function () {
             requestSpy = jest.spyOn(webex, 'request').mockRejectedValue(responsePayload);
             warnSpy = jest.spyOn(_Logger.default, 'warn');
             metricSpy = jest.spyOn(call['metricManager'], 'submitCallMetric');
-            _context71.next = 1;
+            _context74.next = 1;
             return call.completeTransfer(_types5.TransferType.CONSULT, secondCall.getCallId(), undefined);
           case 1:
-            _context71.next = 2;
+            _context74.next = 2;
             return (0, _testUtil.flushPromises)(2);
           case 2:
             expect(requestSpy).toBeCalled();
@@ -3518,18 +3915,18 @@ describe('Supplementary Services tests', function () {
             expect(metricSpy).toHaveBeenCalledWith(_types4.METRIC_EVENT.CALL_ERROR, _types4.TRANSFER_ACTION.CONSULT, _types4.METRIC_TYPE.BEHAVIORAL, call.getCallId(), call.getCorrelationId(), expect.any(_Errors.CallError));
           case 3:
           case "end":
-            return _context71.stop();
+            return _context74.stop();
         }
-      }, _callee71);
+      }, _callee74);
     })));
-    it('Handle blind transfer with undefined transferTarget', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee72() {
+    it('Handle blind transfer with undefined transferTarget', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee75() {
       var requestSpy, warnSpy;
-      return _regenerator.default.wrap(function (_context72) {
-        while (1) switch (_context72.prev = _context72.next) {
+      return _regenerator.default.wrap(function (_context75) {
+        while (1) switch (_context75.prev = _context75.next) {
           case 0:
             requestSpy = jest.spyOn(webex, 'request');
             warnSpy = jest.spyOn(_Logger.default, 'warn');
-            _context72.next = 1;
+            _context75.next = 1;
             return call.completeTransfer(_types5.TransferType.BLIND, undefined, undefined);
           case 1:
             /* We should be in CALL_ESTABLISHED state */
@@ -3541,18 +3938,18 @@ describe('Supplementary Services tests', function () {
             expect(warnSpy).toBeCalledOnceWith("Invalid information received, transfer failed for correlationId: ".concat(call.getCorrelationId()), transferLoggingContext);
           case 2:
           case "end":
-            return _context72.stop();
+            return _context75.stop();
         }
-      }, _callee72);
+      }, _callee75);
     })));
-    it('Handle consult transfer with undefined transferCallId', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee73() {
+    it('Handle consult transfer with undefined transferCallId', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee76() {
       var requestSpy, warnSpy;
-      return _regenerator.default.wrap(function (_context73) {
-        while (1) switch (_context73.prev = _context73.next) {
+      return _regenerator.default.wrap(function (_context76) {
+        while (1) switch (_context76.prev = _context76.next) {
           case 0:
             requestSpy = jest.spyOn(webex, 'request');
             warnSpy = jest.spyOn(_Logger.default, 'warn');
-            _context73.next = 1;
+            _context76.next = 1;
             return call.completeTransfer(_types5.TransferType.CONSULT, undefined, undefined);
           case 1:
             /* We should be in CALL_ESTABLISHED state */
@@ -3564,9 +3961,9 @@ describe('Supplementary Services tests', function () {
             expect(warnSpy).toBeCalledOnceWith("Invalid information received, transfer failed for correlationId: ".concat(call.getCorrelationId()), transferLoggingContext);
           case 2:
           case "end":
-            return _context73.stop();
+            return _context76.stop();
         }
-      }, _callee73);
+      }, _callee76);
     })));
   });
 });