diff --git a/src/modules/audio_coding/codecs/iLBC/main/test/iLBCtestscript.txt b/src/modules/audio_coding/codecs/iLBC/main/test/iLBCtestscript.txt
index 743d904b2a..a52f7c1cf9 100644
--- a/src/modules/audio_coding/codecs/iLBC/main/test/iLBCtestscript.txt
+++ b/src/modules/audio_coding/codecs/iLBC/main/test/iLBCtestscript.txt
@@ -2,68 +2,72 @@
 (set -o igncr) 2>/dev/null && set -o igncr; # force bash to ignore \r character
 
 #
-# This script can be used to verify the bit exatness of iLBC fixpoint version 1.0.6
+# This script can be used to verify the bit exactness of iLBC fixed-point version 1.0.6
 #
 
+INP=../../../../../../../test/data/audio_coding
+EXEP=../../../../../../../out/Release
+OUTP=./GeneratedFiles
+mkdir ./GeneratedFiles
 
-./iLBCtest 20 ./inFiles/F00.INP ./GeneratedFiles/F00.BIT20 ./GeneratedFiles/F00.OUT20 ./inFiles/clean.chn
-./iLBCtest 20 ./inFiles/F01.INP ./GeneratedFiles/F01.BIT20 ./GeneratedFiles/F01.OUT20 ./inFiles/clean.chn
-./iLBCtest 20 ./inFiles/F02.INP ./GeneratedFiles/F02.BIT20 ./GeneratedFiles/F02.OUT20 ./inFiles/clean.chn
-./iLBCtest 20 ./inFiles/F03.INP ./GeneratedFiles/F03.BIT20 ./GeneratedFiles/F03.OUT20 ./inFiles/clean.chn
-./iLBCtest 20 ./inFiles/F04.INP ./GeneratedFiles/F04.BIT20 ./GeneratedFiles/F04.OUT20 ./inFiles/clean.chn
-./iLBCtest 20 ./inFiles/F05.INP ./GeneratedFiles/F05.BIT20 ./GeneratedFiles/F05.OUT20 ./inFiles/clean.chn
-./iLBCtest 20 ./inFiles/F06.INP ./GeneratedFiles/F06.BIT20 ./GeneratedFiles/F06.OUT20 ./inFiles/clean.chn
+$EXEP/iLBCtest 20 $INP/F00.INP $OUTP/F00.BIT20 $OUTP/F00.OUT20 $INP/clean.chn
+$EXEP/iLBCtest 20 $INP/F01.INP $OUTP/F01.BIT20 $OUTP/F01.OUT20 $INP/clean.chn
+$EXEP/iLBCtest 20 $INP/F02.INP $OUTP/F02.BIT20 $OUTP/F02.OUT20 $INP/clean.chn
+$EXEP/iLBCtest 20 $INP/F03.INP $OUTP/F03.BIT20 $OUTP/F03.OUT20 $INP/clean.chn
+$EXEP/iLBCtest 20 $INP/F04.INP $OUTP/F04.BIT20 $OUTP/F04.OUT20 $INP/clean.chn
+$EXEP/iLBCtest 20 $INP/F05.INP $OUTP/F05.BIT20 $OUTP/F05.OUT20 $INP/clean.chn
+$EXEP/iLBCtest 20 $INP/F06.INP $OUTP/F06.BIT20 $OUTP/F06.OUT20 $INP/clean.chn
 
-./iLBCtest 30 ./inFiles/F00.INP ./GeneratedFiles/F00.BIT30 ./GeneratedFiles/F00.OUT30 ./inFiles/clean.chn
-./iLBCtest 30 ./inFiles/F01.INP ./GeneratedFiles/F01.BIT30 ./GeneratedFiles/F01.OUT30 ./inFiles/clean.chn
-./iLBCtest 30 ./inFiles/F02.INP ./GeneratedFiles/F02.BIT30 ./GeneratedFiles/F02.OUT30 ./inFiles/clean.chn
-./iLBCtest 30 ./inFiles/F03.INP ./GeneratedFiles/F03.BIT30 ./GeneratedFiles/F03.OUT30 ./inFiles/clean.chn
-./iLBCtest 30 ./inFiles/F04.INP ./GeneratedFiles/F04.BIT30 ./GeneratedFiles/F04.OUT30 ./inFiles/clean.chn
-./iLBCtest 30 ./inFiles/F05.INP ./GeneratedFiles/F05.BIT30 ./GeneratedFiles/F05.OUT30 ./inFiles/clean.chn
-./iLBCtest 30 ./inFiles/F06.INP ./GeneratedFiles/F06.BIT30 ./GeneratedFiles/F06.OUT30 ./inFiles/clean.chn
+$EXEP/iLBCtest 30 $INP/F00.INP $OUTP/F00.BIT30 $OUTP/F00.OUT30 $INP/clean.chn
+$EXEP/iLBCtest 30 $INP/F01.INP $OUTP/F01.BIT30 $OUTP/F01.OUT30 $INP/clean.chn
+$EXEP/iLBCtest 30 $INP/F02.INP $OUTP/F02.BIT30 $OUTP/F02.OUT30 $INP/clean.chn
+$EXEP/iLBCtest 30 $INP/F03.INP $OUTP/F03.BIT30 $OUTP/F03.OUT30 $INP/clean.chn
+$EXEP/iLBCtest 30 $INP/F04.INP $OUTP/F04.BIT30 $OUTP/F04.OUT30 $INP/clean.chn
+$EXEP/iLBCtest 30 $INP/F05.INP $OUTP/F05.BIT30 $OUTP/F05.OUT30 $INP/clean.chn
+$EXEP/iLBCtest 30 $INP/F06.INP $OUTP/F06.BIT30 $OUTP/F06.OUT30 $INP/clean.chn
 
-./iLBCtest 20 ./inFiles/F00.INP ./GeneratedFiles/F00.BIT20 ./GeneratedFiles/F00_tlm10.OUT20 ./inFiles/tlm10.chn
-./iLBCtest 20 ./inFiles/F01.INP ./GeneratedFiles/F01.BIT20 ./GeneratedFiles/F01_tlm10.OUT20 ./inFiles/tlm10.chn
-./iLBCtest 20 ./inFiles/F02.INP ./GeneratedFiles/F02.BIT20 ./GeneratedFiles/F02_tlm10.OUT20 ./inFiles/tlm10.chn
-./iLBCtest 30 ./inFiles/F00.INP ./GeneratedFiles/F00.BIT30 ./GeneratedFiles/F00_tlm10.OUT30 ./inFiles/tlm10.chn
-./iLBCtest 30 ./inFiles/F01.INP ./GeneratedFiles/F01.BIT30 ./GeneratedFiles/F01_tlm10.OUT30 ./inFiles/tlm10.chn
-./iLBCtest 30 ./inFiles/F02.INP ./GeneratedFiles/F02.BIT30 ./GeneratedFiles/F02_tlm10.OUT30 ./inFiles/tlm10.chn
+$EXEP/iLBCtest 20 $INP/F00.INP $OUTP/F00.BIT20 $OUTP/F00_tlm10.OUT20 $INP/tlm10.chn
+$EXEP/iLBCtest 20 $INP/F01.INP $OUTP/F01.BIT20 $OUTP/F01_tlm10.OUT20 $INP/tlm10.chn
+$EXEP/iLBCtest 20 $INP/F02.INP $OUTP/F02.BIT20 $OUTP/F02_tlm10.OUT20 $INP/tlm10.chn
+$EXEP/iLBCtest 30 $INP/F00.INP $OUTP/F00.BIT30 $OUTP/F00_tlm10.OUT30 $INP/tlm10.chn
+$EXEP/iLBCtest 30 $INP/F01.INP $OUTP/F01.BIT30 $OUTP/F01_tlm10.OUT30 $INP/tlm10.chn
+$EXEP/iLBCtest 30 $INP/F02.INP $OUTP/F02.BIT30 $OUTP/F02_tlm10.OUT30 $INP/tlm10.chn
 
 
-diff ./GeneratedFiles/F00.BIT20 ./ReferenceVectors/F00.BIT20
-diff ./GeneratedFiles/F01.BIT20 ./ReferenceVectors/F01.BIT20
-diff ./GeneratedFiles/F02.BIT20 ./ReferenceVectors/F02.BIT20
-diff ./GeneratedFiles/F03.BIT20 ./ReferenceVectors/F03.BIT20
-diff ./GeneratedFiles/F04.BIT20 ./ReferenceVectors/F04.BIT20
-diff ./GeneratedFiles/F05.BIT20 ./ReferenceVectors/F05.BIT20
-diff ./GeneratedFiles/F06.BIT20 ./ReferenceVectors/F06.BIT20
-diff ./GeneratedFiles/F00.OUT20 ./ReferenceVectors/F00.OUT20
-diff ./GeneratedFiles/F01.OUT20 ./ReferenceVectors/F01.OUT20
-diff ./GeneratedFiles/F02.OUT20 ./ReferenceVectors/F02.OUT20
-diff ./GeneratedFiles/F03.OUT20 ./ReferenceVectors/F03.OUT20
-diff ./GeneratedFiles/F04.OUT20 ./ReferenceVectors/F04.OUT20
-diff ./GeneratedFiles/F05.OUT20 ./ReferenceVectors/F05.OUT20
-diff ./GeneratedFiles/F06.OUT20 ./ReferenceVectors/F06.OUT20
+diff $OUTP/F00.BIT20 $INP/F00.BIT20
+diff $OUTP/F01.BIT20 $INP/F01.BIT20
+diff $OUTP/F02.BIT20 $INP/F02.BIT20
+diff $OUTP/F03.BIT20 $INP/F03.BIT20
+diff $OUTP/F04.BIT20 $INP/F04.BIT20
+diff $OUTP/F05.BIT20 $INP/F05.BIT20
+diff $OUTP/F06.BIT20 $INP/F06.BIT20
+diff $OUTP/F00.OUT20 $INP/F00.OUT20
+diff $OUTP/F01.OUT20 $INP/F01.OUT20
+diff $OUTP/F02.OUT20 $INP/F02.OUT20
+diff $OUTP/F03.OUT20 $INP/F03.OUT20
+diff $OUTP/F04.OUT20 $INP/F04.OUT20
+diff $OUTP/F05.OUT20 $INP/F05.OUT20
+diff $OUTP/F06.OUT20 $INP/F06.OUT20
 
-diff ./GeneratedFiles/F00.BIT30 ./ReferenceVectors/F00.BIT30
-diff ./GeneratedFiles/F01.BIT30 ./ReferenceVectors/F01.BIT30
-diff ./GeneratedFiles/F02.BIT30 ./ReferenceVectors/F02.BIT30
-diff ./GeneratedFiles/F03.BIT30 ./ReferenceVectors/F03.BIT30
-diff ./GeneratedFiles/F04.BIT30 ./ReferenceVectors/F04.BIT30
-diff ./GeneratedFiles/F05.BIT30 ./ReferenceVectors/F05.BIT30
-diff ./GeneratedFiles/F06.BIT30 ./ReferenceVectors/F06.BIT30
-diff ./GeneratedFiles/F00.OUT30 ./ReferenceVectors/F00.OUT30
-diff ./GeneratedFiles/F01.OUT30 ./ReferenceVectors/F01.OUT30
-diff ./GeneratedFiles/F02.OUT30 ./ReferenceVectors/F02.OUT30
-diff ./GeneratedFiles/F03.OUT30 ./ReferenceVectors/F03.OUT30
-diff ./GeneratedFiles/F04.OUT30 ./ReferenceVectors/F04.OUT30
-diff ./GeneratedFiles/F05.OUT30 ./ReferenceVectors/F05.OUT30
-diff ./GeneratedFiles/F06.OUT30 ./ReferenceVectors/F06.OUT30
+diff $OUTP/F00.BIT30 $INP/F00.BIT30
+diff $OUTP/F01.BIT30 $INP/F01.BIT30
+diff $OUTP/F02.BIT30 $INP/F02.BIT30
+diff $OUTP/F03.BIT30 $INP/F03.BIT30
+diff $OUTP/F04.BIT30 $INP/F04.BIT30
+diff $OUTP/F05.BIT30 $INP/F05.BIT30
+diff $OUTP/F06.BIT30 $INP/F06.BIT30
+diff $OUTP/F00.OUT30 $INP/F00.OUT30
+diff $OUTP/F01.OUT30 $INP/F01.OUT30
+diff $OUTP/F02.OUT30 $INP/F02.OUT30
+diff $OUTP/F03.OUT30 $INP/F03.OUT30
+diff $OUTP/F04.OUT30 $INP/F04.OUT30
+diff $OUTP/F05.OUT30 $INP/F05.OUT30
+diff $OUTP/F06.OUT30 $INP/F06.OUT30
 
-diff ./GeneratedFiles/F00_tlm10.OUT20 ./ReferenceVectors/F00_tlm10.OUT20
-diff ./GeneratedFiles/F01_tlm10.OUT20 ./ReferenceVectors/F01_tlm10.OUT20
-diff ./GeneratedFiles/F02_tlm10.OUT20 ./ReferenceVectors/F02_tlm10.OUT20
-diff ./GeneratedFiles/F00_tlm10.OUT30 ./ReferenceVectors/F00_tlm10.OUT30
-diff ./GeneratedFiles/F01_tlm10.OUT30 ./ReferenceVectors/F01_tlm10.OUT30
-diff ./GeneratedFiles/F02_tlm10.OUT30 ./ReferenceVectors/F02_tlm10.OUT30
+diff $OUTP/F00_tlm10.OUT20 $INP/F00_tlm10.OUT20
+diff $OUTP/F01_tlm10.OUT20 $INP/F01_tlm10.OUT20
+diff $OUTP/F02_tlm10.OUT20 $INP/F02_tlm10.OUT20
+diff $OUTP/F00_tlm10.OUT30 $INP/F00_tlm10.OUT30
+diff $OUTP/F01_tlm10.OUT30 $INP/F01_tlm10.OUT30
+diff $OUTP/F02_tlm10.OUT30 $INP/F02_tlm10.OUT30
 
diff --git a/src/modules/audio_coding/main/test/APITest.cpp b/src/modules/audio_coding/main/test/APITest.cpp
index 98c39052b2..a729c86316 100644
--- a/src/modules/audio_coding/main/test/APITest.cpp
+++ b/src/modules/audio_coding/main/test/APITest.cpp
@@ -253,26 +253,26 @@ APITest::SetUp()
     printf("Hit enter to accept the default values indicated in []\n\n");
 
     //--- Input A
-    strcpy(fileName, "./modules/audio_coding/main/test/testfile32kHz.pcm");
+    strcpy(fileName, "./test/data/audio_coding/testfile32kHz.pcm");
     frequencyHz = 32000;
     printf("Enter input file at side A [%s]: ", fileName);
     PCMFile::ChooseFile(fileName, 499, &frequencyHz);
     _inFileA.Open(fileName, frequencyHz, "rb", true);
 
     //--- Output A
-    strcpy(fileName, "./modules/audio_coding/main/test/outA.pcm");
+    strcpy(fileName, "./src/modules/audio_coding/main/test/outA.pcm");
     printf("Enter output file at side A [%s]: ", fileName);
     PCMFile::ChooseFile(fileName, 499, &frequencyHz);
     _outFileA.Open(fileName, frequencyHz, "wb");
 
     //--- Input B
-    strcpy(fileName, "./modules/audio_coding/main/test/testfile32kHz.pcm");
+    strcpy(fileName, "./test/data/audio_coding/testfile32kHz.pcm");
     printf("\n\nEnter input file at side B [%s]: ", fileName);
     PCMFile::ChooseFile(fileName, 499, &frequencyHz);
     _inFileB.Open(fileName, frequencyHz, "rb", true);
 
     //--- Output B
-    strcpy(fileName, "./modules/audio_coding/main/test/outB.pcm");
+    strcpy(fileName, "./src/modules/audio_coding/main/test/outB.pcm");
     printf("Enter output file at side B [%s]: ", fileName);
     PCMFile::ChooseFile(fileName, 499, &frequencyHz);
     _outFileB.Open(fileName, frequencyHz, "wb");
diff --git a/src/modules/audio_coding/main/test/EncodeDecodeTest.cpp b/src/modules/audio_coding/main/test/EncodeDecodeTest.cpp
index 08555da4ee..c0fdbf1b43 100644
--- a/src/modules/audio_coding/main/test/EncodeDecodeTest.cpp
+++ b/src/modules/audio_coding/main/test/EncodeDecodeTest.cpp
@@ -48,14 +48,14 @@ void Receiver::Setup(AudioCodingModule *acm, RTPStream *rtpStream)
     {
       playSampFreq=recvCodec.plfreq;
       //output file for current run
-      sprintf(filename,"./modules/audio_coding/main/test/res_tests/out%dFile.pcm",codeId);
+      sprintf(filename,"./src/modules/audio_coding/main/test/out%dFile.pcm",codeId);
       _pcmFile.Open(filename, recvCodec.plfreq, "wb+");
     }
     else if (testMode == 0)
     {
         playSampFreq=32000;
       //output file for current run
-      sprintf(filename,"./modules/audio_coding/main/test/res_autotests/encodeDecode_out%d.pcm",codeId);
+      sprintf(filename,"./src/modules/audio_coding/main/test/encodeDecode_out%d.pcm",codeId);
       _pcmFile.Open(filename, 32000/*recvCodec.plfreq*/, "wb+");
     }
     else
@@ -64,7 +64,7 @@ void Receiver::Setup(AudioCodingModule *acm, RTPStream *rtpStream)
         printf("8000\n16000\n32000\n-1, which means output freq equal to received signal freq");
         printf("\n\nChoose output sampling frequency: ");       
         scanf("%d", &playSampFreq);
-        char fileName[] = "./modules/audio_coding/main/test/outFile.pcm";
+        char fileName[] = "./src/modules/audio_coding/main/test/outFile.pcm";
         _pcmFile.Open(fileName, 32000, "wb+");
     }
      
diff --git a/src/modules/audio_coding/main/test/EncodeToFileTest.cpp b/src/modules/audio_coding/main/test/EncodeToFileTest.cpp
index 6eed2ea855..eb7affe985 100644
--- a/src/modules/audio_coding/main/test/EncodeToFileTest.cpp
+++ b/src/modules/audio_coding/main/test/EncodeToFileTest.cpp
@@ -69,7 +69,7 @@ void Sender::Setup(AudioCodingModule *acm, RTPStream *rtpStream)
         //set the codec, input file, and parameters for the current test    
         codecNo = codeId;
         //use same input file for now
-        char fileName[] = "./modules/audio_coding/main/test/testfile32kHz.pcm";
+        char fileName[] = "./test/data/audio_coding/testfile32kHz.pcm";
         _pcmFile.Open(fileName, 32000, "rb");
     }
     else if (testMode == 0)
@@ -78,7 +78,7 @@ void Sender::Setup(AudioCodingModule *acm, RTPStream *rtpStream)
         codecNo = codeId;
         acm->Codec(codecNo, sendCodec);
         //use same input file for now
-        char fileName[] = "./modules/audio_coding/main/test/testfile32kHz.pcm";
+        char fileName[] = "./test/data/audio_coding/testfile32kHz.pcm";
         _pcmFile.Open(fileName, 32000, "rb");
     }
     else
@@ -92,7 +92,7 @@ void Sender::Setup(AudioCodingModule *acm, RTPStream *rtpStream)
         printf("Choose your codec:");
     
         scanf("%d", &codecNo);
-        char fileName[] = "./modules/audio_coding/main/test/testfile32kHz.pcm";
+        char fileName[] = "./test/data/audio_coding/testfile32kHz.pcm";
         _pcmFile.Open(fileName, 32000, "rb");
     }
 
diff --git a/src/modules/audio_coding/main/test/SpatialAudio.cpp b/src/modules/audio_coding/main/test/SpatialAudio.cpp
index 016ec0adb6..85c158f1c7 100644
--- a/src/modules/audio_coding/main/test/SpatialAudio.cpp
+++ b/src/modules/audio_coding/main/test/SpatialAudio.cpp
@@ -55,7 +55,7 @@ SpatialAudio::Setup()
     WebRtc_Word8 audioFileName[MAX_FILE_NAME_LENGTH_BYTE];
     WebRtc_UWord16 sampFreqHz = 32000;
 
-    strncpy(audioFileName, "./modules/audio_coding/main/test/testfile32kHz.pcm",
+    strncpy(audioFileName, "./test/data/audio_coding/testfile32kHz.pcm",
             MAX_FILE_NAME_LENGTH_BYTE - 1);
     if(_testMode == 1)
     {
@@ -66,20 +66,20 @@ SpatialAudio::Setup()
 
     if(_testMode == 0)
     {
-        strncpy(audioFileName, "./modules/audio_coding/main/test/res_autotests/out_spatial_autotest.pcm",
+        strncpy(audioFileName, "./src/modules/audio_coding/main/test/out_spatial_autotest.pcm",
                 MAX_FILE_NAME_LENGTH_BYTE - 1);
     }
     else if(_testMode == 1)
     {
         printf("\n");
-        strncpy(audioFileName, "./modules/audio_coding/main/test/res_tests/testspatial_out.pcm",
+        strncpy(audioFileName, "./src/modules/audio_coding/main/test/testspatial_out.pcm",
                 MAX_FILE_NAME_LENGTH_BYTE - 1);
         printf("Enter the output file [%s]: ", audioFileName);
         PCMFile::ChooseFile(audioFileName, MAX_FILE_NAME_LENGTH_BYTE, &sampFreqHz);
     }
     else
     {
-        strncpy(audioFileName, "./modules/audio_coding/main/test/res_tests/testspatial_out.pcm",
+        strncpy(audioFileName, "./src/modules/audio_coding/main/test/testspatial_out.pcm",
                         MAX_FILE_NAME_LENGTH_BYTE - 1);
     }
     _outFile.Open(audioFileName, sampFreqHz, "wb", false);
diff --git a/src/modules/audio_coding/main/test/TestAllCodecs.cpp b/src/modules/audio_coding/main/test/TestAllCodecs.cpp
index 35e5b0a86d..15f0f1684d 100644
--- a/src/modules/audio_coding/main/test/TestAllCodecs.cpp
+++ b/src/modules/audio_coding/main/test/TestAllCodecs.cpp
@@ -137,7 +137,7 @@ TestAllCodecs::~TestAllCodecs()
 void TestAllCodecs::Perform()
 {
 
-    char file[] = "./modules/audio_coding/main/test/testfile32kHz.pcm";
+    char file[] = "./test/data/audio_coding/testfile32kHz.pcm";
     _inFileA.Open(file, 32000, "rb");
 
     if(_testMode == 0)
diff --git a/src/modules/audio_coding/main/test/TestFEC.cpp b/src/modules/audio_coding/main/test/TestFEC.cpp
index 829e1de142..30bb25ee69 100644
--- a/src/modules/audio_coding/main/test/TestFEC.cpp
+++ b/src/modules/audio_coding/main/test/TestFEC.cpp
@@ -58,7 +58,7 @@ void TestFEC::Perform()
         WEBRTC_TRACE(webrtc::kTraceStateInfo, webrtc::kTraceAudioCoding, -1,
                      "---------- TestFEC ----------");
     }
-    char fileName[] = "./modules/audio_coding/main/test/testfile32kHz.pcm";
+    char fileName[] = "./test/data/audio_coding/testfile32kHz.pcm";
     _inFileA.Open(fileName, 32000, "rb");
 
 
@@ -605,12 +605,12 @@ void TestFEC::Run()
 
 void TestFEC::OpenOutFile(WebRtc_Word16 testNumber)
 {
-    char fileName[500] = "./modules/audio_coding/main/test/res_tests/TestFEC_outFile_";
+    char fileName[500] = "./src/modules/audio_coding/main/test/TestFEC_outFile_";
     char cntrStr[10];
 
     if(_testMode == 0)
     {
-        sprintf(fileName, "./modules/audio_coding/main/test/res_autotests/TestFEC_outFile_");
+        sprintf(fileName, "./src/modules/audio_coding/main/test/TestFEC_autoFile_");
     }
     sprintf(cntrStr, "%02d.pcm", testNumber);
     strcat(fileName, cntrStr);
diff --git a/src/modules/audio_coding/main/test/TestStereo.cpp b/src/modules/audio_coding/main/test/TestStereo.cpp
index bb4c40bb48..1add2409de 100644
--- a/src/modules/audio_coding/main/test/TestStereo.cpp
+++ b/src/modules/audio_coding/main/test/TestStereo.cpp
@@ -202,7 +202,7 @@ void TestStereo::Perform()
                        "---------- TestStereo ----------");
       }
 
-     strcpy(fileName, "./modules/audio_coding/main/test/teststereo32kHz.pcm");
+     strcpy(fileName, "./test/data/audio_coding/teststereo32kHz.pcm");
      frequencyHz = 32000;
 
     _inFileA.Open(fileName, frequencyHz, "rb");
@@ -529,7 +529,7 @@ void TestStereo::Run(TestPackStereo* channel)
 
 void TestStereo::OpenOutFile(WebRtc_Word16 testNumber)
 {
-    char fileName[500] = "./modules/audio_coding/main/test/res_tests/teststereo_out_";
+    char fileName[500] = "./src/modules/audio_coding/main/test/teststereo_out_";
     char cntrStr[10];
 
     sprintf(cntrStr, "%02d.pcm", testNumber);
diff --git a/src/modules/audio_coding/main/test/TestVADDTX.cpp b/src/modules/audio_coding/main/test/TestVADDTX.cpp
index 8186f620b0..768bdde034 100644
--- a/src/modules/audio_coding/main/test/TestVADDTX.cpp
+++ b/src/modules/audio_coding/main/test/TestVADDTX.cpp
@@ -58,7 +58,7 @@ void TestVADDTX::Perform()
         WEBRTC_TRACE(webrtc::kTraceStateInfo, webrtc::kTraceAudioCoding, -1,
                      "---------- TestVADDTX ----------");
     }
-    char fileName[] = "./modules/audio_coding/main/test/testfile32kHz.pcm";
+    char fileName[] = "./test/data/audio_coding/testfile32kHz.pcm";
     _inFileA.Open(fileName, 32000, "rb");
 
     _acmA = AudioCodingModule::Create(0);
@@ -352,12 +352,12 @@ void TestVADDTX::Run()
 
 void TestVADDTX::OpenOutFile(WebRtc_Word16 testNumber)
 {
-    char fileName[500] = "./modules/audio_coding/main/test/res_tests/testVADDTX_outFile_";
+    char fileName[500] = "./src/modules/audio_coding/main/test/testVADDTX_outFile_";
     char cntrStr[10];
 
     if(_testMode == 0)
     {
-        sprintf(fileName, "./modules/audio_coding/main/test/res_autotests/testVADDTX_outFile_");
+        sprintf(fileName, "./src/modules/audio_coding/main/test/testVADDTX_autoFile_");
     }
     sprintf(cntrStr, "%02d.pcm", testNumber);
     strcat(fileName, cntrStr);
diff --git a/src/modules/audio_coding/main/test/TwoWayCommunication.cpp b/src/modules/audio_coding/main/test/TwoWayCommunication.cpp
index 21d40121ad..afa9253251 100644
--- a/src/modules/audio_coding/main/test/TwoWayCommunication.cpp
+++ b/src/modules/audio_coding/main/test/TwoWayCommunication.cpp
@@ -195,7 +195,7 @@ WebRtc_Word16 TwoWayCommunication::SetUp()
     WebRtc_UWord16 frequencyHz;
     
     //--- Input A
-    strcpy(fileName, "./modules/audio_coding/main/test/testfile32kHz.pcm");
+    strcpy(fileName, "./test/data/audio_coding/testfile32kHz.pcm");
     frequencyHz = 32000;
     printf("Enter input file at side A [%s]: ", fileName);
     ChooseFile(fileName, 499, &frequencyHz);
@@ -214,7 +214,7 @@ WebRtc_Word16 TwoWayCommunication::SetUp()
     _outFileRefA.Open(refFileName, frequencyHz, "wb");
 
     //--- Input B
-    strcpy(fileName, "./modules/audio_coding/main/test/testfile32kHz.pcm");
+    strcpy(fileName, "./test/data/audio_coding/testfile32kHz.pcm");
     frequencyHz = 32000;
     printf("\n\nEnter input file at side B [%s]: ", fileName);
     ChooseFile(fileName, 499, &frequencyHz);
@@ -302,27 +302,27 @@ WebRtc_Word16 TwoWayCommunication::SetUpAutotest()
 
 
     //--- Input A
-    strcpy(fileName, "./modules/audio_coding/main/test/testfile32kHz.pcm");
+    strcpy(fileName, "./test/data/audio_coding/testfile32kHz.pcm");
     frequencyHz = 16000;
     _inFileA.Open(fileName, frequencyHz, "rb");
 
     //--- Output A
-    strcpy(fileName, "./modules/audio_coding/main/test/res_autotests/outAutotestA.pcm");
+    strcpy(fileName, "./src/modules/audio_coding/main/test/outAutotestA.pcm");
     frequencyHz = 16000;
     _outFileA.Open(fileName, frequencyHz, "wb");
-    strcpy(refFileName, "./modules/audio_coding/main/test/res_autotests/ref_outAutotestA.pcm");
+    strcpy(refFileName, "./src/modules/audio_coding/main/test/ref_outAutotestA.pcm");
     _outFileRefA.Open(refFileName, frequencyHz, "wb");
 
     //--- Input B
-    strcpy(fileName, "./modules/audio_coding/main/test/testfile32kHz.pcm");
+    strcpy(fileName, "./test/data/audio_coding/testfile32kHz.pcm");
     frequencyHz = 16000;
     _inFileB.Open(fileName, frequencyHz, "rb");
 
     //--- Output B
-    strcpy(fileName, "./modules/audio_coding/main/test/res_autotests/outAutotestB.pcm");
+    strcpy(fileName, "./src/modules/audio_coding/main/test/outAutotestB.pcm");
     frequencyHz = 16000;
     _outFileB.Open(fileName, frequencyHz, "wb");
-    strcpy(refFileName, "./modules/audio_coding/main/test/res_autotests/ref_outAutotestB.pcm");
+    strcpy(refFileName, "./src/modules/audio_coding/main/test/ref_outAutotestB.pcm");
     _outFileRefB.Open(refFileName, frequencyHz, "wb");
 
     //--- Set A-to-B channel
diff --git a/src/modules/audio_coding/main/test/iSACTest.cpp b/src/modules/audio_coding/main/test/iSACTest.cpp
index b1c011996d..5c6daff580 100644
--- a/src/modules/audio_coding/main/test/iSACTest.cpp
+++ b/src/modules/audio_coding/main/test/iSACTest.cpp
@@ -183,7 +183,7 @@ ISACTest::Setup()
     CHECK_ERROR(_acmB->RegisterTransportCallback(_channel_B2A));
     _channel_B2A->RegisterReceiverACM(_acmA);
 
-    strncpy(_fileNameSWB, "./modules/audio_coding/main/test/testfile32kHz.pcm",
+    strncpy(_fileNameSWB, "./test/data/audio_coding/testfile32kHz.pcm",
             MAX_FILE_NAME_LENGTH_BYTE);
 
     _acmB->RegisterSendCodec(_paramISAC16kHz);
@@ -201,15 +201,15 @@ ISACTest::Setup()
     _inFileA.Open(_fileNameSWB, 32000, "rb");
     if(_testMode == 0)
     {
-        char fileNameA[] = "./modules/audio_coding/main/test/res_autotests/testisac_a.pcm";
-        char fileNameB[] = "./modules/audio_coding/main/test/res_autotests/testisac_b.pcm";
+        char fileNameA[] = "./src/modules/audio_coding/main/test/testisac_a.pcm";
+        char fileNameB[] = "./src/modules/audio_coding/main/test/testisac_b.pcm";
         _outFileA.Open(fileNameA, 32000, "wb");
         _outFileB.Open(fileNameB, 32000, "wb");
     }
     else
     {
-        char fileNameA[] = "./modules/audio_coding/main/test/res_tests/testisac_a.pcm";
-        char fileNameB[] = "./modules/audio_coding/main/test/res_tests/testisac_b.pcm";
+        char fileNameA[] = "./src/modules/audio_coding/main/test/testisac_a.pcm";
+        char fileNameB[] = "./src/modules/audio_coding/main/test/testisac_b.pcm";
         _outFileA.Open(fileNameA, 32000, "wb");
         _outFileB.Open(fileNameB, 32000, "wb");
     }
@@ -394,14 +394,14 @@ ISACTest::EncodeDecode(
     if(_testMode == 0)
     {
         sprintf(fileNameOut,
-                "./modules/audio_coding/main/test/res_autotests/out_iSACTest_%s_%02d.pcm",
+                "./src/modules/audio_coding/main/test/out_iSACTest_%s_%02d.pcm",
                 "A",
                 testNr);
     }
     else
     {
         sprintf(fileNameOut,
-                "./modules/audio_coding/main/test/res_tests/out%s_%02d.pcm",
+                "./src/modules/audio_coding/main/test/out%s_%02d.pcm",
                 "A",
                 testNr);
     }
@@ -412,14 +412,14 @@ ISACTest::EncodeDecode(
     if(_testMode == 0)
     {
         sprintf(fileNameOut,
-                "./modules/audio_coding/main/test/res_autotests/out_iSACTest_%s_%02d.pcm",
+                "./src/modules/audio_coding/main/test/out_iSACTest_%s_%02d.pcm",
                 "B",
                 testNr);
     }
     else
     {
         sprintf(fileNameOut,
-                "./modules/audio_coding/main/test/res_tests/out%s_%02d.pcm",
+                "./src/modules/audio_coding/main/test/out%s_%02d.pcm",
                 "B",
                 testNr);
     }
@@ -503,7 +503,7 @@ ISACTest::SwitchingSamplingRate(
     if(_testMode == 0)
     {
         sprintf(fileNameOut,
-                "./modules/audio_coding/main/test/res_autotests/out_iSACTest_%s_%02d.pcm",
+                "./src/modules/audio_coding/main/test/out_iSACTest_%s_%02d.pcm",
                 "A",
                 testNr);
     }
@@ -512,7 +512,7 @@ ISACTest::SwitchingSamplingRate(
         printf("\nTest %d", testNr);
         printf("    Alternate between WB and SWB at the sender Side\n\n");
         sprintf(fileNameOut,
-                "./modules/audio_coding/main/test/res_tests/out%s_%02d.pcm",
+                "./src/modules/audio_coding/main/test/out%s_%02d.pcm",
                 "A",
                 testNr);
     }
@@ -523,13 +523,13 @@ ISACTest::SwitchingSamplingRate(
     if(_testMode == 0)
     {
         sprintf(fileNameOut,
-                "./modules/audio_coding/main/test/res_autotests/out_iSACTest_%s_%02d.pcm",
+                "./src/modules/audio_coding/main/test/out_iSACTest_%s_%02d.pcm",
                 "B",
                 testNr);
     }
     else
     {
-        sprintf(fileNameOut, "./modules/audio_coding/main/test/res_tests/out%s_%02d.pcm",
+        sprintf(fileNameOut, "./src/modules/audio_coding/main/test/out%s_%02d.pcm",
                 "B",
                 testNr);
     }
diff --git a/test/data/audio_coding/READ.ME b/test/data/audio_coding/READ.ME
index dff166ab3b..e42b9b3ebb 100644
--- a/test/data/audio_coding/READ.ME
+++ b/test/data/audio_coding/READ.ME
@@ -1,3 +1,8 @@
+Test files for Audio Coding Module
+
+testfile32kHz.pcm - mono speech file samples at 32 kHz
+teststereo32kHz.pcm - stereo speech file samples at 32 kHz
+
 Test and reference vectors to verify correct execution of PacketCable 
 iLBC Fixed Point Reference Code
 
@@ -6,7 +11,7 @@ Format: all .INP and .OUT files contain 16 bit sampled data using the
 Intel (PC) format. The .BIT files are stored in the appropriate byte 
 sequence (big-endian format).
 
-*.INP  - input files (located in the ../inFiles/ directory)
+*.INP  - input files
 *.BIT20 - bit stream files 20 ms mode
 *.OUT20 - output files 20 ms mode (on a channel without packet loss)
 *.BIT30 - bit stream files 30 ms mode