diff --git a/test_purposes/Cx/TP_CX.tplan2 b/test_purposes/Cx/TP_CX.tplan2
index 20bdf54405bf8d78626f0f5a995c16331d389cbb..317cdfe470e36c8cba6d2144e56d338e49642c6d 100644
--- a/test_purposes/Cx/TP_CX.tplan2
+++ b/test_purposes/Cx/TP_CX.tplan2
@@ -29,7 +29,7 @@ Package TP_CX {
             "TS 129 228 [4], clause 6.1.1 and tables 6.1.1.1 and 6.1.1.2",
             "TS 129 229 [5], clauses 6.1.1 and 6.1.2"
         
-        Config Id CF_VxLTE_INT
+        Config Id CF_VoLTE_INT_ES
         
         PICS Selection NONE
         
@@ -81,7 +81,7 @@ Package TP_CX {
         Reference 
             "TS 129 228 [4], clause 6.1.1.1"
         
-        Config Id CF_VxLTE_INT
+        Config Id CF_VoLTE_INT_ES
         
         PICS Selection NONE
         
@@ -120,7 +120,7 @@ Package TP_CX {
             "TS 129 228 [4], clause 6.1.2",
             "TS 129 229 [5], clauses 6.1.3 and 6.1.4"
             
-        Config Id CF_VxLTE_INT
+        Config Id CF_VoLTE_INT_ES
         
         PICS Selection NONE
         
diff --git a/test_purposes/Gx/TP_GX.tplan2 b/test_purposes/Gx/TP_GX.tplan2
index 0e22af94d59deac1a1a9d2686fd856f77243f0fc..d7db5b036637292cca71891f4f1d14400f6b03b9 100644
--- a/test_purposes/Gx/TP_GX.tplan2
+++ b/test_purposes/Gx/TP_GX.tplan2
@@ -29,7 +29,7 @@ Package TP_GX {
         Reference 
             "TS 129 212 [9], clauses 4.5.15.2.1"
         
-        Config Id CF_VxLTE_INT
+        Config Id CF_VoLTE_INT_ES
         
         PICS Selection NONE
         
@@ -70,15 +70,50 @@ Package TP_GX {
             }  
     }  // End of TP_GX_PCRF_ECO_CCA_01
     
+    
+     
+    Test Purpose {
+        TP Id TP_GX_PCRF_ECO_CCA_02
+        //TP_EPC_7004_01 and TP_EPC_7004_02 from TS 103 029 V5.1.1
+        Test objective  "Verify that IUT when receives CC-Request for PCC Rules sends a CC-Answer in case of emergency detachment procedure."
+        
+        Reference 
+            "TS 129 212 [9], clause 4.5.15.2.4"
+        
+        Config Id CF_VoLTE_INT_ES
+        
+        PICS Selection NONE
+        
+        Initial conditions with {
+        	the UE_A entity isAttachedTo the EPC_A
+        }
+        
+        Expected behaviour
+            ensure that {
+                when {
+                    the EPC_PGW_A entity sends an CCR containing
+                        CC_Request_Type_AVP
+                            indicating value TERMINATION_REQUEST;
+                    to the EPC_PCRF_A entity
+                }
+                then {
+                    the EPC_PCRF_A entity sends the CCA containing
+                        Result_Code_AVP
+                            indicating value DIAMETER_SUCCESS;
+                    to the EPC_PGW_A entity
+                }
+            }  
+    }  // End of TP_GX_PCRF_ECO_CCA_02
+    
     Test Purpose {
-        TP Id TP_GX_PCRF_CCA_02
+        TP Id TP_GX_PCRF_EMC_CCA_01
         
-        Test objective  "Verify that IUT when receives CC-Request for PCC Rules containing IMEI for emergency services sends a CC-Answer in case of attachment procedure."
+        Test objective  "Verify that IUT when receives CC-Request for PCC Rules containing IMEI for emergency call sends a CC-Answer in case of attachment procedure."
         
         Reference 
             "TS 129 212 [9], clauses 4.5.15.2.1"
         
-        Config Id CF_VxLTE_INT
+        Config Id CF_VoLTE_INT_ES
         
         PICS Selection NONE
         
diff --git a/test_purposes/Rx/TP_RX.tplan2 b/test_purposes/Rx/TP_RX.tplan2
index 9489a2b92b4b9c6fab1745fbdd7b18ac40947d4f..a2a924a8852654627a290fa4b4210791acdfb90c 100644
--- a/test_purposes/Rx/TP_RX.tplan2
+++ b/test_purposes/Rx/TP_RX.tplan2
@@ -29,7 +29,7 @@ Package TP_RX {
         Reference 
             "TS 129 214 [8], Annex A.5"
         
-        Config Id CF_VxLTE_INT
+        Config Id CF_VoLTE_INT_ES
         
         PICS Selection NONE
         
@@ -69,7 +69,7 @@ Package TP_RX {
         Reference
             "TS 129 214 [8], Annex A.5"
         
-        Config Id CF_VxLTE_INT
+        Config Id CF_VoLTE_INT_ES
         
         PICS Selection NONE
         
@@ -108,7 +108,7 @@ Package TP_RX {
         Reference 
             "TS 129 214 [8], Annex A.5" //clauses 4.4.1, A.1, A.2 and annex B"
         
-        Config Id CF_VxLTE_INT
+        Config Id CF_VoLTE_INT_ES
         
         PICS Selection NONE
         
diff --git a/test_purposes/S6a/TP_S6A.tplan2 b/test_purposes/S6a/TP_S6A.tplan2
index 25fafe6365831c33cec02a821d3101e352f90cb9..b33fcf8166894b7948225991c19d9ca2843822dd 100644
--- a/test_purposes/S6a/TP_S6A.tplan2
+++ b/test_purposes/S6a/TP_S6A.tplan2
@@ -29,7 +29,7 @@ Package TP_S6A {
         Reference 
             "TS 129 272 [10], clause 5.2.1.1.2"
         
-        Config Id CF_VxLTE_INT
+        Config Id CF_VoLTE_INT_ES
         
         PICS Selection NONE
         
diff --git a/test_purposes/Sip_Common.tplan2 b/test_purposes/Sip_Common.tplan2
index 63ab6e530b55d887f925b03931941b85681481a4..f42aa2a6f769f3eff3526e71759a095c8e77ba4d 100644
--- a/test_purposes/Sip_Common.tplan2
+++ b/test_purposes/Sip_Common.tplan2
@@ -183,6 +183,23 @@ Package Sip_Common {
                     connection between IMS_S_CSCF_A.g and IMS_AS_A.g
             ;
             
+            Test Configuration CF_VoLTE_INT_ES
+                containing 
+                    SUT component UE_A of type SipComponent
+                    SUT component IMS_P_CSCF_A of type SipComponent
+                    SUT component IMS_S_CSCF_A of type SipComponent
+                    SUT component IMS_I_CSCF_A of type SipComponent
+                    SUT component IMS_AS_A of type SipComponent
+                    SUT component IMS_IBCF_A of type SipComponent
+                    SUT component IMS_IBCF_B of type SipComponent
+                    connection between UE_A.g and IMS_P_CSCF_A.g
+                    connection between IMS_P_CSCF_A.g and IMS_S_CSCF_A.g
+                    connection between IMS_S_CSCF_A.g and IMS_I_CSCF_A.g
+                    connection between IMS_I_CSCF_A.g and IMS_IBCF_A.g
+                    connection between IMS_IBCF_A.g and IMS_IBCF_B.g
+                    connection between IMS_S_CSCF_A.g and IMS_AS_A.g
+            ;
+            
             Test Configuration CF_VxLTE_RMI
                 containing 
                     SUT component UE_A of type SipComponent
@@ -199,6 +216,22 @@ Package Sip_Common {
                     connection between IMS_IBCF_B.g and IMS_IBCF_A.g
             ;
             
+            Test Configuration CF_VoLTE_RMI_ES
+                containing 
+                    SUT component UE_A of type SipComponent
+                    SUT component IMS_P_CSCF_B of type SipComponent
+                    SUT component IMS_S_CSCF_B of type SipComponent
+                    SUT component IMS_I_CSCF_B of type SipComponent
+                    SUT component IMS_AS_B of type SipComponent
+                    SUT component IMS_IBCF_B of type SipComponent
+                    SUT component IMS_IBCF_A of type SipComponent
+                    connection between UE_A.g and IMS_P_CSCF_B.g
+                    connection between IMS_P_CSCF_B.g and IMS_S_CSCF_B.g
+                    connection between IMS_S_CSCF_B.g and IMS_I_CSCF_B.g
+                    connection between IMS_I_CSCF_B.g and IMS_IBCF_B.g
+                    connection between IMS_IBCF_B.g and IMS_IBCF_A.g
+            ;
+            
             Test Configuration CF_VxLTE_RMI_A
                 containing 
                     SUT component UE_B of type SipComponent
diff --git a/ttcn/AtsImsIot/AtsImsIot_Emergency.ttcn b/ttcn/AtsImsIot/AtsImsIot_Emergency.ttcn
index c656fd3d433c1c947b10434336abd7d68848fe33..9631b049b405326b46e6b3f6c426699269b6f3d4 100644
--- a/ttcn/AtsImsIot/AtsImsIot_Emergency.ttcn
+++ b/ttcn/AtsImsIot/AtsImsIot_Emergency.ttcn
@@ -430,7 +430,7 @@ module AtsImsIot_Emergency {
                         f_cf_VxLteMonitor_Up();
                 
                         // Preamble
-                        f_mtc_check_precond_TD_VoLTE_ECO_INT_INI_01();
+                        f_mtc_check_precond_TD_VoLTE_ECO_INT_INI_01_02();
                         
                         // Test body
                         //f_mtc_userInitiateCall (v_ueA, v_userTelInfoB);
@@ -520,12 +520,31 @@ module AtsImsIot_Emergency {
                 
                 group f_TD_VoLTE_ECO_INT_INI_01_02 {
                     
-                    function f_mtc_check_precond_TD_VoLTE_ECO_INT_INI_01() runs on ImsTestCoordinator {
+                    function f_mtc_check_precond_TD_VoLTE_ECO_INT_INI_01_02() runs on ImsTestCoordinator {
                         log("If the test case fails, please check the preconditions");
                         // TODO Add real code to check pre-conditions
-                     } // End of function f_TD_VoLTE_ECO_INT_INI_01_02
+                     } // End of function f_mtc_check_precond_TD_VoLTE_ECO_INT_INI_01_02
                      
-                } // End of f_TD_VoLTE_ECO_INT_INI_01
+                } // End of group f_TD_VoLTE_ECO_INT_INI_01_02
+                 
+                /**
+                * @desc    To demonstrate the establishment of dedicated bearers at the originating EPC due to SIP emergency session establishment.
+                *          On successful emergency call setup with UE-A attached to EPC A, the P-CSCF should derive from the SDP offer and answer, descriptions of the Service Data Flow
+                * @see ETSI TS 103 795-2 Clause 5.3.1.2	UE calling PSAP with emergency registration
+                * @remark This is option3: IBCF is connected to the PSTN network
+                */
+                testcase TD_VoLTE_ECO_INT_INI_01_03() runs on ImsTestCoordinator system IotSystemInterface {
+
+                } // End of TC TD_VoLTE_ECO_INT_INI_01_03
+                
+                group f_TD_VoLTE_ECO_INT_INI_01_03 {
+                    
+                    function f_mtc_check_precond_TD_VoLTE_ECO_INT_INI_01_03() runs on ImsTestCoordinator {
+                        log("If the test case fails, please check the preconditions");
+                        // TODO Add real code to check pre-conditions
+                     } // End of function f_mtc_check_precond_TD_VoLTE_ECO_INT_INI_01_03
+                     
+                } // End of group f_TD_VoLTE_ECOf_TD_VoLTE_ECO_INT_INI_01_03_INT_INI_01
                  
             } // End of group EmergencySessionEstablishment