diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1a7e7ab803..b9a793841e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,10 +13,11 @@ project(
 
 get_directory_property(hasParent PARENT_DIRECTORY)
 if(hasParent)
-  # Unset flags that come from UFS because they (-r8/-r4) conflict
-  # with Ww3
+  # Unset flags that come from Parent (ie UFS or other coupled build) 
+  # for potential (-r8/-r4) conflict
   set(CMAKE_Fortran_FLAGS "")
   set(CMAKE_C_FLAGS "")
+  remove_definitions(-DDEBUG)
 endif()
 
 set(MULTI_ESMF OFF CACHE BOOL "Build ww3_multi_esmf library")
diff --git a/regtests/bin/run_cmake_test b/regtests/bin/run_cmake_test
index 15f0221dc2..f57f2376d4 100755
--- a/regtests/bin/run_cmake_test
+++ b/regtests/bin/run_cmake_test
@@ -367,6 +367,15 @@ fi
 
 mkdir -p $path_w
 
+cd $path_w
+
+if [ $stub ] && [ -f finished ]
+then
+  echo " Test already finished, skipping ..."
+  echo ' '
+  exit 0
+fi
+
 if [ $multi -eq 0 ] && [ $coupl = "OASIS" ]
 then
   ww3_dir=${path_s}/..
@@ -547,13 +556,6 @@ echo " Input directory: $path_i"
 echo " Switch file: $file_c"
 echo ' '
 
-if [ $stub ] && [ -f finished ]
-then
-  echo " Test already finished, skipping ..."
-  echo ' '
-  exit 0
-fi
-
 # 3.b2 Preprocess cdl files into nc files ----------------------------------- #
 
 for f in $(find $path_i/ -type f -name "*.cdl")