diff --git a/FluidDynamics/BaseClasses/test_Condensation.mo b/FluidDynamics/BaseClasses/test_Condensation.mo
index 39548685c9874630297b238a01676b37fb244476..581867a738580f7a4656036e006ac27fcc333825 100644
--- a/FluidDynamics/BaseClasses/test_Condensation.mo
+++ b/FluidDynamics/BaseClasses/test_Condensation.mo
@@ -16,4 +16,6 @@ equation
     Line(points = {{60, 0}, {16, 0}, {16, 0}, {18, 0}}, color = {191, 0, 0}));
   connect(h_cv.y, condensation.h_cv) annotation(
     Line(points = {{-58, 70}, {-30, 70}, {-30, 12}, {-16, 12}, {-16, 12}}, color = {0, 0, 127}));
-end test_Condensation;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_Condensation;
\ No newline at end of file
diff --git a/FluidDynamics/BaseClasses/test_FreeAeraulicConvection.mo b/FluidDynamics/BaseClasses/test_FreeAeraulicConvection.mo
index ed72e1b53d7a6a71b23fc14451c07a1f73626680..44b8e1e5262da4e833169f6612cbe2c6b37e10da 100644
--- a/FluidDynamics/BaseClasses/test_FreeAeraulicConvection.mo
+++ b/FluidDynamics/BaseClasses/test_FreeAeraulicConvection.mo
@@ -20,4 +20,6 @@ equation
     Line(points = {{-2, 18}, {-2, 40}, {32, 40}, {32, 0}, {60, 0}}, color = {0, 85, 255}));
   connect(atmosphere.Flowport, freeAeraulicConvection.flowPort_down) annotation(
     Line(points = {{60, 0}, {32, 0}, {32, -40}, {-2, -40}, {-2, -18}}, color = {0, 85, 255}));
-end test_FreeAeraulicConvection;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_FreeAeraulicConvection;
\ No newline at end of file
diff --git a/FluidDynamics/BaseClasses/test_FreeConvection.mo b/FluidDynamics/BaseClasses/test_FreeConvection.mo
index b72a44558f8028a0e91f7e11f2a9be7dcbf63c42..d0192a420d380d666972ac8d2165eec3566e81b1 100644
--- a/FluidDynamics/BaseClasses/test_FreeConvection.mo
+++ b/FluidDynamics/BaseClasses/test_FreeConvection.mo
@@ -19,4 +19,6 @@ equation
     Line(points = {{-40, 0}, {-20, 0}, {-20, 0}, {-20, 0}}, color = {191, 0, 0}));
   connect(freeConvection.port_b, atmosphere.Flowport) annotation(
     Line(points = {{20, 0}, {62, 0}, {62, 0}, {60, 0}}, color = {0, 85, 255}));
-end test_FreeConvection;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_FreeConvection;
\ No newline at end of file
diff --git a/FluidDynamics/BaseClasses/test_GasNode.mo b/FluidDynamics/BaseClasses/test_GasNode.mo
index a69b439c9b710aaba03c327410d9b749075142e3..3babd8d65d1158a52ef13812573f517a56ae124e 100644
--- a/FluidDynamics/BaseClasses/test_GasNode.mo
+++ b/FluidDynamics/BaseClasses/test_GasNode.mo
@@ -1,12 +1,14 @@
 within TAeZoSysPro_testsuite.FluidDynamics.BaseClasses;
 
 model test_GasNode
-  package Medium = TAeZoSysPro.Media.Air.MoistAir ;
-  TAeZoSysPro.FluidDynamics.BasesClasses.GasNode gasNode(redeclare package Medium = Medium, nPorts = 1)  annotation(
+  package Medium = TAeZoSysPro.Media.Air.MoistAir;
+  TAeZoSysPro.FluidDynamics.BasesClasses.GasNode gasNode(redeclare package Medium = Medium, nPorts = 1) annotation(
     Placement(visible = true, transformation(origin = {-3.55271e-15, 3.55271e-15}, extent = {{-20, -20}, {20, 20}}, rotation = 0)));
-  Modelica.Fluid.Sources.MassFlowSource_T boundary(redeclare package Medium = Medium, m_flow = 0.001, nPorts = 1)  annotation(
+  Modelica.Fluid.Sources.MassFlowSource_T boundary(redeclare package Medium = Medium, m_flow = 0.001, nPorts = 1) annotation(
     Placement(visible = true, transformation(origin = {-62, 4}, extent = {{-20, -20}, {20, 20}}, rotation = 0)));
 equation
   connect(boundary.ports[1], gasNode.fluidPort[1]) annotation(
     Line(points = {{-42, 4}, {-4, 4}, {-4, 4}, {-4, 4}}, color = {0, 127, 255}));
-end test_GasNode;
+  annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-06, Interval = 0.002));
+end test_GasNode;
\ No newline at end of file
diff --git a/FluidDynamics/BaseClasses/test_GasNode_two_phases.mo b/FluidDynamics/BaseClasses/test_GasNode_two_phases.mo
index d2b60fc701ddcd19a7847ce729d2936d738d8304..e1481f6a925eb04b986e1312990f3951949a8c1b 100644
--- a/FluidDynamics/BaseClasses/test_GasNode_two_phases.mo
+++ b/FluidDynamics/BaseClasses/test_GasNode_two_phases.mo
@@ -14,4 +14,6 @@ equation
     Line(points = {{-60, 50}, {-4, 50}, {-4, 52}, {-4, 52}}, color = {191, 0, 0}));
   connect(boundary.ports[1], gasNode_two_phases1.fluidPort[1]) annotation(
     Line(points = {{-60, -32}, {-2, -32}, {-2, -32}, {-4, -32}}, color = {0, 127, 255}));
-end test_GasNode_two_phases;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_GasNode_two_phases;
\ No newline at end of file
diff --git a/FluidDynamics/BaseClasses/test_Interface_liq_gas.mo b/FluidDynamics/BaseClasses/test_Interface_liq_gas.mo
index 10bd17b576c7d5cc12e69b9495300541e7d7c9e1..8a04cb0ec120cb8a383e3ff009c74d10b2f69d00 100644
--- a/FluidDynamics/BaseClasses/test_Interface_liq_gas.mo
+++ b/FluidDynamics/BaseClasses/test_Interface_liq_gas.mo
@@ -36,4 +36,6 @@ equation
     Line(points = {{40, 30}, {-2, 30}, {-2, 18}, {-2, 18}}, color = {0, 0, 127}));
   connect(liquidNode_simulated.port_liquidNode, interFace_liq_gas.fluidPort_a) annotation(
     Line(points = {{50, -50}, {12, -50}, {12, -18}, {12, -18}}, color = {0, 127, 255}));
-end test_Interface_liq_gas;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_Interface_liq_gas;
\ No newline at end of file
diff --git a/FluidDynamics/BaseClasses/test_MolecularDiffusion.mo b/FluidDynamics/BaseClasses/test_MolecularDiffusion.mo
index 39387691d59a677b7e39c3aa062cb857f06a04e9..799071fa32a803a3f16378f59458ea8db811bc06 100644
--- a/FluidDynamics/BaseClasses/test_MolecularDiffusion.mo
+++ b/FluidDynamics/BaseClasses/test_MolecularDiffusion.mo
@@ -12,4 +12,6 @@ equation
     Line(points = {{-80, 0}, {-22, 0}, {-22, 0}, {-20, 0}}, color = {0, 85, 255}));
   connect(molecularDiffusion.flowPort_b, atmosphere1.Flowport) annotation(
     Line(points = {{20, 0}, {82, 0}, {82, 0}, {80, 0}}, color = {0, 85, 255}));
-end test_MolecularDiffusion;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_MolecularDiffusion;
\ No newline at end of file
diff --git a/FluidDynamics/Components/Buildings/test_BurstMembrane.mo b/FluidDynamics/Components/Buildings/test_BurstMembrane.mo
index ad6af05bf99088e750c12f1a7ec2d55b9b781503..a14d3e1f72cc67acdfdc9f83449870b4a1d7b8d5 100644
--- a/FluidDynamics/Components/Buildings/test_BurstMembrane.mo
+++ b/FluidDynamics/Components/Buildings/test_BurstMembrane.mo
@@ -20,4 +20,6 @@ equation
     Line(points = {{10, 0}, {30, 0}, {30, 0}, {30, 0}}, color = {0, 127, 255}));
   connect(pressure_profile.y, atmosphere.p_in) annotation(
     Line(points = {{-78, 12}, {-60, 12}, {-60, 12}, {-58, 12}}, color = {0, 0, 127}));
-end test_BurstMembrane;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_BurstMembrane;
\ No newline at end of file
diff --git a/FluidDynamics/Components/Buildings/test_HalfWall.mo b/FluidDynamics/Components/Buildings/test_HalfWall.mo
index 4d1fc9e8a1ae8ba0da4f8d8a534db47445f00ca4..0987cff7c28cc1ae67d7b12a8183073183c5ff41 100644
--- a/FluidDynamics/Components/Buildings/test_HalfWall.mo
+++ b/FluidDynamics/Components/Buildings/test_HalfWall.mo
@@ -13,4 +13,6 @@ equation
     Line(points = {{3.4, -10.6}, {-4.6, -10.6}, {-4.6, -6.6}, {3.4, -6.6}, {3.4, -6.6}}, color = {0, 0, 127}));
   connect(halfWall.port_a_rad, halfWall.port_surface) annotation(
     Line(points = {{4, -18}, {-8, -18}, {-8, 2}, {14, 2}, {14, 2}}, color = {191, 0, 0}));
-end test_HalfWall;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_HalfWall;
\ No newline at end of file
diff --git a/FluidDynamics/Components/Buildings/test_InertMass.mo b/FluidDynamics/Components/Buildings/test_InertMass.mo
index 3553a4f94a55196be15938d66dff89cfa7172389..ee3b3edf51d04473a494cc1e50702a27c562384e 100644
--- a/FluidDynamics/Components/Buildings/test_InertMass.mo
+++ b/FluidDynamics/Components/Buildings/test_InertMass.mo
@@ -13,4 +13,6 @@ equation
     Line(points = {{-18, -10}, {-28, -10}, {-28, -6}, {-18, -6}, {-18, -6}}, color = {0, 0, 127}));
   connect(inertMass.port_a, atmosphere.Flowport) annotation(
     Line(points = {{-20, 10}, {-40, 10}, {-40, 0}, {-60, 0}, {-60, 0}}, color = {0, 85, 255}));
-end test_InertMass;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_InertMass;
\ No newline at end of file
diff --git a/FluidDynamics/Components/Buildings/test_Wall.mo b/FluidDynamics/Components/Buildings/test_Wall.mo
index 88f1818b27ea26f604a361003e748ef1e7e0ec62..1ed01839ed61db6e4a8753a3839c5f605a44b93e 100644
--- a/FluidDynamics/Components/Buildings/test_Wall.mo
+++ b/FluidDynamics/Components/Buildings/test_Wall.mo
@@ -21,4 +21,6 @@ equation
     Line(points = {{2, 14}, {-40, 14}, {-40, 0}, {-60, 0}, {-60, 0}}, color = {0, 85, 255}));
   connect(Wall.port_b, atmosphere.Flowport) annotation(
     Line(points = {{40, 14}, {60, 14}, {60, 32}, {-40, 32}, {-40, 0}, {-60, 0}, {-60, 0}}, color = {0, 85, 255}));
-end test_Wall;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_Wall;
\ No newline at end of file
diff --git a/FluidDynamics/Components/Buildings/test_WallLeak.mo b/FluidDynamics/Components/Buildings/test_WallLeak.mo
index 7dfb1e51dab4afa2d967507c7d16dbf04d570315..808aa445a0097d12976a8b0c3d58b4d8e40bf779 100644
--- a/FluidDynamics/Components/Buildings/test_WallLeak.mo
+++ b/FluidDynamics/Components/Buildings/test_WallLeak.mo
@@ -12,4 +12,6 @@ equation
     Line(points = {{-60, 8}, {-40, 8}, {-40, 0}, {-20, 0}, {-20, 0}}, color = {0, 127, 255}));
   connect(atmosphere1.Fluidport[1], wallLeaks.port_b) annotation(
     Line(points = {{60, 8}, {40, 8}, {40, 0}, {20, 0}, {20, 0}}, color = {0, 127, 255}));
-end test_WallLeak;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_WallLeak;
\ No newline at end of file
diff --git a/FluidDynamics/Components/Filters/test_Filter.mo b/FluidDynamics/Components/Filters/test_Filter.mo
index 020a7c377550883cf0907b78c73ccd15df86f3f5..7cae2bb254a3c8051d48eccdc41b0b53cd7701e9 100644
--- a/FluidDynamics/Components/Filters/test_Filter.mo
+++ b/FluidDynamics/Components/Filters/test_Filter.mo
@@ -14,4 +14,6 @@ equation
   connect(airFilter.port_b, sink.ports[1]) annotation(
     Line(points = {{20, 0}, {60, 0}, {60, 0}, {60, 0}}, color = {0, 127, 255}));
 protected
-end test_Filter;
+  annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_Filter;
\ No newline at end of file
diff --git a/FluidDynamics/Components/Machines/test_ControlledVolumeFlowPump.mo b/FluidDynamics/Components/Machines/test_ControlledVolumeFlowPump.mo
index 83b391e360649d8afa5b7b1dccd63f284dae7d0d..3a9db23ebc4d1ec723cc29388cf248a7c2a23ef1 100644
--- a/FluidDynamics/Components/Machines/test_ControlledVolumeFlowPump.mo
+++ b/FluidDynamics/Components/Machines/test_ControlledVolumeFlowPump.mo
@@ -14,4 +14,6 @@ equation
     Line(points = {{-20, 10}, {20, 10}, {20, 10}, {20, 10}}, color = {0, 127, 255}));
   connect(pipe.port_b, boundary.ports[2]) annotation(
     Line(points = {{40, 10}, {60, 10}, {60, -20}, {-80, -20}, {-80, 10}, {-80, 10}}, color = {0, 127, 255}));
-end test_ControlledVolumeFlowPump;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_ControlledVolumeFlowPump;
\ No newline at end of file
diff --git a/FluidDynamics/Components/MassExchangers/test_AnalyticWetExchanger.mo b/FluidDynamics/Components/MassExchangers/test_AnalyticWetExchanger.mo
index bf4c54c8326a3a26f37c30dabba7808dc6f24963..e4c8dd1ef00bd9cb5c5fc377efea6c5a9f6db344 100644
--- a/FluidDynamics/Components/MassExchangers/test_AnalyticWetExchanger.mo
+++ b/FluidDynamics/Components/MassExchangers/test_AnalyticWetExchanger.mo
@@ -27,4 +27,5 @@ equation
     Line(points = {{-40, 50}, {-16, 50}, {-16, 18}, {-16, 18}}, color = {0, 127, 255}));
   connect(Air_source.ports[1], analyticWetExchanger.port_in_A) annotation (
     Line(points = {{0, -50}, {16, -50}, {16, -18}, {16, -18}}, color = {0, 127, 255}));
-end test_AnalyticWetExchanger;
+
+end test_AnalyticWetExchanger;
\ No newline at end of file
diff --git a/FluidDynamics/Components/Orifices/test_HorizontalOpening.mo b/FluidDynamics/Components/Orifices/test_HorizontalOpening.mo
index 472b78c88dd3d1a361ae265909f432435f993dc9..c64408c2cef9e853a24763904d9a464fd1801c6b 100644
--- a/FluidDynamics/Components/Orifices/test_HorizontalOpening.mo
+++ b/FluidDynamics/Components/Orifices/test_HorizontalOpening.mo
@@ -15,4 +15,6 @@ equation
     Line(points = {{-80, 60}, {-60, 60}, {-60, 14}}, color = {0, 85, 255}));
   connect(horizontalOpening.port_b, gasNode.flowPort) annotation(
     Line(points = {{-60, -14}, {-60, -14}, {-60, -60}, {-44, -60}, {-44, -60}}, color = {0, 85, 255}));
-end test_HorizontalOpening;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_HorizontalOpening;
\ No newline at end of file
diff --git a/FluidDynamics/Components/Orifices/test_SimpleOpening.mo b/FluidDynamics/Components/Orifices/test_SimpleOpening.mo
index 699854607318a451f813a9d01075f261add4160a..b1cb454214a49e0a056c9415700c71d0a8c6a079 100644
--- a/FluidDynamics/Components/Orifices/test_SimpleOpening.mo
+++ b/FluidDynamics/Components/Orifices/test_SimpleOpening.mo
@@ -12,4 +12,6 @@ equation
     Line(points = {{-80, 0}, {-14, 0}}, color = {0, 85, 255}));
   connect(simpleOpening.port_b, atmosphere1.Flowport) annotation(
     Line(points = {{14, 0}, {80, 0}}, color = {0, 85, 255}));
-end test_SimpleOpening;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_SimpleOpening;
\ No newline at end of file
diff --git a/FluidDynamics/Components/Orifices/test_VerticalOpening.mo b/FluidDynamics/Components/Orifices/test_VerticalOpening.mo
index 58f37760fc2bbe5e689043cd561a4f2ead6935d7..2737d6fd48fa35b79fdbc90a0c1e68deee34fc2d 100644
--- a/FluidDynamics/Components/Orifices/test_VerticalOpening.mo
+++ b/FluidDynamics/Components/Orifices/test_VerticalOpening.mo
@@ -22,4 +22,6 @@ equation
     Line(points = {{-80, -60}, {-14, -60}, {-14, -60}, {-14, -60}}, color = {0, 85, 255}));
   connect(verticalOpening1.port_b, atmosphere3.Flowport) annotation(
     Line(points = {{14, -60}, {80, -60}, {80, -60}, {80, -60}}, color = {0, 85, 255}));
-end test_VerticalOpening;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_VerticalOpening;
\ No newline at end of file
diff --git a/FluidDynamics/Components/Pipes/test_StaticPipe.mo b/FluidDynamics/Components/Pipes/test_StaticPipe.mo
index e2c8a42150d9f581e61578b0912b72bc55bbb87f..d1c322aa97a88b830e84923fafe3be22baffef9d 100644
--- a/FluidDynamics/Components/Pipes/test_StaticPipe.mo
+++ b/FluidDynamics/Components/Pipes/test_StaticPipe.mo
@@ -12,4 +12,6 @@ equation
     Line(points = {{-80, 8}, {-60, 8}, {-60, 0}, {-20, 0}, {-20, 0}}, color = {0, 127, 255}));
   connect(pipe.port_b, atmosphere1.Fluidport[1]) annotation(
     Line(points = {{20, 0}, {60, 0}, {60, 8}, {80, 8}, {80, 8}}, color = {0, 127, 255}));
-end test_StaticPipe;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_StaticPipe;
\ No newline at end of file
diff --git a/FluidDynamics/Components/Valves/test_CommissioningDamper.mo b/FluidDynamics/Components/Valves/test_CommissioningDamper.mo
index a8e487cf886080c551783161910201b03cd6581b..dfd23eeda77d40dc48e41b07c38d2ffbb6160404 100644
--- a/FluidDynamics/Components/Valves/test_CommissioningDamper.mo
+++ b/FluidDynamics/Components/Valves/test_CommissioningDamper.mo
@@ -14,4 +14,6 @@ equation
   connect(commissioningDamper.port_b, sink.ports[1]) annotation(
     Line(points = {{20, 0}, {60, 0}, {60, 0}, {60, 0}}, color = {0, 127, 255}));
 
-end test_CommissioningDamper;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_CommissioningDamper;
\ No newline at end of file
diff --git a/FluidDynamics/Components/Valves/test_Damper_opposedBlades.mo b/FluidDynamics/Components/Valves/test_Damper_opposedBlades.mo
index a5babd0286dd9fe470b69814d708cec1850c1aa4..74b0ac298e2b9313ebd0c9683dbc242bce3a1dd8 100644
--- a/FluidDynamics/Components/Valves/test_Damper_opposedBlades.mo
+++ b/FluidDynamics/Components/Valves/test_Damper_opposedBlades.mo
@@ -18,4 +18,6 @@ equation
   connect(damper.port_b, sink.ports[1]) annotation(
     Line(points = {{20, 0}, {60, 0}, {60, 0}, {60, 0}}, color = {0, 127, 255}));
 
-end test_Damper_opposedBlades;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_Damper_opposedBlades;
\ No newline at end of file
diff --git a/FluidDynamics/Components/Valves/test_Damper_parallelBlades.mo b/FluidDynamics/Components/Valves/test_Damper_parallelBlades.mo
index 120f449f3a847aa0cfa54729cd06c0b4944c2999..18e004fa13ba1665983d1a149ae303770524fa0a 100644
--- a/FluidDynamics/Components/Valves/test_Damper_parallelBlades.mo
+++ b/FluidDynamics/Components/Valves/test_Damper_parallelBlades.mo
@@ -18,4 +18,6 @@ equation
   connect(damper.port_b, sink.ports[1]) annotation(
     Line(points = {{20, 0}, {60, 0}, {60, 0}, {60, 0}}, color = {0, 127, 255}));
 
-end test_Damper_parallelBlades;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_Damper_parallelBlades;
\ No newline at end of file
diff --git a/FluidDynamics/Components/Valves/test_polynomial.mo b/FluidDynamics/Components/Valves/test_polynomial.mo
index 659dff40bbe3002cec916979a0366cf8691d9d4c..da91cf86d7b0cece4320e049e7a1a357cee742b3 100644
--- a/FluidDynamics/Components/Valves/test_polynomial.mo
+++ b/FluidDynamics/Components/Valves/test_polynomial.mo
@@ -12,4 +12,6 @@ equation
   pos = ramp.y ;
   rc = TAeZoSysPro.FluidDynamics.Components.Valves.BaseClasses.ValveCharacteristics.polynomial(pos = pos, c={0,0,1}) ;
 
-end test_polynomial;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_polynomial;
\ No newline at end of file
diff --git a/FluidDynamics/Functions/test_rootsPolyOrder3.mo b/FluidDynamics/Functions/test_rootsPolyOrder3.mo
index 2050c7b8892103faa45fee0c08808ff8872838c9..e06e8ab0427a845e344dcd610f2b7168d2eab5b4 100644
--- a/FluidDynamics/Functions/test_rootsPolyOrder3.mo
+++ b/FluidDynamics/Functions/test_rootsPolyOrder3.mo
@@ -15,4 +15,6 @@ equation
 roots_3rd = TAeZoSysPro.FluidDynamics.Functions.rootsPolyOrder3(a=a, b=b, c=c, d=d) ;
 roots_2nd = TAeZoSysPro.FluidDynamics.Functions.rootsPolyOrder3(a=0, b=e, c=f, d=g) ;
 
-end test_rootsPolyOrder3;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_rootsPolyOrder3;
\ No newline at end of file
diff --git a/FluidDynamics/Sources/test_atmosphere.mo b/FluidDynamics/Sources/test_atmosphere.mo
index fbb94878258fb487002c0b1e54bfc4a246abc528..57cc193b96b2ee72ae3e25e2d0e1a3925f8316e4 100644
--- a/FluidDynamics/Sources/test_atmosphere.mo
+++ b/FluidDynamics/Sources/test_atmosphere.mo
@@ -22,4 +22,6 @@ equation
     Line(points = {{-78, -82}, {-22, -82}, {-22, -82}, {-18, -82}}, color = {0, 0, 127}));
   connect(T.y, atmosphere2.T_in) annotation(
     Line(points = {{-78, -20}, {-20, -20}, {-20, -20}, {-18, -20}}, color = {0, 0, 127}));
-end test_atmosphere;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_atmosphere;
\ No newline at end of file
diff --git a/HeatTransfer/BaseClasses/test_CarrollRadiation.mo b/HeatTransfer/BaseClasses/test_CarrollRadiation.mo
index 7b2219a380d8a7a06b206797bd0cfa1ddc1e769e..ffe4e238c87290c7020aa669a99bf84c983b94c0 100644
--- a/HeatTransfer/BaseClasses/test_CarrollRadiation.mo
+++ b/HeatTransfer/BaseClasses/test_CarrollRadiation.mo
@@ -42,4 +42,4 @@ equation
     Line(points = {{10, 70}, {30, 70}, {30, 0}, {40, 0}}, color = {191, 0, 0}));
   annotation(
     experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-06, Interval = 0.1));
-end test_CarrollRadiation;
+end test_CarrollRadiation;
\ No newline at end of file
diff --git a/HeatTransfer/BaseClasses/test_Conduction.mo b/HeatTransfer/BaseClasses/test_Conduction.mo
index 0a30b8e131fcc6836e40b7b4b8bb51659e66bc78..9c90da1c43766c510636a036c5feb2a999c16008 100644
--- a/HeatTransfer/BaseClasses/test_Conduction.mo
+++ b/HeatTransfer/BaseClasses/test_Conduction.mo
@@ -1,23 +1,23 @@
 within TAeZoSysPro_testsuite.HeatTransfer.BaseClasses;
 
 model test_Conduction
-  Modelica.Thermal.HeatTransfer.Sources.FixedTemperature T_port_a(T = 303.15)  annotation (
+  Modelica.Thermal.HeatTransfer.Sources.FixedTemperature T_port_a(T = 303.15) annotation(
     Placement(visible = true, transformation(origin = {-70, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  Modelica.Thermal.HeatTransfer.Sources.FixedTemperature T_port_b(T = 293.15)  annotation (
+  Modelica.Thermal.HeatTransfer.Sources.FixedTemperature T_port_b(T = 293.15) annotation(
     Placement(visible = true, transformation(origin = {70, 0}, extent = {{10, -10}, {-10, 10}}, rotation = 0)));
-  TAeZoSysPro.HeatTransfer.BasesClasses.Conduction conduction_linear(A = 1, Th = 0.2, k = 2.3)  annotation (
+  TAeZoSysPro.HeatTransfer.BasesClasses.Conduction conduction_linear(A = 1, Th = 0.2, k = 2.3) annotation(
     Placement(visible = true, transformation(origin = {0, 30}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  TAeZoSysPro.HeatTransfer.BasesClasses.Conduction conduction_cylindric(L = 1 / (2 * 3.14 * conduction_cylindric.Ri), Ri = 0.5, Th = 0.2, conduction = TAeZoSysPro.HeatTransfer.BasesClasses.Conduction.ConductionType.Radial, k = 2.3)  annotation (
+  TAeZoSysPro.HeatTransfer.BasesClasses.Conduction conduction_cylindric(L = 1 / (2 * 3.14 * conduction_cylindric.Ri), Ri = 0.5, Th = 0.2, conduction = TAeZoSysPro.HeatTransfer.BasesClasses.Conduction.ConductionType.Radial, k = 2.3) annotation(
     Placement(visible = true, transformation(origin = {0, -30}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
 equation
-  connect(conduction_linear.port_b, T_port_b.port) annotation (
+  connect(conduction_linear.port_b, T_port_b.port) annotation(
     Line(points = {{10, 30}, {40, 30}, {40, 0}, {60, 0}, {60, 0}}, color = {191, 0, 0}));
-  connect(T_port_a.port, conduction_linear.port_a) annotation (
+  connect(T_port_a.port, conduction_linear.port_a) annotation(
     Line(points = {{-60, 0}, {-40, 0}, {-40, 30}, {-10, 30}, {-10, 30}}, color = {191, 0, 0}));
-  connect(conduction_cylindric.port_b, T_port_b.port) annotation (
+  connect(conduction_cylindric.port_b, T_port_b.port) annotation(
     Line(points = {{10, -30}, {40, -30}, {40, 0}, {60, 0}, {60, 0}}, color = {191, 0, 0}));
-  connect(T_port_a.port, conduction_cylindric.port_a) annotation (
+  connect(T_port_a.port, conduction_cylindric.port_a) annotation(
     Line(points = {{-60, 0}, {-40, 0}, {-40, -30}, {-10, -30}, {-10, -30}}, color = {191, 0, 0}));
-annotation (
-    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
-end test_Conduction;
+  annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-06, Interval = 0.002));
+end test_Conduction;
\ No newline at end of file
diff --git a/HeatTransfer/BaseClasses/test_ForcedConvection.mo b/HeatTransfer/BaseClasses/test_ForcedConvection.mo
index 60ff0562ae2c470d0ea1a5f586c6d487c1dfd9db..ee6370ed49155f28664838dd8a2cf8d385b4ba70 100644
--- a/HeatTransfer/BaseClasses/test_ForcedConvection.mo
+++ b/HeatTransfer/BaseClasses/test_ForcedConvection.mo
@@ -1,23 +1,23 @@
 within TAeZoSysPro_testsuite.HeatTransfer.BaseClasses;
 
 model test_ForcedConvection
-  Modelica.Thermal.HeatTransfer.Sources.FixedTemperature T_wall(T = 303.15)  annotation(
+  Modelica.Thermal.HeatTransfer.Sources.FixedTemperature T_wall(T = 303.15) annotation(
     Placement(visible = true, transformation(origin = {-50, 50}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  Modelica.Thermal.HeatTransfer.Sources.FixedTemperature T_fluid(T = 293.15)  annotation(
+  Modelica.Thermal.HeatTransfer.Sources.FixedTemperature T_fluid(T = 293.15) annotation(
     Placement(visible = true, transformation(origin = {70, 0}, extent = {{10, -10}, {-10, 10}}, rotation = 0)));
-  Modelica.Thermal.HeatTransfer.Sources.FixedHeatFlow fixedHeatFlow1(Q_flow = 383)  annotation(
+  Modelica.Thermal.HeatTransfer.Sources.FixedHeatFlow fixedHeatFlow1(Q_flow = 383) annotation(
     Placement(visible = true, transformation(origin = {-50, -50}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  TAeZoSysPro.HeatTransfer.BasesClasses.ForcedConvection forcedConvection1(A = 1, Lc = 1, correlation = TAeZoSysPro.HeatTransfer.Types.ForcedConvectionCorrelation.flat_plate_ASHRAE)  annotation(
+  TAeZoSysPro.HeatTransfer.BasesClasses.ForcedConvection forcedConvection1(A = 1, Lc = 1, correlation = TAeZoSysPro.HeatTransfer.Types.ForcedConvectionCorrelation.flat_plate_ASHRAE) annotation(
     Placement(visible = true, transformation(origin = {0, 70}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  TAeZoSysPro.HeatTransfer.BasesClasses.ForcedConvection forcedConvection2(A = 1, Lc = 1, correlation = TAeZoSysPro.HeatTransfer.Types.ForcedConvectionCorrelation.crossFlow_cylinder_ASHRAE)  annotation(
+  TAeZoSysPro.HeatTransfer.BasesClasses.ForcedConvection forcedConvection2(A = 1, Lc = 1, correlation = TAeZoSysPro.HeatTransfer.Types.ForcedConvectionCorrelation.crossFlow_cylinder_ASHRAE) annotation(
     Placement(visible = true, transformation(origin = {0, 50}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  TAeZoSysPro.HeatTransfer.BasesClasses.ForcedConvection forcedConvection3(A = 1, Lc = 1, correlation = TAeZoSysPro.HeatTransfer.Types.ForcedConvectionCorrelation.internal_pipe_ASHRAE)  annotation(
+  TAeZoSysPro.HeatTransfer.BasesClasses.ForcedConvection forcedConvection3(A = 1, Lc = 1, correlation = TAeZoSysPro.HeatTransfer.Types.ForcedConvectionCorrelation.internal_pipe_ASHRAE) annotation(
     Placement(visible = true, transformation(origin = {0, 30}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  TAeZoSysPro.HeatTransfer.BasesClasses.ForcedConvection forcedConvection4(A = 1, Lc = 1, correlation = TAeZoSysPro.HeatTransfer.Types.ForcedConvectionCorrelation.Constant, h_cv_const = 100)  annotation(
+  TAeZoSysPro.HeatTransfer.BasesClasses.ForcedConvection forcedConvection4(A = 1, Lc = 1, correlation = TAeZoSysPro.HeatTransfer.Types.ForcedConvectionCorrelation.Constant, h_cv_const = 100) annotation(
     Placement(visible = true, transformation(origin = {0, 10}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  TAeZoSysPro.HeatTransfer.BasesClasses.ForcedConvection forcedConvection5(A = 1)  annotation(
+  TAeZoSysPro.HeatTransfer.BasesClasses.ForcedConvection forcedConvection5(A = 1) annotation(
     Placement(visible = true, transformation(origin = {0, -50}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  Modelica.Blocks.Sources.Constant Velocity(k = 10)  annotation(
+  Modelica.Blocks.Sources.Constant Velocity(k = 10) annotation(
     Placement(visible = true, transformation(origin = {70, 90}, extent = {{10, -10}, {-10, 10}}, rotation = 0)));
 equation
   connect(Velocity.y, forcedConvection5.Vel) annotation(
@@ -50,8 +50,6 @@ equation
     Line(points = {{-40, 50}, {-10, 50}, {-10, 50}, {-10, 50}}, color = {191, 0, 0}));
   connect(T_wall.port, forcedConvection1.port_a) annotation(
     Line(points = {{-40, 50}, {-30, 50}, {-30, 70}, {-10, 70}, {-10, 70}}, color = {191, 0, 0}));
-
-annotation(
-    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.1));
-
-end test_ForcedConvection;
+  annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-06, Interval = 0.1));
+end test_ForcedConvection;
\ No newline at end of file
diff --git a/HeatTransfer/BaseClasses/test_FreeConvection.mo b/HeatTransfer/BaseClasses/test_FreeConvection.mo
index 80415d097c6612ec3b9c391c8ca01d53a75d3a43..0f5514e4f71d4055c36d9698aa1b69ed001b4822 100644
--- a/HeatTransfer/BaseClasses/test_FreeConvection.mo
+++ b/HeatTransfer/BaseClasses/test_FreeConvection.mo
@@ -50,4 +50,6 @@ equation
     Line(points = {{-40, -50}, {-10, -50}, {-10, -50}, {-10, -50}}, color = {191, 0, 0}));
   connect(freeConvection2.port_b, T_fluid.port) annotation(
     Line(points = {{10, -50}, {30, -50}, {30, 0}, {40, 0}, {40, 0}}, color = {191, 0, 0}));
-end test_FreeConvection;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_FreeConvection;
\ No newline at end of file
diff --git a/HeatTransfer/BaseClasses/test_FreeConvection_dT_decoupled.mo b/HeatTransfer/BaseClasses/test_FreeConvection_dT_decoupled.mo
index 351f932b86772b0490aebe784ad88b62650ac9e1..1e90b39b193d59b62940e06bb58cc360b89e6934 100644
--- a/HeatTransfer/BaseClasses/test_FreeConvection_dT_decoupled.mo
+++ b/HeatTransfer/BaseClasses/test_FreeConvection_dT_decoupled.mo
@@ -20,4 +20,6 @@ equation
     Line(points = {{20, 50}, {0, 50}, {0, 8}, {0, 8}}, color = {0, 0, 127}));
   connect(T_fluid.port, temperatureSensor.port) annotation(
     Line(points = {{80, 50}, {40, 50}, {40, 50}, {40, 50}}, color = {191, 0, 0}));
-end test_FreeConvection_dT_decoupled;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_FreeConvection_dT_decoupled;
\ No newline at end of file
diff --git a/HeatTransfer/BaseClasses/test_LumpVolume.mo b/HeatTransfer/BaseClasses/test_LumpVolume.mo
index f415cde57732b0c0617118b09dd8d3dd359caecf..102aae6eaef5a83f2fb15a9677a45b277a8de0bd 100644
--- a/HeatTransfer/BaseClasses/test_LumpVolume.mo
+++ b/HeatTransfer/BaseClasses/test_LumpVolume.mo
@@ -40,4 +40,6 @@ equation
     Line(points = {{60, 0}, {80, 0}, {80, 0}, {80, 0}}, color = {191, 0, 0}));
   connect(lumpVolume2.port_a, thermalConductor1.port_a) annotation(
     Line(points = {{0, 0}, {40, 0}, {40, 0}, {40, 0}}, color = {191, 0, 0}));
-end test_LumpVolume;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_LumpVolume;
\ No newline at end of file
diff --git a/HeatTransfer/BaseClasses/test_PartialWall.mo b/HeatTransfer/BaseClasses/test_PartialWall.mo
index 40f6d330ca23838c3809f35c1b00803236ba1349..234ef78513ec7c656e8ec188060464c5ba996426 100644
--- a/HeatTransfer/BaseClasses/test_PartialWall.mo
+++ b/HeatTransfer/BaseClasses/test_PartialWall.mo
@@ -67,4 +67,6 @@ equation
   connect(ramp.y, prescribedHeatFlow3.Q_flow) annotation(
     Line(points = {{-78, 50}, {-70, 50}, {-70, -70}, {-50, -70}, {-50, -70}}, color = {0, 0, 127}));
 
-end test_PartialWall;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_PartialWall;
\ No newline at end of file
diff --git a/HeatTransfer/Components/test_CabinetPower.mo b/HeatTransfer/Components/test_CabinetPower.mo
index 28e59cc09b5872691b0dc55ee7766e575a3dd534..e4f143ceb6480016b176d7af78a149f7dbd08514 100644
--- a/HeatTransfer/Components/test_CabinetPower.mo
+++ b/HeatTransfer/Components/test_CabinetPower.mo
@@ -22,4 +22,6 @@ equation
     Line(points = {{0, 22}, {0, 30}, {40, 30}, {40, 0}, {60, 0}}, color = {191, 0, 0}));
   connect(heatLoad.y, cabinetPower.Heatload_Variable) annotation(
     Line(points = {{-18, -50}, {0, -50}, {0, -20}, {0, -20}}, color = {0, 0, 127}));
-end test_CabinetPower;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_CabinetPower;
\ No newline at end of file
diff --git a/HeatTransfer/Components/test_FanVentilation.mo b/HeatTransfer/Components/test_FanVentilation.mo
index 89a8676c19538d9349186c3c4ea5a81f8aa7ca6c..748d2851e033e324f1a6224374013dd6f94f42e3 100644
--- a/HeatTransfer/Components/test_FanVentilation.mo
+++ b/HeatTransfer/Components/test_FanVentilation.mo
@@ -29,4 +29,6 @@ equation
     Line(points = {{-58, 90}, {-22, 90}, {-22, 58}, {-10, 58}, {-10, 58}}, color = {0, 0, 127}));
   connect(V_flow.y, fanVentilation2.V_flow_in) annotation(
     Line(points = {{-58, -70}, {-22, -70}, {-22, -58}, {-10, -58}, {-10, -58}}, color = {0, 0, 127}));
-end test_FanVentilation;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_FanVentilation;
\ No newline at end of file
diff --git a/HeatTransfer/Components/test_FviewCalculator.mo b/HeatTransfer/Components/test_FviewCalculator.mo
index 53f592e52a4973e1020d6b8af8e5e9449af21891..97fe16077a8c3a617ba1bbb682296aef9cf73832 100644
--- a/HeatTransfer/Components/test_FviewCalculator.mo
+++ b/HeatTransfer/Components/test_FviewCalculator.mo
@@ -53,4 +53,6 @@ equation
   connect(Ta.port, carrollRadiation_a.port_a) annotation(
     Line(points = {{-60, -90}, {-40, -90}, {-40, -60}, {-40, -60}}, color = {191, 0, 0}));
 
-end test_FviewCalculator;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_FviewCalculator;
\ No newline at end of file
diff --git a/HeatTransfer/Components/test_HalfWall.mo b/HeatTransfer/Components/test_HalfWall.mo
index 2fc234bb07f454615f6631f6ba0aed4fc243616c..d2ff0b1f8fd04467df7c00b4e0d7ff79f258a4f8 100644
--- a/HeatTransfer/Components/test_HalfWall.mo
+++ b/HeatTransfer/Components/test_HalfWall.mo
@@ -1,11 +1,11 @@
 within TAeZoSysPro_testsuite.HeatTransfer.Components;
 
 model test_HalfWall
-  TAeZoSysPro.HeatTransfer.Components.HalfWall halfWall1(A = 1, Lc = 1, Th = 0.1, correlation = TAeZoSysPro.HeatTransfer.Types.FreeConvectionCorrelation.Constant, cp = 1000, d = 1000, energyDynamics = TAeZoSysPro.HeatTransfer.Types.Dynamics.FixedInitial, eps = 1, h_cv_const = 1, k = 0.1)  annotation (
+  TAeZoSysPro.HeatTransfer.Components.HalfWall halfWall1(A = 1, Lc = 1, Th = 0.1, correlation = TAeZoSysPro.HeatTransfer.Types.FreeConvectionCorrelation.Constant, cp = 1000, d = 1000, energyDynamics = TAeZoSysPro.HeatTransfer.Types.Dynamics.FixedInitial, eps = 1, h_cv_const = 1, k = 0.1) annotation(
     Placement(visible = true, transformation(origin = {1, 49}, extent = {{-21, -21}, {21, 21}}, rotation = 0)));
-  Modelica.Thermal.HeatTransfer.Sources.FixedTemperature fixedTemperature1(T = 303.15)  annotation(
+  Modelica.Thermal.HeatTransfer.Sources.FixedTemperature fixedTemperature1(T = 303.15) annotation(
     Placement(visible = true, transformation(origin = {-70, 50}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  TAeZoSysPro.HeatTransfer.Components.HalfWall halfWall2(A = 1, Lc = 1, N = 5, Th = 0.1, correlation = TAeZoSysPro.HeatTransfer.Types.FreeConvectionCorrelation.Constant, cp = 1000, d = 1000, energyDynamics = TAeZoSysPro.HeatTransfer.Types.Dynamics.SteadyState, eps = 1, h_cv_const = 1, k = 0.1, mesh = TAeZoSysPro.HeatTransfer.Types.MeshGrid.uniform) annotation (
+  TAeZoSysPro.HeatTransfer.Components.HalfWall halfWall2(A = 1, Lc = 1, N = 5, Th = 0.1, correlation = TAeZoSysPro.HeatTransfer.Types.FreeConvectionCorrelation.Constant, cp = 1000, d = 1000, energyDynamics = TAeZoSysPro.HeatTransfer.Types.Dynamics.SteadyState, eps = 1, h_cv_const = 1, k = 0.1, mesh = TAeZoSysPro.HeatTransfer.Types.MeshGrid.uniform) annotation(
     Placement(visible = true, transformation(origin = {-1, -51}, extent = {{-21, -21}, {21, 21}}, rotation = 0)));
   Modelica.Thermal.HeatTransfer.Sources.FixedTemperature fixedTemperature3(T = 293.15) annotation(
     Placement(visible = true, transformation(origin = {70, -50}, extent = {{10, -10}, {-10, 10}}, rotation = 0)));
@@ -26,6 +26,6 @@ equation
     Line(points = {{-60, 50}, {-40, 50}, {-40, 30}, {-18, 30}, {-18, 30}}, color = {191, 0, 0}));
   connect(fixedTemperature3.port, halfWall2.port_b) annotation(
     Line(points = {{60, -50}, {18, -50}, {18, -50}, {18, -50}}, color = {191, 0, 0}));
-annotation(
-    experiment(StartTime = 0, StopTime = 600, Tolerance = 1e-6, Interval = 1));
-end test_HalfWall;
+  annotation(
+    experiment(StartTime = 0, StopTime = 600, Tolerance = 1e-06, Interval = 1));
+end test_HalfWall;
\ No newline at end of file
diff --git a/HeatTransfer/Components/test_HeatExchanger.mo b/HeatTransfer/Components/test_HeatExchanger.mo
index 8e8dac568214082a97669f23d79e1923919271e2..7d2685bb1afe6273e2a7769ab37e8f80498e28ef 100644
--- a/HeatTransfer/Components/test_HeatExchanger.mo
+++ b/HeatTransfer/Components/test_HeatExchanger.mo
@@ -22,4 +22,6 @@ equation
     Line(points = {{-60, 30}, {-40, 30}, {-40, 0}, {-20, 0}}, color = {191, 0, 0}));
   connect(T_air_in.port, heatExchanger1.port_B_in) annotation(
     Line(points = {{40, -50}, {14, -50}, {14, -18}, {14, -18}}, color = {191, 0, 0}));
-end test_HeatExchanger;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_HeatExchanger;
\ No newline at end of file
diff --git a/HeatTransfer/Components/test_InertMass.mo b/HeatTransfer/Components/test_InertMass.mo
index 904aad8ab22cd4602705a43f8798fe7cba38639e..2883ae11e004942a500477758c04dbeb7aafc1de 100644
--- a/HeatTransfer/Components/test_InertMass.mo
+++ b/HeatTransfer/Components/test_InertMass.mo
@@ -14,4 +14,6 @@ equation
     Line(points = {{-60, 30}, {-40, 30}, {-40, 14}, {-20, 14}, {-20, 14}}, color = {191, 0, 0}));
   connect(fixedTemperature.port, inertMass.port_a_rad) annotation(
     Line(points = {{-60, 30}, {-40, 30}, {-40, -16}, {-20, -16}, {-20, -18}}, color = {191, 0, 0}));
-end test_InertMass;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_InertMass;
\ No newline at end of file
diff --git a/HeatTransfer/Components/test_Ventilation.mo b/HeatTransfer/Components/test_Ventilation.mo
index 9daab8fa435de8aaa0aae8f34d07a3d74387a3d4..bd95e9b6237d3142264e922142e01373e0c1c864 100644
--- a/HeatTransfer/Components/test_Ventilation.mo
+++ b/HeatTransfer/Components/test_Ventilation.mo
@@ -28,4 +28,6 @@ equation
     Line(points = {{10, 50}, {34, 50}, {34, 0}, {60, 0}, {60, 0}}, color = {191, 0, 0}));
   connect(ventilation2.port_b, fixedHeatFlow1.port) annotation(
     Line(points = {{10, -50}, {60, -50}, {60, -50}, {60, -50}}, color = {191, 0, 0}));
-end test_Ventilation;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_Ventilation;
\ No newline at end of file
diff --git a/HeatTransfer/Components/test_Wall.mo b/HeatTransfer/Components/test_Wall.mo
index fb561448aacff128ea9e2f6be889b726da798210..cd8921d7edf2acb154905749495e2cc9059b8302 100644
--- a/HeatTransfer/Components/test_Wall.mo
+++ b/HeatTransfer/Components/test_Wall.mo
@@ -59,4 +59,6 @@ equation
   connect(fixedTemperature5.port, wall2.port_b_rad) annotation(
     Line(points = {{60, -80}, {40, -80}, {40, -98}, {18, -98}, {18, -98}}, color = {191, 0, 0}));
 
-end test_Wall;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_Wall;
\ No newline at end of file
diff --git a/HeatTransfer/Functions/ExchangerHeatTransferCoeff/test_from_correlations.mo b/HeatTransfer/Functions/ExchangerHeatTransferCoeff/test_from_correlations.mo
index 88c2c984a074ff380ae9884c6219a9659a0d4a3b..9cc6582d1d1e4b82b3b75d574a5cc554376ca4a9 100644
--- a/HeatTransfer/Functions/ExchangerHeatTransferCoeff/test_from_correlations.mo
+++ b/HeatTransfer/Functions/ExchangerHeatTransferCoeff/test_from_correlations.mo
@@ -28,4 +28,6 @@ equation
   
   h_B = TAeZoSysPro.HeatTransfer.Functions.ForcedConvection.flat_plate_ASHRAE(Re = Re_B, Pr=Pr_B)* k_B / Lc_B  ;
 
-end test_from_correlations;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_from_correlations;
\ No newline at end of file
diff --git a/HeatTransfer/Functions/MeshGrid/test_biotAndGeometricalGrowthGrid.mo b/HeatTransfer/Functions/MeshGrid/test_biotAndGeometricalGrowthGrid.mo
index 669b56e4d408760bf214ca2050a6e3c36f8d2b53..7e25923f374541d2427a5eb50e03b7455c33e3cd 100644
--- a/HeatTransfer/Functions/MeshGrid/test_biotAndGeometricalGrowthGrid.mo
+++ b/HeatTransfer/Functions/MeshGrid/test_biotAndGeometricalGrowthGrid.mo
@@ -21,4 +21,6 @@ model test_biotAndGeometricalGrowthGrid
 
 equation
 
-end test_biotAndGeometricalGrowthGrid;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_biotAndGeometricalGrowthGrid;
\ No newline at end of file
diff --git a/HeatTransfer/Functions/MeshGrid/test_biotAndUniformGrid.mo b/HeatTransfer/Functions/MeshGrid/test_biotAndUniformGrid.mo
index 2537a026018b8fd62721a1a26db6c0aa25585aa9..31a64f2ab25de92c671ccc41c4bfd4991f5d361d 100644
--- a/HeatTransfer/Functions/MeshGrid/test_biotAndUniformGrid.mo
+++ b/HeatTransfer/Functions/MeshGrid/test_biotAndUniformGrid.mo
@@ -21,4 +21,6 @@ model test_biotAndUniformGrid
   
 equation
 
-end test_biotAndUniformGrid;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_biotAndUniformGrid;
\ No newline at end of file
diff --git a/HeatTransfer/Functions/MeshGrid/test_geometricalGrowthGrid.mo b/HeatTransfer/Functions/MeshGrid/test_geometricalGrowthGrid.mo
index d4f4a66c05a13d8dab69aea9f7fd0a151748eac5..07c0c3bcf8a53cb6fc240152454c24ad36ea7399 100644
--- a/HeatTransfer/Functions/MeshGrid/test_geometricalGrowthGrid.mo
+++ b/HeatTransfer/Functions/MeshGrid/test_geometricalGrowthGrid.mo
@@ -22,4 +22,6 @@ model test_geometricalGrowthGrid
 equation
 
 
-end test_geometricalGrowthGrid ;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_geometricalGrowthGrid ;
\ No newline at end of file
diff --git a/HeatTransfer/Functions/MeshGrid/test_uniformGrid.mo b/HeatTransfer/Functions/MeshGrid/test_uniformGrid.mo
index 25dbc006f39e6164a404f4b9d91ea8fd7fc79f20..93e68bc266c0d6ab8d6a2e41c12be3bf625830af 100644
--- a/HeatTransfer/Functions/MeshGrid/test_uniformGrid.mo
+++ b/HeatTransfer/Functions/MeshGrid/test_uniformGrid.mo
@@ -8,4 +8,6 @@ model test_uniformGrid
 
 equation
 
-end test_uniformGrid;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_uniformGrid;
\ No newline at end of file
diff --git a/HeatTransfer/Sensors/test_density.mo b/HeatTransfer/Sensors/test_density.mo
index 9d8d0a58df61c88577983d276820b44463728ab5..9dbd966d6e61905dc011c561af2d0d6ab7c0d609 100644
--- a/HeatTransfer/Sensors/test_density.mo
+++ b/HeatTransfer/Sensors/test_density.mo
@@ -3,15 +3,15 @@ within TAeZoSysPro_testsuite.HeatTransfer.Sensors;
 model test_density
   TAeZoSysPro.HeatTransfer.Sensors.Density density annotation(
     Placement(visible = true, transformation(origin = {-3.55271e-15, 3.55271e-15}, extent = {{-20, -20}, {20, 20}}, rotation = 0)));
-  Modelica.Blocks.Sources.Constant pressure(k = 101325)  annotation(
+  Modelica.Blocks.Sources.Constant pressure(k = 101325) annotation(
     Placement(visible = true, transformation(origin = {-70, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  Modelica.Thermal.HeatTransfer.Sources.FixedTemperature fixedTemperature(T = 293.15)  annotation(
+  Modelica.Thermal.HeatTransfer.Sources.FixedTemperature fixedTemperature(T = 293.15) annotation(
     Placement(visible = true, transformation(origin = {-30, -50}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
 equation
   connect(pressure.y, density.p) annotation(
     Line(points = {{-58, 0}, {-20, 0}, {-20, 0}, {-20, 0}}, color = {0, 0, 127}));
   connect(fixedTemperature.port, density.port) annotation(
     Line(points = {{-20, -50}, {0, -50}, {0, -20}, {0, -20}}, color = {191, 0, 0}));
-annotation(
-    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
-end test_density;
+  annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-06, Interval = 0.002));
+end test_density;
\ No newline at end of file
diff --git a/Media/SimpleMoistAir/test_T_phX.mo b/Media/SimpleMoistAir/test_T_phX.mo
index c84b8b53ac1cfe4a7e0a43589c091862a567dd13..3738d7e954a7664b3e97d734e175d0315998de02 100644
--- a/Media/SimpleMoistAir/test_T_phX.mo
+++ b/Media/SimpleMoistAir/test_T_phX.mo
@@ -25,5 +25,6 @@ equation
 
   annotation (
     Icon(coordinateSystem(preserveAspectRatio=false)),
-    Diagram(coordinateSystem(preserveAspectRatio=false)));
-end test_T_phX;
+    Diagram(coordinateSystem(preserveAspectRatio=false)),
+  experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_T_phX;
\ No newline at end of file
diff --git a/Media/SimpleMoistAir/test_cp.mo b/Media/SimpleMoistAir/test_cp.mo
index cdd5ad784858a1f61b162da2f409842b18d85a32..751dd4906097144a2842a0dd13023f3eddcf7ac1 100644
--- a/Media/SimpleMoistAir/test_cp.mo
+++ b/Media/SimpleMoistAir/test_cp.mo
@@ -13,4 +13,6 @@ equation
   state = TAeZoSysPro.Media.Air.MoistAir.setState_pTX(p = p, T = T, X={0.01, 0.99});
   cp = Medium.specificHeatCapacityCp(state) ;
 
-end test_cp;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_cp;
\ No newline at end of file
diff --git a/Media/SimpleMoistAir/test_d_phX.mo b/Media/SimpleMoistAir/test_d_phX.mo
index 0fe85c1046b74551a6400b0caa947ce0e8b775fe..7f38c37b5c6ce8fe931f0285958c3a21dca3b1ea 100644
--- a/Media/SimpleMoistAir/test_d_phX.mo
+++ b/Media/SimpleMoistAir/test_d_phX.mo
@@ -18,4 +18,6 @@ equation
  d_guess = Medium.d_phX(p=p, h=h, X=X)
   annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
         coordinateSystem(preserveAspectRatio=false)));
-end test_d_phX;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_d_phX;
\ No newline at end of file
diff --git a/Media/SimpleMoistAir/test_pressure.mo b/Media/SimpleMoistAir/test_pressure.mo
index 640bdc5cf0508b8570d06179768ece54f9cd2118..ce518fe479a117e67aa8aa18326b409d4e34fda4 100644
--- a/Media/SimpleMoistAir/test_pressure.mo
+++ b/Media/SimpleMoistAir/test_pressure.mo
@@ -20,5 +20,6 @@ equation
   p_guess = Medium.pressure(state);
 
   annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
-        coordinateSystem(preserveAspectRatio=false)));
-end test_pressure;
+        coordinateSystem(preserveAspectRatio=false)),
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_pressure;
\ No newline at end of file
diff --git a/Media/SimpleMoistAir/test_r_dTX.mo b/Media/SimpleMoistAir/test_r_dTX.mo
index c1334ecc3bd81dfb7be0f726b5971c3bab85c022..552f0cdaaeb14d416ce8c8e278be2966a5670ffa 100644
--- a/Media/SimpleMoistAir/test_r_dTX.mo
+++ b/Media/SimpleMoistAir/test_r_dTX.mo
@@ -10,4 +10,4 @@ equation
   R = TAeZoSysPro.Media.Air.MoistAir.r_dTX(d = d, T = T, X = X);
   annotation(
     experiment(StartTime = 0, StopTime = 100, Tolerance = 1e-06, Interval = 0.2));
-end test_r_dTX;
+end test_r_dTX;
\ No newline at end of file
diff --git a/Media/SimpleMoistAir/test_saturationDensity.mo b/Media/SimpleMoistAir/test_saturationDensity.mo
index c8a776415b8a8dd2890b7ef3794ad828cc01e79b..f76c39d174d152d1e84ffb0b0511eb5536832264 100644
--- a/Media/SimpleMoistAir/test_saturationDensity.mo
+++ b/Media/SimpleMoistAir/test_saturationDensity.mo
@@ -7,4 +7,6 @@ model test_saturationDensity
 equation
   d_sat = TAeZoSysPro.Media.Air.MoistAir.saturationDensity(T);
   d_sat_IF97 = Modelica.Media.Water.IF97_Utilities.BaseIF97.Regions.rhov_T(T);
-end test_saturationDensity;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_saturationDensity;
\ No newline at end of file
diff --git a/Media/SimpleMoistAir/test_saturationPressure.mo b/Media/SimpleMoistAir/test_saturationPressure.mo
index 3913cc01c538d0aad0d8d5c6d3cf2df8e0cc4ce1..9059d91290aae22326e1e8ae87e6754c99e9868d 100644
--- a/Media/SimpleMoistAir/test_saturationPressure.mo
+++ b/Media/SimpleMoistAir/test_saturationPressure.mo
@@ -12,4 +12,4 @@ equation
   p = TAeZoSysPro.Media.Air.MoistAir.saturationPressure(T);
   annotation(
     experiment(StartTime = 0, StopTime = 2, Tolerance = 1e-06, Interval = 0.005));
-end test_saturationPressure;
+end test_saturationPressure;
\ No newline at end of file
diff --git a/Media/SimpleMoistAir/test_saturationPressureLiquid.mo b/Media/SimpleMoistAir/test_saturationPressureLiquid.mo
index 5128518e3c6fc1115a5afb5d02ce644e318c0c64..a804b1cf384b9b32c48303410c6f862231a270a3 100644
--- a/Media/SimpleMoistAir/test_saturationPressureLiquid.mo
+++ b/Media/SimpleMoistAir/test_saturationPressureLiquid.mo
@@ -10,4 +10,6 @@ equation
   T = 273.15 + time;
   p = TAeZoSysPro.Media.Air.MoistAir.saturationPressureLiquid(T);
 
-end test_saturationPressureLiquid;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_saturationPressureLiquid;
\ No newline at end of file
diff --git a/Media/SimpleMoistAir/test_saturationPressureLiquidDer.mo b/Media/SimpleMoistAir/test_saturationPressureLiquidDer.mo
index f2fa8aecd0fe159f1b2b770a31fef6ca3de9a3db..a24469eece5ddc5fef8f2738cf96b3b070100a39 100644
--- a/Media/SimpleMoistAir/test_saturationPressureLiquidDer.mo
+++ b/Media/SimpleMoistAir/test_saturationPressureLiquidDer.mo
@@ -1,19 +1,14 @@
 within TAeZoSysPro_testsuite.Media.SimpleMoistAir;
 
 model test_saturationPressureLiquidDer
-
-  Modelica.SIunits.Temperature T ;
+  Modelica.SIunits.Temperature T;
   Modelica.SIunits.Pressure p;
   Real dpdt, dpdt_num;
-
 equation
-
   T = 273.15 + time;
   p = TAeZoSysPro.Media.Air.MoistAir.saturationPressureLiquid(T);
   dpdt = TAeZoSysPro.Media.Air.MoistAir.saturationPressureLiquid_der(T, der(T));
   dpdt_num = der(p);
-  
-
-annotation(
-    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
-end test_saturationPressureLiquidDer;
+  annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-06, Interval = 0.002));
+end test_saturationPressureLiquidDer;
\ No newline at end of file
diff --git a/Media/SimpleMoistAir/test_sublimationPressureIce.mo b/Media/SimpleMoistAir/test_sublimationPressureIce.mo
index ee3e849d979ab873ed763c73c7407475b3eb3bd1..cfc0e17176a15d3f0c790c9497ed2291178b30ed 100644
--- a/Media/SimpleMoistAir/test_sublimationPressureIce.mo
+++ b/Media/SimpleMoistAir/test_sublimationPressureIce.mo
@@ -11,4 +11,6 @@ equation
   p = TAeZoSysPro.Media.Air.MoistAir.sublimationPressureIce(T);
 
 
-end test_sublimationPressureIce;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_sublimationPressureIce;
\ No newline at end of file
diff --git a/Media/SimpleMoistAir/test_sublimationPressureIceDer.mo b/Media/SimpleMoistAir/test_sublimationPressureIceDer.mo
index c17d2a1991b230a92b135221c067fd2d188729c1..95d9304aa4e4b7f07851756d92c96f41e15a320c 100644
--- a/Media/SimpleMoistAir/test_sublimationPressureIceDer.mo
+++ b/Media/SimpleMoistAir/test_sublimationPressureIceDer.mo
@@ -13,4 +13,6 @@ equation
   dpdt = TAeZoSysPro.Media.Air.MoistAir.sublimationPressureIce_der(T, der(T));
   dpdt_num = der(p);
 
-end test_sublimationPressureIceDer;
+annotation(
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
+end test_sublimationPressureIceDer;
\ No newline at end of file
diff --git a/PDE/test_UpwindFirstOrder.mo b/PDE/test_UpwindFirstOrder.mo
index 3037b0249e7afa20b5d7ae7b8b94a77db6aed2b6..f04586469896450001c810ec112588b1a04fff9d 100644
--- a/PDE/test_UpwindFirstOrder.mo
+++ b/PDE/test_UpwindFirstOrder.mo
@@ -1,26 +1,16 @@
 within TAeZoSysPro_testsuite.PDE;
 
 model test_UpwindFirstOrder
-
   parameter Modelica.SIunits.Length L = 1 "Length of the domain";
   parameter Integer N = 5 "Number of discrete layer";
   Modelica.SIunits.Velocity Vel;
-      
-  TAeZoSysPro.PDE.Transport.UpwindFirstOrder transport(
-    CoeffTimeDer = 1,
-    CoeffSpaceDer = Vel,
-    N = N,
-    N_quantity = 2,
-    x = linspace(0, L, N+1),
-    SourceTerm = fill(0.0, N)) annotation(
+  TAeZoSysPro.PDE.Transport.UpwindFirstOrder transport(CoeffTimeDer = 1, CoeffSpaceDer = Vel, N = N, N_quantity = 2, x = linspace(0, L, N + 1), SourceTerm = fill(0.0, N)) annotation(
     Placement(visible = true, transformation(origin = {0, 0}, extent = {{-20, -20}, {20, 20}}, rotation = 0)));
-  Modelica.Blocks.Sources.Pulse pulse(amplitude = -2, offset = 1, period = 4, startTime = 2)  annotation(
+  Modelica.Blocks.Sources.Pulse pulse(amplitude = -2, offset = 1, period = 4, startTime = 2) annotation(
     Placement(visible = true, transformation(origin = {-60, 0}, extent = {{-20, -20}, {20, 20}}, rotation = 0)));
 initial equation
-
   transport.u[:, 1] = fill(0.0, N);
   transport.u[:, 2] = fill(0.0, N);
-
 equation
 //
   Vel = pulse.y;
@@ -28,5 +18,5 @@ equation
   transport.u_ghost_left[:] = fill(1.0, 2);
   transport.u_ghost_right[:] = fill(2.0, 2);
   annotation(
-    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002));
-end test_UpwindFirstOrder;
+    experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-06, Interval = 0.002));
+end test_UpwindFirstOrder;
\ No newline at end of file