diff --git a/VectoCore/Models/SimulationComponent/Data/Engine/FuelConsumptionMap.cs b/VectoCore/Models/SimulationComponent/Data/Engine/FuelConsumptionMap.cs
index 391b15423561bd19f63daa123e6aa60cb60fff90..f120bd1736dd82b8c74d7f53de43be544339233f 100644
--- a/VectoCore/Models/SimulationComponent/Data/Engine/FuelConsumptionMap.cs
+++ b/VectoCore/Models/SimulationComponent/Data/Engine/FuelConsumptionMap.cs
@@ -115,7 +115,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data.Engine
                         fuelConsumptionMap._entries.Add(entry);
 
                         // Delauney map works only as expected, when the engineSpeed is in rpm.
-                        fuelConsumptionMap._fuelMap.AddPoint(entry.EngineSpeed.SI().Radian.Per.Second.To().Rounds.Per.Minute, entry.Torque, entry.FuelConsumption);
+                        fuelConsumptionMap._fuelMap.AddPoint(row.ParseDouble(Fields.EngineSpeed), entry.Torque, entry.FuelConsumption);
                     }
                     catch (Exception e)
                     {
diff --git a/VectoCore/Utils/DelauneyMap.cs b/VectoCore/Utils/DelauneyMap.cs
index 9574ee39439055976de86d2cbc231dd271bd0811..2f5e27349bd51a6dc8b36768ab3ef62157af1633 100644
--- a/VectoCore/Utils/DelauneyMap.cs
+++ b/VectoCore/Utils/DelauneyMap.cs
@@ -259,12 +259,12 @@ namespace TUGraz.VectoCore.Utils
 
                 var result = p0square * det12 + p1square * det20 + p2square * det01;
 
-                return result.IsPositive();
+                return result > 0;
             }
 
             private bool Contains(Point p)
             {
-                return P1.Equals(p) || P2.Equals(p) || P3.Equals(p);
+                return p.Equals(P1) || p.Equals(P2) || p.Equals(P3);
             }
 
             public bool SharesVertexWith(Triangle t)
diff --git a/VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs b/VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs
index a38769e5b7e2250e9ea48ca964af4545a6b2f41c..3079bcb0263970862eaad0ee8159837f7095cad9 100644
--- a/VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs
+++ b/VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs
@@ -1,7 +1,4 @@
 using System;
-using System.IO;
-using System.Reflection;
-using System.Data;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using TUGraz.VectoCore.Models.Simulation.Data;
 using TUGraz.VectoCore.Models.Simulation.Impl;