Add 8kHz training test coverage

Fixes #2638

bin/run-tc-ldc93s1_new.sh

@@ -6,6 +6,7 @@ ldc93s1_dir="./data/smoke_test"
 ldc93s1_csv="${ldc93s1_dir}/ldc93s1.csv"
 
 epoch_count=$1
+audio_sample_rate=$2
 
 if [ ! -f "${ldc93s1_dir}/ldc93s1.csv" ]; then
     echo "Downloading and preprocessing LDC93S1 example data, saving in ${ldc93s1_dir}."
@@ -25,4 +26,5 @@ python -u DeepSpeech.py --noshow_progressbar --noearly_stop \
   --max_to_keep 1 --checkpoint_dir '/tmp/ckpt' \
   --learning_rate 0.001 --dropout_rate 0.05  --export_dir '/tmp/train' \
   --lm_binary_path 'data/smoke_test/vocab.pruned.lm' \
-  --lm_trie_path 'data/smoke_test/vocab.trie'
+  --lm_trie_path 'data/smoke_test/vocab.trie' \
+  --audio_sample_rate ${audio_sample_rate}

bin/run-tc-ldc93s1_tflite.sh

@@ -5,6 +5,8 @@ set -xe
 ldc93s1_dir="./data/smoke_test"
 ldc93s1_csv="${ldc93s1_dir}/ldc93s1.csv"
 
+audio_sample_rate=$1
+
 if [ ! -f "${ldc93s1_dir}/ldc93s1.csv" ]; then
     echo "Downloading and preprocessing LDC93S1 example data, saving in ${ldc93s1_dir}."
     python -u bin/import_ldc93s1.py ${ldc93s1_dir}
@@ -20,6 +22,7 @@ python -u DeepSpeech.py --noshow_progressbar \
   --export_dir '/tmp/train_tflite' \
   --lm_binary_path 'data/smoke_test/vocab.pruned.lm' \
   --lm_trie_path 'data/smoke_test/vocab.trie' \
+  --audio_sample_rate ${audio_sample_rate} \
   --export_tflite
 
 mkdir /tmp/train_tflite/en-us
@@ -30,5 +33,6 @@ python -u DeepSpeech.py --noshow_progressbar \
   --export_dir '/tmp/train_tflite/en-us' \
   --lm_binary_path 'data/smoke_test/vocab.pruned.lm' \
   --lm_trie_path 'data/smoke_test/vocab.trie' \
+  --audio_sample_rate ${audio_sample_rate} \
   --export_language 'Fake English (fk-FK)' \
   --export_zip

taskcluster/.build.yml

@@ -24,3 +24,4 @@ build:
   convert_graphdef: ''
   benchmark_model_bin: ''
   tensorflow_git_desc: 'TensorFlow: v1.14.0-21-ge77504a'
+  test_model_task: ''

taskcluster/darwin-opt-base.tyml

@@ -37,11 +37,7 @@ payload:
   maxRunTime: { $eval: to_int(build.maxRunTime) }
 
   env:
-    $let:
+    TENSORFLOW_BUILD_ARTIFACT: ${build.tensorflow}
-      training: { $eval: as_slugid("test-training_upstream-linux-amd64-py36m-opt") }
-    in:
-      TENSORFLOW_BUILD_ARTIFACT: ${build.tensorflow}
-      DEEPSPEECH_TEST_MODEL: https://community-tc.services.mozilla.com/api/queue/v1/task/${training}/artifacts/public/output_graph.pb
 
   # There is no VM yet running tasks on OSX
   # so one should install by hand:

taskcluster/linux-opt-base.tyml

@@ -33,11 +33,7 @@ then:
     image: "ubuntu:14.04"
 
     env:
-      $let:
+      TENSORFLOW_BUILD_ARTIFACT: ${build.tensorflow}
-        training: { $eval: as_slugid("test-training_upstream-linux-amd64-py36m-opt") }
-      in:
-        TENSORFLOW_BUILD_ARTIFACT: ${build.tensorflow}
-        DEEPSPEECH_TEST_MODEL: https://community-tc.services.mozilla.com/api/queue/v1/task/${training}/artifacts/public/output_graph.pb
 
     command:
       - "/bin/bash"

taskcluster/tc-android-apk-tests.sh

@@ -7,6 +7,9 @@ api_level=$2
 
 source $(dirname "$0")/tc-tests-utils.sh
 
+# Android test code only supports 16kHz and hard-coded filename
+ldc93s1_sample_filename='LDC93S1.wav'
+
 model_source=${DEEPSPEECH_TEST_MODEL//.pb/.tflite}
 model_name=$(basename "${model_source}")
 

taskcluster/tc-android-ds-tests.sh

@@ -7,6 +7,9 @@ api_level=$2
 
 source $(dirname "$0")/tc-tests-utils.sh
 
+bitrate=$3
+set_ldc_sample_filename "${bitrate}"
+
 model_source=${DEEPSPEECH_TEST_MODEL//.pb/.tflite}
 model_name=$(basename "${model_source}")
 export DATA_TMP_DIR=${ANDROID_TMP_DIR}/ds

taskcluster/tc-cpp-ds-tests-prod.sh

@@ -4,6 +4,9 @@ set -xe
 
 source $(dirname "$0")/tc-tests-utils.sh
 
+bitrate=$1
+set_ldc_sample_filename "${bitrate}"
+
 model_source=${DEEPSPEECH_PROD_MODEL}
 model_name=$(basename "${model_source}")
 
@@ -16,4 +19,4 @@ export PATH=${TASKCLUSTER_TMP_DIR}/ds/:$PATH
 
 check_tensorflow_version
 
-run_prod_inference_tests
+run_prod_inference_tests "${bitrate}"

taskcluster/tc-cpp-ds-tests.sh

@@ -4,6 +4,9 @@ set -xe
 
 source $(dirname "$0")/tc-tests-utils.sh
 
+bitrate=$1
+set_ldc_sample_filename "${bitrate}"
+
 download_material "${TASKCLUSTER_TMP_DIR}/ds"
 
 export PATH=${TASKCLUSTER_TMP_DIR}/ds/:$PATH

taskcluster/tc-cpp_tflite-ds-tests.sh

@@ -4,6 +4,9 @@ set -xe
 
 source $(dirname "$0")/tc-tests-utils.sh
 
+bitrate=$1
+set_ldc_sample_filename "${bitrate}"
+
 model_source=${DEEPSPEECH_TEST_MODEL//.pb/.tflite}
 model_name=$(basename "${model_source}")
 model_name_mmap=$(basename "${model_source}")

taskcluster/tc-cpp_tflite-tests-prod.sh

@@ -8,6 +8,9 @@ export DEEPSPEECH_PROD_MODEL_MMAP=https://github.com/lissyx/DeepSpeech/releases/
 
 source $(dirname "$0")/tc-tests-utils.sh
 
+bitrate=$1
+set_ldc_sample_filename "${bitrate}"
+
 model_source=${DEEPSPEECH_PROD_MODEL//.pb/.tflite}
 model_name=$(basename "${model_source}")
 model_name_mmap=$(basename "${model_source}")
@@ -21,4 +24,4 @@ export PATH=${TASKCLUSTER_TMP_DIR}/ds/:$PATH
 
 check_tensorflow_version
 
-run_prodtflite_inference_tests
+run_prodtflite_inference_tests "${bitrate}"

taskcluster/tc-cpp_tflite_basic-ds-tests.sh

@@ -4,6 +4,9 @@ set -xe
 
 source $(dirname "$0")/tc-tests-utils.sh
 
+bitrate=$1
+set_ldc_sample_filename "${bitrate}"
+
 model_source=${DEEPSPEECH_TEST_MODEL//.pb/.tflite}
 model_name=$(basename "${model_source}")
 export DEEPSPEECH_ARTIFACTS_ROOT=${DEEPSPEECH_ARTIFACTS_TFLITE_ROOT}

taskcluster/tc-cppwin-ds-tests.sh

@@ -4,6 +4,9 @@ set -xe
 
 source $(dirname "$0")/tc-tests-utils.sh
 
+bitrate=$1
+set_ldc_sample_filename "${bitrate}"
+
 download_material "${TASKCLUSTER_TMP_DIR}/ds"
 
 export PATH=${TASKCLUSTER_TMP_DIR}/ds/:$PATH

taskcluster/tc-electron-tests.sh

@@ -17,6 +17,9 @@ if [ -z "${electronver}" ]; then
     exit 1
 fi;
 
+bitrate=$3
+set_ldc_sample_filename "${bitrate}"
+
 download_data
 
 node --version

taskcluster/tc-netframework-ds-tests.sh

@@ -6,6 +6,9 @@ cuda=$1
 
 source $(dirname "$0")/tc-tests-utils.sh
 
+bitrate=$1
+set_ldc_sample_filename "${bitrate}"
+
 if [ "${cuda}" = "--cuda" ]; then
     PROJECT_NAME="DeepSpeech-GPU"
 else

taskcluster/tc-node-tests-prod.sh

@@ -11,6 +11,9 @@ if [ -z "${nodever}" ]; then
     exit 1
 fi;
 
+bitrate=$2
+set_ldc_sample_filename "${bitrate}"
+
 model_source=${DEEPSPEECH_PROD_MODEL}
 model_name=$(basename "${model_source}")
 
@@ -32,4 +35,4 @@ npm install --prefix ${NODE_ROOT} --cache ${NODE_CACHE} ${deepspeech_npm_url}
 
 check_runtime_nodejs
 
-run_prod_inference_tests
+run_prod_inference_tests "${bitrate}"

taskcluster/tc-node-tests.sh

@@ -11,6 +11,9 @@ if [ -z "${nodever}" ]; then
     exit 1
 fi;
 
+bitrate=$2
+set_ldc_sample_filename "${bitrate}"
+
 download_data
 
 node --version

taskcluster/tc-node_tflite-tests-prod.sh

@@ -15,6 +15,9 @@ if [ -z "${nodever}" ]; then
     exit 1
 fi;
 
+bitrate=$2
+set_ldc_sample_filename "${bitrate}"
+
 model_source=${DEEPSPEECH_PROD_MODEL//.pb/.tflite}
 model_name=$(basename "${model_source}")
 model_name_mmap=$(basename "${model_source}")
@@ -36,4 +39,4 @@ npm install --prefix ${NODE_ROOT} --cache ${NODE_CACHE} ${deepspeech_npm_url}
 
 check_runtime_nodejs
 
-run_prodtflite_inference_tests
+run_prodtflite_inference_tests "${bitrate}"

taskcluster/tc-node_tflite-tests.sh

@@ -11,6 +11,9 @@ if [ -z "${nodever}" ]; then
     exit 1
 fi;
 
+bitrate=$2
+set_ldc_sample_filename "${bitrate}"
+
 model_source=${DEEPSPEECH_TEST_MODEL//.pb/.tflite}
 model_name=$(basename "${model_source}")
 model_name_mmap=$(basename "${model_source}")

taskcluster/tc-python-tests-prod.sh

@@ -6,6 +6,9 @@ source $(dirname "$0")/tc-tests-utils.sh
 
 extract_python_versions "$1" "pyver" "pyver_pkg" "py_unicode_type" "pyconf" "pyalias"
 
+bitrate=$2
+set_ldc_sample_filename "${bitrate}"
+
 unset PYTHON_BIN_PATH
 unset PYTHONPATH
 
@@ -43,8 +46,8 @@ virtualenv_activate "${pyalias}" "${PYENV_NAME}"
 deepspeech_pkg_url=$(get_python_pkg_url ${pyver_pkg} ${py_unicode_type})
 LD_LIBRARY_PATH=${PY37_LDPATH}:$LD_LIBRARY_PATH pip install --verbose --only-binary :all: ${PY37_SOURCE_PACKAGE} --upgrade ${deepspeech_pkg_url} | cat
 
-run_prod_inference_tests
+run_prod_inference_tests "${bitrate}"
 
-run_prod_concurrent_stream_tests
+run_prod_concurrent_stream_tests "${bitrate}"
 
 virtualenv_deactivate "${pyalias}" "${PYENV_NAME}"

taskcluster/tc-python-tests.sh

@@ -6,6 +6,9 @@ source $(dirname "$0")/tc-tests-utils.sh
 
 extract_python_versions "$1" "pyver" "pyver_pkg" "py_unicode_type" "pyconf" "pyalias"
 
+bitrate=$2
+set_ldc_sample_filename "${bitrate}"
+
 unset PYTHON_BIN_PATH
 unset PYTHONPATH
 

taskcluster/tc-python_tflite-tests-prod.sh

@@ -10,6 +10,9 @@ source $(dirname "$0")/tc-tests-utils.sh
 
 extract_python_versions "$1" "pyver" "pyver_pkg" "py_unicode_type" "pyconf" "pyalias"
 
+bitrate=$2
+set_ldc_sample_filename "${bitrate}"
+
 unset PYTHON_BIN_PATH
 unset PYTHONPATH
 
@@ -50,6 +53,6 @@ LD_LIBRARY_PATH=${PY37_LDPATH}:$LD_LIBRARY_PATH pip install --verbose --only-bin
 which deepspeech
 deepspeech --version
 
-run_prodtflite_inference_tests
+run_prodtflite_inference_tests "${bitrate}"
 
 virtualenv_deactivate "${pyalias}" "${PYENV_NAME}"

taskcluster/tc-python_tflite-tests.sh

@@ -6,6 +6,9 @@ source $(dirname "$0")/tc-tests-utils.sh
 
 extract_python_versions "$1" "pyver" "pyver_pkg" "py_unicode_type" "pyconf" "pyalias"
 
+bitrate=$2
+set_ldc_sample_filename "${bitrate}"
+
 unset PYTHON_BIN_PATH
 unset PYTHONPATH
 

taskcluster/tc-tests-utils.sh

@@ -56,6 +56,8 @@ model_name="$(basename "${model_source}")"
 model_name_mmap="$(basename -s ".pb" "${model_source}").pbmm"
 model_source_mmap="$(dirname "${model_source}")/${model_name_mmap}"
 
+ldc93s1_sample_filename=''
+
 SUPPORTED_PYTHON_VERSIONS=${SUPPORTED_PYTHON_VERSIONS:-2.7.16:ucs2 2.7.16:ucs4 3.5.7:ucs4 3.6.8:ucs4 3.7.3:ucs4 3.8.0:ucs4}
 SUPPORTED_NODEJS_VERSIONS=${SUPPORTED_NODEJS_VERSIONS:-4.9.1 5.12.0 6.17.1 7.10.1 8.16.0 9.11.2 10.16.0 11.15.0 12.5.0 13.0.1}
 SUPPORTED_ELECTRONJS_VERSIONS=${SUPPORTED_ELECTRONJS_VERSIONS:-1.6.18 1.7.16 1.8.8 2.0.18 3.0.16 3.1.11 4.0.3 4.1.5 4.2.5 5.0.6 6.0.11 7.0.1 7.1.2}
@@ -245,7 +247,7 @@ assert_working_ldc93s1_lm()
 
 assert_correct_multi_ldc93s1()
 {
-  assert_shows_something "$1" "/LDC93S1.wav%she had your dark suit in greasy wash water all year%" "$?"
+  assert_shows_something "$1" "/${ldc93s1_sample_filename}%she had your dark suit in greasy wash water all year%" "$?"
   assert_shows_something "$1" "/LDC93S1_pcms16le_2_44100.wav%she had your dark suit in greasy wash water all year%" "$?"
   ## 8k will output garbage anyway ...
   # assert_shows_something "$1" "/LDC93S1_pcms16le_1_8000.wav%she hayorasryrtl lyreasy asr watal w water all year%"
@@ -253,22 +255,46 @@ assert_correct_multi_ldc93s1()
 
 assert_correct_ldc93s1_prodmodel()
 {
-  assert_correct_inference "$1" "she had reduce and greasy wash water all year" "$2"
+  if [ -z "$3" -o "$3" = "16k" ]; then
+    assert_correct_inference "$1" "she had reduce and greasy wash water all year" "$2"
+  fi;
+
+  if [ -o "$3" = "8k" ]; then
+    assert_correct_inference "$1" "she had conduct suit in greasy wash water all year" "$2"
+  fi;
 }
 
 assert_correct_ldc93s1_prodtflitemodel()
 {
-  assert_correct_inference "$1" "she had educate in greasy wash were all year" "$2"
+  if [ -z "$3" -o "$3" = "16k" ]; then
+    assert_correct_inference "$1" "she had educate in greasy wash were all year" "$2"
+  fi;
+
+  if [ -o "$3" = "8k" ]; then
+    assert_correct_inference "$1" "she had conduct suit in greasy wash water all year" "$2"
+  fi;
 }
 
 assert_correct_ldc93s1_prodmodel_stereo_44k()
 {
-  assert_correct_inference "$1" "she had reduce and greasy wash water all year" "$2"
+  if [ -z "$3" -o "$3" = "16k" ]; then
+    assert_correct_inference "$1" "she had reduce and greasy wash water all year" "$2"
+  fi;
+
+  if [ -o "$3" = "8k" ]; then
+    assert_correct_inference "$1" "she had conduct suit in greasy wash water all year" "$2"
+  fi;
 }
 
 assert_correct_ldc93s1_prodtflitemodel_stereo_44k()
 {
-  assert_correct_inference "$1" "she had educate in greasy wash were all year" "$2"
+  if [ -z "$3" -o "$3" = "16k" ]; then
+    assert_correct_inference "$1" "she had educate in greasy wash were all year" "$2"
+  fi;
+
+  if [ -o "$3" = "8k" ]; then
+    assert_correct_inference "$1" "she had conduct suit in greasy wash water all year" "$2"
+  fi;
 }
 
 assert_correct_warning_upsampling()
@@ -320,12 +346,12 @@ check_runtime_electronjs()
 run_tflite_basic_inference_tests()
 {
   set +e
-  phrase_pbmodel_nolm=$(${DS_BINARY_PREFIX}deepspeech --model ${DATA_TMP_DIR}/${model_name} --audio ${DATA_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr)
+  phrase_pbmodel_nolm=$(${DS_BINARY_PREFIX}deepspeech --model ${DATA_TMP_DIR}/${model_name} --audio ${DATA_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr)
   set -e
   assert_correct_ldc93s1 "${phrase_pbmodel_nolm}" "$?"
 
   set +e
-  phrase_pbmodel_nolm=$(${DS_BINARY_PREFIX}deepspeech --model ${DATA_TMP_DIR}/${model_name} --audio ${DATA_TMP_DIR}/LDC93S1.wav --extended 2>${TASKCLUSTER_TMP_DIR}/stderr)
+  phrase_pbmodel_nolm=$(${DS_BINARY_PREFIX}deepspeech --model ${DATA_TMP_DIR}/${model_name} --audio ${DATA_TMP_DIR}/${ldc93s1_sample_filename} --extended 2>${TASKCLUSTER_TMP_DIR}/stderr)
   set -e
   assert_correct_ldc93s1 "${phrase_pbmodel_nolm}" "$?"
 }
@@ -333,22 +359,22 @@ run_tflite_basic_inference_tests()
 run_netframework_inference_tests()
 {
   set +e
-  phrase_pbmodel_nolm=$(DeepSpeechConsole.exe --model ${TASKCLUSTER_TMP_DIR}/${model_name} --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr)
+  phrase_pbmodel_nolm=$(DeepSpeechConsole.exe --model ${TASKCLUSTER_TMP_DIR}/${model_name} --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr)
   set -e
   assert_working_ldc93s1 "${phrase_pbmodel_nolm}" "$?"
 
   set +e
-  phrase_pbmodel_nolm=$(DeepSpeechConsole.exe --model ${TASKCLUSTER_TMP_DIR}/${model_name} --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav --extended yes 2>${TASKCLUSTER_TMP_DIR}/stderr)
+  phrase_pbmodel_nolm=$(DeepSpeechConsole.exe --model ${TASKCLUSTER_TMP_DIR}/${model_name} --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} --extended yes 2>${TASKCLUSTER_TMP_DIR}/stderr)
   set -e
   assert_working_ldc93s1 "${phrase_pbmodel_nolm}" "$?"
 
   set +e
-  phrase_pbmodel_nolm=$(DeepSpeechConsole.exe --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr)
+  phrase_pbmodel_nolm=$(DeepSpeechConsole.exe --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr)
   set -e
   assert_working_ldc93s1 "${phrase_pbmodel_nolm}" "$?"
 
   set +e
-  phrase_pbmodel_withlm=$(DeepSpeechConsole.exe --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr)
+  phrase_pbmodel_withlm=$(DeepSpeechConsole.exe --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr)
   set -e
   assert_working_ldc93s1_lm "${phrase_pbmodel_withlm}" "$?"
 }
@@ -356,22 +382,22 @@ run_netframework_inference_tests()
 run_electronjs_inference_tests()
 {
   set +e
-  phrase_pbmodel_nolm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name} --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr)
+  phrase_pbmodel_nolm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name} --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr)
   set -e
   assert_working_ldc93s1 "${phrase_pbmodel_nolm}" "$?"
 
   set +e
-  phrase_pbmodel_nolm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name} --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav --extended 2>${TASKCLUSTER_TMP_DIR}/stderr)
+  phrase_pbmodel_nolm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name} --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} --extended 2>${TASKCLUSTER_TMP_DIR}/stderr)
   set -e
   assert_working_ldc93s1 "${phrase_pbmodel_nolm}" "$?"
 
   set +e
-  phrase_pbmodel_nolm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr)
+  phrase_pbmodel_nolm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr)
   set -e
   assert_working_ldc93s1 "${phrase_pbmodel_nolm}" "$?"
 
   set +e
-  phrase_pbmodel_withlm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr)
+  phrase_pbmodel_withlm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr)
   set -e
   assert_working_ldc93s1_lm "${phrase_pbmodel_withlm}" "$?"
 }
@@ -379,25 +405,25 @@ run_electronjs_inference_tests()
 run_basic_inference_tests()
 {
   set +e
-  phrase_pbmodel_nolm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name} --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr)
+  phrase_pbmodel_nolm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name} --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr)
   status=$?
   set -e
   assert_correct_ldc93s1 "${phrase_pbmodel_nolm}" "$status"
 
   set +e
-  phrase_pbmodel_nolm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name} --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav --extended 2>${TASKCLUSTER_TMP_DIR}/stderr)
+  phrase_pbmodel_nolm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name} --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} --extended 2>${TASKCLUSTER_TMP_DIR}/stderr)
   status=$?
   set -e
   assert_correct_ldc93s1 "${phrase_pbmodel_nolm}" "$status"
 
   set +e
-  phrase_pbmodel_nolm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr)
+  phrase_pbmodel_nolm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr)
   status=$?
   set -e
   assert_correct_ldc93s1 "${phrase_pbmodel_nolm}" "$status"
 
   set +e
-  phrase_pbmodel_withlm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr)
+  phrase_pbmodel_withlm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr)
   status=$?
   set -e
   assert_correct_ldc93s1_lm "${phrase_pbmodel_withlm}" "$status"
@@ -419,25 +445,30 @@ run_all_inference_tests()
   set -e
   assert_correct_ldc93s1_lm "${phrase_pbmodel_withlm_stereo_44k}" "$status"
 
-  set +e
+  # Run down-sampling warning test only when we actually perform downsampling
-  phrase_pbmodel_nolm_mono_8k=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1_pcms16le_1_8000.wav 2>&1 1>/dev/null)
+  if [ "${ldc93s1_sample_filename}" != "LDC93S1_pcms16le_1_8000.wav" ]; then
-  set -e
+    set +e
-  assert_correct_warning_upsampling "${phrase_pbmodel_nolm_mono_8k}"
+    phrase_pbmodel_nolm_mono_8k=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1_pcms16le_1_8000.wav 2>&1 1>/dev/null)
+    set -e
+    assert_correct_warning_upsampling "${phrase_pbmodel_nolm_mono_8k}"
 
-  set +e
+    set +e
-  phrase_pbmodel_withlm_mono_8k=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1_pcms16le_1_8000.wav 2>&1 1>/dev/null)
+    phrase_pbmodel_withlm_mono_8k=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1_pcms16le_1_8000.wav 2>&1 1>/dev/null)
-  set -e
+    set -e
-  assert_correct_warning_upsampling "${phrase_pbmodel_withlm_mono_8k}"
+    assert_correct_warning_upsampling "${phrase_pbmodel_withlm_mono_8k}"
+  fi;
 }
 
 run_prod_concurrent_stream_tests()
 {
+  local _bitrate=$1
+
   set +e
   output=$(python ${TASKCLUSTER_TMP_DIR}/test_sources/concurrent_streams.py \
              --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} \
              --lm ${TASKCLUSTER_TMP_DIR}/lm.binary \
              --trie ${TASKCLUSTER_TMP_DIR}/trie \
-             --audio1 ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav \
+             --audio1 ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} \
              --audio2 ${TASKCLUSTER_TMP_DIR}/new-home-in-the-stars-16k.wav 2>${TASKCLUSTER_TMP_DIR}/stderr)
   status=$?
   set -e
@@ -445,60 +476,70 @@ run_prod_concurrent_stream_tests()
   output1=$(echo "${output}" | head -n 1)
   output2=$(echo "${output}" | tail -n 1)
 
-  assert_correct_ldc93s1_prodmodel "${output1}" "${status}"
+  assert_correct_ldc93s1_prodmodel "${output1}" "${status}" "${_bitrate}"
   assert_correct_inference "${output2}" "we must find a new home in the stars" "${status}"
 }
 
 run_prod_inference_tests()
 {
-  set +e
+  local _bitrate=$1
-  phrase_pbmodel_withlm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr)
-  status=$?
-  set -e
-  assert_correct_ldc93s1_prodmodel "${phrase_pbmodel_withlm}" "$status"
 
   set +e
-  phrase_pbmodel_withlm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr)
+  phrase_pbmodel_withlm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr)
   status=$?
   set -e
-  assert_correct_ldc93s1_prodmodel "${phrase_pbmodel_withlm}" "$status"
+  assert_correct_ldc93s1_prodmodel "${phrase_pbmodel_withlm}" "$status" "${_bitrate}"
+
+  set +e
+  phrase_pbmodel_withlm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr)
+  status=$?
+  set -e
+  assert_correct_ldc93s1_prodmodel "${phrase_pbmodel_withlm}" "$status" "${_bitrate}"
 
   set +e
   phrase_pbmodel_withlm_stereo_44k=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1_pcms16le_2_44100.wav 2>${TASKCLUSTER_TMP_DIR}/stderr)
   status=$?
   set -e
-  assert_correct_ldc93s1_prodmodel_stereo_44k "${phrase_pbmodel_withlm_stereo_44k}" "$status"
+  assert_correct_ldc93s1_prodmodel_stereo_44k "${phrase_pbmodel_withlm_stereo_44k}" "$status" "${_bitrate}"
 
-  set +e
+  # Run down-sampling warning test only when we actually perform downsampling
-  phrase_pbmodel_withlm_mono_8k=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1_pcms16le_1_8000.wav 2>&1 1>/dev/null)
+  if [ "${ldc93s1_sample_filename}" != "LDC93S1_pcms16le_1_8000.wav" ]; then
-  set -e
+    set +e
-  assert_correct_warning_upsampling "${phrase_pbmodel_withlm_mono_8k}"
+    phrase_pbmodel_withlm_mono_8k=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1_pcms16le_1_8000.wav 2>&1 1>/dev/null)
+    set -e
+    assert_correct_warning_upsampling "${phrase_pbmodel_withlm_mono_8k}"
+  fi;
 }
 
 run_prodtflite_inference_tests()
 {
-  set +e
+  local _bitrate=$1
-  phrase_pbmodel_withlm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr)
-  status=$?
-  set -e
-  assert_correct_ldc93s1_prodtflitemodel "${phrase_pbmodel_withlm}" "$status"
 
   set +e
-  phrase_pbmodel_withlm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr)
+  phrase_pbmodel_withlm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr)
   status=$?
   set -e
-  assert_correct_ldc93s1_prodtflitemodel "${phrase_pbmodel_withlm}" "$status"
+  assert_correct_ldc93s1_prodtflitemodel "${phrase_pbmodel_withlm}" "$status" "${_bitrate}"
+
+  set +e
+  phrase_pbmodel_withlm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr)
+  status=$?
+  set -e
+  assert_correct_ldc93s1_prodtflitemodel "${phrase_pbmodel_withlm}" "$status" "${_bitrate}"
 
   set +e
   phrase_pbmodel_withlm_stereo_44k=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1_pcms16le_2_44100.wav 2>${TASKCLUSTER_TMP_DIR}/stderr)
   status=$?
   set -e
-  assert_correct_ldc93s1_prodtflitemodel_stereo_44k "${phrase_pbmodel_withlm_stereo_44k}" "$status"
+  assert_correct_ldc93s1_prodtflitemodel_stereo_44k "${phrase_pbmodel_withlm_stereo_44k}" "$status" "${_bitrate}"
 
-  set +e
+  # Run down-sampling warning test only when we actually perform downsampling
-  phrase_pbmodel_withlm_mono_8k=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1_pcms16le_1_8000.wav 2>&1 1>/dev/null)
+  if [ "${ldc93s1_sample_filename}" != "LDC93S1_pcms16le_1_8000.wav" ]; then
-  set -e
+    set +e
-  assert_correct_warning_upsampling "${phrase_pbmodel_withlm_mono_8k}"
+    phrase_pbmodel_withlm_mono_8k=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1_pcms16le_1_8000.wav 2>&1 1>/dev/null)
+    set -e
+    assert_correct_warning_upsampling "${phrase_pbmodel_withlm_mono_8k}"
+  fi;
 }
 
 run_multi_inference_tests()
@@ -519,7 +560,7 @@ run_multi_inference_tests()
 run_cpp_only_inference_tests()
 {
   set +e
-  phrase_pbmodel_withlm_intermediate_decode=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav --stream 1280 2>${TASKCLUSTER_TMP_DIR}/stderr | tail -n 1)
+  phrase_pbmodel_withlm_intermediate_decode=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} --stream 1280 2>${TASKCLUSTER_TMP_DIR}/stderr | tail -n 1)
   status=$?
   set -e
   assert_correct_ldc93s1_lm "${phrase_pbmodel_withlm_intermediate_decode}" "$status"
@@ -597,6 +638,25 @@ install_nuget()
   export PATH=${TASKCLUSTER_TMP_DIR}/ds/:$PATH
 }
 
+set_ldc_sample_filename()
+{
+  local _bitrate=$1
+
+  if [ -z "${_bitrate}" ]; then
+    echo "Bitrate should not be empty"
+    exit 1
+  fi;
+
+  case "${_bitrate}" in
+    8k)
+      ldc93s1_sample_filename='LDC93S1_pcms16le_1_8000.wav'
+    ;;
+    16k)
+      ldc93s1_sample_filename='LDC93S1_pcms16le_1_16000.wav'
+    ;;
+  esac
+}
+
 download_data()
 {
   ${WGET} -P "${TASKCLUSTER_TMP_DIR}" "${model_source}"
@@ -1664,7 +1724,7 @@ android_setup_ndk_data()
 
   adb push \
     ${TASKCLUSTER_TMP_DIR}/${model_name} \
-    ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav \
+    ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} \
     ${ANDROID_TMP_DIR}/ds/
 }
 
@@ -1674,7 +1734,7 @@ android_setup_apk_data()
 
   adb push \
     ${TASKCLUSTER_TMP_DIR}/${model_name} \
-    ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav \
+    ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} \
     ${TASKCLUSTER_TMP_DIR}/lm.binary \
     ${TASKCLUSTER_TMP_DIR}/trie \
     ${ANDROID_TMP_DIR}/test/

taskcluster/tc-train-tests.sh

@@ -5,7 +5,7 @@ set -xe
 source $(dirname "$0")/tc-tests-utils.sh
 
 pyver_full=$1
-ds=$2
+bitrate=$2
 
 if [ -z "${pyver_full}" ]; then
     echo "No python version given, aborting."
@@ -56,11 +56,28 @@ decoder_pkg_url=${DECODER_ARTIFACTS_ROOT}/${decoder_pkg}
 
 LD_LIBRARY_PATH=${PY37_LDPATH}:$LD_LIBRARY_PATH pip install --verbose --only-binary :all: ${PY37_SOURCE_PACKAGE} ${decoder_pkg_url} | cat
 
+# Prepare correct arguments for training
+case "${bitrate}" in
+    8k)
+        sample_rate=8000
+        sample_name='LDC93S1_pcms16le_1_8000.wav'
+    ;;
+    16k)
+        sample_rate=16000
+        sample_name='LDC93S1_pcms16le_1_16000.wav'
+    ;;
+esac
+
+# Easier to rename to that we can exercize the LDC93S1 importer code to
+# generate the CSV file.
+echo "Moving ${sample_name} to LDC93S1.wav"
+mv "${DS_ROOT_TASK}/DeepSpeech/ds/data/smoke_test/${sample_name}" "${DS_ROOT_TASK}/DeepSpeech/ds/data/smoke_test/LDC93S1.wav"
+
 pushd ${HOME}/DeepSpeech/ds/
     # Run twice to test preprocessed features
-    time ./bin/run-tc-ldc93s1_new.sh 219
+    time ./bin/run-tc-ldc93s1_new.sh 219 "${sample_rate}"
-    time ./bin/run-tc-ldc93s1_new.sh 1
+    time ./bin/run-tc-ldc93s1_new.sh 1 "${sample_rate}"
-    time ./bin/run-tc-ldc93s1_tflite.sh
+    time ./bin/run-tc-ldc93s1_tflite.sh "${sample_rate}"
 popd
 
 cp /tmp/train/output_graph.pb ${TASKCLUSTER_ARTIFACTS}

taskcluster/test-android-opt-base.tyml

@@ -31,7 +31,7 @@ then:
 
     env:
       $let:
-        training: { $eval: as_slugid("test-training_upstream-linux-amd64-py36m-opt") }
+        training: { $eval: as_slugid(build.test_model_task) }
         android_arm64_build: { $eval: as_slugid("android-arm64-cpu-opt") }
         android_armv7_build: { $eval: as_slugid("android-armv7-cpu-opt") }
       in:

taskcluster/test-apk-android-24-x86_64-opt.yml

@@ -2,12 +2,13 @@ build:
   template_file: test-android-opt-base.tyml
   dependencies:
     - "android-x86_64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       apt-get -qq -y install curl make python && ${swig.packages.install_script}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-apk-tests.sh x86_64 android-24"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-apk-tests.sh x86_64 android-24 16k"
   metadata:
     name: "DeepSpeech Android 7.0 x86_64 Google Pixel APK/Java tests"
     description: "Testing DeepSpeech APK/Java for Android 7.0 x86_64 Google Pixel, optimized version"

taskcluster/test-apk-android-25-x86_64-opt.yml

@@ -2,12 +2,13 @@ build:
   template_file: test-android-opt-base.tyml
   dependencies:
     - "android-x86_64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       apt-get -qq -y install curl make python && ${swig.packages.install_script}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-apk-tests.sh x86_64 android-25"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-apk-tests.sh x86_64 android-25 16k"
   metadata:
     name: "DeepSpeech Android 7.1 x86_64 Google Pixel APK/Java tests"
     description: "Testing DeepSpeech APK/Java for Android 7.1 x86_64 Google Pixel, optimized version"

taskcluster/test-apk-android-26-x86_64-opt.yml.disabled

@@ -3,7 +3,7 @@ build:
   template_file: test-android-opt-base.tyml
   dependencies:
     - "android-x86_64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       apt-get -qq -y install curl make python && ${swig.packages.install_script}

taskcluster/test-apk-android-28-x86_64-opt.yml.disabled

@@ -3,7 +3,7 @@ build:
   template_file: test-android-opt-base.tyml
   dependencies:
     - "android-x86_64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       apt-get -qq -y install curl make python && ${swig.packages.install_script}

taskcluster/test-armbian-opt-base.tyml

@@ -31,7 +31,7 @@ then:
 
     env:
       $let:
-        training: { $eval: as_slugid("test-training_upstream-linux-amd64-py36m-opt") }
+        training: { $eval: as_slugid(build.test_model_task) }
         linux_arm64_build: { $eval: as_slugid("linux-arm64-cpu-opt") }
       in:
         DEEPSPEECH_ARTIFACTS_ROOT: https://community-tc.services.mozilla.com/api/queue/v1/task/${linux_arm64_build}/artifacts/public

taskcluster/test-benchmark-linux-amd64-opt.yml

@@ -2,7 +2,8 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages_trusty.apt} zip

taskcluster/test-cpp-android-24-arm64-opt.yml

@@ -2,9 +2,10 @@ build:
   template_file: test-android-opt-base.tyml
   dependencies:
     - "android-arm64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-ds-tests.sh arm64-v8a android-24"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-ds-tests.sh arm64-v8a android-24 16k"
   metadata:
     name: "DeepSpeech Android 7.0 ARM64 Google Pixel C++ tests"
     description: "Testing DeepSpeech C++ for Android 7.0 ARM64 Google Pixel, optimized version"

taskcluster/test-cpp-android-24-armv7-opt.yml

@@ -2,9 +2,10 @@ build:
   template_file: test-android-opt-base.tyml
   dependencies:
     - "android-armv7-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-ds-tests.sh armeabi-v7a android-24"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-ds-tests.sh armeabi-v7a android-24 16k"
   metadata:
     name: "DeepSpeech Android 7.0 ARMv7 Google Pixel C++ tests"
     description: "Testing DeepSpeech C++ for Android 7.0 ARMv7 Google Pixel, optimized version"

taskcluster/test-cpp-android-25-arm64-opt.yml

@@ -2,9 +2,10 @@ build:
   template_file: test-android-opt-base.tyml
   dependencies:
     - "android-arm64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-ds-tests.sh arm64-v8a android-25"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-ds-tests.sh arm64-v8a android-25 16k"
   metadata:
     name: "DeepSpeech Android 7.1 ARM64 Google Pixel C++ tests"
     description: "Testing DeepSpeech C++ for Android 7.1 ARM64 Google Pixel, optimized version"

taskcluster/test-cpp-android-25-armv7-opt.yml

@@ -2,9 +2,10 @@ build:
   template_file: test-android-opt-base.tyml
   dependencies:
     - "android-armv7-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-ds-tests.sh armeabi-v7a android-25"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-ds-tests.sh armeabi-v7a android-25 16k"
   metadata:
     name: "DeepSpeech Android 7.1 ARMv7 Google Pixel C++ tests"
     description: "Testing DeepSpeech C++ for Android 7.1 ARMv7 Google Pixel, optimized version"

taskcluster/test-cpp-armbian-arm64-opt.yml

@@ -1,10 +0,0 @@
-build:
-  template_file: test-armbian-opt-base.tyml
-  dependencies:
-    - "linux-arm64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
-  args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp-ds-tests.sh"
-  metadata:
-    name: "DeepSpeech ARMbian ARM64 Cortex-A53 CPU C++ tests"
-    description: "Testing DeepSpeech C++ for ARMbian ARM64 Cortex-A53, CPU only, optimized version"

taskcluster/test-cpp-linux-amd64-prod_pbmodel-opt.yml

@@ -3,7 +3,7 @@ build:
   dependencies:
     - "linux-amd64-cpu-opt"
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp-ds-tests-prod.sh"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp-ds-tests-prod.sh 16k"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU C++ prod tests"
     description: "Testing DeepSpeech C++ for Linux/AMD64 on prod model, CPU only, optimized version"

taskcluster/test-cpp-raspbian-rpi3-opt.yml

@@ -1,10 +0,0 @@
-build:
-  template_file: test-raspbian-opt-base.tyml
-  dependencies:
-    - "linux-rpi3-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
-  args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp_tflite-ds-tests.sh"
-  metadata:
-    name: "DeepSpeech Raspbian RPi3/ARMv7 CPU C++ tests"
-    description: "Testing DeepSpeech C++ for Raspbian RPi3/ARMv7, CPU only, optimized version"

taskcluster/test-cpp_16k-armbian-arm64-opt.yml

@@ -0,0 +1,11 @@
+build:
+  template_file: test-armbian-opt-base.tyml
+  dependencies:
+    - "linux-arm64-cpu-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp-ds-tests.sh 16k"
+  metadata:
+    name: "DeepSpeech ARMbian ARM64 Cortex-A53 CPU C++ tests (16kHz)"
+    description: "Testing DeepSpeech C++ for ARMbian ARM64 Cortex-A53, CPU only, optimized version (16kHz)"

taskcluster/test-cpp_16k-darwin-amd64-opt.yml

@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${cpp.brew.setup} && ${cpp.brew.packages} && ${cpp.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-cpp-ds-tests.sh"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-cpp-ds-tests.sh 16k"
   metadata:
-    name: "DeepSpeech OSX AMD64 CPU C++ tests"
+    name: "DeepSpeech OSX AMD64 CPU C++ tests (16kHz)"
-    description: "Testing DeepSpeech C++ for OSX/AMD64, CPU only, optimized version"
+    description: "Testing DeepSpeech C++ for OSX/AMD64, CPU only, optimized version (16kHz)"

taskcluster/test-cpp_16k-linux-amd64-opt.yml

@@ -0,0 +1,11 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-cpu-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp-ds-tests.sh 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU C++ tests (16kHz)"
+    description: "Testing DeepSpeech C++ for Linux/AMD64, CPU only, optimized version (16kHz)"

taskcluster/test-cpp_16k-raspbian-rpi3-opt.yml

@@ -0,0 +1,11 @@
+build:
+  template_file: test-raspbian-opt-base.tyml
+  dependencies:
+    - "linux-rpi3-cpu-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp_tflite-ds-tests.sh 16k"
+  metadata:
+    name: "DeepSpeech Raspbian RPi3/ARMv7 CPU C++ tests (16kHz)"
+    description: "Testing DeepSpeech C++ for Raspbian RPi3/ARMv7, CPU only, optimized version (16kHz)"

taskcluster/test-cpp_16k-win-amd64-opt.yml

@@ -2,9 +2,10 @@ build:
   template_file: test-win-opt-base.tyml
   dependencies:
     - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-cppwin-ds-tests.sh"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-cppwin-ds-tests.sh 16k"
   metadata:
-    name: "DeepSpeech Windows AMD64 CPU C++ tests"
+    name: "DeepSpeech Windows AMD64 CPU C++ tests (16kHz)"
-    description: "Testing DeepSpeech C++ for Windows/AMD64, CPU only, optimized version"
+    description: "Testing DeepSpeech C++ for Windows/AMD64, CPU only, optimized version (16kHz)"

taskcluster/test-cpp_16k_tflite-darwin-amd64-opt.yml

@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-tflite-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${cpp.brew.setup} && ${cpp.brew.packages} && ${cpp.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-cpp_tflite_basic-ds-tests.sh"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-cpp_tflite_basic-ds-tests.sh 16k"
   metadata:
-    name: "DeepSpeech OSX AMD64 TFlite C++ tests"
+    name: "DeepSpeech OSX AMD64 TFlite C++ tests (16kHz)"
-    description: "Testing DeepSpeech C++ for OSX/AMD64, TFLite, optimized version"
+    description: "Testing DeepSpeech C++ for OSX/AMD64, TFLite, optimized version (16kHz)"

taskcluster/test-cpp_16k_tflite-linux-amd64-opt.yml

@@ -0,0 +1,11 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-tflite-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp_tflite_basic-ds-tests.sh 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 TFLite C++ tests (16kHz)"
+    description: "Testing DeepSpeech C++ for Linux/AMD64, TFLite, optimized version (16kHz)"

taskcluster/test-cpp_16k_tflite-win-amd64-opt.yml

@@ -0,0 +1,11 @@
+build:
+  template_file: test-win-opt-base.tyml
+  dependencies:
+    - "win-amd64-tflite-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
+  args:
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-cpp_tflite_basic-ds-tests.sh 16k"
+  metadata:
+    name: "DeepSpeech Windows AMD64 TFLite C++ tests (16kHz)"
+    description: "Testing DeepSpeech C++ for Windows/AMD64, TFLite, optimized version (16kHz)"

taskcluster/test-cpp_8k-linux-amd64-opt.yml

@@ -2,9 +2,10 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_8k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_8k-linux-amd64-py36m-opt"
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp-ds-tests.sh"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp-ds-tests.sh 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU C++ tests"
+    name: "DeepSpeech Linux AMD64 CPU C++ tests (8kHz)"
-    description: "Testing DeepSpeech C++ for Linux/AMD64, CPU only, optimized version"
+    description: "Testing DeepSpeech C++ for Linux/AMD64, CPU only, optimized version (8kHz)"

taskcluster/test-cpp_8k_tflite-linux-amd64-opt.yml

@@ -2,9 +2,10 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-tflite-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_8k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_8k-linux-amd64-py36m-opt"
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp_tflite_basic-ds-tests.sh"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp_tflite_basic-ds-tests.sh 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 TFLite C++ tests"
+    name: "DeepSpeech Linux AMD64 TFLite C++ tests (16kHz)"
-    description: "Testing DeepSpeech C++ for Linux/AMD64, TFLite, optimized version"
+    description: "Testing DeepSpeech C++ for Linux/AMD64, TFLite, optimized version (16kHz)"

taskcluster/test-cpp_tflite-linux-amd64-prod-opt.yml

@@ -3,7 +3,7 @@ build:
   dependencies:
     - "linux-amd64-tflite-opt"
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp_tflite-tests-prod.sh"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp_tflite-tests-prod.sh 16k"
   metadata:
     name: "DeepSpeech Linux AMD64 TFLite C++ prod tests"
     description: "Testing DeepSpeech C++ for Linux/AMD64 on prod model, TFLite, optimized version"

taskcluster/test-cpp_tflite-win-amd64-opt.yml

@@ -1,10 +0,0 @@
-build:
-  template_file: test-win-opt-base.tyml
-  dependencies:
-    - "win-amd64-tflite-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
-  args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-cpp_tflite_basic-ds-tests.sh"
-  metadata:
-    name: "DeepSpeech Windows AMD64 TFLite C++ tests"
-    description: "Testing DeepSpeech C++ for Windows/AMD64, TFLite, optimized version"

taskcluster/test-darwin-opt-base.tyml

@@ -34,7 +34,7 @@ then:
 
     env:
       $let:
-        training: { $eval: as_slugid("test-training_upstream-linux-amd64-py36m-opt") }
+        training: { $eval: as_slugid(build.test_model_task) }
         darwin_amd64_build: { $eval: as_slugid("darwin-amd64-cpu-opt") }
         darwin_amd64_tflite: { $eval: as_slugid("darwin-amd64-tflite-opt") }
       in:

taskcluster/test-electronjs_v3.1-darwin-amd64-opt.yml

@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_10} && ${nodejs.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 3.1.11"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 3.1.11 16k"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU ElectronJS v3.1 tests"
     description: "Testing DeepSpeech for OSX/AMD64 on ElectronJS v3.1, CPU only, optimized version"

taskcluster/test-electronjs_v3.1-win-amd64-opt.yml

@@ -2,12 +2,13 @@ build:
   template_file: test-win-opt-base.tyml
   dependencies:
     - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${system.sox_win} && ${nodejs.win.prep_10}
   args:
-    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 3.1.11"
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 3.1.11 16k"
   metadata:
     name: "DeepSpeech Windows AMD64 CPU ElectronJS v3.1 tests"
     description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS v3.1, CPU only, optimized version"

taskcluster/test-electronjs_v3.1_16k-linux-amd64-opt.yml

@@ -0,0 +1,15 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  docker_image: "ubuntu:16.04"
+  dependencies:
+    - "linux-amd64-cpu-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
+  system_setup:
+    >
+      ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 3.1.11 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v3.1 tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v3.1, CPU only, optimized version (16kHz)"

taskcluster/test-electronjs_v3.1_8k-linux-amd64-opt.yml

@@ -3,12 +3,13 @@ build:
   docker_image: "ubuntu:16.04"
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_8k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_8k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.0.3"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 3.1.11 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU ElectronJS v4.0 tests"
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v3.1 tests (8kHz)"
-    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v4.0, CPU only, optimized version"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v3.1, CPU only, optimized version (8kHz)"

taskcluster/test-electronjs_v4.0-darwin-amd64-opt.yml

@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_10} && ${nodejs.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.0.3"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.0.3 16k"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU ElectronJS v4.0 tests"
     description: "Testing DeepSpeech for OSX/AMD64 on ElectronJS v4.0, CPU only, optimized version"

taskcluster/test-electronjs_v4.0-win-amd64-opt.yml

@@ -2,12 +2,13 @@ build:
   template_file: test-win-opt-base.tyml
   dependencies:
     - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${system.sox_win} && ${nodejs.win.prep_10}
   args:
-    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.0.3"
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.0.3 16k"
   metadata:
     name: "DeepSpeech Windows AMD64 CPU ElectronJS v4.0 tests"
     description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS v4.0, CPU only, optimized version"

taskcluster/test-electronjs_v4.0_16k-linux-amd64-opt.yml

@@ -0,0 +1,15 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  docker_image: "ubuntu:16.04"
+  dependencies:
+    - "linux-amd64-cpu-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
+  system_setup:
+    >
+      ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.0.3 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v4.0 tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v4.0, CPU only, optimized version (16kHz)"

taskcluster/test-electronjs_v4.0_8k-linux-amd64-opt.yml

@@ -3,12 +3,13 @@ build:
   docker_image: "ubuntu:16.04"
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_8k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_8k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 3.1.11"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.0.3 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU ElectronJS v3.1 tests"
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v4.0 tests (8kHz)"
-    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v3.1, CPU only, optimized version"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v4.0, CPU only, optimized version (8kHz)"

taskcluster/test-electronjs_v4.1-darwin-amd64-opt.yml

@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_10} && ${nodejs.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.1.5"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.1.5 16k"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU ElectronJS v4.1 tests"
     description: "Testing DeepSpeech for OSX/AMD64 on ElectronJS v4.1, CPU only, optimized version"

taskcluster/test-electronjs_v4.1-win-amd64-opt.yml

@@ -2,12 +2,13 @@ build:
   template_file: test-win-opt-base.tyml
   dependencies:
     - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${system.sox_win} && ${nodejs.win.prep_10}
   args:
-    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.1.5"
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.1.5 16k"
   metadata:
     name: "DeepSpeech Windows AMD64 CPU ElectronJS v4.1 tests"
     description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS v4.1, CPU only, optimized version"

taskcluster/test-electronjs_v4.1_16k-linux-amd64-opt.yml

@@ -0,0 +1,15 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  docker_image: "ubuntu:16.04"
+  dependencies:
+    - "linux-amd64-cpu-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
+  system_setup:
+    >
+      ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.1.5 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v4.1 tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v4.1, CPU only, optimized version (16kHz)"

taskcluster/test-electronjs_v4.1_8k-linux-amd64-opt.yml

@@ -3,12 +3,13 @@ build:
   docker_image: "ubuntu:16.04"
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_8k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_8k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.1.5"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.1.5 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU ElectronJS v4.1 tests"
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v4.1 tests (8kHz)"
-    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v4.1, CPU only, optimized version"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v4.1, CPU only, optimized version (8kHz)"

taskcluster/test-electronjs_v4.2-darwin-amd64-opt.yml

@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_10} && ${nodejs.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.2.5"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.2.5 16k"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU ElectronJS v4.2 tests"
     description: "Testing DeepSpeech for OSX/AMD64 on ElectronJS v4.2, CPU only, optimized version"

taskcluster/test-electronjs_v4.2-win-amd64-opt.yml

@@ -2,12 +2,13 @@ build:
   template_file: test-win-opt-base.tyml
   dependencies:
     - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${system.sox_win} && ${nodejs.win.prep_10}
   args:
-    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.2.5"
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.2.5 16k"
   metadata:
     name: "DeepSpeech Windows AMD64 CPU ElectronJS v4.2 tests"
     description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS v4.2, CPU only, optimized version"

taskcluster/test-electronjs_v4.2_16k-linux-amd64-opt.yml

@@ -0,0 +1,15 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  docker_image: "ubuntu:16.04"
+  dependencies:
+    - "linux-amd64-cpu-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
+  system_setup:
+    >
+      ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.2.5 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v4.2 tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v4.2, CPU only, optimized version (16kHz)"

taskcluster/test-electronjs_v4.2_8k-linux-amd64-opt.yml

@@ -3,12 +3,13 @@ build:
   docker_image: "ubuntu:16.04"
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_8k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_8k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.2.5"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.2.5 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU ElectronJS v4.2 tests"
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v4.2 tests (8kHz)"
-    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v4.2, CPU only, optimized version"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v4.2, CPU only, optimized version (8kHz)"

taskcluster/test-electronjs_v5.0-darwin-amd64-opt.yml

@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_12} && ${nodejs.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 5.0.6"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 5.0.6 16k"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU ElectronJS v5.0 tests"
     description: "Testing DeepSpeech for OSX/AMD64 on ElectronJS v5.0, CPU only, optimized version"

taskcluster/test-electronjs_v5.0-win-amd64-opt.yml

@@ -2,12 +2,13 @@ build:
   template_file: test-win-opt-base.tyml
   dependencies:
     - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${system.sox_win} && ${nodejs.win.prep_12}
   args:
-    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 5.0.6"
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 5.0.6 16k"
   metadata:
     name: "DeepSpeech Windows AMD64 CPU ElectronJS v5.0 tests"
     description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS v5.0, CPU only, optimized version"

taskcluster/test-electronjs_v5.0_16k-linux-amd64-opt.yml

@@ -0,0 +1,15 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  docker_image: "ubuntu:16.04"
+  dependencies:
+    - "linux-amd64-cpu-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
+  system_setup:
+    >
+      ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 5.0.6 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v5.0 tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v5.0, CPU only, optimized version (16kHz)"

taskcluster/test-electronjs_v5.0_8k-linux-amd64-opt.yml

@@ -3,12 +3,13 @@ build:
   docker_image: "ubuntu:16.04"
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_8k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_8k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 5.0.6"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 5.0.6 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU ElectronJS v5.0 tests"
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v5.0 tests (8kHz)"
-    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v5.0, CPU only, optimized version"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v5.0, CPU only, optimized version (8kHz)"

taskcluster/test-electronjs_v6.0-darwin-amd64-opt.yml

@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_12} && ${nodejs.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 6.0.11"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 6.0.11 16k"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU ElectronJS v6.0 tests"
     description: "Testing DeepSpeech for OSX/AMD64 on ElectronJS v6.0, CPU only, optimized version"

taskcluster/test-electronjs_v6.0-win-amd64-opt.yml

@@ -2,12 +2,13 @@ build:
   template_file: test-win-opt-base.tyml
   dependencies:
     - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${system.sox_win} && ${nodejs.win.prep_12}
   args:
-    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 6.0.11"
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 6.0.11 16k"
   metadata:
     name: "DeepSpeech Windows AMD64 CPU ElectronJS v6.0 tests"
     description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS v6.0, CPU only, optimized version"

taskcluster/test-electronjs_v6.0_16k-linux-amd64-opt.yml

@@ -0,0 +1,15 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  docker_image: "ubuntu:16.04"
+  dependencies:
+    - "linux-amd64-cpu-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
+  system_setup:
+    >
+      ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 6.0.11 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v6.0 tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v6.0, CPU only, optimized version (16kHz)"

taskcluster/test-electronjs_v6.0_8k-linux-amd64-opt.yml

@@ -3,12 +3,13 @@ build:
   docker_image: "ubuntu:16.04"
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py35m-opt"
+    - "test-training_8k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_8k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.1.2"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 6.0.11 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU ElectronJS v7.1 tests"
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v6.0 tests (8kHz)"
-    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v7.1, CPU only, optimized version"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v6.0, CPU only, optimized version (8kHz)"

taskcluster/test-electronjs_v7.0-darwin-amd64-opt.yml

@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py35m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_12} && ${nodejs.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.0.1"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.0.1 16k"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU ElectronJS v7.0 tests"
     description: "Testing DeepSpeech for OSX/AMD64 on ElectronJS v7.0, CPU only, optimized version"

taskcluster/test-electronjs_v7.0-win-amd64-opt.yml

@@ -2,12 +2,13 @@ build:
   template_file: test-win-opt-base.tyml
   dependencies:
     - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py35m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${system.sox_win} && ${nodejs.win.prep_12}
   args:
-    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.0.1"
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.0.1 16k"
   metadata:
     name: "DeepSpeech Windows AMD64 CPU ElectronJS v7.0 tests"
     description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS v7.0, CPU only, optimized version"

taskcluster/test-electronjs_v7.0_16k-linux-amd64-opt.yml

@@ -0,0 +1,15 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  docker_image: "ubuntu:16.04"
+  dependencies:
+    - "linux-amd64-cpu-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
+  system_setup:
+    >
+      ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.0.1 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v7.0 tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v7.0, CPU only, optimized version (16kHz)"

taskcluster/test-electronjs_v7.0_8k-linux-amd64-opt.yml

@@ -3,12 +3,13 @@ build:
   docker_image: "ubuntu:16.04"
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_8k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_8k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 6.0.11"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.0.1 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU ElectronJS v6.0 tests"
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v7.0 tests (8kHz)"
-    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v6.0, CPU only, optimized version"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v7.0, CPU only, optimized version (8kHz)"

taskcluster/test-electronjs_v7.1-darwin-amd64-opt.yml

@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py35m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_12} && ${nodejs.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.1.2"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.1.2 16k"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU ElectronJS v7.1 tests"
     description: "Testing DeepSpeech for OSX/AMD64 on ElectronJS v7.1, CPU only, optimized version"

taskcluster/test-electronjs_v7.1-win-amd64-opt.yml

@@ -2,12 +2,13 @@ build:
   template_file: test-win-opt-base.tyml
   dependencies:
     - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py35m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${system.sox_win} && ${nodejs.win.prep_12}
   args:
-    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.1.2"
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.1.2 16k"
   metadata:
     name: "DeepSpeech Windows AMD64 CPU ElectronJS v7.1 tests"
     description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS v7.1, CPU only, optimized version"

taskcluster/test-electronjs_v7.1_16k-linux-amd64-opt.yml

@@ -0,0 +1,15 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  docker_image: "ubuntu:16.04"
+  dependencies:
+    - "linux-amd64-cpu-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
+  system_setup:
+    >
+      ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.1.2 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v7.1 tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v7.1, CPU only, optimized version (16kHz)"

taskcluster/test-electronjs_v7.1_8k-linux-amd64-opt.yml

@@ -3,12 +3,13 @@ build:
   docker_image: "ubuntu:16.04"
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py35m-opt"
+    - "test-training_8k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_8k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.0.1"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.1.2 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU ElectronJS v7.0 tests"
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v7.1 tests (8kHz)"
-    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v7.0, CPU only, optimized version"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v7.1, CPU only, optimized version (8kHz)"

taskcluster/test-linux-opt-base.tyml

@@ -31,7 +31,7 @@ then:
 
     env:
       $let:
-        training: { $eval: as_slugid("test-training_upstream-linux-amd64-py36m-opt") }
+        training: { $eval: as_slugid(build.test_model_task) }
         linux_amd64_build: { $eval: as_slugid("linux-amd64-cpu-opt") }
         linux_amd64_tflite: { $eval: as_slugid("linux-amd64-tflite-opt") }
         linux_amd64_ctc: { $eval: as_slugid("linux-amd64-ctc-opt") }

taskcluster/test-lite_benchmark_model-linux-amd64-opt.yml

@@ -1,7 +1,8 @@
 build:
   template_file: test-linux-opt-base.tyml
   dependencies:
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-lite_benchmark_model-ds-tests.sh"
   benchmark_model_bin: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r1.14.e77504ac6b941fd2af495b49a0bcd56f25ca0e1e.cpu/artifacts/public/lite_benchmark_model"

taskcluster/test-netframework-win-amd64-opt.yml

@@ -2,9 +2,10 @@ build:
   template_file: test-win-opt-base.tyml
   dependencies:
     - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-netframework-ds-tests.sh"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-netframework-ds-tests.sh 16k"
   metadata:
     name: "DeepSpeech Windows AMD64 CPU .Net Framework tests"
     description: "Testing DeepSpeech .Net Framework for Windows/AMD64, CPU only, optimized version"

taskcluster/test-nodejs_10x-armbian-arm64-opt.yml

@@ -2,12 +2,13 @@ build:
   template_file: test-armbian-opt-base.tyml
   dependencies:
     - "linux-arm64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_buster.prep_10} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 10.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 10.x 16k"
   metadata:
     name: "DeepSpeech ARMbian ARM64 Cortex-A53 CPU NodeJS 10.x tests"
     description: "Testing DeepSpeech forARMbian ARM64 Cortex-A53 on NodeJS v10.x, CPU only, optimized version"

taskcluster/test-nodejs_10x-darwin-amd64-opt.yml

@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_10} && ${nodejs.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 10.x"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 10.x 16k"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU NodeJS 10.x tests"
     description: "Testing DeepSpeech for OSX/AMD64 on NodeJS v10.x, CPU only, optimized version"

taskcluster/test-nodejs_10x-raspbian-rpi3-opt.yml

@@ -2,12 +2,13 @@ build:
   template_file: test-raspbian-opt-base.tyml
   dependencies:
     - "linux-rpi3-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_buster.prep_10} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 10.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 10.x 16k"
   metadata:
     name: "DeepSpeech Raspbian RPi3/ARMv7 CPU NodeJS 10.x tests"
     description: "Testing DeepSpeech for Raspbian RPi3/ARMv7 on NodeJS v10.x, CPU only, optimized version"

taskcluster/test-nodejs_10x-win-amd64-opt.yml

@@ -2,12 +2,13 @@ build:
   template_file: test-win-opt-base.tyml
   dependencies:
     - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${system.sox_win} && ${nodejs.win.prep_10}
   args:
-    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 10.x"
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 10.x 16k"
   metadata:
     name: "DeepSpeech Windows AMD64 CPU NodeJS 10.x tests"
     description: "Testing DeepSpeech for Windows/AMD64 on NodeJS v10.x, CPU only, optimized version"

taskcluster/test-nodejs_10x_16k-linux-amd64-opt.yml

@@ -0,0 +1,15 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  docker_image: "ubuntu:16.04"
+  dependencies:
+    - "linux-amd64-cpu-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
+  system_setup:
+    >
+      ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 10.x 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 10.x tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v10.x, CPU only, optimized version (16kHz)"

taskcluster/test-nodejs_10x_16k-linux-amd64-prod_pbmodel-opt.yml

@@ -3,12 +3,11 @@ build:
   docker_image: "ubuntu:16.04"
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 10.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 10.x 16k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU NodeJS 10.x tests"
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 10.x prod tests (16kHz)"
-    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v10.x, CPU only, optimized version"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v10.x on prod model, CPU only, optimized version (16kHz)"

taskcluster/test-nodejs_10x_16k_tflite-linux-amd64-prod-opt.yml

@@ -0,0 +1,13 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  docker_image: "ubuntu:16.04"
+  dependencies:
+    - "linux-amd64-tflite-opt"
+  system_setup:
+    >
+      ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 10.x 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 TFLite NodeJS 10.x prod tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v10.x on prod model, TFLite, optimized version (16kHz)"

taskcluster/test-nodejs_10x_8k-linux-amd64-opt.yml

@@ -0,0 +1,15 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  docker_image: "ubuntu:16.04"
+  dependencies:
+    - "linux-amd64-cpu-opt"
+    - "test-training_8k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_8k-linux-amd64-py36m-opt"
+  system_setup:
+    >
+      ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 10.x 8k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 10.x tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v10.x, CPU only, optimized version (8kHz)"

taskcluster/test-nodejs_10x_8k-linux-amd64-prod_pbmodel-opt.yml

@@ -7,7 +7,7 @@ build:
     >
       ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 10.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 10.x 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU NodeJS 10.x prod tests"
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 10.x prod tests (8kHz)"
-    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v10.x on prod model, CPU only, optimized version"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v10.x on prod model, CPU only, optimized version (8kHz)"

taskcluster/test-nodejs_10x_8k_tflite-linux-amd64-prod-opt.yml

@@ -7,7 +7,7 @@ build:
     >
       ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 10.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 10.x 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 TFLite NodeJS 10.x prod tests"
+    name: "DeepSpeech Linux AMD64 TFLite NodeJS 10.x prod tests (8kHz)"
-    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v10.x on prod model, TFLite, optimized version"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v10.x on prod model, TFLite, optimized version (8kHz)"

taskcluster/test-nodejs_11x-armbian-arm64-opt.yml

@@ -2,12 +2,13 @@ build:
   template_file: test-armbian-opt-base.tyml
   dependencies:
     - "linux-arm64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_buster.prep_11} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 11.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 11.x 16k"
   metadata:
     name: "DeepSpeech ARMbian ARM64 Cortex-A53 CPU NodeJS 11.x tests"
     description: "Testing DeepSpeech forARMbian ARM64 Cortex-A53 on NodeJS v11.x, CPU only, optimized version"

taskcluster/test-nodejs_11x-darwin-amd64-opt.yml

@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_11} && ${nodejs.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 11.x"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 11.x 16k"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU NodeJS 11.x tests"
     description: "Testing DeepSpeech for OSX/AMD64 on NodeJS v11.x, CPU only, optimized version"