diff --git a/tests/fdb/tools/compare/all_identical/all_identical.sh.in b/tests/fdb/tools/compare/all_identical/all_identical.sh.in
index b72159d1f..f534b01ef 100755
--- a/tests/fdb/tools/compare/all_identical/all_identical.sh.in
+++ b/tests/fdb/tools/compare/all_identical/all_identical.sh.in
@@ -4,8 +4,6 @@ set -eux
 
 yell() { printf "$(basename "$0"): \033[0;31m!!! %s !!!\033[0m\\n" "$*" >&2; }
 die() { yell "$*"; exit 1; }
-try() { "$@" || die "Errored HERE => '$*'"; }
-
 
 fdbread="$<TARGET_FILE:fdb-read>"
 fdbwrite="$<TARGET_FILE:fdb-write>"
diff --git a/tests/fdb/tools/compare/diff_exp/diff_exp.sh.in b/tests/fdb/tools/compare/diff_exp/diff_exp.sh.in
index a8ec2877f..5bd3bad52 100755
--- a/tests/fdb/tools/compare/diff_exp/diff_exp.sh.in
+++ b/tests/fdb/tools/compare/diff_exp/diff_exp.sh.in
@@ -4,7 +4,7 @@ set -eux
 
 yell() { printf "$(basename "$0"): \033[0;31m!!! %s !!!\033[0m\\n" "$*" >&2; }
 die() { yell "$*"; exit 1; }
-try() { "$@" || die "Errored HERE => '$*'"; }
+
 
 
 fdbread="$<TARGET_FILE:fdb-read>"
diff --git a/tests/fdb/tools/compare/grib_keys_select/grib_keys_select.sh.in b/tests/fdb/tools/compare/grib_keys_select/grib_keys_select.sh.in
index 978dcb930..6cdea31e1 100755
--- a/tests/fdb/tools/compare/grib_keys_select/grib_keys_select.sh.in
+++ b/tests/fdb/tools/compare/grib_keys_select/grib_keys_select.sh.in
@@ -4,7 +4,7 @@ set -eux
 
 yell() { printf "$(basename "$0"): \033[0;31m!!! %s !!!\033[0m\\n" "$*" >&2; }
 die() { yell "$*"; exit 1; }
-try() { "$@" || die "Errored HERE => '$*'"; }
+
 
 
 fdbwrite="$<TARGET_FILE:fdb-write>"
diff --git a/tests/fdb/tools/compare/invalid_args/invalid_args.sh.in b/tests/fdb/tools/compare/invalid_args/invalid_args.sh.in
index f554f1a12..6803cd865 100755
--- a/tests/fdb/tools/compare/invalid_args/invalid_args.sh.in
+++ b/tests/fdb/tools/compare/invalid_args/invalid_args.sh.in
@@ -5,7 +5,7 @@ set -eux
 
 yell() { printf "$(basename "$0"): \033[0;31m!!! %s !!!\033[0m\\n" "$*" >&2; }
 die() { yell "$*"; exit 1; }
-try() { "$@" || die "Errored HERE => '$*'"; }
+
 
 
 fdbwrite="$<TARGET_FILE:fdb-write>"
diff --git a/tests/fdb/tools/compare/mars_keys_ignore/mars_keys_ignore.sh.in b/tests/fdb/tools/compare/mars_keys_ignore/mars_keys_ignore.sh.in
index 2ae6e7033..f844230d8 100755
--- a/tests/fdb/tools/compare/mars_keys_ignore/mars_keys_ignore.sh.in
+++ b/tests/fdb/tools/compare/mars_keys_ignore/mars_keys_ignore.sh.in
@@ -4,7 +4,7 @@ set -eux
 
 yell() { printf "$(basename "$0"): \033[0;31m!!! %s !!!\033[0m\\n" "$*" >&2; }
 die() { yell "$*"; exit 1; }
-try() { "$@" || die "Errored HERE => '$*'"; }
+
 
 
 fdbwrite="$<TARGET_FILE:fdb-write>"
diff --git a/tests/fdb/tools/compare/mismatch_grib/mismatch_grib.sh.in b/tests/fdb/tools/compare/mismatch_grib/mismatch_grib.sh.in
index 947a6cf4e..5f7a2e808 100755
--- a/tests/fdb/tools/compare/mismatch_grib/mismatch_grib.sh.in
+++ b/tests/fdb/tools/compare/mismatch_grib/mismatch_grib.sh.in
@@ -4,7 +4,7 @@ set -eux
 
 yell() { printf "$(basename "$0"): \033[0;31m!!! %s !!!\033[0m\\n" "$*" >&2; }
 die() { yell "$*"; exit 1; }
-try() { "$@" || die "Errored HERE => '$*'"; }
+
 
 
 fdbread="$<TARGET_FILE:fdb-read>"
@@ -89,7 +89,7 @@ done
 
 ################
 
-set -e
+set -eux
 $fdbwrite --config=test.yaml scaled.grib
 sync
 
diff --git a/tests/fdb/tools/compare/mismatch_mars/mismatch_mars.sh.in b/tests/fdb/tools/compare/mismatch_mars/mismatch_mars.sh.in
index 515159800..1a1b10287 100755
--- a/tests/fdb/tools/compare/mismatch_mars/mismatch_mars.sh.in
+++ b/tests/fdb/tools/compare/mismatch_mars/mismatch_mars.sh.in
@@ -4,7 +4,7 @@ set -eux
 
 yell() { printf "$(basename "$0"): \033[0;31m!!! %s !!!\033[0m\\n" "$*" >&2; }
 die() { yell "$*"; exit 1; }
-try() { "$@" || die "Errored HERE => '$*'"; }
+
 
 
 fdbread="$<TARGET_FILE:fdb-read>"
diff --git a/tests/fdb/tools/compare/option_warnings/option_warnings.sh.in b/tests/fdb/tools/compare/option_warnings/option_warnings.sh.in
index 34fddb0f6..693a1ef3a 100755
--- a/tests/fdb/tools/compare/option_warnings/option_warnings.sh.in
+++ b/tests/fdb/tools/compare/option_warnings/option_warnings.sh.in
@@ -4,7 +4,7 @@ set -eux
 
 yell() { printf "$(basename "$0"): \033[0;31m!!! %s !!!\033[0m\\n" "$*" >&2; }
 die() { yell "$*"; exit 1; }
-try() { "$@" || die "Errored HERE => '$*'"; }
+
 
 
 fdbwrite="$<TARGET_FILE:fdb-write>"
diff --git a/tests/fdb/tools/dump-toc/fdb_dump-toc.sh.in b/tests/fdb/tools/dump-toc/fdb_dump-toc.sh.in
index 655cffde8..6f0b2aa3b 100755
--- a/tests/fdb/tools/dump-toc/fdb_dump-toc.sh.in
+++ b/tests/fdb/tools/dump-toc/fdb_dump-toc.sh.in
@@ -1,11 +1,8 @@
 #!/usr/bin/env bash
 
-set -eu
+set -eux
 
-yell() { echo "$(basename "$0"): $*" >&2; }
-die() { yell "$*"; exit 1; }
-try() { "$@" || die "Errored HERE => '$*'"; }
-cleanup() { echo "cleanup"; try rm -rf "$@"; }
+cleanup() { echo "cleanup"; rm -rf "$@"; }
 
 export PATH=@CMAKE_BINARY_DIR@/bin:$PATH
 export FDB5_CONFIG_FILE="local.yaml"
@@ -18,12 +15,12 @@ fdbstore="$bindir/$tname/localroot"
 
 ########################################################################################################################
 
-try cd $bindir
+cd $bindir
 
 rm -rf $tname || true
 mkdir -p $tname/localroot
 
-try cd $tname
+cd $tname
 
 for f in local.yaml x.grib; do
   cp "$srcdir/$f" ./
@@ -32,22 +29,22 @@ done
 ########################################################################################################################
 # Create a grib file with 4 steps and populate FDB
 
-try grib_set -s step=0 x.grib 0.grib
-try grib_set -s step=6 x.grib 6.grib
-try grib_set -s step=9 x.grib 9.grib
+grib_set -s step=0 x.grib 0.grib
+grib_set -s step=6 x.grib 6.grib
+grib_set -s step=9 x.grib 9.grib
 
 for f in *.grib; do
-  try grib_set -s type=an "$f" "cf.$f"
+  grib_set -s type=an "$f" "cf.$f"
 done
 
 for f in *.grib; do
-  try cat "$f" >> "$tname.grib"
+  cat "$f" >> "$tname.grib"
 done
 
 ########################################################################################################################
 echo "Running tests on dump-toc for simple toc..."
 
-try fdb-write "$tname.grib"
+fdb-write "$tname.grib"
 
 args="--structure $fdbstore/rd:xxxx:oper:20201102:0000:g/toc"
 out=$(fdb-dump-toc $args)
@@ -62,7 +59,7 @@ TOC_INDEX 2048 1024 toc
 EOF
 )
 
-try test "$exp" = "$parsed"
+test "$exp" = "$parsed"
 
 
 ########################################################################################################################
@@ -73,7 +70,7 @@ cleanup "$fdbstore/*"
 echo "Running tests on dump-toc for tocs with subtoc..."
 
 
-try env FDB5_SUB_TOCS=1 fdb-write "$tname.grib"
+env FDB5_SUB_TOCS=1 fdb-write "$tname.grib"
 
 args="--structure --walk $fdbstore/rd:xxxx:oper:20201102:0000:g/toc"
 out=$(fdb-dump-toc $args)
@@ -108,6 +105,6 @@ TOC_CLEAR 6144 1024 toc
 EOF
 )
 
-try test "$exp" = "$normalised"
+test "$exp" = "$normalised"
 
-cleanup "$fdbstore/*"
\ No newline at end of file
+cleanup "$fdbstore/*"
diff --git a/tests/fdb/tools/inspect/fdb_inspect.sh.in b/tests/fdb/tools/inspect/fdb_inspect.sh.in
index c7da996ad..c47bf4872 100755
--- a/tests/fdb/tools/inspect/fdb_inspect.sh.in
+++ b/tests/fdb/tools/inspect/fdb_inspect.sh.in
@@ -1,10 +1,6 @@
 #!/usr/bin/env bash
 
-set -eu
-
-yell() { echo "$(basename "$0"): $*" >&2; }
-die() { yell "$*"; exit 1; }
-try() { "$@" || die "Errored HERE => '$*'"; }
+set -eux
 
 export PATH=@CMAKE_BINARY_DIR@/bin:$PATH
 export FDB5_CONFIG_FILE="local.yaml"
@@ -16,12 +12,12 @@ bindir=@CMAKE_CURRENT_BINARY_DIR@
 
 ########################################################################################################################
 
-try cd $bindir
+cd $bindir
 
 rm -rf $tname || true
 mkdir -p $tname/localroot
 
-try cd $tname
+cd $tname
 
 for f in local.yaml x.grib; do
   cp "$srcdir/$f" ./
@@ -30,19 +26,19 @@ done
 ########################################################################################################################
 # Create a grib file with 4 steps and populate FDB
 
-try grib_set -s step=0 x.grib 0.grib
-try grib_set -s step=6 x.grib 6.grib
-try grib_set -s step=9 x.grib 9.grib
+grib_set -s step=0 x.grib 0.grib
+grib_set -s step=6 x.grib 6.grib
+grib_set -s step=9 x.grib 9.grib
 
 for f in *.grib; do
-  try grib_set -s type=an "$f" "cf.$f"
+  grib_set -s type=an "$f" "cf.$f"
 done
 
 for f in *.grib; do
-  try cat "$f" >> "$tname.grib"
+  cat "$f" >> "$tname.grib"
 done
 
-try fdb-write "$tname.grib"
+fdb-write "$tname.grib"
 
 ########################################################################################################################
 # test all
@@ -61,4 +57,4 @@ out=$(fdb-inspect $requests)
 exp="Number of requests: 8
 Number of elements: 8"
 
-try test "$exp" = "$out"
+test "$exp" = "$out"
diff --git a/tests/fdb/tools/list/list_all.sh.in b/tests/fdb/tools/list/list_all.sh.in
index 8339b8b20..894f33470 100755
--- a/tests/fdb/tools/list/list_all.sh.in
+++ b/tests/fdb/tools/list/list_all.sh.in
@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 
-set -ux
+set -eux
 
 yell() { printf "$(basename "$0"): \033[0;31m!!! %s !!!\033[0m\\n" "$*" >&2; }
 die() { yell "$*"; exit 1; }
-try() { "$@" || die "Errored HERE => '$*'"; }
+
 
 line_count() {
   [[ $# -eq 1 ]] || die "line_count requires 1 argument; expected line count"
@@ -14,7 +14,7 @@ line_count() {
 
 grep_count() {
   [[ $# -eq 2 ]] || die "grep_count requires 2; regex and expected count"
-  val=$(grep -cE "$1" out)
+  val=$(grep -cE "$1" out || true)
   [[ $val -eq $2 ]] || die "Incorrect count [$val != $2] for regex [$1]"
 }
 
@@ -33,14 +33,14 @@ bin_dir=@CMAKE_CURRENT_BINARY_DIR@
 
 echo "running test '$test_name' on $(hostname)"
 
-try cd $bin_dir
+cd $bin_dir
 
-try rm -rf $test_name
-try mkdir -p $test_name/localroot
+rm -rf $test_name
+mkdir -p $test_name/localroot
 
-try cd $test_name
+cd $test_name
 
-try cp "$src_dir/local.yaml" ./
+cp "$src_dir/local.yaml" ./
 
 work_dir=$(pwd)
 echo "Working directory: $work_dir"
@@ -51,12 +51,12 @@ echo "Working directory: $work_dir"
 
 # Set up the data for the test
 
-try grib_set -s class=rd,expver=xxxx,type=fc,step=0 "$src_data" data.xxxx.0.grib
-try grib_set -s class=rd,expver=xxxx,type=fc,step=1 "$src_data" data.xxxx.1.grib
-try grib_set -s class=rd,expver=xxxx,type=fc,step=2 "$src_data" data.xxxx.2.grib
-try grib_set -s class=rd,expver=xxxy,type=fc,step=0 "$src_data" data.xxxy.0.grib
-try grib_set -s class=rd,expver=xxxy,type=fc,step=1 "$src_data" data.xxxy.1.grib
-try grib_set -s class=rd,expver=xxxy,type=fc,step=2 "$src_data" data.xxxy.2.grib
+grib_set -s class=rd,expver=xxxx,type=fc,step=0 "$src_data" data.xxxx.0.grib
+grib_set -s class=rd,expver=xxxx,type=fc,step=1 "$src_data" data.xxxx.1.grib
+grib_set -s class=rd,expver=xxxx,type=fc,step=2 "$src_data" data.xxxx.2.grib
+grib_set -s class=rd,expver=xxxy,type=fc,step=0 "$src_data" data.xxxy.0.grib
+grib_set -s class=rd,expver=xxxy,type=fc,step=1 "$src_data" data.xxxy.1.grib
+grib_set -s class=rd,expver=xxxy,type=fc,step=2 "$src_data" data.xxxy.2.grib
 
 # Set up some regexes for later testing
 
@@ -75,8 +75,8 @@ for i in 1 2; do
 
   echo "============ Loop $i ============"
 
-  try fdb-write data.xxxx.0.grib
-  try fdb-list --all --minimum-keys="" --porcelain | tee out
+  fdb-write data.xxxx.0.grib
+  fdb-list --all --minimum-keys="" --porcelain | tee out
   if [[ $i = 1 ]]; then
     sum=$((sum + 24))
     line_count $sum
@@ -88,8 +88,8 @@ for i in 1 2; do
   fi
   grep_count "$regex_x0" 24
 
-  try fdb-write data.xxxy.0.grib
-  try fdb-list --all --minimum-keys="" --porcelain | tee out
+  fdb-write data.xxxy.0.grib
+  fdb-list --all --minimum-keys="" --porcelain | tee out
   if [[ $i = 1 ]]; then
     sum=$((sum + 24))
     line_count $sum
@@ -102,8 +102,8 @@ for i in 1 2; do
   grep_count "$regex_y0" 24
 
 
-  try fdb-write data.xxxx.1.grib
-  try fdb-list --all --minimum-keys="" --porcelain | tee out
+  fdb-write data.xxxx.1.grib
+  fdb-list --all --minimum-keys="" --porcelain | tee out
   if [[ $i = 1 ]]; then
     sum=$((sum + 24))
     line_count $sum
@@ -115,8 +115,8 @@ for i in 1 2; do
   grep_count "$regex_y0" 24
   grep_count "$regex_x1" 24
 
-  try fdb-write data.xxxy.1.grib
-  try fdb-list --all --minimum-keys="" --porcelain | tee out
+  fdb-write data.xxxy.1.grib
+  fdb-list --all --minimum-keys="" --porcelain | tee out
   if [[ $i = 1 ]]; then
     sum=$((sum + 24))
     line_count $sum
@@ -129,8 +129,8 @@ for i in 1 2; do
   grep_count "$regex_y1" 24
 
 
-  try fdb-write data.xxxx.2.grib
-  try fdb-list --all --minimum-keys="" --porcelain | tee out
+  fdb-write data.xxxx.2.grib
+  fdb-list --all --minimum-keys="" --porcelain | tee out
   if [[ $i = 1 ]]; then
     sum=$((sum + 24))
     line_count $sum
@@ -142,8 +142,8 @@ for i in 1 2; do
   grep_count "$regex_y1" 24
   grep_count "$regex_x2" 24
 
-  try fdb-write data.xxxy.2.grib
-  try fdb-list --all --minimum-keys="" --porcelain | tee out
+  fdb-write data.xxxy.2.grib
+  fdb-list --all --minimum-keys="" --porcelain | tee out
   [[ $i = 1 ]] && sum=$((sum + 24))
   line_count $sum
   grep_count "$regex_x0" 24
@@ -156,4 +156,4 @@ for i in 1 2; do
 done
 
 echo "cleanup"
-try rm -rf "$work_dir/localroot" "$work_dir"/data.*.grib
+rm -rf "$work_dir/localroot" "$work_dir"/data.*.grib
diff --git a/tests/fdb/tools/list/list_all_full.sh.in b/tests/fdb/tools/list/list_all_full.sh.in
index a90ad8fc8..bda4cb5b6 100755
--- a/tests/fdb/tools/list/list_all_full.sh.in
+++ b/tests/fdb/tools/list/list_all_full.sh.in
@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 
-set -ux
+set -eux
 
 yell() { printf "$(basename "$0"): \033[0;31m!!! %s !!!\033[0m\\n" "$*" >&2; }
 die() { yell "$*"; exit 1; }
-try() { "$@" || die "Errored HERE => '$*'"; }
+
 
 line_count() {
   [[ $# -eq 1 ]] || die "line_count requires 1 argument; expected line count"
@@ -14,7 +14,7 @@ line_count() {
 
 grep_count() {
   [[ $# -eq 2 ]] || die "grep_count requires 2; regex and expected count"
-  val=$(grep -cEE "$1" out)
+  val=$(grep -cE "$1" out || true)
   [[ $val -eq $2 ]] || die "Incorrect count [$val != $2] for regex [$1]"
 }
 
@@ -33,14 +33,14 @@ bin_dir=@CMAKE_CURRENT_BINARY_DIR@
 
 echo "running test '$test_name' on $(hostname)"
 
-try cd $bin_dir
+cd $bin_dir
 
-try rm -rf $test_name
-try mkdir -p $test_name/localroot
+rm -rf $test_name
+mkdir -p $test_name/localroot
 
-try cd $test_name
+cd $test_name
 
-try cp "$src_dir/local.yaml" ./
+cp "$src_dir/local.yaml" ./
 
 work_dir=$(pwd)
 echo "Working directory: $work_dir"
@@ -52,10 +52,10 @@ echo "Working directory: $work_dir"
 
 # Set up the data for the test
 
-try grib_set -s class=rd,expver=xxxx,type=fc,step=0 "$src_data" data.xxxx.0.grib
-try grib_set -s class=rd,expver=xxxx,type=fc,step=1 "$src_data" data.xxxx.1.grib
-try grib_set -s class=rd,expver=xxxy,type=fc,step=0 "$src_data" data.xxxy.0.grib
-try grib_set -s class=rd,expver=xxxy,type=fc,step=1 "$src_data" data.xxxy.1.grib
+grib_set -s class=rd,expver=xxxx,type=fc,step=0 "$src_data" data.xxxx.0.grib
+grib_set -s class=rd,expver=xxxx,type=fc,step=1 "$src_data" data.xxxx.1.grib
+grib_set -s class=rd,expver=xxxy,type=fc,step=0 "$src_data" data.xxxy.0.grib
+grib_set -s class=rd,expver=xxxy,type=fc,step=1 "$src_data" data.xxxy.1.grib
 
 # Set up some regexes for later testing
 
@@ -71,32 +71,32 @@ for i in 0 1; do
 
   echo "============ Loop $i ============"
 
-  try fdb-write data.xxxx.0.grib
-  try fdb-list --all --minimum-keys="" --porcelain --full | tee out
+  fdb-write data.xxxx.0.grib
+  fdb-list --all --minimum-keys="" --porcelain --full | tee out
   line_count $((24+(i*96)))
   grep_count "$regex_x0" $((24+(24*i)))
   grep_count "$regex_x1" $((0+(24*i)))
   grep_count "$regex_y0" $((0+(24*i)))
   grep_count "$regex_y1" $((0+(24*i)))
 
-  try fdb-write data.xxxy.0.grib
-  try fdb-list --all --minimum-keys="" --porcelain --full | tee out
+  fdb-write data.xxxy.0.grib
+  fdb-list --all --minimum-keys="" --porcelain --full | tee out
   line_count $((48+(i*96)))
   grep_count "$regex_x0" $((24+(24*i)))
   grep_count "$regex_x1" $((0+(24*i)))
   grep_count "$regex_y0" $((24+(24*i)))
   grep_count "$regex_y1" $((0+(24*i)))
 
-  try fdb-write data.xxxx.1.grib
-  try fdb-list --all --minimum-keys="" --porcelain --full | tee out
+  fdb-write data.xxxx.1.grib
+  fdb-list --all --minimum-keys="" --porcelain --full | tee out
   line_count $((72+(i*96)))
   grep_count "$regex_x0" $((24+(24*i)))
   grep_count "$regex_x1" $((24+(24*i)))
   grep_count "$regex_y0" $((24+(24*i)))
   grep_count "$regex_y1" $((0+(24*i)))
 
-  try fdb-write data.xxxy.1.grib
-  try fdb-list --all --minimum-keys="" --porcelain --full | tee out
+  fdb-write data.xxxy.1.grib
+  fdb-list --all --minimum-keys="" --porcelain --full | tee out
   line_count $((96+(i*96)))
   grep_count "$regex_x0" $((24+(24*i)))
   grep_count "$regex_x1" $((24+(24*i)))
@@ -106,4 +106,4 @@ for i in 0 1; do
 done
 
 echo "cleanup"
-try rm -rf "$work_dir/localroot" "$work_dir"/data.*.grib
+rm -rf "$work_dir/localroot" "$work_dir"/data.*.grib
diff --git a/tests/fdb/tools/list/list_depth.sh.in b/tests/fdb/tools/list/list_depth.sh.in
index 3d22c6517..068378d3e 100755
--- a/tests/fdb/tools/list/list_depth.sh.in
+++ b/tests/fdb/tools/list/list_depth.sh.in
@@ -1,10 +1,7 @@
 #!/usr/bin/env bash
 
-set -ux
+set -eux
 
-yell() { printf "$(basename "$0"): \033[0;31m!!! %s !!!\033[0m\\n" "$*" >&2; }
-die() { yell "$*"; exit 1; }
-try() { "$@" || die "Errored HERE => '$*'"; }
 
 ########################################################################################################################
 
@@ -21,33 +18,33 @@ bin_dir=@CMAKE_CURRENT_BINARY_DIR@
 
 echo "running test '$test_name' on $(hostname)"
 
-try cd $bin_dir
+cd $bin_dir
 
-try rm -rf $test_name
-try mkdir -p $test_name/localroot
+rm -rf $test_name
+mkdir -p $test_name/localroot
 
-try cd $test_name
+cd $test_name
 
 for f in local.yaml $src_data; do
-  try cp "$src_dir/$f" ./
+  cp "$src_dir/$f" ./
 done
 
 ########################################################################################################################
 # Create a grib file with 4 steps and populate FDB
 
-try grib_set -s step=0 $src_data data.0.grib
-try grib_set -s step=6 $src_data data.6.grib
-try grib_set -s step=9 $src_data data.9.grib
+grib_set -s step=0 $src_data data.0.grib
+grib_set -s step=6 $src_data data.6.grib
+grib_set -s step=9 $src_data data.9.grib
 
 for f in *.grib; do
-  try grib_set -s type=an "$f" "data.an.${f#*.}"
+  grib_set -s type=an "$f" "data.an.${f#*.}"
 done
 
 for f in *.grib; do
-  try cat "$f" >> "data.$test_name.grib"
+  cat "$f" >> "data.$test_name.grib"
 done
 
-try fdb-write "data.$test_name.grib"
+fdb-write "data.$test_name.grib"
 
 work_dir=$(pwd)
 echo "Working directory: $work_dir"
@@ -64,38 +61,38 @@ exp="{class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}{type=fc
 {class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}{type=an,levtype=sfc}{step=12,param=166}
 {class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}{type=an,levtype=sfc}{step=6,param=166}
 {class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}{type=an,levtype=sfc}{step=9,param=166}"
-out=$(try fdb-list --all --minimum-keys= --porcelain)
-try test "$exp" = "$out"
+out=$(fdb-list --all --minimum-keys= --porcelain)
+test "$exp" = "$out"
 
 echo "Test: date depth=1"
 exp="{class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}"
-out=$(try fdb-list date=20201102 --minimum-keys="" --porcelain --depth=1)
-try test "$exp" = "$out"
+out=$(fdb-list date=20201102 --minimum-keys="" --porcelain --depth=1)
+test "$exp" = "$out"
 
 echo "Test: date depth=2"
 exp="{class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}{type=fc,levtype=sfc}
 {class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}{type=an,levtype=sfc}"
-out=$(try fdb-list date=20201102 --minimum-keys="" --porcelain --depth=2)
-try test "$exp" = "$out"
+out=$(fdb-list date=20201102 --minimum-keys="" --porcelain --depth=2)
+test "$exp" = "$out"
 
 echo "Test: cf depth=1"
 exp="{class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}"
-out=$(try fdb-list type=an --minimum-keys="" --porcelain --depth=1)
-try test "$exp" = "$out"
+out=$(fdb-list type=an --minimum-keys="" --porcelain --depth=1)
+test "$exp" = "$out"
 
 echo "Test: cf depth=2"
 exp="{class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}{type=an,levtype=sfc}"
-out=$(try fdb-list type=an --minimum-keys="" --porcelain --depth=2)
-try test "$exp" = "$out"
+out=$(fdb-list type=an --minimum-keys="" --porcelain --depth=2)
+test "$exp" = "$out"
 
 echo "Test: cf depth=3"
 exp="{class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}{type=an,levtype=sfc}{step=0,param=166}
 {class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}{type=an,levtype=sfc}{step=12,param=166}
 {class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}{type=an,levtype=sfc}{step=6,param=166}
 {class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}{type=an,levtype=sfc}{step=9,param=166}"
-out=$(try fdb-list type=an --minimum-keys="" --porcelain --depth=3)
-try test "$exp" = "$out"
+out=$(fdb-list type=an --minimum-keys="" --porcelain --depth=3)
+test "$exp" = "$out"
 
 
 echo "cleanup"
-try rm -rf "$work_dir/localroot" "$work_dir"/*data.*.grib
+rm -rf "$work_dir/localroot" "$work_dir"/*data.*.grib
diff --git a/tests/fdb/tools/list/list_location.sh.in b/tests/fdb/tools/list/list_location.sh.in
index 2526464d2..fdd76f49e 100755
--- a/tests/fdb/tools/list/list_location.sh.in
+++ b/tests/fdb/tools/list/list_location.sh.in
@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 
-set -ux
+set -eux
 
 yell() { printf "$(basename "$0"): \033[0;31m!!! %s !!!\033[0m\\n" "$*" >&2; }
 die() { yell "$*"; exit 1; }
-try() { "$@" || die "Errored HERE => '$*'"; }
+
 
 line_count() {
   [[ $# -eq 1 ]] || die "line_count requires 1 argument; expected line count"
@@ -14,7 +14,7 @@ line_count() {
 
 grep_count() {
   [[ $# -eq 2 ]] || die "grep_count requires 2; regex and expected count"
-  val=$(grep -cE "$1" out)
+  val=$(grep -cE "$1" out || true)
   [[ $val -eq $2 ]] || die "Incorrect count [$val != $2] for regex [$1]"
 }
 
@@ -33,14 +33,14 @@ bin_dir=@CMAKE_CURRENT_BINARY_DIR@
 
 echo "running test '$test_name' on $(hostname)"
 
-try cd $bin_dir
+cd $bin_dir
 
-try rm -rf $test_name
-try mkdir -p $test_name/localroot
+rm -rf $test_name
+mkdir -p $test_name/localroot
 
-try cd $test_name
+cd $test_name
 
-try cp "$src_dir/local.yaml" ./
+cp "$src_dir/local.yaml" ./
 
 work_dir=$(pwd)
 echo "Working directory: $work_dir"
@@ -49,24 +49,24 @@ echo "Working directory: $work_dir"
 
 # Check that we can obtain the location of the data
 
-try grib_set -s class=rd,expver=xxxx "$src_data" data.xxxx.grib
-try grib_ls -m data.xxxx.grib
-try fdb-write data.xxxx.grib
+grib_set -s class=rd,expver=xxxx "$src_data" data.xxxx.grib
+grib_ls -m data.xxxx.grib
+fdb-write data.xxxx.grib
 
 echo "Test: --all --minimum-keys= --porcelain --full"
-try fdb-list --all --minimum-keys= --porcelain --full | tee out
+fdb-list --all --minimum-keys= --porcelain --full | tee out
 line_count 24
 
 
 echo "Test: Specify the location flag"
-try fdb-list class=rd,expver=xxxx,time=0000 --location | tee out
+fdb-list class=rd,expver=xxxx,time=0000 --location | tee out
 grep_count "localroot/rd:xxxx" 12
 
 
 echo "Test: without the location flag, none of the location info is included"
-try fdb-list class=rd,expver=xxxx,time=0000 --porcelain | tee out
+fdb-list class=rd,expver=xxxx,time=0000 --porcelain | tee out
 line_count 12
 grep_count "{class=rd,expver=xxxx,stream=oper,date=[0-9]+,time=0000,domain=g}{type=an,levtype=pl}{step=0,levelist=[0-9]+,param=[0-9]+}" 12
 
 echo "cleanup"
-try rm -rf "$work_dir/localroot" "$work_dir"/data.*.grib
+rm -rf "$work_dir/localroot" "$work_dir"/data.*.grib
diff --git a/tests/fdb/tools/list/list_masking.sh.in b/tests/fdb/tools/list/list_masking.sh.in
index 542142cd3..a86c253be 100755
--- a/tests/fdb/tools/list/list_masking.sh.in
+++ b/tests/fdb/tools/list/list_masking.sh.in
@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 
-set -ux
+set -eux
 
 yell() { printf "$(basename "$0"): \033[0;31m!!! %s !!!\033[0m\\n" "$*" >&2; }
 die() { yell "$*"; exit 1; }
-try() { "$@" || die "Errored HERE => '$*'"; }
+
 
 line_count() {
   [[ $# -eq 1 ]] || die "line_count requires 1 argument; expected line count"
@@ -27,14 +27,14 @@ bin_dir=@CMAKE_CURRENT_BINARY_DIR@
 
 echo "running test '$test_name' on $(hostname)"
 
-try cd $bin_dir
+cd $bin_dir
 
-try rm -rf $test_name
-try mkdir -p $test_name/localroot
+rm -rf $test_name
+mkdir -p $test_name/localroot
 
-try cd $test_name
+cd $test_name
 
-try cp "$src_dir/local.yaml" ./
+cp "$src_dir/local.yaml" ./
 
 work_dir=$(pwd)
 echo "Working directory: $work_dir"
@@ -44,48 +44,48 @@ echo "Working directory: $work_dir"
 # Ensure that we can wipe specified databases with ranges in the requests
 # --> Ensures the MARS requests are working correctly
 
-try grib_set -s class=rd,expver=xxxx "$src_data" data.xxxx.d1.grib
-try grib_set -s class=rd,expver=xxxx,date=20240912 "$src_data" data.xxxx.d2.grib
-try grib_ls -m data.xxxx.d1.grib
+grib_set -s class=rd,expver=xxxx "$src_data" data.xxxx.d1.grib
+grib_set -s class=rd,expver=xxxx,date=20240912 "$src_data" data.xxxx.d2.grib
+grib_ls -m data.xxxx.d1.grib
 
-try fdb-write data.xxxx.d1.grib
-try fdb-write data.xxxx.d2.grib
+fdb-write data.xxxx.d1.grib
+fdb-write data.xxxx.d2.grib
 # write the data three times
-try fdb-write data.xxxx.d1.grib
-try fdb-write data.xxxx.d2.grib
-try fdb-write data.xxxx.d1.grib
-try fdb-write data.xxxx.d2.grib
+fdb-write data.xxxx.d1.grib
+fdb-write data.xxxx.d2.grib
+fdb-write data.xxxx.d1.grib
+fdb-write data.xxxx.d2.grib
 
 echo "Test: Incorrect number of entries written"
-try fdb-list --all --minimum-keys="" --porcelain | tee out
+fdb-list --all --minimum-keys="" --porcelain | tee out
 line_count 48
 
 echo "Test: Incorrect number of entries written"
-try fdb-list --all --minimum-keys="" --porcelain --full | tee out
+fdb-list --all --minimum-keys="" --porcelain --full | tee out
 line_count 144
 
 echo "Test: Entries should be masked without --full"
-try fdb-list class=rd,expver=xxxx,date=20240911/20240912,stream=oper,type=an,levtype=pl,param=155/138,levelist=300/400/500/700/850/1000 --porcelain | tee out
+fdb-list class=rd,expver=xxxx,date=20240911/20240912,stream=oper,type=an,levtype=pl,param=155/138,levelist=300/400/500/700/850/1000 --porcelain | tee out
 line_count 48
 
 echo "Test: All entries should be visible with --full"
-try fdb-list class=rd,expver=xxxx,date=20240911/20240912,stream=oper,type=an,levtype=pl,param=155/138,levelist=300/400/500/700/850/1000 --porcelain --full | tee out
+fdb-list class=rd,expver=xxxx,date=20240911/20240912,stream=oper,type=an,levtype=pl,param=155/138,levelist=300/400/500/700/850/1000 --porcelain --full | tee out
 line_count 144
 
 echo "Test: Entries should be masked without full"
-try fdb-list class=rd,expver=xxxx,date=20240911/20240912,stream=oper,type=an,levtype=pl,param=130/138,levelist=300/123/1000 --porcelain | tee out
+fdb-list class=rd,expver=xxxx,date=20240911/20240912,stream=oper,type=an,levtype=pl,param=130/138,levelist=300/123/1000 --porcelain | tee out
 line_count 8
 
 echo "Test: All entries should be visible with --full"
-try fdb-list class=rd,expver=xxxx,date=20240911/20240912,stream=oper,type=an,levtype=pl,param=130/138,levelist=300/123/1000 --porcelain --full | tee out
+fdb-list class=rd,expver=xxxx,date=20240911/20240912,stream=oper,type=an,levtype=pl,param=130/138,levelist=300/123/1000 --porcelain --full | tee out
 line_count 24
 
 echo "Test: Only duplicated entries should be visible with --only-duplicates"
-try fdb-list --all --minimum-keys="" --porcelain --only-duplicates | tee out
+fdb-list --all --minimum-keys="" --porcelain --only-duplicates | tee out
 line_count 96
 
 echo "Test: Only duplicated entries should be visible with --only-duplicates (filtered)"
-try fdb-list class=rd,expver=xxxx,date=20240911/20240912,stream=oper,type=an,levtype=pl,param=155/138,levelist=300/400/500/700/850/1000 --porcelain --only-duplicates | tee out
+fdb-list class=rd,expver=xxxx,date=20240911/20240912,stream=oper,type=an,levtype=pl,param=155/138,levelist=300/400/500/700/850/1000 --porcelain --only-duplicates | tee out
 line_count 96
 
 echo "Test: Incompatible options --only-duplicates and --full"
@@ -95,4 +95,4 @@ echo "Test: Incompatible options --only-duplicates and --compact"
 fdb-list --all --only-duplicates --compact && die "fdb-list should have failed with --compact and --only-duplicates"
 
 echo "cleanup"
-try rm -rf "$work_dir/localroot" "$work_dir"/data.*.grib
+rm -rf "$work_dir/localroot" "$work_dir"/data.*.grib
diff --git a/tests/fdb/tools/list/list_minimum_keys.sh.in b/tests/fdb/tools/list/list_minimum_keys.sh.in
index 1f5120efd..8498d1e16 100755
--- a/tests/fdb/tools/list/list_minimum_keys.sh.in
+++ b/tests/fdb/tools/list/list_minimum_keys.sh.in
@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 
-set -ux
+set -eux
 
 yell() { printf "$(basename "$0"): \033[0;31m!!! %s !!!\033[0m\\n" "$*" >&2; }
 die() { yell "$*"; exit 1; }
-try() { "$@" || die "Errored HERE => '$*'"; }
+
 
 line_count() {
   [[ $# -eq 1 ]] || die "line_count requires 1 argument; expected line count"
@@ -27,14 +27,14 @@ bin_dir=@CMAKE_CURRENT_BINARY_DIR@
 
 echo "running test '$test_name' on $(hostname)"
 
-try cd $bin_dir
+cd $bin_dir
 
-try rm -rf $test_name
-try mkdir -p $test_name/localroot
+rm -rf $test_name
+mkdir -p $test_name/localroot
 
-try cd $test_name
+cd $test_name
 
-try cp "$src_dir/local.yaml" ./
+cp "$src_dir/local.yaml" ./
 
 work_dir=$(pwd)
 echo "Working directory: $work_dir"
@@ -43,40 +43,40 @@ echo "Working directory: $work_dir"
 
 # Ensure that we can wipe specified databases, but only when fully specified
 
-try grib_set -s class=rd,expver=xxxx "$src_data" data.xxxx.grib
-try grib_ls -m data.xxxx.grib
-try fdb-write data.xxxx.grib
+grib_set -s class=rd,expver=xxxx "$src_data" data.xxxx.grib
+grib_ls -m data.xxxx.grib
+fdb-write data.xxxx.grib
 
 
 echo "Test: check all output"
-try fdb-list --all --full --minimum-keys= --porcelain | tee out
+fdb-list --all --full --minimum-keys= --porcelain | tee out
 line_count 24
 
 
 echo "Test: nothing happens if any of the keys are missing"
 for invalid_key in class=rd expver=xxxx; do
-  fdb-list $invalid_key
-  rc=$?
+  rc=0
+  fdb-list $invalid_key || rc=$?
   [[ $rc = 0 ]] && die "Should not have succeeded: $invalid_key"
 done
 
 
 echo "Test: supplying the key"
-try fdb-list class=rd,expver=xxxx --porcelain | tee out
+fdb-list class=rd,expver=xxxx --porcelain | tee out
 line_count 24
 
 
 echo "Test: changing the minimum keys"
 for invalid_key in class=rd,expver=xxxx class=rd,time=1200 expver=xxxx,time=1200; do
-  fdb-list --minimum-keys="class,expver,time" $invalid_key
-  rc=$?
+  rc=0
+  fdb-list --minimum-keys="class,expver,time" $invalid_key || rc=$?
   [[ $rc = 0 ]] && die "Should not have succeeded: $invalid_key"
 done
 
 
 echo "Test: the purge works now this is supplied"
-try fdb-list --minimum-keys="class,expver,time" class=rd,expver=xxxx,time=1200 --porcelain | tee out
+fdb-list --minimum-keys="class,expver,time" class=rd,expver=xxxx,time=1200 --porcelain | tee out
 line_count 12
 
 echo "cleanup"
-try rm -rf "$work_dir/localroot" "$work_dir"/data.*.grib
+rm -rf "$work_dir/localroot" "$work_dir"/data.*.grib
diff --git a/tests/fdb/tools/list/list_porcelain.sh.in b/tests/fdb/tools/list/list_porcelain.sh.in
index d806751a5..d2575d2cd 100755
--- a/tests/fdb/tools/list/list_porcelain.sh.in
+++ b/tests/fdb/tools/list/list_porcelain.sh.in
@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 
-set -ux
+set -eux
 
 yell() { printf "$(basename "$0"): \033[0;31m!!! %s !!!\033[0m\\n" "$*" >&2; }
 die() { yell "$*"; exit 1; }
-try() { "$@" || die "Errored HERE => '$*'"; }
+
 
 line_count() {
   [[ $# -eq 1 ]] || die "line_count requires 1 argument; expected line count"
@@ -14,7 +14,7 @@ line_count() {
 
 grep_count() {
   [[ $# -eq 2 ]] || die "grep_count requires 2; regex and expected count"
-  val=$(grep -cE "$1" out)
+  val=$(grep -cE "$1" out || true)
   [[ $val -eq $2 ]] || die "Incorrect count [$val != $2] for regex [$1]"
 }
 
@@ -33,14 +33,14 @@ bin_dir=@CMAKE_CURRENT_BINARY_DIR@
 
 echo "running test '$test_name' on $(hostname)"
 
-try cd $bin_dir
+cd $bin_dir
 
-try rm -rf $test_name
-try mkdir -p $test_name/localroot
+rm -rf $test_name
+mkdir -p $test_name/localroot
 
-try cd $test_name
+cd $test_name
 
-try cp "$src_dir/local.yaml" ./
+cp "$src_dir/local.yaml" ./
 
 work_dir=$(pwd)
 echo "Working directory: $work_dir"
@@ -50,21 +50,21 @@ echo "Working directory: $work_dir"
 # If we don't specify --porcelain, then the expanded request is prepended to the output request.
 # Measure the difference!
 
-try grib_set -s class=rd,expver=xxxx "$src_data" data.xxxx.grib
-try grib_ls -m data.xxxx.grib
-try fdb-write data.xxxx.grib
+grib_set -s class=rd,expver=xxxx "$src_data" data.xxxx.grib
+grib_ls -m data.xxxx.grib
+fdb-write data.xxxx.grib
 
 tab=$'\t' # macos doesn't support '\t' in grep
 
 echo "Test all output"
 
-try fdb-list --all --minimum-keys="" --porcelain --full | tee out
+fdb-list --all --minimum-keys="" --porcelain --full | tee out
 line_count 24
 
 
 echo "Test normal output"
 
-try fdb-list class=rd,expver=xxxx | tee out
+fdb-list class=rd,expver=xxxx | tee out
 grep_count "{class=rd,expver=xxxx" 24
 grep_count "^list,$" 1
 grep_count "^${tab}.*=.*" 2
@@ -74,14 +74,14 @@ grep_count "^${tab}expver=xxxx" 1
 
 echo "Test porcelain output"
 
-try fdb-list class=rd,expver=xxxx --porcelain | tee out
+fdb-list class=rd,expver=xxxx --porcelain | tee out
 line_count 24
 grep_count "{class=rd,expver=xxxx" 24
 
 
 echo "Test expansion of date and param without porcelain"
 
-try fdb-list class=rd,expver=xxxx,date=20240911,stream=oper,type=an,levtype=pl,param=t | tee out
+fdb-list class=rd,expver=xxxx,date=20240911,stream=oper,type=an,levtype=pl,param=t | tee out
 grep_count "{class=rd,expver=xxxx" 0
 grep_count "^list,$" 1
 grep_count "^${tab}.*=.*" 7
@@ -93,14 +93,14 @@ grep_count "^${tab}date=20240911" 1
 
 echo "Test expansion of date and param with porcelain"
 
-try fdb-list class=rd,expver=xxxx,date=20240911,stream=oper,type=an,levtype=pl,param=t --porcelain | tee out
+fdb-list class=rd,expver=xxxx,date=20240911,stream=oper,type=an,levtype=pl,param=t --porcelain | tee out
 line_count 0
 [[ "$(grep '{class=rd,expver=xxxx' out | grep 'date=20240911' | wc -l)" -eq 0 ]] || die "Incorrect number of entries reported"
 
 
 echo "Test expansion of date and param without porcelain"
 
-try fdb-list class=rd,expver=xxxx,date=20240911,stream=oper,type=an,levtype=pl,param=138 | tee out
+fdb-list class=rd,expver=xxxx,date=20240911,stream=oper,type=an,levtype=pl,param=138 | tee out
 grep_count "^list,$" 1
 grep_count "^${tab}.*=.*" 7
 grep_count "^${tab}class=rd" 1
@@ -112,9 +112,9 @@ grep_count "^${tab}date=20240911" 1
 
 echo "Test expansion of date and param with porcelain"
 
-try fdb-list class=rd,expver=xxxx,date=20240911,stream=oper,type=an,levtype=pl,param=138 --porcelain | tee out
+fdb-list class=rd,expver=xxxx,date=20240911,stream=oper,type=an,levtype=pl,param=138 --porcelain | tee out
 line_count 12
 [[ $(grep '{class=rd,expver=xxxx' out | grep 'date=20240911' | grep param=138 | wc -l) -eq 12 ]] || die "Incorrect number of entries reported"
 
 echo "cleanup"
-try rm -rf "$work_dir/localroot" "$work_dir"/data.*.grib
+rm -rf "$work_dir/localroot" "$work_dir"/data.*.grib
diff --git a/tests/fdb/tools/list/list_ranges.sh.in b/tests/fdb/tools/list/list_ranges.sh.in
index 650e49011..056c7b02c 100755
--- a/tests/fdb/tools/list/list_ranges.sh.in
+++ b/tests/fdb/tools/list/list_ranges.sh.in
@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 
-set -ux
+set -eux
 
 yell() { printf "$(basename "$0"): \033[0;31m!!! %s !!!\033[0m\\n" "$*" >&2; }
 die() { yell "$*"; exit 1; }
-try() { "$@" || die "Errored HERE => '$*'"; }
+
 
 line_count() {
   [[ $# -eq 1 ]] || die "line_count requires 1 argument; expected line count"
@@ -27,14 +27,14 @@ bin_dir=@CMAKE_CURRENT_BINARY_DIR@
 
 echo "running test '$test_name' on $(hostname)"
 
-try cd $bin_dir
+cd $bin_dir
 
-try rm -rf $test_name
-try mkdir -p $test_name/localroot
+rm -rf $test_name
+mkdir -p $test_name/localroot
 
-try cd $test_name
+cd $test_name
 
-try cp "$src_dir/local.yaml" ./
+cp "$src_dir/local.yaml" ./
 
 work_dir=$(pwd)
 echo "Working directory: $work_dir"
@@ -44,47 +44,47 @@ echo "Working directory: $work_dir"
 # Ensure that we can wipe specified databases with ranges in the requests
 # --> Ensures the MARS requests are working correctly
 
-try grib_set -s class=rd,expver=xxxx "$src_data" data.xxxx.d1.grib
-try grib_set -s class=rd,expver=xxxx,date=20240912 "$src_data" data.xxxx.d2.grib
-try grib_set -s class=rd,expver=xxxx,date=20241001 "$src_data" data.xxxx.d3.grib
-try grib_ls -m data.xxxx.d1.grib
+grib_set -s class=rd,expver=xxxx "$src_data" data.xxxx.d1.grib
+grib_set -s class=rd,expver=xxxx,date=20240912 "$src_data" data.xxxx.d2.grib
+grib_set -s class=rd,expver=xxxx,date=20241001 "$src_data" data.xxxx.d3.grib
+grib_ls -m data.xxxx.d1.grib
 
-try fdb-write data.xxxx.d1.grib
-try fdb-write data.xxxx.d2.grib
-try fdb-write data.xxxx.d3.grib
+fdb-write data.xxxx.d1.grib
+fdb-write data.xxxx.d2.grib
+fdb-write data.xxxx.d3.grib
 
-try fdb-list --all --minimum-keys="" --porcelain --full | tee out
+fdb-list --all --minimum-keys="" --porcelain --full | tee out
 line_count 72
 
-try fdb-list class=rd,expver=xxxx --porcelain | tee out
+fdb-list class=rd,expver=xxxx --porcelain | tee out
 line_count 72
 
-try fdb-list class=rd,expver=xxxx,date=20240911 --porcelain | tee out
+fdb-list class=rd,expver=xxxx,date=20240911 --porcelain | tee out
 line_count 24
 
-try fdb-list class=rd,expver=xxxx,date=20240911/20240912 --porcelain | tee out
+fdb-list class=rd,expver=xxxx,date=20240911/20240912 --porcelain | tee out
 line_count 48
 
-try fdb-list class=rd,expver=xxxx,date=20240911/20240912/20241001 --porcelain | tee out
+fdb-list class=rd,expver=xxxx,date=20240911/20240912/20241001 --porcelain | tee out
 line_count 72
 
-try fdb-list class=rd,expver=xxxx,date=20240911/20240912/20241001/20060101,stream=oper,type=an,levtype=pl,param=60 --porcelain | tee out
+fdb-list class=rd,expver=xxxx,date=20240911/20240912/20241001/20060101,stream=oper,type=an,levtype=pl,param=60 --porcelain | tee out
 line_count 0
 
-try fdb-list class=rd,expver=xxxx,date=20240911/20240912/20241001,stream=oper,type=an,levtype=pl,param=155 --porcelain | tee out
+fdb-list class=rd,expver=xxxx,date=20240911/20240912/20241001,stream=oper,type=an,levtype=pl,param=155 --porcelain | tee out
 line_count 36
 
-try fdb-list class=rd,expver=xxxx,date=20240911/20240912/20241001,stream=oper,type=an,levtype=pl,param=60/155 --porcelain | tee out
+fdb-list class=rd,expver=xxxx,date=20240911/20240912/20241001,stream=oper,type=an,levtype=pl,param=60/155 --porcelain | tee out
 line_count 36
 
-try fdb-list class=rd,expver=xxxx,date=20240911/20240912/20241001,stream=oper,type=an,levtype=pl,param=60/155/138 --porcelain | tee out
+fdb-list class=rd,expver=xxxx,date=20240911/20240912/20241001,stream=oper,type=an,levtype=pl,param=60/155/138 --porcelain | tee out
 line_count 72
 
-try fdb-list class=rd,expver=xxxx,date=20240911/20240912/20241001,stream=oper,type=an,levtype=pl,param=60/155/138,levelist=300/400/500/700/850/1000 --porcelain | tee out
+fdb-list class=rd,expver=xxxx,date=20240911/20240912/20241001,stream=oper,type=an,levtype=pl,param=60/155/138,levelist=300/400/500/700/850/1000 --porcelain | tee out
 line_count 72
 
-try fdb-list class=rd,expver=xxxx,date=20240911/20240912/20241001,stream=oper,type=an,levtype=pl,param=60/155/138,levelist=300/123/1000 --porcelain | tee out
+fdb-list class=rd,expver=xxxx,date=20240911/20240912/20241001,stream=oper,type=an,levtype=pl,param=60/155/138,levelist=300/123/1000 --porcelain | tee out
 line_count 24
 
 echo "cleanup"
-try rm -rf "$work_dir/localroot" "$work_dir"/data.*.grib
+rm -rf "$work_dir/localroot" "$work_dir"/data.*.grib
diff --git a/tests/fdb/tools/wipe/wipe.sh.in b/tests/fdb/tools/wipe/wipe.sh.in
index 7351ae467..91fe7718f 100755
--- a/tests/fdb/tools/wipe/wipe.sh.in
+++ b/tests/fdb/tools/wipe/wipe.sh.in
@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 
-set -ux
+set -eux
 
 yell() { printf "$(basename "$0"): \033[0;31m!!! %s !!!\033[0m\\n" "$*" >&2; }
 die() { yell "$*"; exit 1; }
-try() { "$@" || die "Errored HERE => '$*'"; }
-expect_fail() { "$@" && die "Expected failure but command succeeded => '$*'"; }
+
+expect_fail() { if "$@"; then die "Expected failure but command succeeded => '$*'"; fi; }
 
 line_count() {
   [[ $# -eq 1 ]] || die "line_count requires 1 argument; expected line count"
@@ -15,7 +15,7 @@ line_count() {
 
 grep_count() {
   [[ $# -eq 2 ]] || die "grep_count requires 2; regex and expected count"
-  val=$(grep -cEE "$1" out)
+  val=$(grep -cE "$1" out || true)
   [[ $val -eq $2 ]] || die "Incorrect count [$val != $2] for regex [$1]"
 }
 ########################################################################################################################
@@ -46,18 +46,18 @@ bin_dir=@CMAKE_CURRENT_BINARY_DIR@
 
 ########################################################################################################################
 
-echo "running test '$test_name' on $(hostname)"
+echo "running test '$test_name' on $HOSTNAME"
 
-try cd $bin_dir
+cd $bin_dir
 
-try rm -rf $test_name
-try mkdir -p $test_name/$catroot
-try mkdir -p $test_name/$storoot
+rm -rf $test_name
+mkdir -p $test_name/$catroot
+mkdir -p $test_name/$storoot
 
-try cd $test_name
+cd $test_name
 
-try cp "$src_dir/$configyaml" ./
-try ln -s "$bin_dir/$src_data" ./
+cp "$src_dir/$configyaml" ./
+ln -s "$bin_dir/$src_data" ./
 
 work_dir=$(pwd)
 echo "Working directory: $work_dir"
@@ -69,10 +69,10 @@ echo "Working directory: $work_dir"
 
 # Set up the data for the test
 
-try grib_set -s class=rd,expver=xxxx,type=fc,step=0 "$src_data" data.xxxx.0.grib
-try grib_set -s class=rd,expver=xxxx,type=fc,step=1 "$src_data" data.xxxx.1.grib
-try grib_set -s class=rd,expver=xxxy,type=fc,step=0 "$src_data" data.xxxy.0.grib
-try grib_set -s class=rd,expver=xxxy,type=fc,step=1 "$src_data" data.xxxy.1.grib
+grib_set -s class=rd,expver=xxxx,type=fc,step=0 "$src_data" data.xxxx.0.grib
+grib_set -s class=rd,expver=xxxx,type=fc,step=1 "$src_data" data.xxxx.1.grib
+grib_set -s class=rd,expver=xxxy,type=fc,step=0 "$src_data" data.xxxy.0.grib
+grib_set -s class=rd,expver=xxxy,type=fc,step=1 "$src_data" data.xxxy.1.grib
 
 # Set up some regexes for later testing
 
@@ -88,43 +88,43 @@ for i in 0 1 2; do
 
   echo "============ Loop $i ============"
 
-  try fdb-write data.xxxx.0.grib
-  try fdb-list --all --minimum-keys="" --porcelain --full | tee out
+  fdb-write data.xxxx.0.grib
+  fdb-list --all --minimum-keys="" --porcelain --full | tee out
   line_count $((24+(72*i)))
   grep_count "$regex_x0" $((24+(12*i)))
   grep_count "$regex_x1" $(( 0+(12*i)))
   grep_count "$regex_y0" $(( 0+(24*i)))
   grep_count "$regex_y1" $(( 0+(24*i)))
 
-  try fdb-write data.xxxy.0.grib
-  try fdb-list --all --minimum-keys="" --porcelain --full | tee out
+  fdb-write data.xxxy.0.grib
+  fdb-list --all --minimum-keys="" --porcelain --full | tee out
   line_count $((48+(72*i)))
   grep_count "$regex_x0" $((24+(12*i)))
   grep_count "$regex_x1" $(( 0+(12*i)))
   grep_count "$regex_y0" $((24+(24*i)))
   grep_count "$regex_y1" $(( 0+(24*i)))
 
-  try fdb-write data.xxxx.1.grib
-  try fdb-list --all --minimum-keys="" --porcelain --full | tee out
+  fdb-write data.xxxx.1.grib
+  fdb-list --all --minimum-keys="" --porcelain --full | tee out
   line_count $((72+(72*i)))
   grep_count "$regex_x0" $((24+(12*i)))
   grep_count "$regex_x1" $((24+(12*i)))
   grep_count "$regex_y0" $((24+(24*i)))
   grep_count "$regex_y1" $(( 0+(24*i)))
 
-  try fdb-write data.xxxy.1.grib
-  try fdb-list --all --minimum-keys="" --porcelain --full | tee out
+  fdb-write data.xxxy.1.grib
+  fdb-list --all --minimum-keys="" --porcelain --full | tee out
   line_count $((96+(72*i)))
   grep_count "$regex_x0" $((24+(12*i)))
   grep_count "$regex_x1" $((24+(12*i)))
   grep_count "$regex_y0" $((24+(24*i)))
   grep_count "$regex_y1" $((24+(24*i)))
 
-  try fdb-wipe class=rd,expver=xxxx,stream=oper,date=20240911,time=0000,domain=g
+  fdb-wipe class=rd,expver=xxxx,stream=oper,date=20240911,time=0000,domain=g
 
-  try fdb-wipe class=rd,expver=xxxx,stream=oper,date=20240911,time=0000,domain=g --doit
+  fdb-wipe class=rd,expver=xxxx,stream=oper,date=20240911,time=0000,domain=g --doit
 
-  try fdb-list --all --minimum-keys="" --porcelain --full | tee out
+  fdb-list --all --minimum-keys="" --porcelain --full | tee out
   line_count $((72+(72*i)))
   grep_count "$regex_x0" $((12+(12*i)))
   grep_count "$regex_x1" $((12+(12*i)))
@@ -138,12 +138,12 @@ expect_fail fdb-wipe class=rd,expver=xxxy,stream=oper,date=20240911,time=0000,do
 expect_fail fdb-wipe class=rd,expver=xxxy,stream=oper,date=20240911,time=0000,domain=g,type=fc,step=0 --doit
 
 # Wiping an unclean DB
-try touch $catroot/rd:xxxy:oper:20240911:0000:g/dummy
+touch $catroot/rd:xxxy:oper:20240911:0000:g/dummy
 
-try fdb-wipe class=rd,expver=xxxy,stream=oper,date=20240911,time=0000,domain=g
+fdb-wipe class=rd,expver=xxxy,stream=oper,date=20240911,time=0000,domain=g
 expect_fail fdb-wipe class=rd,expver=xxxy,stream=oper,date=20240911,time=0000,domain=g --doit
 
-try fdb-list --all --minimum-keys="" --porcelain --full | tee out
+fdb-list --all --minimum-keys="" --porcelain --full | tee out
 line_count $((72+(72*2)))
 grep_count "$regex_x0" $((12+(12*2)))
 grep_count "$regex_x1" $((12+(12*2)))
@@ -152,7 +152,7 @@ grep_count "$regex_y1" $((24+(24*2)))
 
 fdb-wipe class=rd,expver=xxxy,stream=oper,date=20240911,time=0000,domain=g --doit --unsafe-wipe-all
 
-try fdb-list --all --minimum-keys="" --porcelain --full | tee out
+fdb-list --all --minimum-keys="" --porcelain --full | tee out
 line_count $((48+(48*2)))
 grep_count "$regex_x0" $((12+(12*2)))
 grep_count "$regex_x1" $((12+(12*2)))
@@ -160,4 +160,4 @@ grep_count "$regex_y0" $((12+(12*2)))
 grep_count "$regex_y1" $((12+(12*2)))
 
 echo "cleanup"
-try rm -rf "$work_dir/$catroot" "$work_dir/$storoot" "$work_dir"/data.*.grib
\ No newline at end of file
+rm -rf "$work_dir/$catroot" "$work_dir/$storoot" "$work_dir"/data.*.grib