diff --git a/ttcn/AtsCAM/ItsCam_TpFunctions.ttcn b/ttcn/AtsCAM/ItsCam_TpFunctions.ttcn
index b06ec590fb804cc2580d0c2eaaa8b5faa8320acc..637b779c8a7b7b6df58dba15d977754c133ddef0 100644
--- a/ttcn/AtsCAM/ItsCam_TpFunctions.ttcn
+++ b/ttcn/AtsCAM/ItsCam_TpFunctions.ttcn
@@ -2996,9 +2996,10 @@ module ItsCam_TpFunctions {
 
         group camGenerationSSP{
             function f_CAM_MSD_SSP_BO_XX(
-                            in Oct8 p_certHashedId8,
-                            in template(value) UtCamTrigger p_utEvent,
-                            in template(present) CAM pmw_CamMsg  
+            				in Oct8 p_certHashedId8,
+            				in template(value)   UtCamTrigger p_utEvent,
+            				in template(present) CAM pmw_CamMsg,
+            				in template(present) Bit128 pmw_ssp := ?  
             ) runs on ItsCam {
                 
                 // Local variables
@@ -3022,7 +3023,7 @@ module ItsCam_TpFunctions {
                 // Test adapter configuration
                 
                 // Preamble
-                // TODO: initialize IUT with given certificate
+                // initialize IUT with given certificate
                 f_prInitialState(
                     e_staticPosition, 
                     true, 
@@ -3037,7 +3038,10 @@ module ItsCam_TpFunctions {
                 // Test Body
                 tc_ac.start;
                 alt {
-                    [] camPort.receive(mw_camInd (  pmw_CamMsg )) { 
+                    [] camPort.receive(mw_camIndWithSecurityParameters (
+                      pmw_CamMsg,
+                      pmw_ssp
+                      )) { 
                         tc_ac.stop;
                         log("*** " & testcasename() & ": FAIL: Expected CAM message received ***");
                         f_selfOrClientSyncAndVerdict(c_tbDone, e_error);  
@@ -3179,13 +3183,10 @@ module ItsCam_TpFunctions {
                     log("*** " & testcasename() & ": PICS_IS_IUT_SECURED required for executing the TC ***");
                     setverdict(inconc);
                     stop;
-                }              
+                }
                 
                 // Test component configuration
-                f_cfUp();
-                
-                // Test adapter configuration
-                // TODO: instruct adapter to use certName to sign the message 
+                f_cfUp(p_certName);
                 
                 // Preamble
                 f_prInitialState();
@@ -3228,7 +3229,7 @@ module ItsCam_TpFunctions {
     
             function f_CAM_MSP_SSP_BV_02() runs on ItsCam {
     
-                f_CAM_MSP_SSP_BV_XX("CERT_TS_CAM_02",
+                f_CAM_MSP_SSP_BV_XX("CERT_TS_CAM_BO_02_AT",
                                 m_camMsg_publicTransport(
                                     f_getTsStationId(),
                                     f_getCurrentTime() mod 65536, // See ETSI EN 302 637-2 V1.3.0 - Clause B.3 generationDelatTime
@@ -3239,7 +3240,7 @@ module ItsCam_TpFunctions {
             
             function f_CAM_MSP_SSP_BV_03() runs on ItsCam {
     
-                f_CAM_MSP_SSP_BV_XX("CERT_TS_CAM_03",
+                f_CAM_MSP_SSP_BV_XX("CERT_TS_CAM_BO_03_AT",
                                 m_camMsg_specialTransport(
                                     f_getTsStationId(),
                                     f_getCurrentTime() mod 65536, // See ETSI EN 302 637-2 V1.3.0 - Clause B.3 generationDelatTime
diff --git a/ttcn/AtsDENM/ItsDenm_TpFunctions.ttcn b/ttcn/AtsDENM/ItsDenm_TpFunctions.ttcn
index c3881ce4a07e89c4e0c488e5968299988a3b7fa3..c3007aeaf5005a143431c6fedac24ad73b2069d5 100644
--- a/ttcn/AtsDENM/ItsDenm_TpFunctions.ttcn
+++ b/ttcn/AtsDENM/ItsDenm_TpFunctions.ttcn
@@ -2373,7 +2373,7 @@ module ItsDenm_TpFunctions {
             f_DEN_SSP_BV_XX (
                 PX_CERT_IUT_DENM_01,
                 m_situation(CauseCodeType_trafficCondition_, TrafficConditionSubCauseCode_unavailable_),
-                mw_sspTrafficCondition
+                mw_sspNoTrafficCondition
             );
         }
               
@@ -2381,7 +2381,7 @@ module ItsDenm_TpFunctions {
             f_DEN_SSP_BV_XX (
                 PX_CERT_IUT_DENM_02,
                 m_situation(CauseCodeType_accident_, AccidentSubCauseCode_unavailable_),
-                mw_sspAccident
+                mw_sspNoAccident
             );
         }
         
@@ -2887,7 +2887,11 @@ module ItsDenm_TpFunctions {
                 f_cfUp();
                 
                 // Test adapter configuration
-                // TODO: instruct adapter to use p_certName to sign message 
+                // instruct adapter to use p_certName to sign message
+                if(e_success != f_acTriggerSecEvent(m_acEnableSecurity(p_certName))) { 
+                    log("*** INFO: TEST CASE NOW STOPPING ITSELF! ***");
+                    stop;
+                }
                 
                 // Preamble
                 f_prInitialState();
@@ -2967,7 +2971,12 @@ module ItsDenm_TpFunctions {
                 
                 // Test adapter configuration
                 
-                // TODO: instruct adapter to use c_certName_FullSSP to sign message 
+                // instruct adapter to use c_certName_FullDENMSSP to sign message
+                if(e_success != f_acTriggerSecEvent(m_acEnableSecurity(c_certName_FullDENMSSP))) { 
+                    log("*** INFO: TEST CASE NOW STOPPING ITSELF! ***");
+                    stop;
+                }
+                
                 
                 // Preamble
                 f_prInitialState();
@@ -2985,7 +2994,15 @@ module ItsDenm_TpFunctions {
                 );
                 
                 f_sleep(1.0);
-                // TODO: instruct adapter to use p_certName to sign message 
+                
+                // instruct adapter to use p_certName to sign message
+                if(e_success != f_acTriggerSecEvent(m_acEnableSecurity(p_certName))) { 
+                    log("*** INFO: TEST CASE NOW STOPPING ITSELF! ***");
+                    stop;
+                }
+                
+                f_sleep(1.0);
+                
                 v_referenceTime2 := f_getCurrentTime();
                 v_actionId := f_sendDenMessage(
                     m_denm(