diff --git a/ProcessLib/HeatTransportBHE/BHE/BHECommonCoaxial.h b/ProcessLib/HeatTransportBHE/BHE/BHECommonCoaxial.h
index efb715f7a9a7498a98dc35e84f61e56873a29273..60db9261ea18e2aa062a0ac918c02a6f67a4d56e 100644
--- a/ProcessLib/HeatTransportBHE/BHE/BHECommonCoaxial.h
+++ b/ProcessLib/HeatTransportBHE/BHE/BHECommonCoaxial.h
@@ -10,6 +10,7 @@
 #pragma once
 
 #include <Eigen/Eigen>
+#include <optional>
 #include "BHECommon.h"
 #include "FlowAndTemperatureControl.h"
 #include "PipeConfigurationCoaxial.h"
diff --git a/ProcessLib/HeatTransportBHE/BHE/BHE_1P.h b/ProcessLib/HeatTransportBHE/BHE/BHE_1P.h
index b14896c1c47fd0e5aa0dfd53e3cd86c8fe75797b..1c23ae53c1ef6e2ea773343aa7ebd200031f441b 100644
--- a/ProcessLib/HeatTransportBHE/BHE/BHE_1P.h
+++ b/ProcessLib/HeatTransportBHE/BHE/BHE_1P.h
@@ -11,6 +11,7 @@
 #pragma once
 
 #include <Eigen/Eigen>
+#include <optional>
 
 #include "BaseLib/Error.h"
 
diff --git a/ProcessLib/HeatTransportBHE/BHE/BHE_1U.h b/ProcessLib/HeatTransportBHE/BHE/BHE_1U.h
index a699fb256b6eefdd4198865b8f15a9c69123b90f..076e8fbd8b56f7b15c3dc0ce7705c540bbb7b1e6 100644
--- a/ProcessLib/HeatTransportBHE/BHE/BHE_1U.h
+++ b/ProcessLib/HeatTransportBHE/BHE/BHE_1U.h
@@ -11,6 +11,7 @@
 #pragma once
 
 #include <Eigen/Eigen>
+#include <optional>
 
 #include "BaseLib/Error.h"
 
diff --git a/ProcessLib/HeatTransportBHE/BHE/BHE_2U.h b/ProcessLib/HeatTransportBHE/BHE/BHE_2U.h
index 0b0b22756a6939c7eba3184d91b04cbfe4036700..d703b3b79570f6a36fb3dab780e39fdd64212916 100644
--- a/ProcessLib/HeatTransportBHE/BHE/BHE_2U.h
+++ b/ProcessLib/HeatTransportBHE/BHE/BHE_2U.h
@@ -12,6 +12,7 @@
 
 #include <Eigen/Eigen>
 
+#include <optional>
 #include "BaseLib/Error.h"
 
 #include "BHECommon.h"
diff --git a/ProcessLib/HeatTransportBHE/BHE/CreateBHE1PType.cpp b/ProcessLib/HeatTransportBHE/BHE/CreateBHE1PType.cpp
index bcab2a31dac27db71c4f9766fa5d98e7638368e8..2331f513e02a913653ff5259e58f3397c647519f 100644
--- a/ProcessLib/HeatTransportBHE/BHE/CreateBHE1PType.cpp
+++ b/ProcessLib/HeatTransportBHE/BHE/CreateBHE1PType.cpp
@@ -34,9 +34,13 @@ parseBHE1PTypeConfig(
 {
     // if the BHE is using python boundary condition
     auto const bhe_if_use_python_bc_conf =
+        //! \ogs_file_param{prj__processes__process__HEAT_TRANSPORT_BHE__borehole_heat_exchangers__borehole_heat_exchanger__use_bhe_pipe_network}
         config.getConfigParameter<bool>("use_bhe_pipe_network", false);
-    DBUG("If using python boundary condition : %s",
-         (bhe_if_use_python_bc_conf) ? "true" : "false");
+
+    if (bhe_if_use_python_bc_conf)
+    {
+        DBUG("BHE 1P using python boundary conditions.");
+    }
 
     auto const borehole_geometry =
         //! \ogs_file_param{prj__processes__process__HEAT_TRANSPORT_BHE__borehole_heat_exchangers__borehole_heat_exchanger__borehole}
diff --git a/ProcessLib/HeatTransportBHE/Tests.cmake b/ProcessLib/HeatTransportBHE/Tests.cmake
index 58397d29bbb24d04f6a25d7430be8e25a815e38c..05da3e9dcde21c6d85c7f4975e76f2ee3aab45f2 100644
--- a/ProcessLib/HeatTransportBHE/Tests.cmake
+++ b/ProcessLib/HeatTransportBHE/Tests.cmake
@@ -100,7 +100,7 @@ AddTest(
 )
 
 AddTest(
-    NAME HeatTransportBHE_single_pipe_flow_EBHE
+    NAME HeatTransportBHE_single_pipe_flow_EUBHE
     PATH Parabolic/T/BHE_1P
     RUNTIME 60
     EXECUTABLE ogs