diff --git a/GEOSagcm_GridComp/GEOShs_GridComp/regression/held-suarez/agcm-simple.yaml b/GEOSagcm_GridComp/GEOShs_GridComp/regression/held-suarez/agcm-simple.yaml
index 7195ad6ba..1dc400958 100644
--- a/GEOSagcm_GridComp/GEOShs_GridComp/regression/held-suarez/agcm-simple.yaml
+++ b/GEOSagcm_GridComp/GEOShs_GridComp/regression/held-suarez/agcm-simple.yaml
@@ -8,12 +8,12 @@ mapl:
     DataMoist:
       dso: libconfigurable_gridcomp
       config_file: data-moist.yaml
-      setservice: setservices_
+      setservices: setservices_
 
     DataAna:
       dso: libconfigurable_gridcomp
       config_file: data-ana.yaml
-      setservice: setservices_
+      setservices: setservices_
 
   connections:
     - src_name: TRADV
diff --git a/GEOSagcm_GridComp/GEOShs_GridComp/regression/run_case.cmake b/GEOSagcm_GridComp/GEOShs_GridComp/regression/run_case.cmake
index 6db4c1d92..451268710 100644
--- a/GEOSagcm_GridComp/GEOShs_GridComp/regression/run_case.cmake
+++ b/GEOSagcm_GridComp/GEOShs_GridComp/regression/run_case.cmake
@@ -17,9 +17,7 @@ function(run_case case_name regression_data_dir)
     compare_results(${checkpoints_dir} ${expdir}/checkpoints/last)
   endif()
 
-  # execute_process(
-  #   COMMAND ${CMAKE_COMMAND} -E rm -rf ${expdir}
-  # )
+  file(REMOVE_RECURSE ${expdir})
 endfunction()
 
-run_case(${TEST_CASE} ${REGRESSION_DATA_DIR})
\ No newline at end of file
+run_case(${TEST_CASE} ${REGRESSION_DATA_DIR})
diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSgwd_GridComp/regression/gwd-ncar-sa/cap.yaml b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSgwd_GridComp/regression/gwd-ncar-sa/cap.yaml
index 08ba71087..4748f9ad7 100644
--- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSgwd_GridComp/regression/gwd-ncar-sa/cap.yaml
+++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSgwd_GridComp/regression/gwd-ncar-sa/cap.yaml
@@ -17,7 +17,7 @@ cap:
       Root:
         dso: libconfigurable_gridcomp
         config_file: root.yaml
-        setservice: setservices_
+        setservices: setservices_
 
   checkpointing:
     enabled: true
diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSgwd_GridComp/regression/gwd-ncar-sa/root.yaml b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSgwd_GridComp/regression/gwd-ncar-sa/root.yaml
index 352716730..3a5976ff6 100644
--- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSgwd_GridComp/regression/gwd-ncar-sa/root.yaml
+++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSgwd_GridComp/regression/gwd-ncar-sa/root.yaml
@@ -19,12 +19,12 @@ mapl:
     GWD:
       dso: libGEOSgwd_GridComp.so
       config_file: gwd.yaml
-      setservice: gwd_setservices_
+      setservices: gwd_setservices_
 
     DataGwdImports:
       dso: libconfigurable_gridcomp
       config_file: data-gwd-imports.yaml
-      setservice: setservices_
+      setservices: setservices_
 
   connections:
     - src_name: PLE
diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSgwd_GridComp/regression/run_case.cmake b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSgwd_GridComp/regression/run_case.cmake
index 0c7683f60..8c495a6d6 100644
--- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSgwd_GridComp/regression/run_case.cmake
+++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSgwd_GridComp/regression/run_case.cmake
@@ -9,8 +9,6 @@ function(run_case case_name regression_data_dir)
 
   set(root_dir ${regression_data_dir}/${case_name})
   set(num_procs "6")
-  set(start_date_time "1891-03-01T00:00:00")
-  set(restart_dir ${root_dir}/checkpoints/${start_date_time})
   set(checkpoints_dir ${root_dir}/checkpoints/last)
 
   if(NOT EXISTS ${root_dir})
@@ -18,14 +16,12 @@ function(run_case case_name regression_data_dir)
     return()
   endif()
 
-  copy_directory(${restart_dir} ${expdir}/checkpoints/${start_date_time})
+  copy_restarts(${root_dir} ${expdir})
   copy_file(${regression_data_dir}/newmfspectra40_dc25.nc ${expdir})
   run_geos(${num_procs} ${case_name} ${expdir})
   compare_results(${checkpoints_dir} ${expdir}/checkpoints/last)
 
-  # execute_process(
-  #   COMMAND ${CMAKE_COMMAND} -E rm -rf ${expdir}
-  # )
+  file(REMOVE_RECURSE ${expdir})
 endfunction()
 
 run_case(${TEST_CASE} ${REGRESSION_DATA_DIR})