diff --git a/Inst_eddies/Tests/long_tests.json b/Inst_eddies/Tests/long_tests.json
index dd6ca63ababbf3e8ab61dfe44cec597ff99014f9..48fab7d67ff803e8ae0f0a597df825f07aaa9bfa 100644
--- a/Inst_eddies/Tests/long_tests.json
+++ b/Inst_eddies/Tests/long_tests.json
@@ -9,7 +9,7 @@
 	    ]
 	],
 	"title": "Set_all_outerm",
-	"input": "&main_nml min_radius = 20./\n"
+	"create_file": ["main_nml.txt", "&main_nml min_radius = 20./\n"]
     },
     {
 	"commands":
@@ -23,7 +23,7 @@
 	    ["$src_dir/Inst_eddies/Tests/Input/h_region_3.nc", "h.nc"],
 	    ["$src_dir/Inst_eddies/Tests/Input/uv_region_3.nc", "uv.nc"]
 	],
-	"input": "&main_nml min_amp = 0./\n",
+	"create_file": ["main_nml.txt", "&main_nml min_amp = 0./\n"],
 	"description": "Larger region, 120 x 120. Includes degenerate extrema."
     },
     {
@@ -38,7 +38,7 @@
 	    ["$src_dir/Inst_eddies/Tests/Input/h_region_3.nc", "h.nc"],
 	    ["$src_dir/Inst_eddies/Tests/Input/uv_region_3.nc", "uv.nc"]
 	],
-	"input": "&main_nml /\n",
+	"create_file": ["main_nml.txt", "&main_nml /\n"],
 	"description":
 	"Same as Extraction_eddies_region_3 except with 1 mm minimum amplitude."
     },
@@ -54,11 +54,11 @@
 	    ["$src_dir/Inst_eddies/Tests/Input/h_region_5.nc", "h.nc"],
 	    ["$src_dir/Inst_eddies/Tests/Input/uv_region_5.nc", "uv.nc"]
 	],
-	"input": "&main_nml /\n",
+	"create_file": ["main_nml.txt", "&main_nml /\n"],
 	"description": "Same as Extraction_eddies_region_4 with larger domain."
     },
     {
-        "input": "&main_nml /\n",
+        "create_file": ["main_nml.txt", "&main_nml /\n"],
         "title": "Extraction_eddies_region_2_noise",
         "command":
 	[
@@ -70,7 +70,7 @@
 	]
     },
     {
-        "input": "&main_nml /\n",
+        "create_file": ["main_nml.txt", "&main_nml /\n"],
         "title": "Region_6",
         "command":
 	[
@@ -81,7 +81,7 @@
         ]
     },
     {
-        "input": "&main_nml /\n",
+        "create_file": ["main_nml.txt", "&main_nml /\n"],
         "title": "Missing_file",
         "command":
 	[
diff --git a/Inst_eddies/Tests/short_tests.json b/Inst_eddies/Tests/short_tests.json
index fc0bb38098bfb1706b18f3bceb39bff1061a0452..7a955b808304470b91b6f12306d6784a0ff67dc9 100644
--- a/Inst_eddies/Tests/short_tests.json
+++ b/Inst_eddies/Tests/short_tests.json
@@ -253,7 +253,7 @@
 	]
     },
     {
-        "input": "&main_nml min_amp = 0./\n",
+        "create_file": ["main_nml.txt", "&main_nml min_amp = 0./\n"],
         "required": [
             ["$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc", "h.nc"],
             ["$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc", "uv.nc"]
@@ -267,7 +267,7 @@
     {
         "description":
 	"Same as Extraction_eddies_region_1 but with non-zero minimal amplitude.",
-        "input": "&main_nml /\n",
+        "create_file": ["main_nml.txt", "&main_nml /\n"],
         "required": [
             ["$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc", "h.nc"],
             ["$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc", "uv.nc"]
@@ -279,7 +279,7 @@
         ]
     },
     {
-        "input": "&main_nml min_amp = 0./\n",
+        "create_file": ["main_nml.txt", "&main_nml min_amp = 0./\n"],
         "required": [
             ["$src_dir/Inst_eddies/Tests/Input/h_region_2.nc", "h.nc"],
             ["$src_dir/Inst_eddies/Tests/Input/uv_region_2.nc", "uv.nc"]
@@ -292,7 +292,7 @@
     },
     {
         "description": "Part of the domain has missing values.",
-        "input": "&main_nml /\n",
+        "create_file": ["main_nml.txt", "&main_nml /\n"],
         "title": "Extraction_eddies_region_4",
         "command":
 	[
@@ -306,7 +306,7 @@
     {
       "description":
       "Like Extraction_eddies_region_4, but for a single date. This is a test of options of the wrapper script rather than a test of the Fortran executable.",
-      "input": "&main_nml /\n",
+      "create_file": ["main_nml.txt", "&main_nml /\n"],
       "title": "Inst_eddies_py",
       "command":
       [
@@ -316,7 +316,7 @@
       ]
     },
     {
-        "input": "&main_nml /\n",
+        "create_file": ["main_nml.txt", "&main_nml /\n"],
         "title": "Inst_eddies_loop",
         "command":
 	[
@@ -335,7 +335,11 @@
     },
     {
         "description": "test_set_all_outerm with periodicity.",
-        "input": "&main_nml MAX_RADIUS_deg = 80., 72., min_radius = 20./\n",
+        "create_file":
+	[
+	    "main_nml.txt",
+	    "&main_nml MAX_RADIUS_deg = 80., 72., min_radius = 20./\n"
+	],
         "title": "Set_all_outerm_periodic",
         "commands":
 	[
@@ -348,7 +352,11 @@
     },
     {
         "description": "Periodic domain.",
-        "input": "&main_nml min_amp = 0., MAX_RADIUS_deg = 80., 72./\n",
+        "create_file":
+	[
+	    "main_nml.txt",
+	    "&main_nml min_amp = 0., MAX_RADIUS_deg = 80., 72./\n"
+	],
         "required": [
             [
                 "$src_dir/Inst_eddies/Tests/Input/h_2006_01_01_coarse.nc",