diff --git a/voice_engine.gyp b/voice_engine.gyp
index 8348e1cc9..9ff350a0b 100644
--- a/voice_engine.gyp
+++ b/voice_engine.gyp
@@ -42,15 +42,14 @@
             {
               'action_name': 'copy audio file',
               'inputs': [
-                'voice_engine/main/test/auto_test/audio_long16.pcm',
+                'test/data/voice_engine/audio_long16.pcm',
               ],
               'outputs': [
                 '/tmp/audio_long16.pcm',
               ],
               'action': [
                 '/bin/sh', '-c',
-                'cp -f voice_engine/main/test/auto_test/audio_* /tmp/;'\
-                'cp -f voice_engine/main/test/auto_test/audio_short16.pcm /tmp/;',
+                'cp -f test/data/voice_engint/audio_* /tmp/;'\
               ],
             },
           ],
@@ -65,27 +64,14 @@
             {
               'action_name': 'copy audio file',
               'inputs': [
-                'voice_engine/main/test/auto_test/audio_long16.pcm',
+                'test/data/voice_engine/audio_long16.pcm',
               ],
               'outputs': [
                 '/tmp/audio_long16.pcm',
               ],
               'action': [
                 'cmd', '/c',
-                'xcopy /Y /R .\\voice_engine\\main\\test\\auto_test\\audio_* \\tmp',
-              ],
-            },
-            {
-              'action_name': 'copy audio audio_short16.pcm',
-              'inputs': [
-                'voice_engine/main/test/auto_test/audio_short16.pcm',
-              ],
-              'outputs': [
-                '/tmp/audio_short16.pcm',
-              ],
-              'action': [
-                'cmd', '/c',    
-                'xcopy /Y /R .\\voice_engine\\main\\test\\auto_test\\audio_short16.pcm \\tmp',
+                'xcopy /Y /R .\\test\\data\\voice_engine\\audio_* \\tmp',
               ],
             },
           ],
@@ -135,40 +121,14 @@
             {
               'action_name': 'copy audio file',
               'inputs': [
-                'voice_engine/main/test/win_test/audio_tiny11.wav',
+                'test/data/voice_engine/audio_tiny11.wav',
               ],
               'outputs': [
                 '/tmp/audio_tiny11.wav',
               ],
               'action': [
                 'cmd', '/c',
-                'xcopy /Y /R .\\voice_engine\\main\\test\\win_test\\audio_* \\tmp',
-              ],
-            },
-            {
-              'action_name': 'copy audio audio_short16.pcm',
-              'inputs': [
-                'voice_engine/main/test/win_test/audio_short16.pcm',
-              ],
-              'outputs': [
-                '/tmp/audio_short16.pcm',
-              ],
-              'action': [
-                'cmd', '/c',    
-                'xcopy /Y /R .\\voice_engine\\main\\test\\win_test\\audio_short16.pcm \\tmp',
-              ],
-            },
-            {
-              'action_name': 'copy audio_long16noise.pcm',
-              'inputs': [
-                'voice_engine/main/test/win_test/audio_long16noise.pcm',
-              ],
-              'outputs': [
-                '/tmp/audio_long16noise.pcm',
-              ],
-              'action': [
-                'cmd', '/c',    
-                'xcopy /Y /R .\\voice_engine\\main\\test\\win_test\\audio_long16noise.pcm \\tmp',
+                'xcopy /Y /R .\\test\\data\\voice_engine\\audio_* \\tmp',
               ],
             },
           ],
diff --git a/voice_engine/main/test/auto_test/audio_long16.pcm b/voice_engine/main/test/auto_test/audio_long16.pcm
deleted file mode 100644
index 853e0dfce..000000000
Binary files a/voice_engine/main/test/auto_test/audio_long16.pcm and /dev/null differ
diff --git a/voice_engine/main/test/auto_test/audio_long16.wav b/voice_engine/main/test/auto_test/audio_long16.wav
deleted file mode 100644
index ebe91c443..000000000
Binary files a/voice_engine/main/test/auto_test/audio_long16.wav and /dev/null differ
diff --git a/voice_engine/main/test/auto_test/audio_long16big_endian.pcm b/voice_engine/main/test/auto_test/audio_long16big_endian.pcm
deleted file mode 100644
index 563e4e993..000000000
Binary files a/voice_engine/main/test/auto_test/audio_long16big_endian.pcm and /dev/null differ
diff --git a/voice_engine/main/test/auto_test/audio_long8.pcm b/voice_engine/main/test/auto_test/audio_long8.pcm
deleted file mode 100644
index 85d17e5dd..000000000
Binary files a/voice_engine/main/test/auto_test/audio_long8.pcm and /dev/null differ
diff --git a/voice_engine/main/test/auto_test/audio_long8mulaw.wav b/voice_engine/main/test/auto_test/audio_long8mulaw.wav
deleted file mode 100644
index 2d3d8b3ff..000000000
Binary files a/voice_engine/main/test/auto_test/audio_long8mulaw.wav and /dev/null differ
diff --git a/voice_engine/main/test/auto_test/audio_short16.pcm b/voice_engine/main/test/auto_test/audio_short16.pcm
deleted file mode 100644
index 15a0f1811..000000000
Binary files a/voice_engine/main/test/auto_test/audio_short16.pcm and /dev/null differ
diff --git a/voice_engine/main/test/auto_test/audio_tiny11.wav b/voice_engine/main/test/auto_test/audio_tiny11.wav
deleted file mode 100644
index 6db80d536..000000000
Binary files a/voice_engine/main/test/auto_test/audio_tiny11.wav and /dev/null differ
diff --git a/voice_engine/main/test/auto_test/audio_tiny16.wav b/voice_engine/main/test/auto_test/audio_tiny16.wav
deleted file mode 100644
index baab0acce..000000000
Binary files a/voice_engine/main/test/auto_test/audio_tiny16.wav and /dev/null differ
diff --git a/voice_engine/main/test/auto_test/audio_tiny22.wav b/voice_engine/main/test/auto_test/audio_tiny22.wav
deleted file mode 100644
index b42186797..000000000
Binary files a/voice_engine/main/test/auto_test/audio_tiny22.wav and /dev/null differ
diff --git a/voice_engine/main/test/auto_test/audio_tiny32.wav b/voice_engine/main/test/auto_test/audio_tiny32.wav
deleted file mode 100644
index 773ac23eb..000000000
Binary files a/voice_engine/main/test/auto_test/audio_tiny32.wav and /dev/null differ
diff --git a/voice_engine/main/test/auto_test/audio_tiny44.wav b/voice_engine/main/test/auto_test/audio_tiny44.wav
deleted file mode 100644
index c9faa45f5..000000000
Binary files a/voice_engine/main/test/auto_test/audio_tiny44.wav and /dev/null differ
diff --git a/voice_engine/main/test/auto_test/audio_tiny48.wav b/voice_engine/main/test/auto_test/audio_tiny48.wav
deleted file mode 100644
index 8ebf11a48..000000000
Binary files a/voice_engine/main/test/auto_test/audio_tiny48.wav and /dev/null differ
diff --git a/voice_engine/main/test/auto_test/audio_tiny8.wav b/voice_engine/main/test/auto_test/audio_tiny8.wav
deleted file mode 100644
index d71c65e89..000000000
Binary files a/voice_engine/main/test/auto_test/audio_tiny8.wav and /dev/null differ
diff --git a/voice_engine/main/test/win_test/audio_long16.pcm b/voice_engine/main/test/win_test/audio_long16.pcm
deleted file mode 100644
index 853e0dfce..000000000
Binary files a/voice_engine/main/test/win_test/audio_long16.pcm and /dev/null differ
diff --git a/voice_engine/main/test/win_test/audio_long16noise.pcm b/voice_engine/main/test/win_test/audio_long16noise.pcm
deleted file mode 100644
index a7be53779..000000000
Binary files a/voice_engine/main/test/win_test/audio_long16noise.pcm and /dev/null differ
diff --git a/voice_engine/main/test/win_test/audio_short16.pcm b/voice_engine/main/test/win_test/audio_short16.pcm
deleted file mode 100644
index 15a0f1811..000000000
Binary files a/voice_engine/main/test/win_test/audio_short16.pcm and /dev/null differ
diff --git a/voice_engine/main/test/win_test/audio_tiny11.wav b/voice_engine/main/test/win_test/audio_tiny11.wav
deleted file mode 100644
index 6db80d536..000000000
Binary files a/voice_engine/main/test/win_test/audio_tiny11.wav and /dev/null differ
diff --git a/voice_engine/main/test/win_test/audio_tiny16.wav b/voice_engine/main/test/win_test/audio_tiny16.wav
deleted file mode 100644
index baab0acce..000000000
Binary files a/voice_engine/main/test/win_test/audio_tiny16.wav and /dev/null differ
diff --git a/voice_engine/main/test/win_test/audio_tiny22.wav b/voice_engine/main/test/win_test/audio_tiny22.wav
deleted file mode 100644
index b42186797..000000000
Binary files a/voice_engine/main/test/win_test/audio_tiny22.wav and /dev/null differ
diff --git a/voice_engine/main/test/win_test/audio_tiny32.wav b/voice_engine/main/test/win_test/audio_tiny32.wav
deleted file mode 100644
index 773ac23eb..000000000
Binary files a/voice_engine/main/test/win_test/audio_tiny32.wav and /dev/null differ
diff --git a/voice_engine/main/test/win_test/audio_tiny44.wav b/voice_engine/main/test/win_test/audio_tiny44.wav
deleted file mode 100644
index c9faa45f5..000000000
Binary files a/voice_engine/main/test/win_test/audio_tiny44.wav and /dev/null differ
diff --git a/voice_engine/main/test/win_test/audio_tiny48.wav b/voice_engine/main/test/win_test/audio_tiny48.wav
deleted file mode 100644
index 8ebf11a48..000000000
Binary files a/voice_engine/main/test/win_test/audio_tiny48.wav and /dev/null differ
diff --git a/voice_engine/main/test/win_test/audio_tiny8.wav b/voice_engine/main/test/win_test/audio_tiny8.wav
deleted file mode 100644
index d71c65e89..000000000
Binary files a/voice_engine/main/test/win_test/audio_tiny8.wav and /dev/null differ
diff --git a/voice_engine/main/test/win_test/stereo_rtp_files/HRTF_pcm16wb.rtp b/voice_engine/main/test/win_test/stereo_rtp_files/HRTF_pcm16wb.rtp
deleted file mode 100644
index 02abbc24f..000000000
Binary files a/voice_engine/main/test/win_test/stereo_rtp_files/HRTF_pcm16wb.rtp and /dev/null differ
diff --git a/voice_engine/main/test/win_test/stereo_rtp_files/HRTF_pcm16wb_jitter.rtp b/voice_engine/main/test/win_test/stereo_rtp_files/HRTF_pcm16wb_jitter.rtp
deleted file mode 100644
index 4ed110b5f..000000000
Binary files a/voice_engine/main/test/win_test/stereo_rtp_files/HRTF_pcm16wb_jitter.rtp and /dev/null differ
diff --git a/voice_engine/main/test/win_test/stereo_rtp_files/README.txt b/voice_engine/main/test/win_test/stereo_rtp_files/README.txt
deleted file mode 100644
index 976ac56c8..000000000
--- a/voice_engine/main/test/win_test/stereo_rtp_files/README.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Use RTP Play tool with command 'rtpplay.exe -v -T -f <path>\<file.rtp> 127.0.0.1/1236' 
-Example: rtpplay.exe -v -T -f hrtf_g722_1C_48.rtp 127.0.0.1/1236.  
-This sends the stereo rtp file to port 1236.  
-You can hear the voice getting panned from left, right and center.   
diff --git a/voice_engine/main/test/win_test/stereo_rtp_files/hrtf_g722_1C_48.rtp b/voice_engine/main/test/win_test/stereo_rtp_files/hrtf_g722_1C_48.rtp
deleted file mode 100644
index b96d59b89..000000000
Binary files a/voice_engine/main/test/win_test/stereo_rtp_files/hrtf_g722_1C_48.rtp and /dev/null differ
diff --git a/voice_engine/main/test/win_test/stereo_rtp_files/hrtf_g722_1C_48_jitterT2.rtp b/voice_engine/main/test/win_test/stereo_rtp_files/hrtf_g722_1C_48_jitterT2.rtp
deleted file mode 100644
index 527a50a5c..000000000
Binary files a/voice_engine/main/test/win_test/stereo_rtp_files/hrtf_g722_1C_48_jitterT2.rtp and /dev/null differ
diff --git a/voice_engine/main/test/win_test/stereo_rtp_files/rtpplay.exe b/voice_engine/main/test/win_test/stereo_rtp_files/rtpplay.exe
deleted file mode 100755
index 6f938c8fb..000000000
Binary files a/voice_engine/main/test/win_test/stereo_rtp_files/rtpplay.exe and /dev/null differ
diff --git a/voice_engine/main/test/win_test/stereo_rtp_files/stereo_g729.rtp b/voice_engine/main/test/win_test/stereo_rtp_files/stereo_g729.rtp
deleted file mode 100644
index 3c36e3078..000000000
Binary files a/voice_engine/main/test/win_test/stereo_rtp_files/stereo_g729.rtp and /dev/null differ
diff --git a/voice_engine/main/test/win_test/stereo_rtp_files/stereo_g729_jitter.rtp b/voice_engine/main/test/win_test/stereo_rtp_files/stereo_g729_jitter.rtp
deleted file mode 100644
index 913226cc9..000000000
Binary files a/voice_engine/main/test/win_test/stereo_rtp_files/stereo_g729_jitter.rtp and /dev/null differ
diff --git a/voice_engine/main/test/win_test/stereo_rtp_files/stereo_pcm16wb.rtp b/voice_engine/main/test/win_test/stereo_rtp_files/stereo_pcm16wb.rtp
deleted file mode 100644
index 729b56517..000000000
Binary files a/voice_engine/main/test/win_test/stereo_rtp_files/stereo_pcm16wb.rtp and /dev/null differ
diff --git a/voice_engine/main/test/win_test/stereo_rtp_files/stereo_pcm16wb_jitter.rtp b/voice_engine/main/test/win_test/stereo_rtp_files/stereo_pcm16wb_jitter.rtp
deleted file mode 100644
index efa2800c1..000000000
Binary files a/voice_engine/main/test/win_test/stereo_rtp_files/stereo_pcm16wb_jitter.rtp and /dev/null differ
diff --git a/voice_engine/main/test/win_test/stereo_rtp_files/stereo_pcmu.rtp b/voice_engine/main/test/win_test/stereo_rtp_files/stereo_pcmu.rtp
deleted file mode 100644
index bb2d93c1c..000000000
Binary files a/voice_engine/main/test/win_test/stereo_rtp_files/stereo_pcmu.rtp and /dev/null differ
diff --git a/voice_engine/main/test/win_test/stereo_rtp_files/stereo_pcmu_jitter.rtp b/voice_engine/main/test/win_test/stereo_rtp_files/stereo_pcmu_jitter.rtp
deleted file mode 100644
index fb7937863..000000000
Binary files a/voice_engine/main/test/win_test/stereo_rtp_files/stereo_pcmu_jitter.rtp and /dev/null differ
diff --git a/voice_engine/main/test/win_test/stereo_rtp_files/stereo_pcmu_vad.rtp b/voice_engine/main/test/win_test/stereo_rtp_files/stereo_pcmu_vad.rtp
deleted file mode 100644
index eebcf3498..000000000
Binary files a/voice_engine/main/test/win_test/stereo_rtp_files/stereo_pcmu_vad.rtp and /dev/null differ
diff --git a/voice_engine/main/test/win_test/stereo_rtp_files/stereo_pcmu_vad_jitter.rtp b/voice_engine/main/test/win_test/stereo_rtp_files/stereo_pcmu_vad_jitter.rtp
deleted file mode 100644
index 5c368b4bc..000000000
Binary files a/voice_engine/main/test/win_test/stereo_rtp_files/stereo_pcmu_vad_jitter.rtp and /dev/null differ
diff --git a/voice_engine/main/test/win_test/stereo_rtp_files/toggling_stereo_g729_pt18_pt125.rtp b/voice_engine/main/test/win_test/stereo_rtp_files/toggling_stereo_g729_pt18_pt125.rtp
deleted file mode 100644
index 1f713f6e8..000000000
Binary files a/voice_engine/main/test/win_test/stereo_rtp_files/toggling_stereo_g729_pt18_pt125.rtp and /dev/null differ