diff --git a/testing_and_setup/compass/ocean/Gaussian_hump/USDEQU120cr10rr2/delaware/config_driver.xml b/testing_and_setup/compass/ocean/Gaussian_hump/USDEQU120cr10rr2/delaware/config_driver.xml
index 765e605959..cab3e937cf 100644
--- a/testing_and_setup/compass/ocean/Gaussian_hump/USDEQU120cr10rr2/delaware/config_driver.xml
+++ b/testing_and_setup/compass/ocean/Gaussian_hump/USDEQU120cr10rr2/delaware/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run_test.py">
+	<prerequisite core="ocean" configuration="Gaussian_hump" resolution="USDEQU120cr10rr2" test="build_mesh"/>
 	<case name="init">
 		<step executable="./run.py" quiet="true" pre_message=" * Running init" post_message="     Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/Redi_verification/SouthernOceanSlice40/se_blocks_test/config_driver.xml b/testing_and_setup/compass/ocean/Redi_verification/SouthernOceanSlice40/se_blocks_test/config_driver.xml
index c584770729..be5db12d2e 100644
--- a/testing_and_setup/compass/ocean/Redi_verification/SouthernOceanSlice40/se_blocks_test/config_driver.xml
+++ b/testing_and_setup/compass/ocean/Redi_verification/SouthernOceanSlice40/se_blocks_test/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run.py">
+	<prerequisite core="ocean" configuration="Redi_verification" resolution="SouthernOceanSlice40" test="all"/>
 	<case name="4blocks_run">
 		<step executable="./run.py" quiet="true" pre_message=" * Running 4blocks_run" post_message="  - Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/Redi_verification/SouthernOceanSlice40/thread_test/config_driver.xml b/testing_and_setup/compass/ocean/Redi_verification/SouthernOceanSlice40/thread_test/config_driver.xml
index 557e580b6f..b119d79dab 100644
--- a/testing_and_setup/compass/ocean/Redi_verification/SouthernOceanSlice40/thread_test/config_driver.xml
+++ b/testing_and_setup/compass/ocean/Redi_verification/SouthernOceanSlice40/thread_test/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run.py">
+	<prerequisite core="ocean" configuration="Redi_verification" resolution="SouthernOceanSlice40" test="all"/>
 	<case name="1thread_run">
 		<step executable="./run.py" quiet="true" pre_message=" * Running 1thread_run" post_message="  - Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/drying_slope/hybrid/1km/config_driver.xml b/testing_and_setup/compass/ocean/drying_slope/hybrid/1km/config_driver.xml
index 76b59bd140..962e2d169e 100644
--- a/testing_and_setup/compass/ocean/drying_slope/hybrid/1km/config_driver.xml
+++ b/testing_and_setup/compass/ocean/drying_slope/hybrid/1km/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run_test.py">
+	<prerequisite core="ocean" configuration="drying_slope" resolution="meshes" test="1km"/>
 	<case name="init_step">
 		<step executable="./run.py" quiet="true" pre_message=" * Running init_step" post_message="     Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/drying_slope/hybrid/250m/config_driver.xml b/testing_and_setup/compass/ocean/drying_slope/hybrid/250m/config_driver.xml
index 76b59bd140..df5010fcee 100644
--- a/testing_and_setup/compass/ocean/drying_slope/hybrid/250m/config_driver.xml
+++ b/testing_and_setup/compass/ocean/drying_slope/hybrid/250m/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run_test.py">
+	<prerequisite core="ocean" configuration="drying_slope" resolution="meshes" test="250m"/>
 	<case name="init_step">
 		<step executable="./run.py" quiet="true" pre_message=" * Running init_step" post_message="     Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/drying_slope/marsh_flooding/idealized_transect/config_driver.xml b/testing_and_setup/compass/ocean/drying_slope/marsh_flooding/idealized_transect/config_driver.xml
index 7fa1481248..687f45fc3e 100644
--- a/testing_and_setup/compass/ocean/drying_slope/marsh_flooding/idealized_transect/config_driver.xml
+++ b/testing_and_setup/compass/ocean/drying_slope/marsh_flooding/idealized_transect/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run_test.py">
+	<prerequisite core="ocean" configuration="drying_slope" resolution="meshes" test="idealized_transect"/>
 	<case name="init_step1">
 		<step executable="./run.py" quiet="true" pre_message=" * Running init_step1" post_message="     Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/drying_slope/sigma/1km/config_driver.xml b/testing_and_setup/compass/ocean/drying_slope/sigma/1km/config_driver.xml
index 76b59bd140..962e2d169e 100644
--- a/testing_and_setup/compass/ocean/drying_slope/sigma/1km/config_driver.xml
+++ b/testing_and_setup/compass/ocean/drying_slope/sigma/1km/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run_test.py">
+	<prerequisite core="ocean" configuration="drying_slope" resolution="meshes" test="1km"/>
 	<case name="init_step">
 		<step executable="./run.py" quiet="true" pre_message=" * Running init_step" post_message="     Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/drying_slope/sigma/250m/config_driver.xml b/testing_and_setup/compass/ocean/drying_slope/sigma/250m/config_driver.xml
index 76b59bd140..df5010fcee 100644
--- a/testing_and_setup/compass/ocean/drying_slope/sigma/250m/config_driver.xml
+++ b/testing_and_setup/compass/ocean/drying_slope/sigma/250m/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run_test.py">
+	<prerequisite core="ocean" configuration="drying_slope" resolution="meshes" test="250m"/>
 	<case name="init_step">
 		<step executable="./run.py" quiet="true" pre_message=" * Running init_step" post_message="     Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/drying_slope/zstar/1km/config_driver.xml b/testing_and_setup/compass/ocean/drying_slope/zstar/1km/config_driver.xml
index 76b59bd140..962e2d169e 100644
--- a/testing_and_setup/compass/ocean/drying_slope/zstar/1km/config_driver.xml
+++ b/testing_and_setup/compass/ocean/drying_slope/zstar/1km/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run_test.py">
+	<prerequisite core="ocean" configuration="drying_slope" resolution="meshes" test="1km"/>
 	<case name="init_step">
 		<step executable="./run.py" quiet="true" pre_message=" * Running init_step" post_message="     Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/drying_slope/zstar/250m/config_driver.xml b/testing_and_setup/compass/ocean/drying_slope/zstar/250m/config_driver.xml
index 76b59bd140..df5010fcee 100644
--- a/testing_and_setup/compass/ocean/drying_slope/zstar/250m/config_driver.xml
+++ b/testing_and_setup/compass/ocean/drying_slope/zstar/250m/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run_test.py">
+	<prerequisite core="ocean" configuration="drying_slope" resolution="meshes" test="250m"/>
 	<case name="init_step">
 		<step executable="./run.py" quiet="true" pre_message=" * Running init_step" post_message="     Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/drying_slope/zstar_above_land/1km/config_driver.xml b/testing_and_setup/compass/ocean/drying_slope/zstar_above_land/1km/config_driver.xml
index a34470b250..242fed17e3 100644
--- a/testing_and_setup/compass/ocean/drying_slope/zstar_above_land/1km/config_driver.xml
+++ b/testing_and_setup/compass/ocean/drying_slope/zstar_above_land/1km/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run_test.py">
+	<prerequisite core="ocean" configuration="drying_slope" resolution="meshes" test="1km"/>
 	<case name="init_step">
 		<step executable="./run.py" quiet="true" pre_message=" * Running init_step" post_message="     Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/drying_slope/zstar_variableCd/1km/config_driver.xml b/testing_and_setup/compass/ocean/drying_slope/zstar_variableCd/1km/config_driver.xml
index e0545f3143..d01b703a0e 100644
--- a/testing_and_setup/compass/ocean/drying_slope/zstar_variableCd/1km/config_driver.xml
+++ b/testing_and_setup/compass/ocean/drying_slope/zstar_variableCd/1km/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run_test.py">
+	<prerequisite core="ocean" configuration="drying_slope" resolution="meshes" test="1km"/>
 	<case name="init_step">
 		<step executable="./run.py" quiet="true" pre_message=" * Running init_step" post_message="     Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/drying_slope/zstar_variableManningn/1km/config_driver.xml b/testing_and_setup/compass/ocean/drying_slope/zstar_variableManningn/1km/config_driver.xml
index 54842e5242..77053d7439 100644
--- a/testing_and_setup/compass/ocean/drying_slope/zstar_variableManningn/1km/config_driver.xml
+++ b/testing_and_setup/compass/ocean/drying_slope/zstar_variableManningn/1km/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run_test.py">
+	<prerequisite core="ocean" configuration="drying_slope" resolution="meshes" test="1km"/>
 	<case name="init_step1">
 		<step executable="./run.py" quiet="true" pre_message=" * Running init_step1" post_message="     Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/global_ocean/EC60to30/spin_up/config_driver.xml b/testing_and_setup/compass/ocean/global_ocean/EC60to30/spin_up/config_driver.xml
index eae88eb43b..fde28d2649 100644
--- a/testing_and_setup/compass/ocean/global_ocean/EC60to30/spin_up/config_driver.xml
+++ b/testing_and_setup/compass/ocean/global_ocean/EC60to30/spin_up/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run.py">
+	<prerequisite core="ocean" configuration="global_ocean" resolution="EC60to30" test="init"/>
 	<case name="prep_spin_up1">
 		<step executable="./run.py" quiet="true" pre_message=" * Running prep_spin_up1" post_message=" - Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up/config_driver.xml b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up/config_driver.xml
index eae88eb43b..dd1c6dc4c4 100644
--- a/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up/config_driver.xml
+++ b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run.py">
+	<prerequisite core="ocean" configuration="global_ocean" resolution="EC60to30wISC" test="init"/>
 	<case name="prep_spin_up1">
 		<step executable="./run.py" quiet="true" pre_message=" * Running prep_spin_up1" post_message=" - Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/global_ocean/QU240/analysis_test/config_driver.xml b/testing_and_setup/compass/ocean/global_ocean/QU240/analysis_test/config_driver.xml
index ec9907895a..84d92a935d 100644
--- a/testing_and_setup/compass/ocean/global_ocean/QU240/analysis_test/config_driver.xml
+++ b/testing_and_setup/compass/ocean/global_ocean/QU240/analysis_test/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run.py">
+	<prerequisite core="ocean" configuration="global_ocean" resolution="QU240" test="init"/>
 	<case name="forward">
 		<step executable="./run.py" quiet="true" pre_message=" * Running forward" post_message=" - Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/global_ocean/QU240/bgc_ecosys_test/config_driver.xml b/testing_and_setup/compass/ocean/global_ocean/QU240/bgc_ecosys_test/config_driver.xml
index e6d082be0c..8f0db3e929 100644
--- a/testing_and_setup/compass/ocean/global_ocean/QU240/bgc_ecosys_test/config_driver.xml
+++ b/testing_and_setup/compass/ocean/global_ocean/QU240/bgc_ecosys_test/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run.py">
+	<prerequisite core="ocean" configuration="global_ocean" resolution="QU240" test="init"/>
 	<case name="initial_state">
 		<step executable="./run.py" quiet="true" pre_message=" * Initializing ocean state with bathymetry and tracers..." post_message="     complete!  Created file:  initial_state/initial_state.nc"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/global_ocean/QU240/daily_output_test/config_driver.xml b/testing_and_setup/compass/ocean/global_ocean/QU240/daily_output_test/config_driver.xml
index 3099703654..e2372001fe 100644
--- a/testing_and_setup/compass/ocean/global_ocean/QU240/daily_output_test/config_driver.xml
+++ b/testing_and_setup/compass/ocean/global_ocean/QU240/daily_output_test/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run.py">
+	<prerequisite core="ocean" configuration="global_ocean" resolution="QU240" test="init"/>
 	<case name="test">
 		<step executable="./run.py" quiet="true" pre_message=" * Running test" post_message=" - Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/global_ocean/QU240/performance_test/config_driver.xml b/testing_and_setup/compass/ocean/global_ocean/QU240/performance_test/config_driver.xml
index b04e0f0a0a..ece52c3bda 100644
--- a/testing_and_setup/compass/ocean/global_ocean/QU240/performance_test/config_driver.xml
+++ b/testing_and_setup/compass/ocean/global_ocean/QU240/performance_test/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run.py">
+	<prerequisite core="ocean" configuration="global_ocean" resolution="QU240" test="init"/>
 	<case name="forward">
 		<step executable="./run.py" quiet="true" pre_message=" * Running forward" post_message=" - Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/global_ocean/QU240/restart_test/config_driver.xml b/testing_and_setup/compass/ocean/global_ocean/QU240/restart_test/config_driver.xml
index 5367a8141b..21187846a6 100644
--- a/testing_and_setup/compass/ocean/global_ocean/QU240/restart_test/config_driver.xml
+++ b/testing_and_setup/compass/ocean/global_ocean/QU240/restart_test/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run.py">
+	<prerequisite core="ocean" configuration="global_ocean" resolution="QU240" test="init"/>
 	<case name="full_run">
 		<step executable="./run.py" quiet="true" pre_message=" * Running full_run" post_message="  - Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/global_ocean/QU240/rk4_blocks_test/config_driver.xml b/testing_and_setup/compass/ocean/global_ocean/QU240/rk4_blocks_test/config_driver.xml
index 0f9ae39dbb..431c28beb9 100644
--- a/testing_and_setup/compass/ocean/global_ocean/QU240/rk4_blocks_test/config_driver.xml
+++ b/testing_and_setup/compass/ocean/global_ocean/QU240/rk4_blocks_test/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run.py">
+	<prerequisite core="ocean" configuration="global_ocean" resolution="QU240" test="init"/>
 	<case name="4blocks_run">
 		<step executable="./run.py" quiet="true" pre_message=" * Running 4blocks_run" post_message="  - Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/global_ocean/QU240/rk4_thread_test/config_driver.xml b/testing_and_setup/compass/ocean/global_ocean/QU240/rk4_thread_test/config_driver.xml
index b4959253c7..f460d61c7d 100644
--- a/testing_and_setup/compass/ocean/global_ocean/QU240/rk4_thread_test/config_driver.xml
+++ b/testing_and_setup/compass/ocean/global_ocean/QU240/rk4_thread_test/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run.py">
+	<prerequisite core="ocean" configuration="global_ocean" resolution="QU240" test="init"/>
 	<case name="1thread_run">
 		<step executable="./run.py" quiet="true" pre_message=" * Running 1thread_run" post_message="  - Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/global_ocean/QU240/se_blocks_test/config_driver.xml b/testing_and_setup/compass/ocean/global_ocean/QU240/se_blocks_test/config_driver.xml
index 0f9ae39dbb..431c28beb9 100644
--- a/testing_and_setup/compass/ocean/global_ocean/QU240/se_blocks_test/config_driver.xml
+++ b/testing_and_setup/compass/ocean/global_ocean/QU240/se_blocks_test/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run.py">
+	<prerequisite core="ocean" configuration="global_ocean" resolution="QU240" test="init"/>
 	<case name="4blocks_run">
 		<step executable="./run.py" quiet="true" pre_message=" * Running 4blocks_run" post_message="  - Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/global_ocean/QU240/test/config_driver.xml b/testing_and_setup/compass/ocean/global_ocean/QU240/test/config_driver.xml
deleted file mode 120000
index 3b79358652..0000000000
--- a/testing_and_setup/compass/ocean/global_ocean/QU240/test/config_driver.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../config_files/config_driver_test.xml
\ No newline at end of file
diff --git a/testing_and_setup/compass/ocean/global_ocean/QU240/test/config_driver.xml b/testing_and_setup/compass/ocean/global_ocean/QU240/test/config_driver.xml
new file mode 100644
index 0000000000..cce68352ad
--- /dev/null
+++ b/testing_and_setup/compass/ocean/global_ocean/QU240/test/config_driver.xml
@@ -0,0 +1,11 @@
+<driver_script name="run.py">
+	<prerequisite core="ocean" configuration="global_ocean" resolution="QU240" test="init"/>
+	<case name="test">
+		<step executable="./run.py" quiet="true" pre_message=" * Running short test of ocean model..." post_message="     complete!"/>
+	</case>
+	<validation>
+		<compare_fields file1="forward/output.nc">
+			<template file="prognostic_comparison.xml" path_base="script_core_dir" path="templates/validations"/>
+		</compare_fields>
+	</validation>
+</driver_script>
diff --git a/testing_and_setup/compass/ocean/global_ocean/QU240/thread_test/config_driver.xml b/testing_and_setup/compass/ocean/global_ocean/QU240/thread_test/config_driver.xml
index b4959253c7..f460d61c7d 100644
--- a/testing_and_setup/compass/ocean/global_ocean/QU240/thread_test/config_driver.xml
+++ b/testing_and_setup/compass/ocean/global_ocean/QU240/thread_test/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run.py">
+	<prerequisite core="ocean" configuration="global_ocean" resolution="QU240" test="init"/>
 	<case name="1thread_run">
 		<step executable="./run.py" quiet="true" pre_message=" * Running 1thread_run" post_message="  - Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/global_ocean/SO60to10wISC/spin_up/config_driver.xml b/testing_and_setup/compass/ocean/global_ocean/SO60to10wISC/spin_up/config_driver.xml
index 5c19fd9d67..9d9165ea05 100644
--- a/testing_and_setup/compass/ocean/global_ocean/SO60to10wISC/spin_up/config_driver.xml
+++ b/testing_and_setup/compass/ocean/global_ocean/SO60to10wISC/spin_up/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run.py">
+	<prerequisite core="ocean" configuration="global_ocean" resolution="SO60to10wISC" test="init"/>
 	<case name="prep_spin_up1">
 		<step executable="./run.py" quiet="true" pre_message=" * Running prep_spin_up1" post_message=" - Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/global_ocean/WC12/spin_up/config_driver.xml b/testing_and_setup/compass/ocean/global_ocean/WC12/spin_up/config_driver.xml
index a1069b0180..b2ae7dc14c 100644
--- a/testing_and_setup/compass/ocean/global_ocean/WC12/spin_up/config_driver.xml
+++ b/testing_and_setup/compass/ocean/global_ocean/WC12/spin_up/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run.py">
+	<prerequisite core="ocean" configuration="global_ocean" resolution="WC12" test="init"/>
 	<case name="spin_up1">
 		<step executable="./run.py" quiet="true" pre_message=" * Running spin_up1" post_message=" - Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/global_ocean/WC14/spin_up/config_driver.xml b/testing_and_setup/compass/ocean/global_ocean/WC14/spin_up/config_driver.xml
index a1069b0180..6c06214281 100644
--- a/testing_and_setup/compass/ocean/global_ocean/WC14/spin_up/config_driver.xml
+++ b/testing_and_setup/compass/ocean/global_ocean/WC14/spin_up/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run.py">
+	<prerequisite core="ocean" configuration="global_ocean" resolution="WC14" test="init"/>
 	<case name="spin_up1">
 		<step executable="./run.py" quiet="true" pre_message=" * Running spin_up1" post_message=" - Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2/sandy/config_driver.xml b/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2/sandy/config_driver.xml
deleted file mode 120000
index 541fb6e756..0000000000
--- a/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2/sandy/config_driver.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../config_files/config_driver.xml
\ No newline at end of file
diff --git a/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2/sandy/config_driver.xml b/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2/sandy/config_driver.xml
new file mode 100644
index 0000000000..316a9817e3
--- /dev/null
+++ b/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2/sandy/config_driver.xml
@@ -0,0 +1,9 @@
+<driver_script name="run_test.py">
+	<prerequisite core="ocean" configuration="hurricane" resolution="USDEQU120at30cr10rr2" test="build_mesh"/>
+	<case name="init">
+		<step executable="./run.py" quiet="true" pre_message=" * Running init" post_message="     Complete"/>
+	</case>
+	<case name="forward">
+		<step executable="./run.py" quiet="true" pre_message=" * Running forward" post_message="     Complete"/>
+	</case>
+</driver_script>
diff --git a/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2/synthetic_sandy/config_driver.xml b/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2/synthetic_sandy/config_driver.xml
index 3bf0b55047..e11f7bb5aa 100644
--- a/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2/synthetic_sandy/config_driver.xml
+++ b/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2/synthetic_sandy/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run_test.py">
+	<prerequisite core="ocean" configuration="hurricane" resolution="USDEQU120at30cr10rr2" test="build_mesh"/>
 	<case name="init">
 		<step executable="./run.py" quiet="true" pre_message=" * Running init" post_message="     Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2WD/sandy/config_driver.xml b/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2WD/sandy/config_driver.xml
deleted file mode 120000
index d11838e423..0000000000
--- a/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2WD/sandy/config_driver.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../config_files_WD/config_driver.xml
\ No newline at end of file
diff --git a/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2WD/sandy/config_driver.xml b/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2WD/sandy/config_driver.xml
new file mode 100644
index 0000000000..54ed741cf7
--- /dev/null
+++ b/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2WD/sandy/config_driver.xml
@@ -0,0 +1,9 @@
+<driver_script name="run.py">
+	<prerequisite core="ocean" configuration="hurricane" resolution="USDEQU120at30cr10rr2WD" test="build_mesh"/>
+	<case name="init">
+		<step executable="./run.py" quiet="true" pre_message=" * Running init" post_message="     Complete"/>
+	</case>
+	<case name="forward_RK4">
+		<step executable="./run.py" quiet="true" pre_message=" * Running forward RK4" post_message="     Complete"/>
+	</case>
+</driver_script>
diff --git a/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2WD_veg/sandy/config_driver.xml b/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2WD_veg/sandy/config_driver.xml
index 2bbc9940c7..45a60691b6 100644
--- a/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2WD_veg/sandy/config_driver.xml
+++ b/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2WD_veg/sandy/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run_test.py">
+	<prerequisite core="ocean" configuration="hurricane" resolution="USDEQU120at30cr10rr2WD_veg" test="build_mesh"/>
 	<case name="init">
 		<step executable="./run.py" quiet="true" pre_message=" * Running init" post_message="     Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/hurricane/USDEQU240at60cr20rr4/sandy/config_driver.xml b/testing_and_setup/compass/ocean/hurricane/USDEQU240at60cr20rr4/sandy/config_driver.xml
index ee0e2ef29a..b6edb84778 100644
--- a/testing_and_setup/compass/ocean/hurricane/USDEQU240at60cr20rr4/sandy/config_driver.xml
+++ b/testing_and_setup/compass/ocean/hurricane/USDEQU240at60cr20rr4/sandy/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run_test.py">
+	<prerequisite core="ocean" configuration="hurricane" resolution="USDEQU240at60cr20rr4" test="build_mesh"/>
 	<case name="init">
 		<step executable="./run.py" quiet="true" pre_message=" * Running init" post_message="     Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/hurricane/USDEQU240at60cr20rr4/synthetic_sandy/config_driver.xml b/testing_and_setup/compass/ocean/hurricane/USDEQU240at60cr20rr4/synthetic_sandy/config_driver.xml
index 3bf0b55047..868997c378 100644
--- a/testing_and_setup/compass/ocean/hurricane/USDEQU240at60cr20rr4/synthetic_sandy/config_driver.xml
+++ b/testing_and_setup/compass/ocean/hurricane/USDEQU240at60cr20rr4/synthetic_sandy/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run_test.py">
+	<prerequisite core="ocean" configuration="hurricane" resolution="USDEQU240at60cr20rr4" test="build_mesh"/>
 	<case name="init">
 		<step executable="./run.py" quiet="true" pre_message=" * Running init" post_message="     Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/hurricane/USDEQU240at60cr20rr4WD/sandy/config_driver.xml b/testing_and_setup/compass/ocean/hurricane/USDEQU240at60cr20rr4WD/sandy/config_driver.xml
deleted file mode 120000
index d11838e423..0000000000
--- a/testing_and_setup/compass/ocean/hurricane/USDEQU240at60cr20rr4WD/sandy/config_driver.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../config_files_WD/config_driver.xml
\ No newline at end of file
diff --git a/testing_and_setup/compass/ocean/hurricane/USDEQU240at60cr20rr4WD/sandy/config_driver.xml b/testing_and_setup/compass/ocean/hurricane/USDEQU240at60cr20rr4WD/sandy/config_driver.xml
new file mode 100644
index 0000000000..d5e9367836
--- /dev/null
+++ b/testing_and_setup/compass/ocean/hurricane/USDEQU240at60cr20rr4WD/sandy/config_driver.xml
@@ -0,0 +1,9 @@
+<driver_script name="run.py">
+	<prerequisite core="ocean" configuration="hurricane" resolution="USDEQU240at60cr20rr4WD" test="build_mesh"/>
+	<case name="init">
+		<step executable="./run.py" quiet="true" pre_message=" * Running init" post_message="     Complete"/>
+	</case>
+	<case name="forward_RK4">
+		<step executable="./run.py" quiet="true" pre_message=" * Running forward RK4" post_message="     Complete"/>
+	</case>
+</driver_script>
diff --git a/testing_and_setup/compass/ocean/hurricane/USDEQU240at60cr20rr4WD/synthetic_sandy/config_driver.xml b/testing_and_setup/compass/ocean/hurricane/USDEQU240at60cr20rr4WD/synthetic_sandy/config_driver.xml
index 3bf0b55047..aece163c42 100644
--- a/testing_and_setup/compass/ocean/hurricane/USDEQU240at60cr20rr4WD/synthetic_sandy/config_driver.xml
+++ b/testing_and_setup/compass/ocean/hurricane/USDEQU240at60cr20rr4WD/synthetic_sandy/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run_test.py">
+	<prerequisite core="ocean" configuration="hurricane" resolution="USDEQU240at60cr20rr4WD" test="build_mesh"/>
 	<case name="init">
 		<step executable="./run.py" quiet="true" pre_message=" * Running init" post_message="     Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/hurricane/USDEQU240at60cr20rr4WD_veg/sandy/config_driver.xml b/testing_and_setup/compass/ocean/hurricane/USDEQU240at60cr20rr4WD_veg/sandy/config_driver.xml
index 2bbc9940c7..4dd2235e1a 100644
--- a/testing_and_setup/compass/ocean/hurricane/USDEQU240at60cr20rr4WD_veg/sandy/config_driver.xml
+++ b/testing_and_setup/compass/ocean/hurricane/USDEQU240at60cr20rr4WD_veg/sandy/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run_test.py">
+	<prerequisite core="ocean" configuration="hurricane" resolution="USDEQU240at60cr20rr4WD_veg" test="build_mesh"/>
 	<case name="init">
 		<step executable="./run.py" quiet="true" pre_message=" * Running init" post_message="     Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/hurricane/USDEQU60at15cr5rr1/sandy/config_driver.xml b/testing_and_setup/compass/ocean/hurricane/USDEQU60at15cr5rr1/sandy/config_driver.xml
deleted file mode 120000
index 541fb6e756..0000000000
--- a/testing_and_setup/compass/ocean/hurricane/USDEQU60at15cr5rr1/sandy/config_driver.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../config_files/config_driver.xml
\ No newline at end of file
diff --git a/testing_and_setup/compass/ocean/hurricane/USDEQU60at15cr5rr1/sandy/config_driver.xml b/testing_and_setup/compass/ocean/hurricane/USDEQU60at15cr5rr1/sandy/config_driver.xml
new file mode 100644
index 0000000000..eb9ec81157
--- /dev/null
+++ b/testing_and_setup/compass/ocean/hurricane/USDEQU60at15cr5rr1/sandy/config_driver.xml
@@ -0,0 +1,9 @@
+<driver_script name="run_test.py">
+	<prerequisite core="ocean" configuration="hurricane" resolution="USDEQU60at15cr5rr1" test="build_mesh"/>
+	<case name="init">
+		<step executable="./run.py" quiet="true" pre_message=" * Running init" post_message="     Complete"/>
+	</case>
+	<case name="forward">
+		<step executable="./run.py" quiet="true" pre_message=" * Running forward" post_message="     Complete"/>
+	</case>
+</driver_script>
diff --git a/testing_and_setup/compass/ocean/hurricane/USDEQU60at15cr5rr100WD/sandy/config_driver.xml b/testing_and_setup/compass/ocean/hurricane/USDEQU60at15cr5rr100WD/sandy/config_driver.xml
index be1976f5c8..a404821290 100644
--- a/testing_and_setup/compass/ocean/hurricane/USDEQU60at15cr5rr100WD/sandy/config_driver.xml
+++ b/testing_and_setup/compass/ocean/hurricane/USDEQU60at15cr5rr100WD/sandy/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run_test.py">
+	<prerequisite core="ocean" configuration="hurricane" resolution="USDEQU60at15cr5rr100WD" test="build_mesh"/>
 	<case name="init">
 		<step executable="./run.py" quiet="true" pre_message=" * Running init" post_message="     Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/hurricane/USDEQU60at15cr5rr1WD/sandy/config_driver.xml b/testing_and_setup/compass/ocean/hurricane/USDEQU60at15cr5rr1WD/sandy/config_driver.xml
deleted file mode 120000
index d11838e423..0000000000
--- a/testing_and_setup/compass/ocean/hurricane/USDEQU60at15cr5rr1WD/sandy/config_driver.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../config_files_WD/config_driver.xml
\ No newline at end of file
diff --git a/testing_and_setup/compass/ocean/hurricane/USDEQU60at15cr5rr1WD/sandy/config_driver.xml b/testing_and_setup/compass/ocean/hurricane/USDEQU60at15cr5rr1WD/sandy/config_driver.xml
new file mode 100644
index 0000000000..8be5049454
--- /dev/null
+++ b/testing_and_setup/compass/ocean/hurricane/USDEQU60at15cr5rr1WD/sandy/config_driver.xml
@@ -0,0 +1,9 @@
+<driver_script name="run.py">
+	<prerequisite core="ocean" configuration="hurricane" resolution="USDEQU60at15cr5rr1WD" test="build_mesh"/>
+	<case name="init">
+		<step executable="./run.py" quiet="true" pre_message=" * Running init" post_message="     Complete"/>
+	</case>
+	<case name="forward_RK4">
+		<step executable="./run.py" quiet="true" pre_message=" * Running forward RK4" post_message="     Complete"/>
+	</case>
+</driver_script>
diff --git a/testing_and_setup/compass/ocean/hurricane/USDEQU60at15cr5rr1WD_veg/sandy/config_driver.xml b/testing_and_setup/compass/ocean/hurricane/USDEQU60at15cr5rr1WD_veg/sandy/config_driver.xml
index 2bbc9940c7..c50904a2ef 100644
--- a/testing_and_setup/compass/ocean/hurricane/USDEQU60at15cr5rr1WD_veg/sandy/config_driver.xml
+++ b/testing_and_setup/compass/ocean/hurricane/USDEQU60at15cr5rr1WD_veg/sandy/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run_test.py">
+	<prerequisite core="ocean" configuration="hurricane" resolution="USDEQU60at15cr5rr1WD_veg" test="build_mesh"/>
 	<case name="init">
 		<step executable="./run.py" quiet="true" pre_message=" * Running init" post_message="     Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/hurricane/USDEQU60at15cr5rr250WD/sandy/config_driver.xml b/testing_and_setup/compass/ocean/hurricane/USDEQU60at15cr5rr250WD/sandy/config_driver.xml
index be1976f5c8..94ba414039 100644
--- a/testing_and_setup/compass/ocean/hurricane/USDEQU60at15cr5rr250WD/sandy/config_driver.xml
+++ b/testing_and_setup/compass/ocean/hurricane/USDEQU60at15cr5rr250WD/sandy/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run_test.py">
+	<prerequisite core="ocean" configuration="hurricane" resolution="USDEQU60at15cr5rr250WD" test="build_mesh"/>
 	<case name="init">
 		<step executable="./run.py" quiet="true" pre_message=" * Running init" post_message="     Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/hurricane/USDEQU60at15cr5rr500WD/sandy/config_driver.xml b/testing_and_setup/compass/ocean/hurricane/USDEQU60at15cr5rr500WD/sandy/config_driver.xml
index be1976f5c8..8d4a0cc95a 100644
--- a/testing_and_setup/compass/ocean/hurricane/USDEQU60at15cr5rr500WD/sandy/config_driver.xml
+++ b/testing_and_setup/compass/ocean/hurricane/USDEQU60at15cr5rr500WD/sandy/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run_test.py">
+	<prerequisite core="ocean" configuration="hurricane" resolution="USDEQU60at15cr5rr500WD" test="build_mesh"/>
 	<case name="init">
 		<step executable="./run.py" quiet="true" pre_message=" * Running init" post_message="     Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/hurricane/config_files/config_driver.xml b/testing_and_setup/compass/ocean/hurricane/config_files/config_driver.xml
deleted file mode 100644
index 765e605959..0000000000
--- a/testing_and_setup/compass/ocean/hurricane/config_files/config_driver.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<driver_script name="run_test.py">
-	<case name="init">
-		<step executable="./run.py" quiet="true" pre_message=" * Running init" post_message="     Complete"/>
-	</case>
-	<case name="forward">
-		<step executable="./run.py" quiet="true" pre_message=" * Running forward" post_message="     Complete"/>
-	</case>
-</driver_script>
diff --git a/testing_and_setup/compass/ocean/hurricane/config_files_WD/config_driver.xml b/testing_and_setup/compass/ocean/hurricane/config_files_WD/config_driver.xml
deleted file mode 100644
index eb3901ef96..0000000000
--- a/testing_and_setup/compass/ocean/hurricane/config_files_WD/config_driver.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<driver_script name="run.py">
-	<case name="init">
-		<step executable="./run.py" quiet="true" pre_message=" * Running init" post_message="     Complete"/>
-	</case>
-	<case name="forward_RK4">
-		<step executable="./run.py" quiet="true" pre_message=" * Running forward RK4" post_message="     Complete"/>
-	</case>
-</driver_script>
diff --git a/testing_and_setup/compass/ocean/tides/USDEQU120at30cr10/harmonic_analysis_test/config_driver.xml b/testing_and_setup/compass/ocean/tides/USDEQU120at30cr10/harmonic_analysis_test/config_driver.xml
index 765e605959..b9971d7ce8 100644
--- a/testing_and_setup/compass/ocean/tides/USDEQU120at30cr10/harmonic_analysis_test/config_driver.xml
+++ b/testing_and_setup/compass/ocean/tides/USDEQU120at30cr10/harmonic_analysis_test/config_driver.xml
@@ -1,4 +1,5 @@
 <driver_script name="run_test.py">
+	<prerequisite core="ocean" configuration="tides" resolution="USDEQU120at30cr10" test="build_mesh"/>
 	<case name="init">
 		<step executable="./run.py" quiet="true" pre_message=" * Running init" post_message="     Complete"/>
 	</case>