diff --git a/Inst_eddies/Analysis/tests.json b/Inst_eddies/Analysis/tests.json
index b579aa33826d1dc5d6686d248e05e0884b9a8b59..39b5bca085af7be2f2abeed469928d55b077dbab 100644
--- a/Inst_eddies/Analysis/tests.json
+++ b/Inst_eddies/Analysis/tests.json
@@ -40,7 +40,7 @@
 	"command":
 	[
 	    "$src_dir/Inst_eddies/Analysis/plot_eddy_contours.py",
-	    "$src_dir/Overlap/Tests/Input/Region_4/Eddies_region_4", "--grid",
+	    "$src_dir/Tests/Eddies_region_4", "--grid",
 	    "--save=png"
 	],
 	"description": "With grid option.",
diff --git a/Overlap/Tests/short_tests.json b/Overlap/Tests/short_tests.json
index 86ddbb5625a961fc5b2b5d172c088d23a5ed5827..8e89579f9c834bdb6bae73002dc4608e95f9f1b2 100644
--- a/Overlap/Tests/short_tests.json
+++ b/Overlap/Tests/short_tests.json
@@ -22,7 +22,7 @@
         "title": "Read_eddy",
         "required": [
             [
-                "$src_dir/Overlap/Tests/Input/Region_4/Eddies_region_4",
+                "$src_dir/Tests/Eddies_region_4",
                 "SHP_triplet_old"
             ]
         ],
@@ -54,7 +54,7 @@
                 "-n",
                 "1",
                 "$build_dir/Overlap/test_read_snapshot",
-                "$src_dir/Overlap/Tests/Input/Region_4/Eddies_region_4"
+                "$src_dir/Tests/Eddies_region_4"
             ]
         ]
     },
@@ -73,7 +73,7 @@
                 "-n",
                 "1",
                 "$build_dir/Overlap/test_overlap",
-                "$src_dir/Overlap/Tests/Input/Region_4/Eddies_region_4"
+                "$src_dir/Tests/Eddies_region_4"
             ]
         ]
     },
@@ -130,7 +130,7 @@
                 "-n",
                 "1",
                 "$build_dir/Overlap/test_overlap",
-                "$src_dir/Overlap/Tests/Input/Region_4/Eddies_region_4"
+                "$src_dir/Tests/Eddies_region_4"
             ]
         ]
     },
@@ -267,7 +267,7 @@
                 "-n",
                 "1",
                 "$build_dir/Overlap/test_overlap",
-                "$src_dir/Overlap/Tests/Input/Region_4/Eddies_region_4"
+                "$src_dir/Tests/Eddies_region_4"
             ]
         ]
     },
@@ -287,7 +287,7 @@
                 "-n",
                 "1",
                 "$build_dir/Overlap/test_overlap",
-                "$src_dir/Overlap/Tests/Input/Region_4/Eddies_region_4"
+                "$src_dir/Tests/Eddies_region_4"
             ]
         ]
     },
@@ -365,7 +365,7 @@
                 "-n",
                 "2",
                 "$build_dir/Overlap/test_send_recv",
-                "$src_dir/Overlap/Tests/Input/Region_4/Eddies_region_4"
+                "$src_dir/Tests/Eddies_region_4"
             ]
         ]
     },
diff --git a/Overlap/Tests/Input/Region_4/Eddies_region_4/extremum.dbf b/Tests/Eddies_region_4/extremum.dbf
similarity index 100%
rename from Overlap/Tests/Input/Region_4/Eddies_region_4/extremum.dbf
rename to Tests/Eddies_region_4/extremum.dbf
diff --git a/Overlap/Tests/Input/Region_4/Eddies_region_4/extremum.shp b/Tests/Eddies_region_4/extremum.shp
similarity index 100%
rename from Overlap/Tests/Input/Region_4/Eddies_region_4/extremum.shp
rename to Tests/Eddies_region_4/extremum.shp
diff --git a/Overlap/Tests/Input/Region_4/Eddies_region_4/extremum.shx b/Tests/Eddies_region_4/extremum.shx
similarity index 100%
rename from Overlap/Tests/Input/Region_4/Eddies_region_4/extremum.shx
rename to Tests/Eddies_region_4/extremum.shx
diff --git a/Overlap/Tests/Input/Region_4/Eddies_region_4/grid_nml.txt b/Tests/Eddies_region_4/grid_nml.txt
similarity index 100%
rename from Overlap/Tests/Input/Region_4/Eddies_region_4/grid_nml.txt
rename to Tests/Eddies_region_4/grid_nml.txt
diff --git a/Overlap/Tests/Input/Region_4/Eddies_region_4/ishape_last.txt b/Tests/Eddies_region_4/ishape_last.txt
similarity index 100%
rename from Overlap/Tests/Input/Region_4/Eddies_region_4/ishape_last.txt
rename to Tests/Eddies_region_4/ishape_last.txt
diff --git a/Overlap/Tests/Input/Region_4/Eddies_region_4/max_speed_contour.dbf b/Tests/Eddies_region_4/max_speed_contour.dbf
similarity index 100%
rename from Overlap/Tests/Input/Region_4/Eddies_region_4/max_speed_contour.dbf
rename to Tests/Eddies_region_4/max_speed_contour.dbf
diff --git a/Overlap/Tests/Input/Region_4/Eddies_region_4/max_speed_contour.shp b/Tests/Eddies_region_4/max_speed_contour.shp
similarity index 100%
rename from Overlap/Tests/Input/Region_4/Eddies_region_4/max_speed_contour.shp
rename to Tests/Eddies_region_4/max_speed_contour.shp
diff --git a/Overlap/Tests/Input/Region_4/Eddies_region_4/max_speed_contour.shx b/Tests/Eddies_region_4/max_speed_contour.shx
similarity index 100%
rename from Overlap/Tests/Input/Region_4/Eddies_region_4/max_speed_contour.shx
rename to Tests/Eddies_region_4/max_speed_contour.shx
diff --git a/Overlap/Tests/Input/Region_4/Eddies_region_4/outermost_contour.dbf b/Tests/Eddies_region_4/outermost_contour.dbf
similarity index 100%
rename from Overlap/Tests/Input/Region_4/Eddies_region_4/outermost_contour.dbf
rename to Tests/Eddies_region_4/outermost_contour.dbf
diff --git a/Overlap/Tests/Input/Region_4/Eddies_region_4/outermost_contour.shp b/Tests/Eddies_region_4/outermost_contour.shp
similarity index 100%
rename from Overlap/Tests/Input/Region_4/Eddies_region_4/outermost_contour.shp
rename to Tests/Eddies_region_4/outermost_contour.shp
diff --git a/Overlap/Tests/Input/Region_4/Eddies_region_4/outermost_contour.shx b/Tests/Eddies_region_4/outermost_contour.shx
similarity index 100%
rename from Overlap/Tests/Input/Region_4/Eddies_region_4/outermost_contour.shx
rename to Tests/Eddies_region_4/outermost_contour.shx
diff --git a/Overlap/Tests/Input/Region_4/Eddies_region_4/used_nml.txt b/Tests/Eddies_region_4/used_nml.txt
similarity index 100%
rename from Overlap/Tests/Input/Region_4/Eddies_region_4/used_nml.txt
rename to Tests/Eddies_region_4/used_nml.txt