diff --git a/Overlap/Tests/short_tests.json b/Overlap/Tests/short_tests.json
index b0b0607cf56e89d74ece7e58dba43297a36c51c4..2f8f27d7e30ad36b0843fd329b2cd4311dceced6 100644
--- a/Overlap/Tests/short_tests.json
+++ b/Overlap/Tests/short_tests.json
@@ -151,7 +151,7 @@
                 "-n",
                 "1",
                 "$build_dir/Overlap/test_overlap",
-                "$src_dir/Overlap/Tests/Input/Region_2_SHP_triplet"
+                "$src_dir/Overlap/Tests/Input/Region_2_SHPC"
             ]
         ]
     },
@@ -346,7 +346,7 @@
                 "-n",
                 "1",
                 "$build_dir/Overlap/test_overlap",
-                "$src_dir/Overlap/Tests/Input/Region_6_SHP_triplet"
+                "$src_dir/Overlap/Tests/Input/Region_6_SHPC"
             ]
         ]
     },
@@ -383,7 +383,7 @@
                 "-n",
                 "1",
                 "$build_dir/Overlap/test_get_dispatch_snap",
-                "$src_dir/Tests/Region_1_SHP_triplet_noise"
+                "$src_dir/Tests/Region_1_SHPC_noise"
             ]
         ]
     },
@@ -402,7 +402,7 @@
                 "-n",
                 "2",
                 "$build_dir/Overlap/test_get_dispatch_snap",
-                "$src_dir/Tests/Region_1_SHP_triplet_noise"
+                "$src_dir/Tests/Region_1_SHPC_noise"
             ]
         ]
     },
@@ -415,7 +415,7 @@
             "mpiexec=$mpiexec",
             "$build_dir/Overlap/eddy_graph.sh",
             "1",
-            "$src_dir/Tests/Region_1_SHP_triplet_noise"
+            "$src_dir/Tests/Region_1_SHPC_noise"
         ]
     },
     {
@@ -428,7 +428,7 @@
             "mpiexec=$mpiexec",
             "$build_dir/Overlap/eddy_graph.sh",
             "2",
-            "$src_dir/Tests/Region_1_SHP_triplet_noise"
+            "$src_dir/Tests/Region_1_SHPC_noise"
         ]
     },
     {
@@ -441,7 +441,7 @@
             "mpiexec=$mpiexec",
             "$build_dir/Overlap/eddy_graph.sh",
             "1",
-            "$src_dir/Tests/Region_1_SHP_triplet_noise"
+            "$src_dir/Tests/Region_1_SHPC_noise"
         ]
     },
     {
@@ -454,7 +454,7 @@
             "mpiexec=$mpiexec",
             "$build_dir/Overlap/eddy_graph.sh",
             "1",
-            "$src_dir/Overlap/Tests/Input/Region_2_SHP_triplet"
+            "$src_dir/Overlap/Tests/Input/Region_2_SHPC"
         ]
     },
     {
@@ -467,7 +467,7 @@
             "mpiexec=$mpiexec",
             "$build_dir/Overlap/eddy_graph.sh",
             "2",
-            "$src_dir/Overlap/Tests/Input/Region_2_SHP_triplet"
+            "$src_dir/Overlap/Tests/Input/Region_2_SHPC"
         ]
     },
     {
@@ -480,7 +480,7 @@
             "mpiexec=$mpiexec",
             "$build_dir/Overlap/eddy_graph.sh",
             "1",
-            "$src_dir/Overlap/Tests/Input/Region_2_SHP_triplet"
+            "$src_dir/Overlap/Tests/Input/Region_2_SHPC"
         ]
     },
     {
@@ -493,7 +493,7 @@
             "mpiexec=$mpiexec",
             "$build_dir/Overlap/eddy_graph.sh",
             "1",
-            "$src_dir/Overlap/Tests/Input/Region_2_SHP_triplet"
+            "$src_dir/Overlap/Tests/Input/Region_2_SHPC"
         ]
     },
     {
@@ -506,7 +506,7 @@
             "mpiexec=$mpiexec",
             "$build_dir/Overlap/eddy_graph.sh",
             "1",
-            "$src_dir/Overlap/Tests/Input/Region_2_SHP_triplet"
+            "$src_dir/Overlap/Tests/Input/Region_2_SHPC"
         ]
     },
     {
@@ -519,7 +519,7 @@
             "mpiexec=$mpiexec",
             "$build_dir/Overlap/eddy_graph.sh",
             "1",
-            "$src_dir/Overlap/Tests/Input/Region_2_SHP_triplet"
+            "$src_dir/Overlap/Tests/Input/Region_2_SHPC"
         ]
     },
     {
@@ -532,7 +532,7 @@
             "mpiexec=$mpiexec",
             "$build_dir/Overlap/eddy_graph.sh",
             "1",
-            "$src_dir/Overlap/Tests/Input/Region_2_SHP_triplet"
+            "$src_dir/Overlap/Tests/Input/Region_2_SHPC"
         ]
     },
     {
@@ -545,7 +545,7 @@
             "mpiexec=$mpiexec",
             "$build_dir/Overlap/eddy_graph.sh",
             "1",
-            "$src_dir/Overlap/Tests/Input/Region_2_SHP_triplet"
+            "$src_dir/Overlap/Tests/Input/Region_2_SHPC"
         ]
     },
     {
@@ -558,7 +558,7 @@
             "mpiexec=$mpiexec",
             "$build_dir/Overlap/eddy_graph.sh",
             "2",
-            "$src_dir/Overlap/Tests/Input/Region_2_SHP_triplet"
+            "$src_dir/Overlap/Tests/Input/Region_2_SHPC"
         ]
     },
     {
@@ -571,7 +571,7 @@
             "mpiexec=$mpiexec",
             "$build_dir/Overlap/eddy_graph.sh",
             "3",
-            "$src_dir/Overlap/Tests/Input/Region_2_SHP_triplet"
+            "$src_dir/Overlap/Tests/Input/Region_2_SHPC"
         ]
     },
     {
@@ -584,7 +584,7 @@
             "mpiexec=$mpiexec",
             "$build_dir/Overlap/eddy_graph.sh",
             "1",
-            "$src_dir/Overlap/Tests/Input/Region_2_SHP_triplet"
+            "$src_dir/Overlap/Tests/Input/Region_2_SHPC"
         ]
     },
     {
@@ -597,7 +597,7 @@
             "mpiexec=$mpiexec",
             "$build_dir/Overlap/eddy_graph.sh",
             "1",
-            "$src_dir/Overlap/Tests/Input/Region_2_SHP_triplet"
+            "$src_dir/Overlap/Tests/Input/Region_2_SHPC"
         ]
     },
     {
@@ -610,7 +610,7 @@
             "mpiexec=$mpiexec",
             "$build_dir/Overlap/eddy_graph.sh",
             "1",
-            "$src_dir/Overlap/Tests/Input/Region_2_SHP_triplet"
+            "$src_dir/Overlap/Tests/Input/Region_2_SHPC"
         ]
     },
     {
@@ -623,7 +623,7 @@
             "mpiexec=$mpiexec",
             "$build_dir/Overlap/eddy_graph.sh",
             "1",
-            "$src_dir/Overlap/Tests/Input/Region_2_SHP_triplet"
+            "$src_dir/Overlap/Tests/Input/Region_2_SHPC"
         ]
     },
     {
@@ -636,7 +636,7 @@
             "mpiexec=$mpiexec",
             "$build_dir/Overlap/eddy_graph.sh",
             "2",
-            "$src_dir/Overlap/Tests/Input/Region_2_SHP_triplet"
+            "$src_dir/Overlap/Tests/Input/Region_2_SHPC"
         ]
     },
     {
@@ -649,7 +649,7 @@
             "mpiexec=$mpiexec",
             "$build_dir/Overlap/eddy_graph.sh",
             "3",
-            "$src_dir/Overlap/Tests/Input/Region_2_SHP_triplet"
+            "$src_dir/Overlap/Tests/Input/Region_2_SHPC"
         ]
     },
     {