diff --git a/docs/readthedocs/models/thermal_grid_model.md b/docs/readthedocs/models/thermal_grid_model.md
index c4304e1c03..48b5371b99 100644
--- a/docs/readthedocs/models/thermal_grid_model.md
+++ b/docs/readthedocs/models/thermal_grid_model.md
@@ -3,7 +3,7 @@
 
 The Thermal Grid Model introduces a coupling point to thermal system, equivalent to an electrical node. It can be used to interconnect thermal units to a thermal heat network.
 
-A Thermal Grid Model consists of a {ref}`thermal_house_model` and / or a {ref}`cts_model` which are supplied by a thermal source like a [Heat pump].
+A Thermal Grid Model consists of a {ref}`thermal_house_model` and / or a {ref}`cts_model` which are supplied by a thermal source like a {ref}`hp_model`.
 
 ## Attributes, Units and Remarks
 
diff --git a/src/test/scala/edu/ie3/simona/model/participant/HpModelSpec.scala b/src/test/scala/edu/ie3/simona/model/participant/HpModelSpec.scala
index b6ccba0334..3d5f97f29e 100644
--- a/src/test/scala/edu/ie3/simona/model/participant/HpModelSpec.scala
+++ b/src/test/scala/edu/ie3/simona/model/participant/HpModelSpec.scala
@@ -349,7 +349,8 @@ class HpModelSpec
               (0.0, 0.0, 95.0),
             ),
 
-            // No capacity for flexibility at all
+            // No capacity for flexibility at all because house is
+            // at upperTempBoundary and storage is at max capacity
             (
               ThermalGridState(
                 Some(ThermalHouseState(0L, Celsius(22), Kilowatts(80))),
@@ -372,7 +373,7 @@ class HpModelSpec
               (0.0, 0.0, 0.0),
             ),
 
-            // No capacity for flexibility at all when house has been (external) heated up above upperTemperatureBoundary
+            // No capacity for flexibility at all when storage is full and house has been (externally) heated up above upperTemperatureBoundary
             (
               ThermalGridState(
                 Some(ThermalHouseState(0L, Celsius(25), Kilowatts(0))),
@@ -413,6 +414,10 @@ class HpModelSpec
             val hp = hpModel(grid)
 
             // Create relevant data for the current test
+            // As we are only testing flexOptions here, we can use tick 0
+            // which is also the tick of the lastState.
+            // This should not happen in the simulation!
+            // This can be simplified once the transitoryData is introduced
             val relevantData = hpData.copy(currentTick =
               thermalState.houseState.map(_.tick).getOrElse(0L)
             )
diff --git a/src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseAndStorageSpec.scala b/src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseAndStorageSpec.scala
index e90edcb0a3..1dbf544c19 100644
--- a/src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseAndStorageSpec.scala
+++ b/src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseAndStorageSpec.scala
@@ -447,7 +447,7 @@ class ThermalGridWithHouseAndStorageSpec
                 Some(
                   (
                     ThermalHouseState(houseTick, _, revisedQDotHouse),
-                    Some(HouseTemperatureUpperBoundaryReached(houseColdTick)),
+                    Some(HouseTemperatureUpperBoundaryReached(houseWarmTick)),
                   )
                 ),
                 Some(
@@ -465,7 +465,7 @@ class ThermalGridWithHouseAndStorageSpec
               thermalStorage.chargingPower * (-1)
             )
 
-            houseColdTick shouldBe 3718L
+            houseWarmTick shouldBe 3718L
             storageEmptyTick shouldBe 3678L
           case _ => fail("Revision of states failed")
         }