From 85b4f2c67fdb917545b61392ec8996c72c490411 Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Wed, 15 Feb 2023 14:29:27 +0100
Subject: [PATCH] CI test XMLs: Add UEs to use in all pipelines; cleanup

- remove -R iperf parameter: handled in test by UL/DL direction
---
 ci-scripts/xml_files/benetel_nsa_quectel.xml  | 12 +++
 .../xml_files/benetel_nsa_quectel_longrun.xml | 12 +++
 .../container_lte_b200_fdd_05Mhz_tm1.xml      | 77 ++++++++++-------
 ...lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml | 31 ++++---
 .../container_lte_b200_fdd_10Mhz_tm1.xml      | 50 +++++++----
 .../container_lte_b200_fdd_10Mhz_tm1_cdrx.xml | 21 +++--
 .../container_lte_b200_fdd_20Mhz_tm1.xml      | 38 +++++++--
 .../container_lte_b200_tdd_05Mhz_tm1.xml      | 55 ++++++++----
 .../container_lte_b200_tdd_05Mhz_tm2.xml      | 42 +++++++---
 .../container_lte_b200_tdd_10Mhz_tm1.xml      | 54 ++++++++----
 .../container_lte_b200_tdd_20Mhz_tm1.xml      | 42 +++++++---
 ...e_b200_tdd_20Mhz_tm1_default_scheduler.xml | 56 +++++++++----
 .../xml_files/container_nsa_b200_quectel.xml  | 83 ++++++++++---------
 .../xml_files/container_sa_b200_quectel.xml   | 74 +++++++----------
 .../container_sa_f1_b200_quectel.xml          | 33 +++++---
 ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml  | 66 ++++++++-------
 .../fr1_nsa_2x2_quectel_attach_detach.xml     | 54 ++++++------
 ci-scripts/xml_files/fr1_nsa_quectel.xml      | 74 ++++++++++-------
 .../fr1_nsa_quectel_attach_detach.xml         |  6 --
 ci-scripts/xml_files/fr1_nsa_quectel_long.xml | 13 ++-
 .../xml_files/fr1_sa_amarisoft_ue_1x.xml      | 72 ++++++++++------
 ci-scripts/xml_files/fr1_sa_oaiue_b200.xml    |  5 +-
 ci-scripts/xml_files/fr1_sa_oaiue_n310.xml    | 31 +++----
 ci-scripts/xml_files/fr1_sa_oaiue_x300.xml    |  6 +-
 ci-scripts/xml_files/fr1_sa_quectel.xml       | 66 ++++++++-------
 .../xml_files/fr1_sa_quectel_162prb.xml       | 46 +++++-----
 .../xml_files/fr1_sa_quectel_stages.xml       | 41 +++++----
 ci-scripts/xml_files/gnb_phytest_usrp_run.xml |  4 +-
 .../xml_files/gnb_phytest_usrp_run_60.xml     |  4 +-
 .../xml_files/gnb_phytest_usrp_run_60_2x2.xml |  6 +-
 ci-scripts/xml_files/lte_2x2_tm1_quectel.xml  | 35 ++++----
 ci-scripts/xml_files/lte_2x2_tm2_quectel.xml  | 42 +++++-----
 32 files changed, 772 insertions(+), 479 deletions(-)

diff --git a/ci-scripts/xml_files/benetel_nsa_quectel.xml b/ci-scripts/xml_files/benetel_nsa_quectel.xml
index 5da8322f228..a7e22e94edc 100644
--- a/ci-scripts/xml_files/benetel_nsa_quectel.xml
+++ b/ci-scripts/xml_files/benetel_nsa_quectel.xml
@@ -30,6 +30,7 @@
  040000
  000002
  010000
+ 010001
  050000
  050001
  000001
@@ -38,6 +39,7 @@
  070001
  000001
  010002
+ 010011
  000001
  080001
  080000
@@ -56,6 +58,16 @@
 		<desc>Detach UE</desc>
 		<id>idefix</id>
 	</testCase>
+ <testCase id="010001">
+		<class>Attach_UE</class>
+		<desc>Attach UE</desc>
+		<id>idefix</id>
+	</testCase>
+ <testCase id="010011">
+		<class>Terminate_UE</class>
+		<desc>Terminate UE</desc>
+		<id>idefix</id>
+	</testCase>
 
 
 	<testCase id="030000">
diff --git a/ci-scripts/xml_files/benetel_nsa_quectel_longrun.xml b/ci-scripts/xml_files/benetel_nsa_quectel_longrun.xml
index 3173e6315a0..54c8690ca4a 100644
--- a/ci-scripts/xml_files/benetel_nsa_quectel_longrun.xml
+++ b/ci-scripts/xml_files/benetel_nsa_quectel_longrun.xml
@@ -30,6 +30,7 @@
  040000
  000002
  010000
+ 010001
  000001
  050000
  050001
@@ -39,6 +40,7 @@
  070001
  000001
  010002
+ 010011
  000001
  080001
  080000
@@ -58,6 +60,16 @@
 		<desc>Detach UE</desc>
 		<id>idefix</id>
 	</testCase>
+ <testCase id="010001">
+		<class>Attach_UE</class>
+		<desc>Attach UE</desc>
+		<id>idefix</id>
+	</testCase>
+  <testCase id="010011">
+		<class>Terminate_UE</class>
+		<desc>Terminate UE</desc>
+		<id>idefix</id>
+	</testCase>
 
 
 	<testCase id="030000">
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml
index 698c6203296..0023edd171c 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml
@@ -30,10 +30,9 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
 100000
 111110
 300000
-040101
+040101 
 030101
-000001
-040301 000001 040501 040603 040604 040605 040606 040607 040641 040642 040643 040644 040401 040201
+040301 040501 040603 040604 040605 040606 040607 040641 040642 040643 040644 040401 040201
 030201
 200000
     </TestCaseRequestedList>
@@ -45,24 +44,26 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
         <test_svr_id>0</test_svr_id>
         <images_to_pull>oai-enb</images_to_pull>
     </testCase>
+
     <testCase id="100000">
-	    <class>Custom_Command</class>
-	    <desc>To reset cpupower</desc>
-	    <node>hutch</node>
-	    <command>sudo cpupower idle-set -D 0</command>
+        <class>Custom_Command</class>
+        <desc>Disable Sleep States</desc>
+        <node>hutch</node>
+        <command>sudo cpupower idle-set -D 0</command>
     </testCase>
     <testCase id="200000">
-	    <class>Custom_Command</class>
-	    <desc>To reset cpupower</desc>
-	    <node>hutch</node>
-	    <command>sudo cpupower idle-set -E</command>
-    </testCase>
-   <testCase id="300000">
-	    <class>Custom_Command</class>
-	    <desc>To reset USRP</desc>
-	    <node>hutch</node>
-	    <command>sudo -S b2xx_fx3_utils --reset-device</command>
-   </testCase>
+        <class>Custom_Command</class>
+        <desc>Enable Sleep States</desc>
+        <node>hutch</node>
+        <command>sudo cpupower idle-set -E</command>
+    </testCase>
+    <testCase id="300000">
+        <class>Custom_Command</class>
+        <desc>Reset USRP</desc>
+        <node>hutch</node>
+        <command>sudo -S b2xx_fx3_utils --reset-device</command>
+    </testCase>
+
     <testCase id="030101">
         <class>Deploy_Object</class>
         <desc>Deploy eNB (FDD/Band7/5MHz/B200) in a container</desc>
@@ -88,21 +89,22 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
     <testCase id="040101">
         <class>Initialize_UE</class>
         <desc>Initialize UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040201">
         <class>Terminate_UE</class>
         <desc>Terminate UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040301">
         <class>Attach_UE</class>
-        <desc>Attach UE</desc>
+        <desc>Attach UEs</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040401">
         <class>Detach_UE</class>
-        <desc>Detach UE</desc>
+        <desc>Detach UEs</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040501">
@@ -110,6 +112,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
         <desc>ping (5MHz - 20 sec)</desc>
         <ping_args>-c 20</ping_args>
         <ping_packetloss_threshold>5</ping_packetloss_threshold>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040603">
@@ -117,7 +120,8 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
         <desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(balanced profile)</desc>
         <iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_profile>balanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040604">
@@ -125,7 +129,8 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
         <desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(single-ue profile)</desc>
         <iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040605">
@@ -134,6 +139,8 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
         <iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040606">
@@ -142,6 +149,8 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
         <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_2</id>
     </testCase>
 
     <testCase id="040607">
@@ -150,38 +159,48 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
         <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040641">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 9M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 9M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040642">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-u -b 9M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 9M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040643">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040644">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/TCP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
 </testCaseList>
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml
index 66d0c982ecf..bf8cb5e2568 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml
@@ -44,16 +44,16 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
         <images_to_pull>oai-enb</images_to_pull>
     </testCase>
     <testCase id="100000">
-	    <class>Custom_Command</class>
-	    <desc>To reset cpupower</desc>
-	    <node>hutch</node>
-	    <command>sudo cpupower idle-set -D 0</command>
+        <class>Custom_Command</class>
+        <desc>Disable Sleep States</desc>
+        <node>hutch</node>
+        <command>sudo cpupower idle-set -D 0</command>
     </testCase>
     <testCase id="200000">
-	    <class>Custom_Command</class>
-	    <desc>To reset cpupower</desc>
-	    <node>hutch</node>
-	    <command>sudo cpupower idle-set -E</command>
+        <class>Custom_Command</class>
+        <desc>Enable Sleep States</desc>
+        <node>hutch</node>
+        <command>sudo cpupower idle-set -E</command>
     </testCase>
 
     <testCase id="030102">
@@ -75,21 +75,22 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
     <testCase id="040101">
         <class>Initialize_UE</class>
         <desc>Initialize UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040201">
         <class>Terminate_UE</class>
         <desc>Terminate UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040301">
         <class>Attach_UE</class>
         <desc>Attach UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040401">
         <class>Detach_UE</class>
         <desc>Detach UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="000001">
@@ -108,34 +109,40 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
         <class>CheckStatusUE</class>
         <desc>Check UE(s) status before attachment</desc>
         <expectedNbOfConnectedUEs>0</expectedNbOfConnectedUEs>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="000011">
         <class>CheckStatusUE</class>
         <desc>Check UE(s) status before data disabling</desc>
         <expectedNbOfConnectedUEs>2</expectedNbOfConnectedUEs>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="000012">
         <class>CheckStatusUE</class>
         <desc>Check UE(s) status after data disabling</desc>
         <expectedNbOfConnectedUEs>0</expectedNbOfConnectedUEs>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="000013">
         <class>CheckStatusUE</class>
         <desc>Check UE(s) status after data re-enabling</desc>
         <expectedNbOfConnectedUEs>2</expectedNbOfConnectedUEs>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040302">
         <class>DataDisable_UE</class>
         <desc>Disabling Data Service on UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040303">
         <class>DataEnable_UE</class>
         <desc>Enabling Data Service on UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040502">
@@ -143,6 +150,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
         <desc>ping (5MHz - 20 sec)</desc>
         <ping_args>-c 20</ping_args>
         <ping_packetloss_threshold>5</ping_packetloss_threshold>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040503">
@@ -150,6 +158,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
         <desc>ping (5MHz - 20 sec)</desc>
         <ping_args>-c 20</ping_args>
         <ping_packetloss_threshold>5</ping_packetloss_threshold>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
 </testCaseList>
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml
index 07f23ff2f0f..ea89f4193af 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml
@@ -46,16 +46,16 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <images_to_pull>oai-enb</images_to_pull>
     </testCase>
     <testCase id="100000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
-            <node>hutch</node>
-            <command>sudo cpupower idle-set -D 0</command>
+        <class>Custom_Command</class>
+        <desc>Disable Sleep States</desc>
+        <node>hutch</node>
+        <command>sudo cpupower idle-set -D 0</command>
     </testCase>
     <testCase id="200000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
-            <node>hutch</node>
-            <command>sudo cpupower idle-set -E</command>
+        <class>Custom_Command</class>
+        <desc>Enable Sleep States</desc>
+        <node>hutch</node>
+        <command>sudo cpupower idle-set -E</command>
     </testCase>
 
     <testCase id="030111">
@@ -83,21 +83,22 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
     <testCase id="040101">
         <class>Initialize_UE</class>
         <desc>Initialize UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040201">
         <class>Terminate_UE</class>
         <desc>Terminate UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040301">
         <class>Attach_UE</class>
         <desc>Attach UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040401">
         <class>Detach_UE</class>
         <desc>Detach UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040511">
@@ -105,6 +106,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <desc>ping (10MHz - 20 sec)</desc>
         <ping_args>-c 20</ping_args>
         <ping_packetloss_threshold>5</ping_packetloss_threshold>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040613">
@@ -113,6 +115,8 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040614">
@@ -121,6 +125,8 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040615">
@@ -129,6 +135,8 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040616">
@@ -137,6 +145,8 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040617">
@@ -145,38 +155,48 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040651">
         <class>Iperf</class>
         <desc>iperf (10MHz - UL/18Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 18M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 18M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040652">
         <class>Iperf</class>
         <desc>iperf (10MHz - UL/18Mbps/UDP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-u -b 18M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 18M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040653">
         <class>Iperf</class>
         <desc>iperf (10MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040654">
         <class>Iperf</class>
         <desc>iperf (10MHz - UL/TCP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
 </testCaseList>
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml
index caa888e4a8c..788a1759dc6 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml
@@ -31,7 +31,8 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
 111110
 040101
 030112
-040301 040512 040612 040650 040401 040201
+040301 040302 040512 040612 040650 040401
+040201
 030201
 200000
     </TestCaseRequestedList>
@@ -45,13 +46,13 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
     </testCase>
     <testCase id="100000">
             <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
+            <desc>Disable Sleep States</desc>
             <node>hutch</node>
             <command>sudo cpupower idle-set -D 0</command>
     </testCase>
     <testCase id="200000">
             <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
+            <desc>Enable Sleep States</desc>
             <node>hutch</node>
             <command>sudo cpupower idle-set -E</command>
     </testCase>
@@ -75,21 +76,22 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
     <testCase id="040101">
         <class>Initialize_UE</class>
         <desc>Initialize UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040201">
         <class>Terminate_UE</class>
         <desc>Terminate UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040301">
         <class>Attach_UE</class>
         <desc>Attach UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040401">
         <class>Detach_UE</class>
         <desc>Detach UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040512">
@@ -97,6 +99,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <desc>ping (10MHz - 20 sec)</desc>
         <ping_args>-c 20</ping_args>
         <ping_packetloss_threshold>5</ping_packetloss_threshold>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040612">
@@ -105,14 +108,18 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040650">
         <class>Iperf</class>
         <desc>iperf (10MHz - UL/20Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 20M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 20M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
 </testCaseList>
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml
index e57e40cb1fb..4fef927a3b6 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml
@@ -46,13 +46,13 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
     </testCase>
     <testCase id="100000">
             <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
+            <desc>Disable Sleep States</desc>
             <node>hutch</node>
             <command>sudo cpupower idle-set -D 0</command>
     </testCase>
     <testCase id="200000">
             <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
+            <desc>Enable Sleep States</desc>
             <node>hutch</node>
             <command>sudo cpupower idle-set -E</command>
     </testCase>
@@ -82,21 +82,22 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
     <testCase id="040101">
         <class>Initialize_UE</class>
         <desc>Initialize UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040201">
         <class>Terminate_UE</class>
         <desc>Terminate UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040301">
         <class>Attach_UE</class>
         <desc>Attach UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040401">
         <class>Detach_UE</class>
         <desc>Detach UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040521">
@@ -104,6 +105,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <desc>ping (20MHz - 20 sec)</desc>
         <ping_args>-c 20</ping_args>
         <ping_packetloss_threshold>5</ping_packetloss_threshold>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040623">
@@ -112,6 +114,8 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040624">
@@ -120,6 +124,8 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040625">
@@ -128,6 +134,8 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040626">
@@ -136,6 +144,8 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040627">
@@ -144,38 +154,48 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040661">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/12Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 12M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 12M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040662">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/17Mbps/UDP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-u -b 17M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 17M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040663">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040664">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/TCP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
 </testCaseList>
diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml
index 9f3bedba9e0..3f12ed8330c 100644
--- a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml
@@ -43,17 +43,18 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
         <test_svr_id>0</test_svr_id>
         <images_to_pull>oai-enb</images_to_pull>
     </testCase>
+
     <testCase id="100000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
-            <node>starsky</node>
-            <command>sudo cpupower idle-set -D 0</command>
+        <class>Custom_Command</class>
+        <desc>Disable Sleep States</desc>
+        <node>starsky</node>
+        <command>sudo cpupower idle-set -D 0</command>
     </testCase>
     <testCase id="200000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
-            <node>starsky</node>
-            <command>sudo cpupower idle-set -E</command>
+        <class>Custom_Command</class>
+        <desc>Enable Sleep States</desc>
+        <node>starsky</node>
+        <command>sudo cpupower idle-set -E</command>
     </testCase>
 
     <testCase id="030104">
@@ -81,21 +82,22 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
     <testCase id="040101">
         <class>Initialize_UE</class>
         <desc>Initialize UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040201">
         <class>Terminate_UE</class>
         <desc>Terminate UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040301">
         <class>Attach_UE</class>
         <desc>Attach UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040401">
         <class>Detach_UE</class>
         <desc>Detach UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040501">
@@ -103,6 +105,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
         <desc>ping (5MHz - 20 sec)</desc>
         <ping_args>-c 20</ping_args>
         <ping_packetloss_threshold>25</ping_packetloss_threshold>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040601">
@@ -111,6 +114,8 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
         <iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040602">
@@ -119,6 +124,8 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
         <iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040603">
@@ -127,6 +134,8 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
         <iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040604">
@@ -135,6 +144,8 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
         <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040605">
@@ -142,45 +153,57 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
         <desc>iperf (5MHz - DL/TCP)(30 sec)</desc>
         <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040641">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
-        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040642">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040643">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(unbalanced)</desc>
-        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040644">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue)</desc>
-        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040645">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
 </testCaseList>
diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml
index d8f87b47414..887b5dab9b9 100644
--- a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml
@@ -45,13 +45,13 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
     </testCase>
     <testCase id="100000">
             <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
+            <desc>Disable Sleep States</desc>
             <node>starsky</node>
             <command>sudo cpupower idle-set -D 0</command>
     </testCase>
     <testCase id="200000">
             <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
+            <desc>Enable Sleep States</desc>
             <node>starsky</node>
             <command>sudo cpupower idle-set -E</command>
     </testCase>
@@ -80,21 +80,22 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
     <testCase id="040101">
         <class>Initialize_UE</class>
         <desc>Initialize UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040201">
         <class>Terminate_UE</class>
         <desc>Terminate UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040301">
         <class>Attach_UE</class>
         <desc>Attach UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040401">
         <class>Detach_UE</class>
         <desc>Detach UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040502">
@@ -102,6 +103,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
         <desc>ping (5MHz - 20 sec)</desc>
         <ping_args>-c 20</ping_args>
         <ping_packetloss_threshold>25</ping_packetloss_threshold>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040601">
@@ -110,6 +112,8 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
         <iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040606">
@@ -118,6 +122,8 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
         <iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040603">
@@ -126,6 +132,8 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
         <iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040608">
@@ -134,6 +142,8 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
         <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040605">
@@ -141,45 +151,57 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
         <desc>iperf (5MHz - DL/TCP)(30 sec)</desc>
         <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040641">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
-        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040646">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040643">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(unbalanced)</desc>
-        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040648">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue)</desc>
-        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040645">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
 </testCaseList>
diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml
index fe47e7c9587..3874ff7028c 100644
--- a/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml
@@ -44,16 +44,16 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
         <images_to_pull>oai-enb</images_to_pull>
     </testCase>
     <testCase id="100000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
-            <node>starsky</node>
-            <command>sudo cpupower idle-set -D 0</command>
+        <class>Custom_Command</class>
+        <desc>Disable Sleep States</desc>
+        <node>starsky</node>
+        <command>sudo cpupower idle-set -D 0</command>
     </testCase>
     <testCase id="200000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
-            <node>starsky</node>
-            <command>sudo cpupower idle-set -E</command>
+        <class>Custom_Command</class>
+        <desc>Enable Sleep States</desc>
+        <node>starsky</node>
+        <command>sudo cpupower idle-set -E</command>
     </testCase>
     <testCase id="030114">
         <class>Deploy_Object</class>
@@ -80,21 +80,22 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
     <testCase id="040101">
         <class>Initialize_UE</class>
         <desc>Initialize UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040201">
         <class>Terminate_UE</class>
         <desc>Terminate UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040301">
         <class>Attach_UE</class>
         <desc>Attach UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040401">
         <class>Detach_UE</class>
         <desc>Detach UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040511">
@@ -102,6 +103,7 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
         <desc>ping (10MHz - 20 sec)</desc>
         <ping_args>-c 20</ping_args>
         <ping_packetloss_threshold>25</ping_packetloss_threshold>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040611">
@@ -110,6 +112,8 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
         <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040612">
@@ -118,6 +122,8 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
         <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040613">
@@ -126,6 +132,8 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
         <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040614">
@@ -134,6 +142,8 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
         <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040615">
@@ -141,45 +151,57 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
         <desc>iperf (10MHz - DL/TCP)(30 sec)</desc>
         <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040651">
         <class>Iperf</class>
         <desc>iperf (10MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
-        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040652">
         <class>Iperf</class>
         <desc>iperf (10MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040653">
         <class>Iperf</class>
         <desc>iperf (10MHz - UL/2Mbps/UDP)(30 sec)(unbalanced)</desc>
-        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040654">
         <class>Iperf</class>
         <desc>iperf (10MHz - UL/TCP)(30 sec)(single-ue)</desc>
-        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040655">
         <class>Iperf</class>
         <desc>iperf (10MHz - UL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
 </testCaseList>
diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml
index 51c4f95137a..77e00d72ac6 100644
--- a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml
@@ -45,13 +45,13 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
     </testCase>
     <testCase id="100000">
             <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
+            <desc>Disable Sleep States</desc>
             <node>starsky</node>
             <command>sudo cpupower idle-set -D 0</command>
     </testCase>
     <testCase id="200000">
             <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
+            <desc>Enable Sleep States</desc>
             <node>starsky</node>
             <command>sudo cpupower idle-set -E</command>
     </testCase>
@@ -80,21 +80,22 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
     <testCase id="040101">
         <class>Initialize_UE</class>
         <desc>Initialize UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040201">
         <class>Terminate_UE</class>
         <desc>Terminate UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040301">
         <class>Attach_UE</class>
         <desc>Attach UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040401">
         <class>Detach_UE</class>
         <desc>Detach UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040521">
@@ -102,6 +103,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
         <desc>ping (20MHz - 20 sec)</desc>
         <ping_args>-c 20</ping_args>
         <ping_packetloss_threshold>25</ping_packetloss_threshold>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040621">
@@ -110,6 +112,8 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
         <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040622">
@@ -118,6 +122,8 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
         <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040623">
@@ -126,6 +132,8 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
         <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040624">
@@ -134,6 +142,8 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
         <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040625">
@@ -141,45 +151,57 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
         <desc>iperf (20MHz - DL/TCP)(30 sec)</desc>
         <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040661">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
-        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040662">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040663">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/2Mbps/UDP)(30 sec)(unbalanced)</desc>
-        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040664">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/TCP)(30 sec)(single-ue)</desc>
-        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040665">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
 </testCaseList>
diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml b/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml
index 57ebb79fac9..fd454f13e2c 100644
--- a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml
@@ -43,18 +43,20 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
         <test_svr_id>0</test_svr_id>
         <images_to_pull>oai-enb</images_to_pull>
     </testCase>
+
     <testCase id="100000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
-            <node>starsky</node>
-            <command>sudo cpupower idle-set -D 0</command>
+        <class>Custom_Command</class>
+        <desc>Disable Sleep States</desc>
+        <node>starsky</node>
+        <command>sudo cpupower idle-set -D 0</command>
     </testCase>
     <testCase id="200000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
-            <node>starsky</node>
-            <command>sudo cpupower idle-set -E</command>
+        <class>Custom_Command</class>
+        <desc>Enable Sleep States</desc>
+        <node>starsky</node>
+        <command>sudo cpupower idle-set -E</command>
     </testCase>
+
     <testCase id="030125">
         <class>Deploy_Object</class>
         <desc>Deploy eNB (TDD/Band40/20MHz/B200) in a container</desc>
@@ -80,21 +82,22 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
     <testCase id="040101">
         <class>Initialize_UE</class>
         <desc>Initialize UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040201">
         <class>Terminate_UE</class>
         <desc>Terminate UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040301">
         <class>Attach_UE</class>
         <desc>Attach UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040401">
         <class>Detach_UE</class>
         <desc>Detach UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040522">
@@ -102,6 +105,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
         <desc>ping (20MHz - 20 sec)</desc>
         <ping_args>-c 20</ping_args>
         <ping_packetloss_threshold>25</ping_packetloss_threshold>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040626">
@@ -110,6 +114,8 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
         <iperf_args>-u -b 27.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040627">
@@ -118,6 +124,8 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
         <iperf_args>-u -b 27.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040628">
@@ -126,6 +134,8 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
         <iperf_args>-u -b 27.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040629">
@@ -134,6 +144,8 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
         <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040630">
@@ -141,45 +153,57 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
         <desc>iperf (20MHz - DL/TCP)(30 sec)</desc>
         <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040666">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/7Mbps/UDP)(30 sec)(balanced)</desc>
-        <iperf_args>-u -b 7M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 7M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040667">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/7Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 7M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 7M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040668">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/7Mbps/UDP)(30 sec)(unbalanced)</desc>
-        <iperf_args>-u -b 7M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 7M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040669">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/TCP)(30 sec)(single-ue)</desc>
-        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040670">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
 </testCaseList>
diff --git a/ci-scripts/xml_files/container_nsa_b200_quectel.xml b/ci-scripts/xml_files/container_nsa_b200_quectel.xml
index 397e6aadbd8..2f0c8dfeda8 100644
--- a/ci-scripts/xml_files/container_nsa_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_nsa_b200_quectel.xml
@@ -31,14 +31,10 @@
  500000
  111110
  111111
- 000001
- 010002
+ 010000
  030101
- 000001
  030102
- 000001
- 010000
- 000001
+ 010001
  050000
  050001
  070001
@@ -46,8 +42,8 @@
  070002
  050002
  050003
+ 010010
  010002
- 000001
  030202
  030201
  300000
@@ -69,47 +65,58 @@
 		<images_to_pull>oai-gnb</images_to_pull>
 	</testCase>
 
+	<testCase id = "100000">
+		<class>Custom_Command</class>
+		<desc>Reset USRP</desc>
+		<node>nepes</node>
+		<command>sudo -S b2xx_fx3_utils --reset-device</command>
+  </testCase>
+
+	<testCase id="200000">
+		<class>Custom_Command</class>
+		<desc>Disable Sleep States (nepes)</desc>
+		<node>nepes</node>
+		<command>sudo cpupower idle-set -D 0</command>
+	</testCase>
+	<testCase id="300000">
+		<class>Custom_Command</class>
+		<desc>Enable Sleep States (nepes)</desc>
+		<node>nepes</node>
+		<command>sudo cpupower idle-set -E</command>
+	</testCase>
+	<testCase id="500000">
+		<class>Custom_Command</class>
+		<desc>Disable Sleep States (obelix)</desc>
+		<node>obelix</node>
+		<command>sudo cpupower idle-set -D 0</command>
+	</testCase>
+	<testCase id="600000">
+		<class>Custom_Command</class>
+		<desc>Enable Sleep States (obelix)</desc>
+		<node>obelix</node>
+		<command>sudo cpupower idle-set -E</command>
+	</testCase>
+
 	<testCase id="010000">
 		<class>Initialize_UE</class>
 		<desc>Initialize Quectel</desc>
 		<id>idefix</id>
 	</testCase>
-        <testCase id = "100000">
-		<class>Custom_Command</class>
-		<desc>To reset USRP</desc>
-		<node>nepes</node>
-		<command>sudo -S b2xx_fx3_utils --reset-device</command>
-        </testCase>
-       <testCase id="200000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower - nepes</desc>
-            <node>nepes</node>
-            <command>sudo cpupower idle-set -D 0</command>
-       </testCase>
-       <testCase id="300000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower - nepes</desc>
-            <node>nepes</node>
-            <command>sudo cpupower idle-set -E</command>
-       </testCase>
-       <testCase id="500000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower - obelix</desc>
-            <node>obelix</node>
-            <command>sudo cpupower idle-set -D 0</command>
-       </testCase>
-       <testCase id="600000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower - obelix</desc>
-            <node>obelix</node>
-            <command>sudo cpupower idle-set -E</command>
-       </testCase>
-
 	<testCase id="010002">
 		<class>Terminate_UE</class>
 		<desc>Terminate Quectel</desc>
 		<id>idefix</id>
 	</testCase>
+	<testCase id="010001">
+		<class>Attach_UE</class>
+		<desc>Attach UE</desc>
+		<id>idefix</id>
+  </testCase>
+	<testCase id= "010010">
+		<class>Detach_UE</class>
+		<desc>Detach UE</desc>
+		<id>idefix</id>
+	</testCase>
 
 	<testCase id="030101">
 		<class>Deploy_Object</class>
diff --git a/ci-scripts/xml_files/container_sa_b200_quectel.xml b/ci-scripts/xml_files/container_sa_b200_quectel.xml
index 4f0e01c692a..ed0b27080bb 100644
--- a/ci-scripts/xml_files/container_sa_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_b200_quectel.xml
@@ -28,25 +28,19 @@
   <TestCaseRequestedList>
     100000
     111111
-    010002
-    030101
-    000001
     010000
-    000001
+    030101
+    010001
     050000
     050001
-    070001
     070000
+    070001
+    070002
+    010010
     010002
-    000001
     030201
     200000
   </TestCaseRequestedList>
-    <!--
- 070002
- 050002
- 050003
-    -->
   <TestCaseExclusionList></TestCaseExclusionList>
 
   <testCase id="111111">
@@ -56,30 +50,40 @@
     <images_to_pull>oai-gnb</images_to_pull>
   </testCase>
 
+  <testCase id="100000">
+    <class>Custom_Command</class>
+    <desc>Disable Sleep States</desc>
+    <node>nepes</node>
+    <command>sudo cpupower idle-set -D 0</command>
+  </testCase>
+  <testCase id="200000">
+    <class>Custom_Command</class>
+    <desc>Enable Sleep States</desc>
+    <node>nepes</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
   <testCase id="010000">
     <class>Initialize_UE</class>
     <desc>Initialize Quectel</desc>
     <id>idefix</id>
   </testCase>
-
-
   <testCase id="010002">
     <class>Terminate_UE</class>
     <desc>Terminate Quectel</desc>
     <id>idefix</id>
   </testCase>
-  <testCase id="100000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower - nepes</desc>
-            <node>nepes</node>
-            <command>sudo cpupower idle-set -D 0</command>
-   </testCase>
-   <testCase id="200000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower - nepes</desc>
-            <node>nepes</node>
-            <command>sudo cpupower idle-set -E</command>
+  <testCase id="010001">
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>idefix</id>
+  </testCase>
+  <testCase id="010010">
+    <class>Detach_UE</class>
+    <desc>Detach UE</desc>
+    <id>idefix</id>
   </testCase>
+
   <testCase id="030101">
     <class>Deploy_Object</class>
     <desc>Deploy gNB (TDD/Band78/40MHz/B200) in a container</desc>
@@ -119,28 +123,10 @@
     <ping_rttavg_threshold>15</ping_rttavg_threshold>
   </testCase>
 
-  <testCase id="050002">
-    <class>Ping</class>
-    <desc>Ping: 20pings in 20sec</desc>
-    <id>idefix</id>
-    <ping_args>-c 20</ping_args>
-    <ping_packetloss_threshold>1</ping_packetloss_threshold>
-    <ping_rttavg_threshold>15</ping_rttavg_threshold>
-  </testCase>
-
-  <testCase id="050003">
-    <class>Ping</class>
-    <desc>Ping: 100pings in 20sec</desc>
-    <id>idefix</id>
-    <ping_args>-c 100 -i 0.2</ping_args>
-    <ping_packetloss_threshold>1</ping_packetloss_threshold>
-    <ping_rttavg_threshold>15</ping_rttavg_threshold>
-  </testCase>
-
   <testCase id="070000">
     <class>Iperf</class>
     <desc>iperf (DL/30Mbps/UDP)(30 sec)(single-ue profile)</desc>
-    <iperf_args>-u -b 30M -t 30 -i 1 -fm -l1400</iperf_args>
+    <iperf_args>-u -b 30M -t 30 -i 1 -fm</iperf_args>
     <direction>DL</direction>
     <id>idefix</id>
     <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
@@ -151,7 +137,7 @@
   <testCase id="070001">
     <class>Iperf</class>
     <desc>iperf (UL/8Mbps/UDP)(30 sec)(single-ue profile)</desc>
-    <iperf_args>-u -b 8M -t 30 -i 1 -fm -l1400</iperf_args>
+    <iperf_args>-u -b 8M -t 30 -i 1 -fm</iperf_args>
     <direction>UL</direction>
     <id>idefix</id>
     <iperf_packetloss_threshold>1</iperf_packetloss_threshold>
diff --git a/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml b/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml
index 45a05375ca1..2f6aad7eeff 100644
--- a/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml
@@ -32,9 +32,11 @@
     130102
     100001
     110000
+    110001
     100001
     150000
     150001
+    110011
     110002
     100001
     130201
@@ -54,13 +56,21 @@
     <desc>Initialize Quectel</desc>
     <id>idefix</id>
   </testCase>
-
-
   <testCase id="110002">
     <class>Terminate_UE</class>
     <desc>Terminate Quectel</desc>
     <id>idefix</id>
   </testCase>
+  <testCase id="110001">
+    <class>Attach_UE</class>
+    <desc>Attach Quectel</desc>
+    <id>idefix</id>
+  </testCase>
+  <testCase id="110011">
+    <class>Detach_UE</class>
+    <desc>Detach Quectel</desc>
+    <id>idefix</id>
+  </testCase>
 
   <testCase id="130101">
     <class>Deploy_Object</class>
@@ -79,18 +89,20 @@
     <eNB_serverId>0</eNB_serverId>
     <services>gnb_du_tdd</services>
   </testCase>
+
   <testCase id="100000">
     <class>Custom_Command</class>
-    <desc>To reset cpupower</desc>
+    <desc>Disable Sleep States</desc>
     <node>nepes</node>
     <command>sudo cpupower idle-set -D 0</command>
-    </testCase>
-    <testCase id="200000">
-      <class>Custom_Command</class>
-      <desc>To reset cpupower</desc>
-      <node>nepes</node>
-      <command>sudo cpupower idle-set -E</command>
-    </testCase>
+  </testCase>
+  <testCase id="200000">
+    <class>Custom_Command</class>
+    <desc>Enable Sleep States</desc>
+    <node>nepes</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
   <testCase id="100001">
     <class>IdleSleep</class>
     <desc>Sleep</desc>
@@ -103,7 +115,6 @@
     <idle_sleep_time_in_sec>20</idle_sleep_time_in_sec>
   </testCase>
 
-
   <testCase id="150000">
     <class>Ping</class>
     <desc>Ping: 20pings in 20sec</desc>
diff --git a/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml b/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml
index f3009f150fb..185d6372181 100644
--- a/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml
+++ b/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml
@@ -33,7 +33,7 @@
  030000
  040000
  000002
- 010000
+ 010000 010010
  000001
  050000
  050001
@@ -42,7 +42,7 @@
  070001
  070002
  000001
- 010002
+ 010011 010002
  080001
  080000
  200000
@@ -50,43 +50,51 @@
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
 
+	<testCase id="100000">
+		<class>Custom_Command</class>
+		<desc>Disable Sleep States (obelix)</desc>
+		<node>obelix</node>
+		<command>sudo cpupower idle-set -D 0</command>
+	</testCase>
+	<testCase id="200000">
+		<class>Custom_Command</class>
+		<desc>Enable Sleep States (obelix)</desc>
+		<node>obelix</node>
+		<command>sudo cpupower idle-set -E</command>
+	</testCase>
+	<testCase id="700000">
+		<class>Custom_Command</class>
+		<desc>Disable Sleep States (asterix)</desc>
+		<node>asterix</node>
+		<command>sudo cpupower idle-set -D 0</command>
+	</testCase>
+	<testCase id="800000">
+		<class>Custom_Command</class>
+		<desc>Enable Sleep States (asterix)</desc>
+		<node>asterix</node>
+		<command>sudo cpupower idle-set -E</command>
+	</testCase>
+
 	<testCase id="010000">
 		<class>Initialize_UE</class>
 		<desc>Initialize Quectel</desc>
 		<id>nrmodule2_quectel</id>
-		<UE_Trace>yes</UE_Trace>
 	</testCase>
-        <testCase id="100000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower - obelix</desc>
-            <node>obelix</node>
-            <command>sudo cpupower idle-set -D 0</command>
-        </testCase>
-        <testCase id="200000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower - obelix</desc>
-            <node>obelix</node>
-            <command>sudo cpupower idle-set -E</command>
-        </testCase>
-        <testCase id="700000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower - asterix</desc>
-            <node>asterix</node>
-            <command>sudo cpupower idle-set -D 0</command>
-        </testCase>
-        <testCase id="800000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower - asterix</desc>
-            <node>asterix</node>
-            <command>sudo cpupower idle-set -E</command>
-        </testCase>
-
-
 	<testCase id="010002">
 		<class>Terminate_UE</class>
 		<desc>Terminate Quectel</desc>
 		<id>nrmodule2_quectel</id>
 	</testCase>
+	<testCase id="010010">
+		<class>Attach_UE</class>
+		<desc>Attach Quectel</desc>
+		<id>nrmodule2_quectel</id>
+	</testCase>
+	<testCase id="010011">
+		<class>Detach_UE</class>
+		<desc>Detach Quectel</desc>
+		<id>nrmodule2_quectel</id>
+	</testCase>
 
 
 	<testCase id="030000">
diff --git a/ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml b/ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml
index d88eebaf919..d1515898ff9 100644
--- a/ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml
+++ b/ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml
@@ -60,53 +60,47 @@
 		<class>Initialize_UE</class>
 		<desc>Initialize Quectel</desc>
 		<id>nrmodule2_quectel</id>
-		<UE_Trace>yes</UE_Trace>
 	</testCase>
-
-
 	<testCase id="010002">
 		<class>Terminate_UE</class>
 		<desc>Terminate Quectel</desc>
 		<id>nrmodule2_quectel</id>
 	</testCase>
-
 	<testCase id="010003">
 		<class>Attach_UE</class>
 		<desc>Attach Quectel</desc>
 		<id>nrmodule2_quectel</id>
 	</testCase>
-
 	<testCase id="010004">
 		<class>Detach_UE</class>
 		<desc>Detach Quectel</desc>
 		<id>nrmodule2_quectel</id>
 	</testCase>	
 
-        <testCase id="100000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower - asterix</desc>
-            <node>asterix</node>
-            <command>sudo cpupower idle-set -D 0</command>
-        </testCase>
-        <testCase id="200000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower - asterix</desc>
-	    <node>asterix</node>
-            <command>sudo cpupower idle-set -E</command>
-        </testCase>
-        <testCase id="300000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower - obelix</desc>
-            <node>obelix</node>
-            <command>sudo cpupower idle-set -D 0</command>
-        </testCase>
-        <testCase id="400000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower - obelix</desc>
-	    <node>obelix</node>
-            <command>sudo cpupower idle-set -E</command>
-        </testCase>
-
+  <testCase id="100000">
+    <class>Custom_Command</class>
+    <desc>Disable Sleep States (asterix)</desc>
+    <node>asterix</node>
+    <command>sudo cpupower idle-set -D 0</command>
+  </testCase>
+  <testCase id="200000">
+    <class>Custom_Command</class>
+    <desc>Enable Sleep States (asterix)</desc>
+    <node>asterix</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+  <testCase id="300000">
+    <class>Custom_Command</class>
+    <desc>Disable Sleep States (obelix)</desc>
+    <node>obelix</node>
+    <command>sudo cpupower idle-set -D 0</command>
+  </testCase>
+  <testCase id="400000">
+    <class>Custom_Command</class>
+    <desc>Enable Sleep States (obelix)</desc>
+    <node>obelix</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
 
 	<testCase id="031000">
 		<class>Initialize_eNB</class>
diff --git a/ci-scripts/xml_files/fr1_nsa_quectel.xml b/ci-scripts/xml_files/fr1_nsa_quectel.xml
index 1087d8e6b56..962b3eef7ed 100644
--- a/ci-scripts/xml_files/fr1_nsa_quectel.xml
+++ b/ci-scripts/xml_files/fr1_nsa_quectel.xml
@@ -33,7 +33,8 @@
  030000
  040000
  000002
- 010000
+ 010000 
+ 010010
  000001
  050000
  050001
@@ -43,6 +44,7 @@
  000001
  050000
  050001
+ 010011
  010002
  080001
  080000
@@ -51,12 +53,6 @@
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
 
-	<testCase id="010000">
-		<class>Initialize_UE</class>
-		<desc>Initialize Quectel</desc>
-		<id>idefix</id>
-		<UE_Trace>yes</UE_Trace>
-	</testCase>
 	<testCase id="100000">
 		<class>Custom_Command</class>
 		<desc>To reset USRP</desc>
@@ -64,35 +60,51 @@
 		<command>sudo -S b2xx_fx3_utils --reset-device</command>
 	</testCase>
 
+	<testCase id="200000">
+		<class>Custom_Command</class>
+		<desc>Disable Sleep States (obelix)</desc>
+		<node>obelix</node>
+		<command>sudo cpupower idle-set -D 0</command>
+	</testCase>
+	<testCase id="300000">
+		<class>Custom_Command</class>
+		<desc>Enable Sleep States (obelix)</desc>
+		<node>obelix</node>
+		<command>sudo cpupower idle-set -E</command>
+	</testCase>
+	<testCase id="400000">
+		<class>Custom_Command</class>
+		<desc>Disable Sleep States (nepes)</desc>
+		<node>nepes</node>
+		<command>sudo cpupower idle-set -D 0</command>
+	</testCase>
+	<testCase id="500000">
+		<class>Custom_Command</class>
+		<desc>Enable Sleep States (nepes)</desc>
+		<node>nepes</node>
+		<command>sudo cpupower idle-set -E</command>
+	</testCase>
+
+	<testCase id="010000">
+		<class>Initialize_UE</class>
+		<desc>Initialize Quectel</desc>
+		<id>idefix</id>
+	</testCase>
 	<testCase id="010002">
 		<class>Terminate_UE</class>
 		<desc>Terminate Quectel</desc>
 		<id>idefix</id>
 	</testCase>
-        <testCase id="200000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower - obelix</desc>
-            <node>obelix</node>
-            <command>sudo cpupower idle-set -D 0</command>
-        </testCase>
-        <testCase id="300000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower - obelix</desc>
-            <node>obelix</node>
-            <command>sudo cpupower idle-set -E</command>
-        </testCase>
-        <testCase id="400000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower - nepes</desc>
-            <node>nepes</node>
-            <command>sudo cpupower idle-set -D 0</command>
-        </testCase>
-        <testCase id="500000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower - nepes</desc>
-            <node>nepes</node>
-            <command>sudo cpupower idle-set -E</command>
-        </testCase>
+	<testCase id="010010">
+		<class>Attach_UE</class>
+		<desc>Attach Quectel</desc>
+		<id>idefix</id>
+	</testCase>
+	<testCase id="010011">
+		<class>Detach_UE</class>
+		<desc>Detach Quectel</desc>
+		<id>idefix</id>
+	</testCase>
 
 	<testCase id="030000">
 		<class>Initialize_eNB</class>
diff --git a/ci-scripts/xml_files/fr1_nsa_quectel_attach_detach.xml b/ci-scripts/xml_files/fr1_nsa_quectel_attach_detach.xml
index 68d2f94af92..593e2d326d7 100644
--- a/ci-scripts/xml_files/fr1_nsa_quectel_attach_detach.xml
+++ b/ci-scripts/xml_files/fr1_nsa_quectel_attach_detach.xml
@@ -55,29 +55,23 @@
 		<class>Initialize_UE</class>
 		<desc>Initialize Quectel</desc>
 		<id>idefix</id>
-		<UE_Trace>yes</UE_Trace>
 	</testCase>
-
-
 	<testCase id="010002">
 		<class>Terminate_UE</class>
 		<desc>Terminate Quectel</desc>
 		<id>idefix</id>
 	</testCase>
-
 	<testCase id="010003">
 		<class>Attach_UE</class>
 		<desc>Attach Quectel</desc>
 		<id>idefix</id>
 	</testCase>
-
 	<testCase id="010004">
 		<class>Detach_UE</class>
 		<desc>Detach Quectel</desc>
 		<id>idefix</id>
 	</testCase>	
 
-
 	<testCase id="030000">
 		<class>Initialize_eNB</class>
 		<desc>Initialize eNB</desc>
diff --git a/ci-scripts/xml_files/fr1_nsa_quectel_long.xml b/ci-scripts/xml_files/fr1_nsa_quectel_long.xml
index c3801068a93..89825cdbf21 100644
--- a/ci-scripts/xml_files/fr1_nsa_quectel_long.xml
+++ b/ci-scripts/xml_files/fr1_nsa_quectel_long.xml
@@ -29,7 +29,7 @@
  030000
  040000
  000002
- 010000
+ 010000 010010
  000001
  050000
  050001
@@ -38,6 +38,7 @@
  000001
  070001
  000001
+ 010011
  010002
  080001
  080000
@@ -56,6 +57,16 @@
 		<desc>Terminate Quectel</desc>
 		<id>idefix</id>
 	</testCase>
+  <testCase id="010010">
+		<class>Attach_UE</class>
+		<desc>Attach Quectel</desc>
+		<id>idefix</id>
+	</testCase>
+  <testCase id="010011">
+		<class>Detach_UE</class>
+		<desc>Detach Quectel</desc>
+		<id>idefix</id>
+	</testCase>
 
 
 	<testCase id="030000">
diff --git a/ci-scripts/xml_files/fr1_sa_amarisoft_ue_1x.xml b/ci-scripts/xml_files/fr1_sa_amarisoft_ue_1x.xml
index 96363dd4c8f..c34fa34cf19 100644
--- a/ci-scripts/xml_files/fr1_sa_amarisoft_ue_1x.xml
+++ b/ci-scripts/xml_files/fr1_sa_amarisoft_ue_1x.xml
@@ -27,34 +27,62 @@
 	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
  100000
- 040000
- 000001
  010000
- 000002
+ 040000
+ 010001
+ 010002
  050000
+ 010100
+ 010200
+ 011111
  080000
  200000
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
 
+	<testCase id="100000">
+		<class>Custom_Command</class>
+		<desc>Disable Sleep States</desc>
+		<node>asterix</node>
+		<command>sudo cpupower idle-set -D 0</command>
+	</testCase>
+	<testCase id="200000">
+		<class>Custom_Command</class>
+		<desc>Enable Sleep States</desc>
+		<node>asterix</node>
+		<command>sudo cpupower idle-set -E</command>
+	</testCase>
+
 	<testCase id="010000">
 		<class>Initialize_UE</class>
-		<desc>Run AS UE Scenario</desc>
+		<desc>Initialize AS-UE Scenario</desc>
+		<id>amarisoft_ue</id>
+	</testCase>
+	<testCase id="010001">
+		<class>Attach_UE</class>
+		<desc>Attach UE</desc>
 		<id>amarisoft_ue_1</id>
 	</testCase>
-        <testCase id="100000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
-            <node>asterix</node>
-            <command>sudo cpupower idle-set -D 0</command>
-        </testCase>
-        <testCase id="200000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
-            <node>asterix</node>
-            <command>sudo cpupower idle-set -E</command>
-        </testCase>
-
+	<testCase id="010002">
+		<class>Attach_UE</class>
+		<desc>Attach UE</desc>
+		<id>amarisoft_ue_2</id>
+	</testCase>
+	<testCase id="010100">
+		<class>Detach_UE</class>
+		<desc>Detach UE</desc>
+		<id>amarisoft_ue_1</id>
+	</testCase>
+	<testCase id="010200">
+		<class>Detach_UE</class>
+		<desc>Detach UE</desc>
+		<id>amarisoft_ue_2</id>
+	</testCase>
+	<testCase id="011111">
+		<class>Terminate_UE</class>
+		<desc>Terminate UE</desc>
+		<id>amarisoft_ue</id>
+	</testCase>
 
 	<testCase id="040000">
 		<class>Initialize_eNB</class>
@@ -73,20 +101,14 @@
 	<testCase id="050000">
 		<class>Ping</class>
 		<desc>Ping Log Analysis</desc>
-		<id>amarisoft_ue_1</id>
+		<id>amarisoft_ue_1 amarisoft_ue_2</id>
 		<ping_packetloss_threshold>1</ping_packetloss_threshold>
 	</testCase>
 
 	<testCase id="000001">
 		<class>IdleSleep</class>
 		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>60</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="000002">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>20</idle_sleep_time_in_sec>
+		<idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
 	</testCase>
 
 
diff --git a/ci-scripts/xml_files/fr1_sa_oaiue_b200.xml b/ci-scripts/xml_files/fr1_sa_oaiue_b200.xml
index 5995f75a644..0a8fd1bfa0c 100644
--- a/ci-scripts/xml_files/fr1_sa_oaiue_b200.xml
+++ b/ci-scripts/xml_files/fr1_sa_oaiue_b200.xml
@@ -86,6 +86,7 @@
 	<testCase id="050001">
 		<class>Ping</class>
 		<desc>Ping from CN to UE: 100pings in 20sec</desc>
+		<id>oai_ue_obelix</id>
 		<ping_args>-c 100 -i 0.2</ping_args>
 		<ping_packetloss_threshold>5</ping_packetloss_threshold>
 	</testCase>
@@ -95,7 +96,7 @@
 		<desc>iperf (DL/60Mbps/UDP)(60 sec)(single-ue profile)</desc>
 		<iperf_args>-u -b 60M -t 60</iperf_args>
 		<direction>DL</direction>
-		<id>nrmodule2_quectel</id>
+		<id>oai_ue_obelix</id>
 		<iperf_packetloss_threshold>5</iperf_packetloss_threshold>
 		<iperf_profile>single-ue</iperf_profile>
 	</testCase>
@@ -105,7 +106,7 @@
 		<desc>iperf (UL/3Mbps/UDP)(60 sec)(single-ue profile)</desc>
 		<iperf_args>-u -b 3M -t 60</iperf_args>
 		<direction>UL</direction>
-		<id>nrmodule2_quectel</id>
+		<id>oai_ue_obelix</id>
 		<iperf_packetloss_threshold>5</iperf_packetloss_threshold>
 		<iperf_profile>single-ue</iperf_profile>
 	</testCase>
diff --git a/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml b/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml
index c041d5976a6..1e7311d4d0f 100644
--- a/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml
+++ b/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml
@@ -51,18 +51,19 @@
 		<class>Terminate_OAI_UE</class>
 		<desc>Terminate OAI UE</desc>
 	</testCase>
-        <testCase id="100000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
-            <node>asterix</node>
-            <command>sudo cpupower idle-set -D 0</command>
-        </testCase>
-        <testCase id="200000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
-            <node>asterix</node>
-            <command>sudo cpupower idle-set -E</command>
-        </testCase>
+
+	<testCase id="100000">
+		<class>Custom_Command</class>
+		<desc>Disable Sleep States</desc>
+		<node>asterix</node>
+		<command>sudo cpupower idle-set -D 0</command>
+	</testCase>
+	<testCase id="200000">
+		<class>Custom_Command</class>
+		<desc>Enable Sleep States</desc>
+		<node>asterix</node>
+		<command>sudo cpupower idle-set -E</command>
+	</testCase>
 
 	<testCase id="040000">
 		<class>Initialize_eNB</class>
@@ -93,6 +94,7 @@
 	<testCase id="050000">
 		<class>Ping</class>
 		<desc>Ping from CN to UE: 20pings in 20sec</desc>
+		<id>oai_ue_obelix</id>
 		<ping_args>-c 20</ping_args>
 		<ping_packetloss_threshold>5</ping_packetloss_threshold>
 	</testCase>
@@ -100,6 +102,7 @@
 	<testCase id="050001">
 		<class>Ping</class>
 		<desc>Ping from CN to UE: 100pings in 20sec</desc>
+		<id>oai_ue_obelix</id>
 		<ping_args>-c 100 -i 0.2</ping_args>
 		<ping_packetloss_threshold>5</ping_packetloss_threshold>
 	</testCase>
@@ -107,9 +110,9 @@
 	<testCase id="070000">
 		<class>Iperf</class>
 		<desc>iperf (DL/60Mbps/UDP)(60 sec)(single-ue profile)</desc>
+		<id>oai_ue_obelix</id>
 		<iperf_args>-u -b 60M -t 60</iperf_args>
 		<direction>DL</direction>
-		<id>nrmodule2_quectel</id>
 		<iperf_packetloss_threshold>5</iperf_packetloss_threshold>
 		<iperf_profile>single-ue</iperf_profile>
 	</testCase>
@@ -117,9 +120,9 @@
 	<testCase id="070001">
 		<class>Iperf</class>
 		<desc>iperf (UL/3Mbps/UDP)(60 sec)(single-ue profile)</desc>
+		<id>oai_ue_obelix</id>
 		<iperf_args>-u -b 3M -t 60</iperf_args>
 		<direction>UL</direction>
-		<id>nrmodule2_quectel</id>
 		<iperf_packetloss_threshold>5</iperf_packetloss_threshold>
 		<iperf_profile>single-ue</iperf_profile>
 	</testCase>
diff --git a/ci-scripts/xml_files/fr1_sa_oaiue_x300.xml b/ci-scripts/xml_files/fr1_sa_oaiue_x300.xml
index ef001a7518f..e3c7a048068 100644
--- a/ci-scripts/xml_files/fr1_sa_oaiue_x300.xml
+++ b/ci-scripts/xml_files/fr1_sa_oaiue_x300.xml
@@ -79,6 +79,7 @@
 	<testCase id="051000">
 		<class>Ping</class>
 		<desc>Ping from CN to UE: 20pings in 20sec</desc>
+		<id>oai_ue_obelix</id>
 		<ping_args>-c 20</ping_args>
 		<ping_packetloss_threshold>5</ping_packetloss_threshold>
 	</testCase>
@@ -86,6 +87,7 @@
 	<testCase id="051001">
 		<class>Ping</class>
 		<desc>Ping from CN to UE: 100pings in 20sec</desc>
+		<id>oai_ue_obelix</id>
 		<ping_args>-c 100 -i 0.2</ping_args>
 		<ping_packetloss_threshold>5</ping_packetloss_threshold>
 	</testCase>
@@ -93,9 +95,9 @@
 	<testCase id="070000">
 		<class>Iperf</class>
 		<desc>iperf (DL/60Mbps/UDP)(60 sec)(single-ue profile)</desc>
+		<id>oai_ue_obelix</id>
 		<iperf_args>-u -b 60M -t 60</iperf_args>
 		<direction>DL</direction>
-		<id>nrmodule2_quectel</id>
 		<iperf_packetloss_threshold>5</iperf_packetloss_threshold>
 		<iperf_profile>single-ue</iperf_profile>
 	</testCase>
@@ -103,9 +105,9 @@
 	<testCase id="070001">
 		<class>Iperf</class>
 		<desc>iperf (UL/3Mbps/UDP)(60 sec)(single-ue profile)</desc>
+		<id>oai_ue_obelix</id>
 		<iperf_args>-u -b 3M -t 60</iperf_args>
 		<direction>UL</direction>
-		<id>nrmodule2_quectel</id>
 		<iperf_packetloss_threshold>5</iperf_packetloss_threshold>
 		<iperf_profile>single-ue</iperf_profile>
 	</testCase>
diff --git a/ci-scripts/xml_files/fr1_sa_quectel.xml b/ci-scripts/xml_files/fr1_sa_quectel.xml
index 12d8c762e28..7d1dda270aa 100644
--- a/ci-scripts/xml_files/fr1_sa_quectel.xml
+++ b/ci-scripts/xml_files/fr1_sa_quectel.xml
@@ -27,59 +27,61 @@
 	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
  100000
- 010002
  300000
- 040000
- 000002
  010000
- 000001
+ 040000
+ 010010
  050000
- 000001
  050001
- 000001
  070000
- 000001
  070001
- 000001
  070002
- 000001
- 010002
+ 010001
  080000
+ 020000
  200000
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
 
+	<testCase id="100000">
+		<class>Custom_Command</class>
+		<desc>Disable Sleep States</desc>
+		<node>asterix</node>
+		<command>sudo cpupower idle-set -D 0</command>
+	</testCase>
+	<testCase id="200000">
+		<class>Custom_Command</class>
+		<desc>Enable Sleep States</desc>
+		<node>asterix</node>
+		<command>sudo cpupower idle-set -E</command>
+	</testCase>
+	<testCase id="300000">
+		<class>Custom_Command</class>
+		<desc>Reboot USRP</desc>
+		<node>asterix</node>
+		<command>ssh root@172.21.19.14 reboot ; sleep 45</command>
+	</testCase>
+
 	<testCase id="010000">
 		<class>Initialize_UE</class>
 		<desc>Initialize Quectel</desc>
 		<id>nrmodule2_quectel</id>
-		<UE_Trace>yes</UE_Trace>
 	</testCase>
-
-
-	<testCase id="010002">
+	<testCase id="010010">
+		<class>Attach_UE</class>
+		<desc>Attach Quectel UE</desc>
+		<id>nrmodule2_quectel</id>
+	</testCase>
+	<testCase id="010001">
+		<class>Detach_UE</class>
+		<desc>Detach Quectel UE</desc>
+		<id>nrmodule2_quectel</id>
+	</testCase>
+	<testCase id="020000">
 		<class>Terminate_UE</class>
 		<desc>Terminate Quectel</desc>
 		<id>nrmodule2_quectel</id>
 	</testCase>
-        <testCase id="100000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
-            <node>asterix</node>
-            <command>sudo cpupower idle-set -D 0</command>
-       </testCase>
-       <testCase id="200000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
-            <node>asterix</node>
-            <command>sudo cpupower idle-set -E</command>
-       </testCase>
-       <testCase id="300000">
-            <class>Custom_Command</class>
-            <desc>To reboot USRP</desc>
-            <node>asterix</node>
-            <command>ssh root@172.21.19.14 reboot ; sleep 45</command>
-       </testCase>
 
 	<testCase id="040000">
 		<class>Initialize_eNB</class>
diff --git a/ci-scripts/xml_files/fr1_sa_quectel_162prb.xml b/ci-scripts/xml_files/fr1_sa_quectel_162prb.xml
index d9aaf57cac8..0f990db8c6d 100644
--- a/ci-scripts/xml_files/fr1_sa_quectel_162prb.xml
+++ b/ci-scripts/xml_files/fr1_sa_quectel_162prb.xml
@@ -27,11 +27,9 @@
 	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
  100000
- 010002
- 042000
- 000002
  010000
- 000001
+ 042000
+ 010001
  052000
  000001
  072000
@@ -40,6 +38,7 @@
  000001
  072002
  000001
+ 010011
  010002
  080000
  200000
@@ -50,10 +49,17 @@
 		<class>Initialize_UE</class>
 		<desc>Initialize Quectel</desc>
 		<id>nrmodule2_quectel</id>
-		<UE_Trace>yes</UE_Trace>
 	</testCase>
-
-
+	<testCase id="010001">
+		<class>Attach_UE</class>
+		<desc>Attach Quectel UE</desc>
+		<id>nrmodule2_quectel</id>
+	</testCase>
+	<testCase id="010011">
+		<class>Detach_UE</class>
+		<desc>Detach Quectel UE</desc>
+		<id>nrmodule2_quectel</id>
+	</testCase>
 	<testCase id="010002">
 		<class>Terminate_UE</class>
 		<desc>Terminate Quectel</desc>
@@ -74,18 +80,20 @@
 		<USRP_IPAddress>172.21.19.14</USRP_IPAddress>
 		<cmd_prefix>numactl --cpunodebind=netdev:ens2f0np0 --membind=netdev:ens2f0np0</cmd_prefix>
 	</testCase>
-        <testCase id="100000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
-            <node>asterix</node>
-            <command>sudo cpupower idle-set -D 0</command>
-        </testCase>
-        <testCase id="200000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
-            <node>asterix</node>
-            <command>sudo cpupower idle-set -E</command>
-        </testCase>
+
+	<testCase id="100000">
+		<class>Custom_Command</class>
+		<desc>Disable Sleep States</desc>
+		<node>asterix</node>
+		<command>sudo cpupower idle-set -D 0</command>
+	</testCase>
+	<testCase id="200000">
+		<class>Custom_Command</class>
+		<desc>Enable Sleep States</desc>
+		<node>asterix</node>
+		<command>sudo cpupower idle-set -E</command>
+	</testCase>
+
 	<testCase id="000001">
 		<class>IdleSleep</class>
 		<desc>Sleep</desc>
diff --git a/ci-scripts/xml_files/fr1_sa_quectel_stages.xml b/ci-scripts/xml_files/fr1_sa_quectel_stages.xml
index 7c86dc0859d..15cefab747c 100644
--- a/ci-scripts/xml_files/fr1_sa_quectel_stages.xml
+++ b/ci-scripts/xml_files/fr1_sa_quectel_stages.xml
@@ -31,6 +31,7 @@
  041000
  000002
  011000
+ 011001
  000001
  051000
  000001
@@ -46,37 +47,47 @@
  000001
  071005
  000001
+ 011011
  011002
  081000
  200000
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
 
+	<testCase id="100000">
+		<class>Custom_Command</class>
+		<desc>Disable Sleep States</desc>
+		<node>asterix</node>
+		<command>sudo cpupower idle-set -D 0</command>
+	</testCase>
+	<testCase id="200000">
+		<class>Custom_Command</class>
+		<desc>Enable Sleep States</desc>
+		<node>asterix</node>
+		<command>sudo cpupower idle-set -E</command>
+	</testCase>
+
 	<testCase id="011000">
 		<class>Initialize_UE</class>
 		<desc>Initialize Quectel</desc>
 		<id>nrmodule2_quectel</id>
-		<UE_Trace>yes</UE_Trace>
-	</testCase>
-       <testCase id="100000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
-            <node>asterix</node>
-            <command>sudo cpupower idle-set -D 0</command>
-       </testCase>
-       <testCase id="200000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
-            <node>asterix</node>
-            <command>sudo cpupower idle-set -E</command>
-       </testCase>
+	</testCase>
+	<testCase id="011001">
+		<class>Attach_UE</class>
+		<desc>Attach Quectel UE</desc>
+		<id>nrmodule2_quectel</id>
+	</testCase>
+	<testCase id="011011">
+		<class>Detach_UE</class>
+		<desc>Detach Quectel UE </desc>
+		<id>nrmodule2_quectel</id>
+	</testCase>
 	<testCase id="011002">
 		<class>Terminate_UE</class>
 		<desc>Terminate Quectel</desc>
 		<id>nrmodule2_quectel</id>
 	</testCase>
 
-
 	<testCase id="041000">
 		<class>Initialize_eNB</class>
 		<desc>Initialize gNB</desc>
diff --git a/ci-scripts/xml_files/gnb_phytest_usrp_run.xml b/ci-scripts/xml_files/gnb_phytest_usrp_run.xml
index ac0510152d6..382efbdd9e1 100644
--- a/ci-scripts/xml_files/gnb_phytest_usrp_run.xml
+++ b/ci-scripts/xml_files/gnb_phytest_usrp_run.xml
@@ -31,13 +31,13 @@
 	<TestCaseExclusionList></TestCaseExclusionList>
         <testCase id = "100000">
 		<class>Custom_Command</class>
-		<desc>To reset cpupower</desc>
+		<desc>Disable Sleep States</desc>
 		<node>caracal</node>
 		<command>sudo cpupower idle-set -D 0</command>
 	</testCase>
 	 <testCase id = "200000">
 		<class>Custom_Command</class>
-		<desc>To reset cpupower</desc>
+		<desc>Enable Sleep States</desc>
 		<node>caracal</node>
 		<command>sudo cpupower idle-set -E</command>
 	</testCase>
diff --git a/ci-scripts/xml_files/gnb_phytest_usrp_run_60.xml b/ci-scripts/xml_files/gnb_phytest_usrp_run_60.xml
index bd43cc9ab68..24b0854224d 100644
--- a/ci-scripts/xml_files/gnb_phytest_usrp_run_60.xml
+++ b/ci-scripts/xml_files/gnb_phytest_usrp_run_60.xml
@@ -31,13 +31,13 @@
   <TestCaseExclusionList></TestCaseExclusionList>
   <testCase id = "100000">
 	  <class>Custom_Command</class>
-	  <desc>To reset cpupower</desc>
+	  <desc>Disable Sleep States</desc>
 	  <node>caracal</node>
 	  <command>sudo cpupower idle-set -D 0</command>
   </testCase>
   <testCase id = "200000">
 	  <class>Custom_Command</class>
-	  <desc>To reset cpupower</desc>
+	  <desc>Enable Sleep States</desc>
 	  <node>caracal</node>
 	  <command>sudo cpupower idle-set -E</command>
   </testCase>
diff --git a/ci-scripts/xml_files/gnb_phytest_usrp_run_60_2x2.xml b/ci-scripts/xml_files/gnb_phytest_usrp_run_60_2x2.xml
index 0190b5ddd69..29d284886ce 100644
--- a/ci-scripts/xml_files/gnb_phytest_usrp_run_60_2x2.xml
+++ b/ci-scripts/xml_files/gnb_phytest_usrp_run_60_2x2.xml
@@ -26,18 +26,18 @@
   <htmlTabIcon>tasks</htmlTabIcon>
   <repeatCount>1</repeatCount>
   <TestCaseRequestedList>
-290101 000001 290109
+100000 290101 000001 290109 200000
   </TestCaseRequestedList>
   <TestCaseExclusionList></TestCaseExclusionList>
   <testCase id="100000">
 	  <class>Custom_Command</class>
-	  <desc>To reset cpupower</desc>
+	  <desc>Disable Sleep States</desc>
 	  <node>caracal</node>
 	  <command>sudo cpupower idle-set -D 0</command>
   </testCase>
   <testCase id="200000">
 	  <class>Custom_Command</class>
-	  <desc>To reset cpupower</desc>
+	  <desc>Enable Sleep States</desc>
 	  <node>caracal</node>
 	  <command>sudo cpupower idle-set -E</command>
   </testCase>
diff --git a/ci-scripts/xml_files/lte_2x2_tm1_quectel.xml b/ci-scripts/xml_files/lte_2x2_tm1_quectel.xml
index a131ddd1946..42705108423 100644
--- a/ci-scripts/xml_files/lte_2x2_tm1_quectel.xml
+++ b/ci-scripts/xml_files/lte_2x2_tm1_quectel.xml
@@ -27,48 +27,53 @@
 	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
  100000
- 010002
+ 010000 
  030000
- 000002
- 010000
- 000001
+ 010001
  050000
  050001
- 000002
  070000
  070001
- 000001
+ 010011
  010002
  080000
  200000
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
-        <testCase id="100000">
+
+	<testCase id="100000">
 		<class>Custom_Command</class>
-		<desc>To reset cpupower</desc>
+		<desc>Disable Sleep States</desc>
 		<node>obelix</node>
 		<command>sudo cpupower idle-set -D 0</command>
 	</testCase>
-        <testCase id="200000">
+	<testCase id="200000">
 		<class>Custom_Command</class>
-		<desc>To reset cpupower</desc>
+		<desc>Enable Sleep States</desc>
 		<node>obelix</node>
 		<command>sudo cpupower idle-set -E</command>
-        </testCase>
+	</testCase>
+
 	<testCase id="010000">
 		<class>Initialize_UE</class>
 		<desc>Initialize Quectel</desc>
 		<id>nrmodule2_quectel</id>
-		<UE_Trace>yes</UE_Trace>
 	</testCase>
-
-
 	<testCase id="010002">
 		<class>Terminate_UE</class>
 		<desc>Terminate Quectel</desc>
 		<id>nrmodule2_quectel</id>
 	</testCase>
-
+	<testCase id="010001">
+		<class>Attach_UE</class>
+		<desc>Attach Quectel</desc>
+		<id>nrmodule2_quectel</id>
+	</testCase>
+	<testCase id="010011">
+		<class>Detach_UE</class>
+		<desc>Detach Quectel</desc>
+		<id>nrmodule2_quectel</id>
+	</testCase>
 
 	<testCase id="030000">
 		<class>Initialize_eNB</class>
diff --git a/ci-scripts/xml_files/lte_2x2_tm2_quectel.xml b/ci-scripts/xml_files/lte_2x2_tm2_quectel.xml
index f5e8d8454f1..d02749700df 100644
--- a/ci-scripts/xml_files/lte_2x2_tm2_quectel.xml
+++ b/ci-scripts/xml_files/lte_2x2_tm2_quectel.xml
@@ -27,49 +27,53 @@
 	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
  100000
- 010002
+ 010000 
  030001
- 000002
- 010000
- 000001
+ 010001
  050002
  050003
- 000002
  070002
  070003
- 000001
+ 010011
  010002
  080000
  200000
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
 
-	<testCase id="010000">
-		<class>Initialize_UE</class>
-		<desc>Initialize Quectel</desc>
-		<id>nrmodule2_quectel</id>
-		<UE_Trace>yes</UE_Trace>
-	</testCase>
-
-        <testCase id="100000">
+	<testCase id="100000">
 		<class>Custom_Command</class>
-		<desc>To reset cpupower</desc>
+		<desc>Disable Sleep States</desc>
 		<node>obelix</node>
 		<command>sudo cpupower idle-set -D 0</command>
 	</testCase>
-        <testCase id="200000">
+	<testCase id="200000">
 		<class>Custom_Command</class>
-		<desc>To reset cpupower</desc>
+		<desc>Enable Sleep States</desc>
 		<node>obelix</node>
 		<command>sudo cpupower idle-set -E</command>
-        </testCase>
+	</testCase>
 
+	<testCase id="010000">
+		<class>Initialize_UE</class>
+		<desc>Initialize Quectel</desc>
+		<id>nrmodule2_quectel</id>
+	</testCase>
 	<testCase id="010002">
 		<class>Terminate_UE</class>
 		<desc>Terminate Quectel</desc>
 		<id>nrmodule2_quectel</id>
 	</testCase>
-
+	<testCase id="010001">
+		<class>Attach_UE</class>
+		<desc>Attach Quectel</desc>
+		<id>nrmodule2_quectel</id>
+	</testCase>
+	<testCase id="010011">
+		<class>Detach_UE</class>
+		<desc>Detach Quectel</desc>
+		<id>nrmodule2_quectel</id>
+	</testCase>
 
 	<testCase id="030001">
 		<class>Initialize_eNB</class>
-- 
GitLab