diff --git a/IBPSA/Fluid/Geothermal/Aquifer/Validation/NumberWells.mo b/IBPSA/Fluid/Geothermal/Aquifer/Validation/NumberWells.mo
index a8007daf3f..592128c8a9 100644
--- a/IBPSA/Fluid/Geothermal/Aquifer/Validation/NumberWells.mo
+++ b/IBPSA/Fluid/Geothermal/Aquifer/Validation/NumberWells.mo
@@ -31,7 +31,7 @@ model NumberWells
     dp_nominal_hex=0) "ATES with two pairs of wells"
     annotation (Placement(transformation(extent={{-20,-60},{0,-40}})));
   Modelica.Blocks.Sources.Constant mWat(k=1)
-    "Constat value of water mass flow rate"
+    "Constant value of pump control signal"
     annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
   Sources.Boundary_pT bou(redeclare package Medium = IBPSA.Media.Water, nPorts=2) "Sink"
            annotation (Placement(transformation(extent={{60,-10},{40,10}})));
@@ -42,6 +42,7 @@ model NumberWells
     "Temperature output from aquifer model with two pairs of wells"
     annotation (Placement(transformation(extent={{20,40},{40,60}})));
   Utilities.Diagnostics.CheckEquality  cheEqu
+    "Assertion that checks for equality of results"
     annotation (Placement(transformation(extent={{60,60},{80,80}})));
 equation
   connect(mWat.y, aquWel1.u) annotation (Line(points={{-59,0},{-40,0},{-40,36},
diff --git a/IBPSA/Fluid/Geothermal/Aquifer/Validation/SimulationTest.mo b/IBPSA/Fluid/Geothermal/Aquifer/Validation/SimulationTest.mo
index 63a6938cef..bd7d910984 100644
--- a/IBPSA/Fluid/Geothermal/Aquifer/Validation/SimulationTest.mo
+++ b/IBPSA/Fluid/Geothermal/Aquifer/Validation/SimulationTest.mo
@@ -15,20 +15,23 @@ model SimulationTest
     m_flow_nominal=1,
     dp_nominal_aquifer=10,
     dp_nominal_well=10,
-    dp_nominal_hex=0)
+    dp_nominal_hex=0) "Aquifer wells"
     annotation (Placement(transformation(extent={{-20,20},{0,40}})));
-  Sources.Boundary_pT bou(redeclare package Medium = IBPSA.Media.Water, nPorts=
-        1) annotation (Placement(transformation(extent={{60,50},{40,70}})));
-  Modelica.Blocks.Sources.CombiTimeTable combiTimeTable(table=[0.0,-1; 86400*120,
-        -1; 86400*120,0; 86400*180,0; 86400*180,1; 86400*300,1; 86400*300,0])
+  Sources.Boundary_pT bou(
+    redeclare package Medium = IBPSA.Media.Water,
+    nPorts=1) "Boundary condition for pressure"
+           annotation (Placement(transformation(extent={{60,50},{40,70}})));
+  Modelica.Blocks.Sources.CombiTimeTable uPum(table=[0.0,-1; 86400*120,-1; 86400
+        *120,0; 86400*180,0; 86400*180,1; 86400*300,1; 86400*300,0])
+    "Pump control signal"
     annotation (Placement(transformation(extent={{-80,26},{-60,46}})));
 equation
   connect(aquWel.port_Col, aquWel.port_Hot) annotation (Line(points={{-16,40},{
           -16,60},{-4,60},{-4,40}}, color={0,127,255}));
   connect(bou.ports[1], aquWel.port_Hot)
     annotation (Line(points={{40,60},{-4,60},{-4,40}}, color={0,127,255}));
-  connect(combiTimeTable.y[1], aquWel.u) annotation (Line(points={{-59,36},{-22,
-          36}},                   color={0,0,127}));
+  connect(uPum.y[1], aquWel.u)
+    annotation (Line(points={{-59,36},{-22,36}}, color={0,0,127}));
   annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
         coordinateSystem(preserveAspectRatio=false)),
     experiment(StopTime=31536000, Tolerance=1e-6),