@webex/calling 3.10.0-next.2 → 3.10.0-next.20

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

@@ -26,7 +26,7 @@ var _callManager = require("./callManager");
 var _Logger = _interopRequireDefault(require("../../Logger"));
 var _Errors = require("../../Errors");
 var _constants2 = require("../../common/constants");
-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 _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = _Object$defineProperty) && _Object$getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+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 */
@@ -136,7 +136,7 @@ describe('Call Tests', function () {
   });
   it('should log a warning when sending a digit fails', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee() {
     var tone, errorMessage, mockMediaConnection, callManager, call, realMediaConnection, warnSpy, infoSpy;
-    return _regenerator.default.wrap(function _callee$(_context) {
+    return _regenerator.default.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           tone = '1';
@@ -171,14 +171,14 @@ describe('Call Tests', function () {
           // Restore the real mediaConnection object
           call.mediaConnection = realMediaConnection;
           call.end();
-          _context.next = 16;
+          _context.next = 1;
           return (0, _Utils.waitForMsecs)(50);
-        case 16:
+        case 1:
           // Need to add a small delay for Promise and callback to finish.
 
           /* After call ends, call manager should have 0 record */
           expect((0, _keys.default)(callManager.getActiveCalls()).length).toBe(0);
-        case 17:
+        case 2:
         case "end":
           return _context.stop();
       }
@@ -186,7 +186,7 @@ describe('Call Tests', function () {
   })));
   it('delete call object when ending the call', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee2() {
     var callManager, mockStream, localAudioStream, call, infoSpy;
-    return _regenerator.default.wrap(function _callee2$(_context2) {
+    return _regenerator.default.wrap(function (_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           webex.request.mockReturnValue({
@@ -225,9 +225,9 @@ describe('Call Tests', function () {
             file: 'call',
             method: 'end'
           });
-          _context2.next = 19;
+          _context2.next = 1;
           return (0, _Utils.waitForMsecs)(50);
-        case 19:
+        case 1:
           // Need to add a small delay for Promise and callback to finish.
           expect(parseMediaQualityStatisticsMock).toHaveBeenCalledTimes(1);
           expect(webex.request.mock.calls[0][0].body.metrics).toStrictEqual(disconnectStats);
@@ -236,7 +236,7 @@ describe('Call Tests', function () {
 
           /* After call ends, call manager should have 0 record */
           expect((0, _keys.default)(callManager.getActiveCalls()).length).toBe(0);
-        case 24:
+        case 2:
         case "end":
           return _context2.stop();
       }
@@ -244,7 +244,7 @@ describe('Call Tests', function () {
   })));
   it('Check whether media requests succeed or not', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee3() {
     var mediaResponse, call, response;
-    return _regenerator.default.wrap(function _callee3$(_context3) {
+    return _regenerator.default.wrap(function (_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
           webex.request.mockReturnValue({
@@ -268,12 +268,12 @@ describe('Call Tests', function () {
             }
           };
           call = callManager.createCall(_types3.CallDirection.INBOUND, deviceId, mockLineId, dest);
-          _context3.next = 5;
+          _context3.next = 1;
           return call['postMedia']({});
-        case 5:
+        case 1:
           response = _context3.sent;
           expect(response.body).toStrictEqual(mediaResponse.body);
-        case 7:
+        case 2:
         case "end":
           return _context3.stop();
       }
@@ -281,18 +281,18 @@ describe('Call Tests', function () {
   })));
   it('check whether callerId midcall event is serviced or not', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee4() {
     var call;
-    return _regenerator.default.wrap(function _callee4$(_context4) {
+    return _regenerator.default.wrap(function (_context4) {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
           call = callManager.createCall(_types3.CallDirection.OUTBOUND, deviceId, mockLineId, dest);
           call.handleMidCallEvent(dummyMidCallEvent);
-          _context4.next = 4;
+          _context4.next = 1;
           return (0, _Utils.waitForMsecs)(50);
-        case 4:
+        case 1:
           expect(call.getCallerInfo().name).toStrictEqual('Bob Marley');
           expect(call.getCallerInfo().num).toStrictEqual('5010');
           expect(call.getCallerInfo().avatarSrc).toBeFalsy();
-        case 7:
+        case 2:
         case "end":
           return _context4.stop();
       }
@@ -300,55 +300,55 @@ describe('Call Tests', function () {
   })));
   it('check whether call midcall event is serviced or not', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee5() {
     var call, logSpy, corelationId;
-    return _regenerator.default.wrap(function _callee5$(_context5) {
+    return _regenerator.default.wrap(function (_context5) {
       while (1) switch (_context5.prev = _context5.next) {
         case 0:
           call = callManager.createCall(_types3.CallDirection.OUTBOUND, deviceId, mockLineId, dest);
           dummyMidCallEvent.eventType = 'callState';
           logSpy = jest.spyOn(_Logger.default, 'log');
           call.handleMidCallEvent(dummyMidCallEvent);
-          _context5.next = 6;
+          _context5.next = 1;
           return (0, _Utils.waitForMsecs)(50);
-        case 6:
+        case 1:
           corelationId = call.getCorrelationId();
           expect(logSpy).toHaveBeenLastCalledWith("Received Midcall call event for correlationId : ".concat(corelationId), {
             file: 'call',
             method: 'handleMidCallEvent'
           });
-        case 8:
+        case 2:
         case "end":
           return _context5.stop();
       }
     }, _callee5);
   })));
   it('check call stats for active call', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee6() {
-    var call, callRtpStats;
-    return _regenerator.default.wrap(function _callee6$(_context6) {
+    var call, callRtpStats, _t;
+    return _regenerator.default.wrap(function (_context6) {
       while (1) switch (_context6.prev = _context6.next) {
         case 0:
           call = callManager.createCall(_types3.CallDirection.OUTBOUND, deviceId, mockLineId, dest);
           _context6.prev = 1;
-          _context6.next = 4;
+          _context6.next = 2;
           return call.getCallRtpStats();
-        case 4:
+        case 2:
           callRtpStats = _context6.sent;
-          _context6.next = 10;
+          _context6.next = 4;
           break;
-        case 7:
-          _context6.prev = 7;
-          _context6.t0 = _context6["catch"](1);
-          console.error(_context6.t0);
-        case 10:
+        case 3:
+          _context6.prev = 3;
+          _t = _context6["catch"](1);
+          console.error(_t);
+        case 4:
           expect(callRtpStats).toStrictEqual(disconnectStats);
-        case 11:
+        case 5:
         case "end":
           return _context6.stop();
       }
-    }, _callee6, null, [[1, 7]]);
+    }, _callee6, null, [[1, 3]]);
   })));
   it('dial functionality tests for coverage', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee7() {
     var mockStream, localAudioStream, warnSpy, call, bnrMetricSpy, logSpy;
-    return _regenerator.default.wrap(function _callee7$(_context7) {
+    return _regenerator.default.wrap(function (_context7) {
       while (1) switch (_context7.prev = _context7.next) {
         case 0:
           mockStream = {
@@ -380,7 +380,7 @@ describe('Call Tests', function () {
             file: 'call',
             method: 'dial'
           });
-        case 16:
+        case 1:
         case "end":
           return _context7.stop();
       }
@@ -388,7 +388,7 @@ describe('Call Tests', function () {
   })));
   it('answer functionality tests for coverage', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee8() {
     var mockStream, localAudioStream, warnSpy, call, bnrMetricSpy, infoSpy;
-    return _regenerator.default.wrap(function _callee8$(_context8) {
+    return _regenerator.default.wrap(function (_context8) {
       while (1) switch (_context8.prev = _context8.next) {
         case 0:
           mockStream = {
@@ -421,7 +421,7 @@ describe('Call Tests', function () {
           call.answer(localAudioStream);
           expect(call['callStateMachine'].state.value).toBe('S_SEND_CALL_CONNECT');
           expect(bnrMetricSpy).toBeCalledOnceWith(_types4.METRIC_EVENT.BNR_ENABLED, _types4.METRIC_TYPE.BEHAVIORAL, call.getCallId(), call.getCorrelationId());
-        case 16:
+        case 1:
         case "end":
           return _context8.stop();
       }
@@ -429,7 +429,7 @@ describe('Call Tests', function () {
   })));
   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;
-    return _regenerator.default.wrap(function _callee9$(_context9) {
+    return _regenerator.default.wrap(function (_context9) {
       while (1) switch (_context9.prev = _context9.next) {
         case 0:
           mockStream = {
@@ -486,16 +486,16 @@ describe('Call Tests', function () {
           });
           expect(bnrMetricSpy).toBeCalledOnceWith(_types4.METRIC_EVENT.BNR_DISABLED, _types4.METRIC_TYPE.BEHAVIORAL, call.getCallId(), call.getCorrelationId());
           call.end();
-          _context9.next = 35;
+          _context9.next = 1;
           return (0, _Utils.waitForMsecs)(50);
-        case 35:
+        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));
-        case 40:
+        case 2:
         case "end":
           return _context9.stop();
       }
@@ -503,7 +503,7 @@ describe('Call Tests', function () {
   })));
   it('answer fails if localAudioTrack is empty', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee0() {
     var mockStream, localAudioStream, warnSpy, call;
-    return _regenerator.default.wrap(function _callee0$(_context0) {
+    return _regenerator.default.wrap(function (_context0) {
       while (1) switch (_context0.prev = _context0.next) {
         case 0:
           mockStream = {
@@ -528,9 +528,9 @@ 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 = 8;
+          _context0.next = 1;
           return (0, _Utils.waitForMsecs)(50);
-        case 8:
+        case 1:
           expect(warnSpy).toBeCalledTimes(2);
           expect(warnSpy).toBeCalledWith("Did not find a local track while answering the call ".concat(call.getCorrelationId()), {
             file: 'call',
@@ -541,7 +541,7 @@ describe('Call Tests', function () {
           expect(call.getDisconnectReason().code).toBe(_types5.DisconnectCode.MEDIA_INACTIVITY);
           expect(call.getDisconnectReason().cause).toBe(_types5.DisconnectCause.MEDIA_INACTIVITY);
           expect(webex.request.mock.calls[0][0].body.metrics).toStrictEqual(disconnectStats);
-        case 15:
+        case 2:
         case "end":
           return _context0.stop();
       }
@@ -549,7 +549,7 @@ describe('Call Tests', function () {
   })));
   it('dial fails if localAudioTrack is empty', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee1() {
     var mockStream, localAudioStream, warnSpy, call;
-    return _regenerator.default.wrap(function _callee1$(_context1) {
+    return _regenerator.default.wrap(function (_context1) {
       while (1) switch (_context1.prev = _context1.next) {
         case 0:
           mockStream = {
@@ -562,9 +562,9 @@ 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 = 7;
+          _context1.next = 1;
           return (0, _Utils.waitForMsecs)(50);
-        case 7:
+        case 1:
           expect(warnSpy).toBeCalledTimes(1);
           expect(warnSpy).toBeCalledWith("Did not find a local track while dialing the call ".concat(call.getCorrelationId()), {
             file: 'call',
@@ -573,7 +573,7 @@ describe('Call Tests', function () {
           expect(call['callStateMachine'].state.value).toBe('S_IDLE');
           expect(call['mediaStateMachine'].state.value).toBe('S_ROAP_IDLE');
           expect(webex.request).not.toBeCalledOnceWith();
-        case 12:
+        case 2:
         case "end":
           return _context1.stop();
       }
@@ -653,7 +653,7 @@ describe('Call Tests', function () {
   });
   it('test system mute and user mute different scnearios', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee10() {
     var logSpy, callManager, mockStream, localAudioStream, call;
-    return _regenerator.default.wrap(function _callee10$(_context10) {
+    return _regenerator.default.wrap(function (_context10) {
       while (1) switch (_context10.prev = _context10.next) {
         case 0:
           logSpy = jest.spyOn(_Logger.default, 'info');
@@ -728,7 +728,7 @@ describe('Call Tests', function () {
           call.mute(localAudioStream, _types5.MUTE_TYPE.USER);
           expect(call.isMuted()).toEqual(false);
           expect(mockStream.setUserMuted).toBeCalledOnceWith(false);
-        case 37:
+        case 1:
         case "end":
           return _context10.stop();
       }
@@ -742,7 +742,7 @@ describe('Call Tests', function () {
     var call;
     it('outgoing call without guest calling must have callee', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee11() {
       var requestSpy, requestArgs;
-      return _regenerator.default.wrap(function _callee11$(_context11) {
+      return _regenerator.default.wrap(function (_context11) {
         while (1) switch (_context11.prev = _context11.next) {
           case 0:
             call = new _call.Call(activeUrl, webex, _types3.CallDirection.OUTBOUND, deviceId, mockLineId, function () {
@@ -754,7 +754,7 @@ describe('Call Tests', function () {
             call.sendCallStateMachineEvt(dummyEvent);
             requestArgs = requestSpy.mock.calls[0][0];
             expect('callee' in requestArgs.body).toBe(true);
-          case 6:
+          case 1:
           case "end":
             return _context11.stop();
         }
@@ -762,7 +762,7 @@ describe('Call Tests', function () {
     })));
     it('outgoing call for guest calling must not have callee', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee12() {
       var requestSpy, requestArgs;
-      return _regenerator.default.wrap(function _callee12$(_context12) {
+      return _regenerator.default.wrap(function (_context12) {
         while (1) switch (_context12.prev = _context12.next) {
           case 0:
             call = new _call.Call(activeUrl, webex, _types3.CallDirection.OUTBOUND, deviceId, mockLineId, function () {
@@ -774,7 +774,7 @@ describe('Call Tests', function () {
             call.sendCallStateMachineEvt(dummyEvent);
             requestArgs = requestSpy.mock.calls[0][0];
             expect('callee' in requestArgs.body).toBe(false);
-          case 6:
+          case 1:
           case "end":
             return _context12.stop();
         }
@@ -813,7 +813,7 @@ describe('State Machine handler tests', function () {
 
   it('successful session refresh', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee13() {
     var statusPayload, dummyEvent, funcSpy, logSpy;
-    return _regenerator.default.wrap(function _callee13$(_context13) {
+    return _regenerator.default.wrap(function (_context13) {
       while (1) switch (_context13.prev = _context13.next) {
         case 0:
           statusPayload = {
@@ -834,29 +834,63 @@ 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 = 11;
+          _context13.next = 1;
           return (0, _testUtil.flushPromises)(3);
-        case 11:
+        case 1:
           expect(setInterval).toHaveBeenCalledTimes(1);
+          expect(setInterval).toHaveBeenCalledWith(expect.any(Function), _constants.DEFAULT_SESSION_TIMER);
           expect(funcSpy).toBeCalledTimes(1);
           expect(logSpy).toBeCalledWith('Session refresh successful', {
             file: 'call',
-            method: 'handleCallEstablished'
+            method: 'scheduleCallKeepaliveInterval'
           });
           expect(logSpy).toHaveBeenCalledWith("".concat(_constants2.METHOD_START_MESSAGE, " with: ").concat(call.getCorrelationId()), {
             file: 'call',
             method: 'handleCallEstablished'
           });
-        case 15:
+        case 2:
         case "end":
           return _context13.stop();
       }
     }, _callee13);
   })));
-  it('session refresh failure', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee14() {
-    var statusPayload, funcSpy;
-    return _regenerator.default.wrap(function _callee14$(_context14) {
+  it('session refresh 401 emits token error and ends the call', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee14() {
+    var statusPayload, emitSpy, funcSpy;
+    return _regenerator.default.wrap(function (_context14) {
       while (1) switch (_context14.prev = _context14.next) {
+        case 0:
+          expect.assertions(4);
+          statusPayload = {
+            statusCode: 401
+          };
+          webex.request.mockReturnValue(statusPayload);
+          jest.spyOn(global, 'clearInterval');
+          emitSpy = jest.spyOn(call, 'emit');
+          call.on(_types2.CALL_EVENT_KEYS.CALL_ERROR, function (errObj) {
+            expect(errObj.type).toStrictEqual(_types.ERROR_TYPE.TOKEN_ERROR);
+          });
+          funcSpy = jest.spyOn(call, 'postStatus').mockRejectedValue(statusPayload);
+          call['handleCallEstablished']({});
+          jest.advanceTimersByTime(_constants.DEFAULT_SESSION_TIMER);
+          _context14.next = 1;
+          return _promise.default.resolve();
+        case 1:
+          _context14.next = 2;
+          return _promise.default.resolve();
+        case 2:
+          expect(clearInterval).toHaveBeenCalledTimes(1);
+          expect(funcSpy).toBeCalledTimes(1);
+          expect(emitSpy).toHaveBeenCalledWith(_types2.CALL_EVENT_KEYS.DISCONNECT, call.getCorrelationId());
+        case 3:
+        case "end":
+          return _context14.stop();
+      }
+    }, _callee14);
+  })));
+  it('session refresh failure', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee15() {
+    var statusPayload, funcSpy;
+    return _regenerator.default.wrap(function (_context15) {
+      while (1) switch (_context15.prev = _context15.next) {
         case 0:
           expect.assertions(4);
           statusPayload = {
@@ -869,35 +903,122 @@ describe('State Machine handler tests', function () {
             expect(errObj.message).toStrictEqual('An unauthorized action has been received. This action has been blocked. Please contact the administrator if this persists.');
           });
           funcSpy = jest.spyOn(call, 'postStatus').mockRejectedValue(statusPayload);
-          if (call['sessionTimer'] === undefined) {
-            /* In cases where this test is run independently/alone, there is no sessionTimer initiated
-            Thus we will check and initialize the timer when not present by calling handleCallEstablish() */
-            call['handleCallEstablished']({});
-          }
           call['handleCallEstablished']({});
           jest.advanceTimersByTime(_constants.DEFAULT_SESSION_TIMER);
 
           /* This is to flush all the promises from the Promise queue so that
            * Jest.fakeTimers can advance time and also clear the promise Queue
            */
-          _context14.next = 11;
-          return _promise.default.resolve();
-        case 11:
-          _context14.next = 13;
-          return _promise.default.resolve();
-        case 13:
-          expect(clearInterval).toHaveBeenCalledTimes(2); // check this
+          _context15.next = 1;
+          return (0, _testUtil.flushPromises)(2);
+        case 1:
+          expect(clearInterval).toHaveBeenCalledTimes(1);
           expect(funcSpy).toBeCalledTimes(1);
-        case 15:
+        case 2:
         case "end":
-          return _context14.stop();
+          return _context15.stop();
       }
-    }, _callee14);
+    }, _callee15);
+  })));
+  it('session refresh 500 schedules retry via retry-after or default interval', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee16() {
+    var errorPayload, okPayload, scheduleKeepaliveSpy, postStatusSpy;
+    return _regenerator.default.wrap(function (_context16) {
+      while (1) switch (_context16.prev = _context16.next) {
+        case 0:
+          errorPayload = {
+            statusCode: 500,
+            headers: {
+              'retry-after': 1
+            }
+          };
+          okPayload = {
+            statusCode: 200,
+            body: {}
+          };
+          scheduleKeepaliveSpy = jest.spyOn(call, 'scheduleCallKeepaliveInterval');
+          postStatusSpy = jest.spyOn(call, 'postStatus').mockRejectedValueOnce(errorPayload).mockResolvedValueOnce(okPayload);
+          if (call['sessionTimer'] === undefined) {
+            call['handleCallEstablished']({});
+          }
+          jest.advanceTimersByTime(_constants.DEFAULT_SESSION_TIMER);
+          _context16.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;
+          return (0, _testUtil.flushPromises)(2);
+        case 2:
+          expect(postStatusSpy).toHaveBeenCalledTimes(2);
+          expect(scheduleKeepaliveSpy).toHaveBeenCalledTimes(2);
+        case 3:
+        case "end":
+          return _context16.stop();
+      }
+    }, _callee16);
+  })));
+  it('keepalive ends after reaching max retry count', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee17() {
+    var errorPayload, warnSpy, postStatusSpy;
+    return _regenerator.default.wrap(function (_context17) {
+      while (1) switch (_context17.prev = _context17.next) {
+        case 0:
+          errorPayload = {
+            statusCode: 500,
+            headers: {
+              'retry-after': 1
+            }
+          };
+          jest.spyOn(global, 'clearInterval');
+          warnSpy = jest.spyOn(_Logger.default, 'warn');
+          postStatusSpy = jest.spyOn(call, 'postStatus').mockRejectedValue(errorPayload); // Put the call in the S_CALL_ESTABLISHED state and set it as connected
+          call['callStateMachine'].state.value = 'S_CALL_ESTABLISHED';
+          call['connected'] = true;
+
+          // Call handleCallEstablished which will setup interval
+          call['handleCallEstablished']({});
+
+          // Advance timer to trigger the first failure (uses DEFAULT_SESSION_TIMER)
+          jest.advanceTimersByTime(_constants.DEFAULT_SESSION_TIMER);
+          _context17.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;
+          return (0, _testUtil.flushPromises)(2);
+        case 2:
+          jest.advanceTimersByTime(1000);
+          _context17.next = 3;
+          return (0, _testUtil.flushPromises)(2);
+        case 3:
+          jest.advanceTimersByTime(1000);
+          _context17.next = 4;
+          return (0, _testUtil.flushPromises)(2);
+        case 4:
+          jest.advanceTimersByTime(1000);
+          _context17.next = 5;
+          return (0, _testUtil.flushPromises)(2);
+        case 5:
+          // The error handler should detect we're at max retry count and stop
+          expect(warnSpy).toHaveBeenCalledWith("Max keepalive retry attempts reached. Aborting call keepalive for callId: ".concat(call.getCallId()), {
+            file: 'call',
+            method: 'keepaliveRetryCallback'
+          });
+          expect(postStatusSpy).toHaveBeenCalledTimes(5);
+          expect(call['callKeepaliveRetryCount']).toBe(4);
+        case 6:
+        case "end":
+          return _context17.stop();
+      }
+    }, _callee17);
   })));
-  it('state changes during successful incoming call', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee15() {
+  it('state changes during successful incoming call', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee18() {
     var statusPayload, dummyEvent, postMediaSpy, deleteSpy, dummyOkEvent;
-    return _regenerator.default.wrap(function _callee15$(_context15) {
-      while (1) switch (_context15.prev = _context15.next) {
+    return _regenerator.default.wrap(function (_context18) {
+      while (1) switch (_context18.prev = _context18.next) {
         case 0:
           statusPayload = {
             statusCode: 200,
@@ -951,16 +1072,16 @@ describe('State Machine handler tests', function () {
           });
           expect(deleteSpy).toBeCalledOnceWith();
           expect(call['callStateMachine'].state.value).toBe('S_RECV_CALL_DISCONNECT');
-        case 27:
+        case 1:
         case "end":
-          return _context15.stop();
+          return _context18.stop();
       }
-    }, _callee15);
+    }, _callee18);
   })));
-  it('state changes during unsuccessful incoming call due to no offer', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee16() {
+  it('state changes during unsuccessful incoming call due to no offer', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee19() {
     var statusPayload, dummyEvent;
-    return _regenerator.default.wrap(function _callee16$(_context16) {
-      while (1) switch (_context16.prev = _context16.next) {
+    return _regenerator.default.wrap(function (_context19) {
+      while (1) switch (_context19.prev = _context19.next) {
         case 0:
           call['direction'] = _types3.CallDirection.INBOUND;
           statusPayload = {
@@ -978,11 +1099,11 @@ describe('State Machine handler tests', function () {
           webex.request.mockReturnValue(statusPayload);
           call.sendCallStateMachineEvt(dummyEvent);
           expect(call['callStateMachine'].state.value).toBe('S_SEND_CALL_PROGRESS');
-          _context16.next = 8;
+          _context19.next = 1;
           return call['handleOutgoingCallConnect']({
             type: 'E_SEND_CALL_CONNECT'
           });
-        case 8:
+        case 1:
           /* state should not change since there is no offer received. */
           expect(call['callStateMachine'].state.value).toBe('S_SEND_CALL_PROGRESS');
           expect(call.isConnected()).toBeFalsy();
@@ -990,16 +1111,16 @@ describe('State Machine handler tests', function () {
             type: 'E_RECV_CALL_DISCONNECT'
           });
           expect(call['callStateMachine'].state.value).toBe('S_RECV_CALL_DISCONNECT');
-        case 12:
+        case 2:
         case "end":
-          return _context16.stop();
+          return _context19.stop();
       }
-    }, _callee16);
+    }, _callee19);
   })));
-  it('state changes during unsuccessful incoming call due error in call connect', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee17() {
+  it('state changes during unsuccessful incoming call due error in call connect', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee20() {
     var warnSpy, errorSpy, stateMachineSpy, statusPayload, roapMessage;
-    return _regenerator.default.wrap(function _callee17$(_context17) {
-      while (1) switch (_context17.prev = _context17.next) {
+    return _regenerator.default.wrap(function (_context20) {
+      while (1) switch (_context20.prev = _context20.next) {
         case 0:
           warnSpy = jest.spyOn(_Logger.default, 'warn');
           errorSpy = jest.spyOn(_Logger.default, 'error');
@@ -1026,25 +1147,25 @@ describe('State Machine handler tests', function () {
           webex.request.mockRejectedValueOnce({
             statusCode: 403
           }).mockResolvedValue(statusPayload);
-          _context17.next = 13;
+          _context20.next = 1;
           return call['handleOutgoingCallConnect']({
             type: 'E_SEND_CALL_CONNECT'
           });
-        case 13:
+        case 1:
           expect(call['callStateMachine'].state.value).toBe('S_UNKNOWN');
           expect(stateMachineSpy).toBeCalledTimes(3);
           expect(warnSpy).toBeCalledTimes(3);
           expect(errorSpy).toBeCalledTimes(1);
-        case 17:
+        case 2:
         case "end":
-          return _context17.stop();
+          return _context20.stop();
       }
-    }, _callee17);
+    }, _callee20);
   })));
-  it('state changes during successful outgoing call', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee18() {
+  it('state changes during successful outgoing call', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee21() {
     var statusPayload, dummyEvent, postMediaSpy, logSpy, dummyOkEvent;
-    return _regenerator.default.wrap(function _callee18$(_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,
@@ -1118,16 +1239,16 @@ describe('State Machine handler tests', function () {
             type: 'E_SEND_CALL_DISCONNECT'
           });
           expect(call['callStateMachine'].state.value).toBe('S_SEND_CALL_DISCONNECT');
-        case 42:
+        case 1:
         case "end":
-          return _context18.stop();
+          return _context21.stop();
       }
-    }, _callee18);
+    }, _callee21);
   })));
-  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 _callee19() {
+  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 _callee22() {
     var statusPayload, dummySetupEvent, dummyConnectEvent, dummyOfferEvent, dummyAnswerEvent, dummyOkEvent, postMediaSpy;
-    return _regenerator.default.wrap(function _callee19$(_context19) {
-      while (1) switch (_context19.prev = _context19.next) {
+    return _regenerator.default.wrap(function (_context22) {
+      while (1) switch (_context22.prev = _context22.next) {
         case 0:
           statusPayload = {
             statusCode: 200,
@@ -1193,16 +1314,16 @@ describe('State Machine handler tests', function () {
             type: 'E_SEND_CALL_DISCONNECT'
           });
           expect(call['callStateMachine'].state.value).toBe('S_SEND_CALL_DISCONNECT');
-        case 25:
+        case 1:
         case "end":
-          return _context19.stop();
+          return _context22.stop();
       }
-    }, _callee19);
+    }, _callee22);
   })));
-  it('state changes during successful outgoing call with early media', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee20() {
+  it('state changes during successful outgoing call with early media', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee23() {
     var statusPayload, dummyEvent;
-    return _regenerator.default.wrap(function _callee20$(_context20) {
-      while (1) switch (_context20.prev = _context20.next) {
+    return _regenerator.default.wrap(function (_context23) {
+      while (1) switch (_context23.prev = _context23.next) {
         case 0:
           statusPayload = {
             statusCode: 200,
@@ -1239,16 +1360,16 @@ describe('State Machine handler tests', function () {
             type: 'E_RECV_CALL_DISCONNECT'
           });
           expect(call['callStateMachine'].state.value).toBe('S_RECV_CALL_DISCONNECT');
-        case 17:
+        case 1:
         case "end":
-          return _context20.stop();
+          return _context23.stop();
       }
-    }, _callee20);
+    }, _callee23);
   })));
-  it('state changes during unsuccessful outgoing call due to error in call setup', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee21() {
+  it('state changes during unsuccessful outgoing call due to error in call setup', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee24() {
     var statusPayload, dummyEvent, errorSpy;
-    return _regenerator.default.wrap(function _callee21$(_context21) {
-      while (1) switch (_context21.prev = _context21.next) {
+    return _regenerator.default.wrap(function (_context24) {
+      while (1) switch (_context24.prev = _context24.next) {
         case 0:
           statusPayload = {
             statusCode: 403,
@@ -1265,25 +1386,25 @@ describe('State Machine handler tests', function () {
           webex.request.mockRejectedValueOnce(statusPayload);
           errorSpy = jest.spyOn(_Logger.default, 'error');
           call.sendCallStateMachineEvt(dummyEvent);
-          _context21.next = 7;
+          _context24.next = 1;
           return (0, _testUtil.flushPromises)(3);
-        case 7:
+        case 1:
           expect(call['callStateMachine'].state.value).toBe('S_UNKNOWN');
           expect(errorSpy).toHaveBeenCalled();
           expect(uploadLogsSpy).toHaveBeenCalledWith({
             correlationId: call.getCorrelationId(),
             callId: call.getCallId()
           });
-        case 10:
+        case 2:
         case "end":
-          return _context21.stop();
+          return _context24.stop();
       }
-    }, _callee21);
+    }, _callee24);
   })));
-  it('state changes during unsuccessful outgoing call due to error in media ok', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee22() {
+  it('state changes during unsuccessful outgoing call due to error in media ok', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee25() {
     var statusPayload, dummyEvent, warnSpy;
-    return _regenerator.default.wrap(function _callee22$(_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: 403,
@@ -1302,33 +1423,33 @@ describe('State Machine handler tests', function () {
           webex.request.mockRejectedValue(statusPayload);
           warnSpy = jest.spyOn(_Logger.default, 'warn');
           jest.spyOn(Utils, 'uploadLogs').mockResolvedValue(undefined);
-          _context22.next = 10;
+          _context25.next = 1;
           return call['handleRoapEstablished']({}, dummyEvent);
-        case 10:
-          _context22.next = 12;
+        case 1:
+          _context25.next = 2;
           return (0, _testUtil.flushPromises)(2);
-        case 12:
+        case 2:
           expect(call.isConnected()).toBe(false);
-          expect(call['mediaStateMachine'].state.value).toBe('S_ROAP_ERROR');
-          expect(call['callStateMachine'].state.value).toBe('S_UNKNOWN');
+          expect(call['mediaStateMachine'].state.value).toBe('S_ROAP_TEARDOWN');
+          expect(call['callStateMachine'].state.value).toBe('S_CALL_CLEARED');
           expect(warnSpy).toHaveBeenCalledWith('Failed to process MediaOk request', {
             file: 'call',
             method: 'handleRoapEstablished'
           });
-          expect(uploadLogsSpy).toHaveBeenCalledWith({
-            correlationId: call.getCorrelationId(),
-            callId: call.getCallId()
+          expect(warnSpy).toHaveBeenCalledWith('Call failed due to media issue', {
+            file: 'call',
+            method: 'handleRoapError'
           });
-        case 17:
+        case 3:
         case "end":
-          return _context22.stop();
+          return _context25.stop();
       }
-    }, _callee22);
+    }, _callee25);
   })));
-  it('state changes during unsuccessful outgoing call since no sdp in offer', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee23() {
+  it('state changes during unsuccessful outgoing call since no sdp in offer', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee26() {
     var statusPayload, dummyEvent;
-    return _regenerator.default.wrap(function _callee23$(_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: 403,
@@ -1349,16 +1470,16 @@ describe('State Machine handler tests', function () {
           and an initiateOffer request to be sent to SDK only once */
           expect(call['mediaStateMachine'].state.value).toBe('S_SEND_ROAP_OFFER');
           expect(_testUtil.mediaConnection.initiateOffer).toBeCalledOnceWith();
-        case 8:
+        case 1:
         case "end":
-          return _context23.stop();
+          return _context26.stop();
       }
-    }, _callee23);
+    }, _callee26);
   })));
-  it('Outgoing Roap offer retry-after error case during midcall', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee24() {
+  it('Outgoing Roap offer retry-after error case during midcall', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee27() {
     var statusPayload, funcSpy, stateMachineSpy, dummyEvent;
-    return _regenerator.default.wrap(function _callee24$(_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: 503,
@@ -1380,9 +1501,9 @@ describe('State Machine handler tests', function () {
             }
           };
           call['connected'] = true;
-          _context24.next = 8;
+          _context27.next = 1;
           return call['handleOutgoingRoapOffer']({}, dummyEvent);
-        case 8:
+        case 1:
           jest.advanceTimersByTime(1005);
           expect(setTimeout).toHaveBeenCalledTimes(1);
           expect(funcSpy).toHaveBeenCalledWith(dummyEvent.data);
@@ -1390,16 +1511,16 @@ describe('State Machine handler tests', function () {
           /* first failure , and second because of retry-after */
           expect(funcSpy).toHaveBeenCalledTimes(2);
           expect(stateMachineSpy).toBeCalledOnceWith(dummyEvent);
-        case 13:
+        case 2:
         case "end":
-          return _context24.stop();
+          return _context27.stop();
       }
-    }, _callee24);
+    }, _callee27);
   })));
-  it('Outgoing Roap offer retry-after error case during call establishment', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee25() {
+  it('Outgoing Roap offer retry-after error case during call establishment', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee28() {
     var statusPayload, funcSpy, stateMachineSpy, dummyEvent;
-    return _regenerator.default.wrap(function _callee25$(_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: 503,
@@ -1421,25 +1542,25 @@ describe('State Machine handler tests', function () {
             }
           };
           call['connected'] = false;
-          _context25.next = 8;
+          _context28.next = 1;
           return call['handleOutgoingRoapOffer']({}, dummyEvent);
-        case 8:
+        case 1:
           jest.advanceTimersByTime(1005);
           expect(funcSpy).toBeCalledOnceWith(dummyEvent.data);
 
           /* These shouldn't be called as call is not connected yet */
           expect(setTimeout).not.toHaveBeenCalled();
           expect(stateMachineSpy).not.toBeCalled();
-        case 12:
+        case 2:
         case "end":
-          return _context25.stop();
+          return _context28.stop();
       }
-    }, _callee25);
+    }, _callee28);
   })));
-  it('Outgoing Roap Answer retry-after error case during midcall', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee26() {
+  it('Outgoing Roap Answer retry-after error case during midcall', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee29() {
     var statusPayload, funcSpy, stateMachineSpy, dummyEvent;
-    return _regenerator.default.wrap(function _callee26$(_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: 503,
@@ -1461,9 +1582,9 @@ describe('State Machine handler tests', function () {
           };
           call['connected'] = true;
           call['mediaStateMachine'].state.value = 'S_RECV_ROAP_OFFER';
-          _context26.next = 9;
+          _context29.next = 1;
           return call['handleOutgoingRoapAnswer']({}, dummyEvent);
-        case 9:
+        case 1:
           jest.advanceTimersByTime(1005);
           expect(setTimeout).toHaveBeenCalledTimes(1);
           expect(funcSpy).toHaveBeenCalledWith(dummyEvent.data);
@@ -1471,16 +1592,16 @@ describe('State Machine handler tests', function () {
           /* first failure , and second because of retry-after */
           expect(funcSpy).toHaveBeenCalledTimes(2);
           expect(stateMachineSpy).toBeCalledOnceWith(dummyEvent);
-        case 14:
+        case 2:
         case "end":
-          return _context26.stop();
+          return _context29.stop();
       }
-    }, _callee26);
+    }, _callee29);
   })));
-  it('Outgoing Roap answer retry-after error case during call establishment', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee27() {
+  it('Outgoing Roap answer retry-after error case during call establishment', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee30() {
     var statusPayload, funcSpy, stateMachineSpy, dummyEvent;
-    return _regenerator.default.wrap(function _callee27$(_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: 503,
@@ -1501,9 +1622,9 @@ describe('State Machine handler tests', function () {
             }
           };
           call['connected'] = false;
-          _context27.next = 8;
+          _context30.next = 1;
           return call['handleOutgoingRoapAnswer']({}, dummyEvent);
-        case 8:
+        case 1:
           jest.advanceTimersByTime(1005);
           expect(funcSpy).toBeCalledOnceWith(dummyEvent.data);
           expect(funcSpy).toHaveBeenCalledTimes(1);
@@ -1511,16 +1632,16 @@ describe('State Machine handler tests', function () {
           /* These shouldn't be called as call is not connected yet */
           expect(setTimeout).not.toHaveBeenCalled();
           expect(stateMachineSpy).not.toBeCalled();
-        case 13:
+        case 2:
         case "end":
-          return _context27.stop();
+          return _context30.stop();
       }
-    }, _callee27);
+    }, _callee30);
   })));
-  it('ROAP error during mid call', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee28() {
+  it('ROAP error during mid call', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee31() {
     var statusPayload, warnSpy, stateMachineSpy, funcSpy, errorEvent;
-    return _regenerator.default.wrap(function _callee28$(_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: 200,
@@ -1543,16 +1664,16 @@ describe('State Machine handler tests', function () {
           expect(funcSpy).toBeCalledOnceWith(errorEvent.data);
           expect(warnSpy).not.toHaveBeenCalled();
           expect(stateMachineSpy).not.toHaveBeenCalled();
-        case 11:
+        case 1:
         case "end":
-          return _context28.stop();
+          return _context31.stop();
       }
-    }, _callee28);
+    }, _callee31);
   })));
-  it('ROAP ok retry-after during mid call', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee29() {
+  it('ROAP ok retry-after during mid call', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee32() {
     var statusPayload, funcSpy, stateMachineSpy, dummyEvent;
-    return _regenerator.default.wrap(function _callee29$(_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,
@@ -1574,9 +1695,9 @@ describe('State Machine handler tests', function () {
           };
           call['connected'] = true;
           call['mediaStateMachine'].state.value = 'S_RECV_ROAP_ANSWER';
-          _context29.next = 9;
+          _context32.next = 1;
           return call['handleRoapEstablished']({}, dummyEvent);
-        case 9:
+        case 1:
           jest.advanceTimersByTime(1005);
           expect(setTimeout).toHaveBeenCalledTimes(1);
           expect(funcSpy).toHaveBeenCalled();
@@ -1584,16 +1705,16 @@ describe('State Machine handler tests', function () {
           /* first failure , and second because of retry-after */
           expect(funcSpy).toHaveBeenCalledTimes(2);
           expect(stateMachineSpy).toBeCalledOnceWith(dummyEvent);
-        case 14:
+        case 2:
         case "end":
-          return _context29.stop();
+          return _context32.stop();
       }
-    }, _callee29);
+    }, _callee32);
   })));
-  it('Unable to communicate roap error with mobius', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee30() {
+  it('Unable to communicate roap error with mobius', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee33() {
     var statusPayload, stateMachineSpy, funcSpy, errorEvent;
-    return _regenerator.default.wrap(function _callee30$(_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: 403,
@@ -1614,16 +1735,16 @@ describe('State Machine handler tests', function () {
           call.sendMediaStateMachineEvt(errorEvent);
           expect(funcSpy).toBeCalledOnceWith(errorEvent.data);
           expect(stateMachineSpy).not.toHaveBeenCalled();
-        case 9:
+        case 1:
         case "end":
-          return _context30.stop();
+          return _context33.stop();
       }
-    }, _callee30);
+    }, _callee33);
   })));
-  it('ROAP error during call establishment', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee31() {
+  it('ROAP error during call establishment', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee34() {
     var statusPayload, warnSpy, stateMachineSpy, funcSpy, errorEvent;
-    return _regenerator.default.wrap(function _callee31$(_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: 200,
@@ -1641,9 +1762,9 @@ describe('State Machine handler tests', function () {
             }
           };
           call['connected'] = false;
-          _context31.next = 8;
+          _context34.next = 1;
           return call['handleRoapError']({}, errorEvent);
-        case 8:
+        case 1:
           expect(funcSpy).toBeCalledOnceWith(errorEvent.data);
           expect(warnSpy).toBeCalledOnceWith('Call failed due to media issue', {
             file: 'call',
@@ -1655,16 +1776,82 @@ describe('State Machine handler tests', function () {
             },
             type: 'E_UNKNOWN'
           });
-        case 11:
+        case 2:
         case "end":
-          return _context31.stop();
+          return _context34.stop();
       }
-    }, _callee31);
+    }, _callee34);
   })));
-  it('state changes during successful incoming call with out of order events', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee32() {
+  it('incoming call: failing ROAP_ANSWER posts error path and tears down', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee35() {
+    var statusPayload, warnSpy, postMediaSpy, setupEvent, connectEvent, offerEvent, answerEvent;
+    return _regenerator.default.wrap(function (_context35) {
+      while (1) switch (_context35.prev = _context35.next) {
+        case 0:
+          statusPayload = {
+            statusCode: 403,
+            body: mockStatusBody
+          };
+          warnSpy = jest.spyOn(_Logger.default, 'warn');
+          postMediaSpy = jest.spyOn(call, 'postMedia').mockRejectedValueOnce(statusPayload); // Simulate inbound call flow
+          call['direction'] = _types3.CallDirection.INBOUND;
+          setupEvent = {
+            type: 'E_RECV_CALL_SETUP',
+            data: {
+              seq: 1,
+              messageType: 'OFFER'
+            }
+          };
+          call.sendCallStateMachineEvt(setupEvent);
+          expect(call['callStateMachine'].state.value).toBe('S_SEND_CALL_PROGRESS');
+          connectEvent = {
+            type: 'E_SEND_CALL_CONNECT'
+          };
+          call.sendCallStateMachineEvt(connectEvent);
+          expect(call['callStateMachine'].state.value).toBe('S_SEND_CALL_CONNECT');
+          offerEvent = {
+            type: 'E_RECV_ROAP_OFFER',
+            data: {
+              seq: 1,
+              messageType: 'OFFER'
+            }
+          };
+          call.sendMediaStateMachineEvt(offerEvent);
+          answerEvent = {
+            type: 'E_SEND_ROAP_ANSWER',
+            data: {
+              seq: 1,
+              messageType: 'ANSWER'
+            }
+          };
+          _context35.next = 1;
+          return call.sendMediaStateMachineEvt(answerEvent);
+        case 1:
+          _context35.next = 2;
+          return (0, _testUtil.flushPromises)(2);
+        case 2:
+          expect(postMediaSpy).toBeCalledOnceWith(answerEvent.data);
+          expect(warnSpy).toHaveBeenCalledWith('Failed to send MediaAnswer request', {
+            file: 'call',
+            method: 'handleOutgoingRoapAnswer'
+          });
+          expect(warnSpy).toHaveBeenCalledWith('Call failed due to media issue', {
+            file: 'call',
+            method: 'handleRoapError'
+          });
+
+          // 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 "end":
+          return _context35.stop();
+      }
+    }, _callee35);
+  })));
+  it('state changes during successful incoming call with out of order events', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee36() {
     var statusPayload, dummyEvent, postMediaSpy, dummyOkEvent, dummyOfferEvent;
-    return _regenerator.default.wrap(function _callee32$(_context32) {
-      while (1) switch (_context32.prev = _context32.next) {
+    return _regenerator.default.wrap(function (_context36) {
+      while (1) switch (_context36.prev = _context36.next) {
         case 0:
           statusPayload = {
             statusCode: 200,
@@ -1697,9 +1884,9 @@ describe('State Machine handler tests', function () {
             seq: 1,
             messageType: 'ANSWER'
           };
-          _context32.next = 17;
+          _context36.next = 1;
           return call.sendMediaStateMachineEvt(dummyEvent);
-        case 17:
+        case 1:
           expect(postMediaSpy).toBeCalledOnceWith(dummyEvent.data);
 
           /* we receive roap Offer Request followed by roap Ok from mobius and handle
@@ -1719,9 +1906,9 @@ describe('State Machine handler tests', function () {
             seq: 2,
             messageType: 'OFFER_REQUEST'
           };
-          _context32.next = 23;
+          _context36.next = 2;
           return call.sendMediaStateMachineEvt(dummyEvent);
-        case 23:
+        case 2:
           expect(call['receivedRoapOKSeq']).toBe(0);
           expect(_testUtil.mediaConnection.roapMessageReceived).not.toHaveBeenLastCalledWith(dummyEvent.data);
           call.sendMediaStateMachineEvt(dummyOkEvent);
@@ -1769,18 +1956,18 @@ describe('State Machine handler tests', function () {
           };
           call.sendCallStateMachineEvt(dummyEvent);
           dummyEvent.type = 'E_RECV_ROAP_OFFER';
-          _context32.next = 49;
+          _context36.next = 3;
           return call.sendMediaStateMachineEvt(dummyEvent);
-        case 49:
+        case 3:
           expect(_testUtil.mediaConnection.roapMessageReceived).toHaveBeenLastCalledWith(dummyEvent.data);
           dummyEvent.type = 'E_SEND_ROAP_ANSWER';
           dummyEvent.data = {
             seq: 3,
             messageType: 'ANSWER'
           };
-          _context32.next = 54;
+          _context36.next = 4;
           return call.sendMediaStateMachineEvt(dummyEvent);
-        case 54:
+        case 4:
           expect(postMediaSpy).toHaveBeenLastCalledWith(dummyEvent.data);
           dummyEvent.type = 'E_RECV_ROAP_OFFER';
           dummyEvent.data = {
@@ -1797,9 +1984,9 @@ describe('State Machine handler tests', function () {
               messageType: 'OK'
             }
           };
-          _context32.next = 63;
+          _context36.next = 5;
           return call.sendMediaStateMachineEvt(dummyOkEvent);
-        case 63:
+        case 5:
           expect(_testUtil.mediaConnection.roapMessageReceived).toHaveBeenNthCalledWith(6, dummyOkEvent.data.message);
           expect(_testUtil.mediaConnection.roapMessageReceived).toHaveBeenLastCalledWith(dummyEvent.data);
           dummyEvent.type = 'E_SEND_ROAP_ANSWER';
@@ -1810,16 +1997,16 @@ describe('State Machine handler tests', function () {
           expect(call['mediaStateMachine'].state.value).toBe('S_RECV_ROAP_OFFER');
           call.sendMediaStateMachineEvt(dummyEvent);
           expect(postMediaSpy).toHaveBeenLastCalledWith(dummyEvent.data);
-        case 70:
+        case 6:
         case "end":
-          return _context32.stop();
+          return _context36.stop();
       }
-    }, _callee32);
+    }, _callee36);
   })));
-  it('successfully handles out of order events when ROAP OK is received while executing outgoingRoapAnswer', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee33() {
+  it('successfully handles out of order events when ROAP OK is received while executing outgoingRoapAnswer', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee37() {
     var mockStatusBody, statusPayload, dummyEvent, postMediaSpy, dummyOkEvent, dummyOfferEvent;
-    return _regenerator.default.wrap(function _callee33$(_context33) {
-      while (1) switch (_context33.prev = _context33.next) {
+    return _regenerator.default.wrap(function (_context37) {
+      while (1) switch (_context37.prev = _context37.next) {
         case 0:
           mockStatusBody = {
             device: {
@@ -1859,9 +2046,9 @@ describe('State Machine handler tests', function () {
             seq: 1,
             messageType: 'ANSWER'
           };
-          _context33.next = 18;
+          _context37.next = 1;
           return call.sendMediaStateMachineEvt(dummyEvent);
-        case 18:
+        case 1:
           expect(postMediaSpy).toBeCalledOnceWith(dummyEvent.data);
 
           /* we receive roap Offer Request followed by roap Ok from mobius and handle
@@ -1881,9 +2068,9 @@ describe('State Machine handler tests', function () {
             seq: 2,
             messageType: 'OFFER_REQUEST'
           };
-          _context33.next = 24;
+          _context37.next = 2;
           return call.sendMediaStateMachineEvt(dummyEvent);
-        case 24:
+        case 2:
           expect(call['receivedRoapOKSeq']).toBe(0);
           expect(_testUtil.mediaConnection.roapMessageReceived).not.toHaveBeenLastCalledWith(dummyEvent.data);
           call.sendMediaStateMachineEvt(dummyOkEvent);
@@ -1931,18 +2118,18 @@ describe('State Machine handler tests', function () {
           };
           call.sendCallStateMachineEvt(dummyEvent);
           dummyEvent.type = 'E_RECV_ROAP_OFFER';
-          _context33.next = 50;
+          _context37.next = 3;
           return call.sendMediaStateMachineEvt(dummyEvent);
-        case 50:
+        case 3:
           expect(_testUtil.mediaConnection.roapMessageReceived).toHaveBeenLastCalledWith(dummyEvent.data);
           dummyEvent.type = 'E_SEND_ROAP_ANSWER';
           dummyEvent.data = {
             seq: 3,
             messageType: 'ANSWER'
           };
-          _context33.next = 55;
+          _context37.next = 4;
           return call.sendMediaStateMachineEvt(dummyEvent);
-        case 55:
+        case 4:
           expect(postMediaSpy).toHaveBeenLastCalledWith(dummyEvent.data);
           dummyEvent.type = 'E_RECV_ROAP_OFFER';
           dummyEvent.data = {
@@ -1957,9 +2144,9 @@ describe('State Machine handler tests', function () {
             }
           };
           call.sendMediaStateMachineEvt(dummyEvent);
-          _context33.next = 62;
+          _context37.next = 5;
           return call.sendMediaStateMachineEvt(dummyOkEvent);
-        case 62:
+        case 5:
           expect(call['receivedRoapOKSeq']).toBe(3);
           expect(_testUtil.mediaConnection.roapMessageReceived).toHaveBeenNthCalledWith(6, dummyOkEvent.data.message);
           expect(_testUtil.mediaConnection.roapMessageReceived).toHaveBeenLastCalledWith(dummyEvent.data);
@@ -1971,16 +2158,16 @@ describe('State Machine handler tests', function () {
           expect(call['mediaStateMachine'].state.value).toBe('S_RECV_ROAP_OFFER');
           call.sendMediaStateMachineEvt(dummyEvent);
           expect(postMediaSpy).toHaveBeenLastCalledWith(dummyEvent.data);
-        case 70:
+        case 6:
         case "end":
-          return _context33.stop();
+          return _context37.stop();
       }
-    }, _callee33);
+    }, _callee37);
   })));
-  it('handle hold event successfully when media received after progress but before connect', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee34() {
+  it('handle hold event successfully when media received after progress but before connect', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee38() {
     var statusPayload, dummyEvent, postMediaSpy, infoSpy, dummyOkEvent;
-    return _regenerator.default.wrap(function _callee34$(_context34) {
-      while (1) switch (_context34.prev = _context34.next) {
+    return _regenerator.default.wrap(function (_context38) {
+      while (1) switch (_context38.prev = _context38.next) {
         case 0:
           statusPayload = {
             statusCode: 200,
@@ -2045,11 +2232,35 @@ describe('State Machine handler tests', function () {
             file: 'call',
             method: 'handleCallHold'
           });
-        case 33:
+        case 1:
         case "end":
-          return _context34.stop();
+          return _context38.stop();
       }
-    }, _callee34);
+    }, _callee38);
+  })));
+  it('emits DISCONNECT before mobius delete request is invoked', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee39() {
+    var emitSpy, deleteSpy;
+    return _regenerator.default.wrap(function (_context39) {
+      while (1) switch (_context39.prev = _context39.next) {
+        case 0:
+          emitSpy = jest.spyOn(call, 'emit');
+          deleteSpy = jest.spyOn(call, 'delete').mockResolvedValue({
+            statusCode: 200
+          });
+          call.sendCallStateMachineEvt({
+            type: 'E_RECV_CALL_DISCONNECT'
+          });
+          _context39.next = 1;
+          return (0, _testUtil.flushPromises)(1);
+        case 1:
+          expect(emitSpy).toHaveBeenCalledWith(_types2.CALL_EVENT_KEYS.DISCONNECT, call.getCorrelationId());
+          expect(deleteSpy).toHaveBeenCalled();
+          expect(emitSpy.mock.invocationCallOrder[0]).toBeLessThan(deleteSpy.mock.invocationCallOrder[0]);
+        case 2:
+        case "end":
+          return _context39.stop();
+      }
+    }, _callee39);
   })));
   describe('Call event timers tests', function () {
     var callManager;
@@ -2060,10 +2271,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 _callee35() {
+    it('times out if the next event is not received - 60 seconds timeout', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee40() {
       var statusPayload, dummyEvent, logSpy, emitSpy, deleteSpy, dummyOkEvent;
-      return _regenerator.default.wrap(function _callee35$(_context35) {
-        while (1) switch (_context35.prev = _context35.next) {
+      return _regenerator.default.wrap(function (_context40) {
+        while (1) switch (_context40.prev = _context40.next) {
           case 0:
             statusPayload = {
               statusCode: 200,
@@ -2080,9 +2291,9 @@ describe('State Machine handler tests', function () {
             webex.request.mockReturnValue(statusPayload);
 
             // handleOutgoingCallSetup is asynchronous
-            _context35.next = 9;
+            _context40.next = 1;
             return call.sendCallStateMachineEvt(dummyEvent);
-          case 9:
+          case 1:
             expect(call['callStateMachine'].state.value).toBe('S_SEND_CALL_SETUP');
             dummyEvent.type = 'E_RECV_CALL_PROGRESS';
             call.sendCallStateMachineEvt(dummyEvent);
@@ -2121,16 +2332,16 @@ describe('State Machine handler tests', function () {
             expect(emitSpy).toHaveBeenCalledWith(_types2.CALL_EVENT_KEYS.DISCONNECT, call.getCorrelationId());
             expect(deleteSpy).toHaveBeenCalledTimes(1);
             expect(callManager.callCollection).toStrictEqual({});
-          case 32:
+          case 2:
           case "end":
-            return _context35.stop();
+            return _context40.stop();
         }
-      }, _callee35);
+      }, _callee40);
     })));
-    it('times out if the next event is not received - 10 seconds timeout', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee36() {
+    it('times out if the next event is not received - 10 seconds timeout', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee41() {
       var statusPayload, dummyEvent, call, emitSpy, deleteSpy, logSpy;
-      return _regenerator.default.wrap(function _callee36$(_context36) {
-        while (1) switch (_context36.prev = _context36.next) {
+      return _regenerator.default.wrap(function (_context41) {
+        while (1) switch (_context41.prev = _context41.next) {
           case 0:
             statusPayload = {
               statusCode: 200,
@@ -2149,9 +2360,9 @@ describe('State Machine handler tests', function () {
             expect((0, _keys.default)(callManager.callCollection)[0]).toBe(call.getCorrelationId());
 
             // handleOutgoingCallSetup is asynchronous
-            _context36.next = 11;
+            _context41.next = 1;
             return call.sendCallStateMachineEvt(dummyEvent);
-          case 11:
+          case 1:
             expect(call['callStateMachine'].state.value).toBe('S_SEND_CALL_SETUP');
             logSpy.mockClear();
             jest.advanceTimersByTime(10000);
@@ -2159,11 +2370,11 @@ describe('State Machine handler tests', function () {
             expect(emitSpy).toHaveBeenCalledWith(_types2.CALL_EVENT_KEYS.DISCONNECT, call.getCorrelationId());
             expect(deleteSpy).toHaveBeenCalledTimes(1);
             expect(callManager.callCollection).toStrictEqual({});
-          case 18:
+          case 2:
           case "end":
-            return _context36.stop();
+            return _context41.stop();
         }
-      }, _callee36);
+      }, _callee41);
     })));
   });
 });
@@ -2223,10 +2434,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 _callee38() {
+    it('Handle successful Call hold case without delayed http response', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee43() {
       var responsePayload, warnSpy, roapEvent;
-      return _regenerator.default.wrap(function _callee38$(_context38) {
-        while (1) switch (_context38.prev = _context38.next) {
+      return _regenerator.default.wrap(function (_context43) {
+        while (1) switch (_context43.prev = _context43.next) {
           case 0:
             expect.assertions(7);
             responsePayload = {
@@ -2239,27 +2450,27 @@ describe('Supplementary Services tests', function () {
             warnSpy = jest.spyOn(_Logger.default, 'warn');
             call['held'] = false;
             call.on(_types2.CALL_EVENT_KEYS.HELD, /*#__PURE__*/function () {
-              var _ref38 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee37(correlationId) {
-                return _regenerator.default.wrap(function _callee37$(_context37) {
-                  while (1) switch (_context37.prev = _context37.next) {
+              var _ref43 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee42(correlationId) {
+                return _regenerator.default.wrap(function (_context42) {
+                  while (1) switch (_context42.prev = _context42.next) {
                     case 0:
                       expect(correlationId).toStrictEqual(call.getCorrelationId());
                     case 1:
                     case "end":
-                      return _context37.stop();
+                      return _context42.stop();
                   }
-                }, _callee37);
+                }, _callee42);
               }));
               return function (_x) {
-                return _ref38.apply(this, arguments);
+                return _ref43.apply(this, arguments);
               };
             }());
-            _context38.next = 10;
+            _context43.next = 1;
             return call.doHoldResume();
-          case 10:
-            _context38.next = 12;
+          case 1:
+            _context43.next = 2;
             return (0, _testUtil.flushPromises)(2);
-          case 12:
+          case 2:
             expect(setTimeout).toHaveBeenCalledTimes(1);
             call.handleMidCallEvent(mockHeldEvent);
 
@@ -2273,13 +2484,13 @@ describe('Supplementary Services tests', function () {
             call['handleIncomingRoapOffer']({}, dummyEvent);
             roapEvent = JSON.parse((0, _stringify.default)(dummyEvent));
             roapEvent.data.type = 'ANSWER';
-            _context38.next = 20;
+            _context43.next = 3;
             return call['handleOutgoingRoapAnswer']({}, dummyEvent);
-          case 20:
+          case 3:
             roapEvent.data.type = 'OK';
-            _context38.next = 23;
+            _context43.next = 4;
             return call['handleRoapEstablished']({}, dummyEvent);
-          case 23:
+          case 4:
             expect(clearTimeout).toHaveBeenCalledTimes(1);
             /* isHeld flag should be set and an Hold event should be emitted */
             expect(call.isHeld()).toStrictEqual(true);
@@ -2290,16 +2501,16 @@ describe('Supplementary Services tests', function () {
               file: 'call',
               method: 'handleCallHold'
             });
-          case 28:
+          case 5:
           case "end":
-            return _context38.stop();
+            return _context43.stop();
         }
-      }, _callee38);
+      }, _callee43);
     })));
-    it('Handle successful Call hold case with delayed http response', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee40() {
+    it('Handle successful Call hold case with delayed http response', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee45() {
       var responsePayload, warnSpy, roapEvent;
-      return _regenerator.default.wrap(function _callee40$(_context40) {
-        while (1) switch (_context40.prev = _context40.next) {
+      return _regenerator.default.wrap(function (_context45) {
+        while (1) switch (_context45.prev = _context45.next) {
           case 0:
             expect.assertions(8);
             responsePayload = {
@@ -2312,28 +2523,28 @@ describe('Supplementary Services tests', function () {
             warnSpy = jest.spyOn(_Logger.default, 'warn');
             call['held'] = false;
             call.on(_types2.CALL_EVENT_KEYS.HELD, /*#__PURE__*/function () {
-              var _ref40 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee39(correlationId) {
-                return _regenerator.default.wrap(function _callee39$(_context39) {
-                  while (1) switch (_context39.prev = _context39.next) {
+              var _ref45 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee44(correlationId) {
+                return _regenerator.default.wrap(function (_context44) {
+                  while (1) switch (_context44.prev = _context44.next) {
                     case 0:
                       expect(correlationId).toStrictEqual(call.getCorrelationId());
                     case 1:
                     case "end":
-                      return _context39.stop();
+                      return _context44.stop();
                   }
-                }, _callee39);
+                }, _callee44);
               }));
               return function (_x2) {
-                return _ref40.apply(this, arguments);
+                return _ref45.apply(this, arguments);
               };
             }());
             call.doHoldResume();
-            _context40.next = 11;
+            _context45.next = 1;
             return _promise.default.resolve();
-          case 11:
-            _context40.next = 13;
+          case 1:
+            _context45.next = 2;
             return _promise.default.resolve();
-          case 13:
+          case 2:
             expect(setTimeout).not.toHaveBeenCalled();
             call.handleMidCallEvent(mockHeldEvent);
 
@@ -2347,13 +2558,13 @@ describe('Supplementary Services tests', function () {
             call['handleIncomingRoapOffer']({}, dummyEvent);
             roapEvent = JSON.parse((0, _stringify.default)(dummyEvent));
             roapEvent.data.type = 'ANSWER';
-            _context40.next = 22;
+            _context45.next = 3;
             return call['handleOutgoingRoapAnswer']({}, dummyEvent);
-          case 22:
+          case 3:
             roapEvent.data.type = 'OK';
-            _context40.next = 25;
+            _context45.next = 4;
             return call['handleRoapEstablished']({}, dummyEvent);
-          case 25:
+          case 4:
             expect(clearTimeout).not.toHaveBeenCalled();
             /* isHeld flag should be set and an Hold event should be emitted */
             expect(call.isHeld()).toStrictEqual(true);
@@ -2364,16 +2575,16 @@ describe('Supplementary Services tests', function () {
               file: 'call',
               method: 'handleCallHold'
             });
-          case 30:
+          case 5:
           case "end":
-            return _context40.stop();
+            return _context45.stop();
         }
-      }, _callee40);
+      }, _callee45);
     })));
-    it('Handle failure Call Hold case during signalling', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee42() {
+    it('Handle failure Call Hold case during signalling', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee47() {
       var responsePayload;
-      return _regenerator.default.wrap(function _callee42$(_context42) {
-        while (1) switch (_context42.prev = _context42.next) {
+      return _regenerator.default.wrap(function (_context47) {
+        while (1) switch (_context47.prev = _context47.next) {
           case 0:
             expect.assertions(4);
             responsePayload = {
@@ -2383,43 +2594,43 @@ 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 _ref42 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee41(errObj) {
-                return _regenerator.default.wrap(function _callee41$(_context41) {
-                  while (1) switch (_context41.prev = _context41.next) {
+              var _ref47 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee46(errObj) {
+                return _regenerator.default.wrap(function (_context46) {
+                  while (1) switch (_context46.prev = _context46.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 2:
+                    case 1:
                     case "end":
-                      return _context41.stop();
+                      return _context46.stop();
                   }
-                }, _callee41);
+                }, _callee46);
               }));
               return function (_x3) {
-                return _ref42.apply(this, arguments);
+                return _ref47.apply(this, arguments);
               };
             }());
-            _context42.next = 7;
+            _context47.next = 1;
             return call.doHoldResume();
-          case 7:
-            _context42.next = 9;
+          case 1:
+            _context47.next = 2;
             return (0, _testUtil.flushPromises)(2);
-          case 9:
+          case 2:
             expect(call.isHeld()).toStrictEqual(false);
 
             /* At this point , the Call State should transition to S_CALL_ESTABLISHED
              */
             expect(call['callStateMachine'].state.value).toStrictEqual('S_CALL_ESTABLISHED');
-          case 11:
+          case 3:
           case "end":
-            return _context42.stop();
+            return _context47.stop();
         }
-      }, _callee42);
+      }, _callee47);
     })));
-    it('Handle failure Call Hold case during offer/answer exchange', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee44() {
+    it('Handle failure Call Hold case during offer/answer exchange', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee49() {
       var responsePayload, rejectPayload, roapEvent;
-      return _regenerator.default.wrap(function _callee44$(_context44) {
-        while (1) switch (_context44.prev = _context44.next) {
+      return _regenerator.default.wrap(function (_context49) {
+        while (1) switch (_context49.prev = _context49.next) {
           case 0:
             expect.assertions(5);
             responsePayload = {
@@ -2433,26 +2644,26 @@ 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 _ref44 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee43(errObj) {
-                return _regenerator.default.wrap(function _callee43$(_context43) {
-                  while (1) switch (_context43.prev = _context43.next) {
+              var _ref49 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee48(errObj) {
+                return _regenerator.default.wrap(function (_context48) {
+                  while (1) switch (_context48.prev = _context48.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 2:
+                    case 1:
                     case "end":
-                      return _context43.stop();
+                      return _context48.stop();
                   }
-                }, _callee43);
+                }, _callee48);
               }));
               return function (_x4) {
-                return _ref44.apply(this, arguments);
+                return _ref49.apply(this, arguments);
               };
             }());
             call.doHoldResume();
-            _context44.next = 9;
+            _context49.next = 1;
             return (0, _testUtil.flushPromises)(2);
-          case 9:
+          case 1:
             /* the Call State should transition to S_CALL_ESTABLISHED
              */
             expect(call['callStateMachine'].state.value).toStrictEqual('S_CALL_HOLD');
@@ -2460,22 +2671,22 @@ describe('Supplementary Services tests', function () {
             roapEvent = JSON.parse((0, _stringify.default)(dummyEvent));
             /* We are intentionally failing the ROAP ANSWER */
             roapEvent.data.type = 'ANSWER';
-            _context44.next = 15;
+            _context49.next = 2;
             return call['handleOutgoingRoapAnswer']({}, dummyEvent);
-          case 15:
+          case 2:
             expect(call.isHeld()).toStrictEqual(false);
             /* We should return back to call established state */
             expect(call['callStateMachine'].state.value).toStrictEqual('S_CALL_ESTABLISHED');
-          case 17:
+          case 3:
           case "end":
-            return _context44.stop();
+            return _context49.stop();
         }
-      }, _callee44);
+      }, _callee49);
     })));
-    it('Handle failure Call Hold case during roap ok out', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee45() {
+    it('Handle failure Call Hold case during roap ok out', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee50() {
       var responsePayload, warnSpy, roapEvent;
-      return _regenerator.default.wrap(function _callee45$(_context45) {
-        while (1) switch (_context45.prev = _context45.next) {
+      return _regenerator.default.wrap(function (_context50) {
+        while (1) switch (_context50.prev = _context50.next) {
           case 0:
             responsePayload = {
               statusCode: 200,
@@ -2486,12 +2697,12 @@ describe('Supplementary Services tests', function () {
             jest.spyOn(global, 'clearTimeout');
             warnSpy = jest.spyOn(_Logger.default, 'warn');
             call['held'] = false;
-            _context45.next = 8;
+            _context50.next = 1;
             return call.doHoldResume();
-          case 8:
-            _context45.next = 10;
+          case 1:
+            _context50.next = 2;
             return (0, _testUtil.flushPromises)(2);
-          case 10:
+          case 2:
             expect(setTimeout).toHaveBeenCalledTimes(1);
 
             /* At this point, the Call State should be S_CALL_HOLD
@@ -2504,21 +2715,21 @@ describe('Supplementary Services tests', function () {
             call['handleIncomingRoapOffer']({}, dummyEvent);
             roapEvent = JSON.parse((0, _stringify.default)(dummyEvent));
             roapEvent.data.type = 'ANSWER';
-            _context45.next = 17;
+            _context50.next = 3;
             return call['handleOutgoingRoapAnswer']({}, dummyEvent);
-          case 17:
+          case 3:
             jest.spyOn(webex, 'request').mockRejectedValue({
               statusCode: 403
             });
             roapEvent.data.type = 'OK';
-            _context45.next = 21;
+            _context50.next = 4;
             return call['handleRoapEstablished']({}, dummyEvent);
-          case 21:
+          case 4:
             /* this is for coverage */
             call['callStateMachine'].state.value = 'S_CALL_HOLD';
-            _context45.next = 24;
+            _context50.next = 5;
             return call['handleRoapEstablished']({}, dummyEvent);
-          case 24:
+          case 5:
             expect(call.isHeld()).toStrictEqual(false);
             /* We should return back to call established state */
             expect(call['callStateMachine'].state.value).toStrictEqual('S_CALL_ESTABLISHED');
@@ -2526,16 +2737,16 @@ describe('Supplementary Services tests', function () {
               file: 'call',
               method: 'handleRoapEstablished'
             });
-          case 27:
+          case 6:
           case "end":
-            return _context45.stop();
+            return _context50.stop();
         }
-      }, _callee45);
+      }, _callee50);
     })));
-    it('Handle failure Call resume case during roap ok out', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee46() {
+    it('Handle failure Call resume case during roap ok out', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee51() {
       var responsePayload, warnSpy, roapEvent;
-      return _regenerator.default.wrap(function _callee46$(_context46) {
-        while (1) switch (_context46.prev = _context46.next) {
+      return _regenerator.default.wrap(function (_context51) {
+        while (1) switch (_context51.prev = _context51.next) {
           case 0:
             responsePayload = {
               statusCode: 200,
@@ -2546,12 +2757,12 @@ describe('Supplementary Services tests', function () {
             jest.spyOn(global, 'clearTimeout');
             warnSpy = jest.spyOn(_Logger.default, 'warn');
             call['held'] = true;
-            _context46.next = 8;
+            _context51.next = 1;
             return call.doHoldResume();
-          case 8:
-            _context46.next = 10;
+          case 1:
+            _context51.next = 2;
             return (0, _testUtil.flushPromises)(2);
-          case 10:
+          case 2:
             expect(setTimeout).toHaveBeenCalledTimes(1);
 
             /* At this point, the Call State should be S_CALL_RESUME
@@ -2564,16 +2775,16 @@ describe('Supplementary Services tests', function () {
             call['handleIncomingRoapOffer']({}, dummyEvent);
             roapEvent = JSON.parse((0, _stringify.default)(dummyEvent));
             roapEvent.data.type = 'ANSWER';
-            _context46.next = 17;
+            _context51.next = 3;
             return call['handleOutgoingRoapAnswer']({}, dummyEvent);
-          case 17:
+          case 3:
             jest.spyOn(webex, 'request').mockRejectedValue({
               statusCode: 403
             });
             roapEvent.data.type = 'OK';
-            _context46.next = 21;
+            _context51.next = 4;
             return call['handleRoapEstablished']({}, dummyEvent);
-          case 21:
+          case 4:
             expect(call.isHeld()).toStrictEqual(true);
             /* We should return back to call established state */
             expect(call['callStateMachine'].state.value).toStrictEqual('S_CALL_ESTABLISHED');
@@ -2581,16 +2792,16 @@ describe('Supplementary Services tests', function () {
               file: 'call',
               method: 'handleRoapEstablished'
             });
-          case 24:
+          case 5:
           case "end":
-            return _context46.stop();
+            return _context51.stop();
         }
-      }, _callee46);
+      }, _callee51);
     })));
-    it('Handle Call hold case where successful Held response does not come', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee48() {
+    it('Handle Call hold case where successful Held response does not come', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee53() {
       var responsePayload, roapEvent;
-      return _regenerator.default.wrap(function _callee48$(_context48) {
-        while (1) switch (_context48.prev = _context48.next) {
+      return _regenerator.default.wrap(function (_context53) {
+        while (1) switch (_context53.prev = _context53.next) {
           case 0:
             expect.assertions(5);
             responsePayload = {
@@ -2600,27 +2811,27 @@ 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 _ref48 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee47(errObj) {
-                return _regenerator.default.wrap(function _callee47$(_context47) {
-                  while (1) switch (_context47.prev = _context47.next) {
+              var _ref53 = (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.TIMEOUT);
                       expect(errObj.message).toStrictEqual('An error occurred while placing the call on hold. Wait a moment and try again.');
-                    case 2:
+                    case 1:
                     case "end":
-                      return _context47.stop();
+                      return _context52.stop();
                   }
-                }, _callee47);
+                }, _callee52);
               }));
               return function (_x5) {
-                return _ref48.apply(this, arguments);
+                return _ref53.apply(this, arguments);
               };
             }());
             jest.runAllTimers();
             call.doHoldResume();
-            _context48.next = 9;
+            _context53.next = 1;
             return (0, _testUtil.flushPromises)(2);
-          case 9:
+          case 1:
             /* At this point, the Call State should be S_CALL_HOLD
              */
             expect(call['callStateMachine'].state.value).toStrictEqual('S_CALL_HOLD');
@@ -2631,13 +2842,13 @@ describe('Supplementary Services tests', function () {
             call['handleIncomingRoapOffer']({}, dummyEvent);
             roapEvent = JSON.parse((0, _stringify.default)(dummyEvent));
             roapEvent.data.type = 'ANSWER';
-            _context48.next = 15;
+            _context53.next = 2;
             return call['handleOutgoingRoapAnswer']({}, dummyEvent);
-          case 15:
+          case 2:
             roapEvent.data.type = 'OK';
-            _context48.next = 18;
+            _context53.next = 3;
             return call['handleRoapEstablished']({}, dummyEvent);
-          case 18:
+          case 3:
             /* Advancing timer by 12 seconds so that it gets timed out */
             jest.advanceTimersByTime(12000);
 
@@ -2645,16 +2856,16 @@ describe('Supplementary Services tests', function () {
             expect(call.isHeld()).toStrictEqual(false);
             /* We should return back to call established state */
             expect(call['callStateMachine'].state.value).toStrictEqual('S_CALL_ESTABLISHED');
-          case 21:
+          case 4:
           case "end":
-            return _context48.stop();
+            return _context53.stop();
         }
-      }, _callee48);
+      }, _callee53);
     })));
-    it('Handle successful Call Resume case without delayed http response', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee50() {
+    it('Handle successful Call Resume case without delayed http response', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee55() {
       var responsePayload, warnSpy, roapEvent;
-      return _regenerator.default.wrap(function _callee50$(_context50) {
-        while (1) switch (_context50.prev = _context50.next) {
+      return _regenerator.default.wrap(function (_context55) {
+        while (1) switch (_context55.prev = _context55.next) {
           case 0:
             expect.assertions(7);
             responsePayload = {
@@ -2667,27 +2878,27 @@ describe('Supplementary Services tests', function () {
             warnSpy = jest.spyOn(_Logger.default, 'warn');
             call['held'] = true;
             call.on(_types2.CALL_EVENT_KEYS.RESUMED, /*#__PURE__*/function () {
-              var _ref50 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee49(correlationId) {
-                return _regenerator.default.wrap(function _callee49$(_context49) {
-                  while (1) switch (_context49.prev = _context49.next) {
+              var _ref55 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee54(correlationId) {
+                return _regenerator.default.wrap(function (_context54) {
+                  while (1) switch (_context54.prev = _context54.next) {
                     case 0:
                       expect(correlationId).toStrictEqual(call.getCorrelationId());
                     case 1:
                     case "end":
-                      return _context49.stop();
+                      return _context54.stop();
                   }
-                }, _callee49);
+                }, _callee54);
               }));
               return function (_x6) {
-                return _ref50.apply(this, arguments);
+                return _ref55.apply(this, arguments);
               };
             }());
-            _context50.next = 10;
+            _context55.next = 1;
             return call.doHoldResume();
-          case 10:
-            _context50.next = 12;
+          case 1:
+            _context55.next = 2;
             return (0, _testUtil.flushPromises)(2);
-          case 12:
+          case 2:
             expect(setTimeout).toHaveBeenCalledTimes(1);
             call.handleMidCallEvent(mockResumeEvent);
 
@@ -2701,13 +2912,13 @@ describe('Supplementary Services tests', function () {
             call['handleIncomingRoapOffer']({}, dummyEvent);
             roapEvent = JSON.parse((0, _stringify.default)(dummyEvent));
             roapEvent.data.type = 'ANSWER';
-            _context50.next = 20;
+            _context55.next = 3;
             return call['handleOutgoingRoapAnswer']({}, dummyEvent);
-          case 20:
+          case 3:
             roapEvent.data.type = 'OK';
-            _context50.next = 23;
+            _context55.next = 4;
             return call['handleRoapEstablished']({}, dummyEvent);
-          case 23:
+          case 4:
             expect(clearTimeout).toHaveBeenCalledTimes(1);
             /* isHeld flag should not be set and an Resume event should be emitted */
             expect(call.isHeld()).toStrictEqual(false);
@@ -2718,16 +2929,16 @@ describe('Supplementary Services tests', function () {
               file: 'call',
               method: 'handleCallResume'
             });
-          case 28:
+          case 5:
           case "end":
-            return _context50.stop();
+            return _context55.stop();
         }
-      }, _callee50);
+      }, _callee55);
     })));
-    it('Handle successful Call Resume case with delayed http response', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee52() {
+    it('Handle successful Call Resume case with delayed http response', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee57() {
       var responsePayload, warnSpy, roapEvent;
-      return _regenerator.default.wrap(function _callee52$(_context52) {
-        while (1) switch (_context52.prev = _context52.next) {
+      return _regenerator.default.wrap(function (_context57) {
+        while (1) switch (_context57.prev = _context57.next) {
           case 0:
             expect.assertions(7);
             responsePayload = {
@@ -2740,28 +2951,28 @@ describe('Supplementary Services tests', function () {
             warnSpy = jest.spyOn(_Logger.default, 'warn');
             call['held'] = true;
             call.on(_types2.CALL_EVENT_KEYS.RESUMED, /*#__PURE__*/function () {
-              var _ref52 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee51(correlationId) {
-                return _regenerator.default.wrap(function _callee51$(_context51) {
-                  while (1) switch (_context51.prev = _context51.next) {
+              var _ref57 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee56(correlationId) {
+                return _regenerator.default.wrap(function (_context56) {
+                  while (1) switch (_context56.prev = _context56.next) {
                     case 0:
                       expect(correlationId).toStrictEqual(call.getCorrelationId());
                     case 1:
                     case "end":
-                      return _context51.stop();
+                      return _context56.stop();
                   }
-                }, _callee51);
+                }, _callee56);
               }));
               return function (_x7) {
-                return _ref52.apply(this, arguments);
+                return _ref57.apply(this, arguments);
               };
             }());
             call.doHoldResume();
-            _context52.next = 11;
+            _context57.next = 1;
             return _promise.default.resolve();
-          case 11:
-            _context52.next = 13;
+          case 1:
+            _context57.next = 2;
             return _promise.default.resolve();
-          case 13:
+          case 2:
             expect(setTimeout).not.toHaveBeenCalled();
             call.handleMidCallEvent(mockResumeEvent);
 
@@ -2775,13 +2986,13 @@ describe('Supplementary Services tests', function () {
             call['handleIncomingRoapOffer']({}, dummyEvent);
             roapEvent = JSON.parse((0, _stringify.default)(dummyEvent));
             roapEvent.data.type = 'ANSWER';
-            _context52.next = 21;
+            _context57.next = 3;
             return call['handleOutgoingRoapAnswer']({}, dummyEvent);
-          case 21:
+          case 3:
             roapEvent.data.type = 'OK';
-            _context52.next = 24;
+            _context57.next = 4;
             return call['handleRoapEstablished']({}, dummyEvent);
-          case 24:
+          case 4:
             expect(clearTimeout).not.toHaveBeenCalled();
             /* isHeld flag should not be set and an Resume event should be emitted */
             expect(call.isHeld()).toStrictEqual(false);
@@ -2792,16 +3003,16 @@ describe('Supplementary Services tests', function () {
               file: 'call',
               method: 'handleCallResume'
             });
-          case 29:
+          case 5:
           case "end":
-            return _context52.stop();
+            return _context57.stop();
         }
-      }, _callee52);
+      }, _callee57);
     })));
-    it('Handle failure Call Resume case during signalling', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee54() {
+    it('Handle failure Call Resume case during signalling', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee59() {
       var responsePayload;
-      return _regenerator.default.wrap(function _callee54$(_context54) {
-        while (1) switch (_context54.prev = _context54.next) {
+      return _regenerator.default.wrap(function (_context59) {
+        while (1) switch (_context59.prev = _context59.next) {
           case 0:
             expect.assertions(4);
             responsePayload = {
@@ -2811,44 +3022,44 @@ 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 _ref54 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee53(errObj) {
-                return _regenerator.default.wrap(function _callee53$(_context53) {
-                  while (1) switch (_context53.prev = _context53.next) {
+              var _ref59 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee58(errObj) {
+                return _regenerator.default.wrap(function (_context58) {
+                  while (1) switch (_context58.prev = _context58.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 2:
+                    case 1:
                     case "end":
-                      return _context53.stop();
+                      return _context58.stop();
                   }
-                }, _callee53);
+                }, _callee58);
               }));
               return function (_x8) {
-                return _ref54.apply(this, arguments);
+                return _ref59.apply(this, arguments);
               };
             }());
-            _context54.next = 7;
+            _context59.next = 1;
             return call.doHoldResume();
-          case 7:
-            _context54.next = 9;
+          case 1:
+            _context59.next = 2;
             return (0, _testUtil.flushPromises)(2);
-          case 9:
+          case 2:
             expect(call.isHeld()).toStrictEqual(true);
 
             /* At this point , the Call State should transition to S_CALL_ESTABLISHED
              */
 
             expect(call['callStateMachine'].state.value).toStrictEqual('S_CALL_ESTABLISHED');
-          case 11:
+          case 3:
           case "end":
-            return _context54.stop();
+            return _context59.stop();
         }
-      }, _callee54);
+      }, _callee59);
     })));
-    it('Handle failure Call Resume case during offer/answer exchange', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee56() {
+    it('Handle failure Call Resume case during offer/answer exchange', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee61() {
       var responsePayload, rejectPayload, roapEvent;
-      return _regenerator.default.wrap(function _callee56$(_context56) {
-        while (1) switch (_context56.prev = _context56.next) {
+      return _regenerator.default.wrap(function (_context61) {
+        while (1) switch (_context61.prev = _context61.next) {
           case 0:
             expect.assertions(5);
             responsePayload = {
@@ -2862,26 +3073,26 @@ 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 _ref56 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee55(errObj) {
-                return _regenerator.default.wrap(function _callee55$(_context55) {
-                  while (1) switch (_context55.prev = _context55.next) {
+              var _ref61 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee60(errObj) {
+                return _regenerator.default.wrap(function (_context60) {
+                  while (1) switch (_context60.prev = _context60.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 2:
+                    case 1:
                     case "end":
-                      return _context55.stop();
+                      return _context60.stop();
                   }
-                }, _callee55);
+                }, _callee60);
               }));
               return function (_x9) {
-                return _ref56.apply(this, arguments);
+                return _ref61.apply(this, arguments);
               };
             }());
             call.doHoldResume();
-            _context56.next = 9;
+            _context61.next = 1;
             return (0, _testUtil.flushPromises)(2);
-          case 9:
+          case 1:
             /* At this point , the Call State should transition to S_CALL_ESTABLISHED
              */
 
@@ -2890,22 +3101,22 @@ describe('Supplementary Services tests', function () {
             roapEvent = JSON.parse((0, _stringify.default)(dummyEvent));
             /* We are intentionally failing the ROAP ANSWER */
             roapEvent.data.type = 'ANSWER';
-            _context56.next = 15;
+            _context61.next = 2;
             return call['handleOutgoingRoapAnswer']({}, dummyEvent);
-          case 15:
+          case 2:
             expect(call.isHeld()).toStrictEqual(true);
             /* We should return back to call established state */
             expect(call['callStateMachine'].state.value).toStrictEqual('S_CALL_ESTABLISHED');
-          case 17:
+          case 3:
           case "end":
-            return _context56.stop();
+            return _context61.stop();
         }
-      }, _callee56);
+      }, _callee61);
     })));
-    it('Handle Call resume case where successful response does not come', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee58() {
+    it('Handle Call resume case where successful response does not come', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee63() {
       var responsePayload, roapEvent;
-      return _regenerator.default.wrap(function _callee58$(_context58) {
-        while (1) switch (_context58.prev = _context58.next) {
+      return _regenerator.default.wrap(function (_context63) {
+        while (1) switch (_context63.prev = _context63.next) {
           case 0:
             expect.assertions(5);
             responsePayload = {
@@ -2915,26 +3126,26 @@ 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 _ref58 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee57(errObj) {
-                return _regenerator.default.wrap(function _callee57$(_context57) {
-                  while (1) switch (_context57.prev = _context57.next) {
+              var _ref63 = (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.TIMEOUT);
                       expect(errObj.message).toStrictEqual('An error occurred while resuming the call. Wait a moment and try again.');
-                    case 2:
+                    case 1:
                     case "end":
-                      return _context57.stop();
+                      return _context62.stop();
                   }
-                }, _callee57);
+                }, _callee62);
               }));
               return function (_x0) {
-                return _ref58.apply(this, arguments);
+                return _ref63.apply(this, arguments);
               };
             }());
             call.doHoldResume();
-            _context58.next = 8;
+            _context63.next = 1;
             return (0, _testUtil.flushPromises)(2);
-          case 8:
+          case 1:
             /* At this point ,the Call State should be S_CALL_RESUME
              */
             expect(call['callStateMachine'].state.value).toStrictEqual('S_CALL_RESUME');
@@ -2945,23 +3156,23 @@ describe('Supplementary Services tests', function () {
             call['handleIncomingRoapOffer']({}, dummyEvent);
             roapEvent = JSON.parse((0, _stringify.default)(dummyEvent));
             roapEvent.data.type = 'ANSWER';
-            _context58.next = 14;
+            _context63.next = 2;
             return call['handleOutgoingRoapAnswer']({}, dummyEvent);
-          case 14:
+          case 2:
             roapEvent.data.type = 'OK';
-            _context58.next = 17;
+            _context63.next = 3;
             return call['handleRoapEstablished']({}, dummyEvent);
-          case 17:
+          case 3:
             /* Advancing timer by 12 seconds so that it gets timed out */
             jest.advanceTimersByTime(12000);
             expect(call.isHeld()).toStrictEqual(true);
             /* We should return back to call established state */
             expect(call['callStateMachine'].state.value).toStrictEqual('S_CALL_ESTABLISHED');
-          case 20:
+          case 4:
           case "end":
-            return _context58.stop();
+            return _context63.stop();
         }
-      }, _callee58);
+      }, _callee63);
     })));
   });
   describe('Call transfer tests', function () {
@@ -2994,10 +3205,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 _callee61() {
+    it('Handle successful consult transfer case ', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee66() {
       var responsePayload, requestSpy, warnSpy, infoSpy, metricSpy;
-      return _regenerator.default.wrap(function _callee61$(_context61) {
-        while (1) switch (_context61.prev = _context61.next) {
+      return _regenerator.default.wrap(function (_context66) {
+        while (1) switch (_context66.prev = _context66.next) {
           case 0:
             expect.assertions(12); // Updated to match actual assertion count
             responsePayload = {
@@ -3009,43 +3220,43 @@ 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 _ref60 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee59(correlationId) {
-                return _regenerator.default.wrap(function _callee59$(_context59) {
-                  while (1) switch (_context59.prev = _context59.next) {
+              var _ref65 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee64(correlationId) {
+                return _regenerator.default.wrap(function (_context64) {
+                  while (1) switch (_context64.prev = _context64.next) {
                     case 0:
                       expect(correlationId).toStrictEqual(call.getCorrelationId());
                     case 1:
                     case "end":
-                      return _context59.stop();
+                      return _context64.stop();
                   }
-                }, _callee59);
+                }, _callee64);
               }));
               return function (_x1) {
-                return _ref60.apply(this, arguments);
+                return _ref65.apply(this, arguments);
               };
             }());
             secondCall.on(_types2.CALL_EVENT_KEYS.DISCONNECT, /*#__PURE__*/function () {
-              var _ref61 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee60(correlationId) {
-                return _regenerator.default.wrap(function _callee60$(_context60) {
-                  while (1) switch (_context60.prev = _context60.next) {
+              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) {
                     case 0:
                       expect(correlationId).toStrictEqual(secondCall.getCorrelationId());
                     case 1:
                     case "end":
-                      return _context60.stop();
+                      return _context65.stop();
                   }
-                }, _callee60);
+                }, _callee65);
               }));
               return function (_x10) {
-                return _ref61.apply(this, arguments);
+                return _ref66.apply(this, arguments);
               };
             }());
-            _context61.next = 10;
+            _context66.next = 1;
             return call.completeTransfer(_types5.TransferType.CONSULT, secondCall.getCallId(), undefined);
-          case 10:
-            _context61.next = 12;
+          case 1:
+            _context66.next = 2;
             return (0, _testUtil.flushPromises)(2);
-          case 12:
+          case 2:
             expect(requestSpy).toBeCalled();
             expect(metricSpy).toHaveBeenCalledWith(_types4.METRIC_EVENT.CALL, _types4.TRANSFER_ACTION.CONSULT, _types4.METRIC_TYPE.BEHAVIORAL, call.getCallId(), call.getCorrelationId(), undefined);
             call.sendCallStateMachineEvt({
@@ -3064,16 +3275,16 @@ describe('Supplementary Services tests', function () {
             expect(warnSpy).not.toHaveBeenCalledWith("Consult Transfer failed for correlationId ".concat(call.getCorrelationId()), transferLoggingContext);
             expect(infoSpy).toHaveBeenCalledWith("Initiating Consult transfer between : ".concat(call.getCallId(), " and ").concat(secondCall.getCallId()), transferLoggingContext);
             expect(warnSpy).not.toHaveBeenCalledWith("Consult Transfer failed for correlationId ".concat(call.getCorrelationId()), transferLoggingContext);
-          case 24:
+          case 3:
           case "end":
-            return _context61.stop();
+            return _context66.stop();
         }
-      }, _callee61);
+      }, _callee66);
     })));
-    it('Handle successful blind transfer case ', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee63() {
+    it('Handle successful blind transfer case ', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee68() {
       var responsePayload, requestSpy, warnSpy, infoSpy, metricSpy;
-      return _regenerator.default.wrap(function _callee63$(_context63) {
-        while (1) switch (_context63.prev = _context63.next) {
+      return _regenerator.default.wrap(function (_context68) {
+        while (1) switch (_context68.prev = _context68.next) {
           case 0:
             expect.assertions(10); // Updated to match actual assertion count
             responsePayload = {
@@ -3085,27 +3296,27 @@ 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 _ref63 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee62(correlationId) {
-                return _regenerator.default.wrap(function _callee62$(_context62) {
-                  while (1) switch (_context62.prev = _context62.next) {
+              var _ref68 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee67(correlationId) {
+                return _regenerator.default.wrap(function (_context67) {
+                  while (1) switch (_context67.prev = _context67.next) {
                     case 0:
                       expect(correlationId).toStrictEqual(call.getCorrelationId());
                     case 1:
                     case "end":
-                      return _context62.stop();
+                      return _context67.stop();
                   }
-                }, _callee62);
+                }, _callee67);
               }));
               return function (_x11) {
-                return _ref63.apply(this, arguments);
+                return _ref68.apply(this, arguments);
               };
             }());
-            _context63.next = 9;
+            _context68.next = 1;
             return call.completeTransfer(_types5.TransferType.BLIND, undefined, transfereeNumber);
-          case 9:
-            _context63.next = 11;
+          case 1:
+            _context68.next = 2;
             return (0, _testUtil.flushPromises)(2);
-          case 11:
+          case 2:
             expect(requestSpy).toBeCalled();
             expect(metricSpy).toHaveBeenCalledWith(_types4.METRIC_EVENT.CALL, _types4.TRANSFER_ACTION.BLIND, _types4.METRIC_TYPE.BEHAVIORAL, call.getCallId(), call.getCorrelationId(), undefined);
             call.sendCallStateMachineEvt({
@@ -3120,16 +3331,16 @@ describe('Supplementary Services tests', function () {
             expect(warnSpy).not.toHaveBeenCalledWith("Blind Transfer failed for correlationId ".concat(call.getCorrelationId()), transferLoggingContext);
             expect(infoSpy).toHaveBeenCalledWith("Initiating Blind transfer with : ".concat(transfereeNumber), transferLoggingContext);
             expect(warnSpy).not.toHaveBeenCalledWith("Blind Transfer failed for correlationId ".concat(call.getCorrelationId()), transferLoggingContext);
-          case 21:
+          case 3:
           case "end":
-            return _context63.stop();
+            return _context68.stop();
         }
-      }, _callee63);
+      }, _callee68);
     })));
-    it('Handle unsuccessful blind transfer case', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee64() {
+    it('Handle unsuccessful blind transfer case', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee69() {
       var responsePayload, emitSpy, requestSpy, warnSpy, metricSpy;
-      return _regenerator.default.wrap(function _callee64$(_context64) {
-        while (1) switch (_context64.prev = _context64.next) {
+      return _regenerator.default.wrap(function (_context69) {
+        while (1) switch (_context69.prev = _context69.next) {
           case 0:
             responsePayload = {
               statusCode: 403,
@@ -3140,12 +3351,12 @@ describe('Supplementary Services tests', function () {
             warnSpy = jest.spyOn(_Logger.default, 'warn');
             metricSpy = jest.spyOn(call['metricManager'], 'submitCallMetric');
             call['broadworksCorrelationInfo'] = 'dummy-broadworks-correlation-info';
-            _context64.next = 8;
+            _context69.next = 1;
             return call.completeTransfer(_types5.TransferType.BLIND, undefined, transfereeNumber);
-          case 8:
-            _context64.next = 10;
+          case 1:
+            _context69.next = 2;
             return (0, _testUtil.flushPromises)(1);
-          case 10:
+          case 2:
             expect(requestSpy).toBeCalled();
             /* We should be in CALL_ESTABLISHED state */
             expect(call['callStateMachine'].state.value).toStrictEqual('S_CALL_ESTABLISHED');
@@ -3162,16 +3373,16 @@ describe('Supplementary Services tests', function () {
             expect(emitSpy).toBeCalledOnceWith(_types2.CALL_EVENT_KEYS.TRANSFER_ERROR, expect.any(_Errors.CallError));
             expect(warnSpy).toHaveBeenCalledWith("Blind Transfer failed for correlationId ".concat(call.getCorrelationId()), transferLoggingContext);
             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 18:
+          case 3:
           case "end":
-            return _context64.stop();
+            return _context69.stop();
         }
-      }, _callee64);
+      }, _callee69);
     })));
-    it('Handle unsuccessful consult transfer case', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee65() {
+    it('Handle unsuccessful consult transfer case', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee70() {
       var responsePayload, emitSpy, requestSpy, warnSpy, metricSpy;
-      return _regenerator.default.wrap(function _callee65$(_context65) {
-        while (1) switch (_context65.prev = _context65.next) {
+      return _regenerator.default.wrap(function (_context70) {
+        while (1) switch (_context70.prev = _context70.next) {
           case 0:
             responsePayload = {
               statusCode: 403,
@@ -3181,12 +3392,12 @@ describe('Supplementary Services tests', function () {
             requestSpy = jest.spyOn(webex, 'request').mockRejectedValue(responsePayload);
             warnSpy = jest.spyOn(_Logger.default, 'warn');
             metricSpy = jest.spyOn(call['metricManager'], 'submitCallMetric');
-            _context65.next = 7;
+            _context70.next = 1;
             return call.completeTransfer(_types5.TransferType.CONSULT, secondCall.getCallId(), undefined);
-          case 7:
-            _context65.next = 9;
+          case 1:
+            _context70.next = 2;
             return (0, _testUtil.flushPromises)(2);
-          case 9:
+          case 2:
             expect(requestSpy).toBeCalled();
             /* We should be in CALL_ESTABLISHED state */
             expect(call['callStateMachine'].state.value).toStrictEqual('S_CALL_ESTABLISHED');
@@ -3203,22 +3414,22 @@ describe('Supplementary Services tests', function () {
             expect(emitSpy).toHaveBeenCalledWith(_types2.CALL_EVENT_KEYS.TRANSFER_ERROR, expect.any(_Errors.CallError));
             expect(warnSpy).toHaveBeenCalledWith("Consult Transfer failed for correlationId ".concat(call.getCorrelationId()), transferLoggingContext);
             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 18:
+          case 3:
           case "end":
-            return _context65.stop();
+            return _context70.stop();
         }
-      }, _callee65);
+      }, _callee70);
     })));
-    it('Handle blind transfer with undefined transferTarget', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee66() {
+    it('Handle blind transfer with undefined transferTarget', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee71() {
       var requestSpy, warnSpy;
-      return _regenerator.default.wrap(function _callee66$(_context66) {
-        while (1) switch (_context66.prev = _context66.next) {
+      return _regenerator.default.wrap(function (_context71) {
+        while (1) switch (_context71.prev = _context71.next) {
           case 0:
             requestSpy = jest.spyOn(webex, 'request');
             warnSpy = jest.spyOn(_Logger.default, 'warn');
-            _context66.next = 4;
+            _context71.next = 1;
             return call.completeTransfer(_types5.TransferType.BLIND, undefined, undefined);
-          case 4:
+          case 1:
             /* We should be in CALL_ESTABLISHED state */
             expect(call['callStateMachine'].state.value).toStrictEqual('S_CALL_ESTABLISHED');
             expect(secondCall['callStateMachine'].state.value).toStrictEqual('S_CALL_ESTABLISHED');
@@ -3226,22 +3437,22 @@ describe('Supplementary Services tests', function () {
             expect(uploadLogsSpy).not.toBeCalled();
             expect(requestSpy).not.toBeCalled();
             expect(warnSpy).toBeCalledOnceWith("Invalid information received, transfer failed for correlationId: ".concat(call.getCorrelationId()), transferLoggingContext);
-          case 10:
+          case 2:
           case "end":
-            return _context66.stop();
+            return _context71.stop();
         }
-      }, _callee66);
+      }, _callee71);
     })));
-    it('Handle consult transfer with undefined transferCallId', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee67() {
+    it('Handle consult transfer with undefined transferCallId', /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee72() {
       var requestSpy, warnSpy;
-      return _regenerator.default.wrap(function _callee67$(_context67) {
-        while (1) switch (_context67.prev = _context67.next) {
+      return _regenerator.default.wrap(function (_context72) {
+        while (1) switch (_context72.prev = _context72.next) {
           case 0:
             requestSpy = jest.spyOn(webex, 'request');
             warnSpy = jest.spyOn(_Logger.default, 'warn');
-            _context67.next = 4;
+            _context72.next = 1;
             return call.completeTransfer(_types5.TransferType.CONSULT, undefined, undefined);
-          case 4:
+          case 1:
             /* We should be in CALL_ESTABLISHED state */
             expect(call['callStateMachine'].state.value).toStrictEqual('S_CALL_ESTABLISHED');
             expect(secondCall['callStateMachine'].state.value).toStrictEqual('S_CALL_ESTABLISHED');
@@ -3249,11 +3460,11 @@ describe('Supplementary Services tests', function () {
             expect(uploadLogsSpy).not.toBeCalled();
             expect(requestSpy).not.toBeCalled();
             expect(warnSpy).toBeCalledOnceWith("Invalid information received, transfer failed for correlationId: ".concat(call.getCorrelationId()), transferLoggingContext);
-          case 10:
+          case 2:
           case "end":
-            return _context67.stop();
+            return _context72.stop();
         }
-      }, _callee67);
+      }, _callee72);
     })));
   });
 });