From 5b8db9dbdf9418b6f99cdbfa97aa8ba15ccb39b7 Mon Sep 17 00:00:00 2001
From: garciay <garciay@5a941883-869f-0410-b6e7-a816b635d326>
Date: Wed, 14 Dec 2016 09:22:07 +0000
Subject: [PATCH] Remove PICS_RSU IS PICS reviews Remove some TODOs

---
 ttcn/AtsCAM/ItsCam_TpFunctions.ttcn           |   5 +-
 ttcn/AtsIVIM/ItsIvim_TestCases.ttcn           |   4 +-
 ttcn/AtsIVIM/ItsIvim_TestControl.ttcn         |   6 +-
 .../ItsMapemSpatem_TestControl.ttcn           |   3 +
 ttcn/AtsMapemSpatem/ItsMapem_TestCases.ttcn   | 898 +-----------------
 ttcn/AtsMapemSpatem/ItsMapem_TpFunctions.ttcn |  36 +-
 ttcn/AtsMapemSpatem/ItsSpatem_TestCases.ttcn  |  22 +-
 .../AtsMapemSpatem/ItsSpatem_TpFunctions.ttcn |  42 +-
 ttcn/AtsSremSsem/ItsSrem_TestCases.ttcn       |  18 +-
 ttcn/AtsSremSsem/ItsSrem_TestControl.ttcn     |   6 +-
 ttcn/AtsSremSsem/ItsSrem_TpFunctions.ttcn     |  46 +-
 11 files changed, 115 insertions(+), 971 deletions(-)

diff --git a/ttcn/AtsCAM/ItsCam_TpFunctions.ttcn b/ttcn/AtsCAM/ItsCam_TpFunctions.ttcn
index aaa0fcafb..53e193fb6 100644
--- a/ttcn/AtsCAM/ItsCam_TpFunctions.ttcn
+++ b/ttcn/AtsCAM/ItsCam_TpFunctions.ttcn
@@ -431,7 +431,6 @@ module ItsCam_TpFunctions {
                 /**
                  * @desc    TP Function for TC_CAM_MSD_INA_BV_01_01
                  */
-                 // TODO yann/ifsttar: why 3601? 0 and 3600 indicates the north!!!!
                 function f_CAM_MSD_INA_BV_01_01() runs on ItsCam {
                     
                     // Local variables
@@ -476,10 +475,10 @@ module ItsCam_TpFunctions {
                                 //change again the curvature value and set the expectation to the measured value
                                 if (v_camInd.msgIn.cam.camParameters.highFrequencyContainer.basicVehicleContainerHighFrequency.curvature.curvatureValue >= 0) {
                                     v_curVal := (v_camInd.msgIn.cam.camParameters.highFrequencyContainer.basicVehicleContainerHighFrequency.curvature.curvatureValue + c_curValOffset) mod 30001;
-                                } else { // TODO Add negative value case
+                                } else { 
                                     v_curVal := v_camInd.msgIn.cam.camParameters.highFrequencyContainer.basicVehicleContainerHighFrequency.curvature.curvatureValue - c_curValOffset;
                                     if (valueof(v_curVal) < -30000) {
-                                        v_curVal := 0; // yann/ifsttar TODO It's not a true negative modulus operation
+                                        v_curVal := 0; 
                                     }
                                 }
                                 f_utTriggerEvent(m_changeCurvature(c_curValOffset));
diff --git a/ttcn/AtsIVIM/ItsIvim_TestCases.ttcn b/ttcn/AtsIVIM/ItsIvim_TestCases.ttcn
index 2b5db0dad..7d23abd27 100644
--- a/ttcn/AtsIVIM/ItsIvim_TestCases.ttcn
+++ b/ttcn/AtsIVIM/ItsIvim_TestCases.ttcn
@@ -586,7 +586,7 @@ module ItsIvim_TestCases {
             /**
              * @desc Check that IVIMs are not generated more frequently than T_GenIvimMin
              * <pre>
-             * Pics Selection: PICS_IVIM_GENERATION
+             * Pics Selection: PICS_T_GENIVIMMIN and PICS_IVIM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -615,7 +615,7 @@ module ItsIvim_TestCases {
             /**
              * @desc Check that IVIMs are not generated less frequently than T_GenIvimMax
              * <pre>
-             * Pics Selection: PICS_IVIM_GENERATION
+             * Pics Selection: PICS_T_GENIVIMMAX and PICS_IVIM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
diff --git a/ttcn/AtsIVIM/ItsIvim_TestControl.ttcn b/ttcn/AtsIVIM/ItsIvim_TestControl.ttcn
index 38ca19ffb..87df6e75c 100644
--- a/ttcn/AtsIVIM/ItsIvim_TestControl.ttcn
+++ b/ttcn/AtsIVIM/ItsIvim_TestControl.ttcn
@@ -22,15 +22,19 @@ module ItsIvim_TestControl {
         
         if(PICS_IVIM_GENERATION) {
             execute(TC_IS_IVI_MSGF_BV_01());
+            
             execute(TC_IS_IVI_EVGN_BV_01());
             execute(TC_IS_IVI_EVGN_BV_02());
             execute(TC_IS_IVI_EVGN_BV_03());
             execute(TC_IS_IVI_EVGN_BV_04());
             execute(TC_IS_IVI_EVGN_BV_05());
+            
             execute(TC_IS_IVI_EVTR_BV_01());
-            execute(TC_IS_IVI_EVTR_BV_01());
+            execute(TC_IS_IVI_EVTR_BV_02());
+            
             execute(TC_IS_IVI_GFQ_TI_01());
             execute(TC_IS_IVI_GFQ_TI_02());
+            
             execute(TC_IS_IVI_COMM_BV_01_01());
             execute(TC_IS_IVI_COMM_BV_01_02());
             execute(TC_IS_IVI_COMM_BV_02());
diff --git a/ttcn/AtsMapemSpatem/ItsMapemSpatem_TestControl.ttcn b/ttcn/AtsMapemSpatem/ItsMapemSpatem_TestControl.ttcn
index 2c692fed5..6e795cfa8 100644
--- a/ttcn/AtsMapemSpatem/ItsMapemSpatem_TestControl.ttcn
+++ b/ttcn/AtsMapemSpatem/ItsMapemSpatem_TestControl.ttcn
@@ -37,6 +37,7 @@ module ItsMapemSpatem_TestControl {
         
         if (PICS_SPATEM_GENERATION) {
             execute(TC_IS_TLM_MSGF_BV_01 ());
+            
             execute(TC_IS_TLM_EVGN_BV_01 ());
             execute(TC_IS_TLM_EVGN_BV_02 ());
             execute(TC_IS_TLM_EVGN_BV_03 ());
@@ -46,6 +47,8 @@ module ItsMapemSpatem_TestControl {
             execute(TC_IS_TLM_COMM_BV_02_01 ());
             execute(TC_IS_TLM_COMM_BV_02_02 ());
             execute(TC_IS_TLM_COMM_BV_03 ());
+        }
+        if (PICS_SPATEM_RECEPTION) {
             execute(TC_IS_TLM_MSGF_BV_02 ());
         }
         
diff --git a/ttcn/AtsMapemSpatem/ItsMapem_TestCases.ttcn b/ttcn/AtsMapemSpatem/ItsMapem_TestCases.ttcn
index e983bab7a..c61eb97e2 100644
--- a/ttcn/AtsMapemSpatem/ItsMapem_TestCases.ttcn
+++ b/ttcn/AtsMapemSpatem/ItsMapem_TestCases.ttcn
@@ -25,7 +25,7 @@ module ItsMapem_TestCases {
             /**
              * @desc Check that protocolVersion is set to 1 and messageID is set to 4
              * <pre>
-             * Pics Selection: PICS_RSU_ROLE and PICS_MAPEM_GENERATION
+             * Pics Selection: PICS_MAPEM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -64,7 +64,7 @@ module ItsMapem_TestCases {
             /**
              * @desc Check that IVI Service generates a new MAPEM on reception of a valid AppMAPEM_Trigger request
              * <pre>
-             * Pics Selection: PICS_RSU_ROLE and PICS_MAPEM_GENERATION
+             * Pics Selection: PICS_MAPEM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -94,7 +94,7 @@ module ItsMapem_TestCases {
             /**
              * @desc Check that RLT Service transmits new content
              * <pre>
-             * Pics Selection: PICS_RSU_ROLE and PICS_MAPEM_GENERATION
+             * Pics Selection: PICS_MAPEM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -134,7 +134,7 @@ module ItsMapem_TestCases {
             /**
              * @desc Check that RLT Service transmits fragmented MAPEM when the message size exceeds the allowed message length 
              * <pre>
-             * Pics Selection: PICS_RSU_ROLE and PICS_MAPEM_GENERATION
+             * Pics Selection: PICS_MAPEM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -178,7 +178,7 @@ module ItsMapem_TestCases {
             /**
              * @desc Check that the RLT Service transmits continuously both MAPEM and SPATEM
              * <pre>
-             * Pics Selection: PICS_RSU_ROLE and PICS_MAPEM_GENERATION and PICS_SPATEM_GENERATION
+             * Pics Selection: PICS_MAPEM_GENERATION and PICS_SPATEM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -210,7 +210,7 @@ module ItsMapem_TestCases {
             /**
              * @desc Check that MAPEM uses BTP_B packet
              * <pre>
-             * Pics Selection: PICS_RSU_ROLE and PICS_MAPEM_GENERATION
+             * Pics Selection: PICS_MAPEM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -241,7 +241,7 @@ module ItsMapem_TestCases {
             /**
              * @desc Check that the destination port for MAPEM is set to 2003
              * <pre>
-             * Pics Selection: PICS_RSU_ROLE and PICS_MAPEM_GENERATION
+             * Pics Selection: PICS_MAPEM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -274,7 +274,7 @@ module ItsMapem_TestCases {
             /**
              * @desc Check that TLM service encapsulates MAPEM in a GBC with the HeaderType field set to the value of 4
              * <pre>
-             * Pics Selection: PICS_RSU_ROLE and PICS_MAPEM_GENERATION
+             * Pics Selection: PICS_MAPEM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -314,7 +314,7 @@ module ItsMapem_TestCases {
         /**
          * @desc Check that the IUT can successfully process all mandatory fields of MAPEM received
          * <pre>
-         * Pics Selection: not PICS_RSU_ROLE and PICS_MAPEM_RECEPTION
+         * Pics Selection: PICS_MAPEM_RECEPTION
          * Initial conditions: 
          *   with {
          *        the IUT being in the "initial state"
@@ -344,884 +344,4 @@ module ItsMapem_TestCases {
         
     } // End of group mapeMessageProcessing
     
-//    group MapemSpatemMessageDissemination { 
-//            
-//        /**
-//        * @desc Verify that when sending a MapData message the DSRCmsgSubID is set to value 1.
-//        * <pre>
-//        * Pics Selection: PICS_RSU_ROLE
-//        * Initial conditions: 
-//        *   with {
-//        *        the IUT being in the "initial state"
-//        *    }
-//        * Expected behaviour:
-//        *    ensure that {
-//        *        when { 
-//        *            a MapData message is generated
-//        *        }
-//        *        then {
-//        *            the IUT sends a valid MapData message
-//        *                containing DSRCmsgSubID
-//        *                    set to value 1
-//        *        }
-//        *    }
-//        * </pre>
-//        * 
-//        * @version   0.0.1
-//        * @see       ETSI TS 103 191-2 v1.2.1 TP/MAPEM-SPATEM/MSD/BV-01
-//        * @reference ETSI TS 103 301 v1.0.4 Clause 7.34
-//        */
-//        testcase TC_IS_RLT_MSD_BV_01 () runs on ItsMapemSpatem system ItsMapemSpatemSystem {
-//                
-//            // Local variables
-//                
-//            // Test component configuration
-//            f_cfUp();
-//                
-//            // Preamble
-//            f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
-//                
-//            // Test Body
-//            tc_ac.start;
-//            alt {
-//                [] mapemSpatemPort.receive ( mw_mapemInd ( mw_mapemPdu ( mw_itsPduHeaderMapem , mw_mapSubId1 ) ) ) { 
-//                    tc_ac.stop;
-//                    log("*** " & testcasename() & ": PASS: Successfully received MAPEM with DSRCmsgSubID == 1. ***");
-//                    f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
-//                }
-//                [] mapemSpatemPort.receive ( mw_mapemInd ( mw_mapemPdu ( mw_itsPduHeaderMapem , mw_anyMap ) ) ) { 
-//                    tc_ac.stop;
-//                    log("*** " & testcasename() & ": FAIL: Received an incorrect MAPEM message. ***");
-//                    f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
-//                }
-//                []    tc_ac.timeout {
-//                    log("*** " & testcasename() & ": INCONC: Timeout while awaiting the reception of a message. ***");
-//                    f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
-//                }
-//            }
-//                
-//            // Postamble
-//            f_poDefault();
-//            f_cfDown();
-//                            
-//        } // End of testcase TC_IS_RLT_MSD_BV-01
-//
-//        /**
-//        * @desc Verify that when sending a SPATEM the DSRCmsgSubID is set to value 1.
-//        * <pre>
-//        * Pics Selection: PICS_RSU_ROLE
-//        * Initial conditions: 
-//        *    with {
-//        *        the IUT being in the "initial state"
-//        *    }
-//        * Expected behaviour:
-//        *    ensure that {
-//        *        when { 
-//        *            a SPATEM is generated
-//        *        }
-//        *        then {
-//        *            the IUT sends a valid SPATEM message
-//        *                containing DSRCmsgSubID
-//        *                    set to value 1
-//        *        }
-//        *    }
-//        * </pre>
-//        *
-//        * @version     0.0.1
-//        * @see         ETSI TS 103 191-2 V0.0.1 TP/MAPEM-SPATEM/MSD//BV-02
-//        * @reference ETSI TS 103 301 v1.0.4 Clause 7.34
-//        */
-//        testcase TC_IS_RLT_MSD_BV_02 () runs on ItsMapemSpatem system ItsMapemSpatemSystem {
-//                
-//            // Local variables
-//            
-//            // Test component configuration
-//            f_cfUp();
-//                
-//            // Preamble
-//            f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
-//                
-//            // Test Body
-//            // Triggering a SPATEM message
-//            f_utTriggerEvent ( m_utTriggerEvent ( spateMsg ) );
-//            
-//            tc_ac.start;
-//            alt {
-//                [] mapemSpatemPort.receive ( mw_spatemInd ( mw_spatemPdu ( mw_itsPduHeaderSpatem , mw_spatSubId1 ) ) ) { 
-//                    tc_ac.stop;
-//                    log("*** " & testcasename() & ": PASS: Successfully received SPATEM with DSRCmsgSubID == 1. ***");
-//                    f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
-//                }
-//                [] mapemSpatemPort.receive ( mw_spatemInd ( mw_spatemPdu ( mw_itsPduHeaderSpatem , mw_defaultSpatem ) ) ) { 
-//                    tc_ac.stop;
-//                    log("*** " & testcasename() & ": FAIL: Received an incorrect MAPEM message. ***");
-//                    f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
-//                }
-//                []    tc_ac.timeout {
-//                    log("*** " & testcasename() & ": INCONC: Timeout while awaiting the reception of a message. ***");
-//                    f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
-//                }
-//            }
-//                
-//            // Postamble
-//            f_poDefault();
-//            f_cfDown();
-//                
-//        } // End of testcase TC_IS_RLT_MSD_BV-02
-//
-//        /**
-//        * @desc Repetition < 10s. Verify that: when the IUT is composing a new message with the same content as the most recent message
-//        * with the same DSRCmsgID, and less than 10 seconds have elapsed since it sent the previous message, the IUT uses the same MsgCount value.
-//        * <pre>
-//        * Pics Selection: PICS_RSU_ROLE
-//        * Initial conditions: 
-//        *    with {
-//        *        the IUT being in the "initial state"
-//        *        and the IUT has sent a MapData message
-//        *            containing MsgCount
-//        *                set to VALUE_1
-//        *    }
-//        * Expected behaviour:
-//        *    ensure that {
-//        *        when { 
-//        *            a new MapData message with the same content is generated
-//        *            and the repetition time is lesser than 10 s
-//        *        }
-//        *        then {
-//        *            the IUT sends a valid MapData message
-//        *                containing MsgCount
-//        *                    set to VALUE_1
-//        *        }
-//        *    }
-//        * </pre>
-//        *
-//        * @version   0.0.1
-//        * @see         ETSI TS 103 191-2 V0.0.1 TP/MAPEM-SPATEM/MSD//BV-05
-//        * @reference ETSI TS 103 301 v1.0.4 Clause 7.92
-//        */
-//        testcase TC_IS_RLT_MSD_BV_05 () runs on ItsMapemSpatem system ItsMapemSpatemSystem {
-//                
-//            // Local variables
-//            var MsgCount    v_msgCount;
-//            var MapemInd        v_message;
-//                
-//            // Test component configuration
-//            f_cfUp();
-//                
-//            // Preamble
-//            // Triggering MAPEM repetition lesser than 10s
-//            v_msgCount := f_utTriggerEvent ( m_utTriggerEvent ( mapRepL10s ) );
-//            // Receiving first MAPEM message
-//            tc_ac.start;
-//            alt {
-//                [] mapemSpatemPort.receive ( mw_mapemInd ( mw_mapemPdu ( mw_itsPduHeaderMapem , mw_anyMap ) ) ) -> value v_message { 
-//                    tc_ac.stop;
-//                    log("*** " & testcasename() & ": PASS: Successfully received first MAPEM message. ***");
-//                    v_msgCount := v_message.msgIn.msgMapem.map_.msgIssueRevision;
-//                }
-//                []    tc_ac.timeout {
-//                    log("*** " & testcasename() & ": INCONC: Timeout while awaiting the reception of a message. ***");
-//                    f_selfOrClientSyncAndVerdict(c_prDone, e_timeout);
-//                }
-//            }
-//            f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
-//                
-//            // Test Body
-//            // Receiving repetition MAPEM before 10s
-//            tc_ac.start (10.0);
-//            alt {
-//                [] mapemSpatemPort.receive ( mw_mapemInd ( mw_mapemPdu ( mw_itsPduHeaderMapem , mw_anyMap ) ) ) -> value v_message { 
-//                    tc_ac.stop;
-//                    if ( v_message.msgIn.msgMapem.map_.msgIssueRevision == v_msgCount ) {
-//                        log("*** " & testcasename() & ": PASS: Successfully received Second MAPEM with correct Count. ***");
-//                        f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
-//                    }
-//                    else {
-//                        log("*** " & testcasename() & ": FAIL: Received an incorrect MAPEM message. ***");
-//                        f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
-//                    }
-//                }
-//                []    tc_ac.timeout {
-//                    log("*** " & testcasename() & ": INCONC: Timeout while awaiting the reception of a message. ***");
-//                    f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
-//                }
-//            }
-//                
-//            // Postamble
-//            f_poDefault();
-//            f_cfDown();
-//                
-//        } // End of testcase TC_IS_RLT_MSD_BV-05
-//
-//        /**
-//        * @desc Repetition >= 10s Verify that: when the IUT is composing a new message with the same content as the most recent message
-//        * with the same DSRCmsgID, and at least 10 seconds have elapsed since it sent the previous message, the IUT sets the MsgCount to any valid value.
-//        * <pre>
-//        * Pics Selection: PICS_RSU_ROLE
-//        * Initial conditions: 
-//        *    with {
-//        *        the IUT being in the "initial state"
-//        *        and the IUT has sent a MapData message
-//        *            containing MsgCount
-//        *                set to VALUE_1
-//}
-//        * Expected behaviour:
-//        *    ensure that {
-//        *        when { 
-//        *            a new MapData message with the same content is generated
-//        *            and the repetition time is greather or egal  than 10 s
-//        *        }
-//        *        then {
-//        *            the IUT sends a valid MapData message
-//        *                containing MsgCount
-//        *                    set to any valid value
-//        *        }
-//        *    }
-//        * </pre>
-//        *
-//        * @version   0.0.1
-//        * @see         ETSI TS 103 191-2 V0.0.1 TP/MAPEM-SPATEM/MSD//BV-06
-//        * @reference ETSI TS 103 301 v1.0.4 Clause 7.92
-//        */
-//        testcase TC_IS_RLT_MSD_BV_06 () runs on ItsMapemSpatem system ItsMapemSpatemSystem {
-//                
-//            // Local variables
-//            var MsgCount    v_msgCount;
-//            var MapemInd        v_message;
-//                
-//            // Test component configuration
-//            f_cfUp();
-//                
-//            // Preamble
-//            // Triggering MAPEM repetition greather than 10s
-//            v_msgCount := f_utTriggerEvent ( m_utTriggerEvent ( mapRepG10s ) );
-//            // Receiving first MAPEM message
-//            tc_ac.start;
-//            alt {
-//                [] mapemSpatemPort.receive ( mw_mapemInd ( mw_mapemPdu ( mw_itsPduHeaderMapem , mw_anyMap ) ) ) -> value v_message { 
-//                    tc_ac.stop;
-//                    log("*** " & testcasename() & ": PASS: Successfully received first MAPEM message. ***");
-//                    v_msgCount := v_message.msgIn.msgMapem.map_.msgIssueRevision;
-//                }
-//                []    tc_ac.timeout {
-//                    log("*** " & testcasename() & ": INCONC: Timeout while awaiting the reception of a message. ***");
-//                    f_selfOrClientSyncAndVerdict(c_prDone, e_timeout);
-//                }
-//            }
-//            f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
-//                
-//            // Test Body
-//            // Receiving repetition MAPEM after 10s
-//            tc_ac.start (20.0);
-//            alt {
-//                [] mapemSpatemPort.receive ( mw_mapemInd ( mw_mapemPdu ( mw_itsPduHeaderMapem , mw_anyMap ) ) ) -> value v_message { 
-//                    tc_ac.stop;
-//                    if ( v_message.msgIn.msgMapem.map_.msgIssueRevision != v_msgCount ) {
-//                        log("*** " & testcasename() & ": PASS: Successfully received Second MAPEM with correct Count. ***");
-//                        f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
-//                    }
-//                    else {
-//                        log("*** " & testcasename() & ": FAIL: Received an incorrect MAPEM message. ***");
-//                        f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
-//                    }
-//                }
-//                []    tc_ac.timeout {
-//                    log("*** " & testcasename() & ": INCONC: Timeout while awaiting the reception of a message. ***");
-//                    f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
-//                }
-//            }
-//                
-//            // Postamble
-//            f_poDefault();
-//            f_cfDown();
-//                
-//        } // End of testcase TC_IS_RLT_MSD_BV-06
-//
-//        /**
-//        * @desc Verify that the MsgCRC (if present) is the last data element of the MapData message.
-//        * <pre>
-//        * Pics Selection: PICS_RSU_ROLE
-//        * Initial conditions: 
-//        *    with {
-//        *        the IUT being in the "initial state"
-//        *    }
-//        * Expected behaviour:
-//        *    ensure that {
-//        *        when { 
-//        *            a MapData message is generated
-//        *        }
-//        *        then {
-//        *            the IUT sends a valid MapData message
-//        *                not containing MsgCRC
-//        *                or
-//        *                containing MsgCRC
-//        *                    as the last data element of the message
-//        *        }
-//        *    }
-//        * </pre>
-//        *
-//        * @version   0.0.1
-//        * @see         ETSI TS 103 191-2 V0.0.1 TP/MAPEM-SPATEM/MSD//BV-08
-//        * @reference ETSI TS 103 301 v1.0.4 Clause 7.93
-//        */
-//        testcase TC_IS_RLT_MSD_BV_08 () runs on ItsMapemSpatem system ItsMapemSpatemSystem {
-//                
-//            // Local variables
-//                
-//            // Test component configuration
-//            f_cfUp();
-//                
-//            // Preamble
-//            f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
-//                
-//            // Test Body
-//            tc_ac.start;
-//            alt {
-//                [] mapemSpatemPort.receive ( mw_mapemInd ( mw_mapemPdu ( mw_itsPduHeaderMapem , mw_mapNoMsgCrc ) ) ) { 
-//                    tc_ac.stop;
-//                    log("*** " & testcasename() & ": PASS: Successfully received MAPEM with no MsgCRC. ***");
-//                    f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
-//                }
-//                [] mapemSpatemPort.receive ( mw_mapemInd ( mw_mapemPdu ( mw_itsPduHeaderMapem , mw_mapMsgCrcLast ) ) ) { 
-//                    tc_ac.stop;
-//                    log("*** " & testcasename() & ": PASS: Successfully received MAPEM with MsgCRC as the last data element of the message. ***");
-//                    f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
-//                }
-//                [] mapemSpatemPort.receive ( mw_mapemInd ( mw_mapemPdu ( mw_itsPduHeaderMapem , mw_anyMap ) ) ) { 
-//                    tc_ac.stop;
-//                    log("*** " & testcasename() & ": FAIL: Received an incorrect MAPEM message. ***");
-//                    f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
-//                }
-//                []    tc_ac.timeout {
-//                    log("*** " & testcasename() & ": INCONC: Timeout while awaiting the reception of a message. ***");
-//                    f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
-//                }
-//            }
-//                
-//            // Postamble
-//            f_poDefault();
-//            f_cfDown();
-//                
-//        } // End of testcase TC_IS_RLT_MSD_BV-08
-//
-//        /**
-//        * @desc Verify that the LayerType is not contained in the MapData message.
-//        * <pre>
-//        * Pics Selection: PICS_RSU_ROLE
-//        * Initial conditions: 
-//        *    with {
-//        *        the IUT being in the "initial state"
-//        *    }
-//        * Expected behaviour:
-//        *    ensure that {
-//        *        when { 
-//        *            a MapData message is generated
-//        *        }
-//        *        then {
-//        *            the IUT sends a valid MapData message
-//        *                not containing LayerType
-//        *        }
-//        *    }
-//        * </pre>
-//        *
-//        * @version     0.0.1
-//        * @see         ETSI TS 103 191-2 V0.0.1 TP/MAPEM-SPATEM/MSD//BV-09
-//        * @reference ETSI TS 103 301 v1.0.4 Clause 7.83
-//        */
-//        testcase TC_IS_RLT_MSD_BV_09 () runs on ItsMapemSpatem system ItsMapemSpatemSystem {
-//                
-//            // Local variables
-//                
-//            // Test component configuration
-//            f_cfUp();
-//                
-//            // Preamble
-//            f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
-//                
-//            // Test Body
-//            tc_ac.start;
-//            alt {
-//                [] mapemSpatemPort.receive ( mw_mapemInd ( mw_mapemPdu ( mw_itsPduHeaderMapem , mw_mapNoLayerType ) ) ) { 
-//                    tc_ac.stop;
-//                    log("*** " & testcasename() & ": PASS: Successfully received MAPEM with no LayerType. ***");
-//                    f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
-//                }
-//                [] mapemSpatemPort.receive ( mw_mapemInd ( mw_mapemPdu ( mw_itsPduHeaderMapem , mw_anyMap ) ) ) { 
-//                    tc_ac.stop;
-//                    log("*** " & testcasename() & ": FAIL: Received an incorrect MAPEM message. ***");
-//                    f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
-//                }
-//                []    tc_ac.timeout {
-//                    log("*** " & testcasename() & ": INCONC: Timeout while awaiting the reception of a message. ***");
-//                    f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
-//                }
-//            }
-//                
-//            // Postamble
-//            f_poDefault();
-//            f_cfDown();
-//                
-//        } // End of testcase TC_IS_RLT_MSD_BV-09
-//
-//        /**
-//        * @desc Verify that the IntersectionReferenceID contained in the SPATEM correspond to a previously received intersection MAPEM.
-//        * <pre>
-//        * Pics Selection: PICS_RSU_ROLE
-//        * Initial conditions: 
-//        *    with {
-//        *        the IUT being in the "initial state"
-//        *        and the IUT has sent a MapData message
-//        *            containing IntersectionList
-//        *                containing INTERSECTION_1
-//        *    }
-//        * Expected behaviour:
-//        *    ensure that {
-//        *        when { 
-//        *            a SPATEM is generated
-//        *        }
-//        *        then {
-//        *            the IUT sends a valid SPATEM message
-//        *                 containing IntersectionReferenceID
-//        *                    corresponding to INTERSECTION_1 
-//        *        }
-//        *    }
-//        * </pre>
-//        *
-//        * @version     0.0.1
-//        * @see         ETSI TS 103 191-2 V0.0.1 TP/MAPEM-SPATEM/MSD//BV-10
-//        * @reference ETSI TS 103 301 v1.0.4 Clause 6.29
-//        */
-//        testcase TC_IS_RLT_MSD_BV_10 () runs on ItsMapemSpatem system ItsMapemSpatemSystem {
-//                
-//            // Local variables
-//            var MapemInd        v_message;
-//            var SpatemInd        v_spat;
-//            var IntersectionGeometryList v_intersections;
-//            var integer        i,j;
-//            var boolean        v_result := false;
-//                
-//            // Test component configuration
-//            f_cfUp();
-//                
-//            // Preamble
-//            // Receiving MAPEM - Saving IntersectionList
-//            tc_ac.start;
-//            alt {
-//                [] mapemSpatemPort.receive ( mw_mapemInd ( mw_mapemPdu ( mw_itsPduHeaderMapem , mw_anyMap ) ) ) -> value v_message { 
-//                    tc_ac.stop;
-//                    log("*** " & testcasename() & ": PASS: Successfully received MAPEM message. ***");
-//                    v_intersections := v_message.msgIn.msgMapem.map_.intersections;
-//                }
-//                []    tc_ac.timeout {
-//                    log("*** " & testcasename() & ": INCONC: Timeout while awaiting the reception of a message. ***");
-//                    f_selfOrClientSyncAndVerdict(c_prDone, e_timeout);
-//                }
-//            }
-//            f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
-//                
-//            // Test Body
-//            f_utTriggerEvent ( m_utTriggerEvent ( spateMsg ) );
-//            
-//            tc_ac.start;
-//            alt {
-//                [] mapemSpatemPort.receive ( mw_spatemInd ( mw_spatemPdu ( mw_itsPduHeaderSpatem , mw_defaultSpatem ) ) ) -> value v_spat { 
-//                    tc_ac.stop;
-//                    log("*** " & testcasename() & ": Successfully received SPATEM message. ***");
-//                    for ( i := 0 ; i < lengthof ( v_intersections ) and not v_result ; i := i+1 ) {
-//                        for ( j := 0 ; j < lengthof ( v_spat.msgIn.msgSpatem.spat.intersections ) ; j := j+1 ) {
-//                            if ( v_intersections[ i ].id == v_spat.msgIn.msgSpatem.spat.intersections[ j ].id ) {
-//                                v_result := true;
-//                            }
-//                        }
-//                    }
-//                    if ( v_result ) {
-//                        log("*** " & testcasename() & ": PASS: concordance of intersection ID. ***");
-//                        f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
-//                    }
-//                    else {
-//                        log("*** " & testcasename() & ": FAIL: non concordance of intersection ID. ***");
-//                        f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
-//                    }
-//                }
-//                []    tc_ac.timeout {
-//                    log("*** " & testcasename() & ": INCONC: Timeout while awaiting the reception of a message. ***");
-//                    f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
-//                }
-//            }
-//                
-//            // Postamble
-//            f_poDefault();
-//            f_cfDown();
-//                
-//        } // End of testcase TC_IS_RLT_MSD_BV-10
-//
-//        /**
-//        * @desc Verify that the MapData message is well formatted.
-//        * <pre>
-//        * Pics Selection: PICS_RSU_ROLE
-//        * Initial conditions: 
-//        *    with {
-//        *        the IUT being in the "initial state"
-//        *    }
-//        * Expected behaviour:
-//        *    ensure that {
-//        *        when { 
-//        *            a MapData message is generated
-//        *        }
-//        *        then {
-//        *            the IUT sends a valid MapData message
-//        *                containing DSRCmsgSubID
-//        *                    set to value 1
-//        *                containing MsgCount
-//        *                not containing LayerType
-//        *        }
-//        *    }
-//        * </pre>
-//        *
-//        * @version     0.0.1
-//        * @see         ETSI TS 103 191-2 V0.0.1 TP/MAPEM-SPATEM/MSD//BV-11
-//        * @reference ETSI TS 103 301 v1.0.4 Clause 10
-//        */
-//        testcase TC_IS_RLT_MSD_BV_11 () runs on ItsMapemSpatem system ItsMapemSpatemSystem {
-//                
-//            // Local variables
-//                
-//            // Test component configuration
-//            f_cfUp();
-//                
-//            // Preamble
-//            f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
-//                
-//            // Test Body
-//            tc_ac.start;
-//            alt {
-//                [] mapemSpatemPort.receive ( mw_mapemInd ( mw_mapemPdu ( mw_itsPduHeaderMapem , mw_mapWellFormatted ) ) ) { 
-//                    tc_ac.stop;
-//                    log("*** " & testcasename() & ": PASS: Successfully received a well formatted MAPEM. ***");
-//                    f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
-//                }
-//                [] mapemSpatemPort.receive ( mw_mapemInd ( mw_mapemPdu ( mw_itsPduHeaderMapem , mw_anyMap ) ) ) { 
-//                    tc_ac.stop;
-//                    log("*** " & testcasename() & ": FAIL: Received an incorrect MAPEM message. ***");
-//                    f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
-//                }
-//                []    tc_ac.timeout {
-//                    log("*** " & testcasename() & ": INCONC: Timeout while awaiting the reception of a message. ***");
-//                    f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
-//                }
-//            }
-//                
-//            // Postamble
-//            f_poDefault();
-//            f_cfDown();
-//                
-//        } // End of testcase TC_IS_RLT_MSD_BV-11
-//
-//        /**
-//        * @desc Verify that the SPATEM is well formatted.
-//        * <pre>
-//        * Pics Selection: PICS_RSU_ROLE
-//        * Initial conditions: 
-//        *    with {
-//        *        the IUT being in the "initial state"
-//        *    }
-//        * Expected behaviour:
-//        *    ensure that {
-//        *        when { 
-//        *            a SPATEM is generated
-//        *        }
-//        *        then {
-//        *            the IUT sends a valid SPATEM message
-//        *        }
-//        *    }
-//        * </pre>
-//        *
-//        * @version     0.0.1
-//        * @see         ETSI TS 103 191-2 V0.0.1 TP/MAPEM-SPATEM/MSD//BV-12
-//        * @reference ETSI TS 103 301 v1.0.4 Clause 10
-//        */
-//        testcase TC_IS_RLT_MSD_BV_12 () runs on ItsMapemSpatem system ItsMapemSpatemSystem {
-//                
-//            // Local variables
-//                
-//            // Test component configuration
-//            f_cfUp();
-//                
-//            // Preamble
-//            f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
-//                
-//            // Test Body
-//            // Triggering a SPATEM message
-//            f_utTriggerEvent ( m_utTriggerEvent ( spateMsg ) );
-//            
-//            tc_ac.start;
-//            alt {
-//                [] mapemSpatemPort.receive ( mw_spatemInd ( mw_spatemPdu ( mw_itsPduHeaderSpatem , mw_spatSubId1 ) ) ) { 
-//                    tc_ac.stop;
-//                    log("*** " & testcasename() & ": PASS: Successfully received SPATEM with DSRCmsgSubID == 1. ***");
-//                    f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
-//                }
-//                [] mapemSpatemPort.receive ( mw_spatemInd ( mw_spatemPdu ( mw_itsPduHeaderSpatem , mw_defaultSpatem ) ) ) { 
-//                    tc_ac.stop;
-//                    log("*** " & testcasename() & ": FAIL: Received an incorrect MAPEM message. ***");
-//                    f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
-//                }
-//                []    tc_ac.timeout {
-//                    log("*** " & testcasename() & ": INCONC: Timeout while awaiting the reception of a message. ***");
-//                    f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
-//                }
-//            }
-//                
-//            // Postamble
-//            f_poDefault();
-//            f_cfDown();
-//                
-//        } // End of testcase TC_IS_RLT_MSD_BV-12
-//
-//        /**
-//        * @desc Verify that when sending a MapData message, the IUT encapsulates the message into a GN SHB message.
-//        * <pre>
-//        * Pics Selection: PICS_RSU_ROLE
-//        * Initial conditions: 
-//        *    with {
-//        *        the IUT being in the "initial state"
-//        *    }
-//        * Expected behaviour:
-//        *    ensure that {
-//        *        when { 
-//        *            a MapData message is generated
-//        *        }
-//        *        then {
-//        *            the IUT sends a valid MapData message encapsulated into a GN SHB message
-//        *        }
-//        *    }
-//        * </pre>
-//        *
-//        * @version     0.0.1
-//        * @see         ETSI TS 103 191-2 V0.0.1 TP/MAPEM-SPATEM/MSD//BV-15
-//        * @reference No clause – Implicit to use in ITS
-//        */
-//        testcase TC_IS_RLT_MSD_BV_15 () runs on ItsMapemSpatem system ItsMapemSpatemSystem {
-//                
-//            // Local variables
-//            var MapemInd        v_message;
-//            const UInt8 c_gnHtTsb := 5;
-//            const UInt8 c_gnHstShb := 0;
-//                
-//            // Test component configuration
-//            f_cfUp();
-//                
-//            // Preamble
-//            f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
-//                
-//            // Test Body
-//            tc_ac.start;
-//            alt {
-//                [] mapemSpatemPort.receive ( mw_mapemIndWithGnParameters ( mw_mapemPdu ( mw_itsPduHeaderMapem , mw_mapWellFormatted ), -, c_gnHtTsb, c_gnHstShb ) ) -> value v_message { 
-//                    tc_ac.stop;
-//                    log("*** " & testcasename() & ": PASS: Successfully received MAPEM. ***");
-//                    f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
-//                }
-//                [] mapemSpatemPort.receive ( mw_mapemInd ( mw_mapemPdu ( mw_itsPduHeaderMapem , mw_anyMap ) ) ) { 
-//                    tc_ac.stop;
-//                    log("*** " & testcasename() & ": FAIL: Received an incorrect MAPEM message. ***");
-//                    f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
-//                }
-//                []    tc_ac.timeout {
-//                    log("*** " & testcasename() & ": INCONC: Timeout while awaiting the reception of a message. ***");
-//                    f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
-//                }
-//            }
-//                
-//            // Postamble
-//            f_poDefault();
-//            f_cfDown();
-//                
-//        } // End of testcase TC_IS_RLT_MSD_BV-15
-//
-//        /**
-//        * @desc Verify that when sending a SPATEM message, the IUT encapsulates the message into a GN SHB message.
-//        * <pre>
-//        * Pics Selection: PICS_RSU_ROLE
-//        * Initial conditions: 
-//        *    with {
-//        *        the IUT being in the "initial state"
-//        *    }
-//        * Expected behaviour:
-//        *    ensure that {
-//        *        when { 
-//        *            a SPATEM is generated
-//        *        }
-//        *        then {
-//        *            the IUT sends a valid SPATEM encapsulated into a GN SHB message
-//        *        }
-//        *    }
-//        * </pre>
-//        *
-//        * @version     0.0.1
-//        * @see         ETSI TS 103 191-2 V0.0.1 TP/MAPEM-SPATEM/MSD//BV-16
-//        * @reference No clause – Implicit to use in ITS
-//        */
-//        testcase TC_IS_RLT_MSD_BV_16 () runs on ItsMapemSpatem system ItsMapemSpatemSystem {
-//                
-//            // Local variables
-//            var SpatemInd        v_message;
-//            const UInt8 c_gnHtTsb := 5;
-//            const UInt8 c_gnHstShb := 0;
-//                
-//            // Test component configuration
-//            f_cfUp();
-//                
-//            // Preamble
-//            f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
-//                
-//            // Test Body
-//            f_utTriggerEvent ( m_utTriggerEvent ( spateMsg ) );
-//            
-//            tc_ac.start;
-//            alt {
-//                [] mapemSpatemPort.receive ( mw_spatemIndWithGnParameters ( mw_spatemPdu ( mw_itsPduHeaderSpatem , mw_spatSubId1 ), -, c_gnHtTsb, c_gnHstShb ) ) -> value v_message { 
-//                    tc_ac.stop;
-//                    log("*** " & testcasename() & ": PASS: Successfully received SPATEM. ***");
-//                    f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
-//                }
-//                [] mapemSpatemPort.receive ( mw_spatemInd ( mw_spatemPdu ( mw_itsPduHeaderSpatem , mw_defaultSpatem ) ) ) { 
-//                    tc_ac.stop;
-//                    log("*** " & testcasename() & ": FAIL: Received an incorrect MAPEM message. ***");
-//                    f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
-//                }
-//                []    tc_ac.timeout {
-//                    log("*** " & testcasename() & ": INCONC: Timeout while awaiting the reception of a message. ***");
-//                    f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
-//                }
-//            }
-//                
-//            // Postamble
-//            f_poDefault();
-//            f_cfDown();
-//                
-//        } // End of testcase TC_IS_RLT_MSD_BV-16
-//
-//    } // End of group MapemSpatemMessageDissemination
-//
-//    group MapemSpatemMessageProcessing { 
-//
-//        /**
-//        * @desc Verify  that: when the IUT receives a GN SHB message encapsulating a MapData message, it pass the message to the application layer.
-//        * <pre>
-//        * Pics Selection: PICS_VEHICLE
-//        * Initial conditions: 
-//        *    with {
-//        *        the IUT being in the "initial state"
-//        *    }
-//        * Expected behaviour:
-//        *    ensure that {
-//        *        when { 
-//        *            the IUT receives a valid MapData message encapsulated into a GN SHB message
-//            *    }
-//        *        then {
-//        *            the IUT forwards the MapData message content to upper layers
-//        *        }
-//        *    }
-//        * </pre>
-//        *
-//        * @version   0.0.1
-//        * @see         ETSI TS 103 191-2 V0.0.1 TP/MAPEM-SPATEM/MSP//BV-01
-//        * @reference No clause – Implicit to use in ITS
-//        */
-//        testcase TC_IS_RLT_MSP_BV_01 () runs on ItsMapemSpatem system ItsMapemSpatemSystem {
-//                
-//            // Local variables
-//            var MapReq        v_mapReq;
-//            var integer        i;
-//                
-//            // Test component configuration
-//            f_cfUp();
-//                
-//            // Preamble
-//            f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
-//                
-//            // Test Body
-//            v_mapReq := valueof (  m_mapemReq ( m_mapemPdu ( m_map ) ) );
-//            mapemSpatemPort.send( v_mapReq ) ;
-//            
-//            f_sleep(PX_TAC);
-//            for ( i:=0 ; i < lengthof ( vc_utMapEvents ) and not match ( v_mapReq.msgOut, vc_utMapEvents[i].mapeMsg ) ; i := i+1 ) {
-//                // empty on purpose 
-//            }
-//            if ( i < lengthof ( vc_utMapEvents ) ) {
-//                log("*** " & testcasename() & ": PASS: MAPEM was transmitted to upper layer ***");
-//                f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
-//            }
-//            else {
-//                log("*** " & testcasename() & ": FAIL: MAPEM was not transmitted to upper layer ***");
-//                f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
-//            }
-//                
-//            // Postamble
-//            f_poDefault();
-//            f_cfDown();
-//                
-//        } // End of testcase TC_IS_RLT_MSP_BV_01
-//
-//        /**
-//        * @desc Verify  that: when the IUT receives a GN SHB message encapsulating a SPATEM message, it pass the message to the application layer.
-//        * <pre>
-//        * Pics Selection: PICS_VEHICLE
-//        * Initial conditions: 
-//        *    with {
-//        *        the IUT being in the "initial state"
-//        *    }
-//        * Expected behaviour:
-//        *    ensure that {
-//        *        when { 
-//        *            the IUT receives a valid SPATEM encapsulated into a GN SHB message
-//            *    }
-//        *        then {
-//        *            the IUT forwards the SPATEM content to upper layers
-//        *        }
-//        *    }
-//        * </pre>
-//        *
-//        * @version   0.0.1
-//        * @see         ETSI TS 103 191-2 V0.0.1 TP/MAPEM-SPATEM/MSP//BV-02
-//        * @reference No clause – Implicit to use in ITS
-//        */
-//        testcase TC_IS_RLT_MSP_BV_02 () runs on ItsMapemSpatem system ItsMapemSpatemSystem {
-//                
-//            // Local variables
-//            var SpatemReq        v_spatReq;
-//            var integer        i;
-//                
-//            // Test component configuration
-//            f_cfUp();
-//                
-//            // Preamble
-//            f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
-//                
-//            // Test Body
-//            v_spatReq := valueof (  m_spatemReq ( m_spatemPdu ( m_spat ) ) );
-//            mapemSpatemPort.send ( v_spatReq ) ;
-//            
-//            f_sleep(PX_TAC);
-//            for ( i:=0 ; i < lengthof ( vc_utSpatemEvents ) and not match ( v_spatReq.msgOut , vc_utSpatemEvents[i].spateMsg ) ; i:=i+1 ) {
-//                // empty on purpose 
-//            }
-//            if ( i < lengthof ( vc_utSpatemEvents ) ) {
-//                log("*** " & testcasename() & ": PASS: SPATEM was transmitted to upper layer ***");
-//                f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
-//            }
-//            else {
-//                log("*** " & testcasename() & ": FAIL: SPATEM was not transmitted to upper layer ***");
-//                f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
-//            }
-//                
-//            // Postamble
-//            f_poDefault();
-//            f_cfDown();
-//                
-//        } // End of testcase TC_IS_RLT_MSP_BV_02
-//
-//    } // End of group MapemSpatemMessageProcessing
-//    
 } // End of module ItsMapem_TestCases
diff --git a/ttcn/AtsMapemSpatem/ItsMapem_TpFunctions.ttcn b/ttcn/AtsMapemSpatem/ItsMapem_TpFunctions.ttcn
index a96732a14..c6fb37b17 100644
--- a/ttcn/AtsMapemSpatem/ItsMapem_TpFunctions.ttcn
+++ b/ttcn/AtsMapemSpatem/ItsMapem_TpFunctions.ttcn
@@ -47,8 +47,8 @@ module ItsMapem_TpFunctions {
                 // Local variables
                 
                 // Test control
-                if (not PICS_RSU_ROLE or not PICS_MAPEM_GENERATION) {
-                    log("*** " & testcasename() & ": PICS_RSU_ROLE and PICS_MAPEM_GENERATION required for executing the TC ***");
+                if (not PICS_MAPEM_GENERATION) {
+                    log("*** " & testcasename() & ": PICS_MAPEM_GENERATION required for executing the TC ***");
                     setverdict(inconc);
                     stop;
                 }
@@ -95,8 +95,8 @@ module ItsMapem_TpFunctions {
                 // Local variables
                 
                 // Test control
-                if (not PICS_RSU_ROLE or not PICS_MAPEM_GENERATION) {
-                    log("*** " & testcasename() & ": PICS_RSU_ROLE and PICS_MAPEM_GENERATION required for executing the TC ***");
+                if (not PICS_MAPEM_GENERATION) {
+                    log("*** " & testcasename() & ": PICS_MAPEM_GENERATION required for executing the TC ***");
                     setverdict(inconc);
                     stop;
                 }
@@ -150,8 +150,8 @@ module ItsMapem_TpFunctions {
                 var MapemInd v_mapem;
                 
                 // Test control
-                if (not PICS_RSU_ROLE or not PICS_MAPEM_GENERATION) {
-                    log("*** " & testcasename() & ": PICS_RSU_ROLE and PICS_MAPEM_GENERATION required for executing the TC ***");
+                if (not PICS_MAPEM_GENERATION) {
+                    log("*** " & testcasename() & ": PICS_MAPEM_GENERATION required for executing the TC ***");
                     setverdict(inconc);
                     stop;
                 }
@@ -218,8 +218,8 @@ module ItsMapem_TpFunctions {
                 var MapemInd v_mapem;
                 
                 // Test control
-                if (not PICS_RSU_ROLE or not PICS_MAPEM_GENERATION) {
-                    log("*** " & testcasename() & ": PICS_RSU_ROLE and PICS_MAPEM_GENERATION required for executing the TC ***");
+                if (not PICS_MAPEM_GENERATION) {
+                    log("*** " & testcasename() & ": PICS_MAPEM_GENERATION required for executing the TC ***");
                     setverdict(inconc);
                     stop;
                 }
@@ -295,8 +295,8 @@ module ItsMapem_TpFunctions {
                 var boolean v_tlmServiceStarted := false;
                 
                 // Test control
-                if (not PICS_RSU_ROLE or not PICS_SPATEM_GENERATION or not PICS_SPATEM_GENERATION) {
-                    log("*** " & testcasename() & ": PICS_RSU_ROLE and PICS_MAPEM_GENERATION and PICS_SPATEM_GENERATION required for executing the TC ***");
+                if (not PICS_SPATEM_GENERATION or not PICS_SPATEM_GENERATION) {
+                    log("*** " & testcasename() & ": PICS_MAPEM_GENERATION and PICS_SPATEM_GENERATION required for executing the TC ***");
                     setverdict(inconc);
                     stop;
                 }
@@ -354,8 +354,8 @@ module ItsMapem_TpFunctions {
                 const UInt8 c_gnNhBtpB := 2;
                 
                 // Test control
-                if (not PICS_RSU_ROLE or not PICS_MAPEM_GENERATION) {
-                    log("*** " & testcasename() & ": PICS_RSU_ROLE and PICS_MAPEM_GENERATION required for executing the TC ***");
+                if (not PICS_MAPEM_GENERATION) {
+                    log("*** " & testcasename() & ": PICS_MAPEM_GENERATION required for executing the TC ***");
                     setverdict(inconc);
                     stop;
                 }
@@ -412,8 +412,8 @@ module ItsMapem_TpFunctions {
                 const UInt16 c_gnNhBtpBPort := 2003;
                 
                 // Test control
-                if (not PICS_RSU_ROLE or not PICS_MAPEM_GENERATION) {
-                    log("*** " & testcasename() & ": PICS_RSU_ROLE and PICS_MAPEM_GENERATION required for executing the TC ***");
+                if (not PICS_MAPEM_GENERATION) {
+                    log("*** " & testcasename() & ": PICS_MAPEM_GENERATION required for executing the TC ***");
                     setverdict(inconc);
                     stop;
                 }
@@ -464,8 +464,8 @@ module ItsMapem_TpFunctions {
                 const UInt8 c_gnHtGbc := 4;
                 
                 // Test control
-                if (not PICS_RSU_ROLE or not PICS_MAPEM_GENERATION) {
-                    log("*** " & testcasename() & ": PICS_RSU_ROLE and PICS_MAPEM_GENERATION required for executing the TC ***");
+                if (not PICS_MAPEM_GENERATION) {
+                    log("*** " & testcasename() & ": PICS_MAPEM_GENERATION required for executing the TC ***");
                     setverdict(inconc);
                     stop;
                 }
@@ -540,8 +540,8 @@ module ItsMapem_TpFunctions {
             var MapemReq   v_mapemReq;
             var integer     i;
                 
-            if (PICS_RSU_ROLE or not PICS_MAPEM_RECEPTION) {
-                log("*** " & testcasename() & ": not PICS_RSU_ROLE and PICS_MAPEM_RECEPTION required for executing the TC ***");
+            if (not PICS_MAPEM_RECEPTION) {
+                log("*** " & testcasename() & ": PICS_MAPEM_RECEPTION required for executing the TC ***");
                 setverdict(inconc);
                 stop;
             }
diff --git a/ttcn/AtsMapemSpatem/ItsSpatem_TestCases.ttcn b/ttcn/AtsMapemSpatem/ItsSpatem_TestCases.ttcn
index 9ae1db6a1..1c45a2f63 100644
--- a/ttcn/AtsMapemSpatem/ItsSpatem_TestCases.ttcn
+++ b/ttcn/AtsMapemSpatem/ItsSpatem_TestCases.ttcn
@@ -25,7 +25,7 @@ module ItsSpatem_TestCases {
             /**
              * @desc Check that protocolVersion is set to 1 and messageID is set to 4
              * <pre>
-             * Pics Selection: PICS_RSU_ROLE and PICS_SPATEM_GENERATION
+             * Pics Selection: PICS_SPATEM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -64,7 +64,7 @@ module ItsSpatem_TestCases {
             /**
              * @desc Check that TLM Service generates a new SPATEM on reception of a valid AppSPATEM _Start request
              * <pre>
-             * Pics Selection: PICS_RSU_ROLE and PICS_SPATEM_GENERATION
+             * Pics Selection: PICS_SPATEM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -94,7 +94,7 @@ module ItsSpatem_TestCases {
             /**
              * @desc Check that TLM Service generates SPATEM are time ordered
              * <pre>
-             * Pics Selection: PICS_RSU_ROLE and PICS_SPATEM_GENERATION
+             * Pics Selection: PICS_SPATEM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -124,7 +124,7 @@ module ItsSpatem_TestCases {
             /**
              * @desc Check that TLM Service terminates on reception of a valid AppSPATEM _Stop request
              * <pre>
-             * Pics Selection: PICS_RSU_ROLE and PICS_SPATEM_GENERATION
+             * Pics Selection: PICS_SPATEM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -145,7 +145,7 @@ module ItsSpatem_TestCases {
              * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_TLM_EVGN_BV_03
              * @reference ETSI TS 103 301 v1.0.4 Clause 5.4.2
              */
-            testcase TC_IS_TLM_EVGN_BV_03() runs on ItsMapemSpatem system ItsMapemSpatemSystem { // TODO Move ito spateEventTermination goup
+            testcase TC_IS_TLM_EVGN_BV_03() runs on ItsMapemSpatem system ItsMapemSpatemSystem { 
                 
                 f_IS_TLM_EVGN_BV_03();
                 
@@ -154,7 +154,7 @@ module ItsSpatem_TestCases {
             /**
              * @desc Check that TLM Service generates a new SPATEM on reception of a valid AppSPATEM_Trigger request
              * <pre>
-             * Pics Selection: PICS_RSU_ROLE and PICS_SPATEM_GENERATION
+             * Pics Selection: PICS_SPATEM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -188,7 +188,7 @@ module ItsSpatem_TestCases {
             /**
              * @desc Check that TLM Service provides the destination area in SPATEM
              * <pre>
-             * Pics Selection: PICS_RSU_ROLE and PICS_SPATEM_GENERATION
+             * Pics Selection: PICS_SPATEM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -223,7 +223,7 @@ module ItsSpatem_TestCases {
             /**
              * @desc Check that SPATEM uses BTP_B packet
              * <pre>
-             * Pics Selection: PICS_RSU_ROLE and PICS_SPATEM_GENERATION
+             * Pics Selection: PICS_SPATEM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -254,7 +254,7 @@ module ItsSpatem_TestCases {
             /**
              * @desc Check that the destination port for SPATEM is set to 2004
              * <pre>
-             * Pics Selection: PICS_RSU_ROLE and PICS_SPATEM_GENERATION
+             * Pics Selection: PICS_SPATEM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -287,7 +287,7 @@ module ItsSpatem_TestCases {
             /**
              * @desc Check that TLM service encapsulates SPATEM in a GBC with the HeaderType field set to the value of 4
              * <pre>
-             * Pics Selection: PICS_RSU_ROLE and PICS_SPATEM_GENERATION
+             * Pics Selection: PICS_SPATEM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -327,7 +327,7 @@ module ItsSpatem_TestCases {
             /**
              * @desc Check that the IUT can successfully process all mandatory fields of SPATEM received
              * <pre>
-             * Pics Selection: not PICS_RSU_ROLE and PICS_SPATEM_RECEPTION
+             * Pics Selection: PICS_SPATEM_RECEPTION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
diff --git a/ttcn/AtsMapemSpatem/ItsSpatem_TpFunctions.ttcn b/ttcn/AtsMapemSpatem/ItsSpatem_TpFunctions.ttcn
index aaf1de7f9..6796aadb4 100644
--- a/ttcn/AtsMapemSpatem/ItsSpatem_TpFunctions.ttcn
+++ b/ttcn/AtsMapemSpatem/ItsSpatem_TpFunctions.ttcn
@@ -47,8 +47,8 @@ module ItsSpatem_TpFunctions {
                 // Local variables
                 
                 // Test control
-                if (not PICS_RSU_ROLE or not PICS_SPATEM_GENERATION) {
-                    log("*** " & testcasename() & ": PICS_RSU_ROLE and PICS_SPATEM_GENERATION required for executing the TC ***");
+                if (not PICS_SPATEM_GENERATION) {
+                    log("*** " & testcasename() & ": PICS_SPATEM_GENERATION required for executing the TC ***");
                     setverdict(inconc);
                     stop;
                 }
@@ -99,8 +99,8 @@ module ItsSpatem_TpFunctions {
                 // Local variables
                 
                 // Test control
-                if (not PICS_RSU_ROLE or not PICS_SPATEM_GENERATION) {
-                    log("*** " & testcasename() & ": PICS_RSU_ROLE and PICS_SPATEM_GENERATION required for executing the TC ***");
+                if (not PICS_SPATEM_GENERATION) {
+                    log("*** " & testcasename() & ": PICS_SPATEM_GENERATION required for executing the TC ***");
                     setverdict(inconc);
                     stop;
                 }
@@ -156,8 +156,8 @@ module ItsSpatem_TpFunctions {
                 var SpatemInd v_spatem;
                 
                 // Test control
-                if (not PICS_RSU_ROLE or not PICS_SPATEM_GENERATION) {
-                    log("*** " & testcasename() & ": PICS_RSU_ROLE and PICS_SPATEM_GENERATION required for executing the TC ***");
+                if (not PICS_SPATEM_GENERATION) {
+                    log("*** " & testcasename() & ": PICS_SPATEM_GENERATION required for executing the TC ***");
                     setverdict(inconc);
                     stop;
                 }
@@ -220,13 +220,13 @@ module ItsSpatem_TpFunctions {
             /**
              * @desc    TP Function for f_IS_TLM_EVGN_BV_03
              */
-            function f_IS_TLM_EVGN_BV_03() runs on ItsMapemSpatem { // TODO Move ito spateEventTermination goup
+            function f_IS_TLM_EVGN_BV_03() runs on ItsMapemSpatem { 
                 
                 // Local variables
                 
                 // Test control
-                if (not PICS_RSU_ROLE or not PICS_SPATEM_GENERATION) {
-                    log("*** " & testcasename() & ": PICS_RSU_ROLE and PICS_SPATEM_GENERATION required for executing the TC ***");
+                if (not PICS_SPATEM_GENERATION) {
+                    log("*** " & testcasename() & ": PICS_SPATEM_GENERATION required for executing the TC ***");
                     setverdict(inconc);
                     stop;
                 }
@@ -274,8 +274,8 @@ module ItsSpatem_TpFunctions {
                 var SpatemInd v_spatem;
                 
                 // Test control
-                if (not PICS_RSU_ROLE or not PICS_SPATEM_GENERATION) {
-                    log("*** " & testcasename() & ": PICS_RSU_ROLE and PICS_SPATEM_GENERATION required for executing the TC ***");
+                if (not PICS_SPATEM_GENERATION) {
+                    log("*** " & testcasename() & ": PICS_SPATEM_GENERATION required for executing the TC ***");
                     setverdict(inconc);
                     stop;
                 }
@@ -347,8 +347,8 @@ module ItsSpatem_TpFunctions {
                 // Local variables
                 
                 // Test control
-                if (not PICS_RSU_ROLE or not PICS_SPATEM_GENERATION) {
-                    log("*** " & testcasename() & ": PICS_RSU_ROLE and PICS_SPATEM_GENERATION required for executing the TC ***");
+                if (not PICS_SPATEM_GENERATION) {
+                    log("*** " & testcasename() & ": PICS_SPATEM_GENERATION required for executing the TC ***");
                     setverdict(inconc);
                     stop;
                 }
@@ -395,8 +395,8 @@ module ItsSpatem_TpFunctions {
                 const UInt8 c_gnNhBtpB := 2;
                 
                 // Test control
-                if (not PICS_RSU_ROLE or not PICS_SPATEM_GENERATION) {
-                    log("*** " & testcasename() & ": PICS_RSU_ROLE and PICS_SPATEM_GENERATION required for executing the TC ***");
+                if (not PICS_SPATEM_GENERATION) {
+                    log("*** " & testcasename() & ": PICS_SPATEM_GENERATION required for executing the TC ***");
                     setverdict(inconc);
                     stop;
                 }
@@ -453,8 +453,8 @@ module ItsSpatem_TpFunctions {
                 const UInt16 c_gnNhBtpBPort := 2004;
                 
                 // Test control
-                if (not PICS_RSU_ROLE or not PICS_SPATEM_GENERATION) {
-                    log("*** " & testcasename() & ": PICS_RSU_ROLE and PICS_SPATEM_GENERATION required for executing the TC ***");
+                if (not PICS_SPATEM_GENERATION) {
+                    log("*** " & testcasename() & ": PICS_SPATEM_GENERATION required for executing the TC ***");
                     setverdict(inconc);
                     stop;
                 }
@@ -507,8 +507,8 @@ module ItsSpatem_TpFunctions {
                 const UInt8 c_gnHtGbc := 4;
                 
                 // Test control
-                if (not PICS_RSU_ROLE or not PICS_SPATEM_GENERATION) {
-                    log("*** " & testcasename() & ": PICS_RSU_ROLE and PICS_SPATEM_GENERATION required for executing the TC ***");
+                if (not PICS_SPATEM_GENERATION) {
+                    log("*** " & testcasename() & ": PICS_SPATEM_GENERATION required for executing the TC ***");
                     setverdict(inconc);
                     stop;
                 }
@@ -585,8 +585,8 @@ module ItsSpatem_TpFunctions {
                 var SpatemReq   v_spatemReq;
                 var integer     i;
                 
-                if (PICS_RSU_ROLE and not PICS_SPATEM_RECEPTION) {
-                    log("*** " & testcasename() & ": not PICS_RSU_ROLE and PICS_SPATEM_RECEPTION required for executing the TC ***");
+                if (not PICS_SPATEM_RECEPTION) {
+                    log("*** " & testcasename() & ": PICS_SPATEM_RECEPTION required for executing the TC ***");
                     setverdict(inconc);
                     stop;
                 }
diff --git a/ttcn/AtsSremSsem/ItsSrem_TestCases.ttcn b/ttcn/AtsSremSsem/ItsSrem_TestCases.ttcn
index d9e1e4e03..17ecd8146 100644
--- a/ttcn/AtsSremSsem/ItsSrem_TestCases.ttcn
+++ b/ttcn/AtsSremSsem/ItsSrem_TestCases.ttcn
@@ -27,7 +27,7 @@ module ItsSrem_TestCases {
                 /**
                  * @desc Check that protocolVersion is set to 1 and messageID is set to 9
                  * <pre>
-                 * Pics Selection: not PICS_RSU and PICS_SREM_GENERATION
+                 * Pics Selection: PICS_SREM_GENERATION
                  * Initial conditions: 
                  *   with {
                  *        the IUT being in the "initial state"
@@ -64,7 +64,7 @@ module ItsSrem_TestCases {
                 /**
                  * @desc Check that IVI Service generates a new SREM on reception of a valid AppSREM_Trigger request
                  * <pre>
-                 * Pics Selection: not PICS_RSU and PICS_SREM_GENERATION
+                 * Pics Selection: PICS_SREM_GENERATION
                  * Initial conditions: 
                  *   with {
                  *        the IUT being in the "initial state"
@@ -92,7 +92,7 @@ module ItsSrem_TestCases {
                 /**
                  * @desc Check that the IUT identifies SREM with a unique request identifier
                  * <pre>
-                 * Pics Selection: not PICS_RSU and PICS_SREM_GENERATION
+                 * Pics Selection: PICS_SREM_GENERATION
                  * Initial conditions: 
                  *   with {
                  *        the IUT being in the "initial state"
@@ -129,7 +129,7 @@ module ItsSrem_TestCases {
                 /**
                  * @desc Check that the IUT increments the sequenceNumber when a SREM update is generated
                  * <pre>
-                 * Pics Selection: not PICS_RSU and PICS_SREM_GENERATION
+                 * Pics Selection: PICS_SREM_GENERATION
                  * Initial conditions: 
                  *   with {
                  *        the IUT being in the "initial state"
@@ -176,7 +176,7 @@ module ItsSrem_TestCases {
                 /**
                  * @desc Check that SREM uses BTP_B packet
                  * <pre>
-                 * Pics Selection: not PICS_RSU and PICS_SREM_GENERATION
+                 * Pics Selection: PICS_SREM_GENERATION
                  * Initial conditions: 
                  *   with {
                  *        the IUT being in the "initial state"
@@ -206,7 +206,7 @@ module ItsSrem_TestCases {
                 /**
                  * @desc Check that the destination port for SREM is set to 2007
                  * <pre>
-                 * Pics Selection: not PICS_RSU and PICS_SREM_GENERATION
+                 * Pics Selection: PICS_SREM_GENERATION
                  * Initial conditions: 
                  *   with {
                  *        the IUT being in the "initial state"
@@ -244,7 +244,7 @@ module ItsSrem_TestCases {
             /**
              * @desc Check that the IUT can successfully process all mandatory fields of SSEM received
              * <pre>
-             * Pics Selection: not PICS_RSU and PICS_SSEM_RECEPTION
+             * Pics Selection: PICS_SSEM_RECEPTION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -284,7 +284,7 @@ module ItsSrem_TestCases {
                 /**
                  * @desc Check that protocolVersion is set to 1 and messageID is set to 10 (TLC-S)
                  * <pre>
-                 * Pics Selection: PICS_RSU and PICS_SSEM_GENERATION
+                 * Pics Selection: PICS_SSEM_GENERATION
                  * Initial conditions: 
                  *   with {
                  *        the IUT being in the "initial state"
@@ -327,7 +327,7 @@ module ItsSrem_TestCases {
             /**
              * @desc Check that the IUT can successfully process all mandatory fields of SREM received (TLC-S)
              * <pre>
-             * Pics Selection: PICS_RSU and PICS_SREM_GENERATION
+             * Pics Selection: PICS_SREM_RECEPTION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
diff --git a/ttcn/AtsSremSsem/ItsSrem_TestControl.ttcn b/ttcn/AtsSremSsem/ItsSrem_TestControl.ttcn
index dc3b7d464..1b8570b8f 100644
--- a/ttcn/AtsSremSsem/ItsSrem_TestControl.ttcn
+++ b/ttcn/AtsSremSsem/ItsSrem_TestControl.ttcn
@@ -23,8 +23,12 @@ module ItsSrem_TestControl {
         if (PICS_SREM_GENERATION) {
             
             execute(TC_IS_RLT_MSGF_BV_01());
+            
             execute(TC_IS_TLC_EVGN_BV_01());
             execute(TC_IS_TLC_EVGN_BV_02());
+            
+            execute(TC_IS_TLC_EVUP_BV_01());
+            
             execute(TC_IS_TLC_COMM_BV_01_01());
             execute(TC_IS_TLC_COMM_BV_01_02());
         }
@@ -34,7 +38,7 @@ module ItsSrem_TestControl {
             
         }
         
-        if (PICS_SREM_GENERATION) {
+        if (PICS_SSEM_GENERATION) {
             
             execute(TC_IS_TLC_MSGF_BV_04());
             
diff --git a/ttcn/AtsSremSsem/ItsSrem_TpFunctions.ttcn b/ttcn/AtsSremSsem/ItsSrem_TpFunctions.ttcn
index e42922a6b..5da4e65b8 100644
--- a/ttcn/AtsSremSsem/ItsSrem_TpFunctions.ttcn
+++ b/ttcn/AtsSremSsem/ItsSrem_TpFunctions.ttcn
@@ -51,8 +51,8 @@ module ItsSrem_TpFunctions {
                     var SremInd v_sremInd;
                     
                     // Test control
-                    if (PICS_RSU_ROLE or not PICS_SREM_GENERATION) {
-                        log("*** " & testcasename() & ": not PICS_RSU_ROLE  and PICS_SREM_GENERATION required for executing the TC ***");
+                    if (not PICS_SREM_GENERATION) {
+                        log("*** " & testcasename() & ": PICS_SREM_GENERATION required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }
@@ -104,8 +104,8 @@ module ItsSrem_TpFunctions {
                     var SremInd v_sremInd;
                     
                     // Test control
-                    if (PICS_RSU_ROLE or not PICS_SREM_GENERATION) {
-                        log("*** " & testcasename() & ": not PICS_RSU_ROLE  and PICS_SREM_GENERATION required for executing the TC ***");
+                    if (not PICS_SREM_GENERATION) {
+                        log("*** " & testcasename() & ": PICS_SREM_GENERATION required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }
@@ -162,8 +162,8 @@ module ItsSrem_TpFunctions {
                     var integer i;
                     
                     // Test control
-                    if (PICS_RSU_ROLE or not PICS_SREM_GENERATION) {
-                        log("*** " & testcasename() & ": not PICS_RSU_ROLE  and PICS_SREM_GENERATION required for executing the TC ***");
+                    if (not PICS_SREM_GENERATION) {
+                        log("*** " & testcasename() & ": PICS_SREM_GENERATION required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }
@@ -227,8 +227,8 @@ module ItsSrem_TpFunctions {
                     var MsgCount v_sequenceNumber;
                     
                     // Test control
-                    if (PICS_RSU_ROLE or not PICS_SREM_GENERATION) {
-                        log("*** " & testcasename() & ": not PICS_RSU_ROLE  and PICS_SREM_GENERATION required for executing the TC ***");
+                    if (not PICS_SREM_GENERATION) {
+                        log("*** " & testcasename() & ": PICS_SREM_GENERATION required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }
@@ -293,6 +293,13 @@ module ItsSrem_TpFunctions {
                     const UInt8 c_gnNhBtpB := 2;
                     var SremInd v_sremInd;
                     
+                    // Test control
+                    if (not PICS_SREM_GENERATION) {
+                        log("*** " & testcasename() & ": PICS_SREM_GENERATION required for executing the TC ***");
+                        setverdict(inconc);
+                        stop;
+                    }
+                    
                     // Test component configuration
                     f_cfUp();
                     
@@ -353,6 +360,13 @@ module ItsSrem_TpFunctions {
                     const UInt16 c_gnNhBtpBPort := 2007;
                     var SremInd v_sremInd;
                     
+                    // Test control
+                    if (not PICS_SREM_GENERATION) {
+                        log("*** " & testcasename() & ": PICS_SREM_GENERATION required for executing the TC ***");
+                        setverdict(inconc);
+                        stop;
+                    }
+                    
                     // Test component configuration
                     f_cfUp();
                     
@@ -406,8 +420,8 @@ module ItsSrem_TpFunctions {
                     var SremInd v_sremInd;
                     
                     // Test control
-                    if (PICS_RSU_ROLE or not PICS_SREM_GENERATION) {
-                        log("*** " & testcasename() & ": not PICS_RSU_ROLE  and PICS_SREM_GENERATION required for executing the TC ***");
+                    if (not PICS_SREM_GENERATION) {
+                        log("*** " & testcasename() & ": PICS_SREM_GENERATION required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }
@@ -490,8 +504,8 @@ module ItsSrem_TpFunctions {
                 var SsemReq   v_ssemReq;
                 var integer     i;
                     
-                if (PICS_RSU_ROLE or not PICS_SSEM_RECEPTION) {
-                    log("*** " & testcasename() & ": not PICS_RSU_ROLE and PICS_SSEM_RECEPTION required for executing the TC ***");
+                if (not PICS_SSEM_RECEPTION) {
+                    log("*** " & testcasename() & ": PICS_SSEM_RECEPTION required for executing the TC ***");
                     setverdict(inconc);
                     stop;
                 }
@@ -543,8 +557,8 @@ module ItsSrem_TpFunctions {
                     // Local variables
                     
                     // Test control
-                    if (PICS_RSU_ROLE or not PICS_SREM_GENERATION) {
-                        log("*** " & testcasename() & ": not PICS_RSU_ROLE  and PICS_SREM_GENERATION required for executing the TC ***");
+                    if (not PICS_SSEM_GENERATION) {
+                        log("*** " & testcasename() & ": PICS_SSEM_GENERATION required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }
@@ -605,8 +619,8 @@ module ItsSrem_TpFunctions {
                 var SremReq   v_sremReq;
                 var integer   i;
                     
-                if (PICS_RSU_ROLE or not PICS_SREM_RECEPTION) {
-                    log("*** " & testcasename() & ": not PICS_RSU_ROLE and PICS_SREM_RECEPTION required for executing the TC ***");
+                if (not PICS_SREM_RECEPTION) {
+                    log("*** " & testcasename() & ": PICS_SREM_RECEPTION required for executing the TC ***");
                     setverdict(inconc);
                     stop;
                 }
-- 
GitLab