diff --git a/conf/testing/dialplan/default/0002_leave_videomail.xml b/conf/testing/dialplan/default/0002_leave_videomail.xml
index 26d68daab8..bf482ea0fe 100644
--- a/conf/testing/dialplan/default/0002_leave_videomail.xml
+++ b/conf/testing/dialplan/default/0002_leave_videomail.xml
@@ -6,3 +6,11 @@
   </condition>
 </extension>
 
+<extension name="check_videomail">
+  <condition field="destination_number" expression="^6001$">
+    <action application="answer"/>
+    <action application="sleep" data="1000"/>
+    <action application="voicemail" data="check videomail ${domain_name} 1000"/>  
+  </condition>
+</extension>
+
diff --git a/conf/testing/dialplan/default/0003_check_videomail.xml b/conf/testing/dialplan/default/0003_check_videomail.xml
deleted file mode 100644
index a2dd2a9837..0000000000
--- a/conf/testing/dialplan/default/0003_check_videomail.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<extension name="check_videomail">
-  <condition field="destination_number" expression="^6001$">
-    <action application="answer"/>
-    <action application="sleep" data="1000"/>
-    <action application="voicemail" data="check videomail ${domain_name} 1000"/>  
-  </condition>
-</extension>
-
diff --git a/conf/testing/dialplan/default/0004_record_video.xml b/conf/testing/dialplan/default/0004_record_video.xml
index f0a8f68dbd..b0c164c4c2 100644
--- a/conf/testing/dialplan/default/0004_record_video.xml
+++ b/conf/testing/dialplan/default/0004_record_video.xml
@@ -1,8 +1,16 @@
 <extension name="record_video">
-  <condition field="destination_number" expression="^6002$">
+  <condition field="destination_number" expression="^6010$">
     <action application="answer"/>
     <action application="sleep" data="1000"/>
     <action application="record" data="/tmp/record_video.mp4"/>  
   </condition>
 </extension>
 
+<extension name="play_video">
+  <condition field="destination_number" expression="^6011$">
+    <action application="answer"/>
+    <action application="sleep" data="1000"/>
+    <action application="playback" data="/tmp/record_video.mp4"/>  
+  </condition>
+</extension>
+
diff --git a/conf/testing/dialplan/default/0005_play_video.xml b/conf/testing/dialplan/default/0005_play_video.xml
deleted file mode 100644
index bc12ec426e..0000000000
--- a/conf/testing/dialplan/default/0005_play_video.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<extension name="play_video">
-  <condition field="destination_number" expression="^6003$">
-    <action application="answer"/>
-    <action application="sleep" data="1000"/>
-    <action application="playback" data="/tmp/record_video.mp4"/>  
-  </condition>
-</extension>
-
diff --git a/conf/testing/dialplan/default/0008_eavesdrop.xml b/conf/testing/dialplan/default/0008_eavesdrop.xml
index b9760f01f7..014c150c6f 100644
--- a/conf/testing/dialplan/default/0008_eavesdrop.xml
+++ b/conf/testing/dialplan/default/0008_eavesdrop.xml
@@ -1,57 +1,35 @@
 <extension name="eavesdrop1">
-  <condition field="destination_number" expression="^6004$">
+  <condition field="destination_number" expression="^6020$">
     <action application="answer"/>
     <action application="eavesdrop" data="all"/>  
   </condition>
 </extension>
 
 <extension name="eavesdrop2">
-  <condition field="destination_number" expression="^6005$">
+  <condition field="destination_number" expression="^6021$">
     <action application="set" data="absolute_codec_string=PCMU"/> <!-- MONO -->
     <action application="answer"/>
     <action application="eavesdrop" data="all"/>  
   </condition>
 </extension>
 <extension name="eavesdrop3">
-  <condition field="destination_number" expression="^6006$">
+  <condition field="destination_number" expression="^6022$">
     <action application="set" data="absolute_codec_string=OPUS"/> <!-- STEREO -->
     <action application="answer"/>
     <action application="eavesdrop" data="all"/>  
   </condition>
 </extension>
 <extension name="eavesdrop4">
-  <condition field="destination_number" expression="^6007$">
+  <condition field="destination_number" expression="^6023$">
     <action application="set" data="absolute_codec_string=OPUS,VP8"/> <!-- STEREO, VIDEO -->
     <action application="answer"/>
     <action application="eavesdrop" data="all"/>  
   </condition>
 </extension>
 <extension name="eavesdrop5">
-  <condition field="destination_number" expression="^6008$">
+  <condition field="destination_number" expression="^6024$">
     <action application="set" data="absolute_codec_string=PCMU,VP8"/> <!-- MONO, VIDEO -->
     <action application="answer"/>
     <action application="eavesdrop" data="all"/>  
   </condition>
 </extension>
-<extension name="eavesdrop6">
-  <!-- RESERVED --> 
-  <condition field="destination_number" expression="^6009$">
-  </condition>
-</extension>
-<extension name="eavesdrop7">
-  <condition field="destination_number" expression="^6010$">
-  </condition>
-</extension>
-<extension name="eavesdrop8">
-  <condition field="destination_number" expression="^6011$">
-  </condition>
-</extension>
-<extension name="eavesdrop9">
-  <condition field="destination_number" expression="^6012$">
-  </condition>
-</extension>
-<extension name="eavesdrop10">
-  <condition field="destination_number" expression="^6013$">
-  </condition>
-</extension>
-