diff --git a/experiments/selection/BS1534-7a/config/BS1534-7a.yml b/experiments/selection/BS1534-7a/config/BS1534-7a.yml
index 89da64b0b193a89631c54f26f59ffd411becebba..062830a0393b97833684da7a7508a55128c2fdb2 100644
--- a/experiments/selection/BS1534-7a/config/BS1534-7a.yml
+++ b/experiments/selection/BS1534-7a/config/BS1534-7a.yml
@@ -52,18 +52,18 @@ conditions_to_generate:
     ### EVS condition ################################
     c03:
         type: evs
-        sba_format: "FOA"
         bitrates:
             - 32000
         cod:
+            fmt: "FOA"
             opts: ["-max_band", "FB"]
         dec:
     c04:
         type: evs
-        sba_format: "FOA"
         bitrates:
             - 48000
         cod:
+            fmt: "FOA"
             opts: ["-max_band", "FB"]
         dec:
     c05:
diff --git a/experiments/selection/BS1534-7b/config/BS1534-7b.yml b/experiments/selection/BS1534-7b/config/BS1534-7b.yml
index e9a3075b666d961c97f03b5bf974715afe3aa4c8..a6cad5d61cec4d971503dc044b44bb8cd04f423a 100644
--- a/experiments/selection/BS1534-7b/config/BS1534-7b.yml
+++ b/experiments/selection/BS1534-7b/config/BS1534-7b.yml
@@ -52,18 +52,18 @@ conditions_to_generate:
     ### EVS condition ################################
     c03:
         type: evs
-        sba_format: "FOA"
         bitrates:
             - 64000
         cod:
+            fmt: "FOA"
             opts: ["-max_band", "FB"]
         dec:
     c04:
         type: evs
-        sba_format: "FOA"
         bitrates:
             - 96000
         cod:
+            fmt: "FOA"
             opts: ["-max_band", "FB"]
         dec:
     c05:
diff --git a/experiments/selection/P800-1/config/P800-1.yml b/experiments/selection/P800-1/config/P800-1.yml
index 92ac83b21f529176e37387b595d10ad05189812c..f596a06681ea946ef2b8212c681ba817f7e7ec6a 100644
--- a/experiments/selection/P800-1/config/P800-1.yml
+++ b/experiments/selection/P800-1/config/P800-1.yml
@@ -17,7 +17,6 @@ condition_in_output_filename: true
 ################################################
 input:
     fmt: "STEREO"
-    # TODO: to be clarified in Test Plan
     fs: 48000
 
 ################################################
diff --git a/experiments/selection/P800-2/config/P800-2.yml b/experiments/selection/P800-2/config/P800-2.yml
index 740eb3b045856a24d0660f4b8e73c19f97c3102a..99b8494f00a0d60be0ec1a9241cfefa5aed26683 100644
--- a/experiments/selection/P800-2/config/P800-2.yml
+++ b/experiments/selection/P800-2/config/P800-2.yml
@@ -17,7 +17,6 @@ condition_in_output_filename: true
 ################################################
 input:
     fmt: "STEREO"
-    # TODO: to be clarified in Test Plan
     fs: 48000
 
 ################################################
diff --git a/experiments/selection/P800-4/config/P800-4.yml b/experiments/selection/P800-4/config/P800-4.yml
index 98aa56da854ba30832a4db2d96d8a938fa016702..bc6e53c7accc6398a18dfd730184a2cff8828be4 100644
--- a/experiments/selection/P800-4/config/P800-4.yml
+++ b/experiments/selection/P800-4/config/P800-4.yml
@@ -17,7 +17,6 @@ condition_in_output_filename: true
 ################################################
 input:
     fmt: "FOA"
-    # TODO: to be clarified in Test Plan
     fs: 48000
 
 ################################################
diff --git a/experiments/selection/P800-5/config/P800-5.yml b/experiments/selection/P800-5/config/P800-5.yml
index d15fc7e059e87db04069c6208bd5282a772e67c5..24e6783921da75772b044ca2d7b112d1952d8ee1 100644
--- a/experiments/selection/P800-5/config/P800-5.yml
+++ b/experiments/selection/P800-5/config/P800-5.yml
@@ -17,7 +17,6 @@ condition_in_output_filename: true
 ################################################
 input:
     fmt: "FOA"
-    # TODO: to be clarified in Test Plan
     fs: 48000
 
 ################################################
diff --git a/experiments/selection/P800-6/config/P800-6.yml b/experiments/selection/P800-6/config/P800-6.yml
index 2dd0f1c20016736b9be3219085addb4e40287c89..afd34dd18870970dec61a712112cad90c3e91ae8 100644
--- a/experiments/selection/P800-6/config/P800-6.yml
+++ b/experiments/selection/P800-6/config/P800-6.yml
@@ -17,7 +17,6 @@ condition_in_output_filename: true
 ################################################
 input:
     fmt: "ISM1"
-    # TODO: to be clarified in Test Plan
     fs: 48000
 
 ################################################
diff --git a/experiments/selection/P800-7/config/P800-7.yml b/experiments/selection/P800-7/config/P800-7.yml
index b584a724c42c0a652fb41276dd33950ca3def407..8560b7dbafdc4ddf34541f2168814673b060fab8 100644
--- a/experiments/selection/P800-7/config/P800-7.yml
+++ b/experiments/selection/P800-7/config/P800-7.yml
@@ -17,7 +17,6 @@ condition_in_output_filename: true
 ################################################
 input:
     fmt: "ISM2"
-    # TODO: to be clarified in Test Plan
     fs: 48000
 
 ################################################
diff --git a/experiments/selection/P800-8/config/P800-8.yml b/experiments/selection/P800-8/config/P800-8.yml
index 2dbf23d240a2d3e91a15cb12156c936400e6fb17..a271a384adb5cb374ab6796cf1e855044c6574ac 100644
--- a/experiments/selection/P800-8/config/P800-8.yml
+++ b/experiments/selection/P800-8/config/P800-8.yml
@@ -40,6 +40,7 @@ preprocessing_2:
         snr: 45
         ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s)
         background_noise_path: "experiments/selection/P800-8/background_noise/background_noise.wav"
+    repeat_signal: true
 
 #################################################
 ### Bitstream processing