Index: AtsCAM/ItsCam_TestControl.ttcn
===================================================================
--- AtsCAM/ItsCam_TestControl.ttcn	(revision 2577)
+++ AtsCAM/ItsCam_TestControl.ttcn	(working copy)
@@ -17,98 +17,98 @@
     control {
         
         if(PICS_CAM_GENERATION) {
-            execute(TC_CAM_MSD_FMT_BV_01());
-            if (not PICS_RSU) {
-                execute(TC_CAM_MSD_FMT_BV_02());
-                execute(TC_CAM_MSD_FMT_BV_03());
-                execute(TC_CAM_MSD_FMT_BV_04());
-                execute(TC_CAM_MSD_FMT_BV_05());
-                execute(TC_CAM_MSD_INA_BV_01_01());
-                execute(TC_CAM_MSD_INA_BV_01_02());
-                execute(TC_CAM_MSD_INA_BV_01_03());
-                execute(TC_CAM_MSD_INA_BV_01_04());
-                execute(TC_CAM_MSD_INA_BV_01_05());
-                execute(TC_CAM_MSD_INA_BV_01_06());
-                execute(TC_CAM_MSD_INA_BV_01_07());
-                execute(TC_CAM_MSD_INA_BV_01_08());
-                execute(TC_CAM_MSD_INA_BV_01_09());
-                execute(TC_CAM_MSD_INA_BV_01_10());
-                execute(TC_CAM_MSD_INA_BV_01_11());
-                execute(TC_CAM_MSD_INA_BV_01_12());
-                execute(TC_CAM_MSD_INA_BV_01_13());
-                execute(TC_CAM_MSD_INA_BV_01_14());
-                execute(TC_CAM_MSD_INA_BV_01_15());
-                execute(TC_CAM_MSD_INA_BV_01_16());
-                execute(TC_CAM_MSD_INA_BV_01_17());
-                execute(TC_CAM_MSD_INA_BV_01_18());
-                execute(TC_CAM_MSD_INA_BV_01_19());
-                execute(TC_CAM_MSD_INA_BV_01_20());
-                execute(TC_CAM_MSD_INA_BV_01_21());
-                execute(TC_CAM_MSD_INA_BV_01_22());
-                execute(TC_CAM_MSD_INA_BV_01_23());
-                execute(TC_CAM_MSD_INA_BV_01_24());
-                execute(TC_CAM_MSD_INA_BV_01_25());
-                execute(TC_CAM_MSD_INA_BV_01_26());
-                execute(TC_CAM_MSD_INA_BV_01_27());
-                execute(TC_CAM_MSD_INA_BV_01_28());
-                execute(TC_CAM_MSD_INA_BV_01_29());
-                execute(TC_CAM_MSD_INA_BV_01_30());
-                execute(TC_CAM_MSD_INA_BV_01_31());
-                execute(TC_CAM_MSD_INA_BV_01_32());
-                execute(TC_CAM_MSD_INA_BV_01_33());
-                execute(TC_CAM_MSD_INA_BV_01_34());
-                execute(TC_CAM_MSD_INA_BV_01_35());
-            }
-            if (PICS_PUBLICTRANS) {
-                execute(TC_CAM_MSD_INA_BV_02());
-            }
-            if (PICS_SPECIALTRANS) {
-                execute(TC_CAM_MSD_INA_BV_03());
-            }
-            if (PICS_DANGEROUSGOODS) {
-                execute(TC_CAM_MSD_INA_BV_04());
-            }
-            if (PICS_ROADWORKS) {
-                execute(TC_CAM_MSD_INA_BV_05());
-            }
-            if (PICS_RESCUE) {
-                execute(TC_CAM_MSD_INA_BV_06());
-            }
-            if (PICS_EMERGENCY) {
-                execute(TC_CAM_MSD_INA_BV_07());
-            }
-            if (PICS_SAFETY_CAR) {
-                execute(TC_CAM_MSD_INA_BV_08());
-            }
-            
-            execute(TC_CAM_MSD_GFQ_TI_01());
-            execute(TC_CAM_MSD_GFQ_TI_02());
-            execute(TC_CAM_MSD_GFQ_TI_03());
-            execute(TC_CAM_MSD_GFQ_BV_04());
-            execute(TC_CAM_MSD_GFQ_BV_05());
-            execute(TC_CAM_MSD_GFQ_BV_06());
-            execute(TC_CAM_MSD_GFQ_TI_07());
-            execute(TC_CAM_MSD_GFQ_TI_08());
-            
-            execute(TC_CAM_MSD_PAR_BV_01());
-            execute(TC_CAM_MSD_PAR_BV_02());
-            execute(TC_CAM_MSD_PAR_BV_03());
-            
-            if (PICS_IS_IUT_SECURED) {
+            if (not PICS_IS_IUT_SECURED) {
+                /*execute(TC_CAM_MSD_FMT_BV_01());*/
+                if (not PICS_RSU) {
+                    /*execute(TC_CAM_MSD_FMT_BV_02());
+                    execute(TC_CAM_MSD_FMT_BV_03());*/
+                    /*execute(TC_CAM_MSD_FMT_BV_04());
+                    execute(TC_CAM_MSD_FMT_BV_05());
+                    execute(TC_CAM_MSD_INA_BV_01_01());
+                    execute(TC_CAM_MSD_INA_BV_01_02());
+                    execute(TC_CAM_MSD_INA_BV_01_03());
+                    execute(TC_CAM_MSD_INA_BV_01_04());
+                    execute(TC_CAM_MSD_INA_BV_01_05());
+                    execute(TC_CAM_MSD_INA_BV_01_06());
+                    execute(TC_CAM_MSD_INA_BV_01_07());
+                    execute(TC_CAM_MSD_INA_BV_01_08());
+                    execute(TC_CAM_MSD_INA_BV_01_09());
+                    execute(TC_CAM_MSD_INA_BV_01_10());
+                    execute(TC_CAM_MSD_INA_BV_01_11());
+                    execute(TC_CAM_MSD_INA_BV_01_12());
+                    execute(TC_CAM_MSD_INA_BV_01_13());
+                    execute(TC_CAM_MSD_INA_BV_01_14());
+                    execute(TC_CAM_MSD_INA_BV_01_15());
+                    execute(TC_CAM_MSD_INA_BV_01_16());
+                    execute(TC_CAM_MSD_INA_BV_01_17());
+                    execute(TC_CAM_MSD_INA_BV_01_18());
+                    execute(TC_CAM_MSD_INA_BV_01_19());
+                    execute(TC_CAM_MSD_INA_BV_01_20());
+                    execute(TC_CAM_MSD_INA_BV_01_21());
+                    execute(TC_CAM_MSD_INA_BV_01_22());
+                    execute(TC_CAM_MSD_INA_BV_01_23());
+                    execute(TC_CAM_MSD_INA_BV_01_24());
+                    execute(TC_CAM_MSD_INA_BV_01_25());
+                    execute(TC_CAM_MSD_INA_BV_01_26());
+                    execute(TC_CAM_MSD_INA_BV_01_27());
+                    execute(TC_CAM_MSD_INA_BV_01_28());
+                    execute(TC_CAM_MSD_INA_BV_01_29());
+                    execute(TC_CAM_MSD_INA_BV_01_30());
+                    execute(TC_CAM_MSD_INA_BV_01_31());
+                    execute(TC_CAM_MSD_INA_BV_01_32());
+                    execute(TC_CAM_MSD_INA_BV_01_33());
+                    execute(TC_CAM_MSD_INA_BV_01_34());
+                    execute(TC_CAM_MSD_INA_BV_01_35());*/
+                }
                 if (PICS_PUBLICTRANS) {
-                    execute(TC_CAM_MSD_SSP_BO_02());
+                    execute(TC_CAM_MSD_INA_BV_02());
                 }
                 if (PICS_SPECIALTRANS) {
+                    execute(TC_CAM_MSD_INA_BV_03());
+                }
+                if (PICS_DANGEROUSGOODS) {
+                    execute(TC_CAM_MSD_INA_BV_04());
+                }
+                if (PICS_ROADWORKS) {
+                    execute(TC_CAM_MSD_INA_BV_05());
+                }
+                if (PICS_RESCUE) {
+                    execute(TC_CAM_MSD_INA_BV_06());
+                }
+                if (PICS_EMERGENCY) {
+                    execute(TC_CAM_MSD_INA_BV_07());
+                }
+                if (PICS_SAFETY_CAR) {
+                    execute(TC_CAM_MSD_INA_BV_08());
+                }
+                
+                /*execute(TC_CAM_MSD_GFQ_TI_01());
+                execute(TC_CAM_MSD_GFQ_TI_02());*/
+                /*execute(TC_CAM_MSD_GFQ_TI_03());
+                execute(TC_CAM_MSD_GFQ_BV_04());
+                execute(TC_CAM_MSD_GFQ_BV_05());
+                execute(TC_CAM_MSD_GFQ_BV_06());
+                execute(TC_CAM_MSD_GFQ_TI_07());
+                execute(TC_CAM_MSD_GFQ_TI_08());
+                
+                execute(TC_CAM_MSD_PAR_BV_01());
+                execute(TC_CAM_MSD_PAR_BV_02());
+                execute(TC_CAM_MSD_PAR_BV_03());*/
+            } else {
+                if (PICS_PUBLICTRANS and PICS_SPECIALVEHICLECONTAINER) {
                     execute(TC_CAM_MSD_SSP_BO_02());
                 }
+                if (PICS_SPECIALTRANS and PICS_SPECIALVEHICLECONTAINER) {
+                    execute(TC_CAM_MSD_SSP_BO_03());
+                }
             }
    		}
         
         if(PICS_CAM_RECEPTION) {
-        	execute(TC_CAM_MSP_BV_01());
-        	
-            if (PICS_IS_IUT_SECURED) {
-                execute(TC_CAM_MSP_SSP_BV_02());
+            if (not PICS_IS_IUT_SECURED) {
+        	    execute(TC_CAM_MSP_BV_01());
+            } else {
+                /*execute(TC_CAM_MSP_SSP_BV_02());*/
                 execute(TC_CAM_MSP_SSP_BV_03());
             }
         }
Index: AtsCAM/ItsCam_TpFunctions.ttcn
===================================================================
--- AtsCAM/ItsCam_TpFunctions.ttcn	(revision 2577)
+++ AtsCAM/ItsCam_TpFunctions.ttcn	(working copy)
@@ -1061,7 +1061,7 @@
                     f_CAM_MSD_INA_BV_01(
                         "Low beam headlights being deactivated", 
                         { m_setExteriorLightsStatus(ExteriorLights_lowBeamHeadlightsOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
-                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_lowBeamLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_lowBeamLightsOff))) }
+                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_lowBeamLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_lowBeamLightsOff)) }
                     );
                     
                     // Postamble
@@ -1133,7 +1133,7 @@
                     f_CAM_MSD_INA_BV_01(
                         "High beam headlights being deactivated", 
                         { m_setExteriorLightsStatus(ExteriorLights_highBeamHeadlightsOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
-                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_highBeamLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_highBeamLightsOff))) }
+                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_highBeamLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_highBeamLightsOff)) }
                     );
                     
                     // Postamble
@@ -1205,7 +1205,7 @@
                     f_CAM_MSD_INA_BV_01( 
                         "Left turn signal being deactivated", 
                         { m_setExteriorLightsStatus(ExteriorLights_leftTurnSignalOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
-                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_leftTurnSignalOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_leftTurnSignalOff))) }
+                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_leftTurnSignalOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_leftTurnSignalOff)) }
                     );
                     
                     // Postamble
@@ -1277,7 +1277,7 @@
                     f_CAM_MSD_INA_BV_01(
                         "Right turn signal being deactivated", 
                         { m_setExteriorLightsStatus(ExteriorLights_rightTurnSignalOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
-                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_rightTurnSignalOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_rightTurnSignalOff))) }
+                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_rightTurnSignalOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_rightTurnSignalOff)) }
                     );
                     
                     // Postamble
@@ -1349,7 +1349,7 @@
                     f_CAM_MSD_INA_BV_01(
                         "Daytime running lights being deactivated", 
                         { m_setExteriorLightsStatus(ExteriorLights_daytimeRunningLightsOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
-                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_daytimeRunningLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_daytimeRunningLightsOff))) }
+                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_daytimeRunningLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_daytimeRunningLightsOff)) }
                     );
                     
                     // Postamble
@@ -1421,7 +1421,7 @@
                     f_CAM_MSD_INA_BV_01(
                         "Reverese light being deactivated", 
                         { m_setExteriorLightsStatus(ExteriorLights_reverseLightOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
-                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_reverseLightOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_reverseLightOff))) }
+                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_reverseLightOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_reverseLightOff)) }
                     );
                     
                     // Postamble
@@ -1493,7 +1493,7 @@
                     f_CAM_MSD_INA_BV_01(
                         "Fog lights being deactivated", 
                         { m_setExteriorLightsStatus(ExteriorLights_fogLightOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
-                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_fogLightOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_fogLightOff))) }
+                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_fogLightOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_fogLightOff)) }
                     );
                     
                     // Postamble
@@ -1565,7 +1565,7 @@
                     f_CAM_MSD_INA_BV_01(
                         "Parking lights being deactivated", 
                         { m_setExteriorLightsStatus(ExteriorLights_parkingLightsOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
-                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_parkingLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_parkingLightsOff))) }
+                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_parkingLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_parkingLightsOff)) }
                     );
                     
                     // Postamble
@@ -3128,14 +3128,14 @@
             
             // Test Body
             v_camReq := valueof(
-                            m_camReq(
-                                m_camMsg_vehicle(
-                                    f_getTsStationId(),
-                                    f_getCurrentTime() mod 65536, // See ETSI EN 302 637-2 V1.3.0 - Clause B.3 generationDelatTime
-                                    m_tsPosition
-                                )
-                            )
-                        );
+                m_camReq(
+                    m_camMsg_vehicle(
+                        f_getTsStationId(),
+                        f_getCurrentTime() mod 65536, // See ETSI EN 302 637-2 V1.3.0 - Clause B.3 generationDelatTime
+                        m_tsPosition
+                    )
+                )
+            );
             camPort.send( v_camReq ) ;
             
             f_sleep(PX_TNOAC);
Index: AtsDENM/ItsDenm_TestControl.ttcn
===================================================================
--- AtsDENM/ItsDenm_TestControl.ttcn	(revision 2577)
+++ AtsDENM/ItsDenm_TestControl.ttcn	(working copy)
@@ -17,16 +17,16 @@
     control {
         
         if(PICS_DENM_GENERATION) {
-            execute(TC_DEN_MSGF_BV_01());
-            execute(TC_DEN_MSGF_BV_02());
+           /*execute(TC_DEN_MSGF_BV_01());
+            execute(TC_DEN_MSGF_BV_02());*/
             
-            execute(TC_DEN_EVGN_BV_01());
-            execute(TC_DEN_EVGN_BV_02());
-            execute(TC_DEN_EVGN_BV_03());
+            /*execute(TC_DEN_EVGN_BV_01());
+            execute(TC_DEN_EVGN_BV_02());*/
+            /*execute(TC_DEN_EVGN_BV_03());
             execute(TC_DEN_EVGN_BV_04());
             execute(TC_DEN_EVGN_BV_05());
             execute(TC_DEN_EVGN_BV_07());
-            execute(TC_DEN_EVGN_BV_10());
+            execute(TC_DEN_EVGN_BV_10());*/
         }
         
         if(PICS_DENM_UPDATE) {
@@ -54,42 +54,42 @@
         }
         
         if(PICS_DENM_REPETITION) {
-            execute(TC_DEN_EVRP_TI_01());
+            /*execute(TC_DEN_EVRP_TI_01());
             execute(TC_DEN_EVRP_BV_02());
             execute(TC_DEN_EVRP_BV_03());
             execute(TC_DEN_EVRP_BV_04());
             execute(TC_DEN_EVRP_BV_05());
-            execute(TC_DEN_EVRP_BV_06());
-            execute(TC_DEN_EVRP_BV_08());
+            execute(TC_DEN_EVRP_BV_06());*/
+            /*execute(TC_DEN_EVRP_BV_08());
             execute(TC_DEN_EVRP_BV_09());
             execute(TC_DEN_EVRP_BV_10());
-            execute(TC_DEN_EVRP_BV_11());
+            execute(TC_DEN_EVRP_BV_11());*/
         }
 
         if(PICS_DENM_GENERATION) {
-            execute(TC_DEN_PAR_BV_01());
-            execute(TC_DEN_PAR_BV_02());
+            /*execute(TC_DEN_PAR_BV_01());
+            execute(TC_DEN_PAR_BV_02());*/
         }
         
         if(PICS_IS_IUT_SECURED) {
-			execute(TC_DEN_SSP_BV_01());
-			execute(TC_DEN_SSP_BV_02());
+			/*execute(TC_DEN_SSP_BV_01());
+			execute(TC_DEN_SSP_BV_02());*/
         }
         
         if(PICS_DENM_RECEPTION) {
-            execute(TC_DEN_MSRV_BV_01());
+            /*execute(TC_DEN_MSRV_BV_01());
             execute(TC_DEN_MSRV_BV_02());
             execute(TC_DEN_MSRV_BO_03());
             execute(TC_DEN_MSRV_BO_04());
             execute(TC_DEN_MSRV_BO_05());
             execute(TC_DEN_MSRV_BO_06());
-            execute(TC_DEN_MSRV_BV_07());
+            execute(TC_DEN_MSRV_BV_07());*/
             
             if(PICS_IS_IUT_SECURED) {
-				execute(TC_DEN_MSRV_BO_08_01());
-				execute(TC_DEN_MSRV_BO_08_02());
+				/*execute(TC_DEN_MSRV_BO_08_01());
+				execute(TC_DEN_MSRV_BO_08_02());*/
 
-				execute(TC_DEN_MSRV_BO_09_01());
+				/*execute(TC_DEN_MSRV_BO_09_01());*/
                 execute(TC_DEN_MSRV_BO_09_02());
             }
             if(PICS_IMPACT_REDUCTION) {
Index: AtsDENM/ItsDenm_TpFunctions.ttcn
===================================================================
--- AtsDENM/ItsDenm_TpFunctions.ttcn	(revision 2577)
+++ AtsDENM/ItsDenm_TpFunctions.ttcn	(working copy)
@@ -802,9 +802,12 @@
               f_utTriggerEvent(m_utTriggerEvent(v_situation));
               f_awaitDenMessage(mw_denmInd(mw_anyDenmPdu), v_denmInd);
               v_timestampIts := f_getCurrentTime();
+              log("v_timestampIts: ", v_timestampIts);
               v_actionId := v_denmInd.msgIn.denm.management.actionID;
               v_referenceTime1 := v_denmInd.msgIn.denm.management.referenceTime;
+              log("v_referenceTime1: ", v_referenceTime1);
               v_diff := v_timestampIts - v_referenceTime1;
+              log("v_diff: ", v_diff);
               f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
               
               // Test Body
@@ -827,7 +830,9 @@
                   ) -> value v_denmInd {
                       tc_ac.stop;
                       v_timestampIts := f_getCurrentTime();
+                      log("v_timestampIts: ", v_timestampIts);
                       v_msgtimestamp := v_denmInd.msgIn.denm.management.referenceTime;
+                      log("v_msgtimestamp: ", v_msgtimestamp);
                       if ( ( ( v_timestampIts + v_diff ) > v_msgtimestamp ) and ( v_msgtimestamp > v_referenceTime1 ) ) {
                           log("*** " & testcasename() & ": PASS: Successfully received expected DENM. ***");
                           f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
@@ -1535,8 +1540,7 @@
               const float c_upperRepetitionInterval := int2float(c_repetitionInterval)*1.05;
               // Local variables
               var template (value) SituationContainer v_situation := m_situation(CauseCodeType_vehicleBreakdown_, VehicleBreakdownSubCauseCode_unavailable_);
-              var template (present) DenmInd v_expectedDenmInd :=
-                                                  mw_denmInd(mw_denmPdu(mw_denm( mw_denmMgmtCon( mw_actionId, -, -, c_validityDuration)))); 
+              var template (present) DenmInd v_expectedDenmInd := mw_denmInd(mw_denmPdu(mw_denm( mw_denmMgmtCon( mw_actionId, -, -, c_validityDuration)))); 
               var ActionID v_actionId;
               var DenmInd v_denmInd;
               // Local timers
@@ -2901,6 +2905,16 @@
                         m_denmLocation_zeroDelta
                     )
                 );
+                f_sleep(PX_LOOP);
+                v_actionId := f_sendDenMessage(
+                    m_denm(
+                        m_denmMgmtCon(
+                            m_tsActionId
+                        ),
+                        p_situation,
+                        m_denmLocation_zeroDelta
+                    )
+                );
                 
                 f_sleep(PX_TNOAC);
                 for ( i := 0; i < lengthof(vc_utEvents) and not match(v_actionId, vc_utEvents[i].denMsg.denm.management.actionID); i := i + 1) {
@@ -2924,7 +2938,7 @@
             function f_DEN_MSRV_BO_08_01 () runs on ItsDenm {
                 
                 f_DEN_MSRV_BO_08_XX(
-                    "CERT_TS_DENM_01",
+                    "CERT_TS_DENM_BO_01_AT",
                     m_situation(CauseCodeType_trafficCondition_, TrafficConditionSubCauseCode_unavailable_)
                 );
             }
@@ -2932,7 +2946,7 @@
             function f_DEN_MSRV_BO_08_02 () runs on ItsDenm {
                 
                 f_DEN_MSRV_BO_08_XX(
-                    "CERT_TS_DENM_02",
+                    "CERT_TS_DENM_BO_02_AT",
                     m_situation(CauseCodeType_accident_, AccidentSubCauseCode_unavailable_)
                 );
             }
@@ -2980,6 +2994,7 @@
                 );
                 
                 f_sleep(1.0);
+                vc_utEvents := {};
                 
                 // instruct adapter to use p_certName to sign message
                 if(e_success != f_acTriggerSecEvent(m_acEnableSecurity(p_certName))) { 
@@ -3025,7 +3040,7 @@
             function f_DEN_MSRV_BO_09_01 () runs on ItsDenm {
                 
                 f_DEN_MSRV_BO_09_XX(
-                    "CERT_TS_DENM_01",
+                    "CERT_TS_DENM_BO_01_AT",
                     m_situation(CauseCodeType_trafficCondition_, TrafficConditionSubCauseCode_unavailable_),
                     m_situation(CauseCodeType_trafficCondition_, TrafficConditionSubCauseCode_trafficJamIncreasing_)
                 );
@@ -3034,7 +3049,7 @@
             function f_DEN_MSRV_BO_09_02 () runs on ItsDenm {
                 
                 f_DEN_MSRV_BO_09_XX(
-                    "CERT_TS_DENM_02",
+                    "CERT_TS_DENM_BO_02_AT",
                     m_situation(CauseCodeType_accident_, AccidentSubCauseCode_unavailable_),
                     m_situation(CauseCodeType_accident_, AccidentSubCauseCode_multiVehicleAccident_)
                 );
Index: AtsGeoNetworking/ItsGeoNetworking_TestControl.ttcn
===================================================================
--- AtsGeoNetworking/ItsGeoNetworking_TestControl.ttcn	(revision 2577)
+++ AtsGeoNetworking/ItsGeoNetworking_TestControl.ttcn	(working copy)
@@ -6,6 +6,8 @@
  *
  */
 module ItsGeoNetworking_TestControl {
+    // LibCommon
+    import from LibCommon_Time all;
     
     // ATS GeoNetworking
     import from ItsGeoNetworking_TestCases {testcase all};
@@ -20,47 +22,47 @@
         /* FDV */
         
         if(PICS_GN_BASIC_HEADER) {
-            execute(TC_GEONW_FDV_BAH_BV_01());
+            /*execute(TC_GEONW_FDV_BAH_BV_01());*/
             execute(TC_GEONW_FDV_BAH_BI_02());
         }
 
         if(PICS_GN_COMMON_HEADER) {
-            execute(TC_GEONW_FDV_COH_BV_01());
+            /*execute(TC_GEONW_FDV_COH_BV_01());
             execute(TC_GEONW_FDV_COH_BV_02());
-            execute(TC_GEONW_FDV_COH_BV_03());
-            execute(TC_GEONW_FDV_COH_BO_04());
+            execute(TC_GEONW_FDV_COH_BV_03());*/
+            /*execute(TC_GEONW_FDV_COH_BO_04());*/
         }        
         
         if(PICS_GN_BEACON_SRC) {
-            execute(TC_GEONW_FDV_BEA_BV_01());
+            /*execute(TC_GEONW_FDV_BEA_BV_01());
             execute(TC_GEONW_FDV_BEA_BV_02());
-            execute(TC_GEONW_FDV_BEA_BV_03());
-            execute(TC_GEONW_FDV_BEA_BV_04());
+            execute(TC_GEONW_FDV_BEA_BV_03());*/
+            /*execute(TC_GEONW_FDV_BEA_BV_04());*/
         }
         
         if(PICS_GN_GUC_SRC) {
-	        execute(TC_GEONW_FDV_GUC_BV_01());
+	        /*execute(TC_GEONW_FDV_GUC_BV_01());*/
         }
         
         if(PICS_GN_GBC_SRC) {
-    	    execute(TC_GEONW_FDV_GBC_BV_01());
+    	    /*execute(TC_GEONW_FDV_GBC_BV_01());*/
         }
         
         if(PICS_GN_GAC_SRC) {
-        	execute(TC_GEONW_FDV_GAC_BV_01());
+        	/*execute(TC_GEONW_FDV_GAC_BV_01());*/
         }
         
         if(PICS_GN_SHB_SRC) {
-        	execute(TC_GEONW_FDV_SHB_BV_01());
+        	/*execute(TC_GEONW_FDV_SHB_BV_01());*/
         }
         
         if(PICS_GN_TSB_SRC) {
-        	execute(TC_GEONW_FDV_TSB_BV_01());
+        	/*execute(TC_GEONW_FDV_TSB_BV_01());*/
         }
 
 		/* PON/LOT */
 
-        if(PICS_GN_GUC_SRC and PICS_GN_BEACON_DST) {
+        /*if(PICS_GN_GUC_SRC and PICS_GN_BEACON_DST) {
         	execute(TC_GEONW_PON_LOT_BV_01());
         }
         
@@ -130,24 +132,24 @@
         
         if(PICS_GN_LS_REP_DST) {
        		execute(TC_GEONW_PON_LOT_BV_05_07());
-        }
+        }*/
         
         /* PON/LPV */
         
-        if(PICS_GN_BEACON_SRC) {
+        /*if(PICS_GN_BEACON_SRC) {
         	execute(TC_GEONW_PON_LPV_BV_01());
-        }
+        }*/
         
         /* PON/SQN */
         
         if(PICS_GN_GBC_SRC) {
-            execute(TC_GEONW_PON_SQN_BV_01());
-            execute(TC_GEONW_PON_SQN_BV_02());
+            /*execute(TC_GEONW_PON_SQN_BV_01());
+            execute(TC_GEONW_PON_SQN_BV_02());*/
         }
         
         /* PON/LOS */
         
-        if(PICS_GN_LS_REQ_SRC) {
+        /*if(PICS_GN_LS_REQ_SRC) {
             execute(TC_GEONW_PON_LOS_BV_01());
             execute(TC_GEONW_PON_LOS_BV_02());
 	        if(PICS_GN_LS_REP_DST) {
@@ -179,11 +181,11 @@
             execute(TC_GEONW_PON_LOS_BV_15());
             execute(TC_GEONW_PON_LOS_BV_16());
             execute(TC_GEONW_PON_LOS_BV_17());
-        }
+        }*/
         
         /* PON/FPB */
         
-        if(PICS_GN_GUC_SRC) {
+        /*if(PICS_GN_GUC_SRC) {
             execute(TC_GEONW_PON_FPB_BV_01());
             execute(TC_GEONW_PON_FPB_BV_02());
             execute(TC_GEONW_PON_FPB_BV_03());
@@ -238,11 +240,11 @@
         
         if(PICS_GN_TSB_SRC) {
         execute(TC_GEONW_PON_FPB_BV_12_04());
-        }
+        }*/
         
         /* PON/GNA */
         
-        if(PICS_GN_ADDR_AUTO) {
+        /*if(PICS_GN_ADDR_AUTO) {
             if (PICS_GN_LOCAL_ADDR_CONF_METHOD == e_auto) {
                 execute(TC_GEONW_PON_GNA_BV_01());
             }
@@ -250,18 +252,18 @@
         
         if(PICS_GN_DAD) {
 	        execute(TC_GEONW_PON_GNA_BV_02());
-        }
+        }*/
         
         /* PON/BEA */
         
-        if(PICS_GN_BEACON_SRC) {
+        /*if(PICS_GN_BEACON_SRC) {
             execute(TC_GEONW_PON_BEA_TI_01());
             execute(TC_GEONW_PON_BEA_TI_02());
-        }
+        }*/
         
         /* PON/GUC */
         
-        if(PICS_GN_GUC_SRC) {
+        /*if(PICS_GN_GUC_SRC) {
             if ((PICS_GN_GEOUNICAST_FORWARDING_ALGORITHM == e_greedy) or (PICS_GN_GEOUNICAST_FORWARDING_ALGORITHM == e_unspecified)) {
                 execute(TC_GEONW_PON_GUC_BV_01());
             }
@@ -297,11 +299,11 @@
             if ((PICS_GN_GEOUNICAST_FORWARDING_ALGORITHM == e_greedy) or (PICS_GN_GEOUNICAST_FORWARDING_ALGORITHM == e_unspecified)) {
 	            execute(TC_GEONW_PON_GUC_BO_13());
             }
-        }
+        }*/
         
         /* PON/GBC */        
         
-        if(PICS_GN_GBC_SRC) {
+        /*if(PICS_GN_GBC_SRC) {
             execute(TC_GEONW_PON_GBC_BV_01());
             if ((PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_simple) or (PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_unspecified) or (PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_advanced)) {
             	execute(TC_GEONW_PON_GBC_BV_02());
@@ -335,11 +337,11 @@
             if ((PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_simple) or (PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_unspecified)) {
             	execute(TC_GEONW_PON_GBC_BO_10());
             }
-        }
+        }*/
         
         /* PON/TSB */
 
-        if(PICS_GN_TSB_SRC) {        
+        /*if(PICS_GN_TSB_SRC) {        
         	execute(TC_GEONW_PON_TSB_BV_01());
         }
 
@@ -352,20 +354,20 @@
         if(PICS_GN_TSB_DST) {        
             execute(TC_GEONW_PON_TSB_BV_06());
             execute(TC_GEONW_PON_TSB_BO_07());
-        }
+        }*/
         
         /* PON/SHB */
         
         if(PICS_GN_SHB_SRC) {
-            execute(TC_GEONW_PON_SHB_BV_01());
+            /*execute(TC_GEONW_PON_SHB_BV_01());*/
         }
         if(PICS_GN_SHB_DST) {        
-            execute(TC_GEONW_PON_SHB_BV_02());
+            /*execute(TC_GEONW_PON_SHB_BV_02());*/
         }
         
         /* PON/GAC */
 
-        if(PICS_GN_GAC_SRC) {        
+        /*if(PICS_GN_GAC_SRC) {        
             execute(TC_GEONW_PON_GAC_BV_01());
             if ((PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_simple) or (PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_unspecified)) {
             	execute(TC_GEONW_PON_GAC_BV_02());
@@ -388,11 +390,11 @@
             execute(TC_GEONW_PON_GAC_BV_08());
             execute(TC_GEONW_PON_GAC_BO_09());
             execute(TC_GEONW_PON_GAC_BV_10());
-        }
+        }*/
         
 		/* PON/BCA */
 
-        if(PICS_GN_GBC_FWD) {        
+        /*if(PICS_GN_GBC_FWD) {        
             if (PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_cbf) {
                 execute(TC_GEONW_PON_BCA_BV_01());
                 execute(TC_GEONW_PON_BCA_BV_02());
@@ -403,11 +405,11 @@
 				execute(TC_GEONW_PON_BCA_BV_07());
                 execute(TC_GEONW_PON_BCA_BV_08());
             }
-        }
+        }*/
         
         /* PON/BAA */
         
-        if(PICS_GN_GBC_FWD) {
+        /*if(PICS_GN_GBC_FWD) {
             if (PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_advanced) {
                 execute(TC_GEONW_PON_BAA_BV_01());
                 execute(TC_GEONW_PON_BAA_BV_02());
@@ -421,11 +423,11 @@
                 execute(TC_GEONW_PON_BAA_BV_10());
                 execute(TC_GEONW_PON_BAA_BV_11());
             }
-        }
+        }*/
                 
         /* CAP */       
         
-        if(PICS_GN_LS_REQ_SRC) {         
+        /*if(PICS_GN_LS_REQ_SRC) {         
         	execute(TC_GEONW_CAP_LOS_BV_01());
         }
         
@@ -435,7 +437,7 @@
       
         if(PICS_GN_GBC_FWD) {
       	  execute(TC_GEONW_CAP_FPB_BV_02());
-        }
+        }*/
         
     }
     
Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn
===================================================================
--- AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn	(revision 2578)
+++ AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn	(working copy)
@@ -527,7 +527,7 @@
                     altitudeValue := AltitudeValue_referenceEllipsoidSurface_,
                     altitudeConfidence := unavailable
                 }
-            }
+            } // End of PICS_UC7_COLLISION_POINT
             
         } // End of group camUseCase7
         
@@ -5638,7 +5638,7 @@
     group generationFrequencies {
         
         /**
-         * @desc CAM frequency timer
+         * @desc Beacon frequency timer
          */
         modulepar float PICS_BEACON_FREQUENCY    := 1.0;
         
Index: AtsSecurity/AtsSecurity_Pics.ttcn3
===================================================================
--- AtsSecurity/AtsSecurity_Pics.ttcn3	(revision 2579)
+++ AtsSecurity/AtsSecurity_Pics.ttcn3	(working copy)
@@ -15,6 +15,6 @@
     /**
      * @desc Set to true to enable restrictions of TS 103 097 v1.2.5
      */
-    modulepar boolean PICS_PLUGTEST_VERSION := false;
+    modulepar boolean PICS_PLUGTEST_VERSION := true;
     
 } // End of module AtsSecurity_Pics 
Index: AtsSecurity/AtsSecurity_TestCases.ttcn3
===================================================================
--- AtsSecurity/AtsSecurity_TestCases.ttcn3	(revision 2582)
+++ AtsSecurity/AtsSecurity_TestCases.ttcn3	(working copy)
@@ -1803,9 +1803,10 @@
                             	log("*** " & testcasename() & ": PASS: Generation time within certificate validity ***");
                             	f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success); 
                         	}
+                        } else {
+                            log("*** " & testcasename() & ": FAIL: Generation time not within certificate validity ***");
+                            f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_error);
                         }
-                        log("*** " & testcasename() & ": FAIL: Generation time not within certificate validity ***");
-                        f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_error);
                     }
                     [] geoNetworkingPort.receive(
                         mw_geoNwInd(
Index: AtsSecurity/AtsSecurity_TestControl.ttcn3
===================================================================
--- AtsSecurity/AtsSecurity_TestControl.ttcn3	(revision 2579)
+++ AtsSecurity/AtsSecurity_TestControl.ttcn3	(working copy)
@@ -11,7 +11,7 @@
     import from LibItsGeoNetworking_Pics all;
     
     // ItsSecurity
-    import from ItsSecurity_TestCases all;
+    import from AtsSecurity_TestCases all;
     import from LibItsSecurity_Pics all;
     
     // Test Execution
@@ -22,16 +22,16 @@
          * @see ETSI TS 103 096-2 V1.2.2 (2016-01) Clause 5.2 Sending behaviour
          */
         if (PICS_GN_SECURITY) {
-            execute(TC_SEC_ITSS_SND_MSG_01_01_BV());
-            execute(TC_SEC_ITSS_SND_MSG_04_01_BV());
-            execute(TC_SEC_ITSS_SND_MSG_04_02_BV());
-            execute(TC_SEC_ITSS_SND_MSG_05_01_BV());
+            /*execute(TC_SEC_ITSS_SND_MSG_01_01_BV());
+            execute(TC_SEC_ITSS_SND_MSG_04_01_BV()); Signature/Hash issue
+            execute(TC_SEC_ITSS_SND_MSG_04_02_BV());*/
+            /*execute(TC_SEC_ITSS_SND_MSG_05_01_BV());*/
             
             /**
              * @desc Sending behaviour test cases for CAM profile
              * @see ETSI TS 103 096-2 V1.2.2 (2016-01) Clause 5.2.4 CAM profile
              */
-            execute(TC_SEC_ITSS_SND_CAM_01_01_BV());
+            /*execute(TC_SEC_ITSS_SND_CAM_01_01_BV());
             execute(TC_SEC_ITSS_SND_CAM_02_01_BV());
             execute(TC_SEC_ITSS_SND_CAM_05_01_BV());
             execute(TC_SEC_ITSS_SND_CAM_05_02_BV());
@@ -39,16 +39,17 @@
             execute(TC_SEC_ITSS_SND_CAM_07_01_TI());
             execute(TC_SEC_ITSS_SND_CAM_08_01_BV());
             execute(TC_SEC_ITSS_SND_CAM_09_01_BV());
+            execute(TC_SEC_ITSS_SND_CAM_09_02_BV()); Missing certificate CERT_TS_A_1_AT
             execute(TC_SEC_ITSS_SND_CAM_10_01_BV());
             execute(TC_SEC_ITSS_SND_CAM_12_01_BV());
-            execute(TC_SEC_ITSS_SND_CAM_14_01_BV());
-            execute(TC_SEC_ITSS_SND_CAM_16_01_BV());
+            execute(TC_SEC_ITSS_SND_CAM_14_01_BV());*/
+            /*execute(TC_SEC_ITSS_SND_CAM_16_01_BV()); Signature issue*/
             
             /**
              * @desc Sending behaviour test cases for DENM profile
              * @see ETSI TS 103 096-2 V1.2.2 (2016-01) Clause 5.2.5 DENM profile
              */
-            execute(TC_SEC_ITSS_SND_DENM_01_01_BV());
+            /*execute(TC_SEC_ITSS_SND_DENM_01_01_BV());
             execute(TC_SEC_ITSS_SND_DENM_02_01_BV());
             execute(TC_SEC_ITSS_SND_DENM_03_01_BV());
             execute(TC_SEC_ITSS_SND_DENM_04_01_BV());
@@ -94,13 +95,13 @@
                 }
                 execute(TC_SEC_ITSS_SND_GENMSG_06_01_BV());
                 execute(TC_SEC_ITSS_SND_GENMSG_07_01_BV());
-            }
+            }*/
             
             /**
              * @desc Sending behaviour test cases for certificates profile
              * @see ETSI TS 103 096-2 V1.2.2 (2016-01) Clause 5.2.7 Profiles for certificates
              */
-            execute(TC_SEC_ITSS_SND_CERT_01_01_BV());
+            /*execute(TC_SEC_ITSS_SND_CERT_01_01_BV());
             execute(TC_SEC_ITSS_SND_CERT_01_02_BV());
             execute(TC_SEC_ITSS_SND_CERT_02_01_BV());
             if (PICS_CERTIFICATE_SELECTION) {
@@ -128,24 +129,24 @@
             execute(TC_SEC_ITSS_SND_CERT_10_02_BV());
             execute(TC_SEC_ITSS_SND_CERT_11_01_BV());
             execute(TC_SEC_ITSS_SND_CERT_11_02_BV());
-            execute(TC_SEC_ITSS_SND_CERT_12_01_BV());
+            execute(TC_SEC_ITSS_SND_CERT_12_01_BV());*/
             
             /**
              * @desc Sending behaviour test cases for AA certificate profil
              * @see ETSI TS 103 096-2 V1.2.2 (2016-01) Clause 5.2.7.7 AA certificate profile
              */
-            execute(TC_SEC_ITSS_SND_CERT_AA_01_01_BV());
+            /*execute(TC_SEC_ITSS_SND_CERT_AA_01_01_BV());
             execute(TC_SEC_ITSS_SND_CERT_AA_02_01_BV());
             execute(TC_SEC_ITSS_SND_CERT_AA_03_01_BV());
             execute(TC_SEC_ITSS_SND_CERT_AA_04_01_BV());
             execute(TC_SEC_ITSS_SND_CERT_AA_05_01_BV());
             execute(TC_SEC_ITSS_SND_CERT_AA_08_01_BV());
-            execute(TC_SEC_ITSS_SND_CERT_AA_10_01_BV());
+            execute(TC_SEC_ITSS_SND_CERT_AA_10_01_BV());*/
             /**
              * @desc Sending behaviour test cases for AT certificate profil
              * @see ETSI TS 103 096-2 V1.2.2 (2016-01) Clause 5.2.7.8 AT certificate profile
              */
-            execute(TC_SEC_ITSS_SND_CERT_AT_01_01_BV());
+            /*execute(TC_SEC_ITSS_SND_CERT_AT_01_01_BV());
             execute(TC_SEC_ITSS_SND_CERT_AT_02_01_BV());
             execute(TC_SEC_ITSS_SND_CERT_AT_03_01_BV());
             execute(TC_SEC_ITSS_SND_CERT_AT_04_01_BV());
@@ -152,7 +153,7 @@
             execute(TC_SEC_ITSS_SND_CERT_AT_05_01_BV());
             execute(TC_SEC_ITSS_SND_CERT_AT_07_01_BV());
             execute(TC_SEC_ITSS_SND_CERT_AT_08_01_BV());
-            execute(TC_SEC_ITSS_SND_CERT_AT_10_01_BV());
+            execute(TC_SEC_ITSS_SND_CERT_AT_10_01_BV());*/
         }
             
         /**
@@ -165,7 +166,7 @@
              * @see ETSI TS 103 096-2 V1.2.2 (2016-01) Clause 5.3.2 CAM Profile
              */
             execute(TC_SEC_ITSS_RCV_CAM_01_01_BV());
-            execute(TC_SEC_ITSS_RCV_CAM_01_02_BV());
+            /*execute(TC_SEC_ITSS_RCV_CAM_01_02_BV());
             execute(TC_SEC_ITSS_RCV_CAM_01_03_BV());
             execute(TC_SEC_ITSS_RCV_CAM_02_01_BO());
             execute(TC_SEC_ITSS_RCV_CAM_02_02_BO());
@@ -212,13 +213,13 @@
             execute(TC_SEC_ITSS_RCV_CAM_13_03_BO());
             execute(TC_SEC_ITSS_RCV_CAM_13_04_BO());
             execute(TC_SEC_ITSS_RCV_CAM_13_05_BO());
-            execute(TC_SEC_ITSS_RCV_CAM_13_06_BO());
+            execute(TC_SEC_ITSS_RCV_CAM_13_06_BO());*/
             
             /**
              * @desc Sending behaviour test cases for DENM profile
              * @see ETSI TS 103 096-2 V1.2.2 (2016-01) Clause 5.3.3 DENM Profile
              */
-            execute(TC_SEC_ITSS_RCV_DENM_01_01_BV());
+            /*execute(TC_SEC_ITSS_RCV_DENM_01_01_BV());
             execute(TC_SEC_ITSS_RCV_DENM_01_02_BV());
             execute(TC_SEC_ITSS_RCV_DENM_01_03_BV());
             execute(TC_SEC_ITSS_RCV_DENM_01_04_BV());
@@ -278,12 +279,12 @@
             execute(TC_SEC_ITSS_RCV_DENM_13_03_BO());
             execute(TC_SEC_ITSS_RCV_DENM_13_04_BO());
             execute(TC_SEC_ITSS_RCV_DENM_13_05_BO());
-            execute(TC_SEC_ITSS_RCV_DENM_13_06_BO());
+            execute(TC_SEC_ITSS_RCV_DENM_13_06_BO());*/
             /**
              * @desc Receiving behaviour test cases for Other profile
              * @see ETSI TS 103 096-2 V1.2.2 (2016-01) Clause 5.3.4 Generic Signed Message Profile
              */
-            if (PICS_GN_GBC_SRC) {
+            /*if (PICS_GN_GBC_SRC) {
                 execute(TC_SEC_ITSS_RCV_GENMSG_01_01_BV());
                 execute(TC_SEC_ITSS_RCV_GENMSG_01_02_BV());
                 execute(TC_SEC_ITSS_RCV_GENMSG_01_03_BV());
@@ -341,7 +342,7 @@
                 execute(TC_SEC_ITSS_RCV_GENMSG_13_03_BO());
                 execute(TC_SEC_ITSS_RCV_GENMSG_13_04_BO());
                 execute(TC_SEC_ITSS_RCV_GENMSG_13_05_BO());
-                execute(TC_SEC_ITSS_RCV_GENMSG_13_06_BO());
+                execute(TC_SEC_ITSS_RCV_GENMSG_13_06_BO());*/
             }
             
             /**
@@ -348,7 +349,7 @@
              * @desc Receiving behaviour test cases for certificates profile
              * @see ETSI TS 103 096-2 V1.2.2 (2016-01) Clause 5.3.5 Profiles for certificates
              */
-            execute(TC_SEC_ITSS_RCV_CERT_01_01_BO());
+            /*execute(TC_SEC_ITSS_RCV_CERT_01_01_BO());
             execute(TC_SEC_ITSS_RCV_CERT_01_02_BO());
             execute(TC_SEC_ITSS_RCV_CERT_01_03_BO());
             execute(TC_SEC_ITSS_RCV_CERT_01_04_BO());
@@ -436,8 +437,8 @@
             execute(TC_SEC_ITSS_RCV_CERT_18_01_BO());
             execute(TC_SEC_ITSS_RCV_CERT_18_02_BO());
             execute(TC_SEC_ITSS_RCV_CERT_19_01_BO());
-        }
+        }*/
         
     } // End of 'control' statement
     
-} // End of module ItsSecurity_TestControl
\ No newline at end of file
+} // End of module AtsSecurity_TestControl
\ No newline at end of file
