diff --git a/ci-scripts/xml_files/if4p5_usrp210_band7.xml b/ci-scripts/xml_files/if4p5_usrp210_band7.xml
deleted file mode 100644
index a582754229..0000000000
--- a/ci-scripts/xml_files/if4p5_usrp210_band7.xml
+++ /dev/null
@@ -1,214 +0,0 @@
-
-
-
- 010101
- 050101 060101 070101 040101
- 030101 030102 040301 040501 040604 040642 040401 040201 030201 030202
- 030111 030112 040301 040511 040614 040652 040401 040201 030201 030202
- 030121 030122 040301 040521 040624 040662 040401 040201 030201 030202
- 050201 060201 070201
-
-
-
-
-
- Build_eNB
- Build eNB (USRP -- Ethernet Fronthaul)
- -t ETHERNET -w USRP -c --eNB
-
-
-
- Initialize_eNB
- Initialize RRU (FDD/Band7)
- -O ci-scripts/conf_files/rru.fdd.band7.conf
- 1
-
-
-
- Initialize_eNB
- Initialize RCC (FDD/Band7/5MHz)
- -O ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.25PRB.usrpb210.conf
- 0
-
-
-
- Initialize_eNB
- Initialize RRU (FDD/Band7)
- -O ci-scripts/conf_files/rru.fdd.band7.conf
- 1
-
-
-
- Initialize_eNB
- Initialize RCC (FDD/Band7/10MHz)
- -O ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.50PRB.usrpb210.conf
- 0
-
-
-
- Initialize_eNB
- Initialize RRU (FDD/Band7)
- -O ci-scripts/conf_files/rru.fdd.band7.conf
- 1
-
-
-
- Initialize_eNB
- Initialize RCC (FDD/Band7/20MHz)
- -O ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.100PRB.usrpb210.conf
- 0
-
-
-
- Terminate_eNB
- Terminate RCC
- 0
-
-
-
- Terminate_eNB
- Terminate RRU
- 1
-
-
-
- Initialize_UE
- Initialize UE
-
-
-
- Terminate_UE
- Terminate UE
-
-
-
- Attach_UE
- Attach UE
-
-
-
- Detach_UE
- Detach UE
-
-
-
- Ping
- ping (5MHz - 20 sec)
- -c 20
- 5
-
-
-
- Iperf
- iperf (5MHz - DL/15Mbps/UDP)(30 sec)(single-ue profile)
- -u -b 15M -t 30 -i 1
- 50
- single-ue
-
-
-
- Iperf
- iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)
- -u -b 9M -t 30 -i 1 -R
- 50
- single-ue
-
-
-
- Ping
- ping (10MHz - 20 sec)
- -c 20
- 5
-
-
-
- Iperf
- iperf (10MHz - DL/32Mbps/UDP)(30 sec)(single-ue profile)
- -u -b 32M -t 30 -i 1
- 50
- single-ue
-
-
-
- Iperf
- iperf (10MHz - UL/20Mbps/UDP)(30 sec)(single-ue profile)
- -u -b 20M -t 30 -i 1 -R
- 50
- single-ue
-
-
-
- Ping
- ping (20MHz - 20 sec)
- -c 20
- 5
-
-
-
- Iperf
- iperf (20MHz - DL/70Mbps/UDP)(30 sec)(single-ue profile)
- -u -b 70M -t 30 -i 1
- 50
- single-ue
-
-
-
- Iperf
- iperf (20MHz - UL/20Mbps/UDP)(30 sec)(single-ue profile)
- -u -b 20M -t 30 -i 1 -R
- 50
- single-ue
-
-
-
- Initialize_HSS
- Initialize HSS
-
-
-
- Initialize_MME
- Initialize MME
-
-
-
- Initialize_SPGW
- Initialize SPGW
-
-
-
- Terminate_HSS
- Terminate HSS
-
-
-
- Terminate_MME
- Terminate MME
-
-
-
- Terminate_SPGW
- Terminate SPGW
-
-
-
diff --git a/ci-scripts/xml_files/if4p5_usrp210_band7_build.xml b/ci-scripts/xml_files/if4p5_usrp210_band7_build.xml
new file mode 100644
index 0000000000..d4714b0de2
--- /dev/null
+++ b/ci-scripts/xml_files/if4p5_usrp210_band7_build.xml
@@ -0,0 +1,55 @@
+
+
+ build-tab
+ Build
+ wrench
+
+ 010101
+ 050101 060101 070101 040101
+
+
+
+
+
+ Build_eNB
+ Build eNB (USRP -- Ethernet Fronthaul)
+ -t ETHERNET -w USRP -c --eNB
+
+
+
+ Initialize_HSS
+ Initialize HSS
+
+
+
+ Initialize_MME
+ Initialize MME
+
+
+
+ Initialize_SPGW
+ Initialize SPGW
+
+
+
diff --git a/ci-scripts/xml_files/if4p5_usrp210_band7_epc_closure.xml b/ci-scripts/xml_files/if4p5_usrp210_band7_epc_closure.xml
new file mode 100644
index 0000000000..cde3581afa
--- /dev/null
+++ b/ci-scripts/xml_files/if4p5_usrp210_band7_epc_closure.xml
@@ -0,0 +1,48 @@
+
+
+ epc-closure
+ EPC-Closure
+ log-out
+
+ 050201 060201 070201
+
+
+
+
+
+ Terminate_HSS
+ Terminate HSS
+
+
+
+ Terminate_MME
+ Terminate MME
+
+
+
+ Terminate_SPGW
+ Terminate SPGW
+
+
+
diff --git a/ci-scripts/xml_files/if4p5_usrp210_band7_test_05mhz.xml b/ci-scripts/xml_files/if4p5_usrp210_band7_test_05mhz.xml
new file mode 100644
index 0000000000..fb6642dd0f
--- /dev/null
+++ b/ci-scripts/xml_files/if4p5_usrp210_band7_test_05mhz.xml
@@ -0,0 +1,102 @@
+
+
+ test-05
+ Test-05MHz
+ tasks
+
+ 030101 030102 040301 040501 040604 040642 040401 040201 030201 030202
+
+
+
+
+
+ Initialize_eNB
+ Initialize RRU (FDD/Band7)
+ -O ci-scripts/conf_files/rru.fdd.band7.conf
+ 1
+
+
+
+ Initialize_eNB
+ Initialize RCC (FDD/Band7/5MHz)
+ -O ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.25PRB.usrpb210.conf
+ 0
+
+
+
+ Terminate_eNB
+ Terminate RCC
+ 0
+
+
+
+ Terminate_eNB
+ Terminate RRU
+ 1
+
+
+
+ Initialize_UE
+ Initialize UE
+
+
+
+ Terminate_UE
+ Terminate UE
+
+
+
+ Attach_UE
+ Attach UE
+
+
+
+ Detach_UE
+ Detach UE
+
+
+
+ Ping
+ ping (5MHz - 20 sec)
+ -c 20
+ 5
+
+
+
+ Iperf
+ iperf (5MHz - DL/15Mbps/UDP)(30 sec)(single-ue profile)
+ -u -b 15M -t 30 -i 1
+ 50
+ single-ue
+
+
+
+ Iperf
+ iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)
+ -u -b 9M -t 30 -i 1 -R
+ 50
+ single-ue
+
+
+
diff --git a/ci-scripts/xml_files/if4p5_usrp210_band7_test_10mhz.xml b/ci-scripts/xml_files/if4p5_usrp210_band7_test_10mhz.xml
new file mode 100644
index 0000000000..e3cf3ae41a
--- /dev/null
+++ b/ci-scripts/xml_files/if4p5_usrp210_band7_test_10mhz.xml
@@ -0,0 +1,102 @@
+
+
+ test-10
+ Test-10MHz
+ tasks
+
+ 030111 030112 040301 040511 040614 040652 040401 040201 030201 030202
+
+
+
+
+
+ Initialize_eNB
+ Initialize RRU (FDD/Band7)
+ -O ci-scripts/conf_files/rru.fdd.band7.conf
+ 1
+
+
+
+ Initialize_eNB
+ Initialize RCC (FDD/Band7/10MHz)
+ -O ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.50PRB.usrpb210.conf
+ 0
+
+
+
+ Terminate_eNB
+ Terminate RCC
+ 0
+
+
+
+ Terminate_eNB
+ Terminate RRU
+ 1
+
+
+
+ Initialize_UE
+ Initialize UE
+
+
+
+ Terminate_UE
+ Terminate UE
+
+
+
+ Attach_UE
+ Attach UE
+
+
+
+ Detach_UE
+ Detach UE
+
+
+
+ Ping
+ ping (10MHz - 20 sec)
+ -c 20
+ 5
+
+
+
+ Iperf
+ iperf (10MHz - DL/32Mbps/UDP)(30 sec)(single-ue profile)
+ -u -b 32M -t 30 -i 1
+ 50
+ single-ue
+
+
+
+ Iperf
+ iperf (10MHz - UL/20Mbps/UDP)(30 sec)(single-ue profile)
+ -u -b 20M -t 30 -i 1 -R
+ 50
+ single-ue
+
+
+
diff --git a/ci-scripts/xml_files/if4p5_usrp210_band7_test_20mhz.xml b/ci-scripts/xml_files/if4p5_usrp210_band7_test_20mhz.xml
new file mode 100644
index 0000000000..8e54c90c44
--- /dev/null
+++ b/ci-scripts/xml_files/if4p5_usrp210_band7_test_20mhz.xml
@@ -0,0 +1,102 @@
+
+
+ test-20
+ Test-20MHz
+ tasks
+
+ 030121 030122 040301 040521 040624 040662 040401 040201 030201 030202
+
+
+
+
+
+ Initialize_eNB
+ Initialize RRU (FDD/Band7)
+ -O ci-scripts/conf_files/rru.fdd.band7.conf
+ 1
+
+
+
+ Initialize_eNB
+ Initialize RCC (FDD/Band7/20MHz)
+ -O ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.100PRB.usrpb210.conf
+ 0
+
+
+
+ Terminate_eNB
+ Terminate RCC
+ 0
+
+
+
+ Terminate_eNB
+ Terminate RRU
+ 1
+
+
+
+ Initialize_UE
+ Initialize UE
+
+
+
+ Terminate_UE
+ Terminate UE
+
+
+
+ Attach_UE
+ Attach UE
+
+
+
+ Detach_UE
+ Detach UE
+
+
+
+ Ping
+ ping (20MHz - 20 sec)
+ -c 20
+ 5
+
+
+
+ Iperf
+ iperf (20MHz - DL/70Mbps/UDP)(30 sec)(single-ue profile)
+ -u -b 70M -t 30 -i 1
+ 50
+ single-ue
+
+
+
+ Iperf
+ iperf (20MHz - UL/20Mbps/UDP)(30 sec)(single-ue profile)
+ -u -b 20M -t 30 -i 1 -R
+ 50
+ single-ue
+
+
+