diff --git a/agent/base b/agent/base
index ae74539a62..10c48913ab 100755
--- a/agent/base
+++ b/agent/base
@@ -291,12 +291,6 @@ function generate_inventory {
     done
 }
 
-function resolve_benchmark_bin {
-    # Encapsulation of method for resolving the actual benchmark
-    # binary.
-    which --skip-alias --skip-functions "${1}"
-}
-
 function vercmp {
     # Compare two package versions via `rpmdev-vercmp`.
     local _package="${1}"
@@ -304,7 +298,11 @@ function vercmp {
     local _exp_ver="${3}"
     local _ins_ver="${4}"
 
-    local _stderr=$(rpmdev-vercmp "${_ins_ver}" "${_exp_ver}" 2>&1 > /dev/null)
+    # Note we declare `_stderr` local without an initializer because the return
+    # code of rpmdev-vercmp would be overwritten by the return code of the
+    # "local" declaration.
+    local _stderr
+    _stderr=$(rpmdev-vercmp "${_ins_ver}" "${_exp_ver}" 2>&1 > /dev/null)
     local _res=${?}
     if [[ ${_res} -ne 0 && ${_res} -ne 11 && ${_res} -ne 12 ]]; then
         error_log "rpmdev-vercmp - ${_stderr}"
diff --git a/agent/bench-scripts/pbench-dbench b/agent/bench-scripts/pbench-dbench
index ee02906e65..5641437449 100755
--- a/agent/bench-scripts/pbench-dbench
+++ b/agent/bench-scripts/pbench-dbench
@@ -24,7 +24,7 @@ warn_log "${script_name} is deprecated and will be removed in the next release"
 benchmark_rpm=$script_name
 export benchmark="dbench"
 if [[ -z "${benchmark_bin}" ]]; then
-	benchmark_bin="$(resolve_benchmark_bin "${benchmark}")"
+	benchmark_bin="$(command -v "${benchmark}")"
 	if [[ -z "${benchmark_bin}" ]]; then
 		error_log "[${script_name}] ${benchmark} executable not found on PATH=${PATH}"
 		exit 1
diff --git a/agent/bench-scripts/pbench-fio b/agent/bench-scripts/pbench-fio
index 36174715e8..2a1c15dc43 100755
--- a/agent/bench-scripts/pbench-fio
+++ b/agent/bench-scripts/pbench-fio
@@ -11,16 +11,7 @@ pbench_bin="`cd ${script_path}/..; /bin/pwd`"
 . "$pbench_bin"/base
 
 export benchmark="fio"
-benchmark_rpm=${benchmark}
 export benchmark_run_dir=""
-# allow unit tests to override
-if [[ -z "${benchmark_bin}" ]]; then
-	benchmark_bin="$(resolve_benchmark_bin "${benchmark}")"
-	if [[ -z "${benchmark_bin}" ]]; then
-		error_log "[${script_name}] ${benchmark} executable not found on PATH=${PATH}"
-		exit 1
-	fi
-fi
 
 job_file="${script_path}/templates/fio.job"
 
@@ -168,6 +159,7 @@ function usage {
 }
 
 function fio_process_options() {
+	local opts
 	opts=$(getopt -q -o b:c:d:hj:r:s:t: --longoptions "help,max-stddev:,max-failures:,samples:,direct:,sync:,pre-check,clients:,client-file:,iodepth:,ioengine:,config:,jobs-per-dev:,job-mode:,rate-iops:,ramptime:,runtime:,test-types:,block-sizes:,file-size:,targets:,tool-group:,postprocess-only:,run-dir:,numjobs:,job-file:,sysinfo:,pre-iteration-script:,histogram-interval-sec:,histogram-interval-msec:,unique-ports" -n "getopt.sh" -- "$@")
 	if [ $? -ne 0 ]; then
 		printf -- "${script_name} $*\n"
@@ -177,6 +169,7 @@ function fio_process_options() {
 		exit 1
 	fi
 	eval set -- "$opts"
+	local arg
 	while true; do
 		arg="${1}"
 		shift
@@ -479,7 +472,12 @@ function local_pre_check() {
 
 	# First check for the supported version of fio in use.
 
-	local _stdout=$(${benchmark_bin} --version)
+	local _stdout
+	_stdout=$(${benchmark} --version 2>&1)
+	if [[ ${?} -ne 0 ]]; then
+		error_log "[${script_name}] ${benchmark} failed reporting its version: '${_stdout}'"
+		exit 1
+	fi
 	local ver_installed=${_stdout##*-}
 
 	vercmp "${benchmark}" "${match}" "${ver}" "${ver_installed}"
@@ -528,8 +526,7 @@ function fio_pre_check() {
 	fi
 	if [[ ${do_local_pre_check} -eq 1 ]]; then
 		debug_log "Running pre-check locally"
-		local_pre_check "${devs}" "${ver}" "${match}"
-		rc=${?}
+		local_pre_check "${devs}" "${ver}" "${match}" || rc=${?}
 	fi
 	if [[ ${rc} -ne 0 ]]; then
 		error_log "pre-check(s) failed, exiting"
@@ -598,7 +595,7 @@ function fio_run_job() {
 
 	if [ -n "${clients}" ]; then
 		for client in "${client_names[@]}"; do
-			local bash_c_cmd="'${benchmark_bin}' --server=,${client_ports[${client}]} > client-result.txt 2> client-result.err"
+			local bash_c_cmd="${benchmark} --server=,${client_ports[${client}]} > client-result.txt 2> client-result.err"
 			local screen_it="screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c ${bash_c_cmd}"
 			if pbench-is-local ${client}; then
 				debug_log "killing any old local fio processes and starting new a fio process for the local client"
@@ -653,9 +650,9 @@ function fio_run_job() {
 	pbench-start-tools --group=$tool_group --dir=$benchmark_results_dir
 
 	# create a command file and keep it with the results for debugging later, or user can run outside of pbench
-	echo "$benchmark_bin $client_opts $bench_opts" >$benchmark_results_dir/fio.cmd
+	echo "$benchmark $client_opts $bench_opts" >$benchmark_results_dir/fio.cmd
 	chmod +x $benchmark_results_dir/fio.cmd
-	debug_log "$benchmark: Going to run [$benchmark_bin $bench_opts $client_opts]"
+	debug_log "$benchmark: Going to run [$benchmark $bench_opts $client_opts]"
 	pushd $benchmark_results_dir >/dev/null
 	$benchmark_results_dir/fio.cmd >$benchmark_results_dir/fio-result.txt
 	local _fio_exit_code=$?
@@ -896,6 +893,7 @@ function fio_run_benchmark() {
 }
 
 fio_process_options "$@"
+
 if [ "$postprocess_only" = "n" ]; then
 	ver="$(pbench-config version ${benchmark})"
 	if [[ -z "${ver}" ]]; then
diff --git a/agent/bench-scripts/pbench-iozone b/agent/bench-scripts/pbench-iozone
index 1ba970c586..bd7c477e98 100755
--- a/agent/bench-scripts/pbench-iozone
+++ b/agent/bench-scripts/pbench-iozone
@@ -25,7 +25,7 @@ warn_log "${script_name} is deprecated and will be removed in the next release"
 benchmark_rpm=$script_name
 export benchmark="iozone"
 if [[ -z "${benchmark_bin}" ]]; then
-	benchmark_bin="$(resolve_benchmark_bin "${benchmark}")"
+	benchmark_bin="$(command -v "${benchmark}")"
 	if [[ -z "${benchmark_bin}" ]]; then
 		error_log "[${script_name}] ${benchmark} executable not found on PATH=${PATH}"
 		exit 1
diff --git a/agent/bench-scripts/pbench-netperf b/agent/bench-scripts/pbench-netperf
index 39d1f09828..d8caa90400 100755
--- a/agent/bench-scripts/pbench-netperf
+++ b/agent/bench-scripts/pbench-netperf
@@ -39,7 +39,7 @@ warn_log "${script_name} is deprecated and will be removed in the next release"
 benchmark_rpm=$script_name
 export benchmark="netperf"
 if [[ -z "${benchmark_bin}" ]]; then
-        benchmark_bin="$(resolve_benchmark_bin "${benchmark}")"
+        benchmark_bin="$(command -v "${benchmark}")"
 	if [[ -z "${benchmark_bin}" ]]; then
 		error_log "[${script_name}] ${benchmark} executable not found on PATH=${PATH}"
 		exit 1
diff --git a/agent/bench-scripts/pbench-uperf b/agent/bench-scripts/pbench-uperf
index 45598d4c3f..5bb3a10719 100755
--- a/agent/bench-scripts/pbench-uperf
+++ b/agent/bench-scripts/pbench-uperf
@@ -25,13 +25,6 @@ pbench_bin="`cd ${script_path}/..; /bin/pwd`"
 . "$pbench_bin"/base
 
 export benchmark="uperf"
-if [[ -z "${benchmark_bin}" ]]; then
-	benchmark_bin="$(resolve_benchmark_bin "${benchmark}")"
-	if [[ -z "${benchmark_bin}" ]]; then
-		error_log "${script_name}: ${benchmark} executable not found on PATH=${PATH}"
-		exit 1
-	fi
-fi
 
 # Every bench-script follows a similar sequence:
 # 1) process bench script arguments
@@ -204,7 +197,13 @@ function local_pre_check {
 	local _ver="${1}"
 	local _match="${2}"
 
-	local ver_installed=$(${benchmark_bin} -V | awk 'NR==1 {print $3}')
+	local _stdout
+	_stdout=$(${benchmark} -V 2>&1)
+	if [[ ${?} -ne 0 ]]; then
+		error_log "${script_name}: ${benchmark} failed reporting version: '${_stdout}'"
+		return 1
+	fi
+	local ver_installed=$(awk 'NR==1 {print $3}' <<< ${_stdout})
 	vercmp "${benchmark}" "${_match}" "${_ver}" "${ver_installed}"
 	return ${?}
 }
@@ -458,6 +457,11 @@ if [[ "${postprocess_only}" != "y" ]]; then
 		# At least one client or server is a local host, so perform the
 		# pre-check.
 		local_pre_check "${ver}" "${match}"
+		res=${?}
+		if [[ ${res} -ne 0 ]]; then
+			error_log "[${script_name}] The local pre-check failed"
+			exit ${res}
+		fi
 	fi
 
 	let err_cnt=0
@@ -484,7 +488,7 @@ if [[ "${postprocess_only}" != "y" ]]; then
 		fi
 	done
 	if [[ ${err_cnt} -gt 0 ]]; then
-		error_log "The following pre-checks on clients and servers failed:"
+		error_log "[${script_name}] The following pre-checks on clients and servers failed:"
 		error_log "    clients: ${err_clients}"
 		error_log "    servers: ${err_servers}"
 		exit 1
@@ -626,7 +630,7 @@ for protocol in ${protocols//,/ }; do
 										# vsock protocol requires socket-type to be specified
 										vsock_extra_opts=" -S vsock"
 									fi
-									benchmark_server_cmd="${benchmark_bin} -v -s -P ${server_port}${vsock_extra_opts} > ${server_log} 2>&1"
+									benchmark_server_cmd="${benchmark} -v -s -P ${server_port}${vsock_extra_opts} > ${server_log} 2>&1"
 									# adjust server command for NUMA binding
 									server_node=`echo "$server_nodes," | cut -d, -f$server_nr`
 									if [ ! -z "$server_node" ]; then
@@ -643,7 +647,7 @@ for protocol in ${protocols//,/ }; do
 									if [ "$log_response_times" == "y" ]; then
 										resp_opt=" -X $benchmark_results_dir/$uperf_identifier--response-times.txt"
 									fi
-									benchmark_client_cmd="${benchmark_bin} -v -m $xml_file -R -a -i 1 ${resp_opt}${vsock_extra_opts} -P $server_port >$result_file 2>&1"
+									benchmark_client_cmd="${benchmark} -v -m $xml_file -R -a -i 1 ${resp_opt}${vsock_extra_opts} -P $server_port >$result_file 2>&1"
 									# adjust client command for NUMA binding
 									client_node=`echo "$client_nodes," | cut -d, -f$server_nr`
 									if [ ! -z "$client_node" ]; then
diff --git a/agent/bench-scripts/test-bin/bm b/agent/bench-scripts/test-bin/bm
deleted file mode 100755
index a438b3b169..0000000000
--- a/agent/bench-scripts/test-bin/bm
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-# Generic "benchmark" command, meant to mock out any behaviors of the various
-# benchmarks, uperf, linpack, iozone, fio, etc.
-
-echo "$0 $*" >> $_testlog
-
-if [[ "${_tst_benchmark}" == "pbench-fio" ]]; then
-    if [[ "${1%%=*}" == "--client" ]]; then 
-        client_file=${1##*=}
-        for line in $(cat ${client_file}); do
-            ip_name="${line%%,*}"
-            client="${ip_name#*:}"
-            if [[ "${client%%.*}" == "hist" ]]; then 
-                # When we are mocking out a benchmark command for pbench-fio,
-                # for each client which begins with "hist" create an empty
-                # fio latency histogram log file so that the invocation of
-                # our latency visualizations can be exercised.
-                touch ./fio_clat_hist.empty.log.${client}
-            fi
-        done
-    elif [[ "${1}" == "--version" ]]; then 
-        echo "fio-3.42"
-    fi
-elif [[ "${_tst_benchmark}" == "pbench-uperf" ]]; then
-    if [[ "${1}" == "-V" ]]; then 
-        echo "Uperf Version 1.0.42"
-        echo "... garbage to be ignored ..."
-    fi
-fi
-
-exit ${_BM_EXIT_STS:-0}
diff --git a/agent/bench-scripts/test-bin/bm b/agent/bench-scripts/test-bin/bm
new file mode 120000
index 0000000000..039bec18e9
--- /dev/null
+++ b/agent/bench-scripts/test-bin/bm
@@ -0,0 +1 @@
+mock-cmd
\ No newline at end of file
diff --git a/agent/bench-scripts/test-bin/dbench b/agent/bench-scripts/test-bin/dbench
new file mode 120000
index 0000000000..039bec18e9
--- /dev/null
+++ b/agent/bench-scripts/test-bin/dbench
@@ -0,0 +1 @@
+mock-cmd
\ No newline at end of file
diff --git a/agent/bench-scripts/test-bin/fio b/agent/bench-scripts/test-bin/fio
new file mode 100755
index 0000000000..337c081c68
--- /dev/null
+++ b/agent/bench-scripts/test-bin/fio
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+echo "$0 $*" >> $_testlog
+
+# Mock fio command behaviors.
+if [[ "${1%%=*}" == "--client" ]]; then 
+	client_file=${1##*=}
+	for line in $(< ${client_file}); do
+		ip_name="${line%%,*}"
+		client="${ip_name#*:}"
+		if [[ "${client%%.*}" == "hist" ]]; then 
+			# When we are mocking out a benchmark command for pbench-fio,
+			# for each client which begins with "hist" create an empty
+			# fio latency histogram log file so that the invocation of
+			# our latency visualizations can be exercised.
+			touch ./fio_clat_hist.empty.log.${client}
+		fi
+	done
+elif [[ "${1}" == "--version" ]]; then 
+	echo "fio-${_BM_FIO_VER:-3.42}"
+	exit 0
+fi
+
+exit ${_BM_FIO_STS:-0}
diff --git a/agent/bench-scripts/test-bin/iozone b/agent/bench-scripts/test-bin/iozone
new file mode 120000
index 0000000000..039bec18e9
--- /dev/null
+++ b/agent/bench-scripts/test-bin/iozone
@@ -0,0 +1 @@
+mock-cmd
\ No newline at end of file
diff --git a/agent/bench-scripts/test-bin/mock-cmd b/agent/bench-scripts/test-bin/mock-cmd
index 100952d126..5a6ff11154 100755
--- a/agent/bench-scripts/test-bin/mock-cmd
+++ b/agent/bench-scripts/test-bin/mock-cmd
@@ -8,13 +8,6 @@ fi
 
 prog="$(basename "${0}")"
 args=( "${@}" )
-lastidx=$((${#args[@]} - 1))
-# avoid "bad array subscript" error
-if [[ "${lastidx}" -lt 0 ]] ;then
-    exit 0
-fi
-
-last=${args[${lastidx}]}
 if [[ "${prog}" == "pbench-tool-meister-start" ]]; then
     echo [pbench] > ${benchmark_run_dir}/metadata.log
 elif [[ "${prog}" == "cat" && "${args[0]}" == "/proc/cmdline" ]]; then
diff --git a/agent/bench-scripts/test-bin/netperf b/agent/bench-scripts/test-bin/netperf
new file mode 120000
index 0000000000..039bec18e9
--- /dev/null
+++ b/agent/bench-scripts/test-bin/netperf
@@ -0,0 +1 @@
+mock-cmd
\ No newline at end of file
diff --git a/agent/bench-scripts/test-bin/uperf b/agent/bench-scripts/test-bin/uperf
new file mode 100755
index 0000000000..d1d147aad5
--- /dev/null
+++ b/agent/bench-scripts/test-bin/uperf
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+echo "$0 $*" >> $_testlog
+
+# Mock uperf command behaviors.
+if [[ "${1}" == "-V" ]]; then 
+	echo "Uperf Version ${_BM_UPERF_VER:-1.0.42}"
+	echo "... garbage to be ignored ..."
+	exit 0
+fi
+
+exit ${_BM_UPERF_STS:-0}
diff --git a/agent/bench-scripts/tests/pbench-dbench/test-02.txt b/agent/bench-scripts/tests/pbench-dbench/test-02.txt
index a98a034067..451386356d 100644
--- a/agent/bench-scripts/tests/pbench-dbench/test-02.txt
+++ b/agent/bench-scripts/tests/pbench-dbench/test-02.txt
@@ -186,26 +186,26 @@ Iteration 2-48thread complete (2 of 2), with 1 pass and 0 failures
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/dbench-postprocess /var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/2-48thread/sample3 dbench- default
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/dbench-postprocess /var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/2-48thread/sample4 dbench- default
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/dbench-postprocess /var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/2-48thread/sample5 dbench- default
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=0 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/1-24thread/sample1/client-1 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 24
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=0 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/1-24thread/sample2/client-1 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 24
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=0 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/1-24thread/sample3/client-1 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 24
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=0 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/1-24thread/sample4/client-1 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 24
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=0 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/1-24thread/sample5/client-1 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 24
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=0 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/2-48thread/sample1/client-1 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 48
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=0 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/2-48thread/sample2/client-1 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 48
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=0 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/2-48thread/sample3/client-1 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 48
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=0 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/2-48thread/sample4/client-1 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 48
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=0 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/2-48thread/sample5/client-1 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 48
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=1 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/1-24thread/sample1/client-2 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 24
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=1 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/1-24thread/sample2/client-2 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 24
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=1 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/1-24thread/sample3/client-2 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 24
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=1 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/1-24thread/sample4/client-2 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 24
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=1 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/1-24thread/sample5/client-2 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 24
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=1 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/2-48thread/sample1/client-2 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 48
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=1 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/2-48thread/sample2/client-2 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 48
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=1 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/2-48thread/sample3/client-2 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 48
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=1 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/2-48thread/sample4/client-2 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 48
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=1 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/2-48thread/sample5/client-2 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 48
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=0 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/dbench --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/1-24thread/sample1/client-1 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 24
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=0 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/dbench --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/1-24thread/sample2/client-1 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 24
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=0 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/dbench --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/1-24thread/sample3/client-1 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 24
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=0 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/dbench --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/1-24thread/sample4/client-1 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 24
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=0 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/dbench --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/1-24thread/sample5/client-1 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 24
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=0 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/dbench --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/2-48thread/sample1/client-1 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 48
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=0 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/dbench --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/2-48thread/sample2/client-1 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 48
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=0 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/dbench --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/2-48thread/sample3/client-1 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 48
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=0 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/dbench --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/2-48thread/sample4/client-1 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 48
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=0 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/dbench --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/2-48thread/sample5/client-1 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 48
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=1 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/dbench --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/1-24thread/sample1/client-2 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 24
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=1 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/dbench --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/1-24thread/sample2/client-2 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 24
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=1 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/dbench --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/1-24thread/sample3/client-2 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 24
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=1 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/dbench --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/1-24thread/sample4/client-2 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 24
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=1 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/dbench --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/1-24thread/sample5/client-2 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 24
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=1 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/dbench --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/2-48thread/sample1/client-2 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 48
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=1 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/dbench --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/2-48thread/sample2/client-2 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 48
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=1 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/dbench --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/2-48thread/sample3/client-2 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 48
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=1 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/dbench --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/2-48thread/sample4/client-2 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 48
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/numactl --cpunodebind=1 bash -c /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/dbench --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/2-48thread/sample5/client-2 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 48
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/1-24thread/sample1
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/1-24thread/sample2
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/1-24thread/sample3
@@ -255,14 +255,14 @@ Iteration 2-48thread complete (2 of 2), with 1 pass and 0 failures
 [pbench]
 --- dbench_test-02_1900.01.01T00.00.00/metadata.log file contents
 +++ dbench_test-02_1900.01.01T00.00.00/1-24thread/dbench-1-127.0.0.1.cmd file contents
-numactl --cpunodebind=0 bash -c "/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/1-24thread/sample5/client-1 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 24"
+numactl --cpunodebind=0 bash -c "/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/dbench --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/1-24thread/sample5/client-1 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 24"
 --- dbench_test-02_1900.01.01T00.00.00/1-24thread/dbench-1-127.0.0.1.cmd file contents
 +++ dbench_test-02_1900.01.01T00.00.00/1-24thread/dbench-2-127.0.0.1.cmd file contents
-numactl --cpunodebind=1 bash -c "/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/1-24thread/sample5/client-2 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 24"
+numactl --cpunodebind=1 bash -c "/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/dbench --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/1-24thread/sample5/client-2 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 24"
 --- dbench_test-02_1900.01.01T00.00.00/1-24thread/dbench-2-127.0.0.1.cmd file contents
 +++ dbench_test-02_1900.01.01T00.00.00/2-48thread/dbench-1-127.0.0.1.cmd file contents
-numactl --cpunodebind=0 bash -c "/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/2-48thread/sample5/client-1 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 48"
+numactl --cpunodebind=0 bash -c "/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/dbench --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/2-48thread/sample5/client-1 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 48"
 --- dbench_test-02_1900.01.01T00.00.00/2-48thread/dbench-1-127.0.0.1.cmd file contents
 +++ dbench_test-02_1900.01.01T00.00.00/2-48thread/dbench-2-127.0.0.1.cmd file contents
-numactl --cpunodebind=1 bash -c "/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/2-48thread/sample5/client-2 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 48"
+numactl --cpunodebind=1 bash -c "/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/dbench --machine-readable --directory=/var/tmp/pbench-test-bench/pbench-agent/dbench_test-02_1900.01.01T00.00.00/2-48thread/sample5/client-2 --timelimit=60 --warmup=15 --loadfile /usr/local/share/doc/dbench/loadfiles/client.txt 48"
 --- dbench_test-02_1900.01.01T00.00.00/2-48thread/dbench-2-127.0.0.1.cmd file contents
diff --git a/agent/bench-scripts/tests/pbench-fio/test-03.txt b/agent/bench-scripts/tests/pbench-fio/test-03.txt
index f487526137..846d0ebd25 100644
--- a/agent/bench-scripts/tests/pbench-fio/test-03.txt
+++ b/agent/bench-scripts/tests/pbench-fio/test-03.txt
@@ -15,5 +15,5 @@
 [debug][1900-01-01T00:00:00.000000] found fio-3.42
 --- pbench.log file contents
 +++ test-execution.log file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --version
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --version
 --- test-execution.log file contents
diff --git a/agent/bench-scripts/tests/pbench-fio/test-04.txt b/agent/bench-scripts/tests/pbench-fio/test-04.txt
index ef187dd23f..ec9eaffb99 100644
--- a/agent/bench-scripts/tests/pbench-fio/test-04.txt
+++ b/agent/bench-scripts/tests/pbench-fio/test-04.txt
@@ -517,152 +517,152 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] Running pre-check locally
 [debug][1900-01-01T00:00:00.000000] local_pre_check(devs="", ver="3.21", match="gte")
 [debug][1900-01-01T00:00:00.000000] found fio-3.42
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
 [debug][1900-01-01T00:00:00.000000] post-processing fio result
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
 [debug][1900-01-01T00:00:00.000000] post-processing fio result
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
 [debug][1900-01-01T00:00:00.000000] post-processing fio result
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
 [debug][1900-01-01T00:00:00.000000] post-processing fio result
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
 [debug][1900-01-01T00:00:00.000000] post-processing fio result
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
 [debug][1900-01-01T00:00:00.000000] post-processing fio result
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
 [debug][1900-01-01T00:00:00.000000] post-processing fio result
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
 [debug][1900-01-01T00:00:00.000000] post-processing fio result
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
 [debug][1900-01-01T00:00:00.000000] post-processing fio result
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
 [debug][1900-01-01T00:00:00.000000] post-processing fio result
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
 [debug][1900-01-01T00:00:00.000000] post-processing fio result
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
 [debug][1900-01-01T00:00:00.000000] post-processing fio result
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
 [debug][1900-01-01T00:00:00.000000] post-processing fio result
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
 [debug][1900-01-01T00:00:00.000000] post-processing fio result
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
 [debug][1900-01-01T00:00:00.000000] post-processing fio result
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
 [debug][1900-01-01T00:00:00.000000] post-processing fio result
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
 [debug][1900-01-01T00:00:00.000000] post-processing fio result
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
 [debug][1900-01-01T00:00:00.000000] post-processing fio result
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
 [debug][1900-01-01T00:00:00.000000] post-processing fio result
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
 [debug][1900-01-01T00:00:00.000000] post-processing fio result
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
 [debug][1900-01-01T00:00:00.000000] post-processing fio result
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
 [debug][1900-01-01T00:00:00.000000] post-processing fio result
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
 [debug][1900-01-01T00:00:00.000000] post-processing fio result
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
 [debug][1900-01-01T00:00:00.000000] post-processing fio result
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
 [debug][1900-01-01T00:00:00.000000] post-processing fio result
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
 [debug][1900-01-01T00:00:00.000000] post-processing fio result
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
 [debug][1900-01-01T00:00:00.000000] post-processing fio result
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
 [debug][1900-01-01T00:00:00.000000] post-processing fio result
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
 [debug][1900-01-01T00:00:00.000000] post-processing fio result
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
@@ -706,37 +706,37 @@ fio job complete
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB readwrite_IOPS 5 0 6 y y
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB readwrite_IOPS 5 0 6 y y
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB readwrite_IOPS 5 0 6 y y
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --version
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --version
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/sample1
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/sample2
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/sample3
@@ -913,31 +913,31 @@ iteration_name = 6-randrw-1024KiB
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/sample1" "fio-" "default"
 --- fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/sample1/fio-postprocess.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/sample1/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/fio.job
 --- fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/sample1/fio.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/sample2/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/sample2" "fio-" "default"
 --- fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/sample2/fio-postprocess.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/sample2/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/fio.job
 --- fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/sample2/fio.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/sample3/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/sample3" "fio-" "default"
 --- fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/sample3/fio-postprocess.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/sample3/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/fio.job
 --- fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/sample3/fio.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/sample4/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/sample4" "fio-" "default"
 --- fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/sample4/fio-postprocess.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/sample4/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/fio.job
 --- fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/sample4/fio.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/sample5/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/sample5" "fio-" "default"
 --- fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/sample5/fio-postprocess.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/sample5/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/fio.job
 --- fio_test-04_1900.01.01T00.00.00/1-rw-4KiB/sample5/fio.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/process-iteration-samples.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples "/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/2-rw-64KiB" "readwrite_IOPS" "5" "0" "6" "y" "y"
@@ -946,31 +946,31 @@ iteration_name = 6-randrw-1024KiB
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/sample1" "fio-" "default"
 --- fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/sample1/fio-postprocess.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/sample1/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/fio.job
 --- fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/sample1/fio.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/sample2/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/sample2" "fio-" "default"
 --- fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/sample2/fio-postprocess.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/sample2/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/fio.job
 --- fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/sample2/fio.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/sample3/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/sample3" "fio-" "default"
 --- fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/sample3/fio-postprocess.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/sample3/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/fio.job
 --- fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/sample3/fio.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/sample4/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/sample4" "fio-" "default"
 --- fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/sample4/fio-postprocess.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/sample4/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/fio.job
 --- fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/sample4/fio.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/sample5/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/sample5" "fio-" "default"
 --- fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/sample5/fio-postprocess.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/sample5/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/fio.job
 --- fio_test-04_1900.01.01T00.00.00/2-rw-64KiB/sample5/fio.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/process-iteration-samples.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples "/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB" "readwrite_IOPS" "5" "0" "6" "y" "y"
@@ -979,31 +979,31 @@ iteration_name = 6-randrw-1024KiB
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/sample1" "fio-" "default"
 --- fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/sample1/fio-postprocess.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/sample1/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/fio.job
 --- fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/sample1/fio.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/sample2/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/sample2" "fio-" "default"
 --- fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/sample2/fio-postprocess.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/sample2/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/fio.job
 --- fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/sample2/fio.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/sample3/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/sample3" "fio-" "default"
 --- fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/sample3/fio-postprocess.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/sample3/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/fio.job
 --- fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/sample3/fio.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/sample4/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/sample4" "fio-" "default"
 --- fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/sample4/fio-postprocess.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/sample4/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/fio.job
 --- fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/sample4/fio.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/sample5/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/sample5" "fio-" "default"
 --- fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/sample5/fio-postprocess.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/sample5/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/fio.job
 --- fio_test-04_1900.01.01T00.00.00/3-rw-1024KiB/sample5/fio.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/process-iteration-samples.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples "/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB" "readwrite_IOPS" "5" "0" "6" "y" "y"
@@ -1012,31 +1012,31 @@ iteration_name = 6-randrw-1024KiB
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/sample1" "fio-" "default"
 --- fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/sample1/fio-postprocess.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/sample1/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/fio.job
 --- fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/sample1/fio.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/sample2/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/sample2" "fio-" "default"
 --- fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/sample2/fio-postprocess.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/sample2/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/fio.job
 --- fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/sample2/fio.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/sample3/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/sample3" "fio-" "default"
 --- fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/sample3/fio-postprocess.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/sample3/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/fio.job
 --- fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/sample3/fio.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/sample4/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/sample4" "fio-" "default"
 --- fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/sample4/fio-postprocess.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/sample4/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/fio.job
 --- fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/sample4/fio.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/sample5/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/sample5" "fio-" "default"
 --- fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/sample5/fio-postprocess.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/sample5/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/fio.job
 --- fio_test-04_1900.01.01T00.00.00/4-randrw-4KiB/sample5/fio.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/process-iteration-samples.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples "/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB" "readwrite_IOPS" "5" "0" "6" "y" "y"
@@ -1045,31 +1045,31 @@ iteration_name = 6-randrw-1024KiB
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/sample1" "fio-" "default"
 --- fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/sample1/fio-postprocess.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/sample1/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/fio.job
 --- fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/sample1/fio.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/sample2/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/sample2" "fio-" "default"
 --- fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/sample2/fio-postprocess.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/sample2/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/fio.job
 --- fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/sample2/fio.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/sample3/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/sample3" "fio-" "default"
 --- fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/sample3/fio-postprocess.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/sample3/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/fio.job
 --- fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/sample3/fio.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/sample4/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/sample4" "fio-" "default"
 --- fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/sample4/fio-postprocess.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/sample4/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/fio.job
 --- fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/sample4/fio.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/sample5/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/sample5" "fio-" "default"
 --- fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/sample5/fio-postprocess.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/sample5/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/fio.job
 --- fio_test-04_1900.01.01T00.00.00/5-randrw-64KiB/sample5/fio.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/process-iteration-samples.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples "/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB" "readwrite_IOPS" "5" "0" "6" "y" "y"
@@ -1078,31 +1078,31 @@ iteration_name = 6-randrw-1024KiB
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/sample1" "fio-" "default"
 --- fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/sample1/fio-postprocess.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/sample1/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/fio.job
 --- fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/sample1/fio.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/sample2/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/sample2" "fio-" "default"
 --- fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/sample2/fio-postprocess.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/sample2/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/fio.job
 --- fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/sample2/fio.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/sample3/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/sample3" "fio-" "default"
 --- fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/sample3/fio-postprocess.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/sample3/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/fio.job
 --- fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/sample3/fio.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/sample4/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/sample4" "fio-" "default"
 --- fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/sample4/fio-postprocess.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/sample4/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/fio.job
 --- fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/sample4/fio.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/sample5/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/sample5" "fio-" "default"
 --- fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/sample5/fio-postprocess.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/sample5/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/fio.job
 --- fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/sample5/fio.cmd file contents
 +++ fio_test-04_1900.01.01T00.00.00/generate-benchmark-summary.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/generate-benchmark-summary "fio" "--config=test-04 --test-types=rw,randrw --ramptime=61" "/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00"
diff --git a/agent/bench-scripts/tests/pbench-fio/test-05.txt b/agent/bench-scripts/tests/pbench-fio/test-05.txt
index 40678ee4f4..c13c50e91c 100644
--- a/agent/bench-scripts/tests/pbench-fio/test-05.txt
+++ b/agent/bench-scripts/tests/pbench-fio/test-05.txt
@@ -145,7 +145,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client foo:8765
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client bar:8765
 [debug][1900-01-01T00:00:00.000000] waiting for fio process(server) to start on the remote clients
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/1-rw-4KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/fio-client.file --max-jobs=2]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/1-rw-4KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/fio-client.file --max-jobs=2]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/foo/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/bar/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
@@ -154,7 +154,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client foo:8765
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client bar:8765
 [debug][1900-01-01T00:00:00.000000] waiting for fio process(server) to start on the remote clients
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/2-rw-64KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/fio-client.file --max-jobs=2]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/2-rw-64KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/fio-client.file --max-jobs=2]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/foo/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/bar/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
@@ -163,7 +163,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client foo:8765
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client bar:8765
 [debug][1900-01-01T00:00:00.000000] waiting for fio process(server) to start on the remote clients
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/3-rw-1024KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/fio-client.file --max-jobs=2]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/3-rw-1024KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/fio-client.file --max-jobs=2]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/foo/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/bar/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
@@ -178,9 +178,9 @@ fio job complete
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/1-rw-4KiB readwrite_IOPS 5 0 6 y y
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/2-rw-64KiB readwrite_IOPS 5 0 6 y y
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/3-rw-1024KiB readwrite_IOPS 5 0 6 y y
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/fio-client.file --max-jobs=2 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/1-rw-4KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/fio-client.file --max-jobs=2 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/2-rw-64KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/fio-client.file --max-jobs=2 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/3-rw-1024KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/fio-client.file --max-jobs=2 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/1-rw-4KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/fio-client.file --max-jobs=2 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/2-rw-64KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/fio-client.file --max-jobs=2 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/3-rw-1024KiB/fio.job
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/1-rw-4KiB/sample1
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/2-rw-64KiB/sample1
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/3-rw-1024KiB/sample1
@@ -195,13 +195,13 @@ fio job complete
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-stop-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/3-rw-1024KiB/sample1
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-start --sysinfo=default default
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-stop --sysinfo=default default
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no bar killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/1-rw-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/1-rw-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no bar killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/2-rw-64KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/2-rw-64KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no bar killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/3-rw-1024KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/3-rw-1024KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no bar killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/1-rw-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/1-rw-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no bar killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/2-rw-64KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/2-rw-64KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no bar killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/3-rw-1024KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/3-rw-1024KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no bar pbench-fio --pre-check --targets=/tmp/fio 3.21 gte
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no foo killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/1-rw-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/1-rw-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no foo killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/2-rw-64KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/2-rw-64KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no foo killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/3-rw-1024KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/3-rw-1024KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no foo killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/1-rw-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/1-rw-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no foo killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/2-rw-64KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/2-rw-64KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no foo killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/3-rw-1024KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/3-rw-1024KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no foo pbench-fio --pre-check --targets=/tmp/fio 3.21 gte
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/timeout --kill-after=1 60 bash -c until printf "" 2>>/dev/null >>/dev/tcp/$0/$1; do sleep 1; done bar 8765
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/timeout --kill-after=1 60 bash -c until printf "" 2>>/dev/null >>/dev/tcp/$0/$1; do sleep 1; done bar 8765
@@ -242,7 +242,7 @@ iteration_name = 3-rw-1024KiB
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/1-rw-4KiB/sample1" "fio-" "default"
 --- fio_test-05_1900.01.01T00.00.00/1-rw-4KiB/sample1/fio-postprocess.cmd file contents
 +++ fio_test-05_1900.01.01T00.00.00/1-rw-4KiB/sample1/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/fio-client.file --max-jobs=2 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/1-rw-4KiB/fio.job
+fio  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/fio-client.file --max-jobs=2 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/1-rw-4KiB/fio.job
 --- fio_test-05_1900.01.01T00.00.00/1-rw-4KiB/sample1/fio.cmd file contents
 +++ fio_test-05_1900.01.01T00.00.00/2-rw-64KiB/process-iteration-samples.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples "/var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/2-rw-64KiB" "readwrite_IOPS" "5" "0" "6" "y" "y"
@@ -251,7 +251,7 @@ iteration_name = 3-rw-1024KiB
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/2-rw-64KiB/sample1" "fio-" "default"
 --- fio_test-05_1900.01.01T00.00.00/2-rw-64KiB/sample1/fio-postprocess.cmd file contents
 +++ fio_test-05_1900.01.01T00.00.00/2-rw-64KiB/sample1/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/fio-client.file --max-jobs=2 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/2-rw-64KiB/fio.job
+fio  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/fio-client.file --max-jobs=2 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/2-rw-64KiB/fio.job
 --- fio_test-05_1900.01.01T00.00.00/2-rw-64KiB/sample1/fio.cmd file contents
 +++ fio_test-05_1900.01.01T00.00.00/3-rw-1024KiB/process-iteration-samples.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples "/var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/3-rw-1024KiB" "readwrite_IOPS" "5" "0" "6" "y" "y"
@@ -260,7 +260,7 @@ iteration_name = 3-rw-1024KiB
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/3-rw-1024KiB/sample1" "fio-" "default"
 --- fio_test-05_1900.01.01T00.00.00/3-rw-1024KiB/sample1/fio-postprocess.cmd file contents
 +++ fio_test-05_1900.01.01T00.00.00/3-rw-1024KiB/sample1/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/fio-client.file --max-jobs=2 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/3-rw-1024KiB/fio.job
+fio  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/fio-client.file --max-jobs=2 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/3-rw-1024KiB/fio.job
 --- fio_test-05_1900.01.01T00.00.00/3-rw-1024KiB/sample1/fio.cmd file contents
 +++ fio_test-05_1900.01.01T00.00.00/generate-benchmark-summary.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/generate-benchmark-summary "fio" "--config=test-05 --test-type=rw --samples=1 --clients=foo,bar" "/var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00"
diff --git a/agent/bench-scripts/tests/pbench-fio/test-06.txt b/agent/bench-scripts/tests/pbench-fio/test-06.txt
index 961d0e5c3b..9c93068aa6 100644
--- a/agent/bench-scripts/tests/pbench-fio/test-06.txt
+++ b/agent/bench-scripts/tests/pbench-fio/test-06.txt
@@ -153,7 +153,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client bar:8765
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client baz:8765
 [debug][1900-01-01T00:00:00.000000] waiting for fio process(server) to start on the remote clients
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/1-rw-4KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/1-rw-4KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/foo/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/bar/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/baz/fio_clat_hist.*.log*) to process for histograms
@@ -164,7 +164,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client bar:8765
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client baz:8765
 [debug][1900-01-01T00:00:00.000000] waiting for fio process(server) to start on the remote clients
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/2-rw-64KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/2-rw-64KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/foo/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/bar/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/baz/fio_clat_hist.*.log*) to process for histograms
@@ -175,7 +175,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client bar:8765
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client baz:8765
 [debug][1900-01-01T00:00:00.000000] waiting for fio process(server) to start on the remote clients
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/3-rw-1024KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/3-rw-1024KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/foo/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/bar/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/baz/fio_clat_hist.*.log*) to process for histograms
@@ -191,9 +191,9 @@ fio job complete
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/1-rw-4KiB readwrite_IOPS 5 0 6 y y
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/2-rw-64KiB readwrite_IOPS 5 0 6 y y
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/3-rw-1024KiB readwrite_IOPS 5 0 6 y y
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/1-rw-4KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/2-rw-64KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/3-rw-1024KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/1-rw-4KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/2-rw-64KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/3-rw-1024KiB/fio.job
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/1-rw-4KiB/sample1
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/2-rw-64KiB/sample1
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/3-rw-1024KiB/sample1
@@ -208,17 +208,17 @@ fio job complete
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-stop-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/3-rw-1024KiB/sample1
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-start --sysinfo=default default
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-stop --sysinfo=default default
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no bar killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/1-rw-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/1-rw-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no bar killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/2-rw-64KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/2-rw-64KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no bar killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/3-rw-1024KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/3-rw-1024KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no bar killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/1-rw-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/1-rw-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no bar killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/2-rw-64KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/2-rw-64KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no bar killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/3-rw-1024KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/3-rw-1024KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no bar pbench-fio --pre-check --targets=/tmp/fio 3.21 gte
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no baz killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/1-rw-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/1-rw-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no baz killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/2-rw-64KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/2-rw-64KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no baz killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/3-rw-1024KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/3-rw-1024KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no baz killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/1-rw-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/1-rw-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no baz killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/2-rw-64KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/2-rw-64KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no baz killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/3-rw-1024KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/3-rw-1024KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no baz pbench-fio --pre-check --targets=/tmp/fio 3.21 gte
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no foo killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/1-rw-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/1-rw-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no foo killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/2-rw-64KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/2-rw-64KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no foo killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/3-rw-1024KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/3-rw-1024KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no foo killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/1-rw-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/1-rw-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no foo killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/2-rw-64KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/2-rw-64KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no foo killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/3-rw-1024KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/3-rw-1024KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no foo pbench-fio --pre-check --targets=/tmp/fio 3.21 gte
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/timeout --kill-after=1 60 bash -c until printf "" 2>>/dev/null >>/dev/tcp/$0/$1; do sleep 1; done bar 8765
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/timeout --kill-after=1 60 bash -c until printf "" 2>>/dev/null >>/dev/tcp/$0/$1; do sleep 1; done bar 8765
@@ -262,7 +262,7 @@ iteration_name = 3-rw-1024KiB
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/1-rw-4KiB/sample1" "fio-" "default"
 --- fio_test-06_1900.01.01T00.00.00/1-rw-4KiB/sample1/fio-postprocess.cmd file contents
 +++ fio_test-06_1900.01.01T00.00.00/1-rw-4KiB/sample1/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/1-rw-4KiB/fio.job
+fio  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/1-rw-4KiB/fio.job
 --- fio_test-06_1900.01.01T00.00.00/1-rw-4KiB/sample1/fio.cmd file contents
 +++ fio_test-06_1900.01.01T00.00.00/2-rw-64KiB/process-iteration-samples.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples "/var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/2-rw-64KiB" "readwrite_IOPS" "5" "0" "6" "y" "y"
@@ -271,7 +271,7 @@ iteration_name = 3-rw-1024KiB
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/2-rw-64KiB/sample1" "fio-" "default"
 --- fio_test-06_1900.01.01T00.00.00/2-rw-64KiB/sample1/fio-postprocess.cmd file contents
 +++ fio_test-06_1900.01.01T00.00.00/2-rw-64KiB/sample1/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/2-rw-64KiB/fio.job
+fio  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/2-rw-64KiB/fio.job
 --- fio_test-06_1900.01.01T00.00.00/2-rw-64KiB/sample1/fio.cmd file contents
 +++ fio_test-06_1900.01.01T00.00.00/3-rw-1024KiB/process-iteration-samples.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples "/var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/3-rw-1024KiB" "readwrite_IOPS" "5" "0" "6" "y" "y"
@@ -280,7 +280,7 @@ iteration_name = 3-rw-1024KiB
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/3-rw-1024KiB/sample1" "fio-" "default"
 --- fio_test-06_1900.01.01T00.00.00/3-rw-1024KiB/sample1/fio-postprocess.cmd file contents
 +++ fio_test-06_1900.01.01T00.00.00/3-rw-1024KiB/sample1/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/3-rw-1024KiB/fio.job
+fio  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/3-rw-1024KiB/fio.job
 --- fio_test-06_1900.01.01T00.00.00/3-rw-1024KiB/sample1/fio.cmd file contents
 +++ fio_test-06_1900.01.01T00.00.00/generate-benchmark-summary.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/generate-benchmark-summary "fio" "--config=test-06 --test-type=rw --samples=1 --client-file=/var/tmp/pbench-test-bench/tmp/test-06_clients.file" "/var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00"
diff --git a/agent/bench-scripts/tests/pbench-fio/test-07.txt b/agent/bench-scripts/tests/pbench-fio/test-07.txt
index 544cb9b9d9..bb3ee39051 100644
--- a/agent/bench-scripts/tests/pbench-fio/test-07.txt
+++ b/agent/bench-scripts/tests/pbench-fio/test-07.txt
@@ -133,7 +133,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.112:8765
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.158:8765
 [debug][1900-01-01T00:00:00.000000] waiting for fio process(server) to start on the remote clients
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/fio-client.file --max-jobs=6]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/fio-client.file --max-jobs=6]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.64/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.112/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.158/fio_clat_hist.*.log*) to process for histograms
@@ -144,7 +144,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.112:8765
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.158:8765
 [debug][1900-01-01T00:00:00.000000] waiting for fio process(server) to start on the remote clients
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/fio-client.file --max-jobs=6]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/fio-client.file --max-jobs=6]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.64/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.112/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.158/fio_clat_hist.*.log*) to process for histograms
@@ -155,7 +155,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.112:8765
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.158:8765
 [debug][1900-01-01T00:00:00.000000] waiting for fio process(server) to start on the remote clients
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/fio-client.file --max-jobs=6]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/fio-client.file --max-jobs=6]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.64/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.112/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.158/fio_clat_hist.*.log*) to process for histograms
@@ -166,7 +166,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.112:8765
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.158:8765
 [debug][1900-01-01T00:00:00.000000] waiting for fio process(server) to start on the remote clients
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/fio-client.file --max-jobs=6]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/fio-client.file --max-jobs=6]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.64/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.112/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.158/fio_clat_hist.*.log*) to process for histograms
@@ -177,7 +177,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.112:8765
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.158:8765
 [debug][1900-01-01T00:00:00.000000] waiting for fio process(server) to start on the remote clients
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/fio-client.file --max-jobs=6]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/fio-client.file --max-jobs=6]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.64/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.112/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.158/fio_clat_hist.*.log*) to process for histograms
@@ -193,11 +193,11 @@ fio job complete
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample5 fio- default
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/generate-benchmark-summary fio --config=test-07 -c 192.168.121.64,192.168.121.112,192.168.121.158 --job-file=/var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/templates/fio.job --targets=/dev/rbd0,/dev/rbd1 -b 4 -t read /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB readwrite_IOPS 5 0 6 y y
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/fio-client.file --max-jobs=6 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/fio-client.file --max-jobs=6 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/fio-client.file --max-jobs=6 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/fio-client.file --max-jobs=6 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/fio-client.file --max-jobs=6 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/fio-client.file --max-jobs=6 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/fio-client.file --max-jobs=6 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/fio-client.file --max-jobs=6 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/fio-client.file --max-jobs=6 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/fio-client.file --max-jobs=6 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/fio.job
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample1
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample2
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample3
@@ -220,23 +220,23 @@ fio job complete
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-stop-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample5
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-start --sysinfo=default default
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-stop --sysinfo=default default
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample2 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample2 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample3 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample3 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample4 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample4 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample5 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample5 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample2 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample2 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample3 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample3 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample4 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample4 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample5 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample5 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 pbench-fio --pre-check --targets=/dev/rbd0,/dev/rbd1 3.21 gte
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample2 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample2 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample3 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample3 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample4 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample4 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample5 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample5 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample2 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample2 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample3 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample3 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample4 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample4 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample5 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample5 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 pbench-fio --pre-check --targets=/dev/rbd0,/dev/rbd1 3.21 gte
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample2 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample2 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample3 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample3 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample4 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample4 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample5 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample5 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample2 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample2 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample3 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample3 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample4 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample4 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample5 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample5 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 pbench-fio --pre-check --targets=/dev/rbd0,/dev/rbd1 3.21 gte
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/timeout --kill-after=1 60 bash -c until printf "" 2>>/dev/null >>/dev/tcp/$0/$1; do sleep 1; done 192.168.121.112 8765
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/timeout --kill-after=1 60 bash -c until printf "" 2>>/dev/null >>/dev/tcp/$0/$1; do sleep 1; done 192.168.121.112 8765
@@ -272,31 +272,31 @@ iteration_name = 1-read-4KiB
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample1" "fio-" "default"
 --- fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample1/fio-postprocess.cmd file contents
 +++ fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample1/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/fio-client.file --max-jobs=6 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/fio.job
+fio  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/fio-client.file --max-jobs=6 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/fio.job
 --- fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample1/fio.cmd file contents
 +++ fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample2/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample2" "fio-" "default"
 --- fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample2/fio-postprocess.cmd file contents
 +++ fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample2/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/fio-client.file --max-jobs=6 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/fio.job
+fio  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/fio-client.file --max-jobs=6 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/fio.job
 --- fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample2/fio.cmd file contents
 +++ fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample3/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample3" "fio-" "default"
 --- fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample3/fio-postprocess.cmd file contents
 +++ fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample3/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/fio-client.file --max-jobs=6 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/fio.job
+fio  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/fio-client.file --max-jobs=6 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/fio.job
 --- fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample3/fio.cmd file contents
 +++ fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample4/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample4" "fio-" "default"
 --- fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample4/fio-postprocess.cmd file contents
 +++ fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample4/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/fio-client.file --max-jobs=6 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/fio.job
+fio  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/fio-client.file --max-jobs=6 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/fio.job
 --- fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample4/fio.cmd file contents
 +++ fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample5/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample5" "fio-" "default"
 --- fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample5/fio-postprocess.cmd file contents
 +++ fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample5/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/fio-client.file --max-jobs=6 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/fio.job
+fio  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/fio-client.file --max-jobs=6 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/fio.job
 --- fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample5/fio.cmd file contents
 +++ fio_test-07_1900.01.01T00.00.00/generate-benchmark-summary.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/generate-benchmark-summary "fio" "--config=test-07 -c 192.168.121.64,192.168.121.112,192.168.121.158 --job-file=/var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/templates/fio.job --targets=/dev/rbd0,/dev/rbd1 -b 4 -t read" "/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00"
diff --git a/agent/bench-scripts/tests/pbench-fio/test-08.txt b/agent/bench-scripts/tests/pbench-fio/test-08.txt
index b6a40745c2..3a59d358cb 100644
--- a/agent/bench-scripts/tests/pbench-fio/test-08.txt
+++ b/agent/bench-scripts/tests/pbench-fio/test-08.txt
@@ -127,7 +127,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.112:8765
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.158:8765
 [debug][1900-01-01T00:00:00.000000] waiting for fio process(server) to start on the remote clients
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.64/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.112/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.158/fio_clat_hist.*.log*) to process for histograms
@@ -138,7 +138,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.112:8765
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.158:8765
 [debug][1900-01-01T00:00:00.000000] waiting for fio process(server) to start on the remote clients
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.64/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.112/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.158/fio_clat_hist.*.log*) to process for histograms
@@ -149,7 +149,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.112:8765
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.158:8765
 [debug][1900-01-01T00:00:00.000000] waiting for fio process(server) to start on the remote clients
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.64/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.112/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.158/fio_clat_hist.*.log*) to process for histograms
@@ -160,7 +160,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.112:8765
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.158:8765
 [debug][1900-01-01T00:00:00.000000] waiting for fio process(server) to start on the remote clients
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.64/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.112/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.158/fio_clat_hist.*.log*) to process for histograms
@@ -171,7 +171,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.112:8765
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.158:8765
 [debug][1900-01-01T00:00:00.000000] waiting for fio process(server) to start on the remote clients
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.64/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.112/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.158/fio_clat_hist.*.log*) to process for histograms
@@ -187,11 +187,11 @@ fio job complete
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample5 fio- default
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/generate-benchmark-summary fio --config=test-08 -c 192.168.121.64,192.168.121.112,192.168.121.158 --job-file=/var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/templates/fio-shared-fs.job --targets=/mnt/cephfs -b 4 -t read /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB readwrite_IOPS 5 0 6 y y
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/fio.job
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample1
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample2
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample3
@@ -214,23 +214,23 @@ fio job complete
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-stop-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample5
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-start --sysinfo=default default
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-stop --sysinfo=default default
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample2 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample2 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample3 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample3 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample4 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample4 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample5 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample5 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample2 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample2 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample3 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample3 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample4 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample4 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample5 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample5 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 pbench-fio --pre-check --targets=/mnt/cephfs 3.21 gte
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample2 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample2 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample3 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample3 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample4 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample4 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample5 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample5 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample2 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample2 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample3 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample3 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample4 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample4 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample5 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample5 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 pbench-fio --pre-check --targets=/mnt/cephfs 3.21 gte
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample2 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample2 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample3 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample3 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample4 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample4 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample5 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample5 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample2 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample2 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample3 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample3 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample4 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample4 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample5 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample5 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 pbench-fio --pre-check --targets=/mnt/cephfs 3.21 gte
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/timeout --kill-after=1 60 bash -c until printf "" 2>>/dev/null >>/dev/tcp/$0/$1; do sleep 1; done 192.168.121.112 8765
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/timeout --kill-after=1 60 bash -c until printf "" 2>>/dev/null >>/dev/tcp/$0/$1; do sleep 1; done 192.168.121.112 8765
@@ -266,31 +266,31 @@ iteration_name = 1-read-4KiB
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample1" "fio-" "default"
 --- fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample1/fio-postprocess.cmd file contents
 +++ fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample1/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/fio.job
+fio  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/fio.job
 --- fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample1/fio.cmd file contents
 +++ fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample2/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample2" "fio-" "default"
 --- fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample2/fio-postprocess.cmd file contents
 +++ fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample2/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/fio.job
+fio  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/fio.job
 --- fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample2/fio.cmd file contents
 +++ fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample3/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample3" "fio-" "default"
 --- fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample3/fio-postprocess.cmd file contents
 +++ fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample3/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/fio.job
+fio  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/fio.job
 --- fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample3/fio.cmd file contents
 +++ fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample4/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample4" "fio-" "default"
 --- fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample4/fio-postprocess.cmd file contents
 +++ fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample4/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/fio.job
+fio  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/fio.job
 --- fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample4/fio.cmd file contents
 +++ fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample5/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample5" "fio-" "default"
 --- fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample5/fio-postprocess.cmd file contents
 +++ fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample5/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/fio.job
+fio  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/fio.job
 --- fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample5/fio.cmd file contents
 +++ fio_test-08_1900.01.01T00.00.00/generate-benchmark-summary.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/generate-benchmark-summary "fio" "--config=test-08 -c 192.168.121.64,192.168.121.112,192.168.121.158 --job-file=/var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/templates/fio-shared-fs.job --targets=/mnt/cephfs -b 4 -t read" "/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00"
diff --git a/agent/bench-scripts/tests/pbench-fio/test-13.txt b/agent/bench-scripts/tests/pbench-fio/test-13.txt
index cb04ba6b2b..e12e9ac7e0 100644
--- a/agent/bench-scripts/tests/pbench-fio/test-13.txt
+++ b/agent/bench-scripts/tests/pbench-fio/test-13.txt
@@ -230,7 +230,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.112:8765
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.158:8765
 [debug][1900-01-01T00:00:00.000000] waiting for fio process(server) to start on the remote clients
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.64/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.112/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.158/fio_clat_hist.*.log*) to process for histograms
@@ -241,7 +241,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.112:8765
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.158:8765
 [debug][1900-01-01T00:00:00.000000] waiting for fio process(server) to start on the remote clients
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.64/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.112/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.158/fio_clat_hist.*.log*) to process for histograms
@@ -252,7 +252,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.112:8765
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.158:8765
 [debug][1900-01-01T00:00:00.000000] waiting for fio process(server) to start on the remote clients
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.64/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.112/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.158/fio_clat_hist.*.log*) to process for histograms
@@ -263,7 +263,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.112:8765
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.158:8765
 [debug][1900-01-01T00:00:00.000000] waiting for fio process(server) to start on the remote clients
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.64/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.112/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.158/fio_clat_hist.*.log*) to process for histograms
@@ -274,7 +274,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.112:8765
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.158:8765
 [debug][1900-01-01T00:00:00.000000] waiting for fio process(server) to start on the remote clients
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.64/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.112/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.158/fio_clat_hist.*.log*) to process for histograms
@@ -285,7 +285,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.112:8765
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.158:8765
 [debug][1900-01-01T00:00:00.000000] waiting for fio process(server) to start on the remote clients
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.64/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.112/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.158/fio_clat_hist.*.log*) to process for histograms
@@ -296,7 +296,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.112:8765
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.158:8765
 [debug][1900-01-01T00:00:00.000000] waiting for fio process(server) to start on the remote clients
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.64/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.112/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.158/fio_clat_hist.*.log*) to process for histograms
@@ -307,7 +307,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.112:8765
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.158:8765
 [debug][1900-01-01T00:00:00.000000] waiting for fio process(server) to start on the remote clients
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.64/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.112/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.158/fio_clat_hist.*.log*) to process for histograms
@@ -318,7 +318,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.112:8765
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.158:8765
 [debug][1900-01-01T00:00:00.000000] waiting for fio process(server) to start on the remote clients
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.64/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.112/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.158/fio_clat_hist.*.log*) to process for histograms
@@ -329,7 +329,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.112:8765
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.121.158:8765
 [debug][1900-01-01T00:00:00.000000] waiting for fio process(server) to start on the remote clients
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.64/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.112/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.121.158/fio_clat_hist.*.log*) to process for histograms
@@ -351,16 +351,16 @@ fio job complete
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/generate-benchmark-summary fio --config=test-13 -c 192.168.121.64,192.168.121.112,192.168.121.158 --job-file=/var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/templates/fio.job --job-mode=serial --targets=/dev/rbd0,/dev/rbd1 -b 4 -t read -s 64m /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0 readwrite_IOPS 5 0 6 y y
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1 readwrite_IOPS 5 0 6 y y
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/fio.job
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample1
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample2
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample3
@@ -403,38 +403,38 @@ fio job complete
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-stop-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample5
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-start --sysinfo=default default
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-stop --sysinfo=default default
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample2 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample2 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample3 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample3 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample4 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample4 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample5 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample5 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample2 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample2 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample3 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample3 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample4 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample4 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample5 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample5 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample2 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample2 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample3 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample3 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample4 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample4 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample5 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample5 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample2 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample2 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample3 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample3 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample4 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample4 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample5 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample5 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.112 pbench-fio --pre-check --targets=/dev/rbd0,/dev/rbd1 3.21 gte
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample2 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample2 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample3 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample3 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample4 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample4 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample5 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample5 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample2 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample2 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample3 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample3 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample4 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample4 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample5 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample5 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample2 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample2 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample3 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample3 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample4 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample4 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample5 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample5 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample2 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample2 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample3 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample3 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample4 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample4 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample5 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample5 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.158 pbench-fio --pre-check --targets=/dev/rbd0,/dev/rbd1 3.21 gte
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample2 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample2 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample3 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample3 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample4 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample4 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample5 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample5 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample2 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample2 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample3 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample3 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample4 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample4 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample5 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample5 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample2 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample2 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample3 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample3 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample4 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample4 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample5 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample5 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample2 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample2 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample3 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample3 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample4 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample4 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample5 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample5 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.121.64 pbench-fio --pre-check --targets=/dev/rbd0,/dev/rbd1 3.21 gte
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/timeout --kill-after=1 60 bash -c until printf "" 2>>/dev/null >>/dev/tcp/$0/$1; do sleep 1; done 192.168.121.112 8765
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/timeout --kill-after=1 60 bash -c until printf "" 2>>/dev/null >>/dev/tcp/$0/$1; do sleep 1; done 192.168.121.112 8765
@@ -492,31 +492,31 @@ iteration_name = 2-read-4KiB-rbd1
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample1" "fio-" "default"
 --- fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample1/fio-postprocess.cmd file contents
 +++ fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample1/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/fio.job
+fio  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/fio.job
 --- fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample1/fio.cmd file contents
 +++ fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample2/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample2" "fio-" "default"
 --- fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample2/fio-postprocess.cmd file contents
 +++ fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample2/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/fio.job
+fio  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/fio.job
 --- fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample2/fio.cmd file contents
 +++ fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample3/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample3" "fio-" "default"
 --- fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample3/fio-postprocess.cmd file contents
 +++ fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample3/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/fio.job
+fio  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/fio.job
 --- fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample3/fio.cmd file contents
 +++ fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample4/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample4" "fio-" "default"
 --- fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample4/fio-postprocess.cmd file contents
 +++ fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample4/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/fio.job
+fio  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/fio.job
 --- fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample4/fio.cmd file contents
 +++ fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample5/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample5" "fio-" "default"
 --- fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample5/fio-postprocess.cmd file contents
 +++ fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample5/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/fio.job
+fio  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/fio.job
 --- fio_test-13_1900.01.01T00.00.00/1-read-4KiB-rbd0/sample5/fio.cmd file contents
 +++ fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/process-iteration-samples.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples "/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1" "readwrite_IOPS" "5" "0" "6" "y" "y"
@@ -525,31 +525,31 @@ iteration_name = 2-read-4KiB-rbd1
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample1" "fio-" "default"
 --- fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample1/fio-postprocess.cmd file contents
 +++ fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample1/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/fio.job
+fio  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/fio.job
 --- fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample1/fio.cmd file contents
 +++ fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample2/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample2" "fio-" "default"
 --- fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample2/fio-postprocess.cmd file contents
 +++ fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample2/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/fio.job
+fio  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/fio.job
 --- fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample2/fio.cmd file contents
 +++ fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample3/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample3" "fio-" "default"
 --- fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample3/fio-postprocess.cmd file contents
 +++ fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample3/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/fio.job
+fio  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/fio.job
 --- fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample3/fio.cmd file contents
 +++ fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample4/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample4" "fio-" "default"
 --- fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample4/fio-postprocess.cmd file contents
 +++ fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample4/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/fio.job
+fio  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/fio.job
 --- fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample4/fio.cmd file contents
 +++ fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample5/fio-postprocess.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample5" "fio-" "default"
 --- fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample5/fio-postprocess.cmd file contents
 +++ fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample5/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/fio.job
+fio  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/fio.job
 --- fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample5/fio.cmd file contents
 +++ fio_test-13_1900.01.01T00.00.00/generate-benchmark-summary.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/generate-benchmark-summary "fio" "--config=test-13 -c 192.168.121.64,192.168.121.112,192.168.121.158 --job-file=/var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/templates/fio.job --job-mode=serial --targets=/dev/rbd0,/dev/rbd1 -b 4 -t read -s 64m" "/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00"
diff --git a/agent/bench-scripts/tests/pbench-fio/test-15.txt b/agent/bench-scripts/tests/pbench-fio/test-15.txt
index 17ec253b8f..e86426f2ab 100644
--- a/agent/bench-scripts/tests/pbench-fio/test-15.txt
+++ b/agent/bench-scripts/tests/pbench-fio/test-15.txt
@@ -253,32 +253,32 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] Running pre-check locally
 [debug][1900-01-01T00:00:00.000000] local_pre_check(devs="", ver="3.21", match="gte")
 [debug][1900-01-01T00:00:00.000000] found fio-3.42
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/1-rw-42KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/1-rw-42KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
 [debug][1900-01-01T00:00:00.000000] post-processing fio result
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/2-randwrite-42KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/2-randwrite-42KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
 [debug][1900-01-01T00:00:00.000000] post-processing fio result
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/3-read-42KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/3-read-42KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
 [debug][1900-01-01T00:00:00.000000] post-processing fio result
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/4-randrw-42KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/4-randrw-42KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
 [debug][1900-01-01T00:00:00.000000] post-processing fio result
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/5-write-42KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/5-write-42KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
 [debug][1900-01-01T00:00:00.000000] post-processing fio result
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/6-randread-42KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/6-randread-42KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
@@ -298,13 +298,13 @@ fio job complete
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/4-randrw-42KiB readwrite_IOPS 5 0 6 y y
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/5-write-42KiB readwrite_IOPS 5 0 6 y y
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/6-randread-42KiB readwrite_IOPS 5 0 6 y y
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/1-rw-42KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/2-randwrite-42KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/3-read-42KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/4-randrw-42KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/5-write-42KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/6-randread-42KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --version
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/1-rw-42KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/2-randwrite-42KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/3-read-42KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/4-randrw-42KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/5-write-42KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/6-randread-42KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --version
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/1-rw-42KiB/sample1
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/2-randwrite-42KiB/sample1
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/3-read-42KiB/sample1
@@ -385,7 +385,7 @@ iteration_name = 6-randread-42KiB
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/1-rw-42KiB/sample1" "fio-" "default"
 --- fio_test-15_1900.01.01T00.00.00/1-rw-42KiB/sample1/fio-postprocess.cmd file contents
 +++ fio_test-15_1900.01.01T00.00.00/1-rw-42KiB/sample1/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/1-rw-42KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/1-rw-42KiB/fio.job
 --- fio_test-15_1900.01.01T00.00.00/1-rw-42KiB/sample1/fio.cmd file contents
 +++ fio_test-15_1900.01.01T00.00.00/2-randwrite-42KiB/process-iteration-samples.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples "/var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/2-randwrite-42KiB" "readwrite_IOPS" "5" "0" "6" "y" "y"
@@ -394,7 +394,7 @@ iteration_name = 6-randread-42KiB
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/2-randwrite-42KiB/sample1" "fio-" "default"
 --- fio_test-15_1900.01.01T00.00.00/2-randwrite-42KiB/sample1/fio-postprocess.cmd file contents
 +++ fio_test-15_1900.01.01T00.00.00/2-randwrite-42KiB/sample1/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/2-randwrite-42KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/2-randwrite-42KiB/fio.job
 --- fio_test-15_1900.01.01T00.00.00/2-randwrite-42KiB/sample1/fio.cmd file contents
 +++ fio_test-15_1900.01.01T00.00.00/3-read-42KiB/process-iteration-samples.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples "/var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/3-read-42KiB" "readwrite_IOPS" "5" "0" "6" "y" "y"
@@ -403,7 +403,7 @@ iteration_name = 6-randread-42KiB
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/3-read-42KiB/sample1" "fio-" "default"
 --- fio_test-15_1900.01.01T00.00.00/3-read-42KiB/sample1/fio-postprocess.cmd file contents
 +++ fio_test-15_1900.01.01T00.00.00/3-read-42KiB/sample1/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/3-read-42KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/3-read-42KiB/fio.job
 --- fio_test-15_1900.01.01T00.00.00/3-read-42KiB/sample1/fio.cmd file contents
 +++ fio_test-15_1900.01.01T00.00.00/4-randrw-42KiB/process-iteration-samples.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples "/var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/4-randrw-42KiB" "readwrite_IOPS" "5" "0" "6" "y" "y"
@@ -412,7 +412,7 @@ iteration_name = 6-randread-42KiB
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/4-randrw-42KiB/sample1" "fio-" "default"
 --- fio_test-15_1900.01.01T00.00.00/4-randrw-42KiB/sample1/fio-postprocess.cmd file contents
 +++ fio_test-15_1900.01.01T00.00.00/4-randrw-42KiB/sample1/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/4-randrw-42KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/4-randrw-42KiB/fio.job
 --- fio_test-15_1900.01.01T00.00.00/4-randrw-42KiB/sample1/fio.cmd file contents
 +++ fio_test-15_1900.01.01T00.00.00/5-write-42KiB/process-iteration-samples.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples "/var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/5-write-42KiB" "readwrite_IOPS" "5" "0" "6" "y" "y"
@@ -421,7 +421,7 @@ iteration_name = 6-randread-42KiB
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/5-write-42KiB/sample1" "fio-" "default"
 --- fio_test-15_1900.01.01T00.00.00/5-write-42KiB/sample1/fio-postprocess.cmd file contents
 +++ fio_test-15_1900.01.01T00.00.00/5-write-42KiB/sample1/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/5-write-42KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/5-write-42KiB/fio.job
 --- fio_test-15_1900.01.01T00.00.00/5-write-42KiB/sample1/fio.cmd file contents
 +++ fio_test-15_1900.01.01T00.00.00/6-randread-42KiB/process-iteration-samples.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples "/var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/6-randread-42KiB" "readwrite_IOPS" "5" "0" "6" "y" "y"
@@ -430,7 +430,7 @@ iteration_name = 6-randread-42KiB
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/6-randread-42KiB/sample1" "fio-" "default"
 --- fio_test-15_1900.01.01T00.00.00/6-randread-42KiB/sample1/fio-postprocess.cmd file contents
 +++ fio_test-15_1900.01.01T00.00.00/6-randread-42KiB/sample1/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/6-randread-42KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/6-randread-42KiB/fio.job
 --- fio_test-15_1900.01.01T00.00.00/6-randread-42KiB/sample1/fio.cmd file contents
 +++ fio_test-15_1900.01.01T00.00.00/generate-benchmark-summary.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/generate-benchmark-summary "fio" "--config=test-15 --test-types=rw,randwrite,read,randrw,write,randread --samples=1 --block-sizes=42" "/var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00"
diff --git a/agent/bench-scripts/tests/pbench-fio/test-16.txt b/agent/bench-scripts/tests/pbench-fio/test-16.txt
index 53c50a7936..c41e8b198d 100644
--- a/agent/bench-scripts/tests/pbench-fio/test-16.txt
+++ b/agent/bench-scripts/tests/pbench-fio/test-16.txt
@@ -65,7 +65,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] Running pre-check on client 192.168.1.1
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client 192.168.1.1:8765
 [debug][1900-01-01T00:00:00.000000] waiting for fio process(server) to start on the remote clients
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-16_1900.01.01T00.00.00/1-rw-42KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-16_1900.01.01T00.00.00/fio-client.file --max-jobs=2]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-16_1900.01.01T00.00.00/1-rw-42KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-16_1900.01.01T00.00.00/fio-client.file --max-jobs=2]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/192.168.1.1/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
@@ -75,14 +75,14 @@ fio job complete
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess /var/tmp/pbench-test-bench/pbench-agent/fio_test-16_1900.01.01T00.00.00/1-rw-42KiB/sample1 fio- default
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/generate-benchmark-summary fio --config=test-16 --job-mode=concurrent -c 192.168.1.1 --test-types=rw --samples=1 --block-sizes=42 --targets=/dev/sda0,/dev/sda1 /var/tmp/pbench-test-bench/pbench-agent/fio_test-16_1900.01.01T00.00.00
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples /var/tmp/pbench-test-bench/pbench-agent/fio_test-16_1900.01.01T00.00.00/1-rw-42KiB readwrite_IOPS 5 0 6 y y
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-16_1900.01.01T00.00.00/fio-client.file --max-jobs=2 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-16_1900.01.01T00.00.00/1-rw-42KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-16_1900.01.01T00.00.00/fio-client.file --max-jobs=2 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-16_1900.01.01T00.00.00/1-rw-42KiB/fio.job
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-16_1900.01.01T00.00.00/1-rw-42KiB/sample1
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-send-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-16_1900.01.01T00.00.00/1-rw-42KiB/sample1
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-start-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-16_1900.01.01T00.00.00/1-rw-42KiB/sample1
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-stop-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-16_1900.01.01T00.00.00/1-rw-42KiB/sample1
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-start --sysinfo=default default
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-stop --sysinfo=default default
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.1.1 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-16_1900.01.01T00.00.00/1-rw-42KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-16_1900.01.01T00.00.00/1-rw-42KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.1.1 killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-16_1900.01.01T00.00.00/1-rw-42KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-16_1900.01.01T00.00.00/1-rw-42KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no 192.168.1.1 pbench-fio --pre-check --targets=/dev/sda0,/dev/sda1 3.21 gte
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/timeout --kill-after=1 60 bash -c until printf "" 2>>/dev/null >>/dev/tcp/$0/$1; do sleep 1; done 192.168.1.1 8765
 --- test-execution.log file contents
@@ -104,7 +104,7 @@ iteration_name = 1-rw-42KiB
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-16_1900.01.01T00.00.00/1-rw-42KiB/sample1" "fio-" "default"
 --- fio_test-16_1900.01.01T00.00.00/1-rw-42KiB/sample1/fio-postprocess.cmd file contents
 +++ fio_test-16_1900.01.01T00.00.00/1-rw-42KiB/sample1/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-16_1900.01.01T00.00.00/fio-client.file --max-jobs=2 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-16_1900.01.01T00.00.00/1-rw-42KiB/fio.job
+fio  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-16_1900.01.01T00.00.00/fio-client.file --max-jobs=2 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-16_1900.01.01T00.00.00/1-rw-42KiB/fio.job
 --- fio_test-16_1900.01.01T00.00.00/1-rw-42KiB/sample1/fio.cmd file contents
 +++ fio_test-16_1900.01.01T00.00.00/generate-benchmark-summary.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/generate-benchmark-summary "fio" "--config=test-16 --job-mode=concurrent -c 192.168.1.1 --test-types=rw --samples=1 --block-sizes=42 --targets=/dev/sda0,/dev/sda1" "/var/tmp/pbench-test-bench/pbench-agent/fio_test-16_1900.01.01T00.00.00"
diff --git a/agent/bench-scripts/tests/pbench-fio/test-20.txt b/agent/bench-scripts/tests/pbench-fio/test-20.txt
index 8ffa88259f..db99e025f6 100644
--- a/agent/bench-scripts/tests/pbench-fio/test-20.txt
+++ b/agent/bench-scripts/tests/pbench-fio/test-20.txt
@@ -171,7 +171,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client def:43
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client ghi:44
 [debug][1900-01-01T00:00:00.000000] waiting for fio process(server) to start on the remote clients
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/1-read-4KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/fio-client.file --max-jobs=6]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/1-read-4KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/fio-client.file --max-jobs=6]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/abc/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/def/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/ghi/fio_clat_hist.*.log*) to process for histograms
@@ -182,7 +182,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client def:43
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client ghi:44
 [debug][1900-01-01T00:00:00.000000] waiting for fio process(server) to start on the remote clients
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/2-read-64KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/fio-client.file --max-jobs=6]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/2-read-64KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/fio-client.file --max-jobs=6]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/abc/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/def/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/ghi/fio_clat_hist.*.log*) to process for histograms
@@ -193,7 +193,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client def:43
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client ghi:44
 [debug][1900-01-01T00:00:00.000000] waiting for fio process(server) to start on the remote clients
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/3-read-1024KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/fio-client.file --max-jobs=6]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/3-read-1024KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/fio-client.file --max-jobs=6]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/abc/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/def/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/ghi/fio_clat_hist.*.log*) to process for histograms
@@ -209,9 +209,9 @@ fio job complete
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/1-read-4KiB readwrite_IOPS 5 0 6 y y
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/2-read-64KiB readwrite_IOPS 5 0 6 y y
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/3-read-1024KiB readwrite_IOPS 5 0 6 y y
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/fio-client.file --max-jobs=6 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/1-read-4KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/fio-client.file --max-jobs=6 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/2-read-64KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/fio-client.file --max-jobs=6 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/3-read-1024KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/fio-client.file --max-jobs=6 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/1-read-4KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/fio-client.file --max-jobs=6 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/2-read-64KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/fio-client.file --max-jobs=6 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/3-read-1024KiB/fio.job
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/1-read-4KiB/sample1
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/2-read-64KiB/sample1
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/3-read-1024KiB/sample1
@@ -226,17 +226,17 @@ fio job complete
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-stop-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/3-read-1024KiB/sample1
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-start --sysinfo=default default
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-stop --sysinfo=default default
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no abc killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/1-read-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/1-read-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,42 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no abc killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/2-read-64KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/2-read-64KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,42 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no abc killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/3-read-1024KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/3-read-1024KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,42 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no abc killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/1-read-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/1-read-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,42 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no abc killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/2-read-64KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/2-read-64KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,42 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no abc killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/3-read-1024KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/3-read-1024KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,42 > client-result.txt 2> client-result.err
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no abc pbench-fio --pre-check --targets=/dev/foo,/dev/bar 3.21 gte
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no def killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/1-read-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/1-read-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,43 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no def killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/2-read-64KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/2-read-64KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,43 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no def killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/3-read-1024KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/3-read-1024KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,43 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no def killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/1-read-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/1-read-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,43 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no def killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/2-read-64KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/2-read-64KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,43 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no def killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/3-read-1024KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/3-read-1024KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,43 > client-result.txt 2> client-result.err
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no def pbench-fio --pre-check --targets=/dev/foo,/dev/bar 3.21 gte
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no ghi killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/1-read-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/1-read-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,44 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no ghi killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/2-read-64KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/2-read-64KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,44 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no ghi killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/3-read-1024KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/3-read-1024KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,44 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no ghi killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/1-read-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/1-read-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,44 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no ghi killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/2-read-64KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/2-read-64KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,44 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no ghi killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/3-read-1024KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/3-read-1024KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,44 > client-result.txt 2> client-result.err
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no ghi pbench-fio --pre-check --targets=/dev/foo,/dev/bar 3.21 gte
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/timeout --kill-after=1 60 bash -c until printf "" 2>>/dev/null >>/dev/tcp/$0/$1; do sleep 1; done abc 42
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/timeout --kill-after=1 60 bash -c until printf "" 2>>/dev/null >>/dev/tcp/$0/$1; do sleep 1; done abc 42
@@ -280,7 +280,7 @@ iteration_name = 3-read-1024KiB
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/1-read-4KiB/sample1" "fio-" "default"
 --- fio_test-20_1900.01.01T00.00.00/1-read-4KiB/sample1/fio-postprocess.cmd file contents
 +++ fio_test-20_1900.01.01T00.00.00/1-read-4KiB/sample1/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/fio-client.file --max-jobs=6 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/1-read-4KiB/fio.job
+fio  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/fio-client.file --max-jobs=6 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/1-read-4KiB/fio.job
 --- fio_test-20_1900.01.01T00.00.00/1-read-4KiB/sample1/fio.cmd file contents
 +++ fio_test-20_1900.01.01T00.00.00/2-read-64KiB/process-iteration-samples.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples "/var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/2-read-64KiB" "readwrite_IOPS" "5" "0" "6" "y" "y"
@@ -289,7 +289,7 @@ iteration_name = 3-read-1024KiB
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/2-read-64KiB/sample1" "fio-" "default"
 --- fio_test-20_1900.01.01T00.00.00/2-read-64KiB/sample1/fio-postprocess.cmd file contents
 +++ fio_test-20_1900.01.01T00.00.00/2-read-64KiB/sample1/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/fio-client.file --max-jobs=6 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/2-read-64KiB/fio.job
+fio  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/fio-client.file --max-jobs=6 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/2-read-64KiB/fio.job
 --- fio_test-20_1900.01.01T00.00.00/2-read-64KiB/sample1/fio.cmd file contents
 +++ fio_test-20_1900.01.01T00.00.00/3-read-1024KiB/process-iteration-samples.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples "/var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/3-read-1024KiB" "readwrite_IOPS" "5" "0" "6" "y" "y"
@@ -298,7 +298,7 @@ iteration_name = 3-read-1024KiB
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/3-read-1024KiB/sample1" "fio-" "default"
 --- fio_test-20_1900.01.01T00.00.00/3-read-1024KiB/sample1/fio-postprocess.cmd file contents
 +++ fio_test-20_1900.01.01T00.00.00/3-read-1024KiB/sample1/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/fio-client.file --max-jobs=6 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/3-read-1024KiB/fio.job
+fio  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/fio-client.file --max-jobs=6 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/3-read-1024KiB/fio.job
 --- fio_test-20_1900.01.01T00.00.00/3-read-1024KiB/sample1/fio.cmd file contents
 +++ fio_test-20_1900.01.01T00.00.00/generate-benchmark-summary.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/generate-benchmark-summary "fio" "--config=test-20 --targets=/dev/foo,/dev/bar --test-type=read --samples=1 --client-file=/var/tmp/pbench-test-bench/tmp/test-20_clients.file" "/var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00"
diff --git a/agent/bench-scripts/tests/pbench-fio/test-22.opts b/agent/bench-scripts/tests/pbench-fio/test-22.opts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/agent/bench-scripts/tests/pbench-fio/test-22.post b/agent/bench-scripts/tests/pbench-fio/test-22.post
new file mode 100755
index 0000000000..58c31aa933
--- /dev/null
+++ b/agent/bench-scripts/tests/pbench-fio/test-22.post
@@ -0,0 +1,3 @@
+#!/bin/bash
+dir=${_testopt}/unittest-scripts
+mv ${dir}/fio.not-found ${dir}/fio
diff --git a/agent/bench-scripts/tests/pbench-fio/test-22.pre b/agent/bench-scripts/tests/pbench-fio/test-22.pre
new file mode 100755
index 0000000000..29003eac2b
--- /dev/null
+++ b/agent/bench-scripts/tests/pbench-fio/test-22.pre
@@ -0,0 +1,3 @@
+#!/bin/bash
+dir=${_testopt}/unittest-scripts
+mv ${dir}/fio ${dir}/fio.not-found
diff --git a/agent/bench-scripts/tests/pbench-fio/test-22.sts b/agent/bench-scripts/tests/pbench-fio/test-22.sts
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/agent/bench-scripts/tests/pbench-fio/test-22.sts
@@ -0,0 +1 @@
+1
diff --git a/agent/bench-scripts/tests/pbench-fio/test-22.txt b/agent/bench-scripts/tests/pbench-fio/test-22.txt
new file mode 100644
index 0000000000..1dec05210e
--- /dev/null
+++ b/agent/bench-scripts/tests/pbench-fio/test-22.txt
@@ -0,0 +1,19 @@
++++ Running test-22 pbench-fio
+[error][1900-01-01T00:00:00.000000] [pbench-fio] fio failed reporting its version: '/var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/pbench-fio: line 476: fio: command not found'
+--- Finished test-22 pbench-fio (status=1)
++++ pbench tree state
+/var/tmp/pbench-test-bench/pbench-agent
+/var/tmp/pbench-test-bench/pbench-agent/pbench.log
+/var/tmp/pbench-test-bench/pbench-agent/tmp
+/var/tmp/pbench-test-bench/pbench-agent/tools-v1-default
+/var/tmp/pbench-test-bench/pbench-agent/tools-v1-default/__trigger__
+/var/tmp/pbench-test-bench/pbench-agent/tools-v1-default/testhost.example.com
+/var/tmp/pbench-test-bench/pbench-agent/tools-v1-default/testhost.example.com/mpstat
+/var/tmp/pbench-test-bench/pbench-agent/tools-v1-default/testhost.example.com/sar
+--- pbench tree state
++++ pbench.log file contents
+[debug][1900-01-01T00:00:00.000000] fio_pre_check(targets="/tmp/fio", clients="", ver="3.21", match="gte")
+[debug][1900-01-01T00:00:00.000000] Running pre-check locally
+[debug][1900-01-01T00:00:00.000000] local_pre_check(devs="", ver="3.21", match="gte")
+[error][1900-01-01T00:00:00.000000] [pbench-fio] fio failed reporting its version: '/var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/pbench-fio: line 476: fio: command not found'
+--- pbench.log file contents
diff --git a/agent/bench-scripts/tests/pbench-fio/test-28.txt b/agent/bench-scripts/tests/pbench-fio/test-28.txt
index 4144ad33f9..c43e03b9ea 100644
--- a/agent/bench-scripts/tests/pbench-fio/test-28.txt
+++ b/agent/bench-scripts/tests/pbench-fio/test-28.txt
@@ -59,7 +59,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] Running pre-check locally
 [debug][1900-01-01T00:00:00.000000] local_pre_check(devs="", ver="3.21", match="gte")
 [debug][1900-01-01T00:00:00.000000] found fio-3.42
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-28_1900.01.01T00.00.00/1-read-8KiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-28_1900.01.01T00.00.00/1-read-8KiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
@@ -69,8 +69,8 @@ fio job complete
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess /var/tmp/pbench-test-bench/pbench-agent/fio_test-28_1900.01.01T00.00.00/1-read-8KiB/sample1 fio- default
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/generate-benchmark-summary fio --config=test-28 --pre-iteration-script=/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio-preint --samples=1 --test-type=read --block-sizes=8 /var/tmp/pbench-test-bench/pbench-agent/fio_test-28_1900.01.01T00.00.00
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples /var/tmp/pbench-test-bench/pbench-agent/fio_test-28_1900.01.01T00.00.00/1-read-8KiB readwrite_IOPS 5 0 6 y y
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-28_1900.01.01T00.00.00/1-read-8KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --version
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-28_1900.01.01T00.00.00/1-read-8KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --version
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio-preint
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-28_1900.01.01T00.00.00/1-read-8KiB/sample1
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-send-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-28_1900.01.01T00.00.00/1-read-8KiB/sample1
@@ -97,7 +97,7 @@ iteration_name = 1-read-8KiB
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-28_1900.01.01T00.00.00/1-read-8KiB/sample1" "fio-" "default"
 --- fio_test-28_1900.01.01T00.00.00/1-read-8KiB/sample1/fio-postprocess.cmd file contents
 +++ fio_test-28_1900.01.01T00.00.00/1-read-8KiB/sample1/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-28_1900.01.01T00.00.00/1-read-8KiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-28_1900.01.01T00.00.00/1-read-8KiB/fio.job
 --- fio_test-28_1900.01.01T00.00.00/1-read-8KiB/sample1/fio.cmd file contents
 +++ fio_test-28_1900.01.01T00.00.00/generate-benchmark-summary.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/generate-benchmark-summary "fio" "--config=test-28 --pre-iteration-script=/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio-preint --samples=1 --test-type=read --block-sizes=8" "/var/tmp/pbench-test-bench/pbench-agent/fio_test-28_1900.01.01T00.00.00"
diff --git a/agent/bench-scripts/tests/pbench-fio/test-30.txt b/agent/bench-scripts/tests/pbench-fio/test-30.txt
index c7658d8a87..8a03af2375 100644
--- a/agent/bench-scripts/tests/pbench-fio/test-30.txt
+++ b/agent/bench-scripts/tests/pbench-fio/test-30.txt
@@ -63,7 +63,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client nodeA:8765
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client nodeB:8765
 [debug][1900-01-01T00:00:00.000000] waiting for fio process(server) to start on the remote clients
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-30_1900.01.01T00.00.00/1-read-4KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-30_1900.01.01T00.00.00/fio-client.file --max-jobs=8]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-30_1900.01.01T00.00.00/1-read-4KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-30_1900.01.01T00.00.00/fio-client.file --max-jobs=8]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/nodeA/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/nodeB/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
@@ -74,16 +74,16 @@ fio job complete
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess /var/tmp/pbench-test-bench/pbench-agent/fio_test-30_1900.01.01T00.00.00/1-read-4KiB/sample1 fio- default
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/generate-benchmark-summary fio --config=test-30 --targets=/tmp --job-file=/var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/templates/fio.job --block-sizes=4 --samples=1 --test-types=read --runtime=30 --file-size=256M --clients=nodeA,nodeB --numjobs=4 /var/tmp/pbench-test-bench/pbench-agent/fio_test-30_1900.01.01T00.00.00
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples /var/tmp/pbench-test-bench/pbench-agent/fio_test-30_1900.01.01T00.00.00/1-read-4KiB readwrite_IOPS 5 0 6 y y
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-30_1900.01.01T00.00.00/fio-client.file --max-jobs=8 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-30_1900.01.01T00.00.00/1-read-4KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-30_1900.01.01T00.00.00/fio-client.file --max-jobs=8 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-30_1900.01.01T00.00.00/1-read-4KiB/fio.job
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-30_1900.01.01T00.00.00/1-read-4KiB/sample1
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-send-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-30_1900.01.01T00.00.00/1-read-4KiB/sample1
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-start-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-30_1900.01.01T00.00.00/1-read-4KiB/sample1
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-stop-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-30_1900.01.01T00.00.00/1-read-4KiB/sample1
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-start --sysinfo=default default
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-stop --sysinfo=default default
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no nodeA killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-30_1900.01.01T00.00.00/1-read-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-30_1900.01.01T00.00.00/1-read-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no nodeA killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-30_1900.01.01T00.00.00/1-read-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-30_1900.01.01T00.00.00/1-read-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no nodeA pbench-fio --pre-check --targets=/tmp 3.21 gte
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no nodeB killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-30_1900.01.01T00.00.00/1-read-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-30_1900.01.01T00.00.00/1-read-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no nodeB killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-30_1900.01.01T00.00.00/1-read-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-30_1900.01.01T00.00.00/1-read-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no nodeB pbench-fio --pre-check --targets=/tmp 3.21 gte
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/timeout --kill-after=1 60 bash -c until printf "" 2>>/dev/null >>/dev/tcp/$0/$1; do sleep 1; done nodeA 8765
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/timeout --kill-after=1 60 bash -c until printf "" 2>>/dev/null >>/dev/tcp/$0/$1; do sleep 1; done nodeB 8765
@@ -106,7 +106,7 @@ iteration_name = 1-read-4KiB
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-30_1900.01.01T00.00.00/1-read-4KiB/sample1" "fio-" "default"
 --- fio_test-30_1900.01.01T00.00.00/1-read-4KiB/sample1/fio-postprocess.cmd file contents
 +++ fio_test-30_1900.01.01T00.00.00/1-read-4KiB/sample1/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-30_1900.01.01T00.00.00/fio-client.file --max-jobs=8 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-30_1900.01.01T00.00.00/1-read-4KiB/fio.job
+fio  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-30_1900.01.01T00.00.00/fio-client.file --max-jobs=8 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-30_1900.01.01T00.00.00/1-read-4KiB/fio.job
 --- fio_test-30_1900.01.01T00.00.00/1-read-4KiB/sample1/fio.cmd file contents
 +++ fio_test-30_1900.01.01T00.00.00/generate-benchmark-summary.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/generate-benchmark-summary "fio" "--config=test-30 --targets=/tmp --job-file=/var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/templates/fio.job --block-sizes=4 --samples=1 --test-types=read --runtime=30 --file-size=256M --clients=nodeA,nodeB --numjobs=4" "/var/tmp/pbench-test-bench/pbench-agent/fio_test-30_1900.01.01T00.00.00"
diff --git a/agent/bench-scripts/tests/pbench-fio/test-31.txt b/agent/bench-scripts/tests/pbench-fio/test-31.txt
index a67e5122f4..f00ad76220 100644
--- a/agent/bench-scripts/tests/pbench-fio/test-31.txt
+++ b/agent/bench-scripts/tests/pbench-fio/test-31.txt
@@ -63,7 +63,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client nodeA:8765
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client nodeB:8765
 [debug][1900-01-01T00:00:00.000000] waiting for fio process(server) to start on the remote clients
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-31_1900.01.01T00.00.00/1-read-4KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-31_1900.01.01T00.00.00/fio-client.file --max-jobs=8]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-31_1900.01.01T00.00.00/1-read-4KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-31_1900.01.01T00.00.00/fio-client.file --max-jobs=8]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/nodeA/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/nodeB/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
@@ -74,16 +74,16 @@ fio job complete
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess /var/tmp/pbench-test-bench/pbench-agent/fio_test-31_1900.01.01T00.00.00/1-read-4KiB/sample1 fio- default
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/generate-benchmark-summary fio --config=test-31 --targets=/tmp --job-file=/var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/templates/fio-shared-fs.job --block-sizes=4 --samples=1 --test-types=read --runtime=30 --file-size=256M --clients=nodeA,nodeB --numjobs=4 /var/tmp/pbench-test-bench/pbench-agent/fio_test-31_1900.01.01T00.00.00
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples /var/tmp/pbench-test-bench/pbench-agent/fio_test-31_1900.01.01T00.00.00/1-read-4KiB readwrite_IOPS 5 0 6 y y
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-31_1900.01.01T00.00.00/fio-client.file --max-jobs=8 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-31_1900.01.01T00.00.00/1-read-4KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-31_1900.01.01T00.00.00/fio-client.file --max-jobs=8 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-31_1900.01.01T00.00.00/1-read-4KiB/fio.job
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-31_1900.01.01T00.00.00/1-read-4KiB/sample1
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-send-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-31_1900.01.01T00.00.00/1-read-4KiB/sample1
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-start-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-31_1900.01.01T00.00.00/1-read-4KiB/sample1
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-stop-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-31_1900.01.01T00.00.00/1-read-4KiB/sample1
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-start --sysinfo=default default
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-stop --sysinfo=default default
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no nodeA killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-31_1900.01.01T00.00.00/1-read-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-31_1900.01.01T00.00.00/1-read-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no nodeA killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-31_1900.01.01T00.00.00/1-read-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-31_1900.01.01T00.00.00/1-read-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no nodeA pbench-fio --pre-check --targets=/tmp 3.21 gte
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no nodeB killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-31_1900.01.01T00.00.00/1-read-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-31_1900.01.01T00.00.00/1-read-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no nodeB killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-31_1900.01.01T00.00.00/1-read-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-31_1900.01.01T00.00.00/1-read-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no nodeB pbench-fio --pre-check --targets=/tmp 3.21 gte
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/timeout --kill-after=1 60 bash -c until printf "" 2>>/dev/null >>/dev/tcp/$0/$1; do sleep 1; done nodeA 8765
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/timeout --kill-after=1 60 bash -c until printf "" 2>>/dev/null >>/dev/tcp/$0/$1; do sleep 1; done nodeB 8765
@@ -106,7 +106,7 @@ iteration_name = 1-read-4KiB
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-31_1900.01.01T00.00.00/1-read-4KiB/sample1" "fio-" "default"
 --- fio_test-31_1900.01.01T00.00.00/1-read-4KiB/sample1/fio-postprocess.cmd file contents
 +++ fio_test-31_1900.01.01T00.00.00/1-read-4KiB/sample1/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-31_1900.01.01T00.00.00/fio-client.file --max-jobs=8 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-31_1900.01.01T00.00.00/1-read-4KiB/fio.job
+fio  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-31_1900.01.01T00.00.00/fio-client.file --max-jobs=8 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-31_1900.01.01T00.00.00/1-read-4KiB/fio.job
 --- fio_test-31_1900.01.01T00.00.00/1-read-4KiB/sample1/fio.cmd file contents
 +++ fio_test-31_1900.01.01T00.00.00/generate-benchmark-summary.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/generate-benchmark-summary "fio" "--config=test-31 --targets=/tmp --job-file=/var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/templates/fio-shared-fs.job --block-sizes=4 --samples=1 --test-types=read --runtime=30 --file-size=256M --clients=nodeA,nodeB --numjobs=4" "/var/tmp/pbench-test-bench/pbench-agent/fio_test-31_1900.01.01T00.00.00"
diff --git a/agent/bench-scripts/tests/pbench-fio/test-32.txt b/agent/bench-scripts/tests/pbench-fio/test-32.txt
index 306870e0d2..ad0b145a91 100644
--- a/agent/bench-scripts/tests/pbench-fio/test-32.txt
+++ b/agent/bench-scripts/tests/pbench-fio/test-32.txt
@@ -98,7 +98,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client hist.foo:42
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client hist.bar:42
 [debug][1900-01-01T00:00:00.000000] waiting for fio process(server) to start on the remote clients
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-32_1900.01.01T00.00.00/1-rw-42KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-32_1900.01.01T00.00.00/fio-client.file --max-jobs=2]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-32_1900.01.01T00.00.00/1-rw-42KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-32_1900.01.01T00.00.00/fio-client.file --max-jobs=2]
 [debug][1900-01-01T00:00:00.000000] post-processing tool data
 [debug][1900-01-01T00:00:00.000000] post-processing fio result
 --- pbench.log file contents
@@ -106,7 +106,7 @@ fio job complete
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess /var/tmp/pbench-test-bench/pbench-agent/fio_test-32_1900.01.01T00.00.00/1-rw-42KiB/sample1 fio- default
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/generate-benchmark-summary fio --config=test-32 --test-type=rw --samples=1 --block-sizes=42 --clients=hist.foo,hist.bar /var/tmp/pbench-test-bench/pbench-agent/fio_test-32_1900.01.01T00.00.00
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples /var/tmp/pbench-test-bench/pbench-agent/fio_test-32_1900.01.01T00.00.00/1-rw-42KiB readwrite_IOPS 5 0 6 y y
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-32_1900.01.01T00.00.00/fio-client.file --max-jobs=2 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-32_1900.01.01T00.00.00/1-rw-42KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-32_1900.01.01T00.00.00/fio-client.file --max-jobs=2 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-32_1900.01.01T00.00.00/1-rw-42KiB/fio.job
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio-histo-log-pctiles.py --time-quantum 10 --percentiles 0 50 90 95 99 99.5 100 -- /var/tmp/pbench-test-bench/pbench-agent/fio_test-32_1900.01.01T00.00.00/1-rw-42KiB/sample1/clients/hist.bar/fio_clat_hist.empty.log
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio-histo-log-pctiles.py --time-quantum 10 --percentiles 0 50 90 95 99 99.5 100 -- /var/tmp/pbench-test-bench/pbench-agent/fio_test-32_1900.01.01T00.00.00/1-rw-42KiB/sample1/clients/hist.bar/fio_clat_hist.empty.log /var/tmp/pbench-test-bench/pbench-agent/fio_test-32_1900.01.01T00.00.00/1-rw-42KiB/sample1/clients/hist.foo/fio_clat_hist.empty.log
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio-histo-log-pctiles.py --time-quantum 10 --percentiles 0 50 90 95 99 99.5 100 -- /var/tmp/pbench-test-bench/pbench-agent/fio_test-32_1900.01.01T00.00.00/1-rw-42KiB/sample1/clients/hist.foo/fio_clat_hist.empty.log
@@ -116,9 +116,9 @@ fio job complete
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-stop-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-32_1900.01.01T00.00.00/1-rw-42KiB/sample1
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-start --sysinfo=default default
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-stop --sysinfo=default default
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no hist.bar killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-32_1900.01.01T00.00.00/1-rw-42KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-32_1900.01.01T00.00.00/1-rw-42KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,42 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no hist.bar killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-32_1900.01.01T00.00.00/1-rw-42KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-32_1900.01.01T00.00.00/1-rw-42KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,42 > client-result.txt 2> client-result.err
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no hist.bar pbench-fio --pre-check --targets=/tmp/fio 3.21 gte
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no hist.foo killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-32_1900.01.01T00.00.00/1-rw-42KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-32_1900.01.01T00.00.00/1-rw-42KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,42 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no hist.foo killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-32_1900.01.01T00.00.00/1-rw-42KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-32_1900.01.01T00.00.00/1-rw-42KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,42 > client-result.txt 2> client-result.err
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no hist.foo pbench-fio --pre-check --targets=/tmp/fio 3.21 gte
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/timeout --kill-after=1 60 bash -c until printf "" 2>>/dev/null >>/dev/tcp/$0/$1; do sleep 1; done hist.bar 42
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/timeout --kill-after=1 60 bash -c until printf "" 2>>/dev/null >>/dev/tcp/$0/$1; do sleep 1; done hist.foo 42
@@ -141,7 +141,7 @@ iteration_name = 1-rw-42KiB
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-32_1900.01.01T00.00.00/1-rw-42KiB/sample1" "fio-" "default"
 --- fio_test-32_1900.01.01T00.00.00/1-rw-42KiB/sample1/fio-postprocess.cmd file contents
 +++ fio_test-32_1900.01.01T00.00.00/1-rw-42KiB/sample1/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-32_1900.01.01T00.00.00/fio-client.file --max-jobs=2 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-32_1900.01.01T00.00.00/1-rw-42KiB/fio.job
+fio  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-32_1900.01.01T00.00.00/fio-client.file --max-jobs=2 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-32_1900.01.01T00.00.00/1-rw-42KiB/fio.job
 --- fio_test-32_1900.01.01T00.00.00/1-rw-42KiB/sample1/fio.cmd file contents
 +++ fio_test-32_1900.01.01T00.00.00/generate-benchmark-summary.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/generate-benchmark-summary "fio" "--config=test-32 --test-type=rw --samples=1 --block-sizes=42 --clients=hist.foo,hist.bar" "/var/tmp/pbench-test-bench/pbench-agent/fio_test-32_1900.01.01T00.00.00"
diff --git a/agent/bench-scripts/tests/pbench-fio/test-50.env b/agent/bench-scripts/tests/pbench-fio/test-50.env
new file mode 100644
index 0000000000..af5ebeecfe
--- /dev/null
+++ b/agent/bench-scripts/tests/pbench-fio/test-50.env
@@ -0,0 +1 @@
+export _BM_FIO_VER="bad"
diff --git a/agent/bench-scripts/tests/pbench-fio/test-50.opts b/agent/bench-scripts/tests/pbench-fio/test-50.opts
new file mode 100644
index 0000000000..28f14772da
--- /dev/null
+++ b/agent/bench-scripts/tests/pbench-fio/test-50.opts
@@ -0,0 +1 @@
+--test-types=read --block-sizes=4k
diff --git a/agent/bench-scripts/tests/pbench-fio/test-50.sts b/agent/bench-scripts/tests/pbench-fio/test-50.sts
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/agent/bench-scripts/tests/pbench-fio/test-50.sts
@@ -0,0 +1 @@
+1
diff --git a/agent/bench-scripts/tests/pbench-fio/test-50.txt b/agent/bench-scripts/tests/pbench-fio/test-50.txt
new file mode 100644
index 0000000000..ab4e019f2f
--- /dev/null
+++ b/agent/bench-scripts/tests/pbench-fio/test-50.txt
@@ -0,0 +1,24 @@
++++ Running test-50 pbench-fio
+[error][1900-01-01T00:00:00.000000] wrong version installed: found fio-bad, expected fio-3.21 (gte)
+[error][1900-01-01T00:00:00.000000] pre-check(s) failed, exiting
+--- Finished test-50 pbench-fio (status=1)
++++ pbench tree state
+/var/tmp/pbench-test-bench/pbench-agent
+/var/tmp/pbench-test-bench/pbench-agent/pbench.log
+/var/tmp/pbench-test-bench/pbench-agent/tmp
+/var/tmp/pbench-test-bench/pbench-agent/tools-v1-default
+/var/tmp/pbench-test-bench/pbench-agent/tools-v1-default/__trigger__
+/var/tmp/pbench-test-bench/pbench-agent/tools-v1-default/testhost.example.com
+/var/tmp/pbench-test-bench/pbench-agent/tools-v1-default/testhost.example.com/mpstat
+/var/tmp/pbench-test-bench/pbench-agent/tools-v1-default/testhost.example.com/sar
+--- pbench tree state
++++ pbench.log file contents
+[debug][1900-01-01T00:00:00.000000] fio_pre_check(targets="/tmp/fio", clients="", ver="3.21", match="gte")
+[debug][1900-01-01T00:00:00.000000] Running pre-check locally
+[debug][1900-01-01T00:00:00.000000] local_pre_check(devs="", ver="3.21", match="gte")
+[error][1900-01-01T00:00:00.000000] wrong version installed: found fio-bad, expected fio-3.21 (gte)
+[error][1900-01-01T00:00:00.000000] pre-check(s) failed, exiting
+--- pbench.log file contents
++++ test-execution.log file contents
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --version
+--- test-execution.log file contents
diff --git a/agent/bench-scripts/tests/pbench-fio/test-55.env b/agent/bench-scripts/tests/pbench-fio/test-55.env
index f94bdc6f2d..273e3ddefe 100644
--- a/agent/bench-scripts/tests/pbench-fio/test-55.env
+++ b/agent/bench-scripts/tests/pbench-fio/test-55.env
@@ -1 +1 @@
-export _BM_EXIT_STS=42
+export _BM_FIO_STS=42
diff --git a/agent/bench-scripts/tests/pbench-fio/test-55.txt b/agent/bench-scripts/tests/pbench-fio/test-55.txt
index e55de83e7a..071e9156bf 100644
--- a/agent/bench-scripts/tests/pbench-fio/test-55.txt
+++ b/agent/bench-scripts/tests/pbench-fio/test-55.txt
@@ -93,20 +93,20 @@ fio job failed, status code 42
 [debug][1900-01-01T00:00:00.000000] Running pre-check locally
 [debug][1900-01-01T00:00:00.000000] local_pre_check(devs="", ver="3.21", match="gte")
 [debug][1900-01-01T00:00:00.000000] found fio-3.42
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-55_1900.01.01T00.00.00/1-read-4kKiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-55_1900.01.01T00.00.00/1-read-4kKiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] failed: fio_run_job "1-read-4kKiB" "/var/tmp/pbench-test-bench/pbench-agent/fio_test-55_1900.01.01T00.00.00/1-read-4kKiB/sample1" "/var/tmp/pbench-test-bench/pbench-agent/fio_test-55_1900.01.01T00.00.00/1-read-4kKiB/fio.job" "/var/tmp" ""
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-55_1900.01.01T00.00.00/2-write-4kKiB/fio.job ]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-55_1900.01.01T00.00.00/2-write-4kKiB/fio.job ]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/localhost/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/*/fio_clat_hist.*.log*) to process for histograms
 [debug][1900-01-01T00:00:00.000000] failed: fio_run_job "2-write-4kKiB" "/var/tmp/pbench-test-bench/pbench-agent/fio_test-55_1900.01.01T00.00.00/2-write-4kKiB/sample1" "/var/tmp/pbench-test-bench/pbench-agent/fio_test-55_1900.01.01T00.00.00/2-write-4kKiB/fio.job" "/var/tmp" ""
 --- pbench.log file contents
 +++ test-execution.log file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/generate-benchmark-summary fio --config=test-55 -d /var/tmp --test-type=read,write --block-size=4k --samples=2 /var/tmp/pbench-test-bench/pbench-agent/fio_test-55_1900.01.01T00.00.00
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-55_1900.01.01T00.00.00/1-read-4kKiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-55_1900.01.01T00.00.00/2-write-4kKiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --version
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-55_1900.01.01T00.00.00/1-read-4kKiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-55_1900.01.01T00.00.00/2-write-4kKiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --version
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-send-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-55_1900.01.01T00.00.00/1-read-4kKiB/sample1
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-send-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-55_1900.01.01T00.00.00/2-write-4kKiB/sample1
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-start-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-55_1900.01.01T00.00.00/1-read-4kKiB/sample1
@@ -135,10 +135,10 @@ iteration_name = 2-write-4kKiB
 
 --- fio_test-55_1900.01.01T00.00.00/metadata.log file contents
 +++ fio_test-55_1900.01.01T00.00.00/1-read-4kKiB/sample1/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-55_1900.01.01T00.00.00/1-read-4kKiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-55_1900.01.01T00.00.00/1-read-4kKiB/fio.job
 --- fio_test-55_1900.01.01T00.00.00/1-read-4kKiB/sample1/fio.cmd file contents
 +++ fio_test-55_1900.01.01T00.00.00/2-write-4kKiB/sample1/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-55_1900.01.01T00.00.00/2-write-4kKiB/fio.job
+fio  --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-55_1900.01.01T00.00.00/2-write-4kKiB/fio.job
 --- fio_test-55_1900.01.01T00.00.00/2-write-4kKiB/sample1/fio.cmd file contents
 +++ fio_test-55_1900.01.01T00.00.00/generate-benchmark-summary.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/generate-benchmark-summary "fio" "--config=test-55 -d /var/tmp --test-type=read,write --block-size=4k --samples=2" "/var/tmp/pbench-test-bench/pbench-agent/fio_test-55_1900.01.01T00.00.00"
diff --git a/agent/bench-scripts/tests/pbench-fio/test-61.txt b/agent/bench-scripts/tests/pbench-fio/test-61.txt
index 04418dcb1e..3a4c177979 100644
--- a/agent/bench-scripts/tests/pbench-fio/test-61.txt
+++ b/agent/bench-scripts/tests/pbench-fio/test-61.txt
@@ -155,7 +155,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client bar:8765
 [debug][1900-01-01T00:00:00.000000] killing any old local fio processes and starting new a fio process for the local client
 [debug][1900-01-01T00:00:00.000000] waiting for fio process(server) to start on the remote clients
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/1-rw-4KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/1-rw-4KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/foo/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/bar/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/testhost/fio_clat_hist.*.log*) to process for histograms
@@ -166,7 +166,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client bar:8765
 [debug][1900-01-01T00:00:00.000000] killing any old local fio processes and starting new a fio process for the local client
 [debug][1900-01-01T00:00:00.000000] waiting for fio process(server) to start on the remote clients
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/2-rw-64KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/2-rw-64KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/foo/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/bar/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/testhost/fio_clat_hist.*.log*) to process for histograms
@@ -177,7 +177,7 @@ fio job complete
 [debug][1900-01-01T00:00:00.000000] killing any old fio processes, creating directories, and starting new a fio process on remote client bar:8765
 [debug][1900-01-01T00:00:00.000000] killing any old local fio processes and starting new a fio process for the local client
 [debug][1900-01-01T00:00:00.000000] waiting for fio process(server) to start on the remote clients
-[debug][1900-01-01T00:00:00.000000] fio: Going to run [/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/3-rw-1024KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
+[debug][1900-01-01T00:00:00.000000] fio: Going to run [fio --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/3-rw-1024KiB/fio.job  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/fio-client.file --max-jobs=3]
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/foo/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/bar/fio_clat_hist.*.log*) to process for histograms
 [warn][1900-01-01T00:00:00.000000] log_hist_msec specified in job file but failed to find any log files (.../clients/testhost/fio_clat_hist.*.log*) to process for histograms
@@ -193,10 +193,10 @@ fio job complete
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/1-rw-4KiB readwrite_IOPS 5 0 6 y y
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/2-rw-64KiB readwrite_IOPS 5 0 6 y y
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/3-rw-1024KiB readwrite_IOPS 5 0 6 y y
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/1-rw-4KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/2-rw-64KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/3-rw-1024KiB/fio.job
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm --version
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/1-rw-4KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/2-rw-64KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/3-rw-1024KiB/fio.job
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/fio --version
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/1-rw-4KiB/sample1
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/2-rw-64KiB/sample1
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/3-rw-1024KiB/sample1
@@ -211,16 +211,16 @@ fio job complete
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-stop-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/3-rw-1024KiB/sample1
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-start --sysinfo=default default
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-stop --sysinfo=default default
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no bar killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/1-rw-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/1-rw-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no bar killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/2-rw-64KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/2-rw-64KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no bar killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/3-rw-1024KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/3-rw-1024KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no bar killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/1-rw-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/1-rw-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no bar killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/2-rw-64KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/2-rw-64KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no bar killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/3-rw-1024KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/3-rw-1024KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no bar pbench-fio --pre-check --targets=/tmp/fio 3.21 gte
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no foo killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/1-rw-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/1-rw-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no foo killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/2-rw-64KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/2-rw-64KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no foo killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/3-rw-1024KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/3-rw-1024KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c '/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm' --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no foo killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/1-rw-4KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/1-rw-4KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no foo killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/2-rw-64KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/2-rw-64KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no foo killall fio > /dev/null 2>&1; mkdir -p /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/3-rw-1024KiB/sample1 && cd /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/3-rw-1024KiB/sample1 && screen -L -Logfile fio-server.screen.log -dmS fio-server bash -c fio --server=,8765 > client-result.txt 2> client-result.err
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no foo pbench-fio --pre-check --targets=/tmp/fio 3.21 gte
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/timeout --kill-after=1 60 bash -c until printf "" 2>>/dev/null >>/dev/tcp/$0/$1; do sleep 1; done bar 8765
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/timeout --kill-after=1 60 bash -c until printf "" 2>>/dev/null >>/dev/tcp/$0/$1; do sleep 1; done bar 8765
@@ -264,7 +264,7 @@ iteration_name = 3-rw-1024KiB
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/1-rw-4KiB/sample1" "fio-" "default"
 --- fio_test-61_1900.01.01T00.00.00/1-rw-4KiB/sample1/fio-postprocess.cmd file contents
 +++ fio_test-61_1900.01.01T00.00.00/1-rw-4KiB/sample1/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/1-rw-4KiB/fio.job
+fio  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/1-rw-4KiB/fio.job
 --- fio_test-61_1900.01.01T00.00.00/1-rw-4KiB/sample1/fio.cmd file contents
 +++ fio_test-61_1900.01.01T00.00.00/2-rw-64KiB/process-iteration-samples.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples "/var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/2-rw-64KiB" "readwrite_IOPS" "5" "0" "6" "y" "y"
@@ -273,7 +273,7 @@ iteration_name = 3-rw-1024KiB
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/2-rw-64KiB/sample1" "fio-" "default"
 --- fio_test-61_1900.01.01T00.00.00/2-rw-64KiB/sample1/fio-postprocess.cmd file contents
 +++ fio_test-61_1900.01.01T00.00.00/2-rw-64KiB/sample1/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/2-rw-64KiB/fio.job
+fio  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/2-rw-64KiB/fio.job
 --- fio_test-61_1900.01.01T00.00.00/2-rw-64KiB/sample1/fio.cmd file contents
 +++ fio_test-61_1900.01.01T00.00.00/3-rw-1024KiB/process-iteration-samples.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/process-iteration-samples "/var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/3-rw-1024KiB" "readwrite_IOPS" "5" "0" "6" "y" "y"
@@ -282,7 +282,7 @@ iteration_name = 3-rw-1024KiB
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/fio-postprocess "/var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/3-rw-1024KiB/sample1" "fio-" "default"
 --- fio_test-61_1900.01.01T00.00.00/3-rw-1024KiB/sample1/fio-postprocess.cmd file contents
 +++ fio_test-61_1900.01.01T00.00.00/3-rw-1024KiB/sample1/fio.cmd file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/3-rw-1024KiB/fio.job
+fio  --client=/var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/fio-client.file --max-jobs=3 --output-format=json /var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00/3-rw-1024KiB/fio.job
 --- fio_test-61_1900.01.01T00.00.00/3-rw-1024KiB/sample1/fio.cmd file contents
 +++ fio_test-61_1900.01.01T00.00.00/generate-benchmark-summary.cmd file contents
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/generate-benchmark-summary "fio" "--config=test-61 --test-type=rw --samples=1 --clients=foo,bar,testhost" "/var/tmp/pbench-test-bench/pbench-agent/fio_test-61_1900.01.01T00.00.00"
diff --git a/agent/bench-scripts/tests/pbench-uperf/test-00.txt b/agent/bench-scripts/tests/pbench-uperf/test-00.txt
index 46a6c82891..c688a8ad73 100644
--- a/agent/bench-scripts/tests/pbench-uperf/test-00.txt
+++ b/agent/bench-scripts/tests/pbench-uperf/test-00.txt
@@ -80,7 +80,6 @@ Iteration 2-tcp_stream-64B-1i complete (2 of 2), with 1 pass and 0 failures
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/uperf-postprocess /var/tmp/pbench-test-bench/pbench-agent/uperf_test-00_1900.01.01T00.00.00/1-tcp_rr-64B-1i/sample2 tcp 64 1 rr 127.0.0.1 127.0.0.1 uperf- default 1.0.7
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/uperf-postprocess /var/tmp/pbench-test-bench/pbench-agent/uperf_test-00_1900.01.01T00.00.00/2-tcp_stream-64B-1i/sample1 tcp 64 1 stream 127.0.0.1 127.0.0.1 uperf- default 1.0.7
 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/uperf-postprocess /var/tmp/pbench-test-bench/pbench-agent/uperf_test-00_1900.01.01T00.00.00/2-tcp_stream-64B-1i/sample2 tcp 64 1 stream 127.0.0.1 127.0.0.1 uperf- default 1.0.7
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm -V
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/uperf_test-00_1900.01.01T00.00.00/1-tcp_rr-64B-1i/sample1
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/uperf_test-00_1900.01.01T00.00.00/1-tcp_rr-64B-1i/sample2
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/uperf_test-00_1900.01.01T00.00.00/2-tcp_stream-64B-1i/sample1
@@ -111,6 +110,7 @@ Iteration 2-tcp_stream-64B-1i complete (2 of 2), with 1 pass and 0 failures
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/sleep 26
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/sleep 26
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/sleep 26
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/uperf -V
 --- test-execution.log file contents
 +++ uperf_test-00_1900.01.01T00.00.00/metadata.log file contents
 [pbench]
@@ -156,3 +156,15 @@ iteration_name = 2-tcp_stream-64B-1i
 +++ uperf_test-00_1900.01.01T00.00.00/pbench-uperf.cmd file contents
 pbench-uperf --config=test-00 --test-types=rr,stream --message-sizes=64 --instances=1 --protocols=tcp --runtime=20 --samples=2
 --- uperf_test-00_1900.01.01T00.00.00/pbench-uperf.cmd file contents
++++ uperf_test-00_1900.01.01T00.00.00/1-tcp_rr-64B-1i/client::127.0.0.1-server::127.0.0.1:20010--client_start.sh file contents
+uperf -v -m /var/tmp/pbench-test-bench/pbench-agent/uperf_test-00_1900.01.01T00.00.00/1-tcp_rr-64B-1i/client::127.0.0.1-server::127.0.0.1:20010--test_config.xml -R -a -i 1  -P 20010 >/var/tmp/pbench-test-bench/pbench-agent/uperf_test-00_1900.01.01T00.00.00/1-tcp_rr-64B-1i/sample2/client::127.0.0.1-server::127.0.0.1:20010--client_output.txt 2>&1
+--- uperf_test-00_1900.01.01T00.00.00/1-tcp_rr-64B-1i/client::127.0.0.1-server::127.0.0.1:20010--client_start.sh file contents
++++ uperf_test-00_1900.01.01T00.00.00/1-tcp_rr-64B-1i/client::127.0.0.1-server::127.0.0.1:20010--server_start.sh file contents
+uperf -v -s -P 20010 > /var/tmp/pbench-test-bench/pbench-agent/uperf_test-00_1900.01.01T00.00.00/1-tcp_rr-64B-1i/sample2/client::127.0.0.1-server::127.0.0.1:20010--server.log 2>&1
+--- uperf_test-00_1900.01.01T00.00.00/1-tcp_rr-64B-1i/client::127.0.0.1-server::127.0.0.1:20010--server_start.sh file contents
++++ uperf_test-00_1900.01.01T00.00.00/2-tcp_stream-64B-1i/client::127.0.0.1-server::127.0.0.1:20010--client_start.sh file contents
+uperf -v -m /var/tmp/pbench-test-bench/pbench-agent/uperf_test-00_1900.01.01T00.00.00/2-tcp_stream-64B-1i/client::127.0.0.1-server::127.0.0.1:20010--test_config.xml -R -a -i 1  -P 20010 >/var/tmp/pbench-test-bench/pbench-agent/uperf_test-00_1900.01.01T00.00.00/2-tcp_stream-64B-1i/sample2/client::127.0.0.1-server::127.0.0.1:20010--client_output.txt 2>&1
+--- uperf_test-00_1900.01.01T00.00.00/2-tcp_stream-64B-1i/client::127.0.0.1-server::127.0.0.1:20010--client_start.sh file contents
++++ uperf_test-00_1900.01.01T00.00.00/2-tcp_stream-64B-1i/client::127.0.0.1-server::127.0.0.1:20010--server_start.sh file contents
+uperf -v -s -P 20010 > /var/tmp/pbench-test-bench/pbench-agent/uperf_test-00_1900.01.01T00.00.00/2-tcp_stream-64B-1i/sample2/client::127.0.0.1-server::127.0.0.1:20010--server.log 2>&1
+--- uperf_test-00_1900.01.01T00.00.00/2-tcp_stream-64B-1i/client::127.0.0.1-server::127.0.0.1:20010--server_start.sh file contents
diff --git a/agent/bench-scripts/tests/pbench-uperf/test-01.txt b/agent/bench-scripts/tests/pbench-uperf/test-01.txt
index cc8f5e5e6a..d457eccab7 100644
--- a/agent/bench-scripts/tests/pbench-uperf/test-01.txt
+++ b/agent/bench-scripts/tests/pbench-uperf/test-01.txt
@@ -326,3 +326,39 @@ iteration_name = 2-tcp_stream-64B-1i
 +++ uperf_test-01_1900.01.01T00.00.00/pbench-uperf.cmd file contents
 pbench-uperf --config=test-01 --test-types=rr,stream --message-sizes=64 --instances=1 --protocols=tcp --runtime=20 --samples=2 --servers=s1,s2,s3 --clients=c1,c2,c3 --server-node=0,-1,2 --client-node=1,-1,3
 --- uperf_test-01_1900.01.01T00.00.00/pbench-uperf.cmd file contents
++++ uperf_test-01_1900.01.01T00.00.00/1-tcp_rr-64B-1i/client::c1-server::s1:20010--client_start.sh file contents
+numactl --cpunodebind=1 bash -c "uperf -v -m /var/tmp/pbench-test-bench/pbench-agent/uperf_test-01_1900.01.01T00.00.00/1-tcp_rr-64B-1i/client::c1-server::s1:20010--test_config.xml -R -a -i 1  -P 20010 >/var/tmp/pbench-test-bench/pbench-agent/uperf_test-01_1900.01.01T00.00.00/1-tcp_rr-64B-1i/sample2/client::c1-server::s1:20010--client_output.txt 2>&1"
+--- uperf_test-01_1900.01.01T00.00.00/1-tcp_rr-64B-1i/client::c1-server::s1:20010--client_start.sh file contents
++++ uperf_test-01_1900.01.01T00.00.00/1-tcp_rr-64B-1i/client::c1-server::s1:20010--server_start.sh file contents
+numactl --cpunodebind=0 bash -c "uperf -v -s -P 20010 > /var/tmp/pbench-test-bench/pbench-agent/uperf_test-01_1900.01.01T00.00.00/1-tcp_rr-64B-1i/sample2/client::c1-server::s1:20010--server.log 2>&1"
+--- uperf_test-01_1900.01.01T00.00.00/1-tcp_rr-64B-1i/client::c1-server::s1:20010--server_start.sh file contents
++++ uperf_test-01_1900.01.01T00.00.00/1-tcp_rr-64B-1i/client::c2-server::s2:20020--client_start.sh file contents
+uperf -v -m /var/tmp/pbench-test-bench/pbench-agent/uperf_test-01_1900.01.01T00.00.00/1-tcp_rr-64B-1i/client::c2-server::s2:20020--test_config.xml -R -a -i 1  -P 20020 >/var/tmp/pbench-test-bench/pbench-agent/uperf_test-01_1900.01.01T00.00.00/1-tcp_rr-64B-1i/sample2/client::c2-server::s2:20020--client_output.txt 2>&1
+--- uperf_test-01_1900.01.01T00.00.00/1-tcp_rr-64B-1i/client::c2-server::s2:20020--client_start.sh file contents
++++ uperf_test-01_1900.01.01T00.00.00/1-tcp_rr-64B-1i/client::c2-server::s2:20020--server_start.sh file contents
+uperf -v -s -P 20020 > /var/tmp/pbench-test-bench/pbench-agent/uperf_test-01_1900.01.01T00.00.00/1-tcp_rr-64B-1i/sample2/client::c2-server::s2:20020--server.log 2>&1
+--- uperf_test-01_1900.01.01T00.00.00/1-tcp_rr-64B-1i/client::c2-server::s2:20020--server_start.sh file contents
++++ uperf_test-01_1900.01.01T00.00.00/1-tcp_rr-64B-1i/client::c3-server::s3:20030--client_start.sh file contents
+numactl --cpunodebind=3 bash -c "uperf -v -m /var/tmp/pbench-test-bench/pbench-agent/uperf_test-01_1900.01.01T00.00.00/1-tcp_rr-64B-1i/client::c3-server::s3:20030--test_config.xml -R -a -i 1  -P 20030 >/var/tmp/pbench-test-bench/pbench-agent/uperf_test-01_1900.01.01T00.00.00/1-tcp_rr-64B-1i/sample2/client::c3-server::s3:20030--client_output.txt 2>&1"
+--- uperf_test-01_1900.01.01T00.00.00/1-tcp_rr-64B-1i/client::c3-server::s3:20030--client_start.sh file contents
++++ uperf_test-01_1900.01.01T00.00.00/1-tcp_rr-64B-1i/client::c3-server::s3:20030--server_start.sh file contents
+numactl --cpunodebind=2 bash -c "uperf -v -s -P 20030 > /var/tmp/pbench-test-bench/pbench-agent/uperf_test-01_1900.01.01T00.00.00/1-tcp_rr-64B-1i/sample2/client::c3-server::s3:20030--server.log 2>&1"
+--- uperf_test-01_1900.01.01T00.00.00/1-tcp_rr-64B-1i/client::c3-server::s3:20030--server_start.sh file contents
++++ uperf_test-01_1900.01.01T00.00.00/2-tcp_stream-64B-1i/client::c1-server::s1:20010--client_start.sh file contents
+numactl --cpunodebind=1 bash -c "uperf -v -m /var/tmp/pbench-test-bench/pbench-agent/uperf_test-01_1900.01.01T00.00.00/2-tcp_stream-64B-1i/client::c1-server::s1:20010--test_config.xml -R -a -i 1  -P 20010 >/var/tmp/pbench-test-bench/pbench-agent/uperf_test-01_1900.01.01T00.00.00/2-tcp_stream-64B-1i/sample2/client::c1-server::s1:20010--client_output.txt 2>&1"
+--- uperf_test-01_1900.01.01T00.00.00/2-tcp_stream-64B-1i/client::c1-server::s1:20010--client_start.sh file contents
++++ uperf_test-01_1900.01.01T00.00.00/2-tcp_stream-64B-1i/client::c1-server::s1:20010--server_start.sh file contents
+numactl --cpunodebind=0 bash -c "uperf -v -s -P 20010 > /var/tmp/pbench-test-bench/pbench-agent/uperf_test-01_1900.01.01T00.00.00/2-tcp_stream-64B-1i/sample2/client::c1-server::s1:20010--server.log 2>&1"
+--- uperf_test-01_1900.01.01T00.00.00/2-tcp_stream-64B-1i/client::c1-server::s1:20010--server_start.sh file contents
++++ uperf_test-01_1900.01.01T00.00.00/2-tcp_stream-64B-1i/client::c2-server::s2:20020--client_start.sh file contents
+uperf -v -m /var/tmp/pbench-test-bench/pbench-agent/uperf_test-01_1900.01.01T00.00.00/2-tcp_stream-64B-1i/client::c2-server::s2:20020--test_config.xml -R -a -i 1  -P 20020 >/var/tmp/pbench-test-bench/pbench-agent/uperf_test-01_1900.01.01T00.00.00/2-tcp_stream-64B-1i/sample2/client::c2-server::s2:20020--client_output.txt 2>&1
+--- uperf_test-01_1900.01.01T00.00.00/2-tcp_stream-64B-1i/client::c2-server::s2:20020--client_start.sh file contents
++++ uperf_test-01_1900.01.01T00.00.00/2-tcp_stream-64B-1i/client::c2-server::s2:20020--server_start.sh file contents
+uperf -v -s -P 20020 > /var/tmp/pbench-test-bench/pbench-agent/uperf_test-01_1900.01.01T00.00.00/2-tcp_stream-64B-1i/sample2/client::c2-server::s2:20020--server.log 2>&1
+--- uperf_test-01_1900.01.01T00.00.00/2-tcp_stream-64B-1i/client::c2-server::s2:20020--server_start.sh file contents
++++ uperf_test-01_1900.01.01T00.00.00/2-tcp_stream-64B-1i/client::c3-server::s3:20030--client_start.sh file contents
+numactl --cpunodebind=3 bash -c "uperf -v -m /var/tmp/pbench-test-bench/pbench-agent/uperf_test-01_1900.01.01T00.00.00/2-tcp_stream-64B-1i/client::c3-server::s3:20030--test_config.xml -R -a -i 1  -P 20030 >/var/tmp/pbench-test-bench/pbench-agent/uperf_test-01_1900.01.01T00.00.00/2-tcp_stream-64B-1i/sample2/client::c3-server::s3:20030--client_output.txt 2>&1"
+--- uperf_test-01_1900.01.01T00.00.00/2-tcp_stream-64B-1i/client::c3-server::s3:20030--client_start.sh file contents
++++ uperf_test-01_1900.01.01T00.00.00/2-tcp_stream-64B-1i/client::c3-server::s3:20030--server_start.sh file contents
+numactl --cpunodebind=2 bash -c "uperf -v -s -P 20030 > /var/tmp/pbench-test-bench/pbench-agent/uperf_test-01_1900.01.01T00.00.00/2-tcp_stream-64B-1i/sample2/client::c3-server::s3:20030--server.log 2>&1"
+--- uperf_test-01_1900.01.01T00.00.00/2-tcp_stream-64B-1i/client::c3-server::s3:20030--server_start.sh file contents
diff --git a/agent/bench-scripts/tests/pbench-uperf/test-39.opts b/agent/bench-scripts/tests/pbench-uperf/test-39.opts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/agent/bench-scripts/tests/pbench-uperf/test-39.post b/agent/bench-scripts/tests/pbench-uperf/test-39.post
new file mode 100755
index 0000000000..9f4e999504
--- /dev/null
+++ b/agent/bench-scripts/tests/pbench-uperf/test-39.post
@@ -0,0 +1,3 @@
+#!/bin/bash
+dir=${_testopt}/unittest-scripts
+mv ${dir}/uperf.not-found ${dir}/uperf
diff --git a/agent/bench-scripts/tests/pbench-uperf/test-39.pre b/agent/bench-scripts/tests/pbench-uperf/test-39.pre
new file mode 100755
index 0000000000..1596e48783
--- /dev/null
+++ b/agent/bench-scripts/tests/pbench-uperf/test-39.pre
@@ -0,0 +1,3 @@
+#!/bin/bash
+dir=${_testopt}/unittest-scripts
+mv ${dir}/uperf ${dir}/uperf.not-found
diff --git a/agent/bench-scripts/tests/pbench-uperf/test-39.sts b/agent/bench-scripts/tests/pbench-uperf/test-39.sts
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/agent/bench-scripts/tests/pbench-uperf/test-39.sts
@@ -0,0 +1 @@
+1
diff --git a/agent/bench-scripts/tests/pbench-uperf/test-39.txt b/agent/bench-scripts/tests/pbench-uperf/test-39.txt
new file mode 100644
index 0000000000..5cff864497
--- /dev/null
+++ b/agent/bench-scripts/tests/pbench-uperf/test-39.txt
@@ -0,0 +1,18 @@
++++ Running test-39 pbench-uperf
+[error][1900-01-01T00:00:00.000000] pbench-uperf: uperf failed reporting version: '/var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/pbench-uperf: line 201: uperf: command not found'
+[error][1900-01-01T00:00:00.000000] [pbench-uperf] The local pre-check failed
+--- Finished test-39 pbench-uperf (status=1)
++++ pbench tree state
+/var/tmp/pbench-test-bench/pbench-agent
+/var/tmp/pbench-test-bench/pbench-agent/pbench.log
+/var/tmp/pbench-test-bench/pbench-agent/tmp
+/var/tmp/pbench-test-bench/pbench-agent/tools-v1-default
+/var/tmp/pbench-test-bench/pbench-agent/tools-v1-default/__trigger__
+/var/tmp/pbench-test-bench/pbench-agent/tools-v1-default/testhost.example.com
+/var/tmp/pbench-test-bench/pbench-agent/tools-v1-default/testhost.example.com/mpstat
+/var/tmp/pbench-test-bench/pbench-agent/tools-v1-default/testhost.example.com/sar
+--- pbench tree state
++++ pbench.log file contents
+[error][1900-01-01T00:00:00.000000] pbench-uperf: uperf failed reporting version: '/var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/pbench-uperf: line 201: uperf: command not found'
+[error][1900-01-01T00:00:00.000000] [pbench-uperf] The local pre-check failed
+--- pbench.log file contents
diff --git a/agent/bench-scripts/tests/pbench-uperf/test-51.env b/agent/bench-scripts/tests/pbench-uperf/test-51.env
new file mode 100644
index 0000000000..34259f8220
--- /dev/null
+++ b/agent/bench-scripts/tests/pbench-uperf/test-51.env
@@ -0,0 +1 @@
+export _BM_UPERF_VER="bad"
diff --git a/agent/bench-scripts/tests/pbench-uperf/test-51.opts b/agent/bench-scripts/tests/pbench-uperf/test-51.opts
new file mode 100644
index 0000000000..442865bd3c
--- /dev/null
+++ b/agent/bench-scripts/tests/pbench-uperf/test-51.opts
@@ -0,0 +1 @@
+--test-types=maerts --message-sizes=128 --instances=1 --protocols=udp --runtime=42 --samples=1
diff --git a/agent/bench-scripts/tests/pbench-uperf/test-51.sts b/agent/bench-scripts/tests/pbench-uperf/test-51.sts
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/agent/bench-scripts/tests/pbench-uperf/test-51.sts
@@ -0,0 +1 @@
+1
diff --git a/agent/bench-scripts/tests/pbench-uperf/test-51.txt b/agent/bench-scripts/tests/pbench-uperf/test-51.txt
new file mode 100644
index 0000000000..e02cec41f3
--- /dev/null
+++ b/agent/bench-scripts/tests/pbench-uperf/test-51.txt
@@ -0,0 +1,21 @@
++++ Running test-51 pbench-uperf
+[error][1900-01-01T00:00:00.000000] wrong version installed: found uperf-bad, expected uperf-1.0.7 (gte)
+[error][1900-01-01T00:00:00.000000] [pbench-uperf] The local pre-check failed
+--- Finished test-51 pbench-uperf (status=1)
++++ pbench tree state
+/var/tmp/pbench-test-bench/pbench-agent
+/var/tmp/pbench-test-bench/pbench-agent/pbench.log
+/var/tmp/pbench-test-bench/pbench-agent/tmp
+/var/tmp/pbench-test-bench/pbench-agent/tools-v1-default
+/var/tmp/pbench-test-bench/pbench-agent/tools-v1-default/__trigger__
+/var/tmp/pbench-test-bench/pbench-agent/tools-v1-default/testhost.example.com
+/var/tmp/pbench-test-bench/pbench-agent/tools-v1-default/testhost.example.com/mpstat
+/var/tmp/pbench-test-bench/pbench-agent/tools-v1-default/testhost.example.com/sar
+--- pbench tree state
++++ pbench.log file contents
+[error][1900-01-01T00:00:00.000000] wrong version installed: found uperf-bad, expected uperf-1.0.7 (gte)
+[error][1900-01-01T00:00:00.000000] [pbench-uperf] The local pre-check failed
+--- pbench.log file contents
++++ test-execution.log file contents
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/uperf -V
+--- test-execution.log file contents
diff --git a/agent/bench-scripts/tests/pbench-uperf/test-52.txt b/agent/bench-scripts/tests/pbench-uperf/test-52.txt
index 0b8349edea..30d3567591 100644
--- a/agent/bench-scripts/tests/pbench-uperf/test-52.txt
+++ b/agent/bench-scripts/tests/pbench-uperf/test-52.txt
@@ -326,3 +326,39 @@ iteration_name = 2-vsock_stream-64B-1i
 +++ uperf_test-52_1900.01.01T00.00.00/pbench-uperf.cmd file contents
 pbench-uperf --config=test-52 --test-types=rr,stream --message-sizes=64 --instances=1 --protocols=vsock --runtime=20 --samples=2 --servers=s1,s2,s3 --clients=c1,c2,c3 --server-node=0,-1,2 --client-node=1,-1,3 --vsock-servers=v1,v2,v3
 --- uperf_test-52_1900.01.01T00.00.00/pbench-uperf.cmd file contents
++++ uperf_test-52_1900.01.01T00.00.00/1-vsock_rr-64B-1i/client::c1-server::s1:20010--client_start.sh file contents
+numactl --cpunodebind=1 bash -c "uperf -v -m /var/tmp/pbench-test-bench/pbench-agent/uperf_test-52_1900.01.01T00.00.00/1-vsock_rr-64B-1i/client::c1-server::s1:20010--test_config.xml -R -a -i 1  -S vsock -P 20010 >/var/tmp/pbench-test-bench/pbench-agent/uperf_test-52_1900.01.01T00.00.00/1-vsock_rr-64B-1i/sample2/client::c1-server::s1:20010--client_output.txt 2>&1"
+--- uperf_test-52_1900.01.01T00.00.00/1-vsock_rr-64B-1i/client::c1-server::s1:20010--client_start.sh file contents
++++ uperf_test-52_1900.01.01T00.00.00/1-vsock_rr-64B-1i/client::c1-server::s1:20010--server_start.sh file contents
+numactl --cpunodebind=0 bash -c "uperf -v -s -P 20010 -S vsock > /var/tmp/pbench-test-bench/pbench-agent/uperf_test-52_1900.01.01T00.00.00/1-vsock_rr-64B-1i/sample2/client::c1-server::s1:20010--server.log 2>&1"
+--- uperf_test-52_1900.01.01T00.00.00/1-vsock_rr-64B-1i/client::c1-server::s1:20010--server_start.sh file contents
++++ uperf_test-52_1900.01.01T00.00.00/1-vsock_rr-64B-1i/client::c2-server::s2:20020--client_start.sh file contents
+uperf -v -m /var/tmp/pbench-test-bench/pbench-agent/uperf_test-52_1900.01.01T00.00.00/1-vsock_rr-64B-1i/client::c2-server::s2:20020--test_config.xml -R -a -i 1  -S vsock -P 20020 >/var/tmp/pbench-test-bench/pbench-agent/uperf_test-52_1900.01.01T00.00.00/1-vsock_rr-64B-1i/sample2/client::c2-server::s2:20020--client_output.txt 2>&1
+--- uperf_test-52_1900.01.01T00.00.00/1-vsock_rr-64B-1i/client::c2-server::s2:20020--client_start.sh file contents
++++ uperf_test-52_1900.01.01T00.00.00/1-vsock_rr-64B-1i/client::c2-server::s2:20020--server_start.sh file contents
+uperf -v -s -P 20020 -S vsock > /var/tmp/pbench-test-bench/pbench-agent/uperf_test-52_1900.01.01T00.00.00/1-vsock_rr-64B-1i/sample2/client::c2-server::s2:20020--server.log 2>&1
+--- uperf_test-52_1900.01.01T00.00.00/1-vsock_rr-64B-1i/client::c2-server::s2:20020--server_start.sh file contents
++++ uperf_test-52_1900.01.01T00.00.00/1-vsock_rr-64B-1i/client::c3-server::s3:20030--client_start.sh file contents
+numactl --cpunodebind=3 bash -c "uperf -v -m /var/tmp/pbench-test-bench/pbench-agent/uperf_test-52_1900.01.01T00.00.00/1-vsock_rr-64B-1i/client::c3-server::s3:20030--test_config.xml -R -a -i 1  -S vsock -P 20030 >/var/tmp/pbench-test-bench/pbench-agent/uperf_test-52_1900.01.01T00.00.00/1-vsock_rr-64B-1i/sample2/client::c3-server::s3:20030--client_output.txt 2>&1"
+--- uperf_test-52_1900.01.01T00.00.00/1-vsock_rr-64B-1i/client::c3-server::s3:20030--client_start.sh file contents
++++ uperf_test-52_1900.01.01T00.00.00/1-vsock_rr-64B-1i/client::c3-server::s3:20030--server_start.sh file contents
+numactl --cpunodebind=2 bash -c "uperf -v -s -P 20030 -S vsock > /var/tmp/pbench-test-bench/pbench-agent/uperf_test-52_1900.01.01T00.00.00/1-vsock_rr-64B-1i/sample2/client::c3-server::s3:20030--server.log 2>&1"
+--- uperf_test-52_1900.01.01T00.00.00/1-vsock_rr-64B-1i/client::c3-server::s3:20030--server_start.sh file contents
++++ uperf_test-52_1900.01.01T00.00.00/2-vsock_stream-64B-1i/client::c1-server::s1:20010--client_start.sh file contents
+numactl --cpunodebind=1 bash -c "uperf -v -m /var/tmp/pbench-test-bench/pbench-agent/uperf_test-52_1900.01.01T00.00.00/2-vsock_stream-64B-1i/client::c1-server::s1:20010--test_config.xml -R -a -i 1  -S vsock -P 20010 >/var/tmp/pbench-test-bench/pbench-agent/uperf_test-52_1900.01.01T00.00.00/2-vsock_stream-64B-1i/sample2/client::c1-server::s1:20010--client_output.txt 2>&1"
+--- uperf_test-52_1900.01.01T00.00.00/2-vsock_stream-64B-1i/client::c1-server::s1:20010--client_start.sh file contents
++++ uperf_test-52_1900.01.01T00.00.00/2-vsock_stream-64B-1i/client::c1-server::s1:20010--server_start.sh file contents
+numactl --cpunodebind=0 bash -c "uperf -v -s -P 20010 -S vsock > /var/tmp/pbench-test-bench/pbench-agent/uperf_test-52_1900.01.01T00.00.00/2-vsock_stream-64B-1i/sample2/client::c1-server::s1:20010--server.log 2>&1"
+--- uperf_test-52_1900.01.01T00.00.00/2-vsock_stream-64B-1i/client::c1-server::s1:20010--server_start.sh file contents
++++ uperf_test-52_1900.01.01T00.00.00/2-vsock_stream-64B-1i/client::c2-server::s2:20020--client_start.sh file contents
+uperf -v -m /var/tmp/pbench-test-bench/pbench-agent/uperf_test-52_1900.01.01T00.00.00/2-vsock_stream-64B-1i/client::c2-server::s2:20020--test_config.xml -R -a -i 1  -S vsock -P 20020 >/var/tmp/pbench-test-bench/pbench-agent/uperf_test-52_1900.01.01T00.00.00/2-vsock_stream-64B-1i/sample2/client::c2-server::s2:20020--client_output.txt 2>&1
+--- uperf_test-52_1900.01.01T00.00.00/2-vsock_stream-64B-1i/client::c2-server::s2:20020--client_start.sh file contents
++++ uperf_test-52_1900.01.01T00.00.00/2-vsock_stream-64B-1i/client::c2-server::s2:20020--server_start.sh file contents
+uperf -v -s -P 20020 -S vsock > /var/tmp/pbench-test-bench/pbench-agent/uperf_test-52_1900.01.01T00.00.00/2-vsock_stream-64B-1i/sample2/client::c2-server::s2:20020--server.log 2>&1
+--- uperf_test-52_1900.01.01T00.00.00/2-vsock_stream-64B-1i/client::c2-server::s2:20020--server_start.sh file contents
++++ uperf_test-52_1900.01.01T00.00.00/2-vsock_stream-64B-1i/client::c3-server::s3:20030--client_start.sh file contents
+numactl --cpunodebind=3 bash -c "uperf -v -m /var/tmp/pbench-test-bench/pbench-agent/uperf_test-52_1900.01.01T00.00.00/2-vsock_stream-64B-1i/client::c3-server::s3:20030--test_config.xml -R -a -i 1  -S vsock -P 20030 >/var/tmp/pbench-test-bench/pbench-agent/uperf_test-52_1900.01.01T00.00.00/2-vsock_stream-64B-1i/sample2/client::c3-server::s3:20030--client_output.txt 2>&1"
+--- uperf_test-52_1900.01.01T00.00.00/2-vsock_stream-64B-1i/client::c3-server::s3:20030--client_start.sh file contents
++++ uperf_test-52_1900.01.01T00.00.00/2-vsock_stream-64B-1i/client::c3-server::s3:20030--server_start.sh file contents
+numactl --cpunodebind=2 bash -c "uperf -v -s -P 20030 -S vsock > /var/tmp/pbench-test-bench/pbench-agent/uperf_test-52_1900.01.01T00.00.00/2-vsock_stream-64B-1i/sample2/client::c3-server::s3:20030--server.log 2>&1"
+--- uperf_test-52_1900.01.01T00.00.00/2-vsock_stream-64B-1i/client::c3-server::s3:20030--server_start.sh file contents
diff --git a/agent/bench-scripts/tests/pbench-uperf/test-58.txt b/agent/bench-scripts/tests/pbench-uperf/test-58.txt
index 5a4aefc6c1..31c4d1dc5e 100644
--- a/agent/bench-scripts/tests/pbench-uperf/test-58.txt
+++ b/agent/bench-scripts/tests/pbench-uperf/test-58.txt
@@ -14,5 +14,5 @@
 [debug][1900-01-01T00:00:00.000000] found uperf-1.0.42
 --- pbench.log file contents
 +++ test-execution.log file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm -V
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/uperf -V
 --- test-execution.log file contents
diff --git a/agent/bench-scripts/tests/pbench-user-benchmark/test-67.txt b/agent/bench-scripts/tests/pbench-user-benchmark/test-67.txt
index b1db9facc0..124c48bd7e 100644
--- a/agent/bench-scripts/tests/pbench-user-benchmark/test-67.txt
+++ b/agent/bench-scripts/tests/pbench-user-benchmark/test-67.txt
@@ -33,7 +33,7 @@ pbench-postprocess-tools: WARNING: No tools are registered
 [info][1900-01-01T00:00:00.000000] [pbench-user-benchmark] Running bm for iteration 1-default
 --- pbench.log file contents
 +++ test-execution.log file contents
-/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm 
+/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-start empty
 /var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-stop --sysinfo=default empty
 --- test-execution.log file contents
diff --git a/agent/bench-scripts/tests/test-benchmark-clis/test-CL.post b/agent/bench-scripts/tests/test-benchmark-clis/test-CL.post
new file mode 100755
index 0000000000..31ee658f93
--- /dev/null
+++ b/agent/bench-scripts/tests/test-benchmark-clis/test-CL.post
@@ -0,0 +1,5 @@
+#!/bin/bash
+dir=${_testopt}/unittest-scripts
+for i in fio uperf; do 
+    mv ${dir}/${i}.not-found ${dir}/${i}
+done
diff --git a/agent/bench-scripts/tests/test-benchmark-clis/test-CL.pre b/agent/bench-scripts/tests/test-benchmark-clis/test-CL.pre
new file mode 100755
index 0000000000..db8342a7e5
--- /dev/null
+++ b/agent/bench-scripts/tests/test-benchmark-clis/test-CL.pre
@@ -0,0 +1,5 @@
+#!/bin/bash
+dir=${_testopt}/unittest-scripts
+for i in fio uperf; do 
+    mv ${dir}/${i} ${dir}/${i}.not-found
+done
diff --git a/agent/bench-scripts/unittests b/agent/bench-scripts/unittests
index 78ed560b70..541cec52f6 100755
--- a/agent/bench-scripts/unittests
+++ b/agent/bench-scripts/unittests
@@ -105,7 +105,6 @@ function _run {
     printf -- "#!/bin/bash\n\n" > ${_testroot}/run.cmd
     printf -- "export _tst_benchmark=%s\n" "${tscrpt%% *}" >> ${_testroot}/run.cmd
     printf -- "export _PBENCH_AGENT_CONFIG=%s/config/pbench-agent.cfg\n" "${_testopt}" >> ${_testroot}/run.cmd
-    printf -- "export benchmark_bin=%s/unittest-scripts/bm\n\n" "${_testopt}" >> ${_testroot}/run.cmd
     printf -- "export PERL_HASH_SEED=0\n" "${_testopt}" >> ${_testroot}/run.cmd
 
     if [[ -e "${env_file}" ]]; then
@@ -169,6 +168,9 @@ function _dump_logs {
             for f in $(find . -name results.html 2> /dev/null | sort); do
                 _dump_file ${rundir} ${f:2}
             done
+            for f in $(find . -name '*--client_start.sh' -o -name '*--server_start.sh' 2> /dev/null | sort); do
+                _dump_file ${rundir} ${f:2}
+            done
         fi
         )
     fi
@@ -306,6 +308,16 @@ else
     mv ${_testroot}/tests-unsorted.lis ${_testroot}/tests.lis
 fi
 
+if [[ ! -z "${_PBENCH_LEGACY_UNITTESTS_LIST}" ]]; then
+    # List the tests we are going to run without running them.  This is helpful
+    # when adding a new test to either use an unused test number or add another
+    # one.
+    cat ${_testroot}/tests.lis
+    # We empty list once displayed so that the execution loop below becomes a
+    # "no-op" and exits cleanly. 
+    > ${_testroot}/tests.lis
+fi
+
 export _date_suffix="1900.01.01T00.00.00"
 let errs=0