diff --git a/scripts/config/ci_linux.json b/scripts/config/ci_linux.json
index e8db23c8ea6516be42070fdc6cb818eac4b30396..23aee75ba7f2daeef62481c518216a7f389a29df 100644
--- a/scripts/config/ci_linux.json
+++ b/scripts/config/ci_linux.json
@@ -2,16 +2,16 @@
     "afspPath": "not_needed",
     "utilPath": "not_needed",
     "inpaths": {
-        "MONO": "/usr/local/testv/all_mono.wav",
-        "STEREO": "/usr/local/testv/all_stereo_speech_ITU_concat.wav",
-        "FOA": "/usr/local/testv/test_FOA_v3.wav",
-        "HOA2": "/usr/local/testv/test_HOA2_v3.wav",
-        "HOA3": "/usr/local/testv/test_HOA3_v3.wav",
-        "SBA": "/usr/local/testv/test_HOA3_v3.wav",
-        "MASA1TC1DIR": "/usr/local/testv/test_HOA3_v3_1dir_MASA1TC.wav",
-        "MASA1TC2DIR": "/usr/local/testv/test_HOA3_v3_2dir_MASA1TC.wav",
-        "MASA2TC1DIR": "/usr/local/testv/test_HOA3_v3_1dir_MASA2TC.wav",
-        "MASA2TC2DIR": "/usr/local/testv/test_HOA3_v3_2dir_MASA2TC.wav",
+        "MONO": "/usr/local/testv/test_mono.wav",
+        "STEREO": "/usr/local/testv/test_stereo.wav",
+        "FOA": "/usr/local/testv/test_FOA.wav",
+        "HOA2": "/usr/local/testv/test_HOA2.wav",
+        "HOA3": "/usr/local/testv/test_HOA3.wav",
+        "SBA": "/usr/local/testv/test_HOA3.wav",
+        "MASA1TC1DIR": "/usr/local/testv/test_MASA_1dir1TC.wav",
+        "MASA1TC2DIR": "/usr/local/testv/test_MASA_2dir1TC.wav",
+        "MASA2TC1DIR": "/usr/local/testv/test_MASA_1dir2TC.wav",
+        "MASA2TC2DIR": "/usr/local/testv/test_MASA_2dir2TC.wav",
         "5_1": "/usr/local/testv/test_MC51.wav",
         "5_1_2": "/usr/local/testv/test_MC51p2.wav",
         "5_1_4": "/usr/local/testv/test_MC51p4.wav",
diff --git a/scripts/ivas_pytests/tests/system_tests/test_spar_foa_bs_enc.py b/scripts/ivas_pytests/tests/system_tests/test_spar_foa_bs_enc.py
index d8ed5ac83f8665082575eaf1a31076f67fc959db..df5d018ce50106deae5cbb62aff1c81ec42ade6a 100644
--- a/scripts/ivas_pytests/tests/system_tests/test_spar_foa_bs_enc.py
+++ b/scripts/ivas_pytests/tests/system_tests/test_spar_foa_bs_enc.py
@@ -48,8 +48,8 @@ from conftest import EncoderFrontend, DecoderFrontend
 
 #params
 tag_list = ['stvFOA']
-tag_list_HOA2 = ['test_HOA2_v3']
-tag_list_HOA3 = ['test_HOA3_v3']
+tag_list_HOA2 = ['test_HOA2']
+tag_list_HOA3 = ['test_HOA3']
 
 tag_list_bw_force = ['stvFOA']
 dtx_set = ['0', '1']
diff --git a/scripts/testv/all_mono.wav b/scripts/testv/all_mono.wav
deleted file mode 100644
index 8d08faa294050499a47d98a9ddeb878c5255108d..0000000000000000000000000000000000000000
--- a/scripts/testv/all_mono.wav
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a976b276c887ed6d75bee7c22010e749709ff9aae855a8479fcd121b37ea55c2
-size 480044
diff --git a/scripts/testv/all_stereo_speech_ITU_concat.wav b/scripts/testv/all_stereo_speech_ITU_concat.wav
deleted file mode 100644
index 6c2eabd97954767686082fad9af81edc3ecc0477..0000000000000000000000000000000000000000
--- a/scripts/testv/all_stereo_speech_ITU_concat.wav
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d8e497b907a9012719237e666dc4fc9c13cc2a70b4c7af888abd8c7c7a154409
-size 965544
diff --git a/scripts/testv/stv514MC48c.pcm b/scripts/testv/stv514MC48c.pcm
index 9b74316f6f8cee3406918694d18c5124ab3455f1..37c80b7eef6d0f88c955f4aadfd7a999a47f00c3 100644
--- a/scripts/testv/stv514MC48c.pcm
+++ b/scripts/testv/stv514MC48c.pcm
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0522de717b42f19597beb4a923343f21270f979b5b05afe97db17a53d5520156
-size 2562560
+oid sha256:b82dfc9cc7ddfb53cf8233934d14f6b61b1bec10f2a3648ee603a92793a2ce32
+size 2880000
diff --git a/scripts/testv/test_FOA.wav b/scripts/testv/test_FOA.wav
new file mode 100644
index 0000000000000000000000000000000000000000..fd654bb7ed178008f82e318d3a5b50a044d12533
--- /dev/null
+++ b/scripts/testv/test_FOA.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9299bbe0637a72ab5419febfff4614066bda4ed8a58ffed19d068d17d4df46e0
+size 7680330
diff --git a/scripts/testv/test_FOA_v3.wav b/scripts/testv/test_FOA_v3.wav
deleted file mode 100644
index cdea336841fd97106cbcdba809ca18887ca763c5..0000000000000000000000000000000000000000
--- a/scripts/testv/test_FOA_v3.wav
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cbb5972bf721508dd027cbbfee9691b5e7a99b5f9859140fd21985a1016806f8
-size 1925544
diff --git a/scripts/testv/test_HOA2.wav b/scripts/testv/test_HOA2.wav
new file mode 100644
index 0000000000000000000000000000000000000000..e076c35ab8521f5dd643a742034dede9e6559edf
--- /dev/null
+++ b/scripts/testv/test_HOA2.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:daa96c69bcf085746add3c41db6e2082e1c691c1bf5ad85a8a815b0155caffe4
+size 17280580
diff --git a/scripts/testv/test_HOA2_v3.wav b/scripts/testv/test_HOA2_v3.wav
deleted file mode 100644
index 2d953b225927f5e15ae63780c9a82180f81d08a7..0000000000000000000000000000000000000000
--- a/scripts/testv/test_HOA2_v3.wav
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cc3ef82c6ffe538f0b54799fe1c6a643ea09140f41252ee58f34d777c5bfdf5b
-size 4325544
diff --git a/scripts/testv/test_HOA3.wav b/scripts/testv/test_HOA3.wav
new file mode 100644
index 0000000000000000000000000000000000000000..811f8b58039109ee54eeb97b0d40c4b8b5886803
--- /dev/null
+++ b/scripts/testv/test_HOA3.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fef816a7ca44d528ff6d56c431fbd81a82b4cae5c7bd86c7770493427e9d3ffc
+size 30720930
diff --git a/scripts/testv/test_HOA3_v3.wav b/scripts/testv/test_HOA3_v3.wav
deleted file mode 100644
index dce49eeb567317be3c1922264ce84f2b0d308c13..0000000000000000000000000000000000000000
--- a/scripts/testv/test_HOA3_v3.wav
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e5978d922d9a5b327633f11d0caff3a3b70289fa4c9e2758dbb03a13a972df2c
-size 7685544
diff --git a/scripts/testv/test_HOA3_v3_1dir_MASA1TC.met b/scripts/testv/test_HOA3_v3_1dir_MASA1TC.met
deleted file mode 100644
index d8ce50553e9d2a0b97e4fdfaad41e67dbf04b2d6..0000000000000000000000000000000000000000
--- a/scripts/testv/test_HOA3_v3_1dir_MASA1TC.met
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:51b739691ce2200ede35959545516ffc2903e9e0a385f364b7ca96d370bcfe7e
-size 204600
diff --git a/scripts/testv/test_HOA3_v3_1dir_MASA1TC.wav b/scripts/testv/test_HOA3_v3_1dir_MASA1TC.wav
deleted file mode 100644
index 8d08faa294050499a47d98a9ddeb878c5255108d..0000000000000000000000000000000000000000
--- a/scripts/testv/test_HOA3_v3_1dir_MASA1TC.wav
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a976b276c887ed6d75bee7c22010e749709ff9aae855a8479fcd121b37ea55c2
-size 480044
diff --git a/scripts/testv/test_HOA3_v3_1dir_MASA2TC.met b/scripts/testv/test_HOA3_v3_1dir_MASA2TC.met
deleted file mode 100644
index c6dddc5119b089a9b96ecb812cc273bbeea419e9..0000000000000000000000000000000000000000
--- a/scripts/testv/test_HOA3_v3_1dir_MASA2TC.met
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6b3068867aff95480921e4c0c24189acd750c2f01ee121d293eb56d03bb1d53c
-size 204600
diff --git a/scripts/testv/test_HOA3_v3_1dir_MASA2TC.wav b/scripts/testv/test_HOA3_v3_1dir_MASA2TC.wav
deleted file mode 100644
index 6c2eabd97954767686082fad9af81edc3ecc0477..0000000000000000000000000000000000000000
--- a/scripts/testv/test_HOA3_v3_1dir_MASA2TC.wav
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d8e497b907a9012719237e666dc4fc9c13cc2a70b4c7af888abd8c7c7a154409
-size 965544
diff --git a/scripts/testv/test_HOA3_v3_2dir_MASA1TC.wav b/scripts/testv/test_HOA3_v3_2dir_MASA1TC.wav
deleted file mode 100644
index 8d08faa294050499a47d98a9ddeb878c5255108d..0000000000000000000000000000000000000000
--- a/scripts/testv/test_HOA3_v3_2dir_MASA1TC.wav
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a976b276c887ed6d75bee7c22010e749709ff9aae855a8479fcd121b37ea55c2
-size 480044
diff --git a/scripts/testv/test_HOA3_v3_2dir_MASA2TC.met b/scripts/testv/test_HOA3_v3_2dir_MASA2TC.met
deleted file mode 100644
index 1540ff84121a128bb1ad4b0094328a2d52e69c04..0000000000000000000000000000000000000000
--- a/scripts/testv/test_HOA3_v3_2dir_MASA2TC.met
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fdede8c947adc2a370ceeb3c0a824d3631c9e091dd5f55587e85804e69f3bde5
-size 319800
diff --git a/scripts/testv/test_HOA3_v3_2dir_MASA2TC.wav b/scripts/testv/test_HOA3_v3_2dir_MASA2TC.wav
deleted file mode 100644
index 6c2eabd97954767686082fad9af81edc3ecc0477..0000000000000000000000000000000000000000
--- a/scripts/testv/test_HOA3_v3_2dir_MASA2TC.wav
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d8e497b907a9012719237e666dc4fc9c13cc2a70b4c7af888abd8c7c7a154409
-size 965544
diff --git a/scripts/testv/test_ISM_1obj.wav b/scripts/testv/test_ISM_1obj.wav
index 8d08faa294050499a47d98a9ddeb878c5255108d..b75df181b21d471a186bd4ba51eccd0aedcff8a4 100644
--- a/scripts/testv/test_ISM_1obj.wav
+++ b/scripts/testv/test_ISM_1obj.wav
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a976b276c887ed6d75bee7c22010e749709ff9aae855a8479fcd121b37ea55c2
-size 480044
+oid sha256:6ecc1d851c8c7f7ecf41e1b16abf01d35d37389584128537181add6f55530a9f
+size 2880106
diff --git a/scripts/testv/test_ISM_2obj.wav b/scripts/testv/test_ISM_2obj.wav
index 6c2eabd97954767686082fad9af81edc3ecc0477..a185618ec720afb6b0d7f23b245b525c75dc080f 100644
--- a/scripts/testv/test_ISM_2obj.wav
+++ b/scripts/testv/test_ISM_2obj.wav
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d8e497b907a9012719237e666dc4fc9c13cc2a70b4c7af888abd8c7c7a154409
-size 965544
+oid sha256:41825bb3378c8a9657bc3ae4dbebda7a54591f5a7aae6de7f4c6cf077e9c8df0
+size 5760106
diff --git a/scripts/testv/test_ISM_3obj.wav b/scripts/testv/test_ISM_3obj.wav
index 2d7e619cd97cfaa8fa8068961da138f798cb0e19..2ce33435357ace6f7c973fbdbfe038272edb2acb 100644
--- a/scripts/testv/test_ISM_3obj.wav
+++ b/scripts/testv/test_ISM_3obj.wav
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:76ab1b1d9a4aad69d32567ea2619c54f09fbd33b796a4499a99a27a4c6f66aaa
-size 1445544
+oid sha256:235749b6b4f6e76c4dccbd8d9ece32bf979ce8b77b7ca4402bb5ca8c159f8acc
+size 8640130
diff --git a/scripts/testv/test_ISM_4obj.wav b/scripts/testv/test_ISM_4obj.wav
index cdea336841fd97106cbcdba809ca18887ca763c5..e50b2d5cbdea95e8a47e288aa39080cff14334be 100644
--- a/scripts/testv/test_ISM_4obj.wav
+++ b/scripts/testv/test_ISM_4obj.wav
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cbb5972bf721508dd027cbbfee9691b5e7a99b5f9859140fd21985a1016806f8
-size 1925544
+oid sha256:98bfb96a3b238a3e4004c07644932d35571f42d566f3278a6cf4bf6b080c1d1a
+size 11520130
diff --git a/scripts/testv/test_MASA_1dir1TC.met b/scripts/testv/test_MASA_1dir1TC.met
new file mode 100644
index 0000000000000000000000000000000000000000..f2ce23bd2054140614b7d2ad88769d5d2db77990
--- /dev/null
+++ b/scripts/testv/test_MASA_1dir1TC.met
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6349efe3448d28979b80744bcdc29d57f1c025704939b42d7b913d7fc3f23ccc
+size 102300
diff --git a/scripts/testv/test_MASA_1dir1TC.wav b/scripts/testv/test_MASA_1dir1TC.wav
new file mode 100644
index 0000000000000000000000000000000000000000..9291feeee3971775f90639b262845ecd19f990fd
--- /dev/null
+++ b/scripts/testv/test_MASA_1dir1TC.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:54ea4543e4d6d43c312f1e461a75a3d8ce18e34bfb5777f15f2e494dd277d2e5
+size 288106
diff --git a/scripts/testv/test_MASA_1dir2TC.met b/scripts/testv/test_MASA_1dir2TC.met
new file mode 100644
index 0000000000000000000000000000000000000000..00acdae5394c5d40e9193d7dd9cd1fee6d182c24
--- /dev/null
+++ b/scripts/testv/test_MASA_1dir2TC.met
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5a1f87bfe360dbd221a94583aa68a58ef050e968a63351730d643f2dc2cac4e1
+size 204600
diff --git a/scripts/testv/test_MASA_1dir2TC.wav b/scripts/testv/test_MASA_1dir2TC.wav
new file mode 100644
index 0000000000000000000000000000000000000000..aefec77efe5edf936ac1ce6fc86f6a7dfc11fb92
--- /dev/null
+++ b/scripts/testv/test_MASA_1dir2TC.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ab7437cdf41e56338c93f5e593118a112a48bae5138be2cdd301eff5da59bb06
+size 1152106
diff --git a/scripts/testv/test_HOA3_v3_2dir_MASA1TC.met b/scripts/testv/test_MASA_2dir1TC.met
similarity index 100%
rename from scripts/testv/test_HOA3_v3_2dir_MASA1TC.met
rename to scripts/testv/test_MASA_2dir1TC.met
diff --git a/scripts/testv/test_MASA_2dir1TC.wav b/scripts/testv/test_MASA_2dir1TC.wav
new file mode 100644
index 0000000000000000000000000000000000000000..c80192b76bd05f869e1bd20859bbb3fbf818c9ad
--- /dev/null
+++ b/scripts/testv/test_MASA_2dir1TC.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b45ecb01efdc7a5d9877c9adcee2aad632ffde326dbc76554cb0452a78e3954d
+size 576106
diff --git a/scripts/testv/test_MASA_2dir2TC.met b/scripts/testv/test_MASA_2dir2TC.met
new file mode 100644
index 0000000000000000000000000000000000000000..1b62022af572fc4f198e4212cca88d51913ec3c4
--- /dev/null
+++ b/scripts/testv/test_MASA_2dir2TC.met
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2eb412d646d7a32c77413dea54dc44cf45dc49e6d8c2de19abe4f4b93a91fa4a
+size 159900
diff --git a/scripts/testv/test_MASA_2dir2TC.wav b/scripts/testv/test_MASA_2dir2TC.wav
new file mode 100644
index 0000000000000000000000000000000000000000..0f72267ea03c634f752c2c755294245cce8222b2
--- /dev/null
+++ b/scripts/testv/test_MASA_2dir2TC.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a5a0379965053087ef1ce4775c85384e8c06aaa8161f12888f5e5c06d8612c1f
+size 576106
diff --git a/scripts/testv/test_MC51.wav b/scripts/testv/test_MC51.wav
index d320555b1a70bff1dc84a2c8caa290365af56074..334d8197450f2c3a998142064c8d6b77d90f00a1 100644
--- a/scripts/testv/test_MC51.wav
+++ b/scripts/testv/test_MC51.wav
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:620da9398ec1fb6f18ffc782070d592ce2f7d5170493686cbfef62406f1f1f4e
-size 2885544
+oid sha256:3a077210fb3ab4f4a8f04ab37a7813e474f3dfb3dbd927b71484e03986cb042a
+size 11520130
diff --git a/scripts/testv/test_MC51p2.wav b/scripts/testv/test_MC51p2.wav
index c3a3eee232b635702c7f8ca3189f1685b8cdd59a..e696a7dae647dfaa2b0ceccd1a94d0d45788b2ea 100644
--- a/scripts/testv/test_MC51p2.wav
+++ b/scripts/testv/test_MC51p2.wav
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4b8f455b2f6eac513d69e53dbe2a32f773fc91672c7b6a1da70dbd8d49a49b6f
-size 3845544
+oid sha256:d056d0c1b412c1e8507872212f18bf333a91aac17358eae6a59c7a76f1bb0aaf
+size 2304130
diff --git a/scripts/testv/test_MC51p4.wav b/scripts/testv/test_MC51p4.wav
index 54bcef364c34588dc342370ba84d190fde71f6c6..3d1c7812a48766f0917636b7419798ac7f6c4db3 100644
--- a/scripts/testv/test_MC51p4.wav
+++ b/scripts/testv/test_MC51p4.wav
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e0fee61f4545696e02d6aaa221eeba649e83692f32749dd307239d0bee2116bd
-size 4805544
+oid sha256:eddaf145410ca04daba554a719c58ed391159c7d73e6ea140d2b5de250929366
+size 2880130
diff --git a/scripts/testv/test_MC71.wav b/scripts/testv/test_MC71.wav
index c3a3eee232b635702c7f8ca3189f1685b8cdd59a..2a0b012ab051c2681cbee56d3165413cd531ae1c 100644
--- a/scripts/testv/test_MC71.wav
+++ b/scripts/testv/test_MC71.wav
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4b8f455b2f6eac513d69e53dbe2a32f773fc91672c7b6a1da70dbd8d49a49b6f
-size 3845544
+oid sha256:d0ac38ddb16b2ce9cbca27965c5aedaf1af857a6fdce340bc01322794311e92d
+size 2304130
diff --git a/scripts/testv/test_MC71p4.wav b/scripts/testv/test_MC71p4.wav
index 511baceb9d4cdb3a94fa551c2501c62750736a60..9d0c1e594e0921e7fff3ee30a16c42456b04d35d 100644
--- a/scripts/testv/test_MC71p4.wav
+++ b/scripts/testv/test_MC71p4.wav
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:95af38dce3c08766124c1991d9f49b5b1e06ace008e6e192aa00b3a4a03b49cb
-size 5765544
+oid sha256:e1f3fa943f86082be69a774280379f179f4bd51f221ee7aad6471c0310a9f4ab
+size 3456130
diff --git a/scripts/testv/test_mono.wav b/scripts/testv/test_mono.wav
new file mode 100644
index 0000000000000000000000000000000000000000..b841d174c36143796ce18f8c9376807d46183594
--- /dev/null
+++ b/scripts/testv/test_mono.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5daeac3fb92d487fc7ded7d1a4a9e6295d2f2f27f59f19dcdaeebaae01908a86
+size 1920106
diff --git a/scripts/testv/test_stereo.wav b/scripts/testv/test_stereo.wav
new file mode 100644
index 0000000000000000000000000000000000000000..70dc46062ec79e6fac58fb6a7531c775700eac5e
--- /dev/null
+++ b/scripts/testv/test_stereo.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e0de400200071a7b26de03eaef88b49efce7a5df813b971336ed17b90ba02aa2
+size 3840106