diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index e8b739bc9..6a355e414 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -101,6 +101,7 @@ if( HAVE_BUILD_TOOLS )
         bufr_ecc-1290
         bufr_ecc-1304
         bufr_ecc-1347
+        bufr_ecc-1395
         bufr_json_samples
         bufr_ecc-359
         bufr_ecc-517
diff --git a/tests/bufr_ecc-1187.sh b/tests/bufr_ecc-1187.sh
index 3db3590d3..4bb6346e5 100755
--- a/tests/bufr_ecc-1187.sh
+++ b/tests/bufr_ecc-1187.sh
@@ -14,7 +14,7 @@
 # This is the test for the JIRA issue ECC-1187
 # BUFR: codes_set_missing()
 # ---------------------------------------------------------
-label="bufr_ecc-1187-test"
+label="bufr_ecc-1187_test"
 tempOut=temp.${label}.out
 tempRules=temp.${label}.filter
 
diff --git a/tests/bufr_ecc-1195.sh b/tests/bufr_ecc-1195.sh
index a91caa55c..8fe40b43f 100755
--- a/tests/bufr_ecc-1195.sh
+++ b/tests/bufr_ecc-1195.sh
@@ -11,7 +11,7 @@
 . ./include.ctest.sh
 set -u
 
-label="bufr_ecc-1195-test"
+label="bufr_ecc-1195_test"
 temp1=temp.$label.bufr
 temp2=temp.$label.txt
 sample_bufr3=$ECCODES_SAMPLES_PATH/BUFR3_local.tmpl
diff --git a/tests/bufr_ecc-1259.sh b/tests/bufr_ecc-1259.sh
index b4e88f4a3..5cca062ae 100755
--- a/tests/bufr_ecc-1259.sh
+++ b/tests/bufr_ecc-1259.sh
@@ -11,7 +11,7 @@
 . ./include.ctest.sh
 set -u
 REDIRECT=/dev/null
-label="bufr_ecc-1259-test"
+label="bufr_ecc-1259_test"
 
 tempBufr=temp.$label.bufr
 tempFilt=temp.$label.filt
diff --git a/tests/bufr_ecc-1288.sh b/tests/bufr_ecc-1288.sh
index 162c838a3..d1f9beed7 100755
--- a/tests/bufr_ecc-1288.sh
+++ b/tests/bufr_ecc-1288.sh
@@ -15,7 +15,7 @@
 # It tests decoding a BUFR file which cannot be done unless
 # we extend the definitions to include extra files
 # ---------------------------------------------------------
-label="bufr_ecc-1288-test"
+label="bufr_ecc-1288_test"
 
 TEMP=${label}.temp
 LOG=${label}.log
diff --git a/tests/bufr_ecc-1290.sh b/tests/bufr_ecc-1290.sh
index ede6e3c8c..9d426ef5d 100755
--- a/tests/bufr_ecc-1290.sh
+++ b/tests/bufr_ecc-1290.sh
@@ -11,7 +11,7 @@
 . ./include.ctest.sh
 set -u
 REDIRECT=/dev/null
-label="bufr_ecc-1290-test"
+label="bufr_ecc-1290_test"
 temp=temp.$label
 tempRules=temp.${label}.filter
 tempBufr=temp.${label}.bufr
diff --git a/tests/bufr_ecc-1304.sh b/tests/bufr_ecc-1304.sh
index c4d18ce66..a7cf5dcd7 100755
--- a/tests/bufr_ecc-1304.sh
+++ b/tests/bufr_ecc-1304.sh
@@ -12,7 +12,7 @@
 set -u
 
 REDIRECT=/dev/null
-label="bufr_ecc-1304-test"
+label="bufr_ecc-1304_test"
 
 tempBufr=temp.$label.bufr
 tempFilt=temp.$label.filt
diff --git a/tests/bufr_ecc-1305.sh b/tests/bufr_ecc-1305.sh
index b85dd2f83..477404ed5 100755
--- a/tests/bufr_ecc-1305.sh
+++ b/tests/bufr_ecc-1305.sh
@@ -11,7 +11,7 @@
 . ./include.ctest.sh
 set -u
 REDIRECT=/dev/null
-label="bufr_ecc-1305-test"
+label="bufr_ecc-1305_test"
 temp=temp.$label
 
 # Check the operator name is printed
diff --git a/tests/bufr_ecc-1347.sh b/tests/bufr_ecc-1347.sh
index 396a15028..fc6de1f29 100755
--- a/tests/bufr_ecc-1347.sh
+++ b/tests/bufr_ecc-1347.sh
@@ -12,7 +12,7 @@
 
 set -u
 
-label="bufr_ecc-1347-test"
+label="bufr_ecc-1347_test"
 tempBufr=temp.$label.bufr
 tempFilt=temp.$label.filter
 
diff --git a/tests/bufr_ecc-1395.sh b/tests/bufr_ecc-1395.sh
new file mode 100755
index 000000000..f21a7bb2f
--- /dev/null
+++ b/tests/bufr_ecc-1395.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+# (C) Copyright 2005- ECMWF.
+#
+# This software is licensed under the terms of the Apache Licence Version 2.0
+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+#
+# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+#
+
+. ./include.ctest.sh
+
+REDIRECT=/dev/null
+label="bufr_ecc-1395_test"
+temp=temp.$label
+tempBufr=temp.$label.bufr
+tempFilt=temp.$label.filt
+tempOut=temp.$label.out
+
+sample_bufr4=$ECCODES_SAMPLES_PATH/BUFR4.tmpl
+
+# Pick a descriptor that does not exist in version 19
+cat > $tempFilt <<EOF
+ set masterTablesVersionNumber = 19;
+ set unexpandedDescriptors = { 25195 }; # should fail
+ write;
+EOF
+
+set +e
+${tools_dir}/bufr_filter -o $tempBufr $tempFilt $sample_bufr4 # > $tempOut
+status=$?
+set -e
+
+# TODO check status
+
+
+rm -f $tempFilt $tempBufr $tempOut
diff --git a/tests/bufr_ecc-197.sh b/tests/bufr_ecc-197.sh
index 208223643..6591931af 100755
--- a/tests/bufr_ecc-197.sh
+++ b/tests/bufr_ecc-197.sh
@@ -15,7 +15,7 @@
 # It tests decoding a BUFR file which cannot be done unless
 # we extend the definitions to include extra files
 # ---------------------------------------------------------
-label="bufr_ecc-197-test"
+label="bufr_ecc-197_test"
 
 input=${data_dir}/bufr/vos308014_v3_26.bufr
 TEMP=${label}.temp
diff --git a/tests/bufr_ecc-286.sh b/tests/bufr_ecc-286.sh
index 764e7bdf8..3288520b6 100755
--- a/tests/bufr_ecc-286.sh
+++ b/tests/bufr_ecc-286.sh
@@ -15,7 +15,7 @@
 # It tests setting a key which starts with a digit
 # ---------------------------------------------------------
 cd ${data_dir}/bufr
-label="bufr_ecc_286_test"
+label="bufr_ecc-286_test"
 
 tempRules=temp.${label}.filter
 tempOut=temp.${label}.out
diff --git a/tests/bufr_ecc-288.sh b/tests/bufr_ecc-288.sh
index cd6ef1a6e..27014e4f1 100755
--- a/tests/bufr_ecc-288.sh
+++ b/tests/bufr_ecc-288.sh
@@ -15,7 +15,7 @@
 # It tests bufr_compare with a relative tolerance
 # ---------------------------------------------------------
 cd ${data_dir}/bufr
-label="bufr_ecc_288_test"
+label="bufr_ecc-288_test"
 
 tempRules=temp.${label}.filter
 tempOut=temp.${label}.out
diff --git a/tests/bufr_ecc-313.sh b/tests/bufr_ecc-313.sh
index 40703efdd..1f6a8c38b 100755
--- a/tests/bufr_ecc-313.sh
+++ b/tests/bufr_ecc-313.sh
@@ -14,7 +14,7 @@
 # This is the test for the JIRA issue ECC-313.
 # It tests decoding a BUFR file which uses the operator 203YYY.
 # ---------------------------------------------------------
-label="bufr_ecc-313-test"
+label="bufr_ecc-313_test"
 tempRules=temp.${label}.filter
 tempOut=temp.${label}.txt
 tempRef=temp.${label}.ref
diff --git a/tests/bufr_ecc-359.sh b/tests/bufr_ecc-359.sh
index 5041fb5df..cf01c14f5 100755
--- a/tests/bufr_ecc-359.sh
+++ b/tests/bufr_ecc-359.sh
@@ -14,7 +14,7 @@
 # This is the test for the JIRA issue ECC-359.
 # It tests calling 'pack=1' and nothing else!
 # ---------------------------------------------------------
-label="bufr_ecc_359_test"
+label="bufr_ecc-359_test"
 
 tempOut=temp.${label}.out
 BufrFile=$ECCODES_SAMPLES_PATH/BUFR4.tmpl
diff --git a/tests/bufr_ecc-379.sh b/tests/bufr_ecc-379.sh
index d718a6502..9ce06692a 100755
--- a/tests/bufr_ecc-379.sh
+++ b/tests/bufr_ecc-379.sh
@@ -15,7 +15,7 @@
 # BUFR encoding failing when value out of range
 # ---------------------------------------------------------
 cd ${data_dir}/bufr
-label="bufr_ecc_379_test"
+label="bufr_ecc-379_test"
 
 tempRules=temp.${label}.filter
 tempOut=temp.${label}.bufr
diff --git a/tests/bufr_ecc-393.sh b/tests/bufr_ecc-393.sh
index 4cd49eec7..59d8189a3 100755
--- a/tests/bufr_ecc-393.sh
+++ b/tests/bufr_ecc-393.sh
@@ -15,7 +15,7 @@
 # It tests bufr_compare with a blacklist with rank
 # ---------------------------------------------------------
 cd ${data_dir}/bufr
-label="bufr_ecc_393_test"
+label="bufr_ecc-393_test"
 
 tempRules=temp.${label}.filter
 tempOut=temp.${label}.bufr
diff --git a/tests/bufr_ecc-428.sh b/tests/bufr_ecc-428.sh
index 26deb7a17..138cd7f74 100755
--- a/tests/bufr_ecc-428.sh
+++ b/tests/bufr_ecc-428.sh
@@ -17,7 +17,7 @@
 # rather than a single value
 # ---------------------------------------------------------
 cd ${data_dir}/bufr
-label="bufr_ecc_428_test"
+label="bufr_ecc-428_test"
 
 tempRules=temp.${label}.filter
 tempText=temp.${label}.text
diff --git a/tests/bufr_ecc-433.sh b/tests/bufr_ecc-433.sh
index 081118d61..625a03540 100755
--- a/tests/bufr_ecc-433.sh
+++ b/tests/bufr_ecc-433.sh
@@ -14,7 +14,7 @@
 # This is the test for the JIRA issue ECC-433.
 # It tests decoding a BUFR file which uses the operator 206YYY.
 # ---------------------------------------------------------
-label="bufr_ecc-433-test"
+label="bufr_ecc-433_test"
 tempRules=temp.${label}.filter
 tempOut=temp.${label}.txt
 tempRef=temp.${label}.ref
diff --git a/tests/bufr_ecc-556.sh b/tests/bufr_ecc-556.sh
index c13a5e5c5..107d9b47d 100755
--- a/tests/bufr_ecc-556.sh
+++ b/tests/bufr_ecc-556.sh
@@ -15,7 +15,7 @@ set -u
 # This is the test for the JIRA issue ECC-556.
 # It tests typicalDate for BUFR edition 4
 # ---------------------------------------------------------
-label="bufr_ecc-556-test"
+label="bufr_ecc-556_test"
 
 # In this BUFR message the typicalYear should have been encoded
 # as 2012 but it is actually 12!
diff --git a/tests/bufr_ecc-616.sh b/tests/bufr_ecc-616.sh
index 88a8bbe21..6e09b55c0 100755
--- a/tests/bufr_ecc-616.sh
+++ b/tests/bufr_ecc-616.sh
@@ -14,7 +14,7 @@
 # This is the test for the JIRA issue ECC-616:
 # Cannot extract subsets when operator 203YYY is present
 # ---------------------------------------------------------
-label="bufr_ecc-616-test"
+label="bufr_ecc-616_test"
 tempRules=temp.${label}.filter
 tempOut=temp.${label}.txt
 tempRef=temp.${label}.ref
diff --git a/tests/bufr_ecc-673.sh b/tests/bufr_ecc-673.sh
index 9babaa896..0b4f1c079 100755
--- a/tests/bufr_ecc-673.sh
+++ b/tests/bufr_ecc-673.sh
@@ -15,7 +15,7 @@
 # bufr_filter script and paths with spaces
 # ---------------------------------------------------------
 cd ${data_dir}/bufr
-label="bufr_ecc_673_test"
+label="bufr_ecc-673_test"
 
 tempBufr=temp.${label}.bufr
 tempRules=temp.${label}.filter
diff --git a/tests/bufr_ecc-680.sh b/tests/bufr_ecc-680.sh
index cf929e0de..a2abc6f05 100755
--- a/tests/bufr_ecc-680.sh
+++ b/tests/bufr_ecc-680.sh
@@ -14,7 +14,7 @@
 # This is the test for the JIRA issue ECC-680:
 # BUFR operator 203YYY: implement encoding
 # ---------------------------------------------------------
-label="bufr_ecc-680-test"
+label="bufr_ecc-680_test"
 
 tempBufr=temp.$label.bufr
 tempFilt=temp.${label}.filter
diff --git a/tests/bufr_ecc-686.sh b/tests/bufr_ecc-686.sh
index 9634fa414..75a4ee23b 100755
--- a/tests/bufr_ecc-686.sh
+++ b/tests/bufr_ecc-686.sh
@@ -14,7 +14,7 @@
 # This is the test for the JIRA issue ECC-686.
 # It tests changing the subtype in the ECMWF local section
 # ---------------------------------------------------------
-label="bufr_ecc-686-test"
+label="bufr_ecc-686_test"
 tempRules=temp.${label}.filter
 tempBufr=temp.${label}.bufr
 
diff --git a/tests/bufr_ecc-690.sh b/tests/bufr_ecc-690.sh
index 9809e98fd..d6b198e01 100755
--- a/tests/bufr_ecc-690.sh
+++ b/tests/bufr_ecc-690.sh
@@ -15,7 +15,7 @@
 # Decoding NOAA GOES message percent confidence values
 # which do not have a bitmap.
 # ---------------------------------------------------------
-label="bufr_ecc-690-test"
+label="bufr_ecc-690_test"
 tempRules=temp.${label}.filter
 tempOut=temp.${label}.txt
 tempBufr=temp.${label}.bufr
diff --git a/tests/bufr_ecc-750.sh b/tests/bufr_ecc-750.sh
index 7eadc0e5f..a7dfa5591 100755
--- a/tests/bufr_ecc-750.sh
+++ b/tests/bufr_ecc-750.sh
@@ -14,7 +14,7 @@
 # This is the test for the JIRA issue ECC-750.
 # Encoding values which exceed the maximum allowed
 # ---------------------------------------------------------
-label="bufr_ecc-750-test"
+label="bufr_ecc-750_test"
 tempRules=temp.${label}.filter
 tempBufr=temp.${label}.bufr
 
diff --git a/tests/bufr_ecc-765.sh b/tests/bufr_ecc-765.sh
index 32e6e25ae..2e0c06ade 100755
--- a/tests/bufr_ecc-765.sh
+++ b/tests/bufr_ecc-765.sh
@@ -14,7 +14,7 @@
 # This is the test for the JIRA issue ECC-765.
 # BUFR decoding memory leaks
 # ---------------------------------------------------------
-label="bufr_ecc-765-test"
+label="bufr_ecc-765_test"
 tempLog=temp.${label}.log
 tempSupp=temp.${label}.supp
 tempFilt=temp.${label}.filt
diff --git a/tests/bufr_ecc-875.sh b/tests/bufr_ecc-875.sh
index 1d2667982..f857a352d 100755
--- a/tests/bufr_ecc-875.sh
+++ b/tests/bufr_ecc-875.sh
@@ -14,7 +14,7 @@
 # This is the test for the JIRA issue ECC-875
 # bufr_copy with -g option to copy the GTS header
 # ---------------------------------------------------------
-label="bufr_ecc-875-test"
+label="bufr_ecc-875_test"
 tempOut=temp.${label}.out
 tempRef=temp.${label}.ref
 tempBufr=temp.${label}.bufr
diff --git a/tests/bufr_ecc-887.sh b/tests/bufr_ecc-887.sh
index bd0191a5b..c112f3509 100755
--- a/tests/bufr_ecc-887.sh
+++ b/tests/bufr_ecc-887.sh
@@ -14,7 +14,7 @@
 # This is the test for the JIRA issue ECC-887
 # BUFR: Search by condition does not work for floating point value
 # ---------------------------------------------------------
-label="bufr_ecc-887-test"
+label="bufr_ecc-887_test"
 tempOut=temp.${label}.out
 tempRules=temp.${label}.filter
 
diff --git a/tests/create_test.sh b/tests/create_test.sh
index c4c3817b3..6dd1b143b 100755
--- a/tests/create_test.sh
+++ b/tests/create_test.sh
@@ -15,7 +15,7 @@ fi
 TEST_TITLE="$1"
 
 # Check label is unique
-grep -q "label=\"$TEST_TITLE\"" $TEST_DIR/*.sh
+grep -i -q "label=\"$TEST_TITLE\"" $TEST_DIR/*.sh
 if [ $? -eq 0 ]; then
   echo "ERROR: Test label \"$TEST_TITLE\" seems to already exist!"
   grep -l "label=\"$TEST_TITLE\"" $TEST_DIR/*.sh # Show results
@@ -36,7 +36,7 @@ cat <<EOF
 . ./include.ctest.sh
 set -u
 REDIRECT=/dev/null
-label="prod_${TEST_TITLE}-test"
+label="prod_${TEST_TITLE}_test"  # Change prod to bufr or grib etc
 temp=temp.\$label
 sample_grib1=\$ECCODES_SAMPLES_PATH/GRIB1.tmpl
 sample_grib2=\$ECCODES_SAMPLES_PATH/GRIB2.tmpl