diff --git a/test/bin/unit_test.sh b/test/bin/unit_test.sh
index a35cd064ca..fd645c3f68 100755
--- a/test/bin/unit_test.sh
+++ b/test/bin/unit_test.sh
@@ -66,6 +66,11 @@ UNIT_XML="unit_ascii2nc.xml \
           unit_tc_gen.xml \
           unit_met_test_scripts.xml  \
           unit_modis.xml  \
+          unit_ref_config_lead_00.xml \
+          unit_ref_config_lead_12.xml \
+          unit_ref_config_lead_24.xml \
+          unit_ref_config_lead_36.xml \
+          unit_ref_config_lead_48.xml \
           unit_ref_config.xml \
           unit_mode_graphics.xml \
           unit_regrid.xml \
diff --git a/test/xml/unit_ref_config.xml b/test/xml/unit_ref_config.xml
index 5f9320ba5d..0cf9a8b8f3 100644
--- a/test/xml/unit_ref_config.xml
+++ b/test/xml/unit_ref_config.xml
@@ -11,930 +11,13 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
-<!-- Requires: None -->
+<!-- Requires: unit_ref_config_lead_00.xml unit_ref_config_lead_12.xml unit_ref_config_lead_24.xml unit_ref_config_lead_36.xml unit_ref_config_lead_48.xml -->
 
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
   <exit_on_fail>true</exit_on_fail>
 
-  <!--                                                                  -->
-  <!-- Run Gen-Vx-Mask                                                  -->
-  <!--                                                                  -->
-
-  <test name="gen_vx_mask">
-    <exec>&MET_BIN;/gen_vx_mask</exec>
-    <param> \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_012.tm00 \
-      &MET_BASE;/poly/CONUS.poly \
-      &OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc \
-      -type poly -v 2
-    </param>
-    <output>
-      <grid_nc>&OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc</grid_nc>
-    </output>
-   </test>
- 
-  <!--                                                                  -->
-  <!-- Run PB2NC five times for the five lead times                     -->
-  <!--                                                                  -->
-
-  <test name="pb2nc_ndas_lead_0">-->
-   <exec>&MET_BIN;/pb2nc</exec>
-   <env>
-     <pair><name>MASK_POLY</name> <value>&CONFIG_DIR;/ref_config/RefConfig.poly</value></pair>
-   </env>
-   <param> \
-     &DATA_DIR_OBS;/ref_config/prepbufr/ndas/2011090212/ndas.t12z.prepbufr.tm12.nr  \
-     &OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110902/prepbufr.ndas.20110902.t00z.tm12.nc \
-     &CONFIG_DIR;/ref_config/PB2NCConfig \
-     -valid_beg 20110901_223000\
-     -valid_end 20110902_013000\
-     -v 2
-   </param>
-   <output>
-     <point_nc>&OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110902/prepbufr.ndas.20110902.t00z.tm12.nc</point_nc>
-   </output>
- </test>
-
-  <test name="pb2nc_ndas_lead_12">-->
-   <exec>&MET_BIN;/pb2nc</exec>
-   <env>
-     <pair><name>MASK_POLY</name> <value>&CONFIG_DIR;/ref_config/RefConfig.poly</value></pair>
-   </env>
-   <param> \
-     &DATA_DIR_OBS;/ref_config/prepbufr/ndas/2011090300/ndas.t00z.prepbufr.tm12.nr  \
-     &OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110902/prepbufr.ndas.20110902.t12z.tm12.nc \
-     &CONFIG_DIR;/ref_config/PB2NCConfig \
-     -valid_beg 20110902_103000\
-     -valid_end 20110902_133000\
-     -v 2
-   </param>
-   <output>
-     <point_nc>&OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110902/prepbufr.ndas.20110902.t12z.tm12.nc</point_nc>
-   </output>
- </test>
-
-  <test name="pb2nc_ndas_lead_24">-->
-   <exec>&MET_BIN;/pb2nc</exec>
-   <env>
-     <pair><name>MASK_POLY</name> <value>&CONFIG_DIR;/ref_config/RefConfig.poly</value></pair>
-   </env>
-   <param> \
-     &DATA_DIR_OBS;/ref_config/prepbufr/ndas/2011090312/ndas.t12z.prepbufr.tm12.nr \
-     &OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110903/prepbufr.ndas.20110903.t00z.tm12.nc \
-     &CONFIG_DIR;/ref_config/PB2NCConfig \
-     -valid_beg 20110902_223000\
-     -valid_end 20110903_013000\
-     -v 2
-   </param>
-   <output>
-     <point_nc>&OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110903/prepbufr.ndas.20110903.t00z.tm12.nc</point_nc>
-   </output>
- </test>
-
-  <test name="pb2nc_ndas_lead_36">-->
-   <exec>&MET_BIN;/pb2nc</exec>
-   <env>
-     <pair><name>MASK_POLY</name> <value>&CONFIG_DIR;/ref_config/RefConfig.poly</value></pair>
-   </env>
-   <param> \
-     &DATA_DIR_OBS;/ref_config/prepbufr/ndas/2011090400/ndas.t00z.prepbufr.tm12.nr  \
-     &OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110903/prepbufr.ndas.20110903.t12z.tm12.nc \
-     &CONFIG_DIR;/ref_config/PB2NCConfig \
-     -valid_beg 20110903_103000\
-     -valid_end 20110903_133000\
-     -v 2
-   </param>
-   <output>
-     <point_nc>&OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110903/prepbufr.ndas.20110903.t12z.tm12.nc</point_nc>
-   </output>
- </test>
-
-  <test name="pb2nc_ndas_lead_48">-->
-   <exec>&MET_BIN;/pb2nc</exec>
-   <env>
-     <pair><name>MASK_POLY</name> <value>&CONFIG_DIR;/ref_config/RefConfig.poly</value></pair>
-   </env>
-   <param> \
-     &DATA_DIR_OBS;/ref_config/prepbufr/ndas/2011090412/ndas.t12z.prepbufr.tm12.nr  \
-     &OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110904/prepbufr.ndas.20110904.t00z.tm12.nc \
-     &CONFIG_DIR;/ref_config/PB2NCConfig \
-     -valid_beg 20110903_223000\
-     -valid_end 20110904_013000\
-     -v 2
-   </param>
-   <output>
-     <point_nc>&OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110904/prepbufr.ndas.20110904.t00z.tm12.nc</point_nc>
-   </output>
- </test>
-
-  <!--                                                                                           -->
-  <!-- Run PCP-Combine for 3-hourly accumulations four times for the model and obs data          -->
-  <!-- Run PCP-Combine for 24-houly accumulation once for the model and obs data                 -->
-  <!--                                                                                           -->
-
-  <test name="pcp_combine_ST2ml_3hr_09_12">
-    <exec>&MET_BIN;/pcp_combine</exec>
-    <param> \
-      -sum \
-      00000000_000000 1 20110902_120000 3 \
-      &OUTPUT_DIR;/ref_config/pcp_combine/ST2_03h/20110902/ST2ml2011090212.03h.nc \
-      -pcpdir &DATA_DIR_OBS;/ref_config/pcp_combine/20110902
-    </param>
-    <output>
-      <grid_nc>&OUTPUT_DIR;/ref_config/pcp_combine/ST2_03h/20110902/ST2ml2011090212.03h.nc</grid_nc>
-    </output>
-  </test>
-
-  <test name="pcp_combine_ST2ml_3hr_21_24">
-    <exec>&MET_BIN;/pcp_combine</exec>
-    <param> \
-      -sum \
-      00000000_000000 1 20110903_000000 3 \
-      &OUTPUT_DIR;/ref_config/pcp_combine/ST2_03h/20110903/ST2ml2011090300.03h.nc \
-      -pcpdir &DATA_DIR_OBS;/ref_config/pcp_combine/20110902 \
-      -pcpdir &DATA_DIR_OBS;/ref_config/pcp_combine/20110903
-    </param>
-    <output>
-      <grid_nc>&OUTPUT_DIR;/ref_config/pcp_combine/ST2_03h/20110903/ST2ml2011090300.03h.nc</grid_nc>
-    </output>
-  </test>
-
-  <test name="pcp_combine_ST2ml_3hr_33_36">
-    <exec>&MET_BIN;/pcp_combine</exec>
-     <param> \
-      -sum \
-      00000000_000000 1 20110903_120000 3 \
-      &OUTPUT_DIR;/ref_config/pcp_combine/ST2_03h/20110903/ST2ml2011090312.03h.nc \
-      -pcpdir &DATA_DIR_OBS;/ref_config/pcp_combine/20110903
-    </param>
-    <output>
-      <grid_nc>&OUTPUT_DIR;/ref_config/pcp_combine/ST2_03h/20110903/ST2ml2011090312.03h.nc</grid_nc>
-    </output>
- </test>
-
-  <test name="pcp_combine_ST2ml_3hr_45_48">
-    <exec>&MET_BIN;/pcp_combine</exec>
-    <param> \
-      -sum \
-      00000000_000000 1 20110904_000000 3 \
-      &OUTPUT_DIR;/ref_config/pcp_combine/ST2_03h/20110904/ST2ml2011090400.03h.nc \
-      -pcpdir &DATA_DIR_OBS;/ref_config/pcp_combine/20110903 \
-      -pcpdir &DATA_DIR_OBS;/ref_config/pcp_combine/20110904
-    </param>
-    <output>
-      <grid_nc>&OUTPUT_DIR;/ref_config/pcp_combine/ST2_03h/20110904/ST2ml2011090400.03h.nc</grid_nc>
-    </output>
-  </test>
-
-  <test name="pcp_combine_ST2ml_24hr_12_36">
-    <exec>&MET_BIN;/pcp_combine</exec>
-    <param> \
-      -add \
-      &DATA_DIR_OBS;/ref_config/pcp_combine/2011090324/ST2ml2011090312.24h.grb \
-      24 \
-      &OUTPUT_DIR;/ref_config/pcp_combine/ST2_24h/20110903/ST2ml2011090312.24h.nc
-    </param>
-    <output>
-      <grid_nc>&OUTPUT_DIR;/ref_config/pcp_combine/ST2_24h/20110903/ST2ml2011090312.24h.nc</grid_nc>
-    </output>
-  </test>
-
-  <test name="pcp_combine_wrf_3hr_09_12">
-    <exec>&MET_BIN;/pcp_combine</exec>
-    <param> \
-      -subtract \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_012.tm00 12 \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_009.tm00 9 \      
-      &OUTPUT_DIR;/ref_config/pcp_combine/wrf/wrfpcp03_012.nc
-    </param>
-    <output>
-      <grid_nc>&OUTPUT_DIR;/ref_config/pcp_combine/wrf/wrfpcp03_012.nc</grid_nc>
-    </output>
-  </test>
-
-  <test name="pcp_combine_wrf_3hr_21_24">
-    <exec>&MET_BIN;/pcp_combine</exec>
-    <param> \
-      -subtract \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_024.tm00 24 \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_021.tm00 21 \
-      &OUTPUT_DIR;/ref_config/pcp_combine/wrf/wrfpcp03_024.nc
-    </param>
-    <output>
-      <grid_nc>&OUTPUT_DIR;/ref_config/pcp_combine/wrf/wrfpcp03_024.nc</grid_nc>
-    </output>
-  </test>
-
-  <test name="pcp_combine_wrf_3hr_33_36">
-    <exec>&MET_BIN;/pcp_combine</exec>
-    <param> \
-      -subtract \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_036.tm00 36 \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_033.tm00 33 \
-      &OUTPUT_DIR;/ref_config/pcp_combine/wrf/wrfpcp03_036.nc
-    </param>
-    <output>
-      <grid_nc>&OUTPUT_DIR;/ref_config/pcp_combine/wrf/wrfpcp03_036.nc</grid_nc>
-    </output>
-  </test>
-
-  <test name="pcp_combine_wrf_3hr_45_48">
-    <exec>&MET_BIN;/pcp_combine</exec>
-    <param> \
-      -subtract \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_048.tm00 48  \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_045.tm00 45 \
-      &OUTPUT_DIR;/ref_config/pcp_combine/wrf/wrfpcp03_048.nc
-    </param>
-    <output>
-      <grid_nc>&OUTPUT_DIR;/ref_config/pcp_combine/wrf/wrfpcp03_048.nc</grid_nc>
-    </output>
-  </test>
-
-  <test name="pcp_combine_wrf_24hr_12_36">
-    <exec>&MET_BIN;/pcp_combine</exec>
-    <param> \
-      -subtract \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_036.tm00 36 \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_012.tm00 12 \
-      &OUTPUT_DIR;/ref_config/pcp_combine/wrf/wrfpcp24_036.nc
-    </param>
-    <output>
-      <grid_nc>&OUTPUT_DIR;/ref_config/pcp_combine/wrf/wrfpcp24_036.nc</grid_nc>
-    </output>
-  </test>
-
-
-  <!--                                                                   -->
-  <!-- Run Point-Stat on the data needed to compute the GO Index         -->
-  <!--                                                                   -->
-
-  <test name="point_stat_lead_00_upper_air_AFWAv3.4_Noahv2.7.1">
-    <exec>&MET_BIN;/point_stat</exec>
-    <env>
-      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc</value></pair>
-      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv2.7.1</value></pair>
-      <pair><name>FCST_TIME</name>      <value>000</value></pair>
-    </env>
-    <param> \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv2.7.1/postprd/wrfprs_000.tm00 \
-      &OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110902/prepbufr.ndas.20110902.t00z.tm12.nc \
-      &CONFIG_DIR;/ref_config/PointStatConfig_ADPUPA \
-      -outdir &OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv2.7.1 \
-      -v 2
-     </param>   
-    <output>
-      <stat>&OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv2.7.1/point_stat_AFWAv3.4_Noahv2.7.1_F000_ADPUPA_000000L_20110902_000000V.stat</stat>
-    </output>
- </test>
-
-  <test name="point_stat_lead_00_surface_AFWAv3.4_Noahv2.7.1">
-    <exec>&MET_BIN;/point_stat</exec>
-    <env>
-      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc</value></pair>
-      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv2.7.1</value></pair>
-      <pair><name>FCST_TIME</name>      <value>000</value></pair>
-    </env>
-    <param> \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv2.7.1/postprd/wrfprs_000.tm00 \
-      &OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110902/prepbufr.ndas.20110902.t00z.tm12.nc \
-      &CONFIG_DIR;/ref_config/PointStatConfig_ONLYSF \
-      -outdir &OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv2.7.1 \
-      -v 2
-     </param>   
-    <output>
-      <stat>&OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv2.7.1/point_stat_AFWAv3.4_Noahv2.7.1_F000_ONLYSF_000000L_20110902_000000V.stat</stat>
-    </output>
- </test>
-
-  <test name="point_stat_lead_00_winds_AFWAv3.4_Noahv2.7.1">
-    <exec>&MET_BIN;/point_stat</exec>
-    <env>
-      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc</value></pair>
-      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv2.7.1</value></pair>
-      <pair><name>FCST_TIME</name>      <value>000</value></pair>
-    </env>
-    <param> \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv2.7.1/postprd/wrfprs_000.tm00 \
-      &OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110902/prepbufr.ndas.20110902.t00z.tm12.nc \
-      &CONFIG_DIR;/ref_config/PointStatConfig_WINDS \
-      -outdir &OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv2.7.1 \
-      -v 2
-     </param>   
-    <output>
-      <stat>&OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv2.7.1/point_stat_AFWAv3.4_Noahv2.7.1_F000_WINDS_000000L_20110902_000000V.stat</stat>
-    </output>
- </test>
-
-  <test name="point_stat_lead_12_upper_air_AFWAv3.4_Noahv2.7.1">
-    <exec>&MET_BIN;/point_stat</exec>
-    <env>
-      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc</value></pair>
-      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv2.7.1</value></pair>
-      <pair><name>FCST_TIME</name>      <value>012</value></pair>
-    </env>
-    <param> \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv2.7.1/postprd/wrfprs_012.tm00 \
-      &OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110902/prepbufr.ndas.20110902.t12z.tm12.nc \
-      &CONFIG_DIR;/ref_config/PointStatConfig_ADPUPA \
-      -outdir &OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv2.7.1 \
-      -v 2
-     </param>   
-    <output>
-      <stat>&OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv2.7.1/point_stat_AFWAv3.4_Noahv2.7.1_F012_ADPUPA_120000L_20110902_120000V.stat</stat>
-    </output>
- </test>
-
-  <test name="point_stat_lead_12_surface_AFWAv3.4_Noahv2.7.1">
-    <exec>&MET_BIN;/point_stat</exec>
-    <env>
-      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc</value></pair>
-      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv2.7.1</value></pair>
-      <pair><name>FCST_TIME</name>      <value>012</value></pair>
-    </env>
-    <param> \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv2.7.1/postprd/wrfprs_012.tm00 \
-      &OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110902/prepbufr.ndas.20110902.t12z.tm12.nc \
-      &CONFIG_DIR;/ref_config/PointStatConfig_ONLYSF \
-      -outdir &OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv2.7.1 \
-      -v 2
-     </param>   
-    <output>
-      <stat>&OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv2.7.1/point_stat_AFWAv3.4_Noahv2.7.1_F012_ONLYSF_120000L_20110902_120000V.stat</stat>
-    </output>
- </test>
-
-  <test name="point_stat_lead_12_winds_AFWAv3.4_Noahv2.7.1">
-    <exec>&MET_BIN;/point_stat</exec>
-    <env>
-      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc</value></pair>
-      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv2.7.1</value></pair>
-      <pair><name>FCST_TIME</name>      <value>012</value></pair>
-    </env>
-    <param> \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv2.7.1/postprd/wrfprs_012.tm00 \
-      &OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110902/prepbufr.ndas.20110902.t12z.tm12.nc \
-      &CONFIG_DIR;/ref_config/PointStatConfig_WINDS \
-      -outdir &OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv2.7.1 \
-      -v 2
-     </param>   
-    <output>
-      <stat>&OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv2.7.1/point_stat_AFWAv3.4_Noahv2.7.1_F012_WINDS_120000L_20110902_120000V.stat</stat>
-    </output>
- </test>
-
-  <test name="point_stat_lead_24_upper_air_AFWAv3.4_Noahv2.7.1">
-    <exec>&MET_BIN;/point_stat</exec>
-    <env>
-      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc</value></pair>
-      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv2.7.1</value></pair>
-      <pair><name>FCST_TIME</name>      <value>024</value></pair>
-    </env>
-    <param> \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv2.7.1/postprd/wrfprs_024.tm00 \
-      &OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110903/prepbufr.ndas.20110903.t00z.tm12.nc \
-      &CONFIG_DIR;/ref_config/PointStatConfig_ADPUPA \
-      -outdir &OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv2.7.1 \
-      -v 2
-     </param>   
-    <output>
-      <stat>&OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv2.7.1/point_stat_AFWAv3.4_Noahv2.7.1_F024_ADPUPA_240000L_20110903_000000V.stat</stat>
-    </output>
- </test>
-
-  <test name="point_stat_lead_24_surface_AFWAv3.4_Noahv2.7.1">
-    <exec>&MET_BIN;/point_stat</exec>
-    <env>
-      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc</value></pair>
-      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv2.7.1</value></pair>
-      <pair><name>FCST_TIME</name>      <value>024</value></pair>
-    </env>
-    <param> \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv2.7.1/postprd/wrfprs_024.tm00 \
-      &OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110903/prepbufr.ndas.20110903.t00z.tm12.nc \
-      &CONFIG_DIR;/ref_config/PointStatConfig_ONLYSF \
-      -outdir &OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv2.7.1 \
-      -v 2
-     </param>   
-    <output>
-      <stat>&OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv2.7.1/point_stat_AFWAv3.4_Noahv2.7.1_F024_ONLYSF_240000L_20110903_000000V.stat</stat>
-    </output>
- </test>
-
-  <test name="point_stat_lead_24_winds_AFWAv3.4_Noahv2.7.1">
-    <exec>&MET_BIN;/point_stat</exec>
-    <env>
-      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc</value></pair>
-      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv2.7.1</value></pair>
-      <pair><name>FCST_TIME</name>      <value>024</value></pair>
-    </env>
-    <param> \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv2.7.1/postprd/wrfprs_024.tm00 \
-      &OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110903/prepbufr.ndas.20110903.t00z.tm12.nc \
-      &CONFIG_DIR;/ref_config/PointStatConfig_WINDS \
-      -outdir &OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv2.7.1 \
-      -v 2
-     </param>   
-    <output>
-      <stat>&OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv2.7.1/point_stat_AFWAv3.4_Noahv2.7.1_F024_WINDS_240000L_20110903_000000V.stat</stat>
-    </output>
- </test>
-
-  <test name="point_stat_lead_36_upper_air_AFWAv3.4_Noahv2.7.1">
-    <exec>&MET_BIN;/point_stat</exec>
-    <env>
-      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc</value></pair>
-      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv2.7.1</value></pair>
-      <pair><name>FCST_TIME</name>      <value>036</value></pair>
-    </env>
-    <param> \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv2.7.1/postprd/wrfprs_036.tm00 \
-      &OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110903/prepbufr.ndas.20110903.t12z.tm12.nc \
-      &CONFIG_DIR;/ref_config/PointStatConfig_ADPUPA \
-      -outdir &OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv2.7.1 \
-      -v 2
-     </param>   
-    <output>
-      <stat>&OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv2.7.1/point_stat_AFWAv3.4_Noahv2.7.1_F036_ADPUPA_360000L_20110903_120000V.stat</stat>
-    </output>
- </test>
-
-  <test name="point_stat_lead_36_surface_AFWAv3.4_Noahv2.7.1">
-    <exec>&MET_BIN;/point_stat</exec>
-    <env>
-      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc</value></pair>
-      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv2.7.1</value></pair>
-      <pair><name>FCST_TIME</name>      <value>036</value></pair>
-    </env>
-    <param> \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv2.7.1/postprd/wrfprs_036.tm00 \
-      &OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110903/prepbufr.ndas.20110903.t12z.tm12.nc \
-      &CONFIG_DIR;/ref_config/PointStatConfig_ONLYSF \
-      -outdir &OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv2.7.1 \
-      -v 2
-     </param>   
-    <output>
-      <stat>&OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv2.7.1/point_stat_AFWAv3.4_Noahv2.7.1_F036_ONLYSF_360000L_20110903_120000V.stat</stat>
-    </output>
- </test>
-
-  <test name="point_stat_lead_36_winds_AFWAv3.4_Noahv2.7.1">
-    <exec>&MET_BIN;/point_stat</exec>
-    <env>
-      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc</value></pair>
-      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv2.7.1</value></pair>
-      <pair><name>FCST_TIME</name>      <value>036</value></pair>
-    </env>
-    <param> \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv2.7.1/postprd/wrfprs_036.tm00 \
-      &OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110903/prepbufr.ndas.20110903.t12z.tm12.nc \
-      &CONFIG_DIR;/ref_config/PointStatConfig_WINDS \
-      -outdir &OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv2.7.1 \
-      -v 2
-     </param>   
-    <output>
-      <stat>&OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv2.7.1/point_stat_AFWAv3.4_Noahv2.7.1_F036_WINDS_360000L_20110903_120000V.stat</stat>
-    </output>
- </test>
-
-  <test name="point_stat_lead_48_upper_air_AFWAv3.4_Noahv2.7.1">
-    <exec>&MET_BIN;/point_stat</exec>
-    <env>
-      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc</value></pair>
-      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv2.7.1</value></pair>
-      <pair><name>FCST_TIME</name>      <value>048</value></pair>
-    </env>
-    <param> \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv2.7.1/postprd/wrfprs_048.tm00 \
-      &OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110904/prepbufr.ndas.20110904.t00z.tm12.nc \
-      &CONFIG_DIR;/ref_config/PointStatConfig_ADPUPA \
-      -outdir &OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv2.7.1 \
-      -v 2
-     </param>   
-    <output>
-      <stat>&OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv2.7.1/point_stat_AFWAv3.4_Noahv2.7.1_F048_ADPUPA_480000L_20110904_000000V.stat</stat>
-    </output>
- </test>
-
-  <test name="point_stat_lead_48_surface_AFWAv3.4_Noahv2.7.1">
-    <exec>&MET_BIN;/point_stat</exec>
-    <env>
-      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc</value></pair>
-      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv2.7.1</value></pair>
-      <pair><name>FCST_TIME</name>      <value>048</value></pair>
-    </env>
-    <param> \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv2.7.1/postprd/wrfprs_048.tm00 \
-      &OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110904/prepbufr.ndas.20110904.t00z.tm12.nc \
-      &CONFIG_DIR;/ref_config/PointStatConfig_ONLYSF \
-      -outdir &OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv2.7.1 \
-      -v 2
-     </param>   
-    <output>
-      <stat>&OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv2.7.1/point_stat_AFWAv3.4_Noahv2.7.1_F048_ONLYSF_480000L_20110904_000000V.stat</stat>
-    </output>
- </test>
-
-  <test name="point_stat_lead_48_winds_AFWAv3.4_Noahv2.7.1">
-    <exec>&MET_BIN;/point_stat</exec>
-    <env>
-      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc</value></pair>
-      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv2.7.1</value></pair>
-      <pair><name>FCST_TIME</name>      <value>048</value></pair>
-    </env>
-    <param> \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv2.7.1/postprd/wrfprs_048.tm00 \
-      &OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110904/prepbufr.ndas.20110904.t00z.tm12.nc \
-      &CONFIG_DIR;/ref_config/PointStatConfig_WINDS \
-      -outdir &OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv2.7.1 \
-      -v 2
-     </param>   
-    <output>
-      <stat>&OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv2.7.1/point_stat_AFWAv3.4_Noahv2.7.1_F048_WINDS_480000L_20110904_000000V.stat</stat>
-    </output>
- </test>
-
-  <test name="point_stat_lead_00_upper_air_AFWAv3.4_Noahv3.3">
-    <exec>&MET_BIN;/point_stat</exec>
-    <env>
-      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc</value></pair>
-      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
-      <pair><name>FCST_TIME</name>      <value>000</value></pair>
-    </env>
-    <param> \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_000.tm00 \
-      &OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110902/prepbufr.ndas.20110902.t00z.tm12.nc \
-      &CONFIG_DIR;/ref_config/PointStatConfig_ADPUPA \
-      -outdir &OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv3.3 \
-      -v 2
-     </param>   
-    <output>
-      <stat>&OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv3.3/point_stat_AFWAv3.4_Noahv3.3_F000_ADPUPA_000000L_20110902_000000V.stat</stat>
-    </output>
- </test>
-
-  <test name="point_stat_lead_00_surface_AFWAv3.4_Noahv3.3">
-    <exec>&MET_BIN;/point_stat</exec>
-    <env>
-      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc</value></pair>
-      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
-      <pair><name>FCST_TIME</name>      <value>000</value></pair>
-    </env>
-    <param> \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_000.tm00 \
-      &OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110902/prepbufr.ndas.20110902.t00z.tm12.nc \
-      &CONFIG_DIR;/ref_config/PointStatConfig_ONLYSF \
-      -outdir &OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv3.3 \
-      -v 2
-     </param>   
-    <output>
-      <stat>&OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv3.3/point_stat_AFWAv3.4_Noahv3.3_F000_ONLYSF_000000L_20110902_000000V.stat</stat>
-    </output>
- </test>
-
-  <test name="point_stat_lead_00_winds_AFWAv3.4_Noahv3.3">
-    <exec>&MET_BIN;/point_stat</exec>
-    <env>
-      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc</value></pair>
-      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
-      <pair><name>FCST_TIME</name>      <value>000</value></pair>
-    </env>
-    <param> \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_000.tm00 \
-      &OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110902/prepbufr.ndas.20110902.t00z.tm12.nc \
-      &CONFIG_DIR;/ref_config/PointStatConfig_WINDS \
-      -outdir &OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv3.3 \
-      -v 2
-     </param>   
-    <output>
-      <stat>&OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv3.3/point_stat_AFWAv3.4_Noahv3.3_F000_WINDS_000000L_20110902_000000V.stat</stat>
-    </output>
- </test>
-
-  <test name="point_stat_lead_12_upper_air_AFWAv3.4_Noahv3.3">
-    <exec>&MET_BIN;/point_stat</exec>
-    <env>
-      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc</value></pair>
-      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
-      <pair><name>FCST_TIME</name>      <value>012</value></pair>
-    </env>
-    <param> \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_012.tm00 \
-      &OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110902/prepbufr.ndas.20110902.t12z.tm12.nc \
-      &CONFIG_DIR;/ref_config/PointStatConfig_ADPUPA \
-      -outdir &OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv3.3 \
-      -v 2
-     </param>   
-    <output>
-      <stat>&OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv3.3/point_stat_AFWAv3.4_Noahv3.3_F012_ADPUPA_120000L_20110902_120000V.stat</stat>
-    </output>
- </test>
-
-  <test name="point_stat_lead_12_surface_AFWAv3.4_Noahv3.3">
-    <exec>&MET_BIN;/point_stat</exec>
-    <env>
-      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc</value></pair>
-      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
-      <pair><name>FCST_TIME</name>      <value>012</value></pair>
-    </env>
-    <param> \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_012.tm00 \
-      &OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110902/prepbufr.ndas.20110902.t12z.tm12.nc \
-      &CONFIG_DIR;/ref_config/PointStatConfig_ONLYSF \
-      -outdir &OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv3.3 \
-      -v 2
-     </param>   
-    <output>
-      <stat>&OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv3.3/point_stat_AFWAv3.4_Noahv3.3_F012_ONLYSF_120000L_20110902_120000V.stat</stat>
-    </output>
- </test>
-
-  <test name="point_stat_lead_12_winds_AFWAv3.4_Noahv3.3">
-    <exec>&MET_BIN;/point_stat</exec>
-    <env>
-      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc</value></pair>
-      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
-      <pair><name>FCST_TIME</name>      <value>012</value></pair>
-    </env>
-    <param> \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_012.tm00 \
-      &OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110902/prepbufr.ndas.20110902.t12z.tm12.nc \
-      &CONFIG_DIR;/ref_config/PointStatConfig_WINDS \
-      -outdir &OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv3.3 \
-      -v 2
-     </param>   
-    <output>
-      <stat>&OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv3.3/point_stat_AFWAv3.4_Noahv3.3_F012_WINDS_120000L_20110902_120000V.stat</stat>
-    </output>
- </test>
-
-  <test name="point_stat_lead_24_upper_air_AFWAv3.4_Noahv3.3">
-    <exec>&MET_BIN;/point_stat</exec>
-    <env>
-      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc</value></pair>
-      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
-      <pair><name>FCST_TIME</name>      <value>024</value></pair>
-    </env>
-    <param> \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_024.tm00 \
-      &OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110903/prepbufr.ndas.20110903.t00z.tm12.nc \
-      &CONFIG_DIR;/ref_config/PointStatConfig_ADPUPA \
-      -outdir &OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv3.3 \
-      -v 2
-     </param>   
-    <output>
-      <stat>&OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv3.3/point_stat_AFWAv3.4_Noahv3.3_F024_ADPUPA_240000L_20110903_000000V.stat</stat>
-    </output>
- </test>
-
-  <test name="point_stat_lead_24_surface_AFWAv3.4_Noahv3.3">
-    <exec>&MET_BIN;/point_stat</exec>
-    <env>
-      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc</value></pair>
-      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
-      <pair><name>FCST_TIME</name>      <value>024</value></pair>
-    </env>
-    <param> \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_024.tm00 \
-      &OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110903/prepbufr.ndas.20110903.t00z.tm12.nc \
-      &CONFIG_DIR;/ref_config/PointStatConfig_ONLYSF \
-      -outdir &OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv3.3 \
-      -v 2
-     </param>   
-    <output>
-      <stat>&OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv3.3/point_stat_AFWAv3.4_Noahv3.3_F024_ONLYSF_240000L_20110903_000000V.stat</stat>
-    </output>
- </test>
-
-  <test name="point_stat_lead_24_winds_AFWAv3.4_Noahv3.3">
-    <exec>&MET_BIN;/point_stat</exec>
-    <env>
-      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc</value></pair>
-      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
-      <pair><name>FCST_TIME</name>      <value>024</value></pair>
-    </env>
-    <param> \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_024.tm00 \
-      &OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110903/prepbufr.ndas.20110903.t00z.tm12.nc \
-      &CONFIG_DIR;/ref_config/PointStatConfig_WINDS \
-      -outdir &OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv3.3 \
-      -v 2
-     </param>   
-    <output>
-      <stat>&OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv3.3/point_stat_AFWAv3.4_Noahv3.3_F024_WINDS_240000L_20110903_000000V.stat</stat>
-    </output>
- </test>
-
-  <test name="point_stat_lead_36_upper_air_AFWAv3.4_Noahv3.3">
-    <exec>&MET_BIN;/point_stat</exec>
-    <env>
-      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc</value></pair>
-      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
-      <pair><name>FCST_TIME</name>      <value>036</value></pair>
-    </env>
-    <param> \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_036.tm00 \
-      &OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110903/prepbufr.ndas.20110903.t12z.tm12.nc \
-      &CONFIG_DIR;/ref_config/PointStatConfig_ADPUPA \
-      -outdir &OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv3.3 \
-      -v 2
-     </param>   
-    <output>
-      <stat>&OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv3.3/point_stat_AFWAv3.4_Noahv3.3_F036_ADPUPA_360000L_20110903_120000V.stat</stat>
-    </output>
- </test>
-
-  <test name="point_stat_lead_36_surface_AFWAv3.4_Noahv3.3">
-    <exec>&MET_BIN;/point_stat</exec>
-    <env>
-      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc</value></pair>
-      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
-      <pair><name>FCST_TIME</name>      <value>036</value></pair>
-    </env>
-    <param> \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_036.tm00 \
-      &OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110903/prepbufr.ndas.20110903.t12z.tm12.nc \
-      &CONFIG_DIR;/ref_config/PointStatConfig_ONLYSF \
-      -outdir &OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv3.3 \
-      -v 2
-     </param>   
-    <output>
-      <stat>&OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv3.3/point_stat_AFWAv3.4_Noahv3.3_F036_ONLYSF_360000L_20110903_120000V.stat</stat>
-    </output>
- </test>
-
-  <test name="point_stat_lead_36_winds_AFWAv3.4_Noahv3.3">
-    <exec>&MET_BIN;/point_stat</exec>
-    <env>
-      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc</value></pair>
-      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
-      <pair><name>FCST_TIME</name>      <value>036</value></pair>
-    </env>
-    <param> \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_036.tm00 \
-      &OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110903/prepbufr.ndas.20110903.t12z.tm12.nc \
-      &CONFIG_DIR;/ref_config/PointStatConfig_WINDS \
-      -outdir &OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv3.3 \
-      -v 2
-     </param>   
-    <output>
-      <stat>&OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv3.3/point_stat_AFWAv3.4_Noahv3.3_F036_WINDS_360000L_20110903_120000V.stat</stat>
-    </output>
- </test>
-
-  <test name="point_stat_lead_48_upper_air_AFWAv3.4_Noahv3.3">
-    <exec>&MET_BIN;/point_stat</exec>
-    <env>
-      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc</value></pair>
-      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
-      <pair><name>FCST_TIME</name>      <value>048</value></pair>
-    </env>
-    <param> \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_048.tm00 \
-      &OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110904/prepbufr.ndas.20110904.t00z.tm12.nc \
-      &CONFIG_DIR;/ref_config/PointStatConfig_ADPUPA \
-      -outdir &OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv3.3 \
-      -v 2
-     </param>   
-    <output>
-      <stat>&OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv3.3/point_stat_AFWAv3.4_Noahv3.3_F048_ADPUPA_480000L_20110904_000000V.stat</stat>
-    </output>
- </test>
-
-  <test name="point_stat_lead_48_surface_AFWAv3.4_Noahv3.3">
-    <exec>&MET_BIN;/point_stat</exec>
-    <env>
-      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc</value></pair>
-      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
-      <pair><name>FCST_TIME</name>      <value>048</value></pair>
-    </env>
-    <param> \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_048.tm00 \
-      &OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110904/prepbufr.ndas.20110904.t00z.tm12.nc \
-      &CONFIG_DIR;/ref_config/PointStatConfig_ONLYSF \
-      -outdir &OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv3.3 \
-      -v 2
-     </param>   
-    <output>
-      <stat>&OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv3.3/point_stat_AFWAv3.4_Noahv3.3_F048_ONLYSF_480000L_20110904_000000V.stat</stat>
-    </output>
- </test>
-
-  <test name="point_stat_lead_48_winds_AFWAv3.4_Noahv3.3">
-    <exec>&MET_BIN;/point_stat</exec>
-    <env>
-      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc</value></pair>
-      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
-      <pair><name>FCST_TIME</name>      <value>048</value></pair>
-    </env>
-    <param> \
-      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_048.tm00 \
-      &OUTPUT_DIR;/ref_config/pb2nc/NDAS_03h/20110904/prepbufr.ndas.20110904.t00z.tm12.nc \
-      &CONFIG_DIR;/ref_config/PointStatConfig_WINDS \
-      -outdir &OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv3.3 \
-      -v 2
-     </param>   
-    <output>
-      <stat>&OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv3.3/point_stat_AFWAv3.4_Noahv3.3_F048_WINDS_480000L_20110904_000000V.stat</stat>
-    </output>
- </test>
-
-  <!--                                                                  -->
-  <!-- Run Grid-Stat four times for 3-hourly and one time for 24-hourly -->
-  <!--                                                                  -->
-
-  <test name="grid_stat_3hr_accum_time_12">
-    <exec>&MET_BIN;/grid_stat</exec>
-    <env>
-      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc</value></pair>
-      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
-      <pair><name>FCST_TIME</name>      <value>12</value></pair>
-    </env>
-    <param> \
-      &OUTPUT_DIR;/ref_config/pcp_combine/wrf/wrfpcp03_012.nc \
-      &OUTPUT_DIR;/ref_config/pcp_combine/ST2_03h/20110902/ST2ml2011090212.03h.nc \
-      &CONFIG_DIR;/ref_config/GridStatConfig_03h \
-      -outdir &OUTPUT_DIR;/ref_config/grid_stat -v 1
-    </param>   
-    <output>
-      <stat>&OUTPUT_DIR;/ref_config/grid_stat/grid_stat_AFWAv3.4_Noahv3.3_F12_03h_120000L_20110902_120000V.stat</stat>
-    </output>
-  </test>
-
-  <test name="grid_stat_3hr_accum_time_24">
-    <exec>&MET_BIN;/grid_stat</exec>
-    <env>
-      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc</value></pair>
-      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
-      <pair><name>FCST_TIME</name>      <value>24</value></pair>
-    </env>
-    <param> \
-      &OUTPUT_DIR;/ref_config/pcp_combine/wrf/wrfpcp03_024.nc \
-      &OUTPUT_DIR;/ref_config/pcp_combine/ST2_03h/20110903/ST2ml2011090300.03h.nc \
-      &CONFIG_DIR;/ref_config/GridStatConfig_03h \
-      -outdir &OUTPUT_DIR;/ref_config/grid_stat -v 1
-    </param>   
-    <output>
-      <stat>&OUTPUT_DIR;/ref_config/grid_stat/grid_stat_AFWAv3.4_Noahv3.3_F24_03h_240000L_20110903_000000V.stat</stat>
-    </output>
-  </test>
-
-  <test name="grid_stat_3hr_accum_time_36">
-    <exec>&MET_BIN;/grid_stat</exec>
-    <env>
-      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc</value></pair>
-      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
-      <pair><name>FCST_TIME</name>      <value>36</value></pair>
-    </env>
-    <param> \
-      &OUTPUT_DIR;/ref_config/pcp_combine/wrf/wrfpcp03_036.nc \
-      &OUTPUT_DIR;/ref_config/pcp_combine/ST2_03h/20110903/ST2ml2011090312.03h.nc \
-      &CONFIG_DIR;/ref_config/GridStatConfig_03h \
-      -outdir &OUTPUT_DIR;/ref_config/grid_stat -v 1
-    </param>   
-    <output>
-      <stat>&OUTPUT_DIR;/ref_config/grid_stat/grid_stat_AFWAv3.4_Noahv3.3_F36_03h_360000L_20110903_120000V.stat</stat>
-    </output>
-  </test>
-
-  <test name="grid_stat_3hr_accum_time_48">
-    <exec>&MET_BIN;/grid_stat</exec>
-    <env>
-      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc</value></pair>
-      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
-      <pair><name>FCST_TIME</name>      <value>48</value></pair>
-    </env>
-    <param> \
-      &OUTPUT_DIR;/ref_config/pcp_combine/wrf/wrfpcp03_048.nc \
-      &OUTPUT_DIR;/ref_config/pcp_combine/ST2_03h/20110904/ST2ml2011090400.03h.nc \
-      &CONFIG_DIR;/ref_config/GridStatConfig_03h \
-      -outdir &OUTPUT_DIR;/ref_config/grid_stat -v 1
-    </param>   
-    <output>
-      <stat>&OUTPUT_DIR;/ref_config/grid_stat/grid_stat_AFWAv3.4_Noahv3.3_F48_03h_480000L_20110904_000000V.stat</stat>
-    </output>
-  </test>
-
-  <test name="grid_stat_24hr_accum_time_36">
-    <exec>&MET_BIN;/grid_stat</exec>
-    <env>
-      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config/gen_vx_mask/CONUS.nc</value></pair>
-      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
-      <pair><name>FCST_TIME</name>      <value>36</value></pair>
-    </env>
-    <param> \
-      &OUTPUT_DIR;/ref_config/pcp_combine/wrf/wrfpcp24_036.nc \
-      &OUTPUT_DIR;/ref_config/pcp_combine/ST2_24h/20110903/ST2ml2011090312.24h.nc \
-      &CONFIG_DIR;/ref_config/GridStatConfig_24h \
-      -outdir &OUTPUT_DIR;/ref_config/grid_stat -v 1
-    </param>   
-    <output>
-      <stat>&OUTPUT_DIR;/ref_config/grid_stat/grid_stat_AFWAv3.4_Noahv3.3_F36_24h_360000L_20110903_120000V.stat</stat>
-    </output>
-  </test>
-
   <!--                                                                  -->
   <!-- Run STAT-Analysis once to compute the GO Index                   -->
   <!--                                                                  -->
@@ -942,8 +25,8 @@
   <test name="stat_analysis_GO_Index">
     <exec>&MET_BIN;/stat_analysis</exec>
     <param> \
-      -lookin &OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv3.3/ \
-      -lookin &OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv2.7.1/ \
+      -lookin &OUTPUT_DIR;/ref_config_lead_*/point_stat/AFWAv3.4_Noahv3.3 \
+      -lookin &OUTPUT_DIR;/ref_config_lead_*/point_stat/AFWAv3.4_Noahv2.7.1 \
       -job go_index -fcst_init_beg 2011090200 -fcst_init_end 2011090200 \
       -model AFWAv3.4_Noahv3.3 -model AFWAv3.4_Noahv2.7.1 \
       -vx_mask FULL -interp_mthd BILIN \
@@ -962,8 +45,8 @@
   <test name="stat_analysis_GO_Index_out_stat">
     <exec>&MET_BIN;/stat_analysis</exec>
     <param> \
-      -lookin &OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv3.3/ \
-      -lookin &OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv2.7.1/ \
+      -lookin &OUTPUT_DIR;/ref_config_lead_*/point_stat/AFWAv3.4_Noahv3.3 \
+      -lookin &OUTPUT_DIR;/ref_config_lead_*/point_stat/AFWAv3.4_Noahv2.7.1 \
       -job go_index \
       -by FCST_INIT_BEG,VX_MASK,OBTYPE -set_hdr DESC Noahv3.3_vs_v2.7.1 \
       -model AFWAv3.4_Noahv3.3,AFWAv3.4_Noahv2.7.1 -ss_index_vld_thresh 0.5 \
@@ -981,8 +64,8 @@
   <test name="stat_analysis_SFC_SS_Index_out">
     <exec>&MET_BIN;/stat_analysis</exec>
     <param> \
-      -lookin &OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv3.3/ \
-      -lookin &OUTPUT_DIR;/ref_config/point_stat/AFWAv3.4_Noahv2.7.1/ \
+      -lookin &OUTPUT_DIR;/ref_config_lead_*/point_stat/AFWAv3.4_Noahv3.3 \
+      -lookin &OUTPUT_DIR;/ref_config_lead_*/point_stat/AFWAv3.4_Noahv2.7.1 \
       -job ss_index -config &CONFIG_DIR;/STATAnalysisConfig_SFC_SS_Index \
       -by FCST_INIT_BEG,VX_MASK,OBTYPE \
       -out_stat &OUTPUT_DIR;/ref_config/stat_analysis/sfc_ss_index_by_option.stat
diff --git a/test/xml/unit_ref_config_lead_00.xml b/test/xml/unit_ref_config_lead_00.xml
new file mode 100644
index 0000000000..ac65be1546
--- /dev/null
+++ b/test/xml/unit_ref_config_lead_00.xml
@@ -0,0 +1,178 @@
+<?xml version="1.0"?>
+<!DOCTYPE met_test [
+  <!ENTITY MET_BASE       "${MET_BASE}">
+  <!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">
+]>
+
+<!-- Requires: None -->
+
+<met_test>
+
+  <test_dir>&TEST_DIR;</test_dir>
+  <exit_on_fail>true</exit_on_fail>
+
+  <!--                                                                  -->
+  <!-- Run Gen-Vx-Mask                                                  -->
+  <!--                                                                  -->
+
+  <test name="gen_vx_mask">
+    <exec>&MET_BIN;/gen_vx_mask</exec>
+    <param> \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_012.tm00 \
+      &MET_BASE;/poly/CONUS.poly \
+      &OUTPUT_DIR;/ref_config_lead_00/gen_vx_mask/CONUS.nc \
+      -type poly -v 2
+    </param>
+    <output>
+      <grid_nc>&OUTPUT_DIR;/ref_config_lead_00/gen_vx_mask/CONUS.nc</grid_nc>
+    </output>
+   </test>
+ 
+  <!--                                                                  -->
+  <!-- Run PB2NC for the current lead time                              -->
+  <!--                                                                  -->
+
+  <test name="pb2nc_ndas_lead_00">
+   <exec>&MET_BIN;/pb2nc</exec>
+   <env>
+     <pair><name>MASK_POLY</name> <value>&CONFIG_DIR;/ref_config/RefConfig.poly</value></pair>
+   </env>
+   <param> \
+     &DATA_DIR_OBS;/ref_config/prepbufr/ndas/2011090212/ndas.t12z.prepbufr.tm12.nr  \
+     &OUTPUT_DIR;/ref_config_lead_00/pb2nc/NDAS_03h/20110902/prepbufr.ndas.20110902.t00z.tm12.nc \
+     &CONFIG_DIR;/ref_config/PB2NCConfig \
+     -valid_beg 20110901_223000\
+     -valid_end 20110902_013000\
+     -v 2
+   </param>
+   <output>
+     <point_nc>&OUTPUT_DIR;/ref_config_lead_00/pb2nc/NDAS_03h/20110902/prepbufr.ndas.20110902.t00z.tm12.nc</point_nc>
+   </output>
+  </test>
+
+  <!--                                                                   -->
+  <!-- Run Point-Stat on the data needed to compute the GO Index         -->
+  <!--                                                                   -->
+
+  <test name="point_stat_lead_00_upper_air_AFWAv3.4_Noahv2.7.1">
+    <exec>&MET_BIN;/point_stat</exec>
+    <env>
+      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config_lead_00/gen_vx_mask/CONUS.nc</value></pair>
+      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv2.7.1</value></pair>
+      <pair><name>FCST_TIME</name>      <value>000</value></pair>
+    </env>
+    <param> \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv2.7.1/postprd/wrfprs_000.tm00 \
+      &OUTPUT_DIR;/ref_config_lead_00/pb2nc/NDAS_03h/20110902/prepbufr.ndas.20110902.t00z.tm12.nc \
+      &CONFIG_DIR;/ref_config/PointStatConfig_ADPUPA \
+      -outdir &OUTPUT_DIR;/ref_config_lead_00/point_stat/AFWAv3.4_Noahv2.7.1 \
+      -v 2
+     </param>   
+    <output>
+      <stat>&OUTPUT_DIR;/ref_config_lead_00/point_stat/AFWAv3.4_Noahv2.7.1/point_stat_AFWAv3.4_Noahv2.7.1_F000_ADPUPA_000000L_20110902_000000V.stat</stat>
+    </output>
+ </test>
+
+  <test name="point_stat_lead_00_surface_AFWAv3.4_Noahv2.7.1">
+    <exec>&MET_BIN;/point_stat</exec>
+    <env>
+      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config_lead_00/gen_vx_mask/CONUS.nc</value></pair>
+      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv2.7.1</value></pair>
+      <pair><name>FCST_TIME</name>      <value>000</value></pair>
+    </env>
+    <param> \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv2.7.1/postprd/wrfprs_000.tm00 \
+      &OUTPUT_DIR;/ref_config_lead_00/pb2nc/NDAS_03h/20110902/prepbufr.ndas.20110902.t00z.tm12.nc \
+      &CONFIG_DIR;/ref_config/PointStatConfig_ONLYSF \
+      -outdir &OUTPUT_DIR;/ref_config_lead_00/point_stat/AFWAv3.4_Noahv2.7.1 \
+      -v 2
+     </param>   
+    <output>
+      <stat>&OUTPUT_DIR;/ref_config_lead_00/point_stat/AFWAv3.4_Noahv2.7.1/point_stat_AFWAv3.4_Noahv2.7.1_F000_ONLYSF_000000L_20110902_000000V.stat</stat>
+    </output>
+ </test>
+
+  <test name="point_stat_lead_00_winds_AFWAv3.4_Noahv2.7.1">
+    <exec>&MET_BIN;/point_stat</exec>
+    <env>
+      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config_lead_00/gen_vx_mask/CONUS.nc</value></pair>
+      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv2.7.1</value></pair>
+      <pair><name>FCST_TIME</name>      <value>000</value></pair>
+    </env>
+    <param> \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv2.7.1/postprd/wrfprs_000.tm00 \
+      &OUTPUT_DIR;/ref_config_lead_00/pb2nc/NDAS_03h/20110902/prepbufr.ndas.20110902.t00z.tm12.nc \
+      &CONFIG_DIR;/ref_config/PointStatConfig_WINDS \
+      -outdir &OUTPUT_DIR;/ref_config_lead_00/point_stat/AFWAv3.4_Noahv2.7.1 \
+      -v 2
+     </param>   
+    <output>
+      <stat>&OUTPUT_DIR;/ref_config_lead_00/point_stat/AFWAv3.4_Noahv2.7.1/point_stat_AFWAv3.4_Noahv2.7.1_F000_WINDS_000000L_20110902_000000V.stat</stat>
+    </output>
+ </test>
+
+  <test name="point_stat_lead_00_upper_air_AFWAv3.4_Noahv3.3">
+    <exec>&MET_BIN;/point_stat</exec>
+    <env>
+      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config_lead_00/gen_vx_mask/CONUS.nc</value></pair>
+      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
+      <pair><name>FCST_TIME</name>      <value>000</value></pair>
+    </env>
+    <param> \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_000.tm00 \
+      &OUTPUT_DIR;/ref_config_lead_00/pb2nc/NDAS_03h/20110902/prepbufr.ndas.20110902.t00z.tm12.nc \
+      &CONFIG_DIR;/ref_config/PointStatConfig_ADPUPA \
+      -outdir &OUTPUT_DIR;/ref_config_lead_00/point_stat/AFWAv3.4_Noahv3.3 \
+      -v 2
+     </param>
+    <output>
+      <stat>&OUTPUT_DIR;/ref_config_lead_00/point_stat/AFWAv3.4_Noahv3.3/point_stat_AFWAv3.4_Noahv3.3_F000_ADPUPA_000000L_20110902_000000V.stat</stat>
+    </output>
+ </test>
+
+  <test name="point_stat_lead_00_surface_AFWAv3.4_Noahv3.3">
+    <exec>&MET_BIN;/point_stat</exec>
+    <env>
+      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config_lead_00/gen_vx_mask/CONUS.nc</value></pair>
+      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
+      <pair><name>FCST_TIME</name>      <value>000</value></pair>
+    </env>
+    <param> \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_000.tm00 \
+      &OUTPUT_DIR;/ref_config_lead_00/pb2nc/NDAS_03h/20110902/prepbufr.ndas.20110902.t00z.tm12.nc \
+      &CONFIG_DIR;/ref_config/PointStatConfig_ONLYSF \
+      -outdir &OUTPUT_DIR;/ref_config_lead_00/point_stat/AFWAv3.4_Noahv3.3 \
+      -v 2
+     </param>
+    <output>
+      <stat>&OUTPUT_DIR;/ref_config_lead_00/point_stat/AFWAv3.4_Noahv3.3/point_stat_AFWAv3.4_Noahv3.3_F000_ONLYSF_000000L_20110902_000000V.stat</stat>
+    </output>
+ </test>
+
+  <test name="point_stat_lead_00_winds_AFWAv3.4_Noahv3.3">
+    <exec>&MET_BIN;/point_stat</exec>
+    <env>
+      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config_lead_00/gen_vx_mask/CONUS.nc</value></pair>
+      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
+      <pair><name>FCST_TIME</name>      <value>000</value></pair>
+    </env>
+    <param> \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_000.tm00 \
+      &OUTPUT_DIR;/ref_config_lead_00/pb2nc/NDAS_03h/20110902/prepbufr.ndas.20110902.t00z.tm12.nc \
+      &CONFIG_DIR;/ref_config/PointStatConfig_WINDS \
+      -outdir &OUTPUT_DIR;/ref_config_lead_00/point_stat/AFWAv3.4_Noahv3.3 \
+      -v 2
+     </param>
+    <output>
+      <stat>&OUTPUT_DIR;/ref_config_lead_00/point_stat/AFWAv3.4_Noahv3.3/point_stat_AFWAv3.4_Noahv3.3_F000_WINDS_000000L_20110902_000000V.stat</stat>
+    </output>
+ </test>
+
+</met_test>
diff --git a/test/xml/unit_ref_config_lead_12.xml b/test/xml/unit_ref_config_lead_12.xml
new file mode 100644
index 0000000000..989e548da5
--- /dev/null
+++ b/test/xml/unit_ref_config_lead_12.xml
@@ -0,0 +1,230 @@
+<?xml version="1.0"?>
+<!DOCTYPE met_test [
+  <!ENTITY MET_BASE       "${MET_BASE}">
+  <!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">
+]>
+
+<!-- Requires: None -->
+
+<met_test>
+
+  <test_dir>&TEST_DIR;</test_dir>
+  <exit_on_fail>true</exit_on_fail>
+
+  <!--                                                                  -->
+  <!-- Run Gen-Vx-Mask                                                  -->
+  <!--                                                                  -->
+
+  <test name="gen_vx_mask">
+    <exec>&MET_BIN;/gen_vx_mask</exec>
+    <param> \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_012.tm00 \
+      &MET_BASE;/poly/CONUS.poly \
+      &OUTPUT_DIR;/ref_config_lead_12/gen_vx_mask/CONUS.nc \
+      -type poly -v 2
+    </param>
+    <output>
+      <grid_nc>&OUTPUT_DIR;/ref_config_lead_12/gen_vx_mask/CONUS.nc</grid_nc>
+    </output>
+   </test>
+ 
+  <!--                                                                  -->
+  <!-- Run PB2NC for the current lead time                              -->
+  <!--                                                                  -->
+
+  <test name="pb2nc_ndas_lead_12">
+   <exec>&MET_BIN;/pb2nc</exec>
+   <env>
+     <pair><name>MASK_POLY</name> <value>&CONFIG_DIR;/ref_config/RefConfig.poly</value></pair>
+   </env>
+   <param> \
+     &DATA_DIR_OBS;/ref_config/prepbufr/ndas/2011090300/ndas.t00z.prepbufr.tm12.nr  \
+     &OUTPUT_DIR;/ref_config_lead_12/pb2nc/NDAS_03h/20110902/prepbufr.ndas.20110902.t12z.tm12.nc \
+     &CONFIG_DIR;/ref_config/PB2NCConfig \
+     -valid_beg 20110902_103000\
+     -valid_end 20110902_133000\
+     -v 2
+   </param>
+   <output>
+     <point_nc>&OUTPUT_DIR;/ref_config_lead_12/pb2nc/NDAS_03h/20110902/prepbufr.ndas.20110902.t12z.tm12.nc</point_nc>
+   </output>
+  </test>
+
+  <!--                                                                  -->
+  <!-- Run PCP-Combine for 3 hour accumulations                         -->
+  <!--                                                                  -->
+
+  <test name="pcp_combine_ST2ml_3hr_09_12">
+    <exec>&MET_BIN;/pcp_combine</exec>
+    <param> \
+      -sum \
+      00000000_000000 1 20110902_120000 3 \
+      &OUTPUT_DIR;/ref_config_lead_12/pcp_combine/ST2_03h/20110902/ST2ml2011090212.03h.nc \
+      -pcpdir &DATA_DIR_OBS;/ref_config/pcp_combine/20110902
+    </param>
+    <output>
+      <grid_nc>&OUTPUT_DIR;/ref_config_lead_12/pcp_combine/ST2_03h/20110902/ST2ml2011090212.03h.nc</grid_nc>
+    </output>
+  </test>
+
+  <test name="pcp_combine_wrf_3hr_09_12">
+    <exec>&MET_BIN;/pcp_combine</exec>
+    <param> \
+      -subtract \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_012.tm00 12 \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_009.tm00 9 \      
+      &OUTPUT_DIR;/ref_config_lead_12/pcp_combine/wrf/wrfpcp03_012.nc
+    </param>
+    <output>
+      <grid_nc>&OUTPUT_DIR;/ref_config_lead_12/pcp_combine/wrf/wrfpcp03_012.nc</grid_nc>
+    </output>
+  </test>
+
+  <!--                                                                   -->
+  <!-- Run Point-Stat on the data needed to compute the GO Index         -->
+  <!--                                                                   -->
+
+  <test name="point_stat_lead_12_upper_air_AFWAv3.4_Noahv2.7.1">
+    <exec>&MET_BIN;/point_stat</exec>
+    <env>
+      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config_lead_12/gen_vx_mask/CONUS.nc</value></pair>
+      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv2.7.1</value></pair>
+      <pair><name>FCST_TIME</name>      <value>012</value></pair>
+    </env>
+    <param> \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv2.7.1/postprd/wrfprs_012.tm00 \
+      &OUTPUT_DIR;/ref_config_lead_12/pb2nc/NDAS_03h/20110902/prepbufr.ndas.20110902.t12z.tm12.nc \
+      &CONFIG_DIR;/ref_config/PointStatConfig_ADPUPA \
+      -outdir &OUTPUT_DIR;/ref_config_lead_12/point_stat/AFWAv3.4_Noahv2.7.1 \
+      -v 2
+     </param>   
+    <output>
+      <stat>&OUTPUT_DIR;/ref_config_lead_12/point_stat/AFWAv3.4_Noahv2.7.1/point_stat_AFWAv3.4_Noahv2.7.1_F012_ADPUPA_120000L_20110902_120000V.stat</stat>
+    </output>
+  </test>
+
+  <test name="point_stat_lead_12_surface_AFWAv3.4_Noahv2.7.1">
+    <exec>&MET_BIN;/point_stat</exec>
+    <env>
+      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config_lead_12/gen_vx_mask/CONUS.nc</value></pair>
+      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv2.7.1</value></pair>
+      <pair><name>FCST_TIME</name>      <value>012</value></pair>
+    </env>
+    <param> \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv2.7.1/postprd/wrfprs_012.tm00 \
+      &OUTPUT_DIR;/ref_config_lead_12/pb2nc/NDAS_03h/20110902/prepbufr.ndas.20110902.t12z.tm12.nc \
+      &CONFIG_DIR;/ref_config/PointStatConfig_ONLYSF \
+      -outdir &OUTPUT_DIR;/ref_config_lead_12/point_stat/AFWAv3.4_Noahv2.7.1 \
+      -v 2
+     </param>   
+    <output>
+      <stat>&OUTPUT_DIR;/ref_config_lead_12/point_stat/AFWAv3.4_Noahv2.7.1/point_stat_AFWAv3.4_Noahv2.7.1_F012_ONLYSF_120000L_20110902_120000V.stat</stat>
+    </output>
+  </test>
+
+  <test name="point_stat_lead_12_winds_AFWAv3.4_Noahv2.7.1">
+    <exec>&MET_BIN;/point_stat</exec>
+    <env>
+      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config_lead_12/gen_vx_mask/CONUS.nc</value></pair>
+      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv2.7.1</value></pair>
+      <pair><name>FCST_TIME</name>      <value>012</value></pair>
+    </env>
+    <param> \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv2.7.1/postprd/wrfprs_012.tm00 \
+      &OUTPUT_DIR;/ref_config_lead_12/pb2nc/NDAS_03h/20110902/prepbufr.ndas.20110902.t12z.tm12.nc \
+      &CONFIG_DIR;/ref_config/PointStatConfig_WINDS \
+      -outdir &OUTPUT_DIR;/ref_config_lead_12/point_stat/AFWAv3.4_Noahv2.7.1 \
+      -v 2
+     </param>   
+    <output>
+      <stat>&OUTPUT_DIR;/ref_config_lead_12/point_stat/AFWAv3.4_Noahv2.7.1/point_stat_AFWAv3.4_Noahv2.7.1_F012_WINDS_120000L_20110902_120000V.stat</stat>
+    </output>
+  </test>
+
+  <test name="point_stat_lead_12_upper_air_AFWAv3.4_Noahv3.3">
+    <exec>&MET_BIN;/point_stat</exec>
+    <env>
+      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config_lead_12/gen_vx_mask/CONUS.nc</value></pair>
+      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
+      <pair><name>FCST_TIME</name>      <value>012</value></pair>
+    </env>
+    <param> \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_012.tm00 \
+      &OUTPUT_DIR;/ref_config_lead_12/pb2nc/NDAS_03h/20110902/prepbufr.ndas.20110902.t12z.tm12.nc \
+      &CONFIG_DIR;/ref_config/PointStatConfig_ADPUPA \
+      -outdir &OUTPUT_DIR;/ref_config_lead_12/point_stat/AFWAv3.4_Noahv3.3 \
+      -v 2
+     </param>   
+    <output>
+      <stat>&OUTPUT_DIR;/ref_config_lead_12/point_stat/AFWAv3.4_Noahv3.3/point_stat_AFWAv3.4_Noahv3.3_F012_ADPUPA_120000L_20110902_120000V.stat</stat>
+    </output>
+  </test>
+
+  <test name="point_stat_lead_12_surface_AFWAv3.4_Noahv3.3">
+    <exec>&MET_BIN;/point_stat</exec>
+    <env>
+      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config_lead_12/gen_vx_mask/CONUS.nc</value></pair>
+      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
+      <pair><name>FCST_TIME</name>      <value>012</value></pair>
+    </env>
+    <param> \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_012.tm00 \
+      &OUTPUT_DIR;/ref_config_lead_12/pb2nc/NDAS_03h/20110902/prepbufr.ndas.20110902.t12z.tm12.nc \
+      &CONFIG_DIR;/ref_config/PointStatConfig_ONLYSF \
+      -outdir &OUTPUT_DIR;/ref_config_lead_12/point_stat/AFWAv3.4_Noahv3.3 \
+      -v 2
+     </param>   
+    <output>
+      <stat>&OUTPUT_DIR;/ref_config_lead_12/point_stat/AFWAv3.4_Noahv3.3/point_stat_AFWAv3.4_Noahv3.3_F012_ONLYSF_120000L_20110902_120000V.stat</stat>
+    </output>
+  </test>
+
+  <test name="point_stat_lead_12_winds_AFWAv3.4_Noahv3.3">
+    <exec>&MET_BIN;/point_stat</exec>
+    <env>
+      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config_lead_12/gen_vx_mask/CONUS.nc</value></pair>
+      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
+      <pair><name>FCST_TIME</name>      <value>012</value></pair>
+    </env>
+    <param> \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_012.tm00 \
+      &OUTPUT_DIR;/ref_config_lead_12/pb2nc/NDAS_03h/20110902/prepbufr.ndas.20110902.t12z.tm12.nc \
+      &CONFIG_DIR;/ref_config/PointStatConfig_WINDS \
+      -outdir &OUTPUT_DIR;/ref_config_lead_12/point_stat/AFWAv3.4_Noahv3.3 \
+      -v 2
+     </param>   
+    <output>
+      <stat>&OUTPUT_DIR;/ref_config_lead_12/point_stat/AFWAv3.4_Noahv3.3/point_stat_AFWAv3.4_Noahv3.3_F012_WINDS_120000L_20110902_120000V.stat</stat>
+    </output>
+  </test>
+
+  <!--                                                                  -->
+  <!-- Run Grid-Stat for 3 hour accumulations                           -->
+  <!--                                                                  -->
+
+  <test name="grid_stat_3hr_accum_time_12">
+    <exec>&MET_BIN;/grid_stat</exec>
+    <env>
+      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config_lead_12/gen_vx_mask/CONUS.nc</value></pair>
+      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
+      <pair><name>FCST_TIME</name>      <value>12</value></pair>
+    </env>
+    <param> \
+      &OUTPUT_DIR;/ref_config_lead_12/pcp_combine/wrf/wrfpcp03_012.nc \
+      &OUTPUT_DIR;/ref_config_lead_12/pcp_combine/ST2_03h/20110902/ST2ml2011090212.03h.nc \
+      &CONFIG_DIR;/ref_config/GridStatConfig_03h \
+      -outdir &OUTPUT_DIR;/ref_config_lead_12/grid_stat -v 1
+    </param>   
+    <output>
+      <stat>&OUTPUT_DIR;/ref_config_lead_12/grid_stat/grid_stat_AFWAv3.4_Noahv3.3_F12_03h_120000L_20110902_120000V.stat</stat>
+    </output>
+  </test>
+
+</met_test>
diff --git a/test/xml/unit_ref_config_lead_24.xml b/test/xml/unit_ref_config_lead_24.xml
new file mode 100644
index 0000000000..78cff2ee56
--- /dev/null
+++ b/test/xml/unit_ref_config_lead_24.xml
@@ -0,0 +1,231 @@
+<?xml version="1.0"?>
+<!DOCTYPE met_test [
+  <!ENTITY MET_BASE       "${MET_BASE}">
+  <!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">
+]>
+
+<!-- Requires: None -->
+
+<met_test>
+
+  <test_dir>&TEST_DIR;</test_dir>
+  <exit_on_fail>true</exit_on_fail>
+
+  <!--                                                                  -->
+  <!-- Run Gen-Vx-Mask                                                  -->
+  <!--                                                                  -->
+
+  <test name="gen_vx_mask">
+    <exec>&MET_BIN;/gen_vx_mask</exec>
+    <param> \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_012.tm00 \
+      &MET_BASE;/poly/CONUS.poly \
+      &OUTPUT_DIR;/ref_config_lead_24/gen_vx_mask/CONUS.nc \
+      -type poly -v 2
+    </param>
+    <output>
+      <grid_nc>&OUTPUT_DIR;/ref_config_lead_24/gen_vx_mask/CONUS.nc</grid_nc>
+    </output>
+   </test>
+ 
+  <!--                                                                  -->
+  <!-- Run PB2NC for the current lead time                              -->
+  <!--                                                                  -->
+
+  <test name="pb2nc_ndas_lead_24">
+   <exec>&MET_BIN;/pb2nc</exec>
+   <env>
+     <pair><name>MASK_POLY</name> <value>&CONFIG_DIR;/ref_config/RefConfig.poly</value></pair>
+   </env>
+   <param> \
+     &DATA_DIR_OBS;/ref_config/prepbufr/ndas/2011090312/ndas.t12z.prepbufr.tm12.nr \
+     &OUTPUT_DIR;/ref_config_lead_24/pb2nc/NDAS_03h/20110903/prepbufr.ndas.20110903.t00z.tm12.nc \
+     &CONFIG_DIR;/ref_config/PB2NCConfig \
+     -valid_beg 20110902_223000\
+     -valid_end 20110903_013000\
+     -v 2
+   </param>
+   <output>
+     <point_nc>&OUTPUT_DIR;/ref_config_lead_24/pb2nc/NDAS_03h/20110903/prepbufr.ndas.20110903.t00z.tm12.nc</point_nc>
+   </output>
+ </test>
+
+  <!--                                                                  -->
+  <!-- Run PCP-Combine for 3 hour accumulations                         -->
+  <!--                                                                  -->
+
+  <test name="pcp_combine_ST2ml_3hr_21_24">
+    <exec>&MET_BIN;/pcp_combine</exec>
+    <param> \
+      -sum \
+      00000000_000000 1 20110903_000000 3 \
+      &OUTPUT_DIR;/ref_config_lead_24/pcp_combine/ST2_03h/20110903/ST2ml2011090300.03h.nc \
+      -pcpdir &DATA_DIR_OBS;/ref_config/pcp_combine/20110902 \
+      -pcpdir &DATA_DIR_OBS;/ref_config/pcp_combine/20110903
+    </param>
+    <output>
+      <grid_nc>&OUTPUT_DIR;/ref_config_lead_24/pcp_combine/ST2_03h/20110903/ST2ml2011090300.03h.nc</grid_nc>
+    </output>
+  </test>
+
+  <test name="pcp_combine_wrf_3hr_21_24">
+    <exec>&MET_BIN;/pcp_combine</exec>
+    <param> \
+      -subtract \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_024.tm00 24 \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_021.tm00 21 \
+      &OUTPUT_DIR;/ref_config_lead_24/pcp_combine/wrf/wrfpcp03_024.nc
+    </param>
+    <output>
+      <grid_nc>&OUTPUT_DIR;/ref_config_lead_24/pcp_combine/wrf/wrfpcp03_024.nc</grid_nc>
+    </output>
+  </test>
+
+  <!--                                                                   -->
+  <!-- Run Point-Stat on the data needed to compute the GO Index         -->
+  <!--                                                                   -->
+
+  <test name="point_stat_lead_24_upper_air_AFWAv3.4_Noahv2.7.1">
+    <exec>&MET_BIN;/point_stat</exec>
+    <env>
+      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config_lead_24/gen_vx_mask/CONUS.nc</value></pair>
+      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv2.7.1</value></pair>
+      <pair><name>FCST_TIME</name>      <value>024</value></pair>
+    </env>
+    <param> \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv2.7.1/postprd/wrfprs_024.tm00 \
+      &OUTPUT_DIR;/ref_config_lead_24/pb2nc/NDAS_03h/20110903/prepbufr.ndas.20110903.t00z.tm12.nc \
+      &CONFIG_DIR;/ref_config/PointStatConfig_ADPUPA \
+      -outdir &OUTPUT_DIR;/ref_config_lead_24/point_stat/AFWAv3.4_Noahv2.7.1 \
+      -v 2
+     </param>   
+    <output>
+      <stat>&OUTPUT_DIR;/ref_config_lead_24/point_stat/AFWAv3.4_Noahv2.7.1/point_stat_AFWAv3.4_Noahv2.7.1_F024_ADPUPA_240000L_20110903_000000V.stat</stat>
+    </output>
+ </test>
+
+  <test name="point_stat_lead_24_surface_AFWAv3.4_Noahv2.7.1">
+    <exec>&MET_BIN;/point_stat</exec>
+    <env>
+      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config_lead_24/gen_vx_mask/CONUS.nc</value></pair>
+      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv2.7.1</value></pair>
+      <pair><name>FCST_TIME</name>      <value>024</value></pair>
+    </env>
+    <param> \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv2.7.1/postprd/wrfprs_024.tm00 \
+      &OUTPUT_DIR;/ref_config_lead_24/pb2nc/NDAS_03h/20110903/prepbufr.ndas.20110903.t00z.tm12.nc \
+      &CONFIG_DIR;/ref_config/PointStatConfig_ONLYSF \
+      -outdir &OUTPUT_DIR;/ref_config_lead_24/point_stat/AFWAv3.4_Noahv2.7.1 \
+      -v 2
+     </param>   
+    <output>
+      <stat>&OUTPUT_DIR;/ref_config_lead_24/point_stat/AFWAv3.4_Noahv2.7.1/point_stat_AFWAv3.4_Noahv2.7.1_F024_ONLYSF_240000L_20110903_000000V.stat</stat>
+    </output>
+ </test>
+
+  <test name="point_stat_lead_24_winds_AFWAv3.4_Noahv2.7.1">
+    <exec>&MET_BIN;/point_stat</exec>
+    <env>
+      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config_lead_24/gen_vx_mask/CONUS.nc</value></pair>
+      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv2.7.1</value></pair>
+      <pair><name>FCST_TIME</name>      <value>024</value></pair>
+    </env>
+    <param> \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv2.7.1/postprd/wrfprs_024.tm00 \
+      &OUTPUT_DIR;/ref_config_lead_24/pb2nc/NDAS_03h/20110903/prepbufr.ndas.20110903.t00z.tm12.nc \
+      &CONFIG_DIR;/ref_config/PointStatConfig_WINDS \
+      -outdir &OUTPUT_DIR;/ref_config_lead_24/point_stat/AFWAv3.4_Noahv2.7.1 \
+      -v 2
+     </param>   
+    <output>
+      <stat>&OUTPUT_DIR;/ref_config_lead_24/point_stat/AFWAv3.4_Noahv2.7.1/point_stat_AFWAv3.4_Noahv2.7.1_F024_WINDS_240000L_20110903_000000V.stat</stat>
+    </output>
+ </test>
+
+  <test name="point_stat_lead_24_upper_air_AFWAv3.4_Noahv3.3">
+    <exec>&MET_BIN;/point_stat</exec>
+    <env>
+      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config_lead_24/gen_vx_mask/CONUS.nc</value></pair>
+      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
+      <pair><name>FCST_TIME</name>      <value>024</value></pair>
+    </env>
+    <param> \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_024.tm00 \
+      &OUTPUT_DIR;/ref_config_lead_24/pb2nc/NDAS_03h/20110903/prepbufr.ndas.20110903.t00z.tm12.nc \
+      &CONFIG_DIR;/ref_config/PointStatConfig_ADPUPA \
+      -outdir &OUTPUT_DIR;/ref_config_lead_24/point_stat/AFWAv3.4_Noahv3.3 \
+      -v 2
+     </param>   
+    <output>
+      <stat>&OUTPUT_DIR;/ref_config_lead_24/point_stat/AFWAv3.4_Noahv3.3/point_stat_AFWAv3.4_Noahv3.3_F024_ADPUPA_240000L_20110903_000000V.stat</stat>
+    </output>
+ </test>
+
+  <test name="point_stat_lead_24_surface_AFWAv3.4_Noahv3.3">
+    <exec>&MET_BIN;/point_stat</exec>
+    <env>
+      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config_lead_24/gen_vx_mask/CONUS.nc</value></pair>
+      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
+      <pair><name>FCST_TIME</name>      <value>024</value></pair>
+    </env>
+    <param> \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_024.tm00 \
+      &OUTPUT_DIR;/ref_config_lead_24/pb2nc/NDAS_03h/20110903/prepbufr.ndas.20110903.t00z.tm12.nc \
+      &CONFIG_DIR;/ref_config/PointStatConfig_ONLYSF \
+      -outdir &OUTPUT_DIR;/ref_config_lead_24/point_stat/AFWAv3.4_Noahv3.3 \
+      -v 2
+     </param>   
+    <output>
+      <stat>&OUTPUT_DIR;/ref_config_lead_24/point_stat/AFWAv3.4_Noahv3.3/point_stat_AFWAv3.4_Noahv3.3_F024_ONLYSF_240000L_20110903_000000V.stat</stat>
+    </output>
+ </test>
+
+  <test name="point_stat_lead_24_winds_AFWAv3.4_Noahv3.3">
+    <exec>&MET_BIN;/point_stat</exec>
+    <env>
+      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config_lead_24/gen_vx_mask/CONUS.nc</value></pair>
+      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
+      <pair><name>FCST_TIME</name>      <value>024</value></pair>
+    </env>
+    <param> \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_024.tm00 \
+      &OUTPUT_DIR;/ref_config_lead_24/pb2nc/NDAS_03h/20110903/prepbufr.ndas.20110903.t00z.tm12.nc \
+      &CONFIG_DIR;/ref_config/PointStatConfig_WINDS \
+      -outdir &OUTPUT_DIR;/ref_config_lead_24/point_stat/AFWAv3.4_Noahv3.3 \
+      -v 2
+     </param>   
+    <output>
+      <stat>&OUTPUT_DIR;/ref_config_lead_24/point_stat/AFWAv3.4_Noahv3.3/point_stat_AFWAv3.4_Noahv3.3_F024_WINDS_240000L_20110903_000000V.stat</stat>
+    </output>
+ </test>
+
+  <!--                                                                  -->
+  <!-- Run Grid-Stat for 3 hour accumulations                           -->
+  <!--                                                                  -->
+
+  <test name="grid_stat_3hr_accum_time_24">
+    <exec>&MET_BIN;/grid_stat</exec>
+    <env>
+      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config_lead_24/gen_vx_mask/CONUS.nc</value></pair>
+      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
+      <pair><name>FCST_TIME</name>      <value>24</value></pair>
+    </env>
+    <param> \
+      &OUTPUT_DIR;/ref_config_lead_24/pcp_combine/wrf/wrfpcp03_024.nc \
+      &OUTPUT_DIR;/ref_config_lead_24/pcp_combine/ST2_03h/20110903/ST2ml2011090300.03h.nc \
+      &CONFIG_DIR;/ref_config/GridStatConfig_03h \
+      -outdir &OUTPUT_DIR;/ref_config_lead_24/grid_stat -v 1
+    </param>   
+    <output>
+      <stat>&OUTPUT_DIR;/ref_config_lead_24/grid_stat/grid_stat_AFWAv3.4_Noahv3.3_F24_03h_240000L_20110903_000000V.stat</stat>
+    </output>
+  </test>
+
+</met_test>
diff --git a/test/xml/unit_ref_config_lead_36.xml b/test/xml/unit_ref_config_lead_36.xml
new file mode 100644
index 0000000000..4832ba4ad1
--- /dev/null
+++ b/test/xml/unit_ref_config_lead_36.xml
@@ -0,0 +1,274 @@
+<?xml version="1.0"?>
+<!DOCTYPE met_test [
+  <!ENTITY MET_BASE       "${MET_BASE}">
+  <!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">
+]>
+
+<!-- Requires: None -->
+
+<met_test>
+
+  <test_dir>&TEST_DIR;</test_dir>
+  <exit_on_fail>true</exit_on_fail>
+
+  <!--                                                                  -->
+  <!-- Run Gen-Vx-Mask                                                  -->
+  <!--                                                                  -->
+
+  <test name="gen_vx_mask">
+    <exec>&MET_BIN;/gen_vx_mask</exec>
+    <param> \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_012.tm00 \
+      &MET_BASE;/poly/CONUS.poly \
+      &OUTPUT_DIR;/ref_config_lead_36/gen_vx_mask/CONUS.nc \
+      -type poly -v 2
+    </param>
+    <output>
+      <grid_nc>&OUTPUT_DIR;/ref_config_lead_36/gen_vx_mask/CONUS.nc</grid_nc>
+    </output>
+   </test>
+ 
+  <!--                                                                  -->
+  <!-- Run PB2NC for the current lead time                              -->
+  <!--                                                                  -->
+
+  <test name="pb2nc_ndas_lead_36">
+   <exec>&MET_BIN;/pb2nc</exec>
+   <env>
+     <pair><name>MASK_POLY</name> <value>&CONFIG_DIR;/ref_config/RefConfig.poly</value></pair>
+   </env>
+   <param> \
+     &DATA_DIR_OBS;/ref_config/prepbufr/ndas/2011090400/ndas.t00z.prepbufr.tm12.nr  \
+     &OUTPUT_DIR;/ref_config_lead_36/pb2nc/NDAS_03h/20110903/prepbufr.ndas.20110903.t12z.tm12.nc \
+     &CONFIG_DIR;/ref_config/PB2NCConfig \
+     -valid_beg 20110903_103000\
+     -valid_end 20110903_133000\
+     -v 2
+   </param>
+   <output>
+     <point_nc>&OUTPUT_DIR;/ref_config_lead_36/pb2nc/NDAS_03h/20110903/prepbufr.ndas.20110903.t12z.tm12.nc</point_nc>
+   </output>
+ </test>
+
+  <!--                                                                  -->
+  <!-- Run PCP-Combine for 3 and 24 hour accumulations                  -->
+  <!--                                                                  -->
+
+  <test name="pcp_combine_ST2ml_3hr_33_36">
+    <exec>&MET_BIN;/pcp_combine</exec>
+     <param> \
+      -sum \
+      00000000_000000 1 20110903_120000 3 \
+      &OUTPUT_DIR;/ref_config_lead_36/pcp_combine/ST2_03h/20110903/ST2ml2011090312.03h.nc \
+      -pcpdir &DATA_DIR_OBS;/ref_config/pcp_combine/20110903
+    </param>
+    <output>
+      <grid_nc>&OUTPUT_DIR;/ref_config_lead_36/pcp_combine/ST2_03h/20110903/ST2ml2011090312.03h.nc</grid_nc>
+    </output>
+ </test>
+
+  <test name="pcp_combine_ST2ml_24hr_12_36">
+    <exec>&MET_BIN;/pcp_combine</exec>
+    <param> \
+      -add \
+      &DATA_DIR_OBS;/ref_config/pcp_combine/2011090324/ST2ml2011090312.24h.grb \
+      24 \
+      &OUTPUT_DIR;/ref_config_lead_36/pcp_combine/ST2_24h/20110903/ST2ml2011090312.24h.nc
+    </param>
+    <output>
+      <grid_nc>&OUTPUT_DIR;/ref_config_lead_36/pcp_combine/ST2_24h/20110903/ST2ml2011090312.24h.nc</grid_nc>
+    </output>
+  </test>
+
+  <test name="pcp_combine_wrf_3hr_33_36">
+    <exec>&MET_BIN;/pcp_combine</exec>
+    <param> \
+      -subtract \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_036.tm00 36 \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_033.tm00 33 \
+      &OUTPUT_DIR;/ref_config_lead_36/pcp_combine/wrf/wrfpcp03_036.nc
+    </param>
+    <output>
+      <grid_nc>&OUTPUT_DIR;/ref_config_lead_36/pcp_combine/wrf/wrfpcp03_036.nc</grid_nc>
+    </output>
+  </test>
+
+  <test name="pcp_combine_wrf_24hr_12_36">
+    <exec>&MET_BIN;/pcp_combine</exec>
+    <param> \
+      -subtract \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_036.tm00 36 \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_012.tm00 12 \
+      &OUTPUT_DIR;/ref_config_lead_36/pcp_combine/wrf/wrfpcp24_036.nc
+    </param>
+    <output>
+      <grid_nc>&OUTPUT_DIR;/ref_config_lead_36/pcp_combine/wrf/wrfpcp24_036.nc</grid_nc>
+    </output>
+  </test>
+
+  <!--                                                                   -->
+  <!-- Run Point-Stat on the data needed to compute the GO Index         -->
+  <!--                                                                   -->
+
+  <test name="point_stat_lead_36_upper_air_AFWAv3.4_Noahv2.7.1">
+    <exec>&MET_BIN;/point_stat</exec>
+    <env>
+      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config_lead_36/gen_vx_mask/CONUS.nc</value></pair>
+      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv2.7.1</value></pair>
+      <pair><name>FCST_TIME</name>      <value>036</value></pair>
+    </env>
+    <param> \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv2.7.1/postprd/wrfprs_036.tm00 \
+      &OUTPUT_DIR;/ref_config_lead_36/pb2nc/NDAS_03h/20110903/prepbufr.ndas.20110903.t12z.tm12.nc \
+      &CONFIG_DIR;/ref_config/PointStatConfig_ADPUPA \
+      -outdir &OUTPUT_DIR;/ref_config_lead_36/point_stat/AFWAv3.4_Noahv2.7.1 \
+      -v 2
+     </param>   
+    <output>
+      <stat>&OUTPUT_DIR;/ref_config_lead_36/point_stat/AFWAv3.4_Noahv2.7.1/point_stat_AFWAv3.4_Noahv2.7.1_F036_ADPUPA_360000L_20110903_120000V.stat</stat>
+    </output>
+ </test>
+
+  <test name="point_stat_lead_36_surface_AFWAv3.4_Noahv2.7.1">
+    <exec>&MET_BIN;/point_stat</exec>
+    <env>
+      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config_lead_36/gen_vx_mask/CONUS.nc</value></pair>
+      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv2.7.1</value></pair>
+      <pair><name>FCST_TIME</name>      <value>036</value></pair>
+    </env>
+    <param> \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv2.7.1/postprd/wrfprs_036.tm00 \
+      &OUTPUT_DIR;/ref_config_lead_36/pb2nc/NDAS_03h/20110903/prepbufr.ndas.20110903.t12z.tm12.nc \
+      &CONFIG_DIR;/ref_config/PointStatConfig_ONLYSF \
+      -outdir &OUTPUT_DIR;/ref_config_lead_36/point_stat/AFWAv3.4_Noahv2.7.1 \
+      -v 2
+     </param>   
+    <output>
+      <stat>&OUTPUT_DIR;/ref_config_lead_36/point_stat/AFWAv3.4_Noahv2.7.1/point_stat_AFWAv3.4_Noahv2.7.1_F036_ONLYSF_360000L_20110903_120000V.stat</stat>
+    </output>
+ </test>
+
+  <test name="point_stat_lead_36_winds_AFWAv3.4_Noahv2.7.1">
+    <exec>&MET_BIN;/point_stat</exec>
+    <env>
+      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config_lead_36/gen_vx_mask/CONUS.nc</value></pair>
+      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv2.7.1</value></pair>
+      <pair><name>FCST_TIME</name>      <value>036</value></pair>
+    </env>
+    <param> \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv2.7.1/postprd/wrfprs_036.tm00 \
+      &OUTPUT_DIR;/ref_config_lead_36/pb2nc/NDAS_03h/20110903/prepbufr.ndas.20110903.t12z.tm12.nc \
+      &CONFIG_DIR;/ref_config/PointStatConfig_WINDS \
+      -outdir &OUTPUT_DIR;/ref_config_lead_36/point_stat/AFWAv3.4_Noahv2.7.1 \
+      -v 2
+     </param>   
+    <output>
+      <stat>&OUTPUT_DIR;/ref_config_lead_36/point_stat/AFWAv3.4_Noahv2.7.1/point_stat_AFWAv3.4_Noahv2.7.1_F036_WINDS_360000L_20110903_120000V.stat</stat>
+    </output>
+ </test>
+
+  <test name="point_stat_lead_36_upper_air_AFWAv3.4_Noahv3.3">
+    <exec>&MET_BIN;/point_stat</exec>
+    <env>
+      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config_lead_36/gen_vx_mask/CONUS.nc</value></pair>
+      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
+      <pair><name>FCST_TIME</name>      <value>036</value></pair>
+    </env>
+    <param> \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_036.tm00 \
+      &OUTPUT_DIR;/ref_config_lead_36/pb2nc/NDAS_03h/20110903/prepbufr.ndas.20110903.t12z.tm12.nc \
+      &CONFIG_DIR;/ref_config/PointStatConfig_ADPUPA \
+      -outdir &OUTPUT_DIR;/ref_config_lead_36/point_stat/AFWAv3.4_Noahv3.3 \
+      -v 2
+     </param>   
+    <output>
+      <stat>&OUTPUT_DIR;/ref_config_lead_36/point_stat/AFWAv3.4_Noahv3.3/point_stat_AFWAv3.4_Noahv3.3_F036_ADPUPA_360000L_20110903_120000V.stat</stat>
+    </output>
+ </test>
+
+  <test name="point_stat_lead_36_surface_AFWAv3.4_Noahv3.3">
+    <exec>&MET_BIN;/point_stat</exec>
+    <env>
+      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config_lead_36/gen_vx_mask/CONUS.nc</value></pair>
+      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
+      <pair><name>FCST_TIME</name>      <value>036</value></pair>
+    </env>
+    <param> \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_036.tm00 \
+      &OUTPUT_DIR;/ref_config_lead_36/pb2nc/NDAS_03h/20110903/prepbufr.ndas.20110903.t12z.tm12.nc \
+      &CONFIG_DIR;/ref_config/PointStatConfig_ONLYSF \
+      -outdir &OUTPUT_DIR;/ref_config_lead_36/point_stat/AFWAv3.4_Noahv3.3 \
+      -v 2
+     </param>   
+    <output>
+      <stat>&OUTPUT_DIR;/ref_config_lead_36/point_stat/AFWAv3.4_Noahv3.3/point_stat_AFWAv3.4_Noahv3.3_F036_ONLYSF_360000L_20110903_120000V.stat</stat>
+    </output>
+ </test>
+
+  <test name="point_stat_lead_36_winds_AFWAv3.4_Noahv3.3">
+    <exec>&MET_BIN;/point_stat</exec>
+    <env>
+      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config_lead_36/gen_vx_mask/CONUS.nc</value></pair>
+      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
+      <pair><name>FCST_TIME</name>      <value>036</value></pair>
+    </env>
+    <param> \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_036.tm00 \
+      &OUTPUT_DIR;/ref_config_lead_36/pb2nc/NDAS_03h/20110903/prepbufr.ndas.20110903.t12z.tm12.nc \
+      &CONFIG_DIR;/ref_config/PointStatConfig_WINDS \
+      -outdir &OUTPUT_DIR;/ref_config_lead_36/point_stat/AFWAv3.4_Noahv3.3 \
+      -v 2
+     </param>   
+    <output>
+      <stat>&OUTPUT_DIR;/ref_config_lead_36/point_stat/AFWAv3.4_Noahv3.3/point_stat_AFWAv3.4_Noahv3.3_F036_WINDS_360000L_20110903_120000V.stat</stat>
+    </output>
+ </test>
+
+  <!--                                                                  -->
+  <!-- Run Grid-Stat for 3 and 24 hour accumulations                    -->
+  <!--                                                                  -->
+
+  <test name="grid_stat_3hr_accum_time_36">
+    <exec>&MET_BIN;/grid_stat</exec>
+    <env>
+      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config_lead_36/gen_vx_mask/CONUS.nc</value></pair>
+      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
+      <pair><name>FCST_TIME</name>      <value>36</value></pair>
+    </env>
+    <param> \
+      &OUTPUT_DIR;/ref_config_lead_36/pcp_combine/wrf/wrfpcp03_036.nc \
+      &OUTPUT_DIR;/ref_config_lead_36/pcp_combine/ST2_03h/20110903/ST2ml2011090312.03h.nc \
+      &CONFIG_DIR;/ref_config/GridStatConfig_03h \
+      -outdir &OUTPUT_DIR;/ref_config_lead_36/grid_stat -v 1
+    </param>   
+    <output>
+      <stat>&OUTPUT_DIR;/ref_config_lead_36/grid_stat/grid_stat_AFWAv3.4_Noahv3.3_F36_03h_360000L_20110903_120000V.stat</stat>
+    </output>
+  </test>
+
+  <test name="grid_stat_24hr_accum_time_36">
+    <exec>&MET_BIN;/grid_stat</exec>
+    <env>
+      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config_lead_36/gen_vx_mask/CONUS.nc</value></pair>
+      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
+      <pair><name>FCST_TIME</name>      <value>36</value></pair>
+    </env>
+    <param> \
+      &OUTPUT_DIR;/ref_config_lead_36/pcp_combine/wrf/wrfpcp24_036.nc \
+      &OUTPUT_DIR;/ref_config_lead_36/pcp_combine/ST2_24h/20110903/ST2ml2011090312.24h.nc \
+      &CONFIG_DIR;/ref_config/GridStatConfig_24h \
+      -outdir &OUTPUT_DIR;/ref_config_lead_36/grid_stat -v 1
+    </param>   
+    <output>
+      <stat>&OUTPUT_DIR;/ref_config_lead_36/grid_stat/grid_stat_AFWAv3.4_Noahv3.3_F36_24h_360000L_20110903_120000V.stat</stat>
+    </output>
+  </test>
+
+</met_test>
diff --git a/test/xml/unit_ref_config_lead_48.xml b/test/xml/unit_ref_config_lead_48.xml
new file mode 100644
index 0000000000..b096241afb
--- /dev/null
+++ b/test/xml/unit_ref_config_lead_48.xml
@@ -0,0 +1,231 @@
+<?xml version="1.0"?>
+<!DOCTYPE met_test [
+  <!ENTITY MET_BASE       "${MET_BASE}">
+  <!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">
+]>
+
+<!-- Requires: None -->
+
+<met_test>
+
+  <test_dir>&TEST_DIR;</test_dir>
+  <exit_on_fail>true</exit_on_fail>
+
+  <!--                                                                  -->
+  <!-- Run Gen-Vx-Mask                                                  -->
+  <!--                                                                  -->
+
+  <test name="gen_vx_mask">
+    <exec>&MET_BIN;/gen_vx_mask</exec>
+    <param> \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_012.tm00 \
+      &MET_BASE;/poly/CONUS.poly \
+      &OUTPUT_DIR;/ref_config_lead_48/gen_vx_mask/CONUS.nc \
+      -type poly -v 2
+    </param>
+    <output>
+      <grid_nc>&OUTPUT_DIR;/ref_config_lead_48/gen_vx_mask/CONUS.nc</grid_nc>
+    </output>
+   </test>
+ 
+  <!--                                                                  -->
+  <!-- Run PB2NC for the current lead time                              -->
+  <!--                                                                  -->
+
+  <test name="pb2nc_ndas_lead_48">
+   <exec>&MET_BIN;/pb2nc</exec>
+   <env>
+     <pair><name>MASK_POLY</name> <value>&CONFIG_DIR;/ref_config/RefConfig.poly</value></pair>
+   </env>
+   <param> \
+     &DATA_DIR_OBS;/ref_config/prepbufr/ndas/2011090412/ndas.t12z.prepbufr.tm12.nr  \
+     &OUTPUT_DIR;/ref_config_lead_48/pb2nc/NDAS_03h/20110904/prepbufr.ndas.20110904.t00z.tm12.nc \
+     &CONFIG_DIR;/ref_config/PB2NCConfig \
+     -valid_beg 20110903_223000\
+     -valid_end 20110904_013000\
+     -v 2
+   </param>
+   <output>
+     <point_nc>&OUTPUT_DIR;/ref_config_lead_48/pb2nc/NDAS_03h/20110904/prepbufr.ndas.20110904.t00z.tm12.nc</point_nc>
+   </output>
+ </test>
+
+  <!--                                                                  -->
+  <!-- Run PCP-Combine for 3 hour accumulations                         -->
+  <!--                                                                  -->
+
+  <test name="pcp_combine_ST2ml_3hr_45_48">
+    <exec>&MET_BIN;/pcp_combine</exec>
+    <param> \
+      -sum \
+      00000000_000000 1 20110904_000000 3 \
+      &OUTPUT_DIR;/ref_config_lead_48/pcp_combine/ST2_03h/20110904/ST2ml2011090400.03h.nc \
+      -pcpdir &DATA_DIR_OBS;/ref_config/pcp_combine/20110903 \
+      -pcpdir &DATA_DIR_OBS;/ref_config/pcp_combine/20110904
+    </param>
+    <output>
+      <grid_nc>&OUTPUT_DIR;/ref_config_lead_48/pcp_combine/ST2_03h/20110904/ST2ml2011090400.03h.nc</grid_nc>
+    </output>
+  </test>
+
+  <test name="pcp_combine_wrf_3hr_45_48">
+    <exec>&MET_BIN;/pcp_combine</exec>
+    <param> \
+      -subtract \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_048.tm00 48  \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_045.tm00 45 \
+      &OUTPUT_DIR;/ref_config_lead_48/pcp_combine/wrf/wrfpcp03_048.nc
+    </param>
+    <output>
+      <grid_nc>&OUTPUT_DIR;/ref_config_lead_48/pcp_combine/wrf/wrfpcp03_048.nc</grid_nc>
+    </output>
+  </test>
+
+  <!--                                                                   -->
+  <!-- Run Point-Stat on the data needed to compute the GO Index         -->
+  <!--                                                                   -->
+
+  <test name="point_stat_lead_48_upper_air_AFWAv3.4_Noahv2.7.1">
+    <exec>&MET_BIN;/point_stat</exec>
+    <env>
+      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config_lead_48/gen_vx_mask/CONUS.nc</value></pair>
+      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv2.7.1</value></pair>
+      <pair><name>FCST_TIME</name>      <value>048</value></pair>
+    </env>
+    <param> \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv2.7.1/postprd/wrfprs_048.tm00 \
+      &OUTPUT_DIR;/ref_config_lead_48/pb2nc/NDAS_03h/20110904/prepbufr.ndas.20110904.t00z.tm12.nc \
+      &CONFIG_DIR;/ref_config/PointStatConfig_ADPUPA \
+      -outdir &OUTPUT_DIR;/ref_config_lead_48/point_stat/AFWAv3.4_Noahv2.7.1 \
+      -v 2
+     </param>   
+    <output>
+      <stat>&OUTPUT_DIR;/ref_config_lead_48/point_stat/AFWAv3.4_Noahv2.7.1/point_stat_AFWAv3.4_Noahv2.7.1_F048_ADPUPA_480000L_20110904_000000V.stat</stat>
+    </output>
+ </test>
+
+  <test name="point_stat_lead_48_surface_AFWAv3.4_Noahv2.7.1">
+    <exec>&MET_BIN;/point_stat</exec>
+    <env>
+      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config_lead_48/gen_vx_mask/CONUS.nc</value></pair>
+      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv2.7.1</value></pair>
+      <pair><name>FCST_TIME</name>      <value>048</value></pair>
+    </env>
+    <param> \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv2.7.1/postprd/wrfprs_048.tm00 \
+      &OUTPUT_DIR;/ref_config_lead_48/pb2nc/NDAS_03h/20110904/prepbufr.ndas.20110904.t00z.tm12.nc \
+      &CONFIG_DIR;/ref_config/PointStatConfig_ONLYSF \
+      -outdir &OUTPUT_DIR;/ref_config_lead_48/point_stat/AFWAv3.4_Noahv2.7.1 \
+      -v 2
+     </param>   
+    <output>
+      <stat>&OUTPUT_DIR;/ref_config_lead_48/point_stat/AFWAv3.4_Noahv2.7.1/point_stat_AFWAv3.4_Noahv2.7.1_F048_ONLYSF_480000L_20110904_000000V.stat</stat>
+    </output>
+ </test>
+
+  <test name="point_stat_lead_48_winds_AFWAv3.4_Noahv2.7.1">
+    <exec>&MET_BIN;/point_stat</exec>
+    <env>
+      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config_lead_48/gen_vx_mask/CONUS.nc</value></pair>
+      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv2.7.1</value></pair>
+      <pair><name>FCST_TIME</name>      <value>048</value></pair>
+    </env>
+    <param> \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv2.7.1/postprd/wrfprs_048.tm00 \
+      &OUTPUT_DIR;/ref_config_lead_48/pb2nc/NDAS_03h/20110904/prepbufr.ndas.20110904.t00z.tm12.nc \
+      &CONFIG_DIR;/ref_config/PointStatConfig_WINDS \
+      -outdir &OUTPUT_DIR;/ref_config_lead_48/point_stat/AFWAv3.4_Noahv2.7.1 \
+      -v 2
+     </param>   
+    <output>
+      <stat>&OUTPUT_DIR;/ref_config_lead_48/point_stat/AFWAv3.4_Noahv2.7.1/point_stat_AFWAv3.4_Noahv2.7.1_F048_WINDS_480000L_20110904_000000V.stat</stat>
+    </output>
+ </test>
+
+  <test name="point_stat_lead_48_upper_air_AFWAv3.4_Noahv3.3">
+    <exec>&MET_BIN;/point_stat</exec>
+    <env>
+      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config_lead_48/gen_vx_mask/CONUS.nc</value></pair>
+      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
+      <pair><name>FCST_TIME</name>      <value>048</value></pair>
+    </env>
+    <param> \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_048.tm00 \
+      &OUTPUT_DIR;/ref_config_lead_48/pb2nc/NDAS_03h/20110904/prepbufr.ndas.20110904.t00z.tm12.nc \
+      &CONFIG_DIR;/ref_config/PointStatConfig_ADPUPA \
+      -outdir &OUTPUT_DIR;/ref_config_lead_48/point_stat/AFWAv3.4_Noahv3.3 \
+      -v 2
+     </param>   
+    <output>
+      <stat>&OUTPUT_DIR;/ref_config_lead_48/point_stat/AFWAv3.4_Noahv3.3/point_stat_AFWAv3.4_Noahv3.3_F048_ADPUPA_480000L_20110904_000000V.stat</stat>
+    </output>
+ </test>
+
+  <test name="point_stat_lead_48_surface_AFWAv3.4_Noahv3.3">
+    <exec>&MET_BIN;/point_stat</exec>
+    <env>
+      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config_lead_48/gen_vx_mask/CONUS.nc</value></pair>
+      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
+      <pair><name>FCST_TIME</name>      <value>048</value></pair>
+    </env>
+    <param> \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_048.tm00 \
+      &OUTPUT_DIR;/ref_config_lead_48/pb2nc/NDAS_03h/20110904/prepbufr.ndas.20110904.t00z.tm12.nc \
+      &CONFIG_DIR;/ref_config/PointStatConfig_ONLYSF \
+      -outdir &OUTPUT_DIR;/ref_config_lead_48/point_stat/AFWAv3.4_Noahv3.3 \
+      -v 2
+     </param>   
+    <output>
+      <stat>&OUTPUT_DIR;/ref_config_lead_48/point_stat/AFWAv3.4_Noahv3.3/point_stat_AFWAv3.4_Noahv3.3_F048_ONLYSF_480000L_20110904_000000V.stat</stat>
+    </output>
+ </test>
+
+  <test name="point_stat_lead_48_winds_AFWAv3.4_Noahv3.3">
+    <exec>&MET_BIN;/point_stat</exec>
+    <env>
+      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config_lead_48/gen_vx_mask/CONUS.nc</value></pair>
+      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
+      <pair><name>FCST_TIME</name>      <value>048</value></pair>
+    </env>
+    <param> \
+      &DATA_DIR_MODEL;/grib1/ref_config/2011090200/AFWAv3.4_Noahv3.3/postprd/wrfprs_048.tm00 \
+      &OUTPUT_DIR;/ref_config_lead_48/pb2nc/NDAS_03h/20110904/prepbufr.ndas.20110904.t00z.tm12.nc \
+      &CONFIG_DIR;/ref_config/PointStatConfig_WINDS \
+      -outdir &OUTPUT_DIR;/ref_config_lead_48/point_stat/AFWAv3.4_Noahv3.3 \
+      -v 2
+     </param>   
+    <output>
+      <stat>&OUTPUT_DIR;/ref_config_lead_48/point_stat/AFWAv3.4_Noahv3.3/point_stat_AFWAv3.4_Noahv3.3_F048_WINDS_480000L_20110904_000000V.stat</stat>
+    </output>
+ </test>
+
+  <!--                                                                  -->
+  <!-- Run Grid-Stat for 3 hour accumulations                           -->
+  <!--                                                                  -->
+
+  <test name="grid_stat_3hr_accum_time_48">
+    <exec>&MET_BIN;/grid_stat</exec>
+    <env>
+      <pair><name>MASK_POLY_FILE</name> <value>&OUTPUT_DIR;/ref_config_lead_48/gen_vx_mask/CONUS.nc</value></pair>
+      <pair><name>MODEL</name>          <value>AFWAv3.4_Noahv3.3</value></pair>
+      <pair><name>FCST_TIME</name>      <value>48</value></pair>
+    </env>
+    <param> \
+      &OUTPUT_DIR;/ref_config_lead_48/pcp_combine/wrf/wrfpcp03_048.nc \
+      &OUTPUT_DIR;/ref_config_lead_48/pcp_combine/ST2_03h/20110904/ST2ml2011090400.03h.nc \
+      &CONFIG_DIR;/ref_config/GridStatConfig_03h \
+      -outdir &OUTPUT_DIR;/ref_config_lead_48/grid_stat -v 1
+    </param>   
+    <output>
+      <stat>&OUTPUT_DIR;/ref_config_lead_48/grid_stat/grid_stat_AFWAv3.4_Noahv3.3_F48_03h_480000L_20110904_000000V.stat</stat>
+    </output>
+  </test>
+
+</met_test>