diff --git a/test/bin/unit_test.sh b/test/bin/unit_test.sh
index 5e48e3bb44..fd1c7149cb 100755
--- a/test/bin/unit_test.sh
+++ b/test/bin/unit_test.sh
@@ -19,6 +19,11 @@ else
   echo "export MET_TEST_OUTPUT=${MET_TEST_OUTPUT}"
 fi
 
+# if MET_TEST_MET_PYTHON_EXE is not set, use default value
+if [[ -z "${MET_TEST_MET_PYTHON_EXE}" ]] ; then
+  export MET_TEST_MET_PYTHON_EXE=/usr/local/python3/bin/python3
+fi
+
 PERL_UNIT_OPTS=""
 for arg in $@; do
   [ $arg == "-memchk" -o $arg == "memchk" ] && PERL_UNIT_OPTS="$PERL_UNIT_OPTS -memchk"
@@ -67,7 +72,7 @@ UNIT_XML="unit_ascii2nc.xml \
           unit_shift_data_plane.xml \
           unit_mtd.xml \
           unit_climatology.xml \
-          unit_test_grib_tables.xml \
+          unit_grib_tables.xml \
           unit_grid_weight.xml \
           unit_netcdf.xml \
           unit_hira.xml \
diff --git a/test/config/PlotModeFieldConfig b/test/config/PlotModeFieldConfig
index f6915f4c4a..816535ff25 100644
--- a/test/config/PlotModeFieldConfig
+++ b/test/config/PlotModeFieldConfig
@@ -9,7 +9,7 @@
 
 plot_info = {
 
-   output_directory = "${MET_TEST_OUTPUT}/plot_mode_field";
+   output_directory = "${MET_TEST_OUTPUT}/mode_graphics";
 
    size = 4;
 
diff --git a/test/xml/unit_aeronet.xml b/test/xml/unit_aeronet.xml
index 4d1fd80ec5..0892c623ad 100644
--- a/test/xml/unit_aeronet.xml
+++ b/test/xml/unit_aeronet.xml
@@ -10,6 +10,8 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: None -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
diff --git a/test/xml/unit_airnow.xml b/test/xml/unit_airnow.xml
index 9c616e5872..9afa68d292 100644
--- a/test/xml/unit_airnow.xml
+++ b/test/xml/unit_airnow.xml
@@ -10,6 +10,8 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: None -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
diff --git a/test/xml/unit_ascii2nc.xml b/test/xml/unit_ascii2nc.xml
index 2edb2bf9b7..11c46a3ea5 100644
--- a/test/xml/unit_ascii2nc.xml
+++ b/test/xml/unit_ascii2nc.xml
@@ -11,6 +11,8 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: None -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
@@ -68,11 +70,11 @@
     <exec>&MET_BIN;/ascii2nc</exec>
     <param> \
       &DATA_DIR_OBS;/ascii/qc_out_2012-09-07_00:00:00.GRM_P+FCST \
-      &OUTPUT_DIR;/ascii2nc/qc_out_2012-09-07_00:00:00.GRM_P+FCST.nc \
+      &OUTPUT_DIR;/ascii2nc/qc_out_2012-09-07_00:00:00.GRM_P_FCST.nc \
       -v 1
     </param>
     <output>
-      <point_nc>&OUTPUT_DIR;/ascii2nc/qc_out_2012-09-07_00:00:00.GRM_P+FCST.nc</point_nc>
+      <point_nc>&OUTPUT_DIR;/ascii2nc/qc_out_2012-09-07_00:00:00.GRM_P_FCST.nc</point_nc>
     </output>
   </test>
 
@@ -80,11 +82,11 @@
     <exec>&MET_BIN;/ascii2nc</exec>
     <param> \
       &DATA_DIR_OBS;/ascii/OBS:2015080700_bad_record \
-      &OUTPUT_DIR;/ascii2nc/OBS:2015080700_bad_record.nc \
+      &OUTPUT_DIR;/ascii2nc/OBS_2015080700_bad_record.nc \
       -v 1
     </param>
     <output>
-      <point_nc>&OUTPUT_DIR;/ascii2nc/OBS:2015080700_bad_record.nc</point_nc>
+      <point_nc>&OUTPUT_DIR;/ascii2nc/OBS_2015080700_bad_record.nc</point_nc>
     </output>
   </test>
 
diff --git a/test/xml/unit_climatology.xml b/test/xml/unit_climatology.xml
index c3a946072e..d50dc86ccf 100644
--- a/test/xml/unit_climatology.xml
+++ b/test/xml/unit_climatology.xml
@@ -11,12 +11,13 @@
   <!ENTITY DATA_DIR_CLIMO "&INPUT_DIR;/climatology_data">
 ]>
 
+<!-- Requires: unit_pb2nc.xml -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
   <exit_on_fail>true</exit_on_fail>
 
-  <!-- Depends on unit_pb2nc.xml -->
   <test name="climatology_POINT_STAT_GFS_2.5DEG">
     <exec>&MET_BIN;/point_stat</exec>
     <env>
diff --git a/test/xml/unit_duplicate_flag.xml b/test/xml/unit_duplicate_flag.xml
index 51de6cecc0..dcd287f59b 100644
--- a/test/xml/unit_duplicate_flag.xml
+++ b/test/xml/unit_duplicate_flag.xml
@@ -10,9 +10,9 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
-<met_test>
+<!-- Requires: unit_ascii2nc.xml -->
 
-  <!--  Depends on unit_ascii2nc to generate dup_test.nc obs file -->
+<met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
   <exit_on_fail>false</exit_on_fail>
@@ -27,11 +27,11 @@
       &DATA_DIR_MODEL;/grib2/nam/nam_2012040900_F012.grib2 \
       &OUTPUT_DIR;/ascii2nc/dup_test.nc \
       &CONFIG_DIR;/PointStatConfig_dup \
-      -outdir &OUTPUT_DIR;/point_stat -v 3
+      -outdir &OUTPUT_DIR;/duplicate_flag -v 3
     </param>   
     <output>
-      <stat>&OUTPUT_DIR;/point_stat/point_stat_DUP_NONE_120000L_20120409_120000V.stat</stat>
-      <stat>&OUTPUT_DIR;/point_stat/point_stat_DUP_NONE_120000L_20120409_120000V_mpr.txt</stat>
+      <stat>&OUTPUT_DIR;/duplicate_flag/point_stat_DUP_NONE_120000L_20120409_120000V.stat</stat>
+      <stat>&OUTPUT_DIR;/duplicate_flag/point_stat_DUP_NONE_120000L_20120409_120000V_mpr.txt</stat>
     </output>
   </test>
 
@@ -45,11 +45,11 @@
       &DATA_DIR_MODEL;/grib2/nam/nam_2012040900_F012.grib2 \
       &OUTPUT_DIR;/ascii2nc/dup_test.nc \
       &CONFIG_DIR;/PointStatConfig_dup \
-      -outdir &OUTPUT_DIR;/point_stat -v 3
+      -outdir &OUTPUT_DIR;/duplicate_flag -v 3
     </param>   
     <output>
-      <stat>&OUTPUT_DIR;/point_stat/point_stat_DUP_UNIQUE_120000L_20120409_120000V.stat</stat>
-      <stat>&OUTPUT_DIR;/point_stat/point_stat_DUP_UNIQUE_120000L_20120409_120000V_mpr.txt</stat>
+      <stat>&OUTPUT_DIR;/duplicate_flag/point_stat_DUP_UNIQUE_120000L_20120409_120000V.stat</stat>
+      <stat>&OUTPUT_DIR;/duplicate_flag/point_stat_DUP_UNIQUE_120000L_20120409_120000V_mpr.txt</stat>
     </output>
   </test>
 
diff --git a/test/xml/unit_ensemble_stat.xml b/test/xml/unit_ensemble_stat.xml
index 93ec40b228..98a97a4779 100644
--- a/test/xml/unit_ensemble_stat.xml
+++ b/test/xml/unit_ensemble_stat.xml
@@ -10,6 +10,8 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: unit_ascii2nc.xml -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
@@ -18,7 +20,6 @@
 
   <!--                                    -->
   <!--  ensemble_stat                     -->
-  <!--  depends on unit_ascii2nc.xml      -->
   <!--                                    -->
 
   <!--  Pass input ensemble files on the command line - one missing.  -->
@@ -216,7 +217,7 @@
 
   <!--  Add observation error perturbations.  -->
 
-  <test name="ensemble_stat_OBS_ERROR">
+  <test name="ensemble_stat_OBSERR">
     <exec>echo "&DATA_DIR_MODEL;/grib1/arw-fer-gep1/arw-fer-gep1_2012040912_F024.grib \
                 &DATA_DIR_MODEL;/grib1/arw-fer-gep5/arw-fer-gep5_2012040912_F024.grib \
                 &DATA_DIR_MODEL;/grib1/arw-sch-gep2/arw-sch-gep2_2012040912_F024.grib \
@@ -226,10 +227,10 @@
                 > &OUTPUT_DIR;/ensemble_stat/input_file_list; \
           &MET_BIN;/ensemble_stat</exec>
     <env>
-      <pair><name>DESC</name>           <value>OBS_ERROR</value></pair>
+      <pair><name>DESC</name>           <value>OBSERR</value></pair>
       <pair><name>OBS_ERROR_FLAG</name> <value>TRUE</value></pair>
       <pair><name>SKIP_CONST</name>     <value>TRUE</value></pair>
-      <pair><name>OUTPUT_PREFIX</name>  <value>OBS_ERROR</value></pair>
+      <pair><name>OUTPUT_PREFIX</name>  <value>OBSERR</value></pair>
     </env>
     <param> \
       &OUTPUT_DIR;/ensemble_stat/input_file_list \
@@ -239,14 +240,14 @@
       -outdir &OUTPUT_DIR;/ensemble_stat -v 1
     </param>
     <output>
-      <stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBS_ERROR_20120410_120000V.stat</stat>
-      <stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBS_ERROR_20120410_120000V_ecnt.txt</stat>
-      <stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBS_ERROR_20120410_120000V_rhist.txt</stat>
-      <stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBS_ERROR_20120410_120000V_phist.txt</stat>
-      <stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBS_ERROR_20120410_120000V_orank.txt</stat>
-      <stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBS_ERROR_20120410_120000V_ssvar.txt</stat>
-      <grid_nc>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBS_ERROR_20120410_120000V_ens.nc</grid_nc>
-      <grid_nc>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBS_ERROR_20120410_120000V_orank.nc</grid_nc>
+      <stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBSERR_20120410_120000V.stat</stat>
+      <stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBSERR_20120410_120000V_ecnt.txt</stat>
+      <stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBSERR_20120410_120000V_rhist.txt</stat>
+      <stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBSERR_20120410_120000V_phist.txt</stat>
+      <stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBSERR_20120410_120000V_orank.txt</stat>
+      <stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBSERR_20120410_120000V_ssvar.txt</stat>
+      <grid_nc>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBSERR_20120410_120000V_ens.nc</grid_nc>
+      <grid_nc>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBSERR_20120410_120000V_orank.nc</grid_nc>
     </output>
   </test>
 
diff --git a/test/xml/unit_gaussian.xml b/test/xml/unit_gaussian.xml
index ef6f74e49d..0c024e76d2 100644
--- a/test/xml/unit_gaussian.xml
+++ b/test/xml/unit_gaussian.xml
@@ -8,6 +8,8 @@
   <!ENTITY DATA_DIR_GAUSS "&INPUT_DIR;/gaussian">
 ]>
 
+<!-- Requires: None -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
@@ -25,5 +27,4 @@
     </output>
   </test>
 
-
 </met_test>
diff --git a/test/xml/unit_gen_ens_prod.xml b/test/xml/unit_gen_ens_prod.xml
index 91f2321431..3c014a08f2 100644
--- a/test/xml/unit_gen_ens_prod.xml
+++ b/test/xml/unit_gen_ens_prod.xml
@@ -10,6 +10,8 @@
   <!ENTITY DATA_DIR_CLIMO "&INPUT_DIR;/climatology_data">
 ]>
 
+<!-- Requires: None -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
@@ -17,7 +19,6 @@
 
   <!--                                    -->
   <!--  gen_ens_prod                      -->
-  <!--  no dependencies                   -->
   <!--                                    -->
 
   <!--  Use -ens twice to include the control as a member.  -->
@@ -120,7 +121,7 @@
     <param> \
         -ens    &DATA_DIR_MODEL;/grib2/gefs/enspost_grb2.t00z.prmsl \
         -config &CONFIG_DIR;/GenEnsProdConfig_single_file_grib \
-        -ctrl    &DATA_DIR_MODEL;/grib2/gefs/enspost_grb2.t00z.prmsl \
+        -ctrl   &DATA_DIR_MODEL;/grib2/gefs/enspost_grb2.t00z.prmsl \
         -out    &OUTPUT_DIR;/gen_ens_prod/gen_ens_prod_SINGLE_FILE_GRIB_WITH_CTRL.nc \
         -v 2
     </param>
diff --git a/test/xml/unit_gen_vx_mask.xml b/test/xml/unit_gen_vx_mask.xml
index 6416d0a048..e9664fe0f9 100644
--- a/test/xml/unit_gen_vx_mask.xml
+++ b/test/xml/unit_gen_vx_mask.xml
@@ -12,6 +12,8 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: None -->
+
 <met_test>
 
   <!--                                                                  -->
diff --git a/test/xml/unit_test_grib_tables.xml b/test/xml/unit_grib_tables.xml
similarity index 77%
rename from test/xml/unit_test_grib_tables.xml
rename to test/xml/unit_grib_tables.xml
index 41d3886867..88e8370e23 100644
--- a/test/xml/unit_test_grib_tables.xml
+++ b/test/xml/unit_grib_tables.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0"?>
 <!DOCTYPE met_test [
-        <!ENTITY MET_BIN        "${MET_BASE}/../../bin">
-        <!ENTITY TEST_DIR       "${MET_TEST_BASE}">
-        <!ENTITY INPUT_DIR      "${MET_TEST_INPUT}">
-        <!ENTITY OUTPUT_DIR     "${MET_TEST_OUTPUT}">
+  <!ENTITY MET_BIN        "${MET_BASE}/../../bin">
+  <!ENTITY TEST_DIR       "${MET_TEST_BASE}">
+  <!ENTITY INPUT_DIR      "${MET_TEST_INPUT}">
+  <!ENTITY OUTPUT_DIR     "${MET_TEST_OUTPUT}">
 
-        <!ENTITY CONFIG_DIR     "&TEST_DIR;/config">
-        <!ENTITY DATA_DIR_MODEL "&INPUT_DIR;/model_data">
-        <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
-        ]>
+  <!ENTITY CONFIG_DIR     "&TEST_DIR;/config">
+  <!ENTITY DATA_DIR_MODEL "&INPUT_DIR;/model_data">
+  <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
+]>
+
+<!-- Requires: None -->
 
 <met_test>
 
diff --git a/test/xml/unit_grid_diag.xml b/test/xml/unit_grid_diag.xml
index 0da3a2bd95..10049144ac 100644
--- a/test/xml/unit_grid_diag.xml
+++ b/test/xml/unit_grid_diag.xml
@@ -11,6 +11,8 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: None -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
diff --git a/test/xml/unit_grid_stat.xml b/test/xml/unit_grid_stat.xml
index c31455c0ce..9d154a91a6 100644
--- a/test/xml/unit_grid_stat.xml
+++ b/test/xml/unit_grid_stat.xml
@@ -11,6 +11,8 @@
   <!ENTITY DATA_DIR_CLIMO "&INPUT_DIR;/climatology_data">
 ]>
 
+<!-- Requires: unit_pcp_combine.xml -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
diff --git a/test/xml/unit_grid_weight.xml b/test/xml/unit_grid_weight.xml
index 2c2949b920..f355401441 100644
--- a/test/xml/unit_grid_weight.xml
+++ b/test/xml/unit_grid_weight.xml
@@ -11,6 +11,8 @@
   <!ENTITY DATA_DIR_CLIMO "&INPUT_DIR;/climatology_data">
 ]>
 
+<!-- Requires: None -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
diff --git a/test/xml/unit_gsi_tools.xml b/test/xml/unit_gsi_tools.xml
index e80505d2fd..78ec34ce56 100644
--- a/test/xml/unit_gsi_tools.xml
+++ b/test/xml/unit_gsi_tools.xml
@@ -10,24 +10,24 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: None -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
   <exit_on_fail>true</exit_on_fail>
 
-  <!-- No dependency on other XML files -->
-
   <!-- Test -set_hdr option with conventional obs -->
   <test name="gsid2mpr_CONV">
     <exec>&MET_BIN;/gsid2mpr</exec>
     <param> \
       &INPUT_DIR;/gsi_data/GSIdiags4EnKF/diag_conv_ges.mem001 \
       -set_hdr MODEL GSI_MEM001 \
-      -outdir &OUTPUT_DIR;/gsid2mpr \
+      -outdir &OUTPUT_DIR;/gsi_tools/gsid2mpr \
       -swap -v 1
     </param>
     <output>
-      <stat>&OUTPUT_DIR;/gsid2mpr/diag_conv_ges.mem001.stat</stat>
+      <stat>&OUTPUT_DIR;/gsi_tools/gsid2mpr/diag_conv_ges.mem001.stat</stat>
     </output>
   </test>
 
@@ -37,11 +37,11 @@
     <param> \
       &INPUT_DIR;/gsi_data/GSIdiags4EnKF/diag_conv_ges.mem001 \
       -set_hdr MODEL GSI_MEM001 \
-      -outdir &OUTPUT_DIR;/gsid2mpr \
+      -outdir &OUTPUT_DIR;/gsi_tools/gsid2mpr \
       -swap -no_check_dup -suffix _DUP_mpr.txt -v 1
     </param>
     <output>
-      <stat>&OUTPUT_DIR;/gsid2mpr/diag_conv_ges.mem001_DUP_mpr.txt</stat>
+      <stat>&OUTPUT_DIR;/gsi_tools/gsid2mpr/diag_conv_ges.mem001_DUP_mpr.txt</stat>
     </output>
   </test>
 
@@ -51,13 +51,13 @@
     <param> \
       &INPUT_DIR;/gsi_data/GSIdiags4EnKF/diag_amsua_n18_ges.mem001 \
       &INPUT_DIR;/gsi_data/GSIdiags4EnKF/diag_amsua_n18_ges.mem002 \
-      -outdir &OUTPUT_DIR;/gsid2mpr \
+      -outdir &OUTPUT_DIR;/gsi_tools/gsid2mpr \
       -suffix _mpr.txt \
       -swap -v 1
     </param>
     <output>
-      <stat>&OUTPUT_DIR;/gsid2mpr/diag_amsua_n18_ges.mem001_mpr.txt</stat>
-      <stat>&OUTPUT_DIR;/gsid2mpr/diag_amsua_n18_ges.mem002_mpr.txt</stat>
+      <stat>&OUTPUT_DIR;/gsi_tools/gsid2mpr/diag_amsua_n18_ges.mem001_mpr.txt</stat>
+      <stat>&OUTPUT_DIR;/gsi_tools/gsid2mpr/diag_amsua_n18_ges.mem002_mpr.txt</stat>
     </output>
   </test>
 
@@ -66,11 +66,11 @@
     <exec>&MET_BIN;/gsidens2orank</exec>
     <param> \
       &INPUT_DIR;/gsi_data/GSIdiags4EnKF/diag_conv_ges.mem* \
-      -out &OUTPUT_DIR;/gsidens2orank/diag_conv_ges_no_mean_orank.txt \
+      -out &OUTPUT_DIR;/gsi_tools/gsidens2orank/diag_conv_ges_no_mean_orank.txt \
       -swap -v 1
     </param>
     <output>
-      <stat>&OUTPUT_DIR;/gsidens2orank/diag_conv_ges_no_mean_orank.txt</stat>
+      <stat>&OUTPUT_DIR;/gsi_tools/gsidens2orank/diag_conv_ges_no_mean_orank.txt</stat>
     </output>
   </test>
 
@@ -80,11 +80,11 @@
     <param> \
       &INPUT_DIR;/gsi_data/GSIdiags4EnKF/diag_conv_ges.mem* \
       -ens_mean &INPUT_DIR;/gsi_data/GSIdiags4EnKF/diag_conv_ges.ensmean \
-      -out &OUTPUT_DIR;/gsidens2orank/diag_conv_ges_ens_mean_orank.txt \
+      -out &OUTPUT_DIR;/gsi_tools/gsidens2orank/diag_conv_ges_ens_mean_orank.txt \
       -swap -v 1
     </param>
     <output>
-      <stat>&OUTPUT_DIR;/gsidens2orank/diag_conv_ges_ens_mean_orank.txt</stat>
+      <stat>&OUTPUT_DIR;/gsi_tools/gsidens2orank/diag_conv_ges_ens_mean_orank.txt</stat>
     </output>
   </test>
 
@@ -93,11 +93,11 @@
     <exec>&MET_BIN;/gsidens2orank</exec>
     <param> \
       &INPUT_DIR;/gsi_data/GSIdiags4EnKF/diag_amsua_n18_ges.mem* \
-      -out &OUTPUT_DIR;/gsidens2orank/diag_amsua_n18_ges_all_channels_orank.txt \
+      -out &OUTPUT_DIR;/gsi_tools/gsidens2orank/diag_amsua_n18_ges_all_channels_orank.txt \
       -swap -v 1
     </param>
     <output>
-      <stat>&OUTPUT_DIR;/gsidens2orank/diag_amsua_n18_ges_all_channels_orank.txt</stat>
+      <stat>&OUTPUT_DIR;/gsi_tools/gsidens2orank/diag_amsua_n18_ges_all_channels_orank.txt</stat>
     </output>
   </test>
 
@@ -108,11 +108,11 @@
       &INPUT_DIR;/gsi_data/GSIdiags4EnKF/diag_amsua_n18_ges.mem* \
       -ens_mean &INPUT_DIR;/gsi_data/GSIdiags4EnKF/diag_amsua_n18_ges.ensmean \
       -channel 2,7,10 \
-      -out &OUTPUT_DIR;/gsidens2orank/diag_amsua_n18_ges_some_channels_orank.txt \
+      -out &OUTPUT_DIR;/gsi_tools/gsidens2orank/diag_amsua_n18_ges_some_channels_orank.txt \
       -swap -v 1
     </param>
     <output>
-      <stat>&OUTPUT_DIR;/gsidens2orank/diag_amsua_n18_ges_some_channels_orank.txt</stat>
+      <stat>&OUTPUT_DIR;/gsi_tools/gsidens2orank/diag_amsua_n18_ges_some_channels_orank.txt</stat>
     </output>
   </test>
 
@@ -120,14 +120,14 @@
   <test name="stat_analysis_MPR_TO_CNT">
     <exec>&MET_BIN;/stat_analysis</exec>
     <param> \
-      -lookin &OUTPUT_DIR;/gsid2mpr/diag_conv_ges.mem001.stat \
+      -lookin &OUTPUT_DIR;/gsi_tools/gsid2mpr/diag_conv_ges.mem001.stat \
       -job aggregate_stat -line_type MPR -out_line_type CNT -by fcst_var \
       -column_thresh ANLY_USE ==1 \
-      -out_stat &OUTPUT_DIR;/gsid2mpr/diag_conv_ges.mem001_cnt.txt \
+      -out_stat &OUTPUT_DIR;/gsi_tools/gsid2mpr/diag_conv_ges.mem001_cnt.txt \
       -v 1
     </param>
     <output>
-      <stat>&OUTPUT_DIR;/gsid2mpr/diag_conv_ges.mem001_cnt.txt</stat>
+      <stat>&OUTPUT_DIR;/gsi_tools/gsid2mpr/diag_conv_ges.mem001_cnt.txt</stat>
     </output>
   </test>
 
@@ -135,14 +135,14 @@
   <test name="stat_analysis_ORANK_TO_RHIST">
     <exec>&MET_BIN;/stat_analysis</exec>
     <param> \
-      -lookin &OUTPUT_DIR;/gsidens2orank/diag_conv_ges_ens_mean_orank.txt \
+      -lookin &OUTPUT_DIR;/gsi_tools/gsidens2orank/diag_conv_ges_ens_mean_orank.txt \
       -job aggregate_stat -line_type ORANK -out_line_type RHIST -by fcst_var \
       -column_thresh N_USE ==20 \
-      -out_stat &OUTPUT_DIR;/gsidens2orank/diag_conv_ges_ens_mean_rhist.txt \
+      -out_stat &OUTPUT_DIR;/gsi_tools/gsidens2orank/diag_conv_ges_ens_mean_rhist.txt \
       -v 1
     </param>
     <output>
-      <stat>&OUTPUT_DIR;/gsidens2orank/diag_conv_ges_ens_mean_rhist.txt</stat>
+      <stat>&OUTPUT_DIR;/gsi_tools/gsidens2orank/diag_conv_ges_ens_mean_rhist.txt</stat>
     </output>
   </test>
 
@@ -150,14 +150,14 @@
   <test name="stat_analysis_ORANK_TO_SSVAR">
     <exec>&MET_BIN;/stat_analysis</exec>
     <param> \
-      -lookin &OUTPUT_DIR;/gsidens2orank/diag_conv_ges_ens_mean_orank.txt \
+      -lookin &OUTPUT_DIR;/gsi_tools/gsidens2orank/diag_conv_ges_ens_mean_orank.txt \
       -job aggregate_stat -line_type ORANK -out_line_type SSVAR -by fcst_var \
       -column_thresh N_USE ==20 -out_bin_size 0.10 \
-      -out_stat &OUTPUT_DIR;/gsidens2orank/diag_conv_ges_ens_mean_ssvar.txt \
+      -out_stat &OUTPUT_DIR;/gsi_tools/gsidens2orank/diag_conv_ges_ens_mean_ssvar.txt \
       -v 1
     </param>
     <output>
-      <stat>&OUTPUT_DIR;/gsidens2orank/diag_conv_ges_ens_mean_ssvar.txt</stat>
+      <stat>&OUTPUT_DIR;/gsi_tools/gsidens2orank/diag_conv_ges_ens_mean_ssvar.txt</stat>
     </output>
   </test>
 
diff --git a/test/xml/unit_hira.xml b/test/xml/unit_hira.xml
index 696199ce98..13d9888216 100644
--- a/test/xml/unit_hira.xml
+++ b/test/xml/unit_hira.xml
@@ -10,6 +10,8 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: unit_ascii2nc.xml -->
+
 <met_test>
 
   <!--                                    -->
diff --git a/test/xml/unit_interp_shape.xml b/test/xml/unit_interp_shape.xml
index 962adf2a6e..be8aba9bd3 100644
--- a/test/xml/unit_interp_shape.xml
+++ b/test/xml/unit_interp_shape.xml
@@ -10,6 +10,8 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: None -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
diff --git a/test/xml/unit_ioda2nc.xml b/test/xml/unit_ioda2nc.xml
index b519a08d4d..91f2a7cbb4 100644
--- a/test/xml/unit_ioda2nc.xml
+++ b/test/xml/unit_ioda2nc.xml
@@ -12,49 +12,12 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: None -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
   <exit_on_fail>true</exit_on_fail>
-<!--
-  <test name="ioda2nc_mask_grid_G212">
-    <exec>&MET_BIN;/ioda2nc</exec>
-    <env>
-      <pair><name>STATION_ID</name>   <value></value></pair>
-      <pair><name>MASK_GRID</name>    <value>G212</value></pair>
-      <pair><name>MASK_POLY</name>    <value></value></pair>
-      <pair><name>MESSAGE_TYPE</name> <value></value></pair>
-    </env>
-    <param> \
-      &DATA_DIR_OBS;/ioda/odb_sonde_16019.nc4 \
-      &OUTPUT_DIR;/ioda2nc/odb_sonde_16019.g212.nc \
-      -config &CONFIG_DIR;/IODA2NCConfig_mask \
-      -v 2
-    </param>
-    <output>
-      <point_nc>&OUTPUT_DIR;/ioda2nc/odb_sonde_16019.g212.nc</point_nc>
-    </output>
-  </test>
-
-  <test name="ioda2nc_mask_poly_conus">
-    <exec>&MET_BIN;/ioda2nc</exec>
-    <env>
-      <pair><name>STATION_ID</name>   <value></value></pair>
-      <pair><name>MASK_GRID</name>    <value></value></pair>
-      <pair><name>MASK_POLY</name>    <value>MET_BASE/poly/CONUS.poly</value></pair>
-      <pair><name>MESSAGE_TYPE</name> <value></value></pair>
-    </env>
-    <param> \
-      &DATA_DIR_OBS;/ioda/odb_sonde_16019.nc4 \
-      &OUTPUT_DIR;/ioda2nc/odb_sonde_16019.mask_poly.nc \
-      -config &CONFIG_DIR;/IODA2NCConfig_mask \
-      -v 2
-    </param>
-    <output>
-      <point_nc>&OUTPUT_DIR;/ioda2nc/odb_sonde_16019.mask_poly.nc</point_nc>
-    </output>
-  </test>
--->
 
   <test name="ioda2nc_mask_sid_list">
     <exec>&MET_BIN;/ioda2nc</exec>
diff --git a/test/xml/unit_lidar2nc.xml b/test/xml/unit_lidar2nc.xml
index dc46dab4bc..4fedf5c895 100644
--- a/test/xml/unit_lidar2nc.xml
+++ b/test/xml/unit_lidar2nc.xml
@@ -10,6 +10,8 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: None -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
diff --git a/test/xml/unit_madis2nc.xml b/test/xml/unit_madis2nc.xml
index 802eebc3c7..550b793ff0 100644
--- a/test/xml/unit_madis2nc.xml
+++ b/test/xml/unit_madis2nc.xml
@@ -11,6 +11,8 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: None -->
+
 <met_test>
 
   <!-- MADIS data can be retrieved from the NOAA JET machine here:
diff --git a/test/xml/unit_met_test_scripts.xml b/test/xml/unit_met_test_scripts.xml
index 1d73214f86..80d05f9877 100644
--- a/test/xml/unit_met_test_scripts.xml
+++ b/test/xml/unit_met_test_scripts.xml
@@ -13,6 +13,8 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: None -->
+
 <met_test>
 
   <!--                                                                  -->
diff --git a/test/xml/unit_mode.xml b/test/xml/unit_mode.xml
index 113eac7934..c13e74676f 100644
--- a/test/xml/unit_mode.xml
+++ b/test/xml/unit_mode.xml
@@ -11,24 +11,13 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: unit_pcp_combine.xml -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
   <exit_on_fail>true</exit_on_fail>
 
-  <test name="pcp_combine_GRIB1_SUBTRACT">
-    <exec>&MET_BIN;/pcp_combine</exec>
-    <param> \
-      -subtract \
-      &DATA_DIR_MODEL;/grib1/arw-tom-gep0/arw-tom-gep0_2012040912_F030.grib 30 \
-      &DATA_DIR_MODEL;/grib1/arw-tom-gep0/arw-tom-gep0_2012040912_F024.grib 24 \
-      &OUTPUT_DIR;/pcp_combine/arw-tom-gep0_2012040912_F030_APCP06.nc
-    </param>
-    <output>
-      <grid_nc>&OUTPUT_DIR;/pcp_combine/arw-tom-gep0_2012040912_F030_APCP06.nc</grid_nc>
-    </output>
-  </test>
-
   <test name="mode_NO_MATCH_MERGE">
     <exec>&MET_BIN;/mode</exec>
     <env>
@@ -125,27 +114,6 @@
     </output>
   </test>
 
-<!-- Disabling the mode_CUT_LINE test which causes random failures in the nightly build 
- <test name="mode_CUT_LINE">
-    <exec>&MET_BIN;/mode</exec>
-    <env>
-      <pair><name>OUTPUT_PREFIX</name>  <value>CUT_LINE</value></pair>
-    </env>
-    <param> \
-      &DATA_DIR_MODEL;/mode_cut_line/latlon_test.nc \
-      &DATA_DIR_MODEL;/mode_cut_line/latlon_test.nc \
-      &CONFIG_DIR;/MODEConfig_cut_line \
-      -outdir &OUTPUT_DIR;/mode -v 3
-    </param>
-    <output>
-      <stat>&OUTPUT_DIR;/mode/mode_CUT_LINE_120000L_20131001_120000V_120000A_cts.txt</stat>
-      <stat>&OUTPUT_DIR;/mode/mode_CUT_LINE_120000L_20131001_120000V_120000A_obj.txt</stat>
-      <exist>&OUTPUT_DIR;/mode/mode_CUT_LINE_120000L_20131001_120000V_120000A_obj.nc</exist>
-      <ps>&OUTPUT_DIR;/mode/mode_CUT_LINE_120000L_20131001_120000V_120000A.ps</ps>
-    </output>
-  </test>
--->
-
   <test name="mode_QUILT">
     <exec>&MET_BIN;/mode</exec>
     <env>
diff --git a/test/xml/unit_mode_analysis.xml b/test/xml/unit_mode_analysis.xml
index 12bb7b871c..f0815df484 100644
--- a/test/xml/unit_mode_analysis.xml
+++ b/test/xml/unit_mode_analysis.xml
@@ -10,13 +10,13 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: unit_mode.xml -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
   <exit_on_fail>true</exit_on_fail>
 
-  <!--  depends on unit_mode.xml  -->
-
   <test name="mode_analysis_BYCASE_SIMPLE">
     <exec>&MET_BIN;/mode_analysis</exec>
     <param> \
diff --git a/test/xml/unit_mode_graphics.xml b/test/xml/unit_mode_graphics.xml
index 824ba86907..485d4fe22e 100644
--- a/test/xml/unit_mode_graphics.xml
+++ b/test/xml/unit_mode_graphics.xml
@@ -10,54 +10,13 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
-<!--  depends on unit_mode.xml and unit_met_test_scripts.xml -->
+<!-- Requires: unit_met_test_scripts.xml -->
 
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
   <exit_on_fail>true</exit_on_fail>
 
-<!-- Disabling the mode CUT LINE test which causes random failures in the nightly build
-  <test name="mode_graphics_PLOT_FCST_RAW">
-    <exec>&MET_BIN;/plot_mode_field</exec>
-    <param> \
-      -raw \
-      -fcst \
-      -config &CONFIG_DIR;/PlotModeFieldConfig \
-      &OUTPUT_DIR;/mode/mode_CUT_LINE_120000L_20131001_120000V_120000A_obj.nc
-    </param>
-    <output>
-      <exist>&OUTPUT_DIR;/plot_mode_field/mode_CUT_LINE_120000L_20131001_120000V_120000A_obj_fcst_raw.png</exist>
-    </output>
-  </test>
-
-  <test name="mode_graphics_PLOT_FCST_SIMPLE_OBJ">
-    <exec>&MET_BIN;/plot_mode_field</exec>
-    <param> \
-      -simple \
-      -fcst \
-      -config &CONFIG_DIR;/PlotModeFieldConfig \
-      &OUTPUT_DIR;/mode/mode_CUT_LINE_120000L_20131001_120000V_120000A_obj.nc
-    </param>
-    <output>
-      <exist>&OUTPUT_DIR;/plot_mode_field/mode_CUT_LINE_120000L_20131001_120000V_120000A_obj_fcst_simple.png</exist>
-    </output>
-  </test>
-
-  <test name="mode_graphics_PLOT_FCST_COMPOSITE_OBJ">
-    <exec>&MET_BIN;/plot_mode_field</exec>
-    <param> \
-      -cluster \
-      -fcst \
-      -config &CONFIG_DIR;/PlotModeFieldConfig \
-      &OUTPUT_DIR;/mode/mode_CUT_LINE_120000L_20131001_120000V_120000A_obj.nc
-    </param>
-    <output>
-      <exist>&OUTPUT_DIR;/plot_mode_field/mode_CUT_LINE_120000L_20131001_120000V_120000A_obj_fcst_cluster.png</exist>
-    </output>
-  </test>
--->
-
   <test name="mode_graphics_PLOT_MULTIPLE">
     <exec>&MET_BIN;/plot_mode_field</exec>
     <param> \
@@ -67,9 +26,9 @@
       &OUTPUT_DIR;/met_test_scripts/mode/mode_*_obj.nc
     </param>
     <output>
-      <exist>&OUTPUT_DIR;/plot_mode_field/mode_120000L_20050807_120000V_000000A_obj_obs_simple.png</exist>
-      <exist>&OUTPUT_DIR;/plot_mode_field/mode_120000L_20050807_120000V_120000A_obj_obs_simple.png</exist>
-      <exist>&OUTPUT_DIR;/plot_mode_field/mode_240000L_20050808_000000V_240000A_obj_obs_simple.png</exist>
+      <exist>&OUTPUT_DIR;/mode_graphics/mode_120000L_20050807_120000V_000000A_obj_obs_simple.png</exist>
+      <exist>&OUTPUT_DIR;/mode_graphics/mode_120000L_20050807_120000V_120000A_obj_obs_simple.png</exist>
+      <exist>&OUTPUT_DIR;/mode_graphics/mode_240000L_20050808_000000V_240000A_obj_obs_simple.png</exist>
     </output>
   </test>
 
diff --git a/test/xml/unit_modis.xml b/test/xml/unit_modis.xml
index d5e1faf2a7..3f28d132e5 100644
--- a/test/xml/unit_modis.xml
+++ b/test/xml/unit_modis.xml
@@ -15,6 +15,8 @@
 
 ]>
 
+<!-- Requires: None -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
diff --git a/test/xml/unit_mtd.xml b/test/xml/unit_mtd.xml
index 0190dd2080..367bc6991a 100644
--- a/test/xml/unit_mtd.xml
+++ b/test/xml/unit_mtd.xml
@@ -9,6 +9,8 @@
   <!ENTITY DATA_DIR       "&INPUT_DIR;/mtd">
 ]>
 
+<!-- Requires: None -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
diff --git a/test/xml/unit_netcdf.xml b/test/xml/unit_netcdf.xml
index b0e6e2fe48..5c0b255240 100644
--- a/test/xml/unit_netcdf.xml
+++ b/test/xml/unit_netcdf.xml
@@ -10,10 +10,12 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: None -->
+
 <!--
   Note:
     the compression test: the output filename should have the same length
-                          by appendinfg '_' for the file size comparison.
+                          by appending '_' for the file size comparison.
 -->
 
 <met_test>
diff --git a/test/xml/unit_obs_summary.xml b/test/xml/unit_obs_summary.xml
index eb150fdaf1..eb98b3099b 100644
--- a/test/xml/unit_obs_summary.xml
+++ b/test/xml/unit_obs_summary.xml
@@ -10,9 +10,9 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
-<met_test>
+<!-- Requires: unit_ascii2nc.xml -->
 
-  <!--  Depends on unit_ascii2nc to generate dup_test.nc obs file -->
+<met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
   <exit_on_fail>false</exit_on_fail>
@@ -21,11 +21,11 @@
     <exec>&MET_BIN;/ascii2nc</exec>
     <param> \
     &DATA_DIR_OBS;/ascii/obs_sum_test_qty.txt \
-    &OUTPUT_DIR;/ascii2nc/obs_sum_test.nc \
+    &OUTPUT_DIR;/obs_summary/obs_sum_test.nc \
     -v 1
     </param>
     <output>
-      <point_nc>&OUTPUT_DIR;/ascii2nc/obs_sum_test.nc</point_nc>
+      <point_nc>&OUTPUT_DIR;/obs_summary/obs_sum_test.nc</point_nc>
     </output>
   </test>
   
@@ -38,13 +38,13 @@
     </env>
     <param> \
       &DATA_DIR_MODEL;/grib2/nam/nam_2012040900_F012.grib2 \
-      &OUTPUT_DIR;/ascii2nc/obs_sum_test.nc \
+      &OUTPUT_DIR;/obs_summary/obs_sum_test.nc \
       &CONFIG_DIR;/PointStatConfig_obs_summary \
-      -outdir &OUTPUT_DIR;/point_stat -v 3
+      -outdir &OUTPUT_DIR;/obs_summary -v 3
     </param>   
     <output>
-      <stat>&OUTPUT_DIR;/point_stat/point_stat_OS_NONE_120000L_20120409_120000V.stat</stat>
-      <stat>&OUTPUT_DIR;/point_stat/point_stat_OS_NONE_120000L_20120409_120000V_mpr.txt</stat>
+      <stat>&OUTPUT_DIR;/obs_summary/point_stat_OS_NONE_120000L_20120409_120000V.stat</stat>
+      <stat>&OUTPUT_DIR;/obs_summary/point_stat_OS_NONE_120000L_20120409_120000V_mpr.txt</stat>
     </output>
   </test>
 
@@ -57,13 +57,13 @@
     </env>
     <param> \
       &DATA_DIR_MODEL;/grib2/nam/nam_2012040900_F012.grib2 \
-      &OUTPUT_DIR;/ascii2nc/obs_sum_test.nc \
+      &OUTPUT_DIR;/obs_summary/obs_sum_test.nc \
       &CONFIG_DIR;/PointStatConfig_obs_summary \
-      -outdir &OUTPUT_DIR;/point_stat -v 3
+      -outdir &OUTPUT_DIR;/obs_summary -v 3
     </param>   
     <output>
-      <stat>&OUTPUT_DIR;/point_stat/point_stat_OS_NEAREST_120000L_20120409_120000V.stat</stat>
-      <stat>&OUTPUT_DIR;/point_stat/point_stat_OS_NEAREST_120000L_20120409_120000V_mpr.txt</stat>
+      <stat>&OUTPUT_DIR;/obs_summary/point_stat_OS_NEAREST_120000L_20120409_120000V.stat</stat>
+      <stat>&OUTPUT_DIR;/obs_summary/point_stat_OS_NEAREST_120000L_20120409_120000V_mpr.txt</stat>
     </output>
   </test>
 
@@ -76,13 +76,13 @@
     </env>
     <param> \
       &DATA_DIR_MODEL;/grib2/nam/nam_2012040900_F012.grib2 \
-      &OUTPUT_DIR;/ascii2nc/obs_sum_test.nc \
+      &OUTPUT_DIR;/obs_summary/obs_sum_test.nc \
       &CONFIG_DIR;/PointStatConfig_obs_summary \
-      -outdir &OUTPUT_DIR;/point_stat -v 3
+      -outdir &OUTPUT_DIR;/obs_summary -v 3
     </param>   
     <output>
-      <stat>&OUTPUT_DIR;/point_stat/point_stat_OS_MIN_120000L_20120409_120000V.stat</stat>
-      <stat>&OUTPUT_DIR;/point_stat/point_stat_OS_MIN_120000L_20120409_120000V_mpr.txt</stat>
+      <stat>&OUTPUT_DIR;/obs_summary/point_stat_OS_MIN_120000L_20120409_120000V.stat</stat>
+      <stat>&OUTPUT_DIR;/obs_summary/point_stat_OS_MIN_120000L_20120409_120000V_mpr.txt</stat>
     </output>
   </test>
 
@@ -95,13 +95,13 @@
     </env>
     <param> \
       &DATA_DIR_MODEL;/grib2/nam/nam_2012040900_F012.grib2 \
-      &OUTPUT_DIR;/ascii2nc/obs_sum_test.nc \
+      &OUTPUT_DIR;/obs_summary/obs_sum_test.nc \
       &CONFIG_DIR;/PointStatConfig_obs_summary \
-      -outdir &OUTPUT_DIR;/point_stat -v 3
+      -outdir &OUTPUT_DIR;/obs_summary -v 3
     </param>   
     <output>
-      <stat>&OUTPUT_DIR;/point_stat/point_stat_OS_MAX_120000L_20120409_120000V.stat</stat>
-      <stat>&OUTPUT_DIR;/point_stat/point_stat_OS_MAX_120000L_20120409_120000V_mpr.txt</stat>
+      <stat>&OUTPUT_DIR;/obs_summary/point_stat_OS_MAX_120000L_20120409_120000V.stat</stat>
+      <stat>&OUTPUT_DIR;/obs_summary/point_stat_OS_MAX_120000L_20120409_120000V_mpr.txt</stat>
     </output>
   </test>
 
@@ -114,13 +114,13 @@
     </env>
     <param> \
       &DATA_DIR_MODEL;/grib2/nam/nam_2012040900_F012.grib2 \
-      &OUTPUT_DIR;/ascii2nc/obs_sum_test.nc \
+      &OUTPUT_DIR;/obs_summary/obs_sum_test.nc \
       &CONFIG_DIR;/PointStatConfig_obs_summary \
-      -outdir &OUTPUT_DIR;/point_stat -v 3
+      -outdir &OUTPUT_DIR;/obs_summary -v 3
     </param>   
     <output>
-      <stat>&OUTPUT_DIR;/point_stat/point_stat_OS_UW_MEAN_120000L_20120409_120000V.stat</stat>
-      <stat>&OUTPUT_DIR;/point_stat/point_stat_OS_UW_MEAN_120000L_20120409_120000V_mpr.txt</stat>
+      <stat>&OUTPUT_DIR;/obs_summary/point_stat_OS_UW_MEAN_120000L_20120409_120000V.stat</stat>
+      <stat>&OUTPUT_DIR;/obs_summary/point_stat_OS_UW_MEAN_120000L_20120409_120000V_mpr.txt</stat>
     </output>
   </test>
   
@@ -133,13 +133,13 @@
     </env>
     <param> \
       &DATA_DIR_MODEL;/grib2/nam/nam_2012040900_F012.grib2 \
-      &OUTPUT_DIR;/ascii2nc/obs_sum_test.nc \
+      &OUTPUT_DIR;/obs_summary/obs_sum_test.nc \
       &CONFIG_DIR;/PointStatConfig_obs_summary \
-      -outdir &OUTPUT_DIR;/point_stat -v 3
+      -outdir &OUTPUT_DIR;/obs_summary -v 3
     </param>   
     <output>
-      <stat>&OUTPUT_DIR;/point_stat/point_stat_OS_DW_MEAN_120000L_20120409_120000V.stat</stat>
-      <stat>&OUTPUT_DIR;/point_stat/point_stat_OS_DW_MEAN_120000L_20120409_120000V_mpr.txt</stat>
+      <stat>&OUTPUT_DIR;/obs_summary/point_stat_OS_DW_MEAN_120000L_20120409_120000V.stat</stat>
+      <stat>&OUTPUT_DIR;/obs_summary/point_stat_OS_DW_MEAN_120000L_20120409_120000V_mpr.txt</stat>
     </output>
   </test>
 
@@ -152,13 +152,13 @@
     </env>
     <param> \
       &DATA_DIR_MODEL;/grib2/nam/nam_2012040900_F012.grib2 \
-      &OUTPUT_DIR;/ascii2nc/obs_sum_test.nc \
+      &OUTPUT_DIR;/obs_summary/obs_sum_test.nc \
       &CONFIG_DIR;/PointStatConfig_obs_summary \
-      -outdir &OUTPUT_DIR;/point_stat -v 3
+      -outdir &OUTPUT_DIR;/obs_summary -v 3
     </param>   
     <output>
-      <stat>&OUTPUT_DIR;/point_stat/point_stat_OS_MEDIAN_120000L_20120409_120000V.stat</stat>
-      <stat>&OUTPUT_DIR;/point_stat/point_stat_OS_MEDIAN_120000L_20120409_120000V_mpr.txt</stat>
+      <stat>&OUTPUT_DIR;/obs_summary/point_stat_OS_MEDIAN_120000L_20120409_120000V.stat</stat>
+      <stat>&OUTPUT_DIR;/obs_summary/point_stat_OS_MEDIAN_120000L_20120409_120000V_mpr.txt</stat>
     </output>
   </test>
 
@@ -171,13 +171,13 @@
     </env>
     <param> \
       &DATA_DIR_MODEL;/grib2/nam/nam_2012040900_F012.grib2 \
-      &OUTPUT_DIR;/ascii2nc/obs_sum_test.nc \
+      &OUTPUT_DIR;/obs_summary/obs_sum_test.nc \
       &CONFIG_DIR;/PointStatConfig_obs_summary \
-      -outdir &OUTPUT_DIR;/point_stat -v 3
+      -outdir &OUTPUT_DIR;/obs_summary -v 3
     </param>   
     <output>
-      <stat>&OUTPUT_DIR;/point_stat/point_stat_OS_PERC_120000L_20120409_120000V.stat</stat>
-      <stat>&OUTPUT_DIR;/point_stat/point_stat_OS_PERC_120000L_20120409_120000V_mpr.txt</stat>
+      <stat>&OUTPUT_DIR;/obs_summary/point_stat_OS_PERC_120000L_20120409_120000V.stat</stat>
+      <stat>&OUTPUT_DIR;/obs_summary/point_stat_OS_PERC_120000L_20120409_120000V_mpr.txt</stat>
     </output>
   </test>
 
@@ -188,13 +188,13 @@
     </env>
     <param> \
       &DATA_DIR_MODEL;/grib2/nam/nam_2012040900_F012.grib2 \
-      &OUTPUT_DIR;/ascii2nc/obs_sum_test.nc \
+      &OUTPUT_DIR;/obs_summary/obs_sum_test.nc \
       &CONFIG_DIR;/PointStatConfig_obs_summary_all \
-      -outdir &OUTPUT_DIR;/point_stat -v 3
+      -outdir &OUTPUT_DIR;/obs_summary -v 3
     </param>   
     <output>
-      <stat>&OUTPUT_DIR;/point_stat/point_stat_OS_UNIQUE_ALL_120000L_20120409_120000V.stat</stat>
-      <stat>&OUTPUT_DIR;/point_stat/point_stat_OS_UNIQUE_ALL_120000L_20120409_120000V_mpr.txt</stat>
+      <stat>&OUTPUT_DIR;/obs_summary/point_stat_OS_UNIQUE_ALL_120000L_20120409_120000V.stat</stat>
+      <stat>&OUTPUT_DIR;/obs_summary/point_stat_OS_UNIQUE_ALL_120000L_20120409_120000V_mpr.txt</stat>
     </output>
   </test>
   
diff --git a/test/xml/unit_pb2nc.xml b/test/xml/unit_pb2nc.xml
index 3c7c6175fb..d6d79def22 100644
--- a/test/xml/unit_pb2nc.xml
+++ b/test/xml/unit_pb2nc.xml
@@ -12,6 +12,8 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: None -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
diff --git a/test/xml/unit_pcp_combine.xml b/test/xml/unit_pcp_combine.xml
index 6d44e95b9b..4a1c39b76b 100644
--- a/test/xml/unit_pcp_combine.xml
+++ b/test/xml/unit_pcp_combine.xml
@@ -10,6 +10,8 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: None -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
@@ -140,6 +142,19 @@
     </output>
   </test>
 
+  <test name="pcp_combine_sub_GRIB1_run2">
+    <exec>&MET_BIN;/pcp_combine</exec>
+    <param> \
+      -subtract \
+      &DATA_DIR_MODEL;/grib1/arw-tom-gep0/arw-tom-gep0_2012040912_F030.grib 30 \
+      &DATA_DIR_MODEL;/grib1/arw-tom-gep0/arw-tom-gep0_2012040912_F024.grib 24 \
+      &OUTPUT_DIR;/pcp_combine/arw-tom-gep0_2012040912_F030_APCP06.nc
+    </param>
+    <output>
+      <grid_nc>&OUTPUT_DIR;/pcp_combine/arw-tom-gep0_2012040912_F030_APCP06.nc</grid_nc>
+    </output>
+  </test>
+
   <test name="pcp_combine_sub_GRIB2">
     <exec>&MET_BIN;/pcp_combine</exec>
     <param> \
diff --git a/test/xml/unit_perc_thresh.xml b/test/xml/unit_perc_thresh.xml
index 893dedf3cf..366b32e3d7 100644
--- a/test/xml/unit_perc_thresh.xml
+++ b/test/xml/unit_perc_thresh.xml
@@ -12,6 +12,8 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: unit_pcp_combine.xml -->
+
 <met_test>
 
   <!--                                                                  -->
diff --git a/test/xml/unit_plot_data_plane.xml b/test/xml/unit_plot_data_plane.xml
index f7642b24c2..25d47c1397 100644
--- a/test/xml/unit_plot_data_plane.xml
+++ b/test/xml/unit_plot_data_plane.xml
@@ -11,13 +11,13 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: unit_pcp_combine.xml -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
   <exit_on_fail>true</exit_on_fail>
 
-  <!-- Depends on unit_pcp_combine.xml -->
-
   <test name="plot_data_plane_GRIB1">
     <exec>&MET_BIN;/plot_data_plane</exec>
     <param> \
diff --git a/test/xml/unit_plot_point_obs.xml b/test/xml/unit_plot_point_obs.xml
index 31e2489b72..9daac9a880 100644
--- a/test/xml/unit_plot_point_obs.xml
+++ b/test/xml/unit_plot_point_obs.xml
@@ -10,12 +10,13 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: unit_ascii2nc.xml unit_pb2nc.xml -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
   <exit_on_fail>true</exit_on_fail>
 
-  <!-- Depends on unit_pb2nc.xml and unit_ascii2nc.xml -->
   <!-- The -data_file option has been replaced by -plot_grid but is still quietly supported. -->
 
   <test name="plot_point_obs_G218">
diff --git a/test/xml/unit_plot_tc.xml b/test/xml/unit_plot_tc.xml
index c4f308adb4..d67ade00f0 100644
--- a/test/xml/unit_plot_tc.xml
+++ b/test/xml/unit_plot_tc.xml
@@ -7,9 +7,9 @@
   <!ENTITY OUTPUT_DIR     "${MET_TEST_OUTPUT}">
 ]>
 
-<met_test>
+<!-- Requires: unit_tc_pairs.xml -->
 
-  <!-- Dependency: unit_tc_pairs.xml -->
+<met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
   <exit_on_fail>true</exit_on_fail>
diff --git a/test/xml/unit_point2grid.xml b/test/xml/unit_point2grid.xml
index 1ab073e20a..dd1792ccf0 100644
--- a/test/xml/unit_point2grid.xml
+++ b/test/xml/unit_point2grid.xml
@@ -10,6 +10,8 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: unit_ascii2nc.xml unit_pb2nc.xml -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
@@ -109,12 +111,12 @@
     <param> \
       &DATA_DIR_OBS;/point_obs/prepbufr.gdas.2017060300.nc \
       G212 \
-      &OUTPUT_DIR;/regrid/pb2nc_TMP_big_input.nc \
+      &OUTPUT_DIR;/point2grid/pb2nc_TMP_big_input.nc \
       -field 'name="TMP"; level="Z2";' \
       -v 1
     </param>
     <output>
-      <grid_nc>&OUTPUT_DIR;/regrid/pb2nc_TMP_big_input.nc</grid_nc>
+      <grid_nc>&OUTPUT_DIR;/point2grid/pb2nc_TMP_big_input.nc</grid_nc>
     </output>
   </test>
 
diff --git a/test/xml/unit_point_stat.xml b/test/xml/unit_point_stat.xml
index 8750e1ee68..d5446343cd 100644
--- a/test/xml/unit_point_stat.xml
+++ b/test/xml/unit_point_stat.xml
@@ -11,6 +11,8 @@
   <!ENTITY DATA_DIR_CLIMO "&INPUT_DIR;/climatology_data">
 ]>
 
+<!-- Requires: unit_ascii2nc.xml unit_pb2nc.xml -->
+
 <met_test>
 
   <!--                                    -->
diff --git a/test/xml/unit_python.xml b/test/xml/unit_python.xml
index 35993ed441..698f550f69 100644
--- a/test/xml/unit_python.xml
+++ b/test/xml/unit_python.xml
@@ -6,7 +6,7 @@
   <!ENTITY TEST_DIR       "${MET_TEST_BASE}">
   <!ENTITY INPUT_DIR      "${MET_TEST_INPUT}">
   <!ENTITY OUTPUT_DIR     "${MET_TEST_OUTPUT}">
-  <!ENTITY MET_PYTHON_EXE "/usr/local/python3/bin/python3">
+  <!ENTITY MET_PYTHON_EXE "${MET_TEST_MET_PYTHON_EXE}">
   <!ENTITY ANACONDA_BIN   "/usr/local/anaconda3-20190923/bin">
 
   <!ENTITY CONFIG_DIR      "&TEST_DIR;/config">
@@ -15,6 +15,8 @@
   <!ENTITY DATA_DIR_OBS    "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: unit_pb2nc.xml unit_pcp_combine.xml -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
diff --git a/test/xml/unit_quality_filter.xml b/test/xml/unit_quality_filter.xml
index 912f52bda3..cbf086e4d5 100644
--- a/test/xml/unit_quality_filter.xml
+++ b/test/xml/unit_quality_filter.xml
@@ -10,16 +10,13 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: unit_pb2nc.xml unit_madis2nc.xml -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
   <exit_on_fail>true</exit_on_fail>
 
-
-  <!--                                                                 -->
-  <!--  NOTE: assumes that the madis2nc and pb2nc unit tests have run  -->
-  <!--                                                                 -->
-
   <test name="point_stat_QTY_INC_EXC_PB">
     <exec>&MET_BIN;/point_stat</exec>
     <env>
@@ -33,13 +30,13 @@
       &DATA_DIR_MODEL;/grib1/nam/nam_2012040900_F012.grib \
       &OUTPUT_DIR;/pb2nc/gdas1.20120409.t12z.prepbufr.nc \
       &CONFIG_DIR;/PointStatConfig_qty_inc_exc \
-      -outdir &OUTPUT_DIR;/point_stat -v 3
+      -outdir &OUTPUT_DIR;/quality_filter -v 3
     </param>   
     <output>
-      <stat>&OUTPUT_DIR;/point_stat/point_stat_QTY_INC_EXC_PB_120000L_20120409_120000V.stat</stat>
-      <stat>&OUTPUT_DIR;/point_stat/point_stat_QTY_INC_EXC_PB_120000L_20120409_120000V_ctc.txt</stat>
-      <stat>&OUTPUT_DIR;/point_stat/point_stat_QTY_INC_EXC_PB_120000L_20120409_120000V_sl1l2.txt</stat>
-      <stat>&OUTPUT_DIR;/point_stat/point_stat_QTY_INC_EXC_PB_120000L_20120409_120000V_mpr.txt</stat>
+      <stat>&OUTPUT_DIR;/quality_filter/point_stat_QTY_INC_EXC_PB_120000L_20120409_120000V.stat</stat>
+      <stat>&OUTPUT_DIR;/quality_filter/point_stat_QTY_INC_EXC_PB_120000L_20120409_120000V_ctc.txt</stat>
+      <stat>&OUTPUT_DIR;/quality_filter/point_stat_QTY_INC_EXC_PB_120000L_20120409_120000V_sl1l2.txt</stat>
+      <stat>&OUTPUT_DIR;/quality_filter/point_stat_QTY_INC_EXC_PB_120000L_20120409_120000V_mpr.txt</stat>
     </output>
   </test>
 
@@ -57,14 +54,14 @@
       &DATA_DIR_MODEL;/grib1/arw-tom-gep3/arw-tom-gep3_2012040900_F012.grib \
       &CONFIG_DIR;/EnsembleStatConfig_qty_inc_exc \
       -point_obs &OUTPUT_DIR;/madis2nc/metar_2012040912_F000.nc \
-      -outdir &OUTPUT_DIR;/ensemble_stat -v 3
+      -outdir &OUTPUT_DIR;/quality_filter -v 3
     </param>   
     <output>
-      <stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_INC_EXC_MADIS_VGS_20120409_120000V.stat</stat>
-      <stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_INC_EXC_MADIS_VGS_20120409_120000V_ecnt.txt</stat>
-      <stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_INC_EXC_MADIS_VGS_20120409_120000V_rhist.txt</stat>
-      <stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_INC_EXC_MADIS_VGS_20120409_120000V_orank.txt</stat>
-      <grid_nc>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_INC_EXC_MADIS_VGS_20120409_120000V_ens.nc</grid_nc>
+      <stat>&OUTPUT_DIR;/quality_filter/ensemble_stat_QTY_INC_EXC_MADIS_VGS_20120409_120000V.stat</stat>
+      <stat>&OUTPUT_DIR;/quality_filter/ensemble_stat_QTY_INC_EXC_MADIS_VGS_20120409_120000V_ecnt.txt</stat>
+      <stat>&OUTPUT_DIR;/quality_filter/ensemble_stat_QTY_INC_EXC_MADIS_VGS_20120409_120000V_rhist.txt</stat>
+      <stat>&OUTPUT_DIR;/quality_filter/ensemble_stat_QTY_INC_EXC_MADIS_VGS_20120409_120000V_orank.txt</stat>
+      <grid_nc>&OUTPUT_DIR;/quality_filter/ensemble_stat_QTY_INC_EXC_MADIS_VGS_20120409_120000V_ens.nc</grid_nc>
     </output>
   </test>
   
diff --git a/test/xml/unit_ref_config.xml b/test/xml/unit_ref_config.xml
index 648da522a9..5f9320ba5d 100644
--- a/test/xml/unit_ref_config.xml
+++ b/test/xml/unit_ref_config.xml
@@ -11,6 +11,8 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: None -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
diff --git a/test/xml/unit_regrid.xml b/test/xml/unit_regrid.xml
index 8fdc3cb7a6..512b4f0a6c 100644
--- a/test/xml/unit_regrid.xml
+++ b/test/xml/unit_regrid.xml
@@ -10,6 +10,8 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: None -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
diff --git a/test/xml/unit_rmw_analysis.xml b/test/xml/unit_rmw_analysis.xml
index f5d871e61d..14f7328957 100644
--- a/test/xml/unit_rmw_analysis.xml
+++ b/test/xml/unit_rmw_analysis.xml
@@ -6,6 +6,8 @@
   <!ENTITY CONFIG_DIR     "&TEST_DIR;/config">
 ]>
 
+<!-- Requires: unit_tc_rmw.xml -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
diff --git a/test/xml/unit_series_analysis.xml b/test/xml/unit_series_analysis.xml
index 8a1e2f7e6a..c1e64416b3 100644
--- a/test/xml/unit_series_analysis.xml
+++ b/test/xml/unit_series_analysis.xml
@@ -11,6 +11,8 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: None -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
diff --git a/test/xml/unit_shift_data_plane.xml b/test/xml/unit_shift_data_plane.xml
index 3d05e4879b..c8339e089e 100644
--- a/test/xml/unit_shift_data_plane.xml
+++ b/test/xml/unit_shift_data_plane.xml
@@ -10,6 +10,8 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: None -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
diff --git a/test/xml/unit_stat_analysis.xml b/test/xml/unit_stat_analysis.xml
index 93ef98b5bc..078b76e072 100644
--- a/test/xml/unit_stat_analysis.xml
+++ b/test/xml/unit_stat_analysis.xml
@@ -10,13 +10,13 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: unit_point_stat.xml unit_grid_stat.xml unit_wavelet_stat.xml unit_ensemble_stat.xml -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
   <exit_on_fail>true</exit_on_fail>
 
-  <!--  depends on unit_point_stat, unit_grid_stat, unit_wavelet_stat.xml, and unit_ensemble_stat.xml  -->
-
   <!--  jobs for wavelet_stat output  -->
 
   <test name="stat_analysis_AGG_RHIST">
@@ -147,7 +147,7 @@
   <test name="stat_analysis_AGG_STAT_ORANK_ECNT">
     <exec>&MET_BIN;/stat_analysis</exec>
     <param> \
-      -lookin &OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBS_ERROR_20120410_120000V.stat \
+      -lookin &OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBSERR_20120410_120000V.stat \
       -job aggregate_stat -line_type ORANK -out_line_type ECNT \
       -fcst_var APCP_24 -by VX_MASK \
       -set_hdr DESC VX_MASK \
diff --git a/test/xml/unit_tc_dland.xml b/test/xml/unit_tc_dland.xml
index baa53b8cb8..3a294af977 100644
--- a/test/xml/unit_tc_dland.xml
+++ b/test/xml/unit_tc_dland.xml
@@ -6,6 +6,8 @@
   <!ENTITY OUTPUT_DIR     "${MET_TEST_OUTPUT}">
 ]>
 
+<!-- Requires: None -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
diff --git a/test/xml/unit_tc_gen.xml b/test/xml/unit_tc_gen.xml
index 6146f1d3ec..85357e6bb3 100644
--- a/test/xml/unit_tc_gen.xml
+++ b/test/xml/unit_tc_gen.xml
@@ -9,6 +9,8 @@
   <!ENTITY DATA_DIR       "&INPUT_DIR;/tc_data">
 ]>
 
+<!-- Requires: None -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
diff --git a/test/xml/unit_tc_pairs.xml b/test/xml/unit_tc_pairs.xml
index c0e22dcf37..d35465237a 100644
--- a/test/xml/unit_tc_pairs.xml
+++ b/test/xml/unit_tc_pairs.xml
@@ -9,6 +9,8 @@
   <!ENTITY DATA_DIR       "&INPUT_DIR;/tc_data">
 ]>
 
+<!-- Requires: unit_tc_dland.xml -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
diff --git a/test/xml/unit_tc_rmw.xml b/test/xml/unit_tc_rmw.xml
index c45d71f10e..347ef88d87 100644
--- a/test/xml/unit_tc_rmw.xml
+++ b/test/xml/unit_tc_rmw.xml
@@ -9,6 +9,8 @@
   <!ENTITY DATA_DIR_MODEL "&INPUT_DIR;/model_data">
 ]>
 
+<!-- Requires: None -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
diff --git a/test/xml/unit_tc_stat.xml b/test/xml/unit_tc_stat.xml
index 7353d72f68..5029a1f9a8 100644
--- a/test/xml/unit_tc_stat.xml
+++ b/test/xml/unit_tc_stat.xml
@@ -10,6 +10,8 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/tc_data/bdeck">
 ]>
 
+<!-- Requires: unit_tc_pairs.xml -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
diff --git a/test/xml/unit_trmm2nc.xml b/test/xml/unit_trmm2nc.xml
index bbd9e136cf..0aca61588e 100644
--- a/test/xml/unit_trmm2nc.xml
+++ b/test/xml/unit_trmm2nc.xml
@@ -11,6 +11,8 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: None -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
diff --git a/test/xml/unit_wavelet_stat.xml b/test/xml/unit_wavelet_stat.xml
index 9e5f6efdd9..f1de40fa53 100644
--- a/test/xml/unit_wavelet_stat.xml
+++ b/test/xml/unit_wavelet_stat.xml
@@ -10,6 +10,8 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: unit_pcp_combine.xml -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
diff --git a/test/xml/unit_wwmca_plot.xml b/test/xml/unit_wwmca_plot.xml
index 2e2a304495..2ea1da991b 100644
--- a/test/xml/unit_wwmca_plot.xml
+++ b/test/xml/unit_wwmca_plot.xml
@@ -10,6 +10,8 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: None -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
diff --git a/test/xml/unit_wwmca_regrid.xml b/test/xml/unit_wwmca_regrid.xml
index 86e225718c..1f5b19f9be 100644
--- a/test/xml/unit_wwmca_regrid.xml
+++ b/test/xml/unit_wwmca_regrid.xml
@@ -10,6 +10,8 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: None -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>