diff --git a/tests/Iberia/BuildHTUs_IP.pbs b/tests/Iberia/BuildHTUs_IP.pbs
index 06bcf7d51b64fd29396caaaba39601c3b3bb322b..a3758c43eb5476ff9d8cf787cf52eb27f9ce7642 100644
--- a/tests/Iberia/BuildHTUs_IP.pbs
+++ b/tests/Iberia/BuildHTUs_IP.pbs
@@ -24,13 +24,13 @@ source ../../Environment
 cp run_MEDCORDEX.def run.def
 mpirun -n ${NSLOTS} python ../../RoutingPreProc.py
 if [ $? -gt 0 ] ; then
-    echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    echo "X    MEDCORDEX Run on Iberian Peninsula failed    X"
-    echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+    echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXZZ"
+    echo "X    MEDCORDEX Run on Iberian Peninsula failed    XZZ"
+    echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXZZ"
 else
-    echo "================================================="
-    echo "= MEDCORDEX Run on Iberian Peninsula successful ="
-    echo "================================================="
+    echo "=================================================ZZ"
+    echo "= MEDCORDEX Run on Iberian Peninsula successful =ZZ"
+    echo "=================================================ZZ"
 fi
 #
 /bin/rm -f Out_RoutingReg_*.txt Weight_proc_*.txt
@@ -40,11 +40,11 @@ fi
 cp run_regular.def run.def
 mpirun -n ${NSLOTS} python ../../RoutingPreProc.py
 if [ $? -gt 0 ] ; then
-    echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    echo "X    Regular grid run on Iberian Peninsula failed    X"
-    echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+    echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXZZ"
+    echo "X    Regular grid run on Iberian Peninsula failed    XZZ"
+    echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXZZ"
 else
-    echo "===================================================="
-    echo "= Regular grid run on Iberian Peninsula successful ="
-    echo "===================================================="
+    echo "====================================================ZZ"
+    echo "= Regular grid run on Iberian Peninsula successful =ZZ"
+    echo "====================================================ZZ"
 fi
diff --git a/tests/Iberia/Structures.txt b/tests/Iberia/Structures.txt
new file mode 100644
index 0000000000000000000000000000000000000000..8a8434f2f17f11c7ab1fb79631c9c5a54c2135e7
--- /dev/null
+++ b/tests/Iberia/Structures.txt
@@ -0,0 +1,3 @@
+#ID   Lon(decimal)   lat   upstream area (km^2)   Type-keyword  Name
+1   4.81711944444   43.9761722222   77055   Run-of-river Test Station A
+2   4.81089722222   44.8239166667   66757   Run-of-river Test station B
diff --git a/tests/Iberia/run_MEDCORDEX.def b/tests/Iberia/run_MEDCORDEX.def
index c16a2c33fea8f921416025908520db3233478954..f23c3338a0aea1dfbf1d5d5d51ebaef5b1a803a6 100644
--- a/tests/Iberia/run_MEDCORDEX.def
+++ b/tests/Iberia/run_MEDCORDEX.def
@@ -30,4 +30,5 @@ GraphFile = MEDCORDEX_Spain_graph.nc
 MaxDistErr = 25.0
 # Maximum error in the upstream area in %
 MaxUpstrErr = 10.0
+StructuresFile = Structures.txt
 GRDCFile = ../../Stations/Station_Metadata.nc
diff --git a/tests/Iberia/run_regular.def b/tests/Iberia/run_regular.def
index 463e36e976f5a72687a5323d312892ae2d044bcc..992b12422afc2e4edc4b56f4ab11a646cc4a5e30 100644
--- a/tests/Iberia/run_regular.def
+++ b/tests/Iberia/run_regular.def
@@ -6,7 +6,7 @@ EarthRadius = 6370000.
 #
 ModelGridFile = /bdd/MEDI/workspaces/polcher/NewRouting/EM_WFDEI_CRU_2000.nc 
 WEST_EAST = -9.75, 5.25
-SOUTH_NORTH = 35.5, 43.5
+SOUTH_NORTH = 35.5, 44.5
 HydroFile = /bdd/ORCHIDEE_Forcing/Routing/Hydro4ORCH/HydroSHEDS_MED.nc
 #
 # FORTRAN interface parameters
@@ -25,3 +25,11 @@ numop = 100
 #
 GraphFile = EM_WFDEI_Spain_graph.nc
 #
+# File containing infrastructures to be placed.
+# Maximum error in the distance of the station in km^2
+MaxDistErr = 25.0
+# Maximum error in the upstream area in %
+MaxUpstrErr = 10.0
+StructuresFile = Structures.txt
+GRDCFile = ../../Stations/Station_Metadata.nc
+#