HCI_EXT_ModemTestTxCmd and HCI_EXT_EndModemTestCmd events

I am trying to Run code on the Command Complete event of HCI_EXT_EndModemTestCmd and HCI_EXT_ModemTestTxCmd. But I cannot figure out how to get the events returned. I can see the Rx and Tx tests are running correctly just not seeing an Command Complete event. Also, HCI_READ_RSSI is working correctly. I have tried many variations, and this is the last attempt I made:

static void gapCentralRole_ProcessOSALMsg( osal_event_hdr_t *pMsg )
{
  switch ( pMsg->event )
  {
    case HCI_EXT_CMD_EVENT:
    case HCI_GAP_EVENT_EVENT:
      if ( pMsg->status == HCI_COMMAND_COMPLETE_EVENT_CODE )
      {
        hciEvt_CmdComplete_t *pPkt = (hciEvt_CmdComplete_t *) pMsg;

        switch(pPkt->cmdOpcode){
        case HCI_READ_RSSI:
          {
            uint16 connHandle = BUILD_UINT16( pPkt->pReturnParam[1], pPkt->pReturnParam[2] );
            int8 rssi = (int8) pPkt->pReturnParam[3];
            print("%i\r\n",rssi);
             
            // Report RSSI to app
            if ( pGapCentralRoleCB && pGapCentralRoleCB->rssiCB )
            {
              pGapCentralRoleCB->rssiCB( connHandle, rssi );
            }
          }
          break;
        case HCI_EXT_MODEM_TEST_TX:
        case HCI_EXT_MODEM_HOP_TEST_TX:
          {
            Currently_Testing = TRUE;
          }
          break;
        case HCI_EXT_MODEM_TEST_RX:
          {
            Currently_Testing = TRUE;
          }
          break;
        case HCI_EXT_END_MODEM_TEST:
          {
            Currently_Testing = FALSE;
            GAPCentralRole_CancelRssi();
          }
          break;
        }
      }else if(pMsg->status == HCI_VE_EVENT_CODE){
        print("else: %i",pMsg->status);
      }
      break;
   }
}