diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 153b0ca11abb42805c86b17052bd916500fe3bc5..2576bc96aed7064958bf01c0c7ec8ced54a8e8f2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -379,6 +379,17 @@ branch-is-up-to-date-with-main-pre:
     - echo $commits_behind_count
     - if [ $commits_behind_count -eq 0 ]; then exit 0; else echo "Your branch is behind main, run 'git merge origin/main' to update."; exit 1; fi;
 
+check-self-test-names-pre:
+  extends:
+    - .rules-merge-request
+  stage: prevalidate
+  needs: []
+  tags:
+    - ivas-linux
+  script:
+    - python3 ci/check_self_test_names.py scripts/config/self_test.prm 135
+
+
 branch-is-up-to-date-with-main-post:
   extends:
     - .rules-merge-request
@@ -1340,22 +1351,17 @@ ivas-conformance:
   timeout: "60 minutes"
   rules:
     - if: ($CI_PIPELINE_SOURCE == 'web' || $CI_PIPELINE_SOURCE == 'trigger') && $MANUAL_PIPELINE_TYPE == 'ivas-conformance'
+    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
   allow_failure:
     exit_codes:
       - 123
   script:
     - *print-common-info-windows
-    # Prepare reference exec, use tests and scripts from reference
-    - $source_branch_commit_sha = $(git rev-parse HEAD)
-    - git checkout main # This should be set to a relevant reference
-    - git pull # Ensure to get the latest version
     - python .\scripts\strip_split_rendering.py
     - MSBuild.exe -maxcpucount .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Debug    
     - cp -force IVAS_cod.exe IVAS_cod_ref.exe
     - cp -force IVAS_dec.exe IVAS_dec_ref.exe
     - cp -force IVAS_rend.exe IVAS_rend_ref.exe
-    - git restore .
-    - git checkout $source_branch_commit_sha
     
     # Reference creation
     - python tests/create_short_testvectors.py
@@ -1370,12 +1376,16 @@ ivas-conformance:
     
     # Copy input data and output ref data
     - if (Test-Path testvec) {rm -r -force testvec}
+    - if (Test-Path TMP_DEC) {rm -r -force TMP_DEC}
+    - if (Test-Path TMP_ENC) {rm -r -force TMP_ENC}    
+    - if (Test-Path TMP_JBM) {rm -r -force TMP_JBM}
+    - if (Test-Path TMP_REND) {rm -r -force TMP_REND}
     - mkdir testvec
     - mkdir testvec/binauralRenderer_interface
     - mkdir testvec/testv
     - mkdir testvec/testv/renderer
     - mkdir testvec/bin    
-    - cp -r -force -ErrorAction Ignore scripts/testv/* testvec/testv
+    - cp    -force -ErrorAction Ignore scripts/testv/* testvec/testv
     - cp -r -force -ErrorAction Ignore scripts/ls_layouts testvec
     - cp -r -force -ErrorAction Ignore scripts/switchPaths testvec
     - cp -r -force -ErrorAction Ignore scripts/trajectories testvec
@@ -1425,16 +1435,10 @@ ivas-conformance-linux:
       - 123
   script:
     - *print-common-info
-    # Prepare reference exec, use tests and scripts from reference
-    - source_branch_commit_sha=$(git rev-parse HEAD)
-    - git checkout main # This should be set to a relevant reference
-    
     - make -j
     - cp IVAS_cod IVAS_cod_ref
     - cp IVAS_dec IVAS_dec_ref
     - cp IVAS_rend IVAS_rend_ref
-    - git restore .
-    - git checkout $source_branch_commit_sha
     
     # Reference creation
     - python3 tests/create_short_testvectors.py
diff --git a/ci/check_self_test_names.py b/ci/check_self_test_names.py
new file mode 100644
index 0000000000000000000000000000000000000000..18943e918dd1a2a17370c41254a90166dc1852d1
--- /dev/null
+++ b/ci/check_self_test_names.py
@@ -0,0 +1,59 @@
+#!/usr/bin/env python3
+"""
+   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
+   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
+   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
+   contributors to this repository. All Rights Reserved.
+
+   This software is protected by copyright law and by international treaties.
+   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
+   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
+   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
+   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
+   contributors to this repository retain full ownership rights in their respective contributions in
+   the software. This notice grants no license of any kind, including but not limited to patent
+   license, nor is any license granted by implication, estoppel or otherwise.
+
+   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
+   contributions.
+
+   This software is provided "AS IS", without any express or implied warranties. The software is in the
+   development stage. It is intended exclusively for experts who have experience with such software and
+   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
+   and fitness for a particular purpose are hereby disclaimed and excluded.
+
+   Any dispute, controversy or claim arising under or in relation to providing this software shall be
+   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
+   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
+   the United Nations Convention on Contracts on the International Sales of Goods.
+"""
+import argparse
+import sys
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser()
+    parser.add_argument("prm_file", type=str)
+    parser.add_argument("max_length", type=int)
+    args = parser.parse_args()
+
+    skiplines = 8
+    exceeded = []
+    with open(args.prm_file, "r") as f:
+        for line in f:
+            if skiplines > 0:
+                skiplines = skiplines - 1
+            else:
+                if "//" in line and len(line) > args.max_length:
+                    exceeded.append(line)
+
+    if exceeded:
+        print(
+            f"Failed! *** Following tests cases exceeded the limit of {args.max_length} characters ***\n"
+        )
+        print("\n".join(exceeded))
+        sys.exit(-1)
+
+    print("All OK")
+    sys.exit(0)
diff --git a/scripts/config/self_test.prm b/scripts/config/self_test.prm
index 2e9886b9ffcfd1343b478c46bce31b7a5a3beffd..e3e1a31114d97be31cace9e45e7bacc718fdabff 100644
--- a/scripts/config/self_test.prm
+++ b/scripts/config/self_test.prm
@@ -533,7 +533,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -dtx -ism 4 testv/stvISM1.csv NULL NULL testv/stvISM4.csv ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/stv4ISM48n.wav bit
 ../IVAS_dec HOA3 48 bit testv/stv4ISM48n.wav_brate_sw_48-48_DTX_hoa3.tst
 
-// 4 ISM with and without metadata bitrate switching from 24.4 kbps to 256 kbps, 48 kHz in, 48 kHz out, DTX on, BINAURAL_ROOM_IR out (Model from file)
+// 4 ISM w and wo md br switching 24.4 kbps to 256 kbps, 48 kHz in, 48 kHz out, DTX on, BINAURAL_ROOM_IR out (Model from file)
 ../IVAS_cod -dtx -ism 4 testv/stvISM1.csv NULL NULL testv/stvISM4.csv ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/stv4ISM48n.wav bit
 ../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin BINAURAL_ROOM_IR 48 bit testv/stv4ISM48n.wav_brate_sw_48-48_DTX_hoa3.tst
 
@@ -1320,7 +1320,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -mc 7_1_4 512000 48 testv/stv714MC48c.wav bit
 ../IVAS_dec -render_config testv/rend_config_ER_v2.cfg BINAURAL_ROOM_REVERB 48 bit testv/stv714MC48c.wav_MC714_512000_48-48_MC_ER_v2.tst
 
-// Multi-channel 7_1_4 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out Config early reflections, low complexity, listener origin
+// Multi-channel 7_1_4 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out Conf early refl, low complexity, listener origin
 ../IVAS_cod -mc 7_1_4 512000 48 testv/stv714MC48c.wav bit
 ../IVAS_dec -render_config testv/rend_config_ER_v3.cfg BINAURAL_ROOM_REVERB 48 bit testv/stv714MC48c.wav_MC714_512000_48-48_MC_ER_v3.tst
 
@@ -1726,7 +1726,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -ism_sba 4 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv ../scripts/switchPaths/sw_13k2_512k.bin 32 testv/stvOSBA_4ISM_3OA32c.wav bit
 ../IVAS_dec EXT 48 bit testv/stvOSBA_4ISM_3OA32c.wav_EXT_sw_13k2_512k_32-48.tst
 
-// OSBA FOA 4ISM at bitrate switching 13.2 to 512 kbps, 48kHz in, 16kHz out, BINAURAL out (Model from file), FER at 5%, bandwidth switching
+// OSBA FOA 4ISM at br sw 13.2 to 512 kbps, 48kHz in, 16kHz out, BINAURAL out (Model from file), FER at 5%, bandwidth switching
 ../IVAS_cod -max_band testv/ivas_bws_20fr_start_FB.txt -ism_sba 4 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stvOSBA_4ISM_FOA48c.wav bit
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL 16 bit_error testv/stvOSBA_4ISM_FOA48c.wav_BINAURAL_sw_48-48_FER5.tst
diff --git a/scripts/config/self_test_ltv.prm b/scripts/config/self_test_ltv.prm
index 690d3ed897cfe6bf0831b51aefd2bd5a14944323..91cebec595a4a70d460b786aa69852f963f25a2f 100644
--- a/scripts/config/self_test_ltv.prm
+++ b/scripts/config/self_test_ltv.prm
@@ -532,7 +532,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -dtx -ism 4 testv/ltvISM1.csv NULL NULL testv/ltvISM4.csv ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/ltv48_4ISM.wav bit
 ../IVAS_dec HOA3 48 bit testv/ltv48_4ISM.wav_brate_sw_48-48_DTX_hoa3.tst
 
-// 4 ISM with and without metadata bitrate switching from 24.4 kbps to 256 kbps, 48 kHz in, 48 kHz out, DTX on, BINAURAL_ROOM_IR out (Model from file)
+// 4 ISM w and wo md br switching 24.4 kbps to 256 kbps, 48 kHz in, 48 kHz out, DTX on, BINAURAL_ROOM_IR out (Model from file)
 ../IVAS_cod -dtx -ism 4 testv/ltvISM1.csv NULL NULL testv/ltvISM4.csv ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/ltv48_4ISM.wav bit
 ../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin BINAURAL_ROOM_IR 48 bit testv/ltv48_4ISM.wav_brate_sw_48-48_DTX_hoa3.tst
 
@@ -1283,7 +1283,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -mc 7_1 512000 48 testv/ltv48_MC71.wav bit
 ../IVAS_dec -render_config testv/rend_config_renderer.cfg BINAURAL_ROOM_REVERB 48 bit testv/ltv48_MC71.wav_MC71_512000_48-48_MC_Config_renderer.tst
 
-// Multi-channel 5_1 at 80 kbps, 48kHz in, 32kHz out, BINAURAL_ROOM_REVERB out Config renderer
+// Multi-channel 5_1 at 80 kbps, 48kHz in, 32kHz out, BINAURAL_ROOM_REVERB out Config renderer, HR
 ../IVAS_cod -mc 5_1 80000 48 testv/ltv48_MC51.wav bit
 ../IVAS_dec -render_config testv/rend_config_renderer.cfg -t ../scripts/trajectories/full-circle-4s.csv BINAURAL_ROOM_REVERB 32 bit testv/ltv48_MC51.wav_MC51_80000_48-32_MC_Config_renderer.tst
 
@@ -1299,7 +1299,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -mc 5_1 160000 48 testv/ltv48_MC51.wav bit
 ../IVAS_dec -render_config testv/rend_config_recreation.cfg -t ../scripts/trajectories/full-circle-with-up-and-down-4s.csv BINAURAL_ROOM_REVERB 48 bit testv/ltv48_MC51.wav_M714_160000_48-48_MC_Config_recreation.tst
 
-// Multi-channel 5_1_2 64 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out Config renderer, HR
+// Multi-channel 5_1_2 at 64 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out Config renderer, HR
 ../IVAS_cod -mc 5_1_2 64000 48 testv/ltv48_MC512.wav bit
 ../IVAS_dec -render_config testv/rend_config_renderer.cfg -t testv/headrot_case04_3000_q.csv BINAURAL_ROOM_REVERB 48 bit testv/ltv48_MC512.wav_MC512_64000_48-48_MC_Config_renderer.tst
 
@@ -1319,7 +1319,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -mc 7_1_4 512000 48 testv/ltv48_MC714.wav bit
 ../IVAS_dec -render_config testv/rend_config_ER_v2.cfg BINAURAL_ROOM_REVERB 48 bit testv/ltv48_MC714.wav_MC714_512000_48-48_MC_ER_v2.tst
 
-// Multi-channel 7_1_4 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out Config early reflections, low complexity, listener origin
+// Multi-channel 7_1_4 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out Conf early refl, low complexity, listener origin
 ../IVAS_cod -mc 7_1_4 512000 48 testv/ltv48_MC714.wav bit
 ../IVAS_dec -render_config testv/rend_config_ER_v3.cfg BINAURAL_ROOM_REVERB 48 bit testv/ltv48_MC714.wav_MC714_512000_48-48_MC_ER_v3.tst
 
@@ -1725,7 +1725,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -ism_sba 4 3 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv ../scripts/switchPaths/sw_13k2_512k.bin 32 testv/ltv32_OSBA_4ISM_HOA3.wav bit
 ../IVAS_dec EXT 48 bit testv/ltv32_OSBA_4ISM_HOA3.wav_EXT_sw_13k2_512k_32-32.tst
 
-// OSBA FOA 4ISM at bitrate switching 13.2 to 512 kbps, 48kHz in, 16kHz out, BINAURAL out (Model from file), FER at 5%, bandwidth switching
+// OSBA FOA 4ISM at br sw 13.2 to 512 kbps, 48kHz in, 16kHz out, BINAURAL out (Model from file), FER at 5%, bandwidth switching
 ../IVAS_cod -max_band testv/ivas_bws_20fr_start_WB.txt -ism_sba 4 1 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/ltv48_OSBA_4ISM_FOA.wav bit
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL 16 bit_error testv/ltv48_OSBA_4ISM_FOA.wav_BINAURAL_sw_48-48_FER5.tst