diff --git a/modules/audio_coding/codecs/iLBC/main/test/GeneratedFiles/info.txt b/modules/audio_coding/codecs/iLBC/main/test/GeneratedFiles/info.txt
deleted file mode 100644
index bb03b66631..0000000000
--- a/modules/audio_coding/codecs/iLBC/main/test/GeneratedFiles/info.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-iLBC 1.0.4
-
-Folder is intentionally empty.
-This is the location where the test script will put the generated output files (.BITXX and .OUTXX).
\ No newline at end of file
diff --git a/modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F00.BIT20 b/test/data/audio_coding/F00.BIT20
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F00.BIT20
rename to test/data/audio_coding/F00.BIT20
diff --git a/modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F00.BIT30 b/test/data/audio_coding/F00.BIT30
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F00.BIT30
rename to test/data/audio_coding/F00.BIT30
diff --git a/modules/audio_coding/codecs/iLBC/main/test/inFiles/F00.INP b/test/data/audio_coding/F00.INP
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/inFiles/F00.INP
rename to test/data/audio_coding/F00.INP
diff --git a/modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F00.OUT20 b/test/data/audio_coding/F00.OUT20
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F00.OUT20
rename to test/data/audio_coding/F00.OUT20
diff --git a/modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F00.OUT30 b/test/data/audio_coding/F00.OUT30
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F00.OUT30
rename to test/data/audio_coding/F00.OUT30
diff --git a/modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F00_tlm10.OUT20 b/test/data/audio_coding/F00_tlm10.OUT20
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F00_tlm10.OUT20
rename to test/data/audio_coding/F00_tlm10.OUT20
diff --git a/modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F00_tlm10.OUT30 b/test/data/audio_coding/F00_tlm10.OUT30
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F00_tlm10.OUT30
rename to test/data/audio_coding/F00_tlm10.OUT30
diff --git a/modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F01.BIT20 b/test/data/audio_coding/F01.BIT20
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F01.BIT20
rename to test/data/audio_coding/F01.BIT20
diff --git a/modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F01.BIT30 b/test/data/audio_coding/F01.BIT30
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F01.BIT30
rename to test/data/audio_coding/F01.BIT30
diff --git a/modules/audio_coding/codecs/iLBC/main/test/inFiles/F01.INP b/test/data/audio_coding/F01.INP
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/inFiles/F01.INP
rename to test/data/audio_coding/F01.INP
diff --git a/modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F01.OUT20 b/test/data/audio_coding/F01.OUT20
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F01.OUT20
rename to test/data/audio_coding/F01.OUT20
diff --git a/modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F01.OUT30 b/test/data/audio_coding/F01.OUT30
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F01.OUT30
rename to test/data/audio_coding/F01.OUT30
diff --git a/modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F01_tlm10.OUT20 b/test/data/audio_coding/F01_tlm10.OUT20
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F01_tlm10.OUT20
rename to test/data/audio_coding/F01_tlm10.OUT20
diff --git a/modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F01_tlm10.OUT30 b/test/data/audio_coding/F01_tlm10.OUT30
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F01_tlm10.OUT30
rename to test/data/audio_coding/F01_tlm10.OUT30
diff --git a/modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F02.BIT20 b/test/data/audio_coding/F02.BIT20
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F02.BIT20
rename to test/data/audio_coding/F02.BIT20
diff --git a/modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F02.BIT30 b/test/data/audio_coding/F02.BIT30
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F02.BIT30
rename to test/data/audio_coding/F02.BIT30
diff --git a/modules/audio_coding/codecs/iLBC/main/test/inFiles/F02.INP b/test/data/audio_coding/F02.INP
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/inFiles/F02.INP
rename to test/data/audio_coding/F02.INP
diff --git a/modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F02.OUT20 b/test/data/audio_coding/F02.OUT20
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F02.OUT20
rename to test/data/audio_coding/F02.OUT20
diff --git a/modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F02.OUT30 b/test/data/audio_coding/F02.OUT30
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F02.OUT30
rename to test/data/audio_coding/F02.OUT30
diff --git a/modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F02_tlm10.OUT20 b/test/data/audio_coding/F02_tlm10.OUT20
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F02_tlm10.OUT20
rename to test/data/audio_coding/F02_tlm10.OUT20
diff --git a/modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F02_tlm10.OUT30 b/test/data/audio_coding/F02_tlm10.OUT30
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F02_tlm10.OUT30
rename to test/data/audio_coding/F02_tlm10.OUT30
diff --git a/modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F03.BIT20 b/test/data/audio_coding/F03.BIT20
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F03.BIT20
rename to test/data/audio_coding/F03.BIT20
diff --git a/modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F03.BIT30 b/test/data/audio_coding/F03.BIT30
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F03.BIT30
rename to test/data/audio_coding/F03.BIT30
diff --git a/modules/audio_coding/codecs/iLBC/main/test/inFiles/F03.INP b/test/data/audio_coding/F03.INP
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/inFiles/F03.INP
rename to test/data/audio_coding/F03.INP
diff --git a/modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F03.OUT20 b/test/data/audio_coding/F03.OUT20
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F03.OUT20
rename to test/data/audio_coding/F03.OUT20
diff --git a/modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F03.OUT30 b/test/data/audio_coding/F03.OUT30
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F03.OUT30
rename to test/data/audio_coding/F03.OUT30
diff --git a/modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F04.BIT20 b/test/data/audio_coding/F04.BIT20
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F04.BIT20
rename to test/data/audio_coding/F04.BIT20
diff --git a/modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F04.BIT30 b/test/data/audio_coding/F04.BIT30
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F04.BIT30
rename to test/data/audio_coding/F04.BIT30
diff --git a/modules/audio_coding/codecs/iLBC/main/test/inFiles/F04.INP b/test/data/audio_coding/F04.INP
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/inFiles/F04.INP
rename to test/data/audio_coding/F04.INP
diff --git a/modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F04.OUT20 b/test/data/audio_coding/F04.OUT20
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F04.OUT20
rename to test/data/audio_coding/F04.OUT20
diff --git a/modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F04.OUT30 b/test/data/audio_coding/F04.OUT30
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F04.OUT30
rename to test/data/audio_coding/F04.OUT30
diff --git a/modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F05.BIT20 b/test/data/audio_coding/F05.BIT20
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F05.BIT20
rename to test/data/audio_coding/F05.BIT20
diff --git a/modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F05.BIT30 b/test/data/audio_coding/F05.BIT30
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F05.BIT30
rename to test/data/audio_coding/F05.BIT30
diff --git a/modules/audio_coding/codecs/iLBC/main/test/inFiles/F05.INP b/test/data/audio_coding/F05.INP
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/inFiles/F05.INP
rename to test/data/audio_coding/F05.INP
diff --git a/modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F05.OUT20 b/test/data/audio_coding/F05.OUT20
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F05.OUT20
rename to test/data/audio_coding/F05.OUT20
diff --git a/modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F05.OUT30 b/test/data/audio_coding/F05.OUT30
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F05.OUT30
rename to test/data/audio_coding/F05.OUT30
diff --git a/modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F06.BIT20 b/test/data/audio_coding/F06.BIT20
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F06.BIT20
rename to test/data/audio_coding/F06.BIT20
diff --git a/modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F06.BIT30 b/test/data/audio_coding/F06.BIT30
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F06.BIT30
rename to test/data/audio_coding/F06.BIT30
diff --git a/modules/audio_coding/codecs/iLBC/main/test/inFiles/F06.INP b/test/data/audio_coding/F06.INP
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/inFiles/F06.INP
rename to test/data/audio_coding/F06.INP
diff --git a/modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F06.OUT20 b/test/data/audio_coding/F06.OUT20
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F06.OUT20
rename to test/data/audio_coding/F06.OUT20
diff --git a/modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F06.OUT30 b/test/data/audio_coding/F06.OUT30
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/F06.OUT30
rename to test/data/audio_coding/F06.OUT30
diff --git a/modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/READ.ME b/test/data/audio_coding/READ.ME
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/ReferenceVectors/READ.ME
rename to test/data/audio_coding/READ.ME
diff --git a/modules/audio_coding/codecs/iLBC/main/test/inFiles/clean.chn b/test/data/audio_coding/clean.chn
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/inFiles/clean.chn
rename to test/data/audio_coding/clean.chn
diff --git a/test/data/audio_coding/testfile32kHz.pcm b/test/data/audio_coding/testfile32kHz.pcm
new file mode 100644
index 0000000000..cd4bd2ba5a
Binary files /dev/null and b/test/data/audio_coding/testfile32kHz.pcm differ
diff --git a/test/data/audio_coding/teststereo32kHz.pcm b/test/data/audio_coding/teststereo32kHz.pcm
new file mode 100644
index 0000000000..9b84b62dc4
Binary files /dev/null and b/test/data/audio_coding/teststereo32kHz.pcm differ
diff --git a/modules/audio_coding/codecs/iLBC/main/test/inFiles/tlm10.chn b/test/data/audio_coding/tlm10.chn
similarity index 100%
rename from modules/audio_coding/codecs/iLBC/main/test/inFiles/tlm10.chn
rename to test/data/audio_coding/tlm10.chn