diff --git a/conf/testing/autoload_configs/modules.conf.xml b/conf/testing/autoload_configs/modules.conf.xml
index c43cf435af..cfd02d3b64 100644
--- a/conf/testing/autoload_configs/modules.conf.xml
+++ b/conf/testing/autoload_configs/modules.conf.xml
@@ -2,6 +2,7 @@
   <modules>
     
     <load module="mod_console"/>
+    <load module="mod_png"/>
     <load module="mod_logfile"/>
     <load module="mod_cdr_csv"/>
     <load module="mod_event_socket"/>
diff --git a/conf/testing/dialplan/default/0019_conf.xml b/conf/testing/dialplan/default/0019_conf.xml
index 568ff01138..4e83876708 100644
--- a/conf/testing/dialplan/default/0019_conf.xml
+++ b/conf/testing/dialplan/default/0019_conf.xml
@@ -2,6 +2,8 @@
 <extension name="conf">
   <condition field="destination_number" expression="^6070$">
     <!--<action application="answer" data="is_conference"/>  -->
+    <action application="set" data="video_mirror_input=true"/> 
+    <action application="set" data="video_use_dedicated_encoder=true"/> 
     <action application="push" data="conference_member_flags=moderator"/>
     <action application="conference" data="6070@video-mcu-stereo"/>  
   </condition>
diff --git a/conf/testing/dialplan/public/000000.xml b/conf/testing/dialplan/public/000000.xml
new file mode 100644
index 0000000000..00562a1510
--- /dev/null
+++ b/conf/testing/dialplan/public/000000.xml
@@ -0,0 +1,57 @@
+<!-- Eavesdrop Test Rig -->
+
+<!-- Target Bridge To Spy On -->
+<extension name="party-a-to-party-b-bridge">
+  <condition field="destination_number" expression="^bridge$">
+    <action application="set" data="test_role=bridge_partya"/>
+    <action application="set" data="eavesdrop_group=bridge"/>
+    <action application="set" data="absolute_codec_string=${sip_h_X-Party-A-Codec}"/>
+    <action application="bridge" data="{test_role=bridge_partyb,eavesdrop_group=bridge,absolute_codec_string=${sip_h_X-Party-B-Codec}}sofia/external/sip:partyb@${local_ip_v4}:5090"/>
+  </condition>
+</extension>
+
+<!-- Eavesdrop Target App -->
+<extension name="eavesdrop-target">
+  <condition field="destination_number" expression="^eavesdrop$">
+    <action application="set" data="test_role=eavesdrop_target"/>
+    <action application="set" data="eavesdrop_require_group=bridge"/>
+    <action application="set" data="absolute_codec_string=${sip_h_X-Eavesdrop-Codec}"/>
+    <action application="answer"/>
+    <action application="eavesdrop" data="all"/>
+  </condition>
+</extension>
+
+<!-- Target Party B -->
+<extension name="party-b-answer">
+  <condition field="destination_number" expression="^partyb$">
+    <action application="set" data="test_role=partyb"/>
+    <action application="set" data="absolute_codec_string=${sip_h_X-Party-B-Codec}"/>
+    <action application="answer"/>
+    <action application="spandsp_start_dtmf"/>
+    <action application="playback" data="silence_stream://-1"/>
+  </condition>
+</extension>
+
+<!-- Source Party A -->
+<extension name="party-a-playback">
+  <condition field="destination_number" expression="^partya$">
+    <action application="set" data="test_role=partya"/>
+    <action application="answer"/>
+    <action application="spandsp_start_dtmf"/>
+    <action application="playback" data="silence_stream://-1"/>
+  </condition>
+</extension>
+
+<!-- Eavesdrop Party -->
+<extension name="eavesdroper">
+  <condition field="destination_number" expression="^eavesdroper$">
+    <action application="set" data="test_role=eavesdrop_source"/>
+    <action application="answer"/>
+    <action application="spandsp_start_dtmf"/>
+    <action application="playback" data="silence_stream://-1"/>
+  </condition>
+</extension>
+
+
+
+
diff --git a/conf/testing/dialplan/public/000001.xml b/conf/testing/dialplan/public/000001.xml
new file mode 100644
index 0000000000..8f4ed9238b
--- /dev/null
+++ b/conf/testing/dialplan/public/000001.xml
@@ -0,0 +1,22 @@
+<!-- Image Playback Party -->
+<extension name="image-play-back">
+  <condition field="destination_number" expression="^playimg(\d+)$">
+    <action application="set" data="test_role=playimg$1"/>
+    <action application="answer"/>
+    <action application="spandsp_start_dtmf"/>
+    <action application="playback" data="{audio_file=silence_stream://-1,png_ms=-1}/${sip_h_X-File}"/>
+  </condition>
+</extension>
+
+<!-- Conference MCU -->
+<extension name="conf">
+  <condition field="destination_number" expression="^6070$">
+    <action application="set" data="test_role=${sip_h_X-Test-Role}"/>
+    <!--
+    <action application="set" data="video_mirror_input=true"/> 
+    <action application="set" data="video_use_dedicated_encoder=true"/>
+    -->
+    <action application="push" data="conference_member_flags=moderator"/>
+    <action application="conference" data="6070@video-mcu-stereo"/>  
+  </condition>
+</extension>
diff --git a/conf/testing/vars.xml b/conf/testing/vars.xml
index 6a070df84b..0aa41240c8 100644
--- a/conf/testing/vars.xml
+++ b/conf/testing/vars.xml
@@ -7,8 +7,8 @@
   <X-PRE-PROCESS cmd="set" data="use_profile=external"/>
   <X-PRE-PROCESS cmd="set" data="rtp_sdes_suites=AEAD_AES_256_GCM_8|AEAD_AES_128_GCM_8|AES_CM_256_HMAC_SHA1_80|AES_CM_192_HMAC_SHA1_80|AES_CM_128_HMAC_SHA1_80|AES_CM_256_HMAC_SHA1_32|AES_CM_192_HMAC_SHA1_32|AES_CM_128_HMAC_SHA1_32|AES_CM_128_NULL_AUTH"/>
   <X-PRE-PROCESS cmd="set" data="zrtp_secure_media=true"/>
-  <X-PRE-PROCESS cmd="set" data="global_codec_prefs=OPUS,G722,PCMU,PCMA,VP8,H264,H263,H263-1998"/>
-  <X-PRE-PROCESS cmd="set" data="outbound_codec_prefs=OPUS,G722,PCMU,PCMA,VP8,H264,H263,H263-1998"/>
+  <X-PRE-PROCESS cmd="set" data="global_codec_prefs=OPUS,G722,PCMU,PCMA,VP8,H264,H263,H263-1998,G7221@32000h"/>
+  <X-PRE-PROCESS cmd="set" data="outbound_codec_prefs=OPUS,G722,PCMU,PCMA,VP8,H264,H263,H263-1998,G7221@32000h"/>
   <X-PRE-PROCESS cmd="set" data="outbound_caller_name=FreeSWITCH"/>
   <X-PRE-PROCESS cmd="set" data="outbound_caller_id=0000000000"/>