From bc84192ef2c0199cf01e90866c6eeec45de1b921 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Thu, 2 Jun 2016 11:13:01 +0200
Subject: [PATCH] adapt aux tests due to switch to SI-class

---
 .../IntegrationTests/AuxDemandTest.vb         |   26 +-
 .../Mocks/AlternatorMapMock.vb                |   39 +-
 .../Mocks/CompressorMapMock.vb                |   17 +-
 .../Mocks/ElectricalConsumerMock.vb           |   53 +-
 .../VectoAuxiliariesTests/Mocks/M1_Mock.vb    |   90 +-
 .../VectoAuxiliariesTests/Mocks/M2_Mock.vb    |   41 +-
 .../VectoAuxiliariesTests/Mocks/M3_Mock.vb    |   41 +-
 .../VectoAuxiliariesTests/Mocks/M4_Mock.vb    |  115 +-
 .../VectoAuxiliariesTests/Mocks/M5_Mock.vb    |   56 +-
 .../VectoAuxiliariesTests/Mocks/M6_Mock.vb    |  189 ++-
 .../VectoAuxiliariesTests/Mocks/M7_Mock.vb    |  105 +-
 .../Mocks/MockFuel50PC.vb                     |    9 +-
 .../My Project/Application.Designer.vb        |    8 +-
 .../My Project/Resources.Designer.vb          |   24 +-
 .../My Project/Settings.Designer.vb           |   10 +-
 .../UnitTests/AirCompressorTests.vb           |  308 ++--
 .../UnitTests/AlternatorMapTests.vb           |    9 +-
 .../AuxiliaryEnvironmentComparisonTests.vb    | 1470 ++++++++---------
 .../AveragePneumaticLoadDemandTests.vb        |   77 +-
 .../UnitTests/CombinedAlternatorTests.vb      |  637 +++----
 .../UnitTests/CompressorMapTests.vb           |  269 ++-
 .../UnitTests/ElectricalConsumerListTests.vb  |   74 +-
 .../UnitTests/ElectricalConsumerTests.vb      |  105 +-
 .../M0_5_SmartAlternatorSetEfficiencyTests.vb |  169 +-
 ..._NonSmart_AlternatorsSetEfficiencyTests.vb |  129 +-
 .../UnitTests/M10Tests.vb                     |   68 +-
 .../UnitTests/M11Tests.vb                     |  247 ++-
 .../UnitTests/M12Tests.vb                     |   88 +-
 .../UnitTests/M13Tests.vb                     |  100 +-
 .../UnitTests/M14Tests.vb                     |   25 +-
 .../M1_AverageHVACLoadDemandTests.vb          |  137 +-
 .../M2_AverageElectricalLoadTests.vb          |   13 +-
 .../M5_SmartAlternatorSetGenerationTests.vb   |   26 +-
 .../UnitTests/M6Tests.vb                      |  224 ++-
 .../UnitTests/M7Tests.vb                      |  191 +--
 .../UnitTests/M8Tests.vb                      |  239 ++-
 .../UnitTests/M9Tests.vb                      |  109 +-
 .../UnitTests/ResultCardTests.vb              |  240 ++-
 38 files changed, 2811 insertions(+), 2966 deletions(-)

diff --git a/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb b/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb
index f22dc7e58f..aea9d54927 100644
--- a/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb
+++ b/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb
@@ -1,5 +1,6 @@
 Imports System.IO
 Imports NUnit.Framework
+Imports TUGraz.VectoCommon.Utils
 Imports VectoAuxiliaries
 
 Namespace IntegrationTests
@@ -11,8 +12,7 @@ Namespace IntegrationTests
 		<TestCase(12000, 1256, -15, -50, 8954.1435)>
 		<TestCase(15700, 1319, -35.79263, -144.0441, 9093.9511)>
 		Public Sub AuxDemnadTest(vehicleWeight As Double, engineSpeed As Double, driveLinePower As Double,
-								internalPower As Double,
-								expectedPowerDemand As Double)
+								internalPower As Double, expectedPowerDemand As Double)
 			Dim engineFCMapFilePath = "TestFiles\Integration\24t Coach.vmap"
 			Dim auxFilePath = "TestFiles\Integration\AdvAuxTest.aaux"
 
@@ -46,9 +46,9 @@ Namespace IntegrationTests
 			aux.Signals.RunningCalc = True
 			aux.Signals.Internal_Engine_Power = internalPower	'kW
 
-			Dim power As Single = aux.AuxiliaryPowerAtCrankWatts
+			Dim power As Watt = aux.AuxiliaryPowerAtCrankWatts()
 
-			Assert.AreEqual(expectedPowerDemand, power, 0.001)
+			Assert.AreEqual(expectedPowerDemand, power.Value(), 0.001)
 		End Sub
 
 		<Test>
@@ -94,33 +94,33 @@ Namespace IntegrationTests
 
 			Dim msg As String = String.Empty
 			For i As Integer = 0 To 9
-				Assert.AreEqual(6087.0317, aux.AuxiliaryPowerAtCrankWatts, 0.001)
-				aux.CycleStep(1, msg)
+				Assert.AreEqual(6087.0317, aux.AuxiliaryPowerAtCrankWatts().Value(), 0.001)
+				aux.CycleStep(1.SI(Of Second), msg)
 			Next
 
-			Assert.AreEqual(79.303, aux.AA_TotalCycleFC_Grams, 0.0001)
+			Assert.AreEqual(79.303, aux.AA_TotalCycleFC_Grams().Value(), 0.0001)
 
 			aux.Signals.EngineDrivelinePower = -15
 			aux.Signals.EngineDrivelineTorque = aux.Signals.EngineDrivelinePower * 1000 / (1256 * 2 * Math.PI / 60)
 			aux.Signals.Internal_Engine_Power = -50
 
 			For i As Integer = 0 To 9
-				Assert.AreEqual(8954.1435, aux.AuxiliaryPowerAtCrankWatts, 0.001)
-				aux.CycleStep(1, msg)
+				Assert.AreEqual(8954.1435, aux.AuxiliaryPowerAtCrankWatts().Value(), 0.001)
+				aux.CycleStep(1.SI(Of Second), msg)
 			Next
 
-			Assert.AreEqual(82.5783, aux.AA_TotalCycleFC_Grams, 0.0001)
+			Assert.AreEqual(82.5783, aux.AA_TotalCycleFC_Grams().Value(), 0.0001)
 
 			aux.Signals.EngineDrivelinePower = driveLinePower
 			aux.Signals.EngineDrivelineTorque = aux.Signals.EngineDrivelinePower * 1000 / (1256 * 2 * Math.PI / 60)
 			aux.Signals.Internal_Engine_Power = internalPower
 
 			For i As Integer = 0 To 9
-				Assert.AreEqual(6087.0317, aux.AuxiliaryPowerAtCrankWatts, 0.001)
-				aux.CycleStep(1, msg)
+				Assert.AreEqual(6087.0317, aux.AuxiliaryPowerAtCrankWatts().Value(), 0.001)
+				aux.CycleStep(1.SI(Of Second), msg)
 			Next
 
-			Assert.AreEqual(162.4655, aux.AA_TotalCycleFC_Grams, 0.0001)
+			Assert.AreEqual(162.4655, aux.AA_TotalCycleFC_Grams().Value(), 0.0001)
 		End Sub
 	End Class
 End Namespace
\ No newline at end of file
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/AlternatorMapMock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/AlternatorMapMock.vb
index d94cd72e60..99df79b250 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/AlternatorMapMock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/AlternatorMapMock.vb
@@ -1,35 +1,36 @@
-Imports VectoAuxiliaries.Electrics
+Imports TUGraz.VectoCommon.Utils
+Imports VectoAuxiliaries.Electrics
 
 Namespace Mocks
 
-    Public Class AlternatorMapMock
-        Implements IAlternatorMap
+	Public Class AlternatorMapMock
+		Implements IAlternatorMap
 
 
 
-        Dim failing As Boolean
+		Dim failing As Boolean
 
-        Public Sub New(ByVal isFailing As Boolean)
-            failing = isFailing
-        End Sub
+		Public Sub New(ByVal isFailing As Boolean)
+			failing = isFailing
+		End Sub
 
-        Public Function Initialise() As Boolean Implements IAlternatorMap.Initialise
-            If failing Then
-                Throw New ArgumentException
-            Else
-                Return True
-            End If
-        End Function
+		Public Function Initialise() As Boolean Implements IAlternatorMap.Initialise
+			If failing Then
+				Throw New ArgumentException
+			Else
+				Return True
+			End If
+		End Function
 
-        Public Function GetEfficiency(ByVal rpm As single, ByVal amps As single) As AlternatorMapValues Implements IAlternatorMap.GetEfficiency
-            Return New AlternatorMapValues()
-        End Function
+		Public Function GetEfficiency(rpm1 As Double, amps1 As Ampere) As AlternatorMapValues Implements IAlternatorMap.GetEfficiency
+			Return New AlternatorMapValues()
+		End Function
 
 
-      Public Event AuxiliaryEvent(ByRef sender As Object, message As String, messageType As VectoAuxiliaries.AdvancedAuxiliaryMessageType) Implements VectoAuxiliaries.IAuxiliaryEvent.AuxiliaryEvent
+		Public Event AuxiliaryEvent(ByRef sender As Object, message As String, messageType As VectoAuxiliaries.AdvancedAuxiliaryMessageType) Implements VectoAuxiliaries.IAuxiliaryEvent.AuxiliaryEvent
 
 
 
-    End Class
+	End Class
 
 End Namespace
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/CompressorMapMock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/CompressorMapMock.vb
index f726848898..f78f43a9a8 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/CompressorMapMock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/CompressorMapMock.vb
@@ -1,4 +1,5 @@
-Imports VectoAuxiliaries
+Imports TUGraz.VectoCommon.Utils
+Imports VectoAuxiliaries
 Imports VectoAuxiliaries.Pneumatics
 
 Namespace Mocks
@@ -19,20 +20,20 @@ Namespace Mocks
 			End If
 		End Function
 
-		Public Function GetFlowRate(ByVal rpm As Double) As Single Implements ICompressorMap.GetFlowRate
-			Return 2.0
+		Public Function GetFlowRate(ByVal rpm As Double) As NormLiterPerSecond Implements ICompressorMap.GetFlowRate
+			Return 2.0.SI(Of NormLiterPerSecond)()
 		End Function
 
-		Public Function GetPowerCompressorOn(ByVal rpm As Double) As Single Implements ICompressorMap.GetPowerCompressorOn
-			Return 8.0
+		Public Function GetPowerCompressorOn(ByVal rpm As Double) As Watt Implements ICompressorMap.GetPowerCompressorOn
+			Return 8.0.SI(Of Watt)()
 		End Function
 
-		Public Function GetPowerCompressorOff(ByVal rpm As Double) As Single Implements ICompressorMap.GetPowerCompressorOff
-			Return 5.0
+		Public Function GetPowerCompressorOff(ByVal rpm As Double) As Watt Implements ICompressorMap.GetPowerCompressorOff
+			Return 5.0.SI(Of Watt)()
 		End Function
 
 
-		Public Function GetAveragePowerDemandPerCompressorUnitFlowRate() As Single _
+		Public Function GetAveragePowerDemandPerCompressorUnitFlowRate() As Double _
 			Implements ICompressorMap.GetAveragePowerDemandPerCompressorUnitFlowRate
 
 			Return 0.01
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/ElectricalConsumerMock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/ElectricalConsumerMock.vb
index 9fbc700242..ac0e67d58b 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/ElectricalConsumerMock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/ElectricalConsumerMock.vb
@@ -1,48 +1,47 @@
 Imports VectoAuxiliaries.Electrics
 Imports System.ComponentModel
+Imports TUGraz.VectoCommon.Utils
 
 Namespace Mocks
+	Public Class ElectricalConsumerMock
+		Implements IElectricalConsumer
 
-    Public Class ElectricalConsumerMock
-        Implements IElectricalConsumer
+		Public Property AvgConsumptionAmps As Double Implements IElectricalConsumer.AvgConsumptionAmps
 
-        Public Property AvgConsumptionAmps As Single Implements IElectricalConsumer.AvgConsumptionAmps
+		Public Property BaseVehicle As Boolean Implements IElectricalConsumer.BaseVehicle
 
-        Public Property BaseVehicle As Boolean Implements IElectricalConsumer.BaseVehicle
+		Public Property Category As String Implements IElectricalConsumer.Category
 
-        Public Property Category As String Implements IElectricalConsumer.Category
+		Public Property ConsumerName As String Implements IElectricalConsumer.ConsumerName
 
-        Public Property ConsumerName As String Implements IElectricalConsumer.ConsumerName
+		Public Property NominalConsumptionAmps As Double Implements IElectricalConsumer.NominalConsumptionAmps
 
-        Public Property NominalConsumptionAmps As Single Implements IElectricalConsumer.NominalConsumptionAmps
+		Public Property NumberInActualVehicle As Integer Implements IElectricalConsumer.NumberInActualVehicle
 
-        Public Property NumberInActualVehicle As Integer Implements IElectricalConsumer.NumberInActualVehicle
+		Public Property PhaseIdle_TractionOn As Double Implements IElectricalConsumer.PhaseIdle_TractionOn
 
-        Public Property PhaseIdle_TractionOn As Single Implements IElectricalConsumer.PhaseIdle_TractionOn
+		Public Property PowerNetVoltage As Double Implements IElectricalConsumer.PowerNetVoltage
 
-        Public Property PowerNetVoltage As Single Implements IElectricalConsumer.PowerNetVoltage
+		Public Function TotalAvgConumptionAmps(Optional PhaseIdle_TractionOnBasedOnCycle As Double = Nothing) As Ampere _
+			Implements IElectricalConsumer.TotalAvgConumptionAmps
+			Return 9.SI(Of Ampere)()
+		End Function
 
-        Public Function TotalAvgConumptionAmps(Optional PhaseIdle_TractionOnBasedOnCycle As Single = 0.0) As Single Implements IElectricalConsumer.TotalAvgConumptionAmps
-            Return 9
-        End Function
 
+		Public Function TotalAvgConsumptionInWatts(Optional PhaseIdle_TractionOnBasedOnCycle As Double = 0.0) As Watt _
+			Implements IElectricalConsumer.TotalAvgConsumptionInWatts
 
-        Public Function TotalAvgConsumptionInWatts(Optional PhaseIdle_TractionOnBasedOnCycle As Single = 0.0) As Single Implements IElectricalConsumer.TotalAvgConsumptionInWatts
+			Return (9 * 26.3).SI(Of Watt)()
+		End Function
 
-            Return 9 * 26.3
 
-        End Function
+		Public Property Info As String Implements IElectricalConsumer.Info
 
+		Public Event PropertyChanged As PropertyChangedEventHandler _
+			Implements INotifyPropertyChanged.PropertyChanged
 
-        Public Property Info As String Implements IElectricalConsumer.Info
-
-        Public Event PropertyChanged As PropertyChangedEventHandler _
-            Implements INotifyPropertyChanged.PropertyChanged
-
-        Private Sub NotifyPropertyChanged(p As String)
-            RaiseEvent PropertyChanged(Me, New PropertyChangedEventArgs(p))
-        End Sub
-
-    End Class
-
+		Private Sub NotifyPropertyChanged(p As String)
+			RaiseEvent PropertyChanged(Me, New PropertyChangedEventArgs(p))
+		End Sub
+	End Class
 End Namespace
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M1_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M1_Mock.vb
index ec7cfd4ad5..42d2ef3d3b 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/M1_Mock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M1_Mock.vb
@@ -1,4 +1,5 @@
 
+Imports TUGraz.VectoCommon.Utils
 Imports VectoAuxiliaries.Electrics
 Imports VectoAuxiliaries.Pneumatics
 Imports VectoAuxiliaries.Hvac
@@ -6,51 +7,48 @@ Imports VectoAuxiliaries.DownstreamModules
 
 
 Public Class M1_Mock
-Implements IM1_AverageHVACLoadDemand
-
-Public  _AveragePowerDemandAtAlternatorFromHVACElectricsWatts As Single
-public _AveragePowerDemandAtCrankFromHVACElectricsWatts As single
-Public _AveragePowerDemandAtCrankFromHVACMechanicalsWatts As Single
-Public _HVACFuelingLitresPerHour As single
-
-    Public Function AveragePowerDemandAtAlternatorFromHVACElectricsWatts() As Single Implements IM1_AverageHVACLoadDemand.AveragePowerDemandAtAlternatorFromHVACElectricsWatts
-       Return _AveragePowerDemandAtAlternatorFromHVACElectricsWatts
-    End Function
-
-    Public Function AveragePowerDemandAtCrankFromHVACElectricsWatts() As Single Implements IM1_AverageHVACLoadDemand.AveragePowerDemandAtCrankFromHVACElectricsWatts
-        Return _AveragePowerDemandAtCrankFromHVACElectricsWatts
-    End Function
-
-    Public Function AveragePowerDemandAtCrankFromHVACMechanicalsWatts() As Single Implements IM1_AverageHVACLoadDemand.AveragePowerDemandAtCrankFromHVACMechanicalsWatts
-       Return _AveragePowerDemandAtCrankFromHVACMechanicalsWatts
-    End Function
-
-    Public Function HVACFuelingLitresPerHour() As Single Implements IM1_AverageHVACLoadDemand.HVACFuelingLitresPerHour
-       Return _HVACFuelingLitresPerHour
-    End Function
-
-
-
-Public Sub new()
-
-End Sub
-
-Public Sub new ( AveragePowerDemandAtAlternatorFromHVACElectricsWatts  As Single, _
-                 AveragePowerDemandAtCrankFromHVACElectricsWatts       As single, _
-                 AveragePowerDemandAtCrankFromHVACMechanicalsWatts     As Single, _
-                 HVACFuelingLitresPerHour                              As single)
-
-                 'Assign Values
-                _AveragePowerDemandAtAlternatorFromHVACElectricsWatts  = AveragePowerDemandAtAlternatorFromHVACElectricsWatts
-                _AveragePowerDemandAtCrankFromHVACElectricsWatts       = AveragePowerDemandAtCrankFromHVACElectricsWatts
-                _AveragePowerDemandAtCrankFromHVACMechanicalsWatts     = AveragePowerDemandAtCrankFromHVACMechanicalsWatts
-                _HVACFuelingLitresPerHour                              = HVACFuelingLitresPerHour
-                                                              
-                                                            
-End Sub                                                                              
-
-
-
-
+	Implements IM1_AverageHVACLoadDemand
+
+	Public _AveragePowerDemandAtAlternatorFromHVACElectricsWatts As Watt
+	Public _AveragePowerDemandAtCrankFromHVACElectricsWatts As Watt
+	Public _AveragePowerDemandAtCrankFromHVACMechanicalsWatts As Watt
+	Public _HVACFuelingLitresPerHour As LiterPerHour
+
+	Public Function AveragePowerDemandAtAlternatorFromHVACElectricsWatts() As Watt _
+		Implements IM1_AverageHVACLoadDemand.AveragePowerDemandAtAlternatorFromHVACElectricsWatts
+		Return _AveragePowerDemandAtAlternatorFromHVACElectricsWatts
+	End Function
+
+	Public Function AveragePowerDemandAtCrankFromHVACElectricsWatts() As Watt _
+		Implements IM1_AverageHVACLoadDemand.AveragePowerDemandAtCrankFromHVACElectricsWatts
+		Return _AveragePowerDemandAtCrankFromHVACElectricsWatts
+	End Function
+
+	Public Function AveragePowerDemandAtCrankFromHVACMechanicalsWatts() As Watt _
+		Implements IM1_AverageHVACLoadDemand.AveragePowerDemandAtCrankFromHVACMechanicalsWatts
+		Return _AveragePowerDemandAtCrankFromHVACMechanicalsWatts
+	End Function
+
+	Public Function HVACFuelingLitresPerHour() As LiterPerHour _
+		Implements IM1_AverageHVACLoadDemand.HVACFuelingLitresPerHour
+		Return _HVACFuelingLitresPerHour
+	End Function
+
+
+	Public Sub New()
+	End Sub
+
+	Public Sub New(AveragePowerDemandAtAlternatorFromHVACElectricsWatts As Double,
+					AveragePowerDemandAtCrankFromHVACElectricsWatts As Double,
+					AveragePowerDemandAtCrankFromHVACMechanicalsWatts As Double,
+					HVACFuelingLitresPerHour As Double)
+
+		'Assign Values
+		_AveragePowerDemandAtAlternatorFromHVACElectricsWatts =
+			AveragePowerDemandAtAlternatorFromHVACElectricsWatts.SI(Of Watt)()
+		_AveragePowerDemandAtCrankFromHVACElectricsWatts = AveragePowerDemandAtCrankFromHVACElectricsWatts.SI(Of Watt)()
+		_AveragePowerDemandAtCrankFromHVACMechanicalsWatts = AveragePowerDemandAtCrankFromHVACMechanicalsWatts.SI(Of Watt)()
+		_HVACFuelingLitresPerHour = HVACFuelingLitresPerHour.SI(Of LiterPerHour)()
+	End Sub
 End Class
 
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M2_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M2_Mock.vb
index 14b4ad5464..e555250bf3 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/M2_Mock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M2_Mock.vb
@@ -1,39 +1,36 @@
-Imports VectoAuxiliaries.Electrics
+Imports TUGraz.VectoCommon.Utils
+Imports VectoAuxiliaries.Electrics
 Imports VectoAuxiliaries.Pneumatics
 Imports VectoAuxiliaries.Hvac
 Imports VectoAuxiliaries.DownstreamModules
 
 Public Class M2_Mock
-Implements IM2_AverageElectricalLoadDemand
+	Implements IM2_AverageElectricalLoadDemand
 
+	Public _GetAveragePowerAtCrankFromElectrics As Watt
+	Public _GetAveragePowerDemandAtAlternator As Watt
 
-Public _GetAveragePowerAtCrankFromElectrics As Single
-Public _GetAveragePowerDemandAtAlternator   As Single
 
+	Public Function GetAveragePowerAtCrankFromElectrics() As Watt _
+		Implements IM2_AverageElectricalLoadDemand.GetAveragePowerAtCrankFromElectrics
+		Return _GetAveragePowerAtCrankFromElectrics
+	End Function
 
+	Public Function GetAveragePowerDemandAtAlternator() As Watt _
+		Implements IM2_AverageElectricalLoadDemand.GetAveragePowerDemandAtAlternator
+		Return _GetAveragePowerDemandAtAlternator
+	End Function
 
-    Public Function GetAveragePowerAtCrankFromElectrics() As Single Implements IM2_AverageElectricalLoadDemand.GetAveragePowerAtCrankFromElectrics
-       Return _GetAveragePowerAtCrankFromElectrics
-    End Function
 
-    Public Function GetAveragePowerDemandAtAlternator() As Single Implements IM2_AverageElectricalLoadDemand.GetAveragePowerDemandAtAlternator
-     Return _GetAveragePowerDemandAtAlternator
-    End Function
+	Public Sub New()
+	End Sub
 
 
-Public Sub new()
-
-End Sub
-
-
-Public Sub new ( GetAveragePowerAtCrankFromElectrics As Single,GetAveragePowerDemandAtAlternator As single )
-
-
- _GetAveragePowerAtCrankFromElectrics =  GetAveragePowerAtCrankFromElectrics
- _GetAveragePowerDemandAtAlternator   =  GetAveragePowerDemandAtAlternator  
-
-End Sub
+	Public Sub New(GetAveragePowerAtCrankFromElectrics As Double, GetAveragePowerDemandAtAlternator As Double)
 
 
+		_GetAveragePowerAtCrankFromElectrics = GetAveragePowerAtCrankFromElectrics.SI(Of Watt)()
+		_GetAveragePowerDemandAtAlternator = GetAveragePowerDemandAtAlternator.SI(Of Watt)()
+	End Sub
 End Class
 
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M3_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M3_Mock.vb
index 9067cef65a..c7d3bd5e9f 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/M3_Mock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M3_Mock.vb
@@ -1,37 +1,34 @@
-Imports VectoAuxiliaries.Electrics
+Imports TUGraz.VectoCommon.Utils
+Imports VectoAuxiliaries.Electrics
 Imports VectoAuxiliaries.Pneumatics
 Imports VectoAuxiliaries.Hvac
 Imports VectoAuxiliaries.DownstreamModules
 
 Public Class M3_Mock
- Implements IM3_AveragePneumaticLoadDemand
+	Implements IM3_AveragePneumaticLoadDemand
 
- public _GetAveragePowerDemandAtCrankFromPneumatics    as single
- public _TotalAirConsumedPerCycle                      as single
+	Public _GetAveragePowerDemandAtCrankFromPneumatics As Watt
+	Public _TotalAirConsumedPerCycle As NormLiterPerSecond
 
 
-    Public Function GetAveragePowerDemandAtCrankFromPneumatics() As Single Implements IM3_AveragePneumaticLoadDemand.GetAveragePowerDemandAtCrankFromPneumatics
-     Return _GetAveragePowerDemandAtCrankFromPneumatics
-    End Function
+	Public Function GetAveragePowerDemandAtCrankFromPneumatics() As Watt _
+		Implements IM3_AveragePneumaticLoadDemand.GetAveragePowerDemandAtCrankFromPneumatics
+		Return _GetAveragePowerDemandAtCrankFromPneumatics
+	End Function
 
-    Public Function TotalAirConsumedPerCycle() As Single Implements IM3_AveragePneumaticLoadDemand.AverageAirConsumedPerSecondLitre
-     Return _TotalAirConsumedPerCycle
-    End Function
+	Public Function TotalAirConsumedPerCycle() As NormLiterPerSecond _
+		Implements IM3_AveragePneumaticLoadDemand.AverageAirConsumedPerSecondLitre
+		Return _TotalAirConsumedPerCycle
+	End Function
 
 
+	Public Sub New()
+	End Sub
 
-Public Sub new()
-
-End Sub
-
-Public Sub new ( GetAveragePowerDemandAtCrankFromPneumatics As Single,TotalAirConsumedPerCycle As single )
-
-_GetAveragePowerDemandAtCrankFromPneumatics= GetAveragePowerDemandAtCrankFromPneumatics
-_TotalAirConsumedPerCycle = TotalAirConsumedPerCycle
-
-End Sub
-
-
+	Public Sub New(GetAveragePowerDemandAtCrankFromPneumatics As Double, TotalAirConsumedPerCycle As Double)
 
+		_GetAveragePowerDemandAtCrankFromPneumatics = GetAveragePowerDemandAtCrankFromPneumatics.SI(Of Watt)()
+		_TotalAirConsumedPerCycle = TotalAirConsumedPerCycle.SI(Of NormLiterPerSecond)()
+	End Sub
 End Class
 
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M4_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M4_Mock.vb
index 513ec0a8d0..7eb7e8e744 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/M4_Mock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M4_Mock.vb
@@ -1,65 +1,66 @@
-Imports VectoAuxiliaries.Electrics
+Imports TUGraz.VectoCommon.Utils
+Imports VectoAuxiliaries.Electrics
 Imports VectoAuxiliaries.Pneumatics
 Imports VectoAuxiliaries.Hvac
 Imports VectoAuxiliaries.DownstreamModules
 
 Public Class M4_Mock
- Implements IM4_AirCompressor
-
-
-Public Property _AveragePowerDemandPerCompressorUnitFlowRate As Single
-Public Property _FlowRate                                    As Single
-Public Property _PowerCompressorOff                          As single
-Public Property _PowerCompressorOn                           As Single
-Public Property _PowerDifference                             As single
-
-    Public Function GetAveragePowerDemandPerCompressorUnitFlowRate() As Single Implements IM4_AirCompressor.GetAveragePowerDemandPerCompressorUnitFlowRate
-       Return _AveragePowerDemandPerCompressorUnitFlowRate
-    End Function
-
-    Public Function GetFlowRate() As Single Implements IM4_AirCompressor.GetFlowRate
-       Return _FlowRate
-    End Function
-
-    Public Function GetPowerCompressorOff() As Single Implements IM4_AirCompressor.GetPowerCompressorOff
-        Return _PowerCompressorOff
-    End Function
-
-    Public Function PowerCompressorOn() As Single Implements IM4_AirCompressor.GetPowerCompressorOn
-      Return _PowerCompressorOn
-    End Function
-
-    Public Function GetPowerDifference() As Single Implements IM4_AirCompressor.GetPowerDifference
-       Return _PowerDifference
-    End Function
-
-
-   Public Sub new()
-
-   End Sub
-
-   Public Sub new(AveragePowerDemandPerCompressorUnitFlowRate as single , _
-                  FlowRate           As single, _
-                  PowerCompressorOff As Single, _
-                  PowerCompressorOn  As Single, _
-                  PowerDifference    As Single)
-                               
-                 _AveragePowerDemandPerCompressorUnitFlowRate = AveragePowerDemandPerCompressorUnitFlowRate
-                 _FlowRate                                    = FlowRate
-                 _PowerCompressorOff                          = PowerCompressorOff
-                 _PowerCompressorOn                           = PowerCompressorOn
-                 _PowerDifference                             = PowerDifference
-                                                                                           
-   End Sub                                                                       
-                                                                                  
-                                                                                    
-    'Non Essential 
-    Public Function Initialise() As Boolean Implements IM4_AirCompressor.Initialise
-     Return true
-    End Function
-
-    Public Property PulleyGearEfficiency As Single Implements IM4_AirCompressor.PulleyGearEfficiency
-    Public Property PulleyGearRatio As Single Implements IM4_AirCompressor.PulleyGearRatio
+	Implements IM4_AirCompressor
+
+
+	Public Property _AveragePowerDemandPerCompressorUnitFlowRate As SI
+	Public Property _FlowRate As NormLiterPerSecond
+	Public Property _PowerCompressorOff As Watt
+	Public Property _PowerCompressorOn As Watt
+	Public Property _PowerDifference As Watt
+
+	Public Function GetAveragePowerDemandPerCompressorUnitFlowRate() As SI Implements IM4_AirCompressor.GetAveragePowerDemandPerCompressorUnitFlowRate
+		Return _AveragePowerDemandPerCompressorUnitFlowRate
+	End Function
+
+	Public Function GetFlowRate() As NormLiterPerSecond Implements IM4_AirCompressor.GetFlowRate
+		Return _FlowRate
+	End Function
+
+	Public Function GetPowerCompressorOff() As Watt Implements IM4_AirCompressor.GetPowerCompressorOff
+		Return _PowerCompressorOff
+	End Function
+
+	Public Function PowerCompressorOn() As Watt Implements IM4_AirCompressor.GetPowerCompressorOn
+		Return _PowerCompressorOn
+	End Function
+
+	Public Function GetPowerDifference() As Watt Implements IM4_AirCompressor.GetPowerDifference
+		Return _PowerDifference
+	End Function
+
+
+	Public Sub New()
+
+	End Sub
+
+	Public Sub New(AveragePowerDemandPerCompressorUnitFlowRate As Double, _
+				   FlowRate As Double, _
+				   PowerCompressorOff As Double, _
+				   PowerCompressorOn As Double, _
+				   PowerDifference As Double)
+
+		_AveragePowerDemandPerCompressorUnitFlowRate = AveragePowerDemandPerCompressorUnitFlowRate.SI()
+		_FlowRate = FlowRate.SI(Of NormLiterPerSecond)()
+		_PowerCompressorOff = PowerCompressorOff.SI(Of Watt)()
+		_PowerCompressorOn = PowerCompressorOn.SI(Of Watt)()
+		_PowerDifference = PowerDifference.SI(Of Watt)()
+
+	End Sub
+
+
+	'Non Essential 
+	Public Function Initialise() As Boolean Implements IM4_AirCompressor.Initialise
+		Return True
+	End Function
+
+	Public Property PulleyGearEfficiency As Double Implements IM4_AirCompressor.PulleyGearEfficiency
+	Public Property PulleyGearRatio As Double Implements IM4_AirCompressor.PulleyGearRatio
 
 
 
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M5_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M5_Mock.vb
index 93b90a035b..1b53fb739f 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/M5_Mock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M5_Mock.vb
@@ -1,46 +1,44 @@
-Imports VectoAuxiliaries.Electrics
+Imports TUGraz.VectoCommon.Utils
+Imports VectoAuxiliaries.Electrics
 Imports VectoAuxiliaries.Pneumatics
 Imports VectoAuxiliaries.Hvac
 Imports VectoAuxiliaries.DownstreamModules
 
 Public Class M5_Mock
- Implements IM5_SmartAlternatorSetGeneration
+	Implements IM5_SmartAlternatorSetGeneration
 
+	Public Property _AlternatorsGenerationPowerAtCrankIdleWatts As Watt
+	Public Property _AlternatorsGenerationPowerAtCrankOverrunWatts As Watt
+	Public Property _AlternatorsGenerationPowerAtCrankTractionOnWatts As Watt
 
- public property _AlternatorsGenerationPowerAtCrankIdleWatts          as single
- public property _AlternatorsGenerationPowerAtCrankOverrunWatts       as single
- public property _AlternatorsGenerationPowerAtCrankTractionOnWatts    as single
 
+	Public Function AlternatorsGenerationPowerAtCrankIdleWatts() As Watt _
+		Implements IM5_SmartAlternatorSetGeneration.AlternatorsGenerationPowerAtCrankIdleWatts
+		Return _AlternatorsGenerationPowerAtCrankIdleWatts
+	End Function
 
-    Public Function AlternatorsGenerationPowerAtCrankIdleWatts() As Single Implements IM5_SmartAlternatorSetGeneration.AlternatorsGenerationPowerAtCrankIdleWatts
-       Return _AlternatorsGenerationPowerAtCrankIdleWatts
-    End Function
+	Public Function AlternatorsGenerationPowerAtCrankOverrunWatts() As Watt _
+		Implements IM5_SmartAlternatorSetGeneration.AlternatorsGenerationPowerAtCrankOverrunWatts
+		Return _AlternatorsGenerationPowerAtCrankOverrunWatts
+	End Function
 
-    Public Function AlternatorsGenerationPowerAtCrankOverrunWatts() As Single Implements IM5_SmartAlternatorSetGeneration.AlternatorsGenerationPowerAtCrankOverrunWatts
-       Return _AlternatorsGenerationPowerAtCrankOverrunWatts
-    End Function
+	Public Function AlternatorsGenerationPowerAtCrankTractionOnWatts() As Watt _
+		Implements IM5_SmartAlternatorSetGeneration.AlternatorsGenerationPowerAtCrankTractionOnWatts
+		Return _AlternatorsGenerationPowerAtCrankTractionOnWatts
+	End Function
 
-    Public Function AlternatorsGenerationPowerAtCrankTractionOnWatts() As Single Implements IM5_SmartAlternatorSetGeneration.AlternatorsGenerationPowerAtCrankTractionOnWatts
-     Return _AlternatorsGenerationPowerAtCrankTractionOnWatts
-    End Function
 
+	Public Sub New()
+	End Sub
 
- Public Sub new ()
-
- End Sub
-
-
-   Public Sub new ( AlternatorsGenerationPowerAtCrankIdleWatts          as single,
-                    AlternatorsGenerationPowerAtCrankOverrunWatts       as single,
-                    AlternatorsGenerationPowerAtCrankTractionOnWatts    as single)
-
-         _AlternatorsGenerationPowerAtCrankIdleWatts          = AlternatorsGenerationPowerAtCrankIdleWatts
-         _AlternatorsGenerationPowerAtCrankOverrunWatts       = AlternatorsGenerationPowerAtCrankOverrunWatts
-         _AlternatorsGenerationPowerAtCrankTractionOnWatts    = AlternatorsGenerationPowerAtCrankTractionOnWatts       
-                                                    
-
-   End Sub
 
+	Public Sub New(AlternatorsGenerationPowerAtCrankIdleWatts As Double,
+					AlternatorsGenerationPowerAtCrankOverrunWatts As Double,
+					AlternatorsGenerationPowerAtCrankTractionOnWatts As Double)
 
+		_AlternatorsGenerationPowerAtCrankIdleWatts = AlternatorsGenerationPowerAtCrankIdleWatts.SI(Of Watt)()
+		_AlternatorsGenerationPowerAtCrankOverrunWatts = AlternatorsGenerationPowerAtCrankOverrunWatts.SI(Of Watt)()
+		_AlternatorsGenerationPowerAtCrankTractionOnWatts = AlternatorsGenerationPowerAtCrankTractionOnWatts.SI(Of Watt)()
+	End Sub
 End Class
 
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M6_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M6_Mock.vb
index 70621c1a9c..3ccbc11731 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/M6_Mock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M6_Mock.vb
@@ -1,4 +1,5 @@
 
+Imports TUGraz.VectoCommon.Utils
 Imports VectoAuxiliaries.Electrics
 Imports VectoAuxiliaries.Pneumatics
 Imports VectoAuxiliaries.Hvac
@@ -6,97 +7,103 @@ Imports VectoAuxiliaries.DownstreamModules
 
 
 Public Class M6_Mock
- Implements IM6
-
-
-Public Property _AveragePowerDemandAtCrankFromPneumatics       As Single
-public property _AvgPowerDemandAtCrankFromElectricsIncHVAC     As single
-public property _OverrunFlag                                   As integer
-public property _SmartElecAndPneumaticAirCompPowerGenAtCrank   As single
-public property _SmartElecAndPneumaticAltPowerGenAtCrank       As single
-public property _SmartElecAndPneumaticsCompressorFlag          As integer
-public property _SmartElecOnlyAltPowerGenAtCrank               As single
-public property _SmartPneumaticOnlyAirCompPowerGenAtCrank      As single
-public property _SmartPneumaticsOnlyCompressorFlag             As integer
-
-
-    Public ReadOnly Property AveragePowerDemandAtCrankFromPneumatics As Single Implements IM6.AveragePowerDemandAtCrankFromPneumatics
-        Get
-        Return _AveragePowerDemandAtCrankFromPneumatics
-        End Get
-
-    End Property
-    Public ReadOnly Property AvgPowerDemandAtCrankFromElectricsIncHVAC As Single Implements IM6.AvgPowerDemandAtCrankFromElectricsIncHVAC
-        Get
-        Return _AvgPowerDemandAtCrankFromElectricsIncHVAC
-        End Get
-    End Property
-    Public ReadOnly Property OverrunFlag As Integer Implements IM6.OverrunFlag
-        Get
-        Return _OverrunFlag
-        End Get
-    End Property
-    Public ReadOnly Property SmartElecAndPneumaticAirCompPowerGenAtCrank As Single Implements IM6.SmartElecAndPneumaticAirCompPowerGenAtCrank
-        Get
-        Return _SmartElecAndPneumaticAirCompPowerGenAtCrank
-        End Get
-    End Property
-    Public ReadOnly Property SmartElecAndPneumaticAltPowerGenAtCrank As Single Implements IM6.SmartElecAndPneumaticAltPowerGenAtCrank
-        Get
-         Return _SmartElecAndPneumaticAltPowerGenAtCrank
-        End Get
-    End Property
-    Public ReadOnly Property SmartElecAndPneumaticsCompressorFlag As Integer Implements IM6.SmartElecAndPneumaticsCompressorFlag
-        Get
-          Return _SmartElecAndPneumaticsCompressorFlag
-        End Get
-    End Property
-    Public ReadOnly Property SmartElecOnlyAltPowerGenAtCrank As Single Implements IM6.SmartElecOnlyAltPowerGenAtCrank
-        Get
-        Return _SmartElecOnlyAltPowerGenAtCrank
-        End Get
-    End Property
-    Public ReadOnly Property SmartPneumaticOnlyAirCompPowerGenAtCrank As Single Implements IM6.SmartPneumaticOnlyAirCompPowerGenAtCrank
-        Get
-          return _SmartPneumaticOnlyAirCompPowerGenAtCrank
-        End Get
-    End Property
-    Public ReadOnly Property SmartPneumaticsOnlyCompressorFlag As Integer Implements IM6.SmartPneumaticsOnlyCompressorFlag
-        Get
-         Return _SmartPneumaticsOnlyCompressorFlag
-        End Get
-    End Property
-
-
-    Public Sub new()
-
-    End Sub
-
-    Public Sub new(_AveragePowerDemandAtCrankFromPneumatics       As Single , _
-                   _AvgPowerDemandAtCrankFromElectricsIncHVAC     As single , _
-                   _OverrunFlag                                   As integer, _
-                   _SmartElecAndPneumaticAirCompPowerGenAtCrank   As single , _
-                   _SmartElecAndPneumaticAltPowerGenAtCrank       As single , _
-                   _SmartElecAndPneumaticsCompressorFlag          As integer, _
-                   _SmartElecOnlyAltPowerGenAtCrank               As single , _
-                   _SmartPneumaticOnlyAirCompPowerGenAtCrank      As single , _
-                   _SmartPneumaticsOnlyCompressorFlag             As integer)
-
-
-       _AveragePowerDemandAtCrankFromPneumatics     = AveragePowerDemandAtCrankFromPneumatics
-       _AvgPowerDemandAtCrankFromElectricsIncHVAC   = AvgPowerDemandAtCrankFromElectricsIncHVAC
-       _OverrunFlag                                 = OverrunFlag
-       _SmartElecAndPneumaticAirCompPowerGenAtCrank = SmartElecAndPneumaticAirCompPowerGenAtCrank
-       _SmartElecAndPneumaticAltPowerGenAtCrank     = SmartElecAndPneumaticAltPowerGenAtCrank
-       _SmartElecAndPneumaticsCompressorFlag        = SmartElecAndPneumaticsCompressorFlag
-       _SmartElecOnlyAltPowerGenAtCrank             = SmartElecOnlyAltPowerGenAtCrank
-       _SmartPneumaticOnlyAirCompPowerGenAtCrank    = SmartPneumaticOnlyAirCompPowerGenAtCrank
-       _SmartPneumaticsOnlyCompressorFlag           = SmartPneumaticsOnlyCompressorFlag
-                                                         
-                                                           
-                                                                   
-    End Sub                                               
-                                                                 
+	Implements IM6
 
+	Public Property _AveragePowerDemandAtCrankFromPneumatics As Watt
+	Public Property _AvgPowerDemandAtCrankFromElectricsIncHVAC As Watt
+	Public Property _OverrunFlag As Integer
+	Public Property _SmartElecAndPneumaticAirCompPowerGenAtCrank As Watt
+	Public Property _SmartElecAndPneumaticAltPowerGenAtCrank As Watt
+	Public Property _SmartElecAndPneumaticsCompressorFlag As Integer
+	Public Property _SmartElecOnlyAltPowerGenAtCrank As Watt
+	Public Property _SmartPneumaticOnlyAirCompPowerGenAtCrank As Watt
+	Public Property _SmartPneumaticsOnlyCompressorFlag As Integer
+
+
+	Public ReadOnly Property AveragePowerDemandAtCrankFromPneumatics As Watt _
+		Implements IM6.AveragePowerDemandAtCrankFromPneumatics
+		Get
+			Return _AveragePowerDemandAtCrankFromPneumatics
+		End Get
+	End Property
+
+	Public ReadOnly Property AvgPowerDemandAtCrankFromElectricsIncHVAC As Watt _
+		Implements IM6.AvgPowerDemandAtCrankFromElectricsIncHVAC
+		Get
+			Return _AvgPowerDemandAtCrankFromElectricsIncHVAC
+		End Get
+	End Property
+
+	Public ReadOnly Property OverrunFlag As Boolean Implements IM6.OverrunFlag
+		Get
+			Return _OverrunFlag
+		End Get
+	End Property
+
+	Public ReadOnly Property SmartElecAndPneumaticAirCompPowerGenAtCrank As Watt _
+		Implements IM6.SmartElecAndPneumaticAirCompPowerGenAtCrank
+		Get
+			Return _SmartElecAndPneumaticAirCompPowerGenAtCrank
+		End Get
+	End Property
+
+	Public ReadOnly Property SmartElecAndPneumaticAltPowerGenAtCrank As Watt _
+		Implements IM6.SmartElecAndPneumaticAltPowerGenAtCrank
+		Get
+			Return _SmartElecAndPneumaticAltPowerGenAtCrank
+		End Get
+	End Property
+
+	Public ReadOnly Property SmartElecAndPneumaticsCompressorFlag As Boolean _
+		Implements IM6.SmartElecAndPneumaticsCompressorFlag
+		Get
+			Return _SmartElecAndPneumaticsCompressorFlag
+		End Get
+	End Property
+
+	Public ReadOnly Property SmartElecOnlyAltPowerGenAtCrank As Watt Implements IM6.SmartElecOnlyAltPowerGenAtCrank
+		Get
+			Return _SmartElecOnlyAltPowerGenAtCrank
+		End Get
+	End Property
+
+	Public ReadOnly Property SmartPneumaticOnlyAirCompPowerGenAtCrank As Watt _
+		Implements IM6.SmartPneumaticOnlyAirCompPowerGenAtCrank
+		Get
+			Return _SmartPneumaticOnlyAirCompPowerGenAtCrank
+		End Get
+	End Property
+
+	Public ReadOnly Property SmartPneumaticsOnlyCompressorFlag As Boolean Implements IM6.SmartPneumaticsOnlyCompressorFlag
+		Get
+			Return _SmartPneumaticsOnlyCompressorFlag
+		End Get
+	End Property
+
+
+	Public Sub New()
+	End Sub
+
+	Public Sub New(AveragePowerDemandAtCrankFromPneumatics As Double,
+					AvgPowerDemandAtCrankFromElectricsIncHVAC As Double,
+					OverrunFlag As Boolean,
+					SmartElecAndPneumaticAirCompPowerGenAtCrank As Double,
+					SmartElecAndPneumaticAltPowerGenAtCrank As Double,
+					SmartElecAndPneumaticsCompressorFlag As Boolean,
+					SmartElecOnlyAltPowerGenAtCrank As Double,
+					SmartPneumaticOnlyAirCompPowerGenAtCrank As Double,
+					SmartPneumaticsOnlyCompressorFlag As Boolean)
+
+
+		_AveragePowerDemandAtCrankFromPneumatics = AveragePowerDemandAtCrankFromPneumatics.SI(Of Watt)()
+		_AvgPowerDemandAtCrankFromElectricsIncHVAC = AvgPowerDemandAtCrankFromElectricsIncHVAC.SI(Of Watt)()
+		_OverrunFlag = OverrunFlag
+		_SmartElecAndPneumaticAirCompPowerGenAtCrank = SmartElecAndPneumaticAirCompPowerGenAtCrank.SI(Of Watt)()
+		_SmartElecAndPneumaticAltPowerGenAtCrank = SmartElecAndPneumaticAltPowerGenAtCrank.SI(Of Watt)()
+		_SmartElecAndPneumaticsCompressorFlag = SmartElecAndPneumaticsCompressorFlag
+		_SmartElecOnlyAltPowerGenAtCrank = SmartElecOnlyAltPowerGenAtCrank.SI(Of Watt)()
+		_SmartPneumaticOnlyAirCompPowerGenAtCrank = SmartPneumaticOnlyAirCompPowerGenAtCrank.SI(Of Watt)()
+		_SmartPneumaticsOnlyCompressorFlag = SmartPneumaticsOnlyCompressorFlag
+	End Sub
 End Class
 
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M7_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M7_Mock.vb
index c9df44ed5d..4bae966872 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/M7_Mock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M7_Mock.vb
@@ -1,4 +1,5 @@
 
+Imports TUGraz.VectoCommon.Utils
 Imports VectoAuxiliaries.Electrics
 Imports VectoAuxiliaries.Pneumatics
 Imports VectoAuxiliaries.Hvac
@@ -6,56 +7,54 @@ Imports VectoAuxiliaries.DownstreamModules
 
 
 Public Class M7_Mock
- Implements IM7
-
-    Private _SmartElectricalAndPneumaticAuxAirCompPowerGenAtCrank As Single
-    Private _SmartElectricalAndPneumaticAuxAltPowerGenAtCrank     As Single
-    Private _SmartElectricalOnlyAuxAltPowerGenAtCrank             As Single
-    Private _SmartPneumaticOnlyAuxAirCompPowerGenAtCrank          As Single
- 
-    Public ReadOnly Property SmartElectricalAndPneumaticAuxAirCompPowerGenAtCrank As Single Implements IM7.SmartElectricalAndPneumaticAuxAirCompPowerGenAtCrank
-        Get
-           Return _SmartElectricalAndPneumaticAuxAirCompPowerGenAtCrank
-        End Get
-    End Property
-
-    Public ReadOnly Property SmartElectricalAndPneumaticAuxAltPowerGenAtCrank As Single Implements IM7.SmartElectricalAndPneumaticAuxAltPowerGenAtCrank
-        Get
-        Return _SmartElectricalAndPneumaticAuxAltPowerGenAtCrank
-        End Get
-    End Property
-
-    Public ReadOnly Property SmartElectricalOnlyAuxAltPowerGenAtCrank As Single Implements IM7.SmartElectricalOnlyAuxAltPowerGenAtCrank
-        Get
-        Return _SmartElectricalOnlyAuxAltPowerGenAtCrank
-        End Get
-    End Property
-
-    Public ReadOnly Property SmartPneumaticOnlyAuxAirCompPowerGenAtCrank As Single Implements IM7.SmartPneumaticOnlyAuxAirCompPowerGenAtCrank
-        Get
-         Return _SmartPneumaticOnlyAuxAirCompPowerGenAtCrank
-        End Get
-    End Property
-
-
-
-    'Constructors
-    public Sub new()
-
-    End Sub
-
-    Public Sub new (SmartElectricalAndPneumaticAuxAirCompPowerGenAtCrank As Single,
-                    SmartElectricalAndPneumaticAuxAltPowerGenAtCrank     As Single, 
-                    SmartElectricalOnlyAuxAltPowerGenAtCrank             As Single,         
-                    SmartPneumaticOnlyAuxAirCompPowerGenAtCrank          As Single)  
-
-                    _SmartElectricalAndPneumaticAuxAirCompPowerGenAtCrank = SmartElectricalAndPneumaticAuxAirCompPowerGenAtCrank
-                    _SmartElectricalAndPneumaticAuxAltPowerGenAtCrank     = SmartElectricalAndPneumaticAuxAltPowerGenAtCrank
-                    _SmartElectricalOnlyAuxAltPowerGenAtCrank             = SmartElectricalOnlyAuxAltPowerGenAtCrank
-                    _SmartPneumaticOnlyAuxAirCompPowerGenAtCrank          = SmartPneumaticOnlyAuxAirCompPowerGenAtCrank
-                                                                    
-                                                                            
-    End Sub                                                              
-            
-                         
-End Class 
\ No newline at end of file
+	Implements IM7
+
+	Private _SmartElectricalAndPneumaticAuxAirCompPowerGenAtCrank As Watt
+	Private _SmartElectricalAndPneumaticAuxAltPowerGenAtCrank As Watt
+	Private _SmartElectricalOnlyAuxAltPowerGenAtCrank As Watt
+	Private _SmartPneumaticOnlyAuxAirCompPowerGenAtCrank As Watt
+
+	Public ReadOnly Property SmartElectricalAndPneumaticAuxAirCompPowerGenAtCrank As Watt _
+		Implements IM7.SmartElectricalAndPneumaticAuxAirCompPowerGenAtCrank
+		Get
+			Return _SmartElectricalAndPneumaticAuxAirCompPowerGenAtCrank
+		End Get
+	End Property
+
+	Public ReadOnly Property SmartElectricalAndPneumaticAuxAltPowerGenAtCrank As Watt _
+		Implements IM7.SmartElectricalAndPneumaticAuxAltPowerGenAtCrank
+		Get
+			Return _SmartElectricalAndPneumaticAuxAltPowerGenAtCrank
+		End Get
+	End Property
+
+	Public ReadOnly Property SmartElectricalOnlyAuxAltPowerGenAtCrank As Watt _
+		Implements IM7.SmartElectricalOnlyAuxAltPowerGenAtCrank
+		Get
+			Return _SmartElectricalOnlyAuxAltPowerGenAtCrank
+		End Get
+	End Property
+
+	Public ReadOnly Property SmartPneumaticOnlyAuxAirCompPowerGenAtCrank As Watt _
+		Implements IM7.SmartPneumaticOnlyAuxAirCompPowerGenAtCrank
+		Get
+			Return _SmartPneumaticOnlyAuxAirCompPowerGenAtCrank
+		End Get
+	End Property
+
+
+	'Constructors
+	Public Sub New()
+	End Sub
+
+	Public Sub New(SmartElectricalAndPneumaticAuxAirCompPowerGenAtCrank As Watt,
+					SmartElectricalAndPneumaticAuxAltPowerGenAtCrank As Watt,
+					SmartElectricalOnlyAuxAltPowerGenAtCrank As Watt,
+					SmartPneumaticOnlyAuxAirCompPowerGenAtCrank As Watt)
+
+		_SmartElectricalAndPneumaticAuxAirCompPowerGenAtCrank = SmartElectricalAndPneumaticAuxAirCompPowerGenAtCrank
+		_SmartElectricalAndPneumaticAuxAltPowerGenAtCrank = SmartElectricalAndPneumaticAuxAltPowerGenAtCrank
+		_SmartElectricalOnlyAuxAltPowerGenAtCrank = SmartElectricalOnlyAuxAltPowerGenAtCrank
+		_SmartPneumaticOnlyAuxAirCompPowerGenAtCrank = SmartPneumaticOnlyAuxAirCompPowerGenAtCrank
+	End Sub
+End Class
\ No newline at end of file
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/MockFuel50PC.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/MockFuel50PC.vb
index a98fdff1bd..12e46d286c 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/MockFuel50PC.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/MockFuel50PC.vb
@@ -3,20 +3,21 @@ Imports VectoAuxiliaries.Pneumatics
 Imports VectoAuxiliaries.Hvac
 Imports VectoAuxiliaries.DownstreamModules
 Imports NUnit.Framework
+Imports TUGraz.VectoCommon.Utils
 Imports VectoAuxiliaries
 
-public class MockFuel50PC
+Public Class MockFuel50PC
 	Implements IFuelConsumptionMap
 
-	Public Function fFCdelaunay_Intp(nU As Single, Tq As Single) As Single
+	Public Function fFCdelaunay_Intp(nU As Double, Tq As Double) As Double
 
 		Return (nU + Tq) * 0.5
 	End Function
 
 
-	Public Function GetFuelConsumption(torque As Double, angularVelocity As Double) As Double _
+	Public Function GetFuelConsumption(torque As NewtonMeter, angularVelocity As Double) As GramPerSecond _
 		Implements IFuelConsumptionMap.GetFuelConsumption
-		Return fFCdelaunay_Intp(angularVelocity, torque)
+		Return (fFCdelaunay_Intp(angularVelocity, torque.Value()) / 3600).SI(Of GramPerSecond)()
 	End Function
 End Class
 
diff --git a/VECTOAux/VectoAuxiliariesTests/My Project/Application.Designer.vb b/VECTOAux/VectoAuxiliariesTests/My Project/Application.Designer.vb
index 0aecefe664..8ab460ba03 100644
--- a/VECTOAux/VectoAuxiliariesTests/My Project/Application.Designer.vb	
+++ b/VECTOAux/VectoAuxiliariesTests/My Project/Application.Designer.vb	
@@ -1,10 +1,10 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
-'     This code was generated by a tool.
-'     Runtime Version:4.0.30319.18444
+'     Dieser Code wurde von einem Tool generiert.
+'     Laufzeitversion:4.0.30319.42000
 '
-'     Changes to this file may cause incorrect behavior and will be lost if
-'     the code is regenerated.
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     der Code erneut generiert wird.
 ' </auto-generated>
 '------------------------------------------------------------------------------
 
diff --git a/VECTOAux/VectoAuxiliariesTests/My Project/Resources.Designer.vb b/VECTOAux/VectoAuxiliariesTests/My Project/Resources.Designer.vb
index 12ad5ab830..1d5344126a 100644
--- a/VECTOAux/VectoAuxiliariesTests/My Project/Resources.Designer.vb	
+++ b/VECTOAux/VectoAuxiliariesTests/My Project/Resources.Designer.vb	
@@ -1,10 +1,10 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
-'     This code was generated by a tool.
-'     Runtime Version:4.0.30319.18444
+'     Dieser Code wurde von einem Tool generiert.
+'     Laufzeitversion:4.0.30319.42000
 '
-'     Changes to this file may cause incorrect behavior and will be lost if
-'     the code is regenerated.
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     der Code erneut generiert wird.
 ' </auto-generated>
 '------------------------------------------------------------------------------
 
@@ -15,12 +15,12 @@ Imports System
 
 Namespace My.Resources
     
-    'This class was auto-generated by the StronglyTypedResourceBuilder
-    'class via a tool like ResGen or Visual Studio.
-    'To add or remove a member, edit your .ResX file then rerun ResGen
-    'with the /str option, or rebuild your VS project.
+    'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
     '''<summary>
-    '''  A strongly-typed resource class, for looking up localized strings, etc.
+    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     '''</summary>
     <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"),  _
      Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -33,7 +33,7 @@ Namespace My.Resources
         Private resourceCulture As Global.System.Globalization.CultureInfo
         
         '''<summary>
-        '''  Returns the cached ResourceManager instance used by this class.
+        '''  Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
         '''</summary>
         <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
         Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
@@ -47,8 +47,8 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Overrides the current thread's CurrentUICulture property for all
-        '''  resource lookups using this strongly typed resource class.
+        '''  Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        '''  Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
         '''</summary>
         <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
         Friend Property Culture() As Global.System.Globalization.CultureInfo
diff --git a/VECTOAux/VectoAuxiliariesTests/My Project/Settings.Designer.vb b/VECTOAux/VectoAuxiliariesTests/My Project/Settings.Designer.vb
index 4587b0e408..4d52204690 100644
--- a/VECTOAux/VectoAuxiliariesTests/My Project/Settings.Designer.vb	
+++ b/VECTOAux/VectoAuxiliariesTests/My Project/Settings.Designer.vb	
@@ -1,10 +1,10 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
-'     This code was generated by a tool.
-'     Runtime Version:4.0.30319.18444
+'     Dieser Code wurde von einem Tool generiert.
+'     Laufzeitversion:4.0.30319.42000
 '
-'     Changes to this file may cause incorrect behavior and will be lost if
-'     the code is regenerated.
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     der Code erneut generiert wird.
 ' </auto-generated>
 '------------------------------------------------------------------------------
 
@@ -22,7 +22,7 @@ Namespace My
         
         Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
         
-#Region "My.Settings Auto-Save Functionality"
+#Region "Funktion zum automatischen Speichern von My.Settings"
 #If _MyType = "WindowsForms" Then
     Private Shared addedHandler As Boolean
 
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AirCompressorTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AirCompressorTests.vb
index c3e3a0c855..d83fa84603 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AirCompressorTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AirCompressorTests.vb
@@ -1,182 +1,178 @@
 Imports NUnit.Framework
+Imports TUGraz.VectoCommon.Utils
 Imports VectoAuxiliaries.Pneumatics
 Imports VectoAuxiliariesTests.Mocks
 Imports VectoAuxiliaries
 
 
 Namespace UnitTests
+	<TestFixture()>
+	Public Class M4_AirCompressorTests
 
-    <TestFixture()>
-    Public Class M4_AirCompressorTests
 #Region "Test Constants"
-        Private Const GoodEfficiency As Single = 0.7
-        Private Const TooLowEfficiency As Single = -1
-        Private Const TooHighEfficiency As Single = 1.1
 
-        Private Const GoodRatio As Single = 1
-        Private Const TooLowRatio As Single = -1
-        Private Const TooHighRatio As Single = 12
-
-#End Region
+		Private Const GoodEfficiency As Single = 0.7
+		Private Const TooLowEfficiency As Single = -1
+		Private Const TooHighEfficiency As Single = 1.1
 
+		Private Const GoodRatio As Single = 1
+		Private Const TooLowRatio As Single = -1
+		Private Const TooHighRatio As Single = 12
 
-Private _signals As ISignals = New Signals
+#End Region
 
 
-Public Sub new()
+		Private _signals As ISignals = New Signals
 
-_signals.EngineSpeed=100
 
+		Public Sub New()
 
-End Sub
+			_signals.EngineSpeed = 100
+		End Sub
 
 
 #Region "Factory Methods"
 
-        Private Function GetNonFailingCompressorMapMock() As ICompressorMap
-            Return New CompressorMapMock(False)
-        End Function
+		Private Function GetNonFailingCompressorMapMock() As ICompressorMap
+			Return New CompressorMapMock(False)
+		End Function
+
+		Private Function GetFailingCompressorMapMock() As ICompressorMap
+			Return New CompressorMapMock(True)
+		End Function
 
-        Private Function GetFailingCompressorMapMock() As ICompressorMap
-            Return New CompressorMapMock(True)
-        End Function
+		Private Function GetGoodCompressor() As M4_AirCompressor
+			Dim map As ICompressorMap = GetNonFailingCompressorMapMock()
+			Dim target As M4_AirCompressor = New M4_AirCompressor(map, GoodRatio, GoodEfficiency, _signals)
+			Return target
+		End Function
 
-        Private Function GetGoodCompressor() As M4_AirCompressor
-            Dim map As ICompressorMap = GetNonFailingCompressorMapMock()
-            Dim target As M4_AirCompressor = New M4_AirCompressor(map, GoodRatio, GoodEfficiency, _signals)
-            Return target
-        End Function
 #End Region
 
-        <Test()>
-        Public Sub CreateNewJustPathTest()
-            Dim map As ICompressorMap = GetNonFailingCompressorMapMock()
-            _signals.EngineSpeed=100
-            Dim target As M4_AirCompressor = New M4_AirCompressor(map,2,0.8,_signals)
-            Assert.IsNotNull(target)
-        End Sub
-
-        <Test()>
-        Public Sub CreateNewAllParametersTest()
-            Dim map As ICompressorMap = GetNonFailingCompressorMapMock()
-            Dim target As M4_AirCompressor = New M4_AirCompressor(map, GoodRatio, GoodEfficiency,_signals)
-            Assert.IsNotNull(target)
-        End Sub
-
-
-        <Test()>
-        Public Sub InitialiseTest()
-            Dim map As ICompressorMap = GetNonFailingCompressorMapMock()
-            _signals.EngineSpeed=100
-            Dim target As M4_AirCompressor = New M4_AirCompressor(map,2,0.8,_signals)
-            Assert.IsTrue(target.Initialise())
-        End Sub
-
-        <Test(), ExpectedException("System.ArgumentException")>
-        Public Sub InitialiseInvalidMapTest()
-            Dim map As ICompressorMap = GetFailingCompressorMapMock()
-            _signals.EngineSpeed=100
-            Dim target As M4_AirCompressor = New M4_AirCompressor(map,2,0.8,_signals)
-            target.Initialise()
-        End Sub
-
-        <Test()>
-        Public Sub GetEfficiencyTest()
-            Dim comp As M4_AirCompressor = GetGoodCompressor()
-            Dim target = comp.PulleyGearEfficiency
-            Assert.AreEqual(target, GoodEfficiency)
-        End Sub
-
-        <Test()>
-        Public Sub SetEfficiencyTest()
-            Dim comp As M4_AirCompressor = GetGoodCompressor()
-            Dim target As Single = 0.3
-            comp.PulleyGearEfficiency = target
-            Dim actual As Single = comp.PulleyGearEfficiency
-            Assert.AreEqual(target, actual)
-        End Sub
-
-        <TestCase(TooLowEfficiency)> _
-        <TestCase(TooHighEfficiency)> _
-        <ExpectedException("System.ArgumentOutOfRangeException")>
-        Public Sub SetEfficiencyOutOfRangeTest(ByVal efficiency As Single)
-            Dim comp As M4_AirCompressor = GetGoodCompressor()
-            comp.PulleyGearEfficiency = efficiency
-        End Sub
-
-
-        <Test()>
-        Public Sub GetRatioTest()
-            Dim comp As M4_AirCompressor = GetGoodCompressor()
-            Dim target = comp.PulleyGearRatio
-            Assert.AreEqual(target, GoodRatio)
-        End Sub
-
-        <Test()>
-        Public Sub SetRatioTest()
-            Dim comp As M4_AirCompressor = GetGoodCompressor()
-            Dim target As Single = 3
-            comp.PulleyGearRatio = target
-            Dim actual As Single = comp.PulleyGearRatio
-            Assert.AreEqual(target, actual)
-        End Sub
-
-        <TestCase(TooLowRatio)> _
-        <TestCase(TooHighRatio)> _
-        <ExpectedException("System.ArgumentOutOfRangeException")>
-        Public Sub SetRatioOutOfRangeTest(ByVal ratio As Single)
-            Dim comp As M4_AirCompressor = GetGoodCompressor()
-            comp.PulleyGearRatio = ratio
-        End Sub
-
-        <Test()>
-        Public Sub GetCompressorFlowRateTest()
-            Dim comp As M4_AirCompressor = GetGoodCompressor()
-            Dim expected As Single = 0.0333333351f
-            Dim actual = comp.GetFlowRate()
-            Assert.AreEqual(expected, actual)
-        End Sub
-
-        <Test()>
-        Public Sub GetPowerCompressorOffTest()
-            Dim comp As M4_AirCompressor = GetGoodCompressor()
-            Dim expected As Single = 5.0
-            Dim actual = comp.GetPowerCompressorOff()
-            Assert.AreEqual(expected, actual)
-        End Sub
-
-
-        <Test()>
-        Public Sub GetPowerCompressorOnTest()
-            Dim comp As M4_AirCompressor = GetGoodCompressor()
-            Dim expected As Single = 8.0
-            Dim actual = comp.GetPowerCompressorOn()
-            Assert.AreEqual(expected, actual)
-        End Sub
-
-
-        <Test()>
-        Public Sub GetPowerDifferenceTest()
-            Dim comp As M4_AirCompressor = GetGoodCompressor()
-            Dim expected As Single = 3.0
-            Dim actual = comp.GetPowerDifference()
-            Assert.AreEqual(expected, actual)
-        End Sub
-
-
-        <Test>
-        Public Sub GetAveragePowerDemandPerCompressorUnitFlowRate()
-
-            Dim comp As M4_AirCompressor = GetGoodCompressor()
-
-            Dim expected As Single = 0.01
-            Dim actual As Single = comp.GetAveragePowerDemandPerCompressorUnitFlowRate
-            Assert.AreEqual(actual, expected)
-
-
-        End Sub
-
-
-
-    End Class
+		<Test()>
+		Public Sub CreateNewJustPathTest()
+			Dim map As ICompressorMap = GetNonFailingCompressorMapMock()
+			_signals.EngineSpeed = 100
+			Dim target As M4_AirCompressor = New M4_AirCompressor(map, 2, 0.8, _signals)
+			Assert.IsNotNull(target)
+		End Sub
+
+		<Test()>
+		Public Sub CreateNewAllParametersTest()
+			Dim map As ICompressorMap = GetNonFailingCompressorMapMock()
+			Dim target As M4_AirCompressor = New M4_AirCompressor(map, GoodRatio, GoodEfficiency, _signals)
+			Assert.IsNotNull(target)
+		End Sub
+
+
+		<Test()>
+		Public Sub InitialiseTest()
+			Dim map As ICompressorMap = GetNonFailingCompressorMapMock()
+			_signals.EngineSpeed = 100
+			Dim target As M4_AirCompressor = New M4_AirCompressor(map, 2, 0.8, _signals)
+			Assert.IsTrue(target.Initialise())
+		End Sub
+
+		<Test(), ExpectedException("System.ArgumentException")>
+		Public Sub InitialiseInvalidMapTest()
+			Dim map As ICompressorMap = GetFailingCompressorMapMock()
+			_signals.EngineSpeed = 100
+			Dim target As M4_AirCompressor = New M4_AirCompressor(map, 2, 0.8, _signals)
+			target.Initialise()
+		End Sub
+
+		<Test()>
+		Public Sub GetEfficiencyTest()
+			Dim comp As M4_AirCompressor = GetGoodCompressor()
+			Dim target = comp.PulleyGearEfficiency
+			Assert.AreEqual(target, GoodEfficiency)
+		End Sub
+
+		<Test()>
+		Public Sub SetEfficiencyTest()
+			Dim comp As M4_AirCompressor = GetGoodCompressor()
+			Dim target As Single = 0.3
+			comp.PulleyGearEfficiency = target
+			Dim actual As Single = comp.PulleyGearEfficiency
+			Assert.AreEqual(target, actual)
+		End Sub
+
+		<TestCase(TooLowEfficiency)> _
+		<TestCase(TooHighEfficiency)> _
+		<ExpectedException("System.ArgumentOutOfRangeException")>
+		Public Sub SetEfficiencyOutOfRangeTest(ByVal efficiency As Single)
+			Dim comp As M4_AirCompressor = GetGoodCompressor()
+			comp.PulleyGearEfficiency = efficiency
+		End Sub
+
+
+		<Test()>
+		Public Sub GetRatioTest()
+			Dim comp As M4_AirCompressor = GetGoodCompressor()
+			Dim target = comp.PulleyGearRatio
+			Assert.AreEqual(target, GoodRatio)
+		End Sub
+
+		<Test()>
+		Public Sub SetRatioTest()
+			Dim comp As M4_AirCompressor = GetGoodCompressor()
+			Dim target As Single = 3
+			comp.PulleyGearRatio = target
+			Dim actual As Single = comp.PulleyGearRatio
+			Assert.AreEqual(target, actual)
+		End Sub
+
+		<TestCase(TooLowRatio)> _
+		<TestCase(TooHighRatio)> _
+		<ExpectedException("System.ArgumentOutOfRangeException")>
+		Public Sub SetRatioOutOfRangeTest(ByVal ratio As Single)
+			Dim comp As M4_AirCompressor = GetGoodCompressor()
+			comp.PulleyGearRatio = ratio
+		End Sub
+
+		<Test()>
+		Public Sub GetCompressorFlowRateTest()
+			Dim comp As M4_AirCompressor = GetGoodCompressor()
+			Dim expected As Double = 0.0333333351
+			Dim actual = comp.GetFlowRate()
+			Assert.AreEqual(expected, actual.Value(), 0.00000001)
+		End Sub
+
+		<Test()>
+		Public Sub GetPowerCompressorOffTest()
+			Dim comp As M4_AirCompressor = GetGoodCompressor()
+			Dim expected As Double = 5.0
+			Dim actual = comp.GetPowerCompressorOff()
+			Assert.AreEqual(expected, actual.Value(), 0.00000001)
+		End Sub
+
+
+		<Test()>
+		Public Sub GetPowerCompressorOnTest()
+			Dim comp As M4_AirCompressor = GetGoodCompressor()
+			Dim expected As Double = 8.0
+			Dim actual = comp.GetPowerCompressorOn()
+			Assert.AreEqual(expected, actual.Value(), 0.00000001)
+		End Sub
+
+
+		<Test()>
+		Public Sub GetPowerDifferenceTest()
+			Dim comp As M4_AirCompressor = GetGoodCompressor()
+			Dim expected As Double = 3.0
+			Dim actual = comp.GetPowerDifference()
+			Assert.AreEqual(expected, actual.Value(), 0.00000001)
+		End Sub
+
+
+		<Test>
+		Public Sub GetAveragePowerDemandPerCompressorUnitFlowRate()
+
+			Dim comp As M4_AirCompressor = GetGoodCompressor()
+
+			Dim expected As Single = 0.01
+			Dim actual As SI = comp.GetAveragePowerDemandPerCompressorUnitFlowRate
+			Assert.AreEqual(actual.Value(), expected, 0.001)
+		End Sub
+	End Class
 End Namespace
\ No newline at end of file
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb
index b67ce159b5..082bfb8ec0 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb
@@ -1,5 +1,6 @@
 Imports VectoAuxiliaries.Electrics
 Imports NUnit.Framework
+Imports TUGraz.VectoCommon.Utils
 Imports VectoAuxiliaries
 
 
@@ -31,7 +32,7 @@ Namespace UnitTests
 
 			Dim map As IAlternatorMap = GetInitialisedMap()
 			Dim target As IAlternatorMap = GetInitialisedMap()
-			Dim actual As Single = map.GetEfficiency(rpm, amps).Efficiency
+			Dim actual As Single = map.GetEfficiency(rpm, amps.SI(Of Ampere)).Efficiency
 			Assert.AreEqual(expected, actual)
 		End Sub
 
@@ -44,7 +45,7 @@ Namespace UnitTests
 			Dim map As IAlternatorMap = GetInitialisedMap()
 			Dim target As IAlternatorMap = GetInitialisedMap()
 
-			Dim actual As Single = map.GetEfficiency(rpm, amps).Efficiency
+			Dim actual As Single = map.GetEfficiency(rpm, amps.SI(Of Ampere)).Efficiency
 
 			Assert.AreEqual(expected, actual)
 		End Sub
@@ -58,7 +59,7 @@ Namespace UnitTests
 			Dim map As IAlternatorMap = GetInitialisedMap()
 			Dim target As IAlternatorMap = GetInitialisedMap()
 
-			Dim actual As Single = map.GetEfficiency(rpm, amps).Efficiency
+			Dim actual As Single = map.GetEfficiency(rpm, amps.SI(Of Ampere)).Efficiency
 
 			Assert.AreEqual(expected, actual)
 		End Sub
@@ -95,7 +96,7 @@ Namespace UnitTests
 			Dim map As IAlternatorMap = GetInitialisedMap()
 			Dim target As IAlternatorMap = GetInitialisedMap()
 
-			Dim actual As Single = map.GetEfficiency(rpm, amps).Efficiency
+			Dim actual As Single = map.GetEfficiency(rpm, amps.SI(Of Ampere)).Efficiency
 
 			Assert.AreEqual(expected, CType(Math.Round(actual, 6), Single))
 		End Sub
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentComparisonTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentComparisonTests.vb
index 8ea31566d7..89291cbd1a 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentComparisonTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentComparisonTests.vb
@@ -1,856 +1,846 @@
 Imports System.Text
 Imports NUnit.Framework
 Imports NUnit
+Imports TUGraz.VectoCommon.Utils
 Imports VectoAuxiliaries
 Imports VectoAuxiliaries.Electrics
 Imports VectoAuxiliaries.Pneumatics
 Imports VectoAuxiliaries.Hvac
 
 Namespace UnitTests
+	<TestFixture()>
+	Public Class AuxiliaryComparisonTests
+		<Test()>
+		Public Sub BasicEqualCompareTest()
 
-<TestFixture()> 
-Public Class AuxiliaryComparisonTests
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("") 'auxFresh.ShallowCopy()
+			Dim compareResult As Boolean
 
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
 
-    <Test()> 
-    Public Sub BasicEqualCompareTest()
+			Assert.AreEqual(True, compareResult)
+		End Sub
 
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")'auxFresh.ShallowCopy()
-    Dim compareResult As Boolean
-    
-    'Act
-    compareResult =  auxFresh.ConfigValuesAreTheSameAs( auxNow)
-    
-    Assert.AreEqual( True,compareResult )
+		<Test()>
+		Public Sub BasicUnequalTest()
 
-    End Sub
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+
+			'Act
+			auxNow.PneumaticUserInputsConfig.SmartRegeneration = Not auxNow.PneumaticUserInputsConfig.SmartRegeneration
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
+
+			Assert.AreEqual(False, compareResult)
+		End Sub
 
-    <Test()> 
-    Public Sub BasicUnequalTest()
+#Region "ElectricalUserConfig"
 
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    
-    'Act
-    auxNow.PneumaticUserInputsConfig.SmartRegeneration= Not auxNow.PneumaticUserInputsConfig.SmartRegeneration
-    compareResult =  auxFresh.ConfigValuesAreTheSameAs( auxNow)
- 
-    Assert.AreEqual( false,compareResult )
+		<Test()>
+		<Category("ElectricalUserConfig")>
+		Public Sub ElectricalUserConfig_AlternatorGearEfficiency_UnequalTest()
 
-    End Sub
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxNow.ElectricalUserInputsConfig.AlternatorGearEfficiency =
+				If _
+					(auxNow.ElectricalUserInputsConfig.AlternatorGearEfficiency + 0.1 > 1, 1,
+					auxNow.ElectricalUserInputsConfig.AlternatorGearEfficiency + 0.1)
+
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
+
+			Assert.AreEqual(False, compareResult)
+		End Sub
+
+		<Test()>
+		<Category("ElectricalUserConfig")>
+		Public Sub ElectricalUserConfig_AlternatorMap_UnequalTest()
+
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxNow.ElectricalUserInputsConfig.AlternatorMap = auxNow.ElectricalUserInputsConfig.AlternatorMap & "X"
+
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
+
+			Assert.AreEqual(False, compareResult)
+		End Sub
+
+		<Test()>
+		<Category("ElectricalUserConfig")>
+		Public Sub ElectricalUserConfig_DoorActuationTimeSecond_UnequalTest()
+
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxNow.ElectricalUserInputsConfig.DoorActuationTimeSecond += 1
+
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
+
+			Assert.AreEqual(False, compareResult)
+		End Sub
+
+		<Test()>
+		<Category("ElectricalUserConfig")>
+		Public Sub ElectricalUserConfig_Consumers_Unequal_Count_UnequalTest()
+
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items.RemoveAt(0)
+
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
+
+			Assert.AreEqual(False, compareResult)
+		End Sub
+
+		<Test()>
+		<Category("ElectricalUserConfig")>
+		Public Sub ElectricalUserConfig_Unequal_Consumers_AvgConsumptionAmps_UnequalTest()
 
-    #Region "ElectricalUserConfig"
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).AvgConsumptionAmps += 1
+
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
+
+			Assert.AreEqual(False, compareResult)
+		End Sub
+
+		<Test()>
+		<Category("ElectricalUserConfig")>
+		Public Sub ElectricalUserConfig_Unequal_Consumers_BaseVehicle_UnequalTest()
+
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).BaseVehicle =
+				Not auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).BaseVehicle
+
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
+
+			Assert.AreEqual(False, compareResult)
+		End Sub
+
+		<Test()>
+		<Category("ElectricalUserConfig")>
+		Public Sub ElectricalUserConfig_Unequal_Consumers_Category_UnequalTest()
+
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			Dim cat As String = auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).Category
+			auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).Category = cat & "x"
+
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
+
+			Assert.AreEqual(False, compareResult)
+		End Sub
+
+		<Test()>
+		<Category("ElectricalUserConfig")>
+		Public Sub ElectricalUserConfig_Unequal_Consumers_ConsumerName_UnequalTest()
+
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			Dim cname As String = auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).ConsumerName
+			auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).ConsumerName = cname & "x"
+
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
+
+			Assert.AreEqual(False, compareResult)
+		End Sub
+
+		<Test()>
+		<Category("ElectricalUserConfig")>
+		Public Sub ElectricalUserConfig_Unequal_Consumers_NominalConsumptionAmps_UnequalTest()
+
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).NominalConsumptionAmps += 1
+
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
+
+			Assert.AreEqual(False, compareResult)
+		End Sub
+
+		<Test()>
+		<Category("ElectricalUserConfig")>
+		Public Sub ElectricalUserConfig_Unequal_Consumers_NumberInActualVehicle_UnequalTest()
+
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			Dim cname As Single = auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).NumberInActualVehicle
+			auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).NumberInActualVehicle += 1
+
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
+
+			Assert.AreEqual(False, compareResult)
+		End Sub
+
+		<Test()>
+		<Category("ElectricalUserConfig")>
+		Public Sub ElectricalUserConfig_Unequal_Consumers_PhaseIdle_TractionOn_UnequalTest()
+
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			Dim cname As Single = auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).PhaseIdle_TractionOn
+			auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).PhaseIdle_TractionOn += 1
+
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
+
+			Assert.AreEqual(False, compareResult)
+		End Sub
+
+		<Test()>
+		<Category("ElectricalUserConfig")>
+		Public Sub ElectricalUserConfig_Unequal_ResultCardIdle_UnequalCount_UnequalTest()
+
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxNow.ElectricalUserInputsConfig.ResultCardIdle.Results.Add(New SmartResult(50, 49))
+
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
+
+			Assert.AreEqual(False, compareResult)
+		End Sub
+
+		<Test()>
+		<Category("ElectricalUserConfig")>
+		Public Sub ElectricalUserConfig_Unequal_ResultCardTraction_UnequalCount_UnequalTest()
+
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxNow.ElectricalUserInputsConfig.ResultCardTraction.Results.Add(New SmartResult(50, 49))
+
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
+
+			Assert.AreEqual(False, compareResult)
+		End Sub
+
+		<Test()>
+		<Category("ElectricalUserConfig")>
+		Public Sub ElectricalUserConfig_Unequal_ResultCardOverrun_UnequalCount_UnequalTest()
+
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxNow.ElectricalUserInputsConfig.ResultCardOverrun.Results.Add(New SmartResult(50, 49))
+
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
+
+			Assert.AreEqual(False, compareResult)
+		End Sub
+
+		<Test()>
+		<Category("ElectricalUserConfig")>
+		Public Sub ElectricalUserConfig_Unequal_ResultCardIdle_AMPS_UnequalTest()
+
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxFresh.ElectricalUserInputsConfig.ResultCardIdle.Results.Add(New SmartResult(50, 49))
+			auxNow.ElectricalUserInputsConfig.ResultCardIdle.Results.Add(New SmartResult(49, 49))
+
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
+
+			Assert.AreEqual(False, compareResult)
+		End Sub
+
+		<Test()>
+		<Category("ElectricalUserConfig")>
+		Public Sub ElectricalUserConfig_Unequal_ResultCardIdle_UnEqualAMPS_UnequalTest()
+
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxFresh.ElectricalUserInputsConfig.ResultCardIdle.Results.Add(New SmartResult(49, 49))
+			auxNow.ElectricalUserInputsConfig.ResultCardIdle.Results.Add(New SmartResult(50, 49))
+
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
+
+			Assert.AreEqual(False, compareResult)
+		End Sub
+
+		<Test()>
+		<Category("ElectricalUserConfig")>
+		Public Sub ElectricalUserConfig_Unequal_ResultCardIdle_UnEqualSMARTAMPS_UnequalTest()
+
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxFresh.ElectricalUserInputsConfig.ResultCardIdle.Results.Add(New SmartResult(49, 51))
+			auxNow.ElectricalUserInputsConfig.ResultCardIdle.Results.Add(New SmartResult(49, 50))
+
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
+
+			Assert.AreEqual(False, compareResult)
+		End Sub
+
+		<Test()>
+		<Category("ElectricalUserConfig")>
+		Public Sub ElectricalUserConfig_Unequal_ResultCardTraction_AMPS_UnequalTest()
+
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxFresh.ElectricalUserInputsConfig.ResultCardTraction.Results.Add(New SmartResult(50, 49))
+			auxNow.ElectricalUserInputsConfig.ResultCardTraction.Results.Add(New SmartResult(51, 49))
+
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
+
+			Assert.AreEqual(False, compareResult)
+		End Sub
+
+		<Test()>
+		<Category("ElectricalUserConfig")>
+		Public Sub ElectricalUserConfig_Unequal_ResultCardTraction_UnEqualAMPS_UnequalTest()
+
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxFresh.ElectricalUserInputsConfig.ResultCardIdle.Results.Add(New SmartResult(49, 49))
+			auxNow.ElectricalUserInputsConfig.ResultCardIdle.Results.Add(New SmartResult(50, 49))
+
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
+
+			Assert.AreEqual(False, compareResult)
+		End Sub
+
+		<Test()>
+		<Category("ElectricalUserConfig")>
+		Public Sub ElectricalUserConfig_Unequal_ResultCardTraction_UnEqualSMARTAMPS_UnequalTest()
+
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxFresh.ElectricalUserInputsConfig.ResultCardIdle.Results.Add(New SmartResult(49, 49))
+			auxNow.ElectricalUserInputsConfig.ResultCardIdle.Results.Add(New SmartResult(49, 50))
+
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
+
+			Assert.AreEqual(False, compareResult)
+		End Sub
+
+		<Test()>
+		<Category("ElectricalUserConfig")>
+		Public Sub ElectricalUserConfig_Unequal_ResultCardOverrun_AMPS_UnequalTest()
+
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxFresh.ElectricalUserInputsConfig.ResultCardOverrun.Results.Add(New SmartResult(50, 49))
+			auxNow.ElectricalUserInputsConfig.ResultCardOverrun.Results.Add(New SmartResult(50, 48))
+
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
+
+			Assert.AreEqual(False, compareResult)
+		End Sub
+
+		<Test()>
+		<Category("ElectricalUserConfig")>
+		Public Sub ElectricalUserConfig_Unequal_ResultCardOverrun_UnEqualAMPS_UnequalTest()
+
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxFresh.ElectricalUserInputsConfig.ResultCardOverrun.Results.Add(New SmartResult(49, 49))
+			auxNow.ElectricalUserInputsConfig.ResultCardOverrun.Results.Add(New SmartResult(50, 49))
+
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
+
+			Assert.AreEqual(False, compareResult)
+		End Sub
+
+		<Test()>
+		<Category("ElectricalUserConfig")>
+		Public Sub ElectricalUserConfig_Unequal_ResultCardOverrun_UnEqualSMARTAMPS_UnequalTest()
+
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxFresh.ElectricalUserInputsConfig.ResultCardOverrun.Results.Add(New SmartResult(49, 49))
+			auxNow.ElectricalUserInputsConfig.ResultCardOverrun.Results.Add(New SmartResult(49, 50))
 
-    <Test()> 
-    <Category("ElectricalUserConfig")> _
-    Public Sub ElectricalUserConfig_AlternatorGearEfficiency_UnequalTest()
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
 
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxNow.ElectricalUserInputsConfig.AlternatorGearEfficiency= If( auxNow.ElectricalUserInputsConfig.AlternatorGearEfficiency+0.1>1, 1, auxNow.ElectricalUserInputsConfig.AlternatorGearEfficiency+0.1)
+			Assert.AreEqual(False, compareResult)
+		End Sub
 
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow )
+		<Test()>
+		<Category("ElectricalUserConfig")>
+		Public Sub ElectricalUserConfig_Unequal_PowernetVoltage_UnEqualSMARTAMPS_UnequalTest()
 
-    Assert.AreEqual( false,compareResult )
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxNow.ElectricalUserInputsConfig.PowerNetVoltage += 1
 
-    End Sub
-    <Test()> 
-    <Category("ElectricalUserConfig")> _
-    Public Sub ElectricalUserConfig_AlternatorMap_UnequalTest()
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
 
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxNow.ElectricalUserInputsConfig.AlternatorMap = auxNow.ElectricalUserInputsConfig.AlternatorMap & "X"
-
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow )
+			Assert.AreEqual(False, compareResult)
+		End Sub
 
-    Assert.AreEqual( false,compareResult )
+		<Test()>
+		<Category("ElectricalUserConfig")>
+		Public Sub ElectricalUserConfig_Unequal_SmarElectrics_UnEqualSMARTAMPS_UnequalTest()
 
-    End Sub
-    <Test()> 
-    <Category("ElectricalUserConfig")> _
-    Public Sub ElectricalUserConfig_DoorActuationTimeSecond_UnequalTest()
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxNow.ElectricalUserInputsConfig.SmartElectrical = Not auxNow.ElectricalUserInputsConfig.SmartElectrical
 
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxNow.ElectricalUserInputsConfig.DoorActuationTimeSecond+=1
-
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow )
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
 
-    Assert.AreEqual( false,compareResult )
+			Assert.AreEqual(False, compareResult)
+		End Sub
 
-    End Sub
-    <Test()>
-    <Category("ElectricalUserConfig")> _
-    Public Sub ElectricalUserConfig_Consumers_Unequal_Count_UnequalTest()
+#End Region
 
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items.RemoveAt(0)
-
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow )
+#Region "PneumaticAuxiliariesConfig"
 
-    Assert.AreEqual( false,compareResult )
+		<Test()>
+		<Category("PneumaticAuxiliariesConfig")>
+		Public Sub PneumaticsAuxuiliaryConfig_AdBlueNIperMinute_Enequal()
 
-    End Sub
-    <Test()>
-    <Category("ElectricalUserConfig")> _
-    Public Sub ElectricalUserConfig_Unequal_Consumers_AvgConsumptionAmps_UnequalTest()
-
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).AvgConsumptionAmps+=1
-
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow )
-
-    Assert.AreEqual( false,compareResult )
-
-    End Sub
-    <Test()>
-    <Category("ElectricalUserConfig")> _
-    Public Sub ElectricalUserConfig_Unequal_Consumers_BaseVehicle_UnequalTest()
-
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).BaseVehicle= NOT auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).BaseVehicle
-
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow )
-
-    Assert.AreEqual( false,compareResult )
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxNow.PneumaticAuxillariesConfig.AdBlueNIperMinute += 1
 
-    End Sub
-    <Test()>
-    <Category("ElectricalUserConfig")> _
-    Public Sub ElectricalUserConfig_Unequal_Consumers_Category_UnequalTest()
-
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    Dim cat As String = auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).Category
-    auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).Category= cat & "x"
-
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow )
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
 
-    Assert.AreEqual( false,compareResult )
+			Assert.AreEqual(False, compareResult)
+		End Sub
 
-    End Sub
-    <Test()>
-    <Category("ElectricalUserConfig")> _
-    Public Sub ElectricalUserConfig_Unequal_Consumers_ConsumerName_UnequalTest()
-
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    Dim cname As String = auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).ConsumerName
-    auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).ConsumerName= cName & "x"
-
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow )
-
-    Assert.AreEqual( false,compareResult )
+		<Test()>
+		<Category("PneumaticAuxiliariesConfig")>
+		Public Sub PneumaticsAuxuiliaryConfig_AirControlledSuspensionNIperMinute_Enequal()
 
-    End Sub
-    <Test()>
-    <Category("ElectricalUserConfig")> _
-    Public Sub ElectricalUserConfig_Unequal_Consumers_NominalConsumptionAmps_UnequalTest()
-
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    Dim cname As single = auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).NominalConsumptionAmps
-    auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).NominalConsumptionAmps+=1
-
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow )
-
-    Assert.AreEqual( false,compareResult )
-
-    End Sub
-    <Test()>
-    <Category("ElectricalUserConfig")> _
-    Public Sub ElectricalUserConfig_Unequal_Consumers_NumberInActualVehicle_UnequalTest()
-
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    Dim cname As single = auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).NumberInActualVehicle
-    auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).NumberInActualVehicle+=1
-
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow )
-
-    Assert.AreEqual( false,compareResult )
-
-    End Sub
-    <Test()>
-    <Category("ElectricalUserConfig")> _
-    Public Sub ElectricalUserConfig_Unequal_Consumers_PhaseIdle_TractionOn_UnequalTest()
-
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    Dim cname As single = auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).PhaseIdle_TractionOn
-    auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).PhaseIdle_TractionOn+=1
-
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow )
-
-    Assert.AreEqual( false,compareResult )
-
-    End Sub
-    <Test()>
-    <Category("ElectricalUserConfig")> _
-    Public Sub ElectricalUserConfig_Unequal_ResultCardIdle_UnequalCount_UnequalTest()
-
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxNow.ElectricalUserInputsConfig.ResultCardIdle.Results.Add( New SmartResult(50,49))
-
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow )
-
-    Assert.AreEqual( false,compareResult )
-
-    End Sub
-    <Test()>
-    <Category("ElectricalUserConfig")> _
-    Public Sub ElectricalUserConfig_Unequal_ResultCardTraction_UnequalCount_UnequalTest()
-
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxNow.ElectricalUserInputsConfig.ResultCardTraction.Results.Add( New SmartResult(50,49))
-
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow )
-
-    Assert.AreEqual( false,compareResult )
-
-    End Sub
-    <Test()>
-    <Category("ElectricalUserConfig")> _
-    Public Sub ElectricalUserConfig_Unequal_ResultCardOverrun_UnequalCount_UnequalTest()
-
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxNow.ElectricalUserInputsConfig.ResultCardOverrun.Results.Add( New SmartResult(50,49))
-
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow )
-
-    Assert.AreEqual( false,compareResult )
-
-    End Sub
-    <Test()>
-    <Category("ElectricalUserConfig")> _
-    Public Sub ElectricalUserConfig_Unequal_ResultCardIdle_AMPS_UnequalTest()
-
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxFresh.ElectricalUserInputsConfig.ResultCardIdle.Results.Add( New SmartResult(50,49))
-    auxNow.ElectricalUserInputsConfig.ResultCardIdle.Results.Add( New SmartResult(49,49))
-
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow )
-
-    Assert.AreEqual( false,compareResult )
-
-    End Sub
-    <Test()>
-    <Category("ElectricalUserConfig")> _
-    Public Sub ElectricalUserConfig_Unequal_ResultCardIdle_UnEqualAMPS_UnequalTest()
-
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxFresh.ElectricalUserInputsConfig.ResultCardIdle.Results.Add( New SmartResult(49,49))
-    auxNow.ElectricalUserInputsConfig.ResultCardIdle.Results.Add( New SmartResult(50,49))
-
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow )
-
-    Assert.AreEqual( false,compareResult )
-
-    End Sub
-    <Test()>
-    <Category("ElectricalUserConfig")> _
-    Public Sub ElectricalUserConfig_Unequal_ResultCardIdle_UnEqualSMARTAMPS_UnequalTest()
-
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxFresh.ElectricalUserInputsConfig.ResultCardIdle.Results.Add( New SmartResult(49,51))
-    auxNow.ElectricalUserInputsConfig.ResultCardIdle.Results.Add( New SmartResult(49,50))
-
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow )
-
-    Assert.AreEqual( false,compareResult )
-
-    End Sub
-    <Test()>
-    <Category("ElectricalUserConfig")> _
-    Public Sub ElectricalUserConfig_Unequal_ResultCardTraction_AMPS_UnequalTest()
-
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxFresh.ElectricalUserInputsConfig.ResultCardTraction.Results.Add( New SmartResult(50,49))
-    auxNow.ElectricalUserInputsConfig.ResultCardTraction.Results.Add( New SmartResult(51,49))
-
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow )
-
-    Assert.AreEqual( false,compareResult )
-
-    End Sub
-    <Test()>
-    <Category("ElectricalUserConfig")> _
-    Public Sub ElectricalUserConfig_Unequal_ResultCardTraction_UnEqualAMPS_UnequalTest()
-
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxFresh.ElectricalUserInputsConfig.ResultCardIdle.Results.Add( New SmartResult(49,49))
-    auxNow.ElectricalUserInputsConfig.ResultCardIdle.Results.Add( New SmartResult(50,49))
-
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow )
-
-    Assert.AreEqual( false,compareResult )
-
-    End Sub
-    <Test()>
-    <Category("ElectricalUserConfig")> _
-    Public Sub ElectricalUserConfig_Unequal_ResultCardTraction_UnEqualSMARTAMPS_UnequalTest()
-
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxFresh.ElectricalUserInputsConfig.ResultCardIdle.Results.Add( New SmartResult(49,49))
-    auxNow.ElectricalUserInputsConfig.ResultCardIdle.Results.Add( New SmartResult(49,50))
-
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow )
-
-    Assert.AreEqual( false,compareResult )
-
-    End Sub  
-    <Test()>
-    <Category("ElectricalUserConfig")> _
-    Public Sub ElectricalUserConfig_Unequal_ResultCardOverrun_AMPS_UnequalTest()
-
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxFresh.ElectricalUserInputsConfig.ResultCardOverrun.Results.Add( New SmartResult(50,49))
-    auxNow.ElectricalUserInputsConfig.ResultCardOverrun.Results.Add( New SmartResult(50,48))
-
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow )
-
-    Assert.AreEqual( false,compareResult )
-
-    End Sub
-    <Test()>
-    <Category("ElectricalUserConfig")> _
-    Public Sub ElectricalUserConfig_Unequal_ResultCardOverrun_UnEqualAMPS_UnequalTest()
-
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxFresh.ElectricalUserInputsConfig.ResultCardOverrun.Results.Add( New SmartResult(49,49))
-    auxNow.ElectricalUserInputsConfig.ResultCardOverrun.Results.Add( New SmartResult(50,49))
-
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow )
-
-    Assert.AreEqual( false,compareResult )
-
-    End Sub
-    <Test()>
-    <Category("ElectricalUserConfig")> _
-    Public Sub ElectricalUserConfig_Unequal_ResultCardOverrun_UnEqualSMARTAMPS_UnequalTest()
-
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxFresh.ElectricalUserInputsConfig.ResultCardOverrun.Results.Add( New SmartResult(49,49))
-    auxNow.ElectricalUserInputsConfig.ResultCardOverrun.Results.Add( New SmartResult(49,50))
-
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow )
-
-    Assert.AreEqual( false,compareResult )
-
-    End Sub
-    <Test()>
-    <Category("ElectricalUserConfig")> _
-    Public Sub ElectricalUserConfig_Unequal_PowernetVoltage_UnEqualSMARTAMPS_UnequalTest()
-
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxNow.ElectricalUserInputsConfig.PowerNetVoltage+=1
-   
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow )
-
-    Assert.AreEqual( false,compareResult )
-
-    End Sub
-    <Test()>
-    <Category("ElectricalUserConfig")> _
-    Public Sub ElectricalUserConfig_Unequal_SmarElectrics_UnEqualSMARTAMPS_UnequalTest()
-
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxNow.ElectricalUserInputsConfig.SmartElectrical= Not auxNow.ElectricalUserInputsConfig.SmartElectrical
-    
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow )
-
-    Assert.AreEqual( false,compareResult )
-
-    End Sub
-
-    #End Region
-
-    #Region "PneumaticAuxiliariesConfig"
-
-    <Test()>
-    <Category("PneumaticAuxiliariesConfig")> _
-    Public Sub PneumaticsAuxuiliaryConfig_AdBlueNIperMinute_Enequal()
-
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxNow.PneumaticAuxillariesConfig.AdBlueNIperMinute+=1
-  
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow )
-
-    Assert.AreEqual( false,compareResult )
-
-    End Sub
-    <Test()>
-    <Category("PneumaticAuxiliariesConfig")> _
-    Public Sub PneumaticsAuxuiliaryConfig_AirControlledSuspensionNIperMinute_Enequal()
-
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxNow.PneumaticAuxillariesConfig.AirControlledSuspensionNIperMinute+=1
-
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow )
-
-    Assert.AreEqual( false,compareResult )
-
-    End Sub
-    <Test()>
-    <Category("PneumaticAuxiliariesConfig")> _
-    Public Sub PneumaticsAuxuiliaryConfig_BrakingNoRetarderNIperKG_Enequal()
-
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxNow.PneumaticAuxillariesConfig.BrakingNoRetarderNIperKG+=1
-
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow )
-
-    Assert.AreEqual( false,compareResult )
-
-    End Sub
-    <Test()>
-    <Category("PneumaticAuxiliariesConfig")> _
-    Public Sub PneumaticsAuxuiliaryConfig_BrakingWithRetarderNIperKG_Enequal()
-
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxNow.PneumaticAuxillariesConfig.BrakingWithRetarderNIperKG+=1
-
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow )
-
-    Assert.AreEqual( false,compareResult )
-
-    End Sub
-    <Test()>
-    <Category("PneumaticAuxiliariesConfig")> _
-    Public Sub PneumaticsAuxuiliaryConfig_BreakingPerKneelingNIperKGinMM_Enequal()
-
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxNow.PneumaticAuxillariesConfig.BreakingPerKneelingNIperKGinMM+=1
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxNow.PneumaticAuxillariesConfig.AirControlledSuspensionNIperMinute += 1
 
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow )
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
 
-    Assert.AreEqual( false,compareResult )
-
-    End Sub
-    <Test()>
-    <Category("PneumaticAuxiliariesConfig")> _
-    Public Sub PneumaticsAuxuiliaryConfig_DeadVolBlowOutsPerLitresperHour_Enequal()
-
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxNow.PneumaticAuxillariesConfig.DeadVolBlowOutsPerLitresperHour+=1   
+			Assert.AreEqual(False, compareResult)
+		End Sub
 
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow )
+		<Test()>
+		<Category("PneumaticAuxiliariesConfig")>
+		Public Sub PneumaticsAuxuiliaryConfig_BrakingNoRetarderNIperKG_Enequal()
 
-    Assert.AreEqual( false,compareResult )
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxNow.PneumaticAuxillariesConfig.BrakingNoRetarderNIperKG += 1
 
-    End Sub
-    <Test()>
-    <Category("PneumaticAuxiliariesConfig")> _
-    Public Sub PneumaticsAuxuiliaryConfig_DeadVolumeLitres_Enequal()
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
 
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxNow.PneumaticAuxillariesConfig.DeadVolumeLitres+=1    
+			Assert.AreEqual(False, compareResult)
+		End Sub
 
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow )
+		<Test()>
+		<Category("PneumaticAuxiliariesConfig")>
+		Public Sub PneumaticsAuxuiliaryConfig_BrakingWithRetarderNIperKG_Enequal()
 
-    Assert.AreEqual( false,compareResult )
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxNow.PneumaticAuxillariesConfig.BrakingWithRetarderNIperKG += 1
 
-    End Sub
-    <Test()>
-    <Category("PneumaticAuxiliariesConfig")> _
-    Public Sub PneumaticsAuxuiliaryConfig_NonSmartRegenFractionTotalAirDemand_Enequal()
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
 
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxNow.PneumaticAuxillariesConfig.NonSmartRegenFractionTotalAirDemand+=1    
+			Assert.AreEqual(False, compareResult)
+		End Sub
 
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow )
+		<Test()>
+		<Category("PneumaticAuxiliariesConfig")>
+		Public Sub PneumaticsAuxuiliaryConfig_BreakingPerKneelingNIperKGinMM_Enequal()
 
-    Assert.AreEqual( false,compareResult )
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxNow.PneumaticAuxillariesConfig.BreakingPerKneelingNIperKGinMM += 1
 
-    End Sub
-    <Test()>
-    <Category("PneumaticAuxiliariesConfig")> _
-    Public Sub PneumaticsAuxuiliaryConfig_OverrunUtilisationForCompressionFraction_Enequal()
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
 
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxNow.PneumaticAuxillariesConfig.OverrunUtilisationForCompressionFraction+=1    
+			Assert.AreEqual(False, compareResult)
+		End Sub
 
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow )
+		<Test()>
+		<Category("PneumaticAuxiliariesConfig")>
+		Public Sub PneumaticsAuxuiliaryConfig_DeadVolBlowOutsPerLitresperHour_Enequal()
 
-    Assert.AreEqual( false,compareResult )
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxNow.PneumaticAuxillariesConfig.DeadVolBlowOutsPerLitresperHour += 1
 
-    End Sub
-    <Test()>
-    <Category("PneumaticAuxiliariesConfig")> _
-    Public Sub PneumaticsAuxuiliaryConfig_PerDoorOpeningNI_Enequal()
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
 
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxNow.PneumaticAuxillariesConfig.PerDoorOpeningNI+=1    
+			Assert.AreEqual(False, compareResult)
+		End Sub
 
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow)
+		<Test()>
+		<Category("PneumaticAuxiliariesConfig")>
+		Public Sub PneumaticsAuxuiliaryConfig_DeadVolumeLitres_Enequal()
 
-    Assert.AreEqual( false,compareResult )
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxNow.PneumaticAuxillariesConfig.DeadVolumeLitres += 1
 
-    End Sub
-    <Test()>
-    <Category("PneumaticAuxiliariesConfig")> _
-    Public Sub PneumaticsAuxuiliaryConfig_PerStopBrakeActuationNIperKG_Enequal()
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
 
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxNow.PneumaticAuxillariesConfig.PerStopBrakeActuationNIperKG+=1    
+			Assert.AreEqual(False, compareResult)
+		End Sub
 
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow)
+		<Test()>
+		<Category("PneumaticAuxiliariesConfig")>
+		Public Sub PneumaticsAuxuiliaryConfig_NonSmartRegenFractionTotalAirDemand_Enequal()
 
-    Assert.AreEqual( false,compareResult )
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxNow.PneumaticAuxillariesConfig.NonSmartRegenFractionTotalAirDemand += 1
 
-    End Sub
-    <Test()>
-    <Category("PneumaticAuxiliariesConfig")> _
-    Public Sub PneumaticsUserInputsConfig_SmartRegenFractionTotalAirDemand_Enequal()
-
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxNow.PneumaticAuxillariesConfig.SmartRegenFractionTotalAirDemand+=1    
-
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow)
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
 
-    Assert.AreEqual( false,compareResult )
+			Assert.AreEqual(False, compareResult)
+		End Sub
 
-    End Sub
+		<Test()>
+		<Category("PneumaticAuxiliariesConfig")>
+		Public Sub PneumaticsAuxuiliaryConfig_OverrunUtilisationForCompressionFraction_Enequal()
 
-    #End Region
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxNow.PneumaticAuxillariesConfig.OverrunUtilisationForCompressionFraction += 1
 
-    #Region "PneumaticUserInputsConfig"
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
 
-    <Test()>
-    <Category("PneumaticUserInputsConfig")> _
-    Public Sub PneumaticUserInputsConfig_ActuationsMap_Enequal()
+			Assert.AreEqual(False, compareResult)
+		End Sub
 
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxNow.PneumaticUserInputsConfig.ActuationsMap = auxNow.PneumaticUserInputsConfig.ActuationsMap & "x"    
+		<Test()>
+		<Category("PneumaticAuxiliariesConfig")>
+		Public Sub PneumaticsAuxuiliaryConfig_PerDoorOpeningNI_Enequal()
 
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow)
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxNow.PneumaticAuxillariesConfig.PerDoorOpeningNI += 1
 
-    Assert.AreEqual( false,compareResult )
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
 
-    End Sub
-    <Test()>
-    <Category("PneumaticUserInputsConfig")> _
-    Public Sub PneumaticUserInputsConfig_AdBlueDosing_Enequal()
+			Assert.AreEqual(False, compareResult)
+		End Sub
 
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxNow.PneumaticUserInputsConfig.AdBlueDosing = auxNow.PneumaticUserInputsConfig.AdBlueDosing & "x"   
-     
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow)
+		<Test()>
+		<Category("PneumaticAuxiliariesConfig")>
+		Public Sub PneumaticsAuxuiliaryConfig_PerStopBrakeActuationNIperKG_Enequal()
 
-    Assert.AreEqual( false,compareResult )
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxNow.PneumaticAuxillariesConfig.PerStopBrakeActuationNIperKG += 1
 
-    End Sub
-    <Test()>
-    <Category("PneumaticUserInputsConfig")> _
-    Public Sub PneumaticUserInputsConfig_AirSuspensionControl_Enequal()
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
 
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxNow.PneumaticUserInputsConfig.AirSuspensionControl = auxNow.PneumaticUserInputsConfig.AirSuspensionControl & "x"    
+			Assert.AreEqual(False, compareResult)
+		End Sub
 
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow)
+		<Test()>
+		<Category("PneumaticAuxiliariesConfig")>
+		Public Sub PneumaticsUserInputsConfig_SmartRegenFractionTotalAirDemand_Enequal()
 
-    Assert.AreEqual( false,compareResult )
-
-    End Sub
-    <Test()>
-    <Category("PneumaticUserInputsConfig")> _
-    Public Sub PneumaticUserInputsConfig_CompressorGearEfficiency_Enequal()
-
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxNow.PneumaticUserInputsConfig.CompressorGearEfficiency = If( auxNow.PneumaticUserInputsConfig.CompressorGearEfficiency-0.1<0,0,auxNow.PneumaticUserInputsConfig.CompressorGearEfficiency-0.1)
-        
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow)
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxNow.PneumaticAuxillariesConfig.SmartRegenFractionTotalAirDemand += 1
 
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
 
-    Assert.AreEqual( false,compareResult )
+			Assert.AreEqual(False, compareResult)
+		End Sub
 
-    End Sub
-    <Test()>
-    <Category("PneumaticUserInputsConfig")> _
-    Public Sub PneumaticUserInputsConfig_CompressorGearRatio_Enequal()
+#End Region
 
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean 
-    auxNow.PneumaticUserInputsConfig.CompressorGearRatio +=1
-
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow)
-    Assert.AreEqual( false,compareResult )
-
-    End Sub
-    <Test()>
-    <Category("PneumaticUserInputsConfig")> _
-    Public Sub PneumaticUserInputsConfig_CompressorMap_Enequal()
+#Region "PneumaticUserInputsConfig"
 
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    
+		<Test()>
+		<Category("PneumaticUserInputsConfig")>
+		Public Sub PneumaticUserInputsConfig_ActuationsMap_Enequal()
 
-    auxNow.PneumaticUserInputsConfig.CompressorMap = auxNow.PneumaticUserInputsConfig.CompressorMap & "x"
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow)
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxNow.PneumaticUserInputsConfig.ActuationsMap = auxNow.PneumaticUserInputsConfig.ActuationsMap & "x"
 
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
 
+			Assert.AreEqual(False, compareResult)
+		End Sub
 
-    Assert.AreEqual( false,compareResult )
+		<Test()>
+		<Category("PneumaticUserInputsConfig")>
+		Public Sub PneumaticUserInputsConfig_AdBlueDosing_Enequal()
 
-    End Sub
-    <Test()>
-    <Category("PneumaticUserInputsConfig")> _
-    Public Sub PneumaticUserInputsConfig_Doors_Enequal()
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxNow.PneumaticUserInputsConfig.AdBlueDosing = auxNow.PneumaticUserInputsConfig.AdBlueDosing & "x"
 
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxNow.PneumaticUserInputsConfig.Doors = auxNow.PneumaticUserInputsConfig.Doors & "x"
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
 
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow)
+			Assert.AreEqual(False, compareResult)
+		End Sub
 
+		<Test()>
+		<Category("PneumaticUserInputsConfig")>
+		Public Sub PneumaticUserInputsConfig_AirSuspensionControl_Enequal()
 
-    Assert.AreEqual( false,compareResult )
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxNow.PneumaticUserInputsConfig.AirSuspensionControl = auxNow.PneumaticUserInputsConfig.AirSuspensionControl & "x"
 
-    End Sub
-    <Test()>
-    <Category("PneumaticUserInputsConfig")> _
-    Public Sub PneumaticUserInputsConfig_KneelingHeightMillimeters_Enequal()
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
 
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxNow.PneumaticUserInputsConfig.KneelingHeightMillimeters +=1   
-     
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow)
-    Assert.AreEqual( false,compareResult )
+			Assert.AreEqual(False, compareResult)
+		End Sub
 
-    End Sub
-    <Test()>
-    <Category("PneumaticUserInputsConfig")> _
-    Public Sub PneumaticUserInputsConfig_RetarderBrake_Enequal()
+		<Test()>
+		<Category("PneumaticUserInputsConfig")>
+		Public Sub PneumaticUserInputsConfig_CompressorGearEfficiency_Enequal()
 
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean    
-    auxNow.PneumaticUserInputsConfig.RetarderBrake = Not auxNow.PneumaticUserInputsConfig.RetarderBrake 
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxNow.PneumaticUserInputsConfig.CompressorGearEfficiency =
+				If _
+					(auxNow.PneumaticUserInputsConfig.CompressorGearEfficiency - 0.1 < 0, 0,
+					auxNow.PneumaticUserInputsConfig.CompressorGearEfficiency - 0.1)
 
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow)
-    Assert.AreEqual( false,compareResult )
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
 
-    End Sub
-    <Test()>
-    <Category("PneumaticUserInputsConfig")> _
-    Public Sub PneumaticUserInputsConfig_SmartAirCompression_Enequal()
 
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxNow.PneumaticUserInputsConfig.SmartAirCompression = Not auxNow.PneumaticUserInputsConfig.SmartAirCompression 
+			Assert.AreEqual(False, compareResult)
+		End Sub
 
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow)
+		<Test()>
+		<Category("PneumaticUserInputsConfig")>
+		Public Sub PneumaticUserInputsConfig_CompressorGearRatio_Enequal()
 
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxNow.PneumaticUserInputsConfig.CompressorGearRatio += 1
 
-    Assert.AreEqual( false,compareResult )
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
+			Assert.AreEqual(False, compareResult)
+		End Sub
 
-    End Sub
-    <Test()>
-    <Category("PneumaticUserInputsConfig")> _
-    Public Sub PneumaticUserInputsConfig_SmartRegeneration_Enequal()
+		<Test()>
+		<Category("PneumaticUserInputsConfig")>
+		Public Sub PneumaticUserInputsConfig_CompressorMap_Enequal()
 
-    'Arrange
-    Dim auxFresh = New AuxiliaryConfig("")
-    Dim auxNow   = New AuxiliaryConfig("")
-    Dim compareResult As Boolean
-    auxNow.PneumaticUserInputsConfig.SmartRegeneration = Not auxNow.PneumaticUserInputsConfig.SmartRegeneration 
-   
-    'Act
-    compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow)
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
 
-    Assert.AreEqual( false,compareResult )
 
-    End Sub
+			auxNow.PneumaticUserInputsConfig.CompressorMap = auxNow.PneumaticUserInputsConfig.CompressorMap & "x"
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
 
-    #End Region
 
+			Assert.AreEqual(False, compareResult)
+		End Sub
 
+		<Test()>
+		<Category("PneumaticUserInputsConfig")>
+		Public Sub PneumaticUserInputsConfig_Doors_Enequal()
 
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxNow.PneumaticUserInputsConfig.Doors = auxNow.PneumaticUserInputsConfig.Doors & "x"
 
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
 
 
-End Class
+			Assert.AreEqual(False, compareResult)
+		End Sub
 
+		<Test()>
+		<Category("PneumaticUserInputsConfig")>
+		Public Sub PneumaticUserInputsConfig_KneelingHeightMillimeters_Enequal()
 
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxNow.PneumaticUserInputsConfig.KneelingHeightMillimeters += 1
+
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
+			Assert.AreEqual(False, compareResult)
+		End Sub
+
+		<Test()>
+		<Category("PneumaticUserInputsConfig")>
+		Public Sub PneumaticUserInputsConfig_RetarderBrake_Enequal()
+
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxNow.PneumaticUserInputsConfig.RetarderBrake = Not auxNow.PneumaticUserInputsConfig.RetarderBrake
+
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
+			Assert.AreEqual(False, compareResult)
+		End Sub
+
+		<Test()>
+		<Category("PneumaticUserInputsConfig")>
+		Public Sub PneumaticUserInputsConfig_SmartAirCompression_Enequal()
+
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxNow.PneumaticUserInputsConfig.SmartAirCompression = Not auxNow.PneumaticUserInputsConfig.SmartAirCompression
+
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
+
+
+			Assert.AreEqual(False, compareResult)
+		End Sub
+
+		<Test()>
+		<Category("PneumaticUserInputsConfig")>
+		Public Sub PneumaticUserInputsConfig_SmartRegeneration_Enequal()
+
+			'Arrange
+			Dim auxFresh = New AuxiliaryConfig("")
+			Dim auxNow = New AuxiliaryConfig("")
+			Dim compareResult As Boolean
+			auxNow.PneumaticUserInputsConfig.SmartRegeneration = Not auxNow.PneumaticUserInputsConfig.SmartRegeneration
+
+			'Act
+			compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
+
+			Assert.AreEqual(False, compareResult)
+		End Sub
+
+#End Region
+	End Class
 End Namespace
 
 
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
index 4d3c8681a6..3c173461cb 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
@@ -1,6 +1,7 @@
 
 Imports VectoAuxiliaries.Pneumatics
 Imports NUnit.Framework
+Imports TUGraz.VectoCommon.Utils
 Imports VectoAuxiliariesTests.Mocks
 Imports VectoAuxiliaries
 
@@ -67,8 +68,8 @@ Namespace UnitTests
 			psCompressorMap.Initialise()
 			Dim _
 				target As _
-					New M3_AveragePneumaticLoadDemand(psUserInputsConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG,
-													"Urban", _signals)
+					New M3_AveragePneumaticLoadDemand(psUserInputsConfig, psAuxConfig, psActuationsMap, psCompressorMap,
+													_vehicleMassKG.SI(Of Kilogram), "Urban", _Signals)
 
 
 			Assert.IsNotNull(target)
@@ -88,12 +89,12 @@ Namespace UnitTests
 			Dim _
 				target As _
 					New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap,
-													_vehicleMassKG, "Urban", _signals)
+													_vehicleMassKG.SI(Of Kilogram), "Urban", _Signals)
 
-			Dim expected As Single = 7947.684
-			Dim actual As Single = target.TotalAirDemand()
+			Dim expected As Double = 7947.684
+			Dim actual As NormLiter = target.TotalAirDemand()
 
-			Assert.AreEqual(expected, actual)
+			Assert.AreEqual(expected, actual.Value(), 0.000001)
 		End Sub
 
 		<Test()>
@@ -110,12 +111,12 @@ Namespace UnitTests
 			Dim _
 				target As _
 					New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap,
-													_vehicleMassKG, "Urban", _signals)
+													_vehicleMassKG.SI(Of Kilogram), "Urban", _Signals)
 
 			Dim expected As Single = 5832.091
-			Dim actual As Single = target.GetAveragePowerDemandAtCrankFromPneumatics()
+			Dim actual As Watt = target.GetAveragePowerDemandAtCrankFromPneumatics()
 
-			Assert.AreEqual(expected, actual, 0.001)
+			Assert.AreEqual(expected, actual.Value(), 0.001)
 		End Sub
 
 
@@ -135,12 +136,11 @@ Namespace UnitTests
 			Dim _
 				target As _
 					New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap,
-													_vehicleMassKG, "Urban", _signals)
+													_vehicleMassKG.SI(Of Kilogram), "Urban", _Signals)
 
 			Dim expected As Single = 5832.091
-			Dim actual As Single = target.GetAveragePowerDemandAtCrankFromPneumatics()
 
-			Assert.AreEqual(expected, actual, 0.001)
+			Assert.AreEqual(expected, target.GetAveragePowerDemandAtCrankFromPneumatics().Value(), 0.001)
 		End Sub
 
 		<Test()>
@@ -157,12 +157,11 @@ Namespace UnitTests
 			Dim _
 				target As _
 					New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap,
-													_vehicleMassKG, "Urban", _signals)
+													_vehicleMassKG.SI(Of Kilogram), "Urban", _Signals)
 
-			Dim expected As Single = Math.Round(7947.55127 / _Signals.TotalCycleTimeSeconds, 4)
-			Dim actual As Single = Math.Round(target.AverageAirConsumedPerSecondLitre(), 4)
+			Dim expected As Single = 7947.55127 / _Signals.TotalCycleTimeSeconds
 
-			Assert.AreEqual(expected, actual)
+			Assert.AreEqual(expected, target.AverageAirConsumedPerSecondLitre().Value(), 0.001)
 		End Sub
 
 		'SmartRegeneration = False
@@ -182,12 +181,11 @@ Namespace UnitTests
 			Dim _
 				target As _
 					New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap,
-													_vehicleMassKG, "Urban", _Signals)
+													_vehicleMassKG.SI(Of Kilogram), "Urban", _Signals)
 
-			Dim expected As Single = Math.Round(8863.378 / _Signals.TotalCycleTimeSeconds, 4)
-			Dim actual As Single = Math.Round(target.AverageAirConsumedPerSecondLitre(), 4)
+			Dim expected As Double = 8863.378 / _Signals.TotalCycleTimeSeconds
 
-			Assert.AreEqual(expected, actual)
+			Assert.AreEqual(expected, target.AverageAirConsumedPerSecondLitre().Value(), 0.001)
 		End Sub
 
 		'RetarderBrake = False
@@ -207,13 +205,12 @@ Namespace UnitTests
 			Dim _
 				target As _
 					New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap,
-													_vehicleMassKG, "Urban", _Signals)
+													_vehicleMassKG.SI(Of Kilogram), "Urban", _Signals)
 
-			Dim expected As Single = Math.Round(8541.45 / _Signals.TotalCycleTimeSeconds, 4)
+			Dim expected As Double = 8541.45 / _Signals.TotalCycleTimeSeconds
 
-			Dim actual As Single = Math.Round(target.AverageAirConsumedPerSecondLitre(), 4)
 
-			Assert.AreEqual(expected, actual)
+			Assert.AreEqual(expected, target.AverageAirConsumedPerSecondLitre().Value(), 0.001)
 		End Sub
 
 		'KneelingHeightMilimeters = 100
@@ -233,13 +230,11 @@ Namespace UnitTests
 			Dim _
 				target As _
 					New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap,
-													_vehicleMassKG, "Urban", _Signals)
+													_vehicleMassKG.SI(Of Kilogram), "Urban", _Signals)
 
-			Dim expected As Single = 8557.524 / _Signals.TotalCycleTimeSeconds
+			Dim expected As Double = 8557.524 / _Signals.TotalCycleTimeSeconds
 
-			Dim actual As Single = Math.Round(target.AverageAirConsumedPerSecondLitre(), 8)
-
-			Assert.AreEqual(expected, actual)
+			Assert.AreEqual(expected, target.AverageAirConsumedPerSecondLitre().Value(), 0.001)
 		End Sub
 
 		'AirSuspensionControl = "mechanically"
@@ -259,13 +254,11 @@ Namespace UnitTests
 			Dim _
 				target As _
 					New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap,
-													_vehicleMassKG, "Urban", _Signals)
-
-			Dim expected As Single = 7947.68457 / _Signals.TotalCycleTimeSeconds
+													_vehicleMassKG.SI(Of Kilogram), "Urban", _Signals)
 
-			Dim actual As Single = Math.Round(target.AverageAirConsumedPerSecondLitre(), 6)
+			Dim expected As Double = 7947.68457 / _Signals.TotalCycleTimeSeconds
 
-			Assert.AreEqual(expected, actual)
+			Assert.AreEqual(expected, target.AverageAirConsumedPerSecondLitre().Value(), 0.001)
 		End Sub
 
 		'AdBlueDosing = "electric"
@@ -285,13 +278,11 @@ Namespace UnitTests
 			Dim _
 				target As _
 					New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap,
-													_vehicleMassKG, "Urban", _Signals)
+													_vehicleMassKG.SI(Of Kilogram), "Urban", _Signals)
 
-			Dim expected As Single = 7947.68457 / _Signals.TotalCycleTimeSeconds
+			Dim expected As Double = 7947.68457 / _Signals.TotalCycleTimeSeconds
 
-			Dim actual As Single = Math.Round(target.AverageAirConsumedPerSecondLitre(), 6)
-
-			Assert.AreEqual(expected, actual)
+			Assert.AreEqual(expected, target.AverageAirConsumedPerSecondLitre().Value(), 0.001)
 		End Sub
 
 		'Doors = "Electric"
@@ -311,13 +302,11 @@ Namespace UnitTests
 			Dim _
 				target As _
 					New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap,
-													_vehicleMassKG, "Urban", _Signals)
-
-			Dim expected As Single = 6880.88428 / _Signals.TotalCycleTimeSeconds
+													_vehicleMassKG.SI(Of Kilogram), "Urban", _Signals)
 
-			Dim actual As Single = Math.Round(target.AverageAirConsumedPerSecondLitre(), 6)
+			Dim expected As Double = 6880.88428 / _Signals.TotalCycleTimeSeconds
 
-			Assert.AreEqual(expected, actual)
+			Assert.AreEqual(expected, target.AverageAirConsumedPerSecondLitre().Value(), 0.001)
 		End Sub
 	End Class
 End Namespace
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb
index 1e057d583f..f6e3167d3c 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb
@@ -1,6 +1,7 @@
 Option Strict On
 
 Imports NUnit.Framework
+Imports TUGraz.VectoCommon.Utils
 Imports VectoAuxiliaries.Electrics
 Imports VectoAuxiliariesTests.Mocks
 Imports VectoAuxiliaries
@@ -8,133 +9,133 @@ Imports VectoAuxiliaries.Hvac
 
 Namespace UnitTests
 
-    <TestFixture()>
-    Public Class CombinedAlternatorTests
-
-        Private Alt1ExpectedTable2000 As New List(Of AltUserInput)
-        Private Alt1ExpectedTable4000 As New List(Of AltUserInput)
-        Private Alt1ExpectedTable6000 As New List(Of AltUserInput)
-        Private Alt2ExpectedTable2000 As New List(Of AltUserInput)
-        Private Alt2ExpectedTable4000 As New List(Of AltUserInput)
-        Private Alt2ExpectedTable6000 As New List(Of AltUserInput)
-        Private Alt3ExpectedTable2000 As New List(Of AltUserInput)
-        Private Alt3ExpectedTable4000 As New List(Of AltUserInput)
-        Private Alt3ExpectedTable6000 As New List(Of AltUserInput)
-        Private Alt4ExpectedTable2000 As New List(Of AltUserInput)
-        Private Alt4ExpectedTable4000 As New List(Of AltUserInput)
-        Private Alt4ExpectedTable6000 As New List(Of AltUserInput)
-        Private RangeTableExpected As New List(Of AltUserInput)
-
-
-
-        Private Const COMBINEDALT_GOODMAP = "testfiles\testCombinedAlternatorMap.aalt"
-
-
-        Sub New()
-
-            Alt1ExpectedTable2000 = New List(Of AltUserInput)() From {New AltUserInput(0, 50), _
-                                                                         New AltUserInput(10, 50), _
-                                                                         New AltUserInput(40, 50), _
-                                                                         New AltUserInput(60, 50), _
-                                                                         New AltUserInput(61, 50), _
-                                                                         New AltUserInput(200, 50)}
-
-            Alt1ExpectedTable4000 = New List(Of AltUserInput)() From {New AltUserInput(0, 70), _
-                                                                         New AltUserInput(10, 70), _
-                                                                         New AltUserInput(40, 70), _
-                                                                         New AltUserInput(60, 70), _
-                                                                         New AltUserInput(61, 70), _
-                                                                         New AltUserInput(200, 70)}
+	<TestFixture()>
+	Public Class CombinedAlternatorTests
+
+		Private Alt1ExpectedTable2000 As New List(Of AltUserInput)
+		Private Alt1ExpectedTable4000 As New List(Of AltUserInput)
+		Private Alt1ExpectedTable6000 As New List(Of AltUserInput)
+		Private Alt2ExpectedTable2000 As New List(Of AltUserInput)
+		Private Alt2ExpectedTable4000 As New List(Of AltUserInput)
+		Private Alt2ExpectedTable6000 As New List(Of AltUserInput)
+		Private Alt3ExpectedTable2000 As New List(Of AltUserInput)
+		Private Alt3ExpectedTable4000 As New List(Of AltUserInput)
+		Private Alt3ExpectedTable6000 As New List(Of AltUserInput)
+		Private Alt4ExpectedTable2000 As New List(Of AltUserInput)
+		Private Alt4ExpectedTable4000 As New List(Of AltUserInput)
+		Private Alt4ExpectedTable6000 As New List(Of AltUserInput)
+		Private RangeTableExpected As New List(Of AltUserInput)
+
+
+
+		Private Const COMBINEDALT_GOODMAP = "testfiles\testCombinedAlternatorMap.aalt"
+
+
+		Sub New()
+
+			Alt1ExpectedTable2000 = New List(Of AltUserInput)() From {New AltUserInput(0, 50), _
+																		 New AltUserInput(10, 50), _
+																		 New AltUserInput(40, 50), _
+																		 New AltUserInput(60, 50), _
+																		 New AltUserInput(61, 50), _
+																		 New AltUserInput(200, 50)}
+
+			Alt1ExpectedTable4000 = New List(Of AltUserInput)() From {New AltUserInput(0, 70), _
+																		 New AltUserInput(10, 70), _
+																		 New AltUserInput(40, 70), _
+																		 New AltUserInput(60, 70), _
+																		 New AltUserInput(61, 70), _
+																		 New AltUserInput(200, 70)}
 
 
-            Alt1ExpectedTable6000 = New List(Of AltUserInput)() From {New AltUserInput(0, 60), _
-                                                                         New AltUserInput(10, 60), _
-                                                                         New AltUserInput(40, 60), _
-                                                                         New AltUserInput(60, 60), _
-                                                                         New AltUserInput(61, 60), _
-                                                                         New AltUserInput(200, 60)}
+			Alt1ExpectedTable6000 = New List(Of AltUserInput)() From {New AltUserInput(0, 60), _
+																		 New AltUserInput(10, 60), _
+																		 New AltUserInput(40, 60), _
+																		 New AltUserInput(60, 60), _
+																		 New AltUserInput(61, 60), _
+																		 New AltUserInput(200, 60)}
 
-            'ALT 2
-            Alt2ExpectedTable2000 = New List(Of AltUserInput)() From {New AltUserInput(0, 80), _
-                                                                         New AltUserInput(10, 80), _
-                                                                         New AltUserInput(40, 80), _
-                                                                         New AltUserInput(60, 80), _
-                                                                         New AltUserInput(61, 80), _
-                                                                         New AltUserInput(200, 80)}
+			'ALT 2
+			Alt2ExpectedTable2000 = New List(Of AltUserInput)() From {New AltUserInput(0, 80), _
+																		 New AltUserInput(10, 80), _
+																		 New AltUserInput(40, 80), _
+																		 New AltUserInput(60, 80), _
+																		 New AltUserInput(61, 80), _
+																		 New AltUserInput(200, 80)}
 
-            Alt2ExpectedTable4000 = New List(Of AltUserInput)() From {New AltUserInput(0, 40), _
-                                                                         New AltUserInput(10, 40), _
-                                                                         New AltUserInput(40, 40), _
-                                                                         New AltUserInput(60, 40), _
-                                                                         New AltUserInput(61, 40), _
-                                                                         New AltUserInput(200, 40)}
+			Alt2ExpectedTable4000 = New List(Of AltUserInput)() From {New AltUserInput(0, 40), _
+																		 New AltUserInput(10, 40), _
+																		 New AltUserInput(40, 40), _
+																		 New AltUserInput(60, 40), _
+																		 New AltUserInput(61, 40), _
+																		 New AltUserInput(200, 40)}
 
 
-            Alt2ExpectedTable6000 = New List(Of AltUserInput)() From {New AltUserInput(0, 60), _
-                                                                         New AltUserInput(10, 60), _
-                                                                         New AltUserInput(40, 60), _
-                                                                         New AltUserInput(60, 60), _
-                                                                         New AltUserInput(61, 60), _
-                                                                         New AltUserInput(200, 60)}
+			Alt2ExpectedTable6000 = New List(Of AltUserInput)() From {New AltUserInput(0, 60), _
+																		 New AltUserInput(10, 60), _
+																		 New AltUserInput(40, 60), _
+																		 New AltUserInput(60, 60), _
+																		 New AltUserInput(61, 60), _
+																		 New AltUserInput(200, 60)}
 
 
-            'ALT 3
-            Alt3ExpectedTable2000 = New List(Of AltUserInput)() From {New AltUserInput(0, 95), _
-                                                                         New AltUserInput(10, 95), _
-                                                                         New AltUserInput(40, 50), _
-                                                                         New AltUserInput(60, 90), _
-                                                                         New AltUserInput(62.5, 95), _
-                                                                         New AltUserInput(200, 95)}
+			'ALT 3
+			Alt3ExpectedTable2000 = New List(Of AltUserInput)() From {New AltUserInput(0, 95), _
+																		 New AltUserInput(10, 95), _
+																		 New AltUserInput(40, 50), _
+																		 New AltUserInput(60, 90), _
+																		 New AltUserInput(62.5, 95), _
+																		 New AltUserInput(200, 95)}
 
-            Alt3ExpectedTable4000 = New List(Of AltUserInput)() From {New AltUserInput(0, 99), _
-                                                                         New AltUserInput(10, 99), _
-                                                                         New AltUserInput(40, 1), _
-                                                                         New AltUserInput(60, 55), _
-                                                                         New AltUserInput(76.2962963, 99), _
-                                                                         New AltUserInput(200, 99)}
+			Alt3ExpectedTable4000 = New List(Of AltUserInput)() From {New AltUserInput(0, 99), _
+																		 New AltUserInput(10, 99), _
+																		 New AltUserInput(40, 1), _
+																		 New AltUserInput(60, 55), _
+																		 New AltUserInput(76.2962963, 99), _
+																		 New AltUserInput(200, 99)}
 
 
-            Alt3ExpectedTable6000 = New List(Of AltUserInput)() From {New AltUserInput(0, 94), _
-                                                                         New AltUserInput(10, 94), _
-                                                                         New AltUserInput(40, 86), _
-                                                                         New AltUserInput(60, 13), _
-                                                                         New AltUserInput(63.5616438, 0), _
-                                                                         New AltUserInput(200, 0)}
+			Alt3ExpectedTable6000 = New List(Of AltUserInput)() From {New AltUserInput(0, 94), _
+																		 New AltUserInput(10, 94), _
+																		 New AltUserInput(40, 86), _
+																		 New AltUserInput(60, 13), _
+																		 New AltUserInput(63.5616438, 0), _
+																		 New AltUserInput(200, 0)}
 
 
-            'ALT 4
-            Alt4ExpectedTable2000 = New List(Of AltUserInput)() From {New AltUserInput(0, 55), _
-                                                                         New AltUserInput(10, 55), _
-                                                                         New AltUserInput(40, 45), _
-                                                                         New AltUserInput(60, 67), _
-                                                                         New AltUserInput(61, 67), _
-                                                                         New AltUserInput(200, 67)}
+			'ALT 4
+			Alt4ExpectedTable2000 = New List(Of AltUserInput)() From {New AltUserInput(0, 55), _
+																		 New AltUserInput(10, 55), _
+																		 New AltUserInput(40, 45), _
+																		 New AltUserInput(60, 67), _
+																		 New AltUserInput(61, 67), _
+																		 New AltUserInput(200, 67)}
 
-            Alt4ExpectedTable4000 = New List(Of AltUserInput)() From {New AltUserInput(0, 77), _
-                                                                         New AltUserInput(10, 77), _
-                                                                         New AltUserInput(40, 39), _
-                                                                         New AltUserInput(60, 23), _
-                                                                         New AltUserInput(88.75, 0), _
-                                                                         New AltUserInput(200, 0)}
+			Alt4ExpectedTable4000 = New List(Of AltUserInput)() From {New AltUserInput(0, 77), _
+																		 New AltUserInput(10, 77), _
+																		 New AltUserInput(40, 39), _
+																		 New AltUserInput(60, 23), _
+																		 New AltUserInput(88.75, 0), _
+																		 New AltUserInput(200, 0)}
 
 
-            Alt4ExpectedTable6000 = New List(Of AltUserInput)() From {New AltUserInput(0, 34), _
-                                                                         New AltUserInput(10, 34), _
-                                                                         New AltUserInput(40, 67), _
-                                                                         New AltUserInput(60, 35), _
-                                                                         New AltUserInput(81.875, 0), _
-                                                                         New AltUserInput(200, 0)}
+			Alt4ExpectedTable6000 = New List(Of AltUserInput)() From {New AltUserInput(0, 34), _
+																		 New AltUserInput(10, 34), _
+																		 New AltUserInput(40, 67), _
+																		 New AltUserInput(60, 35), _
+																		 New AltUserInput(81.875, 0), _
+																		 New AltUserInput(200, 0)}
 
 
 
-            'RangeTable
-            RangeTableExpected = New List(Of AltUserInput)() From {New AltUserInput(-3001, 0), _
-                                                                        New AltUserInput(-3000, 0), _
-                                                                        New AltUserInput(2000, 50), _
-                                                                        New AltUserInput(4000, 70), _
-                                                                        New AltUserInput(6000, 60), _
-                                                                        New AltUserInput(18000, 0), _
-                                                                        New AltUserInput(18001, 0)}
+			'RangeTable
+			RangeTableExpected = New List(Of AltUserInput)() From {New AltUserInput(-3001, 0), _
+																		New AltUserInput(-3000, 0), _
+																		New AltUserInput(2000, 50), _
+																		New AltUserInput(4000, 70), _
+																		New AltUserInput(6000, 60), _
+																		New AltUserInput(18000, 0), _
+																		New AltUserInput(18001, 0)}
 
 
 
@@ -144,371 +145,371 @@ Namespace UnitTests
 
 
 
-        End Sub
+		End Sub
 
-        <Test()> _
-        <TestCase(1, 2, 50.0F)> _
-        <TestCase(1, 4, 70)> _
-        <TestCase(1, 6, 60)> _
-        <TestCase(2, 2, 80)> _
-        <TestCase(2, 4, 40)> _
-        <TestCase(2, 6, 60)> _
-        <TestCase(3, 2, 55)> _
-        <TestCase(3, 4, 7.75F)> _
-        <TestCase(3, 6, 76.875F)> _
-        <TestCase(4, 2, 47.75F)> _
-        <TestCase(4, 4, 37)> _
-        <TestCase(4, 6, 63)>
-        Public Sub Interpolate4Table4(alt As Integer, rpmK As Integer, expected As Single)
+		<Test()> _
+		<TestCase(1, 2, 50.0F)> _
+		<TestCase(1, 4, 70)> _
+		<TestCase(1, 6, 60)> _
+		<TestCase(2, 2, 80)> _
+		<TestCase(2, 4, 40)> _
+		<TestCase(2, 6, 60)> _
+		<TestCase(3, 2, 55)> _
+		<TestCase(3, 4, 7.75F)> _
+		<TestCase(3, 6, 76.875F)> _
+		<TestCase(4, 2, 47.75F)> _
+		<TestCase(4, 4, 37)> _
+		<TestCase(4, 6, 63)>
+		Public Sub Interpolate4Table4(alt As Integer, rpmK As Integer, expected As Single)
 
-            Dim interpValue As Single
+			Dim interpValue As Double
 
-            Select Case alt
+			Select Case alt
 
-                Case 1
+				Case 1
 
-                    Select Case rpmK
+					Select Case rpmK
 
-                        Case 2
-                            interpValue = Alternator.Iterpolate(Alt1ExpectedTable2000, 42.5)
-                        Case 4
-                            interpValue = Alternator.Iterpolate(Alt1ExpectedTable4000, 42.5)
-                        Case 6
-                            interpValue = Alternator.Iterpolate(Alt1ExpectedTable6000, 42.5)
+						Case 2
+							interpValue = Alternator.Iterpolate(Alt1ExpectedTable2000, 42.5)
+						Case 4
+							interpValue = Alternator.Iterpolate(Alt1ExpectedTable4000, 42.5)
+						Case 6
+							interpValue = Alternator.Iterpolate(Alt1ExpectedTable6000, 42.5)
 
-                    End Select
+					End Select
 
 
-                Case 2
+				Case 2
 
-                    Select Case rpmK
+					Select Case rpmK
 
-                        Case 2
-                            interpValue = Alternator.Iterpolate(Alt2ExpectedTable2000, 42.5)
-                        Case 4
-                            interpValue = Alternator.Iterpolate(Alt2ExpectedTable4000, 42.5)
-                        Case 6
-                            interpValue = Alternator.Iterpolate(Alt2ExpectedTable6000, 42.5)
+						Case 2
+							interpValue = Alternator.Iterpolate(Alt2ExpectedTable2000, 42.5)
+						Case 4
+							interpValue = Alternator.Iterpolate(Alt2ExpectedTable4000, 42.5)
+						Case 6
+							interpValue = Alternator.Iterpolate(Alt2ExpectedTable6000, 42.5)
 
-                    End Select
+					End Select
 
-                Case 3
+				Case 3
 
-                    Select Case rpmK
+					Select Case rpmK
 
-                        Case 2
-                            interpValue = Alternator.Iterpolate(Alt3ExpectedTable2000, 42.5)
-                        Case 4
-                            interpValue = Alternator.Iterpolate(Alt3ExpectedTable4000, 42.5)
-                        Case 6
-                            interpValue = Alternator.Iterpolate(Alt3ExpectedTable6000, 42.5)
+						Case 2
+							interpValue = Alternator.Iterpolate(Alt3ExpectedTable2000, 42.5)
+						Case 4
+							interpValue = Alternator.Iterpolate(Alt3ExpectedTable4000, 42.5)
+						Case 6
+							interpValue = Alternator.Iterpolate(Alt3ExpectedTable6000, 42.5)
 
-                    End Select
+					End Select
 
-                Case 4
+				Case 4
 
-                    Select Case rpmK
+					Select Case rpmK
 
-                        Case 2
-                            interpValue = Alternator.Iterpolate(Alt4ExpectedTable2000, 42.5)
-                        Case 4
-                            interpValue = Alternator.Iterpolate(Alt4ExpectedTable4000, 42.5)
-                        Case 6
-                            interpValue = Alternator.Iterpolate(Alt4ExpectedTable6000, 42.5)
+						Case 2
+							interpValue = Alternator.Iterpolate(Alt4ExpectedTable2000, 42.5)
+						Case 4
+							interpValue = Alternator.Iterpolate(Alt4ExpectedTable4000, 42.5)
+						Case 6
+							interpValue = Alternator.Iterpolate(Alt4ExpectedTable6000, 42.5)
 
-                    End Select
+					End Select
 
-            End Select
+			End Select
 
 
-            Assert.AreEqual(interpValue, expected)
+			Assert.AreEqual(interpValue, expected, 0.001)
 
 
-        End Sub
+		End Sub
 
 
-        <Test()>
-        Public Sub Alt1TableConstructTest()
+		<Test()>
+		Public Sub Alt1TableConstructTest()
 
 
-            'Arrange
-            Dim signals As ICombinedAlternatorSignals = New CombinedAlternatorSignals
+			'Arrange
+			Dim signals As ICombinedAlternatorSignals = New CombinedAlternatorSignals
 
 
-            'Act
-            Dim alt As New CombinedAlternator(COMBINEDALT_GOODMAP)
+			'Act
+			Dim alt As New CombinedAlternator(COMBINEDALT_GOODMAP)
 
 
 
-            Dim idx As Integer
+			Dim idx As Integer
 
-            For idx = 0 To alt.Alternators(0).InputTable2000.Count - 1
-                Assert.IsTrue(alt.Alternators(0).InputTable2000(idx).IsEqual(Alt1ExpectedTable2000(idx)))
-            Next
+			For idx = 0 To alt.Alternators(0).InputTable2000.Count - 1
+				Assert.IsTrue(alt.Alternators(0).InputTable2000(idx).IsEqual(Alt1ExpectedTable2000(idx)))
+			Next
 
-            For idx = 0 To alt.Alternators(0).InputTable4000.Count - 1
-                Assert.IsTrue(alt.Alternators(0).InputTable4000(idx).IsEqual(Alt1ExpectedTable4000(idx)))
-            Next
+			For idx = 0 To alt.Alternators(0).InputTable4000.Count - 1
+				Assert.IsTrue(alt.Alternators(0).InputTable4000(idx).IsEqual(Alt1ExpectedTable4000(idx)))
+			Next
 
-            For idx = 0 To alt.Alternators(0).InputTable6000.Count - 1
-                Assert.IsTrue(alt.Alternators(0).InputTable6000(idx).IsEqual(Alt1ExpectedTable6000(idx)))
-            Next
+			For idx = 0 To alt.Alternators(0).InputTable6000.Count - 1
+				Assert.IsTrue(alt.Alternators(0).InputTable6000(idx).IsEqual(Alt1ExpectedTable6000(idx)))
+			Next
 
 
-        End Sub
+		End Sub
 
-        <Test()>
-        Public Sub Alt2TableConstructTest()
+		<Test()>
+		Public Sub Alt2TableConstructTest()
 
 
 
-            'Arrange
+			'Arrange
 
-            'Act
-            Dim alt As New CombinedAlternator(COMBINEDALT_GOODMAP)
+			'Act
+			Dim alt As New CombinedAlternator(COMBINEDALT_GOODMAP)
 
 
-            Dim idx As Integer
+			Dim idx As Integer
 
-            For idx = 0 To alt.Alternators(1).InputTable2000.Count - 1
-                Assert.IsTrue(alt.Alternators(1).InputTable2000(idx).IsEqual(Alt2ExpectedTable2000(idx)))
-            Next
+			For idx = 0 To alt.Alternators(1).InputTable2000.Count - 1
+				Assert.IsTrue(alt.Alternators(1).InputTable2000(idx).IsEqual(Alt2ExpectedTable2000(idx)))
+			Next
 
-            For idx = 0 To alt.Alternators(1).InputTable4000.Count - 1
-                Assert.IsTrue(alt.Alternators(1).InputTable4000(idx).IsEqual(Alt2ExpectedTable4000(idx)))
-            Next
+			For idx = 0 To alt.Alternators(1).InputTable4000.Count - 1
+				Assert.IsTrue(alt.Alternators(1).InputTable4000(idx).IsEqual(Alt2ExpectedTable4000(idx)))
+			Next
 
-            For idx = 0 To alt.Alternators(1).InputTable6000.Count - 1
-                Assert.IsTrue(alt.Alternators(1).InputTable6000(idx).IsEqual(Alt2ExpectedTable6000(idx)))
-            Next
+			For idx = 0 To alt.Alternators(1).InputTable6000.Count - 1
+				Assert.IsTrue(alt.Alternators(1).InputTable6000(idx).IsEqual(Alt2ExpectedTable6000(idx)))
+			Next
 
 
-        End Sub
-        <Test()>
-        Public Sub Alt3TableConstructTest()
+		End Sub
+		<Test()>
+		Public Sub Alt3TableConstructTest()
 
 
-            'Arrange
-            Dim signals As ICombinedAlternatorSignals = New CombinedAlternatorSignals
+			'Arrange
+			Dim signals As ICombinedAlternatorSignals = New CombinedAlternatorSignals
 
 
-            'Act
-            Dim alt As New CombinedAlternator(COMBINEDALT_GOODMAP)
+			'Act
+			Dim alt As New CombinedAlternator(COMBINEDALT_GOODMAP)
 
 
-            Dim idx As Integer
+			Dim idx As Integer
 
-            For idx = 0 To alt.Alternators(2).InputTable2000.Count - 1
-                Assert.IsTrue(alt.Alternators(2).InputTable2000(idx).IsEqual(Alt3ExpectedTable2000(idx)))
-            Next
+			For idx = 0 To alt.Alternators(2).InputTable2000.Count - 1
+				Assert.IsTrue(alt.Alternators(2).InputTable2000(idx).IsEqual(Alt3ExpectedTable2000(idx)))
+			Next
 
-            For idx = 0 To alt.Alternators(2).InputTable4000.Count - 1
-                Assert.IsTrue(alt.Alternators(2).InputTable4000(idx).IsEqual(Alt3ExpectedTable4000(idx), 3))
-            Next
+			For idx = 0 To alt.Alternators(2).InputTable4000.Count - 1
+				Assert.IsTrue(alt.Alternators(2).InputTable4000(idx).IsEqual(Alt3ExpectedTable4000(idx), 3))
+			Next
 
-            For idx = 0 To alt.Alternators(2).InputTable6000.Count - 1
-                Assert.IsTrue(alt.Alternators(2).InputTable6000(idx).IsEqual(Alt3ExpectedTable6000(idx), 3))
-            Next
+			For idx = 0 To alt.Alternators(2).InputTable6000.Count - 1
+				Assert.IsTrue(alt.Alternators(2).InputTable6000(idx).IsEqual(Alt3ExpectedTable6000(idx), 3))
+			Next
 
 
-        End Sub
-        <Test()>
-        Public Sub Alt4TableConstructTest()
+		End Sub
+		<Test()>
+		Public Sub Alt4TableConstructTest()
 
-            'Arrange
-            Dim signals As ICombinedAlternatorSignals = New CombinedAlternatorSignals
+			'Arrange
+			Dim signals As ICombinedAlternatorSignals = New CombinedAlternatorSignals
 
 
-            'Act
-            Dim alt As New CombinedAlternator(COMBINEDALT_GOODMAP)
+			'Act
+			Dim alt As New CombinedAlternator(COMBINEDALT_GOODMAP)
 
 
-            Dim idx As Integer
+			Dim idx As Integer
 
-            For idx = 0 To alt.Alternators(3).InputTable2000.Count - 1
-                Assert.IsTrue(alt.Alternators(3).InputTable2000(idx).IsEqual(Alt4ExpectedTable2000(idx)))
-            Next
+			For idx = 0 To alt.Alternators(3).InputTable2000.Count - 1
+				Assert.IsTrue(alt.Alternators(3).InputTable2000(idx).IsEqual(Alt4ExpectedTable2000(idx)))
+			Next
 
-            For idx = 0 To alt.Alternators(3).InputTable4000.Count - 1
-                Assert.IsTrue(alt.Alternators(3).InputTable4000(idx).IsEqual(Alt4ExpectedTable4000(idx), 3))
-            Next
+			For idx = 0 To alt.Alternators(3).InputTable4000.Count - 1
+				Assert.IsTrue(alt.Alternators(3).InputTable4000(idx).IsEqual(Alt4ExpectedTable4000(idx), 3))
+			Next
 
-            For idx = 0 To alt.Alternators(3).InputTable6000.Count - 1
-                Assert.IsTrue(alt.Alternators(3).InputTable6000(idx).IsEqual(Alt4ExpectedTable6000(idx), 3))
-            Next
+			For idx = 0 To alt.Alternators(3).InputTable6000.Count - 1
+				Assert.IsTrue(alt.Alternators(3).InputTable6000(idx).IsEqual(Alt4ExpectedTable6000(idx), 3))
+			Next
 
 
-        End Sub
+		End Sub
 
 
-        'testCombinedAlternatorMap
-        <Test()>
-        Public Sub InitialiseCombinedAlternatorMapFromFile()
+		'testCombinedAlternatorMap
+		<Test()>
+		Public Sub InitialiseCombinedAlternatorMapFromFile()
 
 
-            'Arrange
-            Dim signals As ICombinedAlternatorSignals = New CombinedAlternatorSignals
+			'Arrange
+			Dim signals As ICombinedAlternatorSignals = New CombinedAlternatorSignals
 
 
-            'Act
-            Dim target As New CombinedAlternator(COMBINEDALT_GOODMAP)
+			'Act
+			Dim target As New CombinedAlternator(COMBINEDALT_GOODMAP)
 
 
 
-            'Assert
+			'Assert
 
-            Assert.AreEqual(target.Alternators.Count, 4)
+			Assert.AreEqual(target.Alternators.Count, 4)
 
 
 
-        End Sub
+		End Sub
 
-        <Test()>
-        Public Sub InitialiseCombinedAlternatorMapFromDefault()
+		<Test()>
+		Public Sub InitialiseCombinedAlternatorMapFromDefault()
 
-            'Arrange
-            Dim signals As ICombinedAlternatorSignals = New CombinedAlternatorSignals
+			'Arrange
+			Dim signals As ICombinedAlternatorSignals = New CombinedAlternatorSignals
 
-            'Act
-            Dim target As New CombinedAlternator("123.aalt")
+			'Act
+			Dim target As New CombinedAlternator("123.aalt")
 
-            'Assert
-            Assert.AreEqual(target.Alternators.Count, 2)
+			'Assert
+			Assert.AreEqual(target.Alternators.Count, 2)
 
-        End Sub
+		End Sub
 
 
-        <Test()>
-        Public Sub AveragedEfficiency()
+		<Test()>
+		Public Sub AveragedEfficiency()
 
 
-            '  Dim signals As ICombinedAlternatorSignals = New CombinedAlternatorSignals() With {.CrankRPM=1750, .CurrentDemandAmps=170}
+			'  Dim signals As ICombinedAlternatorSignals = New CombinedAlternatorSignals() With {.CrankRPM=1750, .CurrentDemandAmps=170}
 
-            Dim ca As New CombinedAlternator("abc.aalt")
+			Dim ca As New CombinedAlternator("abc.aalt")
 
-            ca.Initialise()
+			ca.Initialise()
 
 
-            Dim actual As AlternatorMapValues = ca.GetEfficiency(1750, 170)
+			Dim actual As AlternatorMapValues = ca.GetEfficiency(1750, 170.SI(Of Ampere))
 
-            Assert.AreEqual(0.684354842F, actual.Efficiency)
+			Assert.AreEqual(0.684354842F, actual.Efficiency)
 
 
-        End Sub
+		End Sub
 
-        '<Test()>
-        Public Sub Performance()
+		'<Test()>
+		Public Sub Performance()
 
 
-            Dim ca As New CombinedAlternator("abc.aalt")
+			Dim ca As New CombinedAlternator("abc.aalt")
 
-            ca.Initialise()
+			ca.Initialise()
 
-            Dim startDT As DateTime = DateTime.Now
-            Dim endDateDT As DateTime
-            Dim crank As Single
-            Dim demand As Single
-            Dim rand As New Random(50)
+			Dim startDT As DateTime = DateTime.Now
+			Dim endDateDT As DateTime
+			Dim crank As Single
+			Dim demand As Single
+			Dim rand As New Random(50)
 
-            Dim min As Single = 0.1
-            Dim max As Single = 0.1
+			Dim min As Double = 0.1
+			Dim max As Double = 0.1
 
-            For x = 1 To 500000
+			For x = 1 To 500000
 
-                'crank = rand.Next(500,3000)
-                'demand = rand.Next(1,200)
+				'crank = rand.Next(500,3000)
+				'demand = rand.Next(1,200)
 
-                crank = rand.Next(0, 0)
-                demand = rand.Next(0, 0)
+				crank = rand.Next(0, 0)
+				demand = rand.Next(0, 0)
 
-                Dim actual As AlternatorMapValues = ca.GetEfficiency(crank, demand)
+				Dim actual As AlternatorMapValues = ca.GetEfficiency(crank, demand.SI(Of Ampere))
 
-                If actual.Efficiency < min Then min = actual.Efficiency
+				If actual.Efficiency < min Then min = actual.Efficiency
 
-                If actual.Efficiency > max Then max = actual.Efficiency
+				If actual.Efficiency > max Then max = actual.Efficiency
 
-            Next
+			Next
 
-            endDateDT = DateTime.Now
+			endDateDT = DateTime.Now
 
-            Dim secs As Single = (endDateDT - startDT).Seconds
+			Dim secs As Single = (endDateDT - startDT).Seconds
 
 
-        End Sub
+		End Sub
 
 
-        <Test()>
-        Public Sub AlternatorsAreEqual()
+		<Test()>
+		Public Sub AlternatorsAreEqual()
 
 
-            Dim ca As ICombinedAlternator = New CombinedAlternator("abc.aalt")
-            Dim original As ICombinedAlternator = New CombinedAlternator("abc.aalt")
+			Dim ca As ICombinedAlternator = New CombinedAlternator("abc.aalt")
+			Dim original As ICombinedAlternator = New CombinedAlternator("abc.aalt")
 
-            Assert.IsTrue(ca.IsEqualTo(original))
+			Assert.IsTrue(ca.IsEqualTo(original))
 
-        End Sub
+		End Sub
 
-        <Test()>
-        Public Sub AlternatorsUnequalName()
+		<Test()>
+		Public Sub AlternatorsUnequalName()
 
 
-            Dim ca As New CombinedAlternator("abc.aalt")
-            Dim original As New CombinedAlternator("abc.aalt")
+			Dim ca As New CombinedAlternator("abc.aalt")
+			Dim original As New CombinedAlternator("abc.aalt")
 
-            ca.Alternators(0).AlternatorName = "ZCZZCZCZCZCXXXYYY"
+			ca.Alternators(0).AlternatorName = "ZCZZCZCZCZCXXXYYY"
 
-            Assert.IsFalse(ca.IsEqualTo(original))
+			Assert.IsFalse(ca.IsEqualTo(original))
 
-        End Sub
+		End Sub
 
-        <Test()>
-        Public Sub AlternatorsUnequalPulley()
+		<Test()>
+		Public Sub AlternatorsUnequalPulley()
 
 
-            Dim ca As New CombinedAlternator("abc.aalt")
-            Dim original As New CombinedAlternator("abc.aalt")
+			Dim ca As New CombinedAlternator("abc.aalt")
+			Dim original As New CombinedAlternator("abc.aalt")
 
-            ca.Alternators(0).PulleyRatio = 9
+			ca.Alternators(0).PulleyRatio = 9
 
-            Assert.IsFalse(ca.IsEqualTo(original))
+			Assert.IsFalse(ca.IsEqualTo(original))
 
-        End Sub
+		End Sub
 
-        '<Test()>
-        ' Public Sub AlternatorsUnequalEfficiency()
+		'<Test()>
+		' Public Sub AlternatorsUnequalEfficiency()
 
 
-        '  Dim ca As new CombinedAlternator("abc.aalt")
-        '  Dim original As new CombinedAlternator("abc.aalt")
+		'  Dim ca As new CombinedAlternator("abc.aalt")
+		'  Dim original As new CombinedAlternator("abc.aalt")
 
-        '  ca.Alternators(0).InputTable2000(1).Eff=0.99999
+		'  ca.Alternators(0).InputTable2000(1).Eff=0.99999
 
-        '  'Only tests efficiency values table row 1-3
-        '  Assert.IsFalse(ca.IsEqualTo( original))
+		'  'Only tests efficiency values table row 1-3
+		'  Assert.IsFalse(ca.IsEqualTo( original))
 
-        ' End Sub
+		' End Sub
 
 
-        <Test()>
-        Public Sub AlternatorsUnequalEfficiency()
+		<Test()>
+		Public Sub AlternatorsUnequalEfficiency()
 
 
-            Dim ca As New CombinedAlternator("abc.aalt")
-            Dim original As New CombinedAlternator("abc.aalt")
+			Dim ca As New CombinedAlternator("abc.aalt")
+			Dim original As New CombinedAlternator("abc.aalt")
 
-            ca.Alternators(0).InputTable2000(1).Eff = 0.99999
+			ca.Alternators(0).InputTable2000(1).Eff = 0.99999
 
-            'Only tests efficiency values table row 1-3
-            Assert.IsFalse(ca.IsEqualTo(original))
+			'Only tests efficiency values table row 1-3
+			Assert.IsFalse(ca.IsEqualTo(original))
 
-        End Sub
+		End Sub
 
 
 
 
 
 
-    End Class
+	End Class
 
 
 End Namespace
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb
index d0f3fbf06a..d899a1c627 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb
@@ -1,153 +1,142 @@
 Imports NUnit.Framework
+Imports TUGraz.VectoCommon.Utils
 Imports VectoAuxiliaries.Pneumatics
 
 Namespace UnitTests
-
-    <TestFixture()>
-    Public Class CompressorMapTests
-
-        Private Const GOODMAP As String = "TestFiles\testCompressorMap.acmp"
-        Private Const INVALIDPOWERCOMPRESSORONMAP As String = "TestFiles\testCompressorMapInvalidOnPower.acmp"
-        Private Const INVALIDPOWERCOMPRESSOROFFMAP As String = "TestFiles\testCompressorMapInvalidOffPower.acmp"
-        Private Const INVALIDFLOWRATEMAP As String = "TestFiles\testCompressorMapInvalidFlow.acmp"
-        Private Const INSSUFICIENTROWSMAP As String = "TestFiles\testCompressorMapNotEnoughRows.acmp"
-        Private Const INVALIDRPMMAP As String = "TestFiles\testCompressorMapInvalidRpm.acmp"
-        Private Const INVALIDNUMBEROFCOLUMNS As String = "TestFiles\testCompressorMapWrongNumberOfColumns.acmp"
+	<TestFixture()>
+	Public Class CompressorMapTests
+		Private Const GOODMAP As String = "TestFiles\testCompressorMap.acmp"
+		Private Const INVALIDPOWERCOMPRESSORONMAP As String = "TestFiles\testCompressorMapInvalidOnPower.acmp"
+		Private Const INVALIDPOWERCOMPRESSOROFFMAP As String = "TestFiles\testCompressorMapInvalidOffPower.acmp"
+		Private Const INVALIDFLOWRATEMAP As String = "TestFiles\testCompressorMapInvalidFlow.acmp"
+		Private Const INSSUFICIENTROWSMAP As String = "TestFiles\testCompressorMapNotEnoughRows.acmp"
+		Private Const INVALIDRPMMAP As String = "TestFiles\testCompressorMapInvalidRpm.acmp"
+		Private Const INVALIDNUMBEROFCOLUMNS As String = "TestFiles\testCompressorMapWrongNumberOfColumns.acmp"
 
 
 #Region "Helpers"
 
-        Private Function GetInitialiseMap() As CompressorMap
-            Dim target As CompressorMap = GetMap()
-            target.Initialise()
-            Return target
-        End Function
+		Private Function GetInitialiseMap() As CompressorMap
+			Dim target As CompressorMap = GetMap()
+			target.Initialise()
+			Return target
+		End Function
 
-        Private Function GetMap() As CompressorMap
-            Dim path As String = GOODMAP
-            Dim target As CompressorMap = New CompressorMap(path)
-            Return target
-        End Function
+		Private Function GetMap() As CompressorMap
+			Dim path As String = GOODMAP
+			Dim target As CompressorMap = New CompressorMap(path)
+			Return target
+		End Function
 
 #End Region
 
-        <Test()>
-        Public Sub CreateNewCompressorMapInstanceTest()
-            Dim pat As String = "test"
-            Dim target As CompressorMap = New CompressorMap(pat)
-        End Sub
-
-
-        <Test()>
-        Public Sub InitialisationTest()
-            Dim target As CompressorMap = GetMap()
-            Assert.IsTrue(target.Initialise())
-        End Sub
-
-        <Test(), ExpectedException("System.ArgumentException")>
-        Public Sub InitialisationNoFileSuppliedThrowsExceptionTest()
-            Dim path As String = ""
-            Dim target As CompressorMap = New CompressorMap(path)
-            Assert.IsTrue(target.Initialise())
-        End Sub
-
-        <Test(), ExpectedException("System.ArgumentException")>
-        Public Sub InitialisationWrongNumberOfColumnsThrowsExceptionTest()
-            Dim path As String = INVALIDNUMBEROFCOLUMNS
-            Dim target As CompressorMap = New CompressorMap(path)
-            target.Initialise()
-        End Sub
-
-        <Test(), ExpectedException("System.InvalidCastException")>
-        Public Sub InitialisationInvalidRpmThrowsExceptionTest()
-            Dim path As String = INVALIDRPMMAP
-            Dim target As CompressorMap = New CompressorMap(path)
-            target.Initialise()
-        End Sub
-
-        <Test(), ExpectedException("System.InvalidCastException")>
-        Public Sub InitialisationInvalidFlowRateThrowsExceptionTest()
-            Dim path As String = INVALIDFLOWRATEMAP
-            Dim target As CompressorMap = New CompressorMap(path)
-            target.Initialise()
-        End Sub
-
-        <Test(), ExpectedException("System.InvalidCastException")>
-        Public Sub InitialisationInvalidPowerCompressorOnThrowsExceptionTest()
-            Dim path As String = INVALIDPOWERCOMPRESSORONMAP
-            Dim target As CompressorMap = New CompressorMap(path)
-            target.Initialise()
-        End Sub
-
-        <Test(), ExpectedException("System.InvalidCastException")>
-        Public Sub InitialisationInvalidPowerCompressorOffThrowsExceptionTest()
-            Dim path As String = INVALIDPOWERCOMPRESSOROFFMAP
-            Dim target As CompressorMap = New CompressorMap(path)
-            target.Initialise()
-        End Sub
-
-        <Test(), ExpectedException("System.ArgumentException")>
-        Public Sub InitialisationInsufficientRowsThrowsExceptionTest()
-            Dim path As String = INSSUFICIENTROWSMAP
-            Dim target As CompressorMap = New CompressorMap(path)
-            target.Initialise()
-        End Sub
-
-
-        <Test()>
-        Public Sub GetFlowRateKeyPassedTest()
-            Dim target As CompressorMap = GetInitialiseMap()
-            Dim expected As Single = 400
-            Dim value As Single = target.GetFlowRate(2000)
-            Assert.AreEqual(expected, value)
-        End Sub
-
-        <Test()>
-        Public Sub GetFlowRateInterpolaitionTest()
-            Dim target As CompressorMap = GetInitialiseMap()
-            Dim expected As Single = 500
-            Dim value As Single = target.GetFlowRate(2500)
-            Assert.AreEqual(expected, value)
-        End Sub
-
-
-
-
-
-        <Test()>
-        Public Sub GetPowerCompressorOnInterpolaitionTest()
-            Dim target As CompressorMap = GetInitialiseMap()
-            Dim expected As Single = 5000
-            Dim value As Single = target.GetPowerCompressorOn(2500)
-            Assert.AreEqual(expected, value)
-        End Sub
-
-
-
-
-        <Test()>
-        Public Sub GetPowerCompressorOffInterpolaitionTest()
-            Dim target As CompressorMap = GetInitialiseMap()
-            Dim expected As Single = 2500
-            Dim value As Single = target.GetPowerCompressorOff(2500)
-            Assert.AreEqual(expected, value)
-        End Sub
-
-
-
-        <Test()>
-        Public Sub InterpMiddle()
-
-            Dim target As CompressorMap = New CompressorMap(GOODMAP)
-            Assert.IsTrue(target.Initialise())
-
-            Dim actual = target.GetFlowRate(1750)
-
-            Assert.AreEqual( actual,300)
-
-        End Sub
-
-
-    End Class
-
+		<Test()>
+		Public Sub CreateNewCompressorMapInstanceTest()
+			Dim pat As String = "test"
+			Dim target As CompressorMap = New CompressorMap(pat)
+		End Sub
+
+
+		<Test()>
+		Public Sub InitialisationTest()
+			Dim target As CompressorMap = GetMap()
+			Assert.IsTrue(target.Initialise())
+		End Sub
+
+		<Test(), ExpectedException("System.ArgumentException")>
+		Public Sub InitialisationNoFileSuppliedThrowsExceptionTest()
+			Dim path As String = ""
+			Dim target As CompressorMap = New CompressorMap(path)
+			Assert.IsTrue(target.Initialise())
+		End Sub
+
+		<Test(), ExpectedException("System.ArgumentException")>
+		Public Sub InitialisationWrongNumberOfColumnsThrowsExceptionTest()
+			Dim path As String = INVALIDNUMBEROFCOLUMNS
+			Dim target As CompressorMap = New CompressorMap(path)
+			target.Initialise()
+		End Sub
+
+		<Test(), ExpectedException("System.InvalidCastException")>
+		Public Sub InitialisationInvalidRpmThrowsExceptionTest()
+			Dim path As String = INVALIDRPMMAP
+			Dim target As CompressorMap = New CompressorMap(path)
+			target.Initialise()
+		End Sub
+
+		<Test(), ExpectedException("System.InvalidCastException")>
+		Public Sub InitialisationInvalidFlowRateThrowsExceptionTest()
+			Dim path As String = INVALIDFLOWRATEMAP
+			Dim target As CompressorMap = New CompressorMap(path)
+			target.Initialise()
+		End Sub
+
+		<Test(), ExpectedException("System.InvalidCastException")>
+		Public Sub InitialisationInvalidPowerCompressorOnThrowsExceptionTest()
+			Dim path As String = INVALIDPOWERCOMPRESSORONMAP
+			Dim target As CompressorMap = New CompressorMap(path)
+			target.Initialise()
+		End Sub
+
+		<Test(), ExpectedException("System.InvalidCastException")>
+		Public Sub InitialisationInvalidPowerCompressorOffThrowsExceptionTest()
+			Dim path As String = INVALIDPOWERCOMPRESSOROFFMAP
+			Dim target As CompressorMap = New CompressorMap(path)
+			target.Initialise()
+		End Sub
+
+		<Test(), ExpectedException("System.ArgumentException")>
+		Public Sub InitialisationInsufficientRowsThrowsExceptionTest()
+			Dim path As String = INSSUFICIENTROWSMAP
+			Dim target As CompressorMap = New CompressorMap(path)
+			target.Initialise()
+		End Sub
+
+
+		<Test()>
+		Public Sub GetFlowRateKeyPassedTest()
+			Dim target As CompressorMap = GetInitialiseMap()
+			Dim expected As Single = 400
+			Dim value As NormLiterPerSecond = target.GetFlowRate(2000)
+			Assert.AreEqual(expected, value.Value(), 0.001)
+		End Sub
+
+		<Test()>
+		Public Sub GetFlowRateInterpolaitionTest()
+			Dim target As CompressorMap = GetInitialiseMap()
+			Dim expected As Single = 500
+			Dim value As NormLiterPerSecond = target.GetFlowRate(2500)
+			Assert.AreEqual(expected, value.Value(), 0.001)
+		End Sub
+
+
+		<Test()>
+		Public Sub GetPowerCompressorOnInterpolaitionTest()
+			Dim target As CompressorMap = GetInitialiseMap()
+			Dim expected As Single = 5000
+			Dim value As Watt = target.GetPowerCompressorOn(2500)
+			Assert.AreEqual(expected, value.Value(), 0.001)
+		End Sub
+
+
+		<Test()>
+		Public Sub GetPowerCompressorOffInterpolaitionTest()
+			Dim target As CompressorMap = GetInitialiseMap()
+			Dim expected As Single = 2500
+			Dim value As Watt = target.GetPowerCompressorOff(2500)
+			Assert.AreEqual(expected, value.Value(), 0.001)
+		End Sub
+
+
+		<Test()>
+		Public Sub InterpMiddle()
+
+			Dim target As CompressorMap = New CompressorMap(GOODMAP)
+			Assert.IsTrue(target.Initialise())
+
+			Dim actual = target.GetFlowRate(1750)
+
+			Assert.AreEqual(300, actual.Value(), 0.001)
+		End Sub
+	End Class
 End Namespace
\ No newline at end of file
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerListTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerListTests.vb
index c72c90a42a..76d9d1b63a 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerListTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerListTests.vb
@@ -1,65 +1,57 @@
 Imports NUnit.Framework
+Imports TUGraz.VectoCommon.Utils
 Imports VectoAuxiliaries.Electrics
 
 <TestFixture()>
 Public Class ElectricalConsumerListTests
+	Private TestConsumerList As ElectricalConsumerList = New ElectricalConsumerList(26.3, 0.096, True)
 
-Private TestConsumerList As ElectricalConsumerList = New ElectricalConsumerList(26.3,0.096,True)
 
+	Sub New()
+	End Sub
 
-Sub New()
 
-End Sub
+	<Test()>
+	Public Sub CreateNewTest()
 
+		Dim target As New ElectricalConsumerList(26.3, 0.096, True)
 
-<Test()>
-Public Sub CreateNewTest()
+		Assert.IsNotNull(target)
+	End Sub
 
-   Dim target As New ElectricalConsumerList(26.3,0.096, True)
 
-   Assert.IsNotNull(target)
+	<Test()>
+	Public Sub SumAllConsumersTest()
 
-End Sub
+		TestConsumerList.Items.First(Function(item) item.ConsumerName = "Controllers,Valves etc").NumberInActualVehicle = 1
 
+		Dim actual As Ampere = TestConsumerList.GetTotalAverageDemandAmps(False)
 
-<Test()>
-Public Sub SumAllConsumersTest()
+		TestConsumerList.Items.First(Function(item) item.ConsumerName = "Controllers,Valves etc").NumberInActualVehicle = 0
 
-     TestConsumerList.Items.First(Function(item) item.ConsumerName= "Controllers,Valves etc").NumberInActualVehicle=1
+		Dim expected = 60.63
 
-     Dim actual As Single = TestConsumerList.GetTotalAverageDemandAmps( False)
+		Assert.AreEqual(expected, actual.Value(), 0.01)
+	End Sub
 
-     TestConsumerList.Items.First(Function(item) item.ConsumerName= "Controllers,Valves etc").NumberInActualVehicle=0
+	<Test()>
+	Public Sub SumNonExcludedConsumersTest()
 
-     Dim expected = 60.63
-
-     Assert.AreEqual(expected, Math.Round(actual,2))
-
-End Sub
-
-<Test()>
-Public Sub SumNonExcludedConsumersTest()
-
-     TestConsumerList.Items.First(Function(item) item.ConsumerName= "Controllers,Valves etc").NumberInActualVehicle=1
-     Dim actual As Single = TestConsumerList.GetTotalAverageDemandAmps(True)
-     TestConsumerList.Items.First(Function(item) item.ConsumerName= "Controllers,Valves etc").NumberInActualVehicle=0
-     Dim expected = 35.63
-     Assert.AreEqual(expected, Math.Round(actual,2))
-
-End Sub
-
-
-<Test()>            
-<ExpectedException("System.ArgumentException")>  _
-Public Sub DuplicateConsumersTest_ThrowsArgumentException()
-
-   Dim target As New ElectricalConsumerList(0.096,26.3)
-   'Add two OnBaseVehicle consumers
-   target.AddConsumer(New ElectricalConsumer(True, "TEST", "Exclude1", 10, 1, 26.3, 1,""))
-   target.AddConsumer(New ElectricalConsumer(True, "TEST", "Exclude1", 10, 1, 26.3, 1,""))
-
-End Sub
+		TestConsumerList.Items.First(Function(item) item.ConsumerName = "Controllers,Valves etc").NumberInActualVehicle = 1
+		Dim actual As Ampere = TestConsumerList.GetTotalAverageDemandAmps(True)
+		TestConsumerList.Items.First(Function(item) item.ConsumerName = "Controllers,Valves etc").NumberInActualVehicle = 0
+		Dim expected = 35.63
+		Assert.AreEqual(expected, actual.Value(), 0.01)
+	End Sub
 
 
+	<Test()>
+	<ExpectedException("System.ArgumentException")>
+	Public Sub DuplicateConsumersTest_ThrowsArgumentException()
 
+		Dim target As New ElectricalConsumerList(0.096, 26.3)
+		'Add two OnBaseVehicle consumers
+		target.AddConsumer(New ElectricalConsumer(True, "TEST", "Exclude1", 10, 1, 26.3, 1, ""))
+		target.AddConsumer(New ElectricalConsumer(True, "TEST", "Exclude1", 10, 1, 26.3, 1, ""))
+	End Sub
 End Class
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerTests.vb
index e227cfb538..23c1fd81af 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerTests.vb
@@ -1,75 +1,82 @@
 Imports VectoAuxiliaries.Electrics
 Imports NUnit.Framework
+Imports TUGraz.VectoCommon.Utils
 
 Namespace UnitTests
-
-    <TestFixture()>
-    Public Class ElectricalConsumerTests
+	<TestFixture()>
+	Public Class ElectricalConsumerTests
 
 #Region "Helpers"
 
-
-
-        Public Function GetGoodConsumer() As ElectricalConsumer
-            Return New ElectricalConsumer(False, "Doors", "Doors per Door", 20, 0.5, 26.3, 1,"")
-        End Function
+		Public Function GetGoodConsumer() As ElectricalConsumer
+			Return New ElectricalConsumer(False, "Doors", "Doors per Door", 20, 0.5, 26.3, 1, "")
+		End Function
 
 #End Region
 
 
-        <Test()>
-        Public Sub CreateNewTest()
-            Dim target As ElectricalConsumer = GetGoodConsumer()
-            Assert.IsNotNull(target)
-        End Sub
-
-      '  <Test(), ExpectedException("System.ArgumentException")>
-
-      <Test(), ExpectedException("System.ArgumentException")>
-      Public Sub ZeroLengthConsumerNameTest()
-
-        Dim target As New ElectricalConsumer(False, "Doors", "", 20, 0.5, 26.3, 1,"")
+		<Test()>
+		Public Sub CreateNewTest()
+			Dim target As ElectricalConsumer = GetGoodConsumer()
+			Assert.IsNotNull(target)
+		End Sub
 
-      End Sub
+		'  <Test(), ExpectedException("System.ArgumentException")>
 
-      <Test(), ExpectedException("System.ArgumentException")>
-      Public Sub ZeroLengthCategoryNameTest_ThrowsArgumentException()
+		<Test(), ExpectedException("System.ArgumentException")>
+		Public Sub ZeroLengthConsumerNameTest()
 
-        Dim target As New ElectricalConsumer(False, "", "Doors per Door", 20, 0.5, 26.3, 1,"")
+			Dim target As New ElectricalConsumer(False, "Doors", "", 20, 0.5, 26.3, 1, "")
+		End Sub
 
-      End Sub
+		<Test(), ExpectedException("System.ArgumentException")>
+		Public Sub ZeroLengthCategoryNameTest_ThrowsArgumentException()
 
+			Dim target As New ElectricalConsumer(False, "", "Doors per Door", 20, 0.5, 26.3, 1, "")
+		End Sub
 
-      'TooLow     NominalConsumption
-      'TooHigh    NominalConsumption
 
+		'TooLow     NominalConsumption
+		'TooHigh    NominalConsumption
 
-      <Test(), ExpectedException("System.ArgumentException")>
-      Public Sub ToLow_PhaseIdleTractionOn_ThrowsArgumentException()
-            Dim target As New ElectricalConsumer(False, "", "Doors per Door", 20, ElectricConstants.PhaseIdleTractionOnMin - 1, 26.3, 1,"")
-      End Sub
 
-      <Test(), ExpectedException("System.ArgumentException")>
-      Public Sub ToHigh_PhaseIdleTractionOn_ThrowsArgumentException()
-            Dim target As New ElectricalConsumer(False, "", "Doors per Door", 20, ElectricConstants.PhaseIdleTractionMax + 1, 26.3, 1,"")
-      End Sub
+		<Test(), ExpectedException("System.ArgumentException")>
+		Public Sub ToLow_PhaseIdleTractionOn_ThrowsArgumentException()
+			Dim _
+				target As _
+					New ElectricalConsumer(False, "", "Doors per Door", 20, ElectricConstants.PhaseIdleTractionOnMin - 1,
+											26.3, 1, "")
+		End Sub
 
+		<Test(), ExpectedException("System.ArgumentException")>
+		Public Sub ToHigh_PhaseIdleTractionOn_ThrowsArgumentException()
+			Dim _
+				target As _
+					New ElectricalConsumer(False, "", "Doors per Door", 20, ElectricConstants.PhaseIdleTractionMax + 1,
+											26.3, 1, "")
+		End Sub
 
-      <Test(), ExpectedException("System.ArgumentException")>
-      Public Sub ToLowNumberInVehicle_ThrowsArgumentException()
-            Dim target As New ElectricalConsumer(False, "", "Doors per Door", 20, 0.5, 26.3, -1,"")
-      End Sub
 
-      'TooLow     PowerNetVoltage
-      <Test(), ExpectedException("System.ArgumentException")>
-      Public Sub ToLowPowerNetVoltageTest_ThrowsArgumentException()
-            Dim target As New ElectricalConsumer(False, "", "Doors per Door", 20, 0.5, ElectricConstants.PowenetVoltageMin - 1, 1,"")
-      End Sub
+		<Test(), ExpectedException("System.ArgumentException")>
+		Public Sub ToLowNumberInVehicle_ThrowsArgumentException()
+			Dim target As New ElectricalConsumer(False, "", "Doors per Door", 20, 0.5, 26.3, -1, "")
+		End Sub
 
-      'TooHigh    PowerNetVoltage
-      Public Sub ToHighPowerNetVoltageTest_ThrowsArgumentException()
-            Dim target As New ElectricalConsumer(False, "", "Doors per Door", 20, 0.5, ElectricConstants.PowenetVoltageMax + 1, 1,"")
-      End Sub
+		'TooLow     PowerNetVoltage
+		<Test(), ExpectedException("System.ArgumentException")>
+		Public Sub ToLowPowerNetVoltageTest_ThrowsArgumentException()
+			Dim _
+				target As _
+					New ElectricalConsumer(False, "", "Doors per Door", 20, 0.5,
+											(ElectricConstants.PowenetVoltageMin - 1), 1, "")
+		End Sub
 
-    End Class
+		'TooHigh    PowerNetVoltage
+		Public Sub ToHighPowerNetVoltageTest_ThrowsArgumentException()
+			Dim _
+				target As _
+					New ElectricalConsumer(False, "", "Doors per Door", 20, 0.5,
+											(ElectricConstants.PowenetVoltageMax + 1), 1, "")
+		End Sub
+	End Class
 End Namespace
\ No newline at end of file
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
index 6e23f9ad6e..c95a2a6eff 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
@@ -2,137 +2,122 @@
 Imports VectoAuxiliaries.Hvac
 Imports VectoAuxiliaries
 Imports NUnit.Framework
+Imports TUGraz.VectoCommon.Utils
 
 Namespace UnitTests
+	<TestFixture()>
+	Public Class M0_5_SmartAlternatorSetEfficiencyTests
+		Private target As M0_5_SmartAlternatorSetEfficiency
+		Private signals = New Signals
 
-<TestFixture()>
-Public Class M0_5_SmartAlternatorSetEfficiencyTests
+		Public Sub New()
 
-Private target As M0_5_SmartAlternatorSetEfficiency
-Private signals  = New Signals
+			Initialise()
+		End Sub
 
-Public Sub new()
 
-Initialise()
+		Private Function GetSSM() As ISSMTOOL
 
-End Sub
 
-
-Private Function GetSSM() As ISSMTOOL
-
-
-  Const _SSMMAP As String = "TestFiles\ssm.Ahsm
+			Const _SSMMAP As String = "TestFiles\ssm.Ahsm"
 			'Const _BusDatabase As String ="TestFiles\BusDatabase.abdb
 
-            Dim ssm As ISSMTOOL = New SSMTOOL(_SSMMAP, New HVACConstants())
-
-
-  ssm.Load( _SSMMAP)
-
-
-   Return ssm
-
+			Dim ssm As ISSMTOOL = New SSMTOOL(_SSMMAP, New HVACConstants())
 
-End Function
 
-Private sub Initialise()
+			ssm.Load(_SSMMAP)
 
 
-Dim ssm As ISSMTOOL = GetSSM()
-Dim elecConsumers As New ElectricalConsumerList(26.3,0.096,True)
+			Return ssm
+		End Function
 
-'Dim  hvacMap As New HVACMap("testFiles\TestHvacMap.csv")
-'hvacMap.Initialise()
-Dim alternatoMap As New AlternatorMap("testFiles\testAlternatormap.aalt")
-alternatoMap.Initialise()
+		Private Sub Initialise()
 
-Dim signals = New Signals()
-signals.EngineSpeed=2000
 
-Dim m0 As New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers,alternatoMap,26.3,signals,ssm)
+			Dim ssm As ISSMTOOL = GetSSM()
+			Dim elecConsumers As New ElectricalConsumerList(26.3, 0.096, True)
 
-'Results Cards
-Dim readings = new List(of SmartResult)
-readings.Add(new SmartResult(10,8))
-readings.Add(New SmartResult(70,63))
+			'Dim  hvacMap As New HVACMap("testFiles\TestHvacMap.csv")
+			'hvacMap.Initialise()
+			Dim alternatoMap As New AlternatorMap("testFiles\testAlternatormap.aalt")
+			alternatoMap.Initialise()
 
-Dim idleResult As New ResultCard(readings)
-Dim tractionResult As New ResultCard(readings)
-Dim overrunResult As New ResultCard(readings)
+			Dim signals = New Signals()
+			signals.EngineSpeed = 2000
 
+			Dim m0 As New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers, alternatoMap, 26.3.SI(Of Volt), signals, ssm)
 
-  signals.EngineSpeed=2000
-  target = New M0_5_SmartAlternatorSetEfficiency(m0,elecConsumers,alternatoMap,idleResult,tractionResult,overrunResult, signals)
+			'Results Cards
+			Dim readings = New List(Of SmartResult)
+			readings.Add(New SmartResult(10, 8))
+			readings.Add(New SmartResult(70, 63))
 
-End Sub
+			Dim idleResult As New ResultCard(readings)
+			Dim tractionResult As New ResultCard(readings)
+			Dim overrunResult As New ResultCard(readings)
 
-<Test()> _
-Public Sub CreateNewTest()
-   Initialise()
-   Assert.IsNotNull( target)
-End Sub
 
-<Test()> _
-Public Sub SmartIdleCurrentTest()
-   Initialise()
-   Assert.IsNotNull( target)
-End Sub
+			signals.EngineSpeed = 2000
+			target = New M0_5_SmartAlternatorSetEfficiency(m0, elecConsumers, alternatoMap, idleResult, tractionResult,
+															overrunResult, signals)
+		End Sub
 
-<Test()> _
-Public Sub SmartTractionCurrentTest()
-   Initialise()
-   Assert.IsNotNull( target)
-End Sub
+		<Test()>
+		Public Sub CreateNewTest()
+			Initialise()
+			Assert.IsNotNull(target)
+		End Sub
 
-<Test()> _
-Public Sub SmartOverrunCurrentTest()
-   Initialise()
-   Assert.IsNotNull( target)
-End Sub
+		<Test()>
+		Public Sub SmartIdleCurrentTest()
+			Initialise()
+			Assert.IsNotNull(target)
+		End Sub
 
-<Test()> _
-Public Sub AlternatorsEfficiencyIdle2000rpmTest()
-   Initialise()
+		<Test()>
+		Public Sub SmartTractionCurrentTest()
+			Initialise()
+			Assert.IsNotNull(target)
+		End Sub
 
-            Dim expected As Single = 0.6308339
-   Dim actual As Single = target.AlternatorsEfficiencyIdleResultCard()
+		<Test()>
+		Public Sub SmartOverrunCurrentTest()
+			Initialise()
+			Assert.IsNotNull(target)
+		End Sub
 
-   Assert.AreEqual(expected, actual)
-   
+		<Test()>
+		Public Sub AlternatorsEfficiencyIdle2000rpmTest()
+			Initialise()
 
-End Sub
+			Dim expected As Double = 0.6308339
+			Dim actual As Double = target.AlternatorsEfficiencyIdleResultCard()
 
+			Assert.AreEqual(expected, actual, 0.000001)
+		End Sub
 
-<Test()> _
-Public Sub AlternatorsEfficiencyTraction2000rpmTest()
-   Initialise()
 
-            Dim expected As Single = 0.6308339
-   Dim actual As Single = target.AlternatorsEfficiencyTractionOnResultCard()
+		<Test()>
+		Public Sub AlternatorsEfficiencyTraction2000rpmTest()
+			Initialise()
 
-   Assert.AreEqual(expected, actual)
+			Dim expected As Double = 0.6308339
+			Dim actual As Double = target.AlternatorsEfficiencyTractionOnResultCard()
 
-End Sub
+			Assert.AreEqual(expected, actual, 0.000001)
+		End Sub
 
 
-<Test()> _
-Public Sub AlternatorsEfficiencyOverrun2000rpmTest()
-   Initialise()
-
-            Dim expected As Single = 0.6308339
-   Dim actual As Single = target.AlternatorsEfficiencyOverrunResultCard()
-
-   Assert.AreEqual(expected, actual)
-
-End Sub
-
-
-
-End Class
+		<Test()>
+		Public Sub AlternatorsEfficiencyOverrun2000rpmTest()
+			Initialise()
 
+			Dim expected As Double = 0.6308339
+			Dim actual As Double = target.AlternatorsEfficiencyOverrunResultCard()
 
+			Assert.AreEqual(expected, actual, 0.000001)
+		End Sub
+	End Class
 End Namespace
 
 
-
-
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
index 11112d24ed..86e950a2d2 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
@@ -1,4 +1,5 @@
 Imports NUnit.Framework
+Imports TUGraz.VectoCommon.Utils
 Imports VectoAuxiliaries
 Imports VectoAuxiliaries.Pneumatics
 Imports VectoAuxiliariesTests.Mocks
@@ -6,94 +7,90 @@ Imports VectoAuxiliaries.Electrics
 Imports VectoAuxiliaries.Hvac
 
 Namespace UnitTests
+	<TestFixture()>
+	Public Class M0_NonSmart_AlternatorsSetEfficiencyTests
+		Private Const cstrAlternatorsEfficiencyMapLocation As String = "tests\testAlternatorMap.aalt"
+		Private Const cstrHVACMapLocation As String = "TestFiles\TestHvacMap.csv"
+		Private Const cstrAlternatorMap As String = "TestFiles\testAlternatorMap.aalt"
 
-    <TestFixture()>
-    Public Class M0_NonSmart_AlternatorsSetEfficiencyTests
+		Private elecConsumers As IElectricalConsumerList
 
-        Private Const cstrAlternatorsEfficiencyMapLocation As String = "tests\testAlternatorMap.aalt"
-        Private Const cstrHVACMapLocation As String = "TestFiles\TestHvacMap.csv"
-        Private Const cstrAlternatorMap As String = "TestFiles\testAlternatorMap.aalt"
+		Private alternatorMap As IAlternatorMap
+		Private signals As Signals = New Signals
+		Private powernetVoltage As Volt = 26.3.SI(Of Volt)()
+		Private ssm As IHVACSteadyStateModel = New HVACSteadyStateModel(100, 100, 100)
 
-        Private elecConsumers As IElectricalConsumerList
+		Private Function GetSSM() As ISSMTOOL
 
-        Private alternatorMap As IAlternatorMap
-        Private signals As Signals = New Signals
-        Private powernetVoltage As Single = 26.3
-        Private ssm As IHVACSteadyStateModel = New HVACSteadyStateModel(100, 100, 100)
+			Const _SSMMAP As String = "TestFiles\ssm.Ahsm"
 
-        Private Function GetSSM() As ISSMTOOL
+			Dim ssm As ISSMTOOL = New SSMTOOL(_SSMMAP, New HVACConstants())
+			ssm.Load(_SSMMAP)
 
-            Const _SSMMAP As String = "TestFiles\ssm.Ahsm"
+			Return ssm
+		End Function
 
-            Dim ssm As ISSMTOOL = New SSMTOOL(_SSMMAP, New HVACConstants())
-            ssm.Load(_SSMMAP)
+		Public Sub New()
 
-            Return ssm
+			signals.EngineSpeed = 2000
 
-        End Function
+			'Setup consumers and HVAC ( 1 Consumer in Test Category )
+			elecConsumers = CType(New ElectricalConsumerList(0.096, 26.3), IElectricalConsumerList)
+			elecConsumers.AddConsumer(New ElectricalConsumer(False, "TEST", "CONSUMER1", 20, 0.5,
+															26.3, 1, ""))
 
-        Public Sub New()
+			'Alternator Map
+			alternatorMap = CType(New AlternatorMap(cstrAlternatorMap), IAlternatorMap)
+			alternatorMap.Initialise()
+		End Sub
 
-            signals.EngineSpeed = 2000
+		<Test()>
+		Public Sub CreateNewTest()
+			Dim target As M0_NonSmart_AlternatorsSetEfficiency = New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers,
+																										alternatorMap, powernetVoltage, signals, GetSSM())
+			Assert.IsNotNull(target)
+		End Sub
 
-            'Setup consumers and HVAC ( 1 Consumer in Test Category )
-            elecConsumers = CType(New ElectricalConsumerList(0.096, 26.3), IElectricalConsumerList)
-            elecConsumers.AddConsumer(New ElectricalConsumer(False, "TEST", "CONSUMER1", 20, 0.5, 26.3, 1, ""))
+		<Test()>
+		<ExpectedException("System.ArgumentException")>
+		Public Sub CreateNew_MissingElecConsumers_ThrowArgumentExceptionTest()
+			Dim target As M0_NonSmart_AlternatorsSetEfficiency = New M0_NonSmart_AlternatorsSetEfficiency(Nothing, alternatorMap,
+																										powernetVoltage, signals, GetSSM())
+		End Sub
 
-            'Alternator Map
-            alternatorMap = CType(New AlternatorMap(cstrAlternatorMap), IAlternatorMap)
-            alternatorMap.Initialise()
+		<Test()>
+		<ExpectedException("System.ArgumentException")>
+		Public Sub CreateNew_MissingAlternatorMap_ThrowArgumentExceptionTest()
+			Dim target As M0_NonSmart_AlternatorsSetEfficiency = New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers, Nothing,
+																										powernetVoltage, signals, GetSSM())
+		End Sub
 
-        End Sub
+		<Test()>
+		Public Sub EfficiencyValueTest()
+			Dim target As M0_NonSmart_AlternatorsSetEfficiency = New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers,
+																										alternatorMap, powernetVoltage, signals, GetSSM())
 
-        <Test()>
-        Public Sub CreateNewTest()
-            Dim target As M0_NonSmart_AlternatorsSetEfficiency = New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers, alternatorMap, powernetVoltage, signals, GetSSM())
-            Assert.IsNotNull(target)
-        End Sub
+			Dim actual As Single = target.AlternatorsEfficiency
 
-        <Test()>
-        <ExpectedException("System.ArgumentException")>
-        Public Sub CreateNew_MissingElecConsumers_ThrowArgumentExceptionTest()
-            Dim target As M0_NonSmart_AlternatorsSetEfficiency = New M0_NonSmart_AlternatorsSetEfficiency(Nothing, alternatorMap, powernetVoltage, signals, GetSSM())
-        End Sub
+			Dim expected As Single = 0.62
 
-        <Test()>
-        <ExpectedException("System.ArgumentException")>
-        Public Sub CreateNew_MissingAlternatorMap_ThrowArgumentExceptionTest()
-            Dim target As M0_NonSmart_AlternatorsSetEfficiency = New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers, Nothing, powernetVoltage, signals, GetSSM())
-        End Sub
+			Assert.AreEqual(expected, actual, 0.001)
+		End Sub
 
-        <Test()>
-        Public Sub EfficiencyValueTest()
-            Dim target As M0_NonSmart_AlternatorsSetEfficiency = New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers, alternatorMap, powernetVoltage, signals, GetSSM())
+		<Test()>
+		Public Sub HVAC_PowerDemandAmpsTest()
 
-            Dim actual As Single = target.AlternatorsEfficiency
+			Dim target As M0_NonSmart_AlternatorsSetEfficiency = New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers,
+																										alternatorMap, powernetVoltage, signals, GetSSM())
 
-            Dim expected As Single = 0.62
+			Dim actual As Ampere
+			Dim expected As Single = 0
 
-            Assert.AreEqual(expected, actual)
-
-
-        End Sub
-
-        <Test()>
-        Public Sub HVAC_PowerDemandAmpsTest()
-
-            Dim target As M0_NonSmart_AlternatorsSetEfficiency = New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers, alternatorMap, powernetVoltage, signals, GetSSM())
-
-            Dim actual As Single
-            Dim expected As Single = 0
-
-            actual = target.GetHVACElectricalPowerDemandAmps()
-
-            Assert.AreEqual(expected, actual)
-
-        End Sub
-
-    End Class
+			actual = target.GetHVACElectricalPowerDemandAmps()
 
+			Assert.AreEqual(expected, actual.Value(), 0.001)
+		End Sub
+	End Class
 End Namespace
 
 
-
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M10Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M10Tests.vb
index 83b1355303..8cf37b0d06 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M10Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M10Tests.vb
@@ -5,47 +5,37 @@ Imports VectoAuxiliaries.DownstreamModules
 Imports NUnit.Framework
 Imports VectoAuxiliaries
 Imports Moq
+Imports TUGraz.VectoCommon.Utils
 
 Namespace UnitTests
-
-<TestFixture()> 
-Public Class M10Test
-
-
-
-<Test()> _
-<TestCase(8,8,0,2,4,2,5,5.75f,3.5f)> _
-Public Sub InterpolationTests( x1 As Single ,y1 As Single ,x2 As single,y2 As single,x3 As single,y3 As single,xTAir As single, out1 As single, out2 as single)
-
-Dim m3 As new Mock( Of IM3_AveragePneumaticLoadDemand)
-Dim m9 As new Mock( Of IM9)
-Dim signals As New Signals() ' Not required , here for expansion only.
-
-m3.Setup( Function(x) x.AverageAirConsumedPerSecondLitre).Returns( xTAir )
-m9.Setup( Function(x) x.LitresOfAirCompressorOnContinually).Returns(x1)
-m9.Setup( Function(x) x.TotalCycleFuelConsumptionCompressorOnContinuously).Returns(y1)
-'x2 is not an output of m9, an is allways zero, but to keep in line with schematic, is represented anyway although it is a constant.
-m9.Setup( Function(x) x.TotalCycleFuelConsumptionCompressorOffContinuously).Returns( y2)
-m9.Setup( Function(x) x.LitresOfAirCompressorOnOnlyInOverrun).Returns( x3)
-m9.Setup( Function(x) x.TotalCycleFuelConsumptionCompressorOffContinuously).Returns(y3)
-
-
-Dim target As IM10 = New M10(m3.Object,m9.Object,Signals)
-
-target.CycleStep(1)
-
-Assert.AreEqual(out1, target.AverageLoadsFuelConsumptionInterpolatedForPneumatics )
-Assert.AreEqual(out2, target.FuelConsumptionSmartPneumaticsAndAverageElectricalPowerDemand )
-
-
-
-
-End Sub
-
-
-End Class
-
+	<TestFixture()>
+	Public Class M10Test
+		<Test()> _
+		<TestCase(8, 8, 0, 2, 4, 2, 5, 5.75F, 3.5F)>
+		Public Sub InterpolationTests(x1 As Double, y1 As Double, x2 As Double, y2 As Double, x3 As Double, y3 As Double,
+									xTAir As Double, out1 As Double, out2 As Double)
+
+			Dim m3 As New Mock(Of IM3_AveragePneumaticLoadDemand)
+			Dim m9 As New Mock(Of IM9)
+			Dim signals As New Signals() ' Not required , here for expansion only.
+
+			m3.Setup(Function(x) x.AverageAirConsumedPerSecondLitre).Returns(xTAir.SI(Of NormLiterPerSecond))
+			m9.Setup(Function(x) x.LitresOfAirCompressorOnContinually).Returns(x1.SI(Of NormLiter))
+			m9.Setup(Function(x) x.TotalCycleFuelConsumptionCompressorOnContinuously).Returns(y1.SI(Of Gram))
+			'x2 is not an output of m9, an is allways zero, but to keep in line with schematic, is represented anyway although it is a constant.
+			m9.Setup(Function(x) x.TotalCycleFuelConsumptionCompressorOffContinuously).Returns(y2.SI(Of Gram))
+			m9.Setup(Function(x) x.LitresOfAirCompressorOnOnlyInOverrun).Returns(x3.SI(Of NormLiter))
+			m9.Setup(Function(x) x.TotalCycleFuelConsumptionCompressorOffContinuously).Returns(y3.SI(Of Gram))
+
+
+			Dim target As IM10 = New M10(m3.Object, m9.Object, signals)
+
+			target.CycleStep(1.SI(Of Second))
+
+			Assert.AreEqual(out1, target.AverageLoadsFuelConsumptionInterpolatedForPneumatics.Value(), 0.001)
+			Assert.AreEqual(out2, target.FuelConsumptionSmartPneumaticsAndAverageElectricalPowerDemand.Value(), 0.001)
+		End Sub
+	End Class
 End Namespace
 
 
-
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M11Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M11Tests.vb
index 1791559c24..8829b3227f 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M11Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M11Tests.vb
@@ -5,139 +5,124 @@ Imports VectoAuxiliaries.DownstreamModules
 Imports NUnit.Framework
 Imports VectoAuxiliaries
 Imports Moq
+Imports TUGraz.VectoCommon.Utils
 
 Namespace UnitTests
-<TestFixture()> _
-Public Class M11Tests
-
-<Test()> _
-<TestCase(0,50,60,70,80,90,1500,False , 0,50,60,0.2182501f,0.2182059f,60)> _
-<TestCase(1,50,60,70,80,90,1500,False ,50,50,60,0.2182501f,0.2182059f,60)> _
-<TestCase(1,50,60,70,80,90,1500,True  , 0, 0,60,0          ,0         ,0)> _
-Public Sub InputOutputValues( IP1  As single, 
-                              IP2  As single, 
-                              IP3  As single,
-                              IP4  As single, 
-                              IP5  As single, 
-                              IP6  As single,
-                              IP7  As single, 
-                              IP8  As Boolean,
-                              OUT1 As single, 
-                              OUT2 As single, 
-                              OUT3 As single, 
-                              OUT4 As single, 
-                              OUT5 As single,
-                              OUT6 As single)
-
-'Arrange
-
- Dim m1Mock     As New Mock(Of IM1_AverageHVACLoadDemand)
- Dim m3Mock     As New Mock(Of IM3_AveragePneumaticLoadDemand)
-
-
- Dim m6Mock     As New Mock(Of IM6)
- Dim m8Mock     As New Mock(Of IM8)
- Dim sgnlsMock  As New Mock(Of ISignals)
- Dim fmap       As New MockFuel50pc
-
-
-
-
- m6Mock   .Setup( Function(x)  x.OverrunFlag)                                       .Returns( IP1 )
- m8Mock   .Setup( Function(x)  x.SmartElectricalAlternatorPowerGenAtCrank)          .Returns( IP2 )
- m6Mock   .Setup( Function(x)  x.AvgPowerDemandAtCrankFromElectricsIncHVAC)         .Returns( IP3 )
- sgnlsMock.Setup( Function(x)  x.EngineDrivelineTorque)                             .Returns( IP4 )
- m3Mock   .Setup( Function(x)  x.GetAveragePowerDemandAtCrankFromPneumatics)        .Returns( IP5 )
- m1Mock   .Setup( Function(x)  x.AveragePowerDemandAtCrankFromHVACMechanicalsWatts) .Returns( IP6 )
- sgnlsMock.Setup( Function(x)  x.EngineSpeed)                                       .Returns( IP7 )
- sgnlsMock.Setup( Function(x)  x.EngineStopped)                                     .Returns( IP8 )
-
-
- 'Act
-  Dim target  = New M11( m1Mock.Object,m3Mock.Object, m6Mock.Object,m8Mock.Object,fmap ,sgnlsMock.Object)',m3Mock.Object,m6Mock.Object,m8Mock.Object,fmap,sgnlsMock.Object)
-        
- 'Add Current Calculation to Internal Aggregates ( Accesseed by public output properties which are external interface )
- target.CycleStep(1)
-
-
- 'Assert
- Assert.AreEqual( target.SmartElectricalTotalCycleElectricalEnergyGeneratedDuringOverrunOnly,OUT1)
- Assert.AreEqual( target.SmartElectricalTotalCycleEletricalEnergyGenerated,OUT2)
- Assert.AreEqual( target.TotalCycleElectricalDemand,OUT3)
- Assert.AreEqual( Math.Round(CType(target.TotalCycleFuelConsumptionSmartElectricalLoad,Decimal),7),OUT4)
- Assert.AreEqual( Math.Round(CType(target.TotalCycleFuelConsumptionZeroElectricalLoad,Decimal),7),OUT5)
- Assert.AreEqual( Math.Round(CType(target.StopStartSensitiveTotalCycleElectricalDemand,Decimal),7),OUT6)
-
-
-
-End Sub
-
-
-<Test()> _
-<TestCase(1,50,60,70,80,90,1500,True  , 0, 0,60,0          ,0         ,0)> 
-Public Sub UnaggregatedInputOutputValues( IP1  As single, 
-                              IP2  As single, 
-                              IP3  As single,
-                              IP4  As single, 
-                              IP5  As single, 
-                              IP6  As single,
-                              IP7  As single, 
-                              IP8  As Boolean,
-                              OUT1 As single, 
-                              OUT2 As single, 
-                              OUT3 As single, 
-                              OUT4 As single, 
-                              OUT5 As single,
-                              OUT6 As single)
-
-'Arrange
-
- Dim m1Mock     As New Mock(Of IM1_AverageHVACLoadDemand)
- Dim m3Mock     As New Mock(Of IM3_AveragePneumaticLoadDemand)
-
-
- Dim m6Mock     As New Mock(Of IM6)
- Dim m8Mock     As New Mock(Of IM8)
- Dim sgnlsMock  As New Mock(Of ISignals)
- Dim fmap       As New MockFuel50pc
-
-
-
-
- m6Mock   .Setup( Function(x)  x.OverrunFlag)                                       .Returns( IP1 )
- m8Mock   .Setup( Function(x)  x.SmartElectricalAlternatorPowerGenAtCrank)          .Returns( IP2 )
- m6Mock   .Setup( Function(x)  x.AvgPowerDemandAtCrankFromElectricsIncHVAC)         .Returns( IP3 )
- sgnlsMock.Setup( Function(x)  x.EngineDrivelineTorque)                             .Returns( IP4 )
- m3Mock   .Setup( Function(x)  x.GetAveragePowerDemandAtCrankFromPneumatics)        .Returns( IP5 )
- m1Mock   .Setup( Function(x)  x.AveragePowerDemandAtCrankFromHVACMechanicalsWatts) .Returns( IP6 )
- sgnlsMock.Setup( Function(x)  x.EngineSpeed)                                       .Returns( IP7 )
- sgnlsMock.Setup( Function(x)  x.EngineStopped)                                     .Returns( IP8 )
-
-
- 'Act
-  Dim target  = New M11( m1Mock.Object,m3Mock.Object, m6Mock.Object,m8Mock.Object,fmap ,sgnlsMock.Object)',m3Mock.Object,m6Mock.Object,m8Mock.Object,fmap,sgnlsMock.Object)
-
-
-  target.CycleStep(1)
-
- 'Assert
- Assert.AreEqual( target.SmartElectricalTotalCycleElectricalEnergyGeneratedDuringOverrunOnly,OUT1)
- Assert.AreEqual( target.SmartElectricalTotalCycleEletricalEnergyGenerated,OUT2)
- Assert.AreEqual( target.TotalCycleElectricalDemand,OUT3)
- Assert.AreEqual( Math.Round(CType(target.TotalCycleFuelConsumptionSmartElectricalLoad,Decimal),7),OUT4)
- Assert.AreEqual( Math.Round(CType(target.TotalCycleFuelConsumptionZeroElectricalLoad,Decimal),7),OUT5)
- Assert.AreEqual( Math.Round(CType(target.StopStartSensitiveTotalCycleElectricalDemand,Decimal),7),OUT6)
-
-
-
-End Sub
-
-
-End Class
-
-
-
+	<TestFixture()>
+	Public Class M11Tests
+		<Test()> _
+		<TestCase(0, 50, 60, 70, 80, 90, 1500, False, 0, 50, 60, 0.2182501F, 0.2182059, 60)> _
+		<TestCase(1, 50, 60, 70, 80, 90, 1500, False, 50, 50, 60, 0.2182501F, 0.2182059, 60)> _
+		<TestCase(1, 50, 60, 70, 80, 90, 1500, True, 0, 0, 60, 0, 0, 0)>
+		Public Sub InputOutputValues(IP1 As Double,
+									IP2 As Double,
+									IP3 As Double,
+									IP4 As Double,
+									IP5 As Double,
+									IP6 As Double,
+									IP7 As Double,
+									IP8 As Boolean,
+									OUT1 As Double,
+									OUT2 As Double,
+									OUT3 As Double,
+									OUT4 As Double,
+									OUT5 As Double,
+									OUT6 As Double)
+
+			'Arrange
+
+			Dim m1Mock As New Mock(Of IM1_AverageHVACLoadDemand)
+			Dim m3Mock As New Mock(Of IM3_AveragePneumaticLoadDemand)
+
+
+			Dim m6Mock As New Mock(Of IM6)
+			Dim m8Mock As New Mock(Of IM8)
+			Dim sgnlsMock As New Mock(Of ISignals)
+			Dim fmap As New MockFuel50PC
+
+
+			m6Mock.Setup(Function(x) x.OverrunFlag).Returns(IP1)
+			m8Mock.Setup(Function(x) x.SmartElectricalAlternatorPowerGenAtCrank).Returns(IP2.SI(Of Watt))
+			m6Mock.Setup(Function(x) x.AvgPowerDemandAtCrankFromElectricsIncHVAC).Returns(IP3.SI(Of Watt))
+			sgnlsMock.Setup(Function(x) x.EngineDrivelineTorque).Returns(IP4)
+			m3Mock.Setup(Function(x) x.GetAveragePowerDemandAtCrankFromPneumatics).Returns(IP5.SI(Of Watt))
+			m1Mock.Setup(Function(x) x.AveragePowerDemandAtCrankFromHVACMechanicalsWatts).Returns(IP6.SI(Of Watt))
+			sgnlsMock.Setup(Function(x) x.EngineSpeed).Returns(IP7)
+			sgnlsMock.Setup(Function(x) x.EngineStopped).Returns(IP8)
+
+
+			'Act
+			Dim target = New M11(m1Mock.Object, m3Mock.Object, m6Mock.Object, m8Mock.Object, fmap, sgnlsMock.Object) _
+			',m3Mock.Object,m6Mock.Object,m8Mock.Object,fmap,sgnlsMock.Object)
+
+			'Add Current Calculation to Internal Aggregates ( Accesseed by public output properties which are external interface )
+			target.CycleStep(1.SI(Of Second))
+
+
+			'Assert
+			Assert.AreEqual(target.SmartElectricalTotalCycleElectricalEnergyGeneratedDuringOverrunOnly.Value(), OUT1, 0.00001)
+			Assert.AreEqual(target.SmartElectricalTotalCycleEletricalEnergyGenerated.Value(), OUT2, 0.00001)
+			Assert.AreEqual(target.TotalCycleElectricalDemand.Value(), OUT3, 0.00001)
+			Assert.AreEqual(target.TotalCycleFuelConsumptionSmartElectricalLoad.Value(), OUT4, 0.00001)
+			Assert.AreEqual(target.TotalCycleFuelConsumptionZeroElectricalLoad.Value(), OUT5, 0.00001)
+			Assert.AreEqual(target.StopStartSensitiveTotalCycleElectricalDemand.Value(), OUT6, 0.00001)
+		End Sub
+
+
+		<Test()> _
+		<TestCase(1, 50, 60, 70, 80, 90, 1500, True, 0, 0, 60, 0, 0, 0)>
+		Public Sub UnaggregatedInputOutputValues(IP1 As Double,
+												IP2 As Double,
+												IP3 As Double,
+												IP4 As Double,
+												IP5 As Double,
+												IP6 As Double,
+												IP7 As Double,
+												IP8 As Boolean,
+												OUT1 As Double,
+												OUT2 As Double,
+												OUT3 As Double,
+												OUT4 As Double,
+												OUT5 As Double,
+												OUT6 As Double)
+
+			'Arrange
+
+			Dim m1Mock As New Mock(Of IM1_AverageHVACLoadDemand)
+			Dim m3Mock As New Mock(Of IM3_AveragePneumaticLoadDemand)
+
+
+			Dim m6Mock As New Mock(Of IM6)
+			Dim m8Mock As New Mock(Of IM8)
+			Dim sgnlsMock As New Mock(Of ISignals)
+			Dim fmap As New MockFuel50PC
+
+			m6Mock.Setup(Function(x) x.OverrunFlag).Returns(IP1)
+			m8Mock.Setup(Function(x) x.SmartElectricalAlternatorPowerGenAtCrank).Returns(IP2.SI(Of Watt))
+			m6Mock.Setup(Function(x) x.AvgPowerDemandAtCrankFromElectricsIncHVAC).Returns(IP3.SI(Of Watt))
+			sgnlsMock.Setup(Function(x) x.EngineDrivelineTorque).Returns(IP4)
+			m3Mock.Setup(Function(x) x.GetAveragePowerDemandAtCrankFromPneumatics).Returns(IP5.SI(Of Watt))
+			m1Mock.Setup(Function(x) x.AveragePowerDemandAtCrankFromHVACMechanicalsWatts).Returns(IP6.SI(Of Watt))
+			sgnlsMock.Setup(Function(x) x.EngineSpeed).Returns(IP7)
+			sgnlsMock.Setup(Function(x) x.EngineStopped).Returns(IP8)
+
+
+			'Act
+			Dim target = New M11(m1Mock.Object, m3Mock.Object, m6Mock.Object, m8Mock.Object, fmap, sgnlsMock.Object) _
+			',m3Mock.Object,m6Mock.Object,m8Mock.Object,fmap,sgnlsMock.Object)
+
+
+			target.CycleStep(1.SI(Of Second))
+
+			'Assert
+			Assert.AreEqual(target.SmartElectricalTotalCycleElectricalEnergyGeneratedDuringOverrunOnly.Value(), OUT1, 0.00001)
+			Assert.AreEqual(target.SmartElectricalTotalCycleEletricalEnergyGenerated.Value(), OUT2, 0.00001)
+			Assert.AreEqual(target.TotalCycleElectricalDemand.Value(), OUT3, 0.00001)
+			Assert.AreEqual(target.TotalCycleFuelConsumptionSmartElectricalLoad.Value(), OUT4, 0.00001)
+			Assert.AreEqual(target.TotalCycleFuelConsumptionZeroElectricalLoad.Value(), OUT5, 0.00001)
+			Assert.AreEqual(target.StopStartSensitiveTotalCycleElectricalDemand.Value(), OUT6, 0.00001)
+		End Sub
+	End Class
 End Namespace
 
 
-
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb
index 5e1c7332a4..7bc21271c6 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb
@@ -5,57 +5,47 @@ Imports VectoAuxiliaries.DownstreamModules
 Imports NUnit.Framework
 Imports VectoAuxiliaries
 Imports Moq
+Imports TUGraz.VectoCommon.Utils
 
 Namespace UnitTests
-<TestFixture()> _
-Public Class M12Tests
-
-<Test()> _
-<TestCase(2,8,6,5,8,6,4.67379665f,4.5f)> _
-Public Sub InputOutputValues( IP2  As single, 
-                              IP3  As single,
-                              IP4  As single, 
-                              IP5  As single, 
-                              IP6  As Single,
-                              IP7  As Single,
-                              OUT1 As single,
-                              OUT2 As single
-                              )
-
-'Arrange
- Dim M10Mock     As New Mock(Of IM10)
- Dim m11Mock     As New Mock(Of IM11)
-
- Dim sgnlsMock   As New Mock(Of ISignals)
-
-
-            sgnlsMock.Setup(Function(x) x.StoredEnergyEfficiency).Returns(0.935)
-
-m11Mock.Setup( Function(x) x.TotalCycleFuelConsumptionZeroElectricalLoad)          .Returns( IP2 )
-m11Mock.Setup( Function(x) x.SmartElectricalTotalCycleEletricalEnergyGenerated)    .Returns( IP3 )
-m11Mock.Setup( Function(x) x.TotalCycleFuelConsumptionSmartElectricalLoad)         .Returns( IP4 )
-m11Mock.Setup( Function(x) x.TotalCycleElectricalDemand)                           .Returns( IP5 )
-m11Mock.Setup( Function(x) x.StopStartSensitiveTotalCycleElectricalDemand)         .Returns( IP6 )
-M10Mock.Setup( Function(x) x.AverageLoadsFuelConsumptionInterpolatedForPneumatics) .Returns( IP7 )
-
- 'Act
-  Dim target  = New M12(M10Mock.Object, m11Mock.Object ,sgnlsMock.Object )
-        
- 'Assert
- Assert.AreEqual( target.FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDemand, OUT1 )
- Assert.AreEqual( target.BaseFuelConsumptionWithTrueAuxiliaryLoads,                    OUT2 )
-
-End Sub
-
-
-
-
-
-End Class
-
-
-
+	<TestFixture()>
+	Public Class M12Tests
+		<Test()> _
+		<TestCase(2, 8, 6, 5, 8, 6, 4.67379665, 4.5)>
+		Public Sub InputOutputValues(IP2 As Double,
+									IP3 As Double,
+									IP4 As Double,
+									IP5 As Double,
+									IP6 As Double,
+									IP7 As Double,
+									OUT1 As Double,
+									OUT2 As Double
+									)
+
+			'Arrange
+			Dim M10Mock As New Mock(Of IM10)
+			Dim m11Mock As New Mock(Of IM11)
+
+			Dim sgnlsMock As New Mock(Of ISignals)
+
+
+			sgnlsMock.Setup(Function(x) x.StoredEnergyEfficiency).Returns(0.935)
+
+			m11Mock.Setup(Function(x) x.TotalCycleFuelConsumptionZeroElectricalLoad).Returns(IP2.SI(Of Gram))
+			m11Mock.Setup(Function(x) x.SmartElectricalTotalCycleEletricalEnergyGenerated).Returns(IP3.SI(Of Joule))
+			m11Mock.Setup(Function(x) x.TotalCycleFuelConsumptionSmartElectricalLoad).Returns(IP4.SI(Of Gram))
+			m11Mock.Setup(Function(x) x.TotalCycleElectricalDemand).Returns(IP5.SI(Of Joule))
+			m11Mock.Setup(Function(x) x.StopStartSensitiveTotalCycleElectricalDemand).Returns(IP6.SI(Of Joule))
+			M10Mock.Setup(Function(x) x.AverageLoadsFuelConsumptionInterpolatedForPneumatics).Returns(IP7.SI(Of Gram))
+
+			'Act
+			Dim target = New M12(M10Mock.Object, m11Mock.Object, sgnlsMock.Object)
+
+			'Assert
+			Assert.AreEqual(target.FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDemand().Value(), OUT1, 0.001)
+			Assert.AreEqual(target.BaseFuelConsumptionWithTrueAuxiliaryLoads().Value(), OUT2, 0.001)
+		End Sub
+	End Class
 End Namespace
 
 
-
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb
index 671e30bd53..bf8736dcf0 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb
@@ -5,60 +5,58 @@ Imports VectoAuxiliaries.DownstreamModules
 Imports NUnit.Framework
 Imports VectoAuxiliaries
 Imports Moq
+Imports TUGraz.VectoCommon.Utils
 
 
 Namespace UnitTests
-    <TestFixture()> _
-    Public Class M13Tests
-
-        Private Const FUEL_DENSITY_percm3 As Single = 0.835
-
-
-        '<TestCase(50,	60,	70,	TRUE,	TRUE ,100, 1,False,	 72287.5f , 86.57185629f )> _
-
-        <Test()> _
-        <TestCase(50, 60, 70, False, False, 100, 1, False, 60.0F)> _
-        <TestCase(50, 60, 70, False, True, 100, 1, False, 110.0F)> _
-        <TestCase(50, 60, 70, True, False, 100, 1, False, 0.0F)> _
-        <TestCase(50, 60, 70, True, True, 100, 1, False, 110.0F)> _
-        <TestCase(50, 60, 70, True, True, 100, 2, True, 220.0F)> _
-        Public Sub InputOutputValues(IP1 As Single,
-                              IP2 As Single,
-                              IP3 As Single,
-                              IP4 As Boolean,
-                              IP5 As Boolean,
-                              IP6 As Single,
-                              IP7 As Single,
-                              IP8 As Boolean,
-                              OUT1 As Single)
-
-            'Arrange
-            Dim m10 As New Mock(Of IM10)
-            Dim m11 As New Mock(Of IM11)
-            Dim m12 As New Mock(Of IM12)
-            Dim Signals As New Mock(Of ISignals)
-
-            m12.Setup(Function(x) x.FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDemand).Returns(IP1)
-            m12.Setup(Function(x) x.BaseFuelConsumptionWithTrueAuxiliaryLoads).Returns(IP2)
-            m10.Setup(Function(x) x.FuelConsumptionSmartPneumaticsAndAverageElectricalPowerDemand).Returns(IP3)
-            Signals.Setup(Function(x) x.SmartPneumatics).Returns(IP4)
-            Signals.Setup(Function(x) x.SmartElectrics).Returns(IP5)
-            Signals.Setup(Function(x) x.WHTC).Returns(IP7)
-            Signals.Setup(Function(x) x.DeclarationMode).Returns(IP8)
-            Signals.Setup(Function(x) x.TotalCycleTimeSeconds).Returns(3114)
-            Signals.Setup(Function(x) x.CurrentCycleTimeInSeconds).Returns(3114)
-
-            'Act
-            Dim target = New M13(m10.Object, m11.Object, m12.Object, Signals.Object)
-
-            'Assert
-            Assert.AreEqual(OUT1, target.WHTCTotalCycleFuelConsumptionGrams)
-
-        End Sub
-
-    End Class
-
+	<TestFixture()>
+	Public Class M13Tests
+		Private Const FUEL_DENSITY_percm3 As Single = 0.835
+
+
+		'<TestCase(50,	60,	70,	TRUE,	TRUE ,100, 1,False,	 72287.5f , 86.57185629f )> _
+
+		<Test()> _
+		<TestCase(50, 60, 70, False, False, 100, 1, False, 60.0F)> _
+		<TestCase(50, 60, 70, False, True, 100, 1, False, 110.0F)> _
+		<TestCase(50, 60, 70, True, False, 100, 1, False, 0.0F)> _
+		<TestCase(50, 60, 70, True, True, 100, 1, False, 110.0F)> _
+		<TestCase(50, 60, 70, True, True, 100, 2, True, 220.0F)>
+		Public Sub InputOutputValues(IP1 As Double,
+									IP2 As Double,
+									IP3 As Double,
+									IP4 As Boolean,
+									IP5 As Boolean,
+									IP6 As Double,
+									IP7 As Double,
+									IP8 As Boolean,
+									OUT1 As Double)
+
+			'Arrange
+			Dim m10 As New Mock(Of IM10)
+			Dim m11 As New Mock(Of IM11)
+			Dim m12 As New Mock(Of IM12)
+			Dim Signals As New Mock(Of ISignals)
+
+			m12.Setup(Function(x) x.FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDemand()).Returns(IP1.SI(Of Gram))
+			m12.Setup(Function(x) x.BaseFuelConsumptionWithTrueAuxiliaryLoads()).Returns(IP2.SI(Of Gram))
+			m10.Setup(Function(x) x.AverageLoadsFuelConsumptionInterpolatedForPneumatics).Returns(0.SI(Of Gram))
+			m10.Setup(Function(x) x.FuelConsumptionSmartPneumaticsAndAverageElectricalPowerDemand).Returns(IP3.SI(Of Gram))
+			m11.Setup(Function(x) x.TotalCycleFuelConsuptionAverageLoads).Returns(0.SI(Of Gram))
+			Signals.Setup(Function(x) x.SmartPneumatics).Returns(IP4)
+			Signals.Setup(Function(x) x.SmartElectrics).Returns(IP5)
+			Signals.Setup(Function(x) x.WHTC).Returns(IP7)
+			Signals.Setup(Function(x) x.DeclarationMode).Returns(IP8)
+			Signals.Setup(Function(x) x.TotalCycleTimeSeconds).Returns(3114)
+			Signals.Setup(Function(x) x.CurrentCycleTimeInSeconds).Returns(3114)
+
+			'Act
+			Dim target = New M13(m10.Object, m11.Object, m12.Object, Signals.Object)
+
+			'Assert
+			Assert.AreEqual(OUT1, target.WHTCTotalCycleFuelConsumptionGrams.Value(), 0.001)
+		End Sub
+	End Class
 End Namespace
 
 
-
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb
index 4b7d086a7c..10f7ad0068 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb
@@ -5,6 +5,7 @@ Imports VectoAuxiliaries.DownstreamModules
 Imports NUnit.Framework
 Imports VectoAuxiliaries
 Imports Moq
+Imports TUGraz.VectoCommon.Utils
 
 
 Namespace UnitTests
@@ -20,31 +21,31 @@ Namespace UnitTests
 		Public Sub Clone(from As ISSMTOOL) Implements ISSMTOOL.Clone
 		End Sub
 
-		Public ReadOnly Property ElectricalWAdjusted As Single Implements ISSMTOOL.ElectricalWAdjusted
+		Public ReadOnly Property ElectricalWAdjusted As Double Implements ISSMTOOL.ElectricalWAdjusted
 			Get
 				Throw New NotImplementedException
 			End Get
 		End Property
 
-		Public ReadOnly Property ElectricalWBase As Single Implements ISSMTOOL.ElectricalWBase
+		Public ReadOnly Property ElectricalWBase As Double Implements ISSMTOOL.ElectricalWBase
 			Get
 				Throw New NotImplementedException
 			End Get
 		End Property
 
-		Public ReadOnly Property FuelPerHBase As Single Implements ISSMTOOL.FuelPerHBase
+		Public ReadOnly Property FuelPerHBase As Double Implements ISSMTOOL.FuelPerHBase
 			Get
 				Throw New NotImplementedException
 			End Get
 		End Property
 
-		Public ReadOnly Property FuelPerHBaseAdjusted As Single Implements ISSMTOOL.FuelPerHBaseAdjusted
+		Public ReadOnly Property FuelPerHBaseAdjusted As Double Implements ISSMTOOL.FuelPerHBaseAdjusted
 			Get
 				Throw New NotImplementedException
 			End Get
 		End Property
 
-		Public Function FuelPerHBaseAsjusted(AverageUseableEngineWasteHeatKW As Single) As Single _
+		Public Function FuelPerHBaseAsjusted(AverageUseableEngineWasteHeatKW As Double) As Double _
 			Implements ISSMTOOL.FuelPerHBaseAsjusted
 
 			Return 0.5 * AverageUseableEngineWasteHeatKW
@@ -67,13 +68,13 @@ Namespace UnitTests
 			Throw New NotImplementedException
 		End Function
 
-		Public ReadOnly Property MechanicalWBase As Single Implements ISSMTOOL.MechanicalWBase
+		Public ReadOnly Property MechanicalWBase As Double Implements ISSMTOOL.MechanicalWBase
 			Get
 				Throw New NotImplementedException
 			End Get
 		End Property
 
-		Public ReadOnly Property MechanicalWBaseAdjusted As Single Implements ISSMTOOL.MechanicalWBaseAdjusted
+		Public ReadOnly Property MechanicalWBaseAdjusted As Double Implements ISSMTOOL.MechanicalWBaseAdjusted
 			Get
 				Throw New NotImplementedException
 			End Get
@@ -100,8 +101,8 @@ Namespace UnitTests
 			Dim ip5 As Single = 3114
 			Dim ip6 As Single = 3114
 
-			Dim expectedOut1 As Single = 780333.4F
-			Dim expectedOut2 As Single = 0.934531F
+			Dim expectedOut1 As Double = 780333.4
+			Dim expectedOut2 As Double = 0.934531
 
 			Dim m13 As New Mock(Of IM13)
 			Dim hvacSSM As New Mock(Of ISSMTOOL)
@@ -110,7 +111,7 @@ Namespace UnitTests
 			Dim constants As IHVACConstants = New HVACConstants(835)
 
 			'Moq' Arrangements
-			m13.Setup(Function(x) x.WHTCTotalCycleFuelConsumptionGrams).Returns(ip1)
+			m13.Setup(Function(x) x.WHTCTotalCycleFuelConsumptionGrams).Returns(ip1.SI(Of Gram))
 			signals.Setup(Function(x) x.CurrentCycleTimeInSeconds).Returns(ip5)
 
 
@@ -118,8 +119,8 @@ Namespace UnitTests
 			Dim m14 As New M14(m13.Object, ssmMock, constants, signals.Object)
 
 			'Assert
-			Assert.AreEqual(expectedOut1, m14.TotalCycleFCGrams)
-			Assert.AreEqual(expectedOut2, m14.TotalCycleFCLitres)
+			Assert.AreEqual(expectedOut1, m14.TotalCycleFCGrams.Value(), 0.1)
+			Assert.AreEqual(expectedOut2, m14.TotalCycleFCLitres.Value(), 0.00001)
 		End Sub
 	End Class
 End Namespace
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
index 1647a7a614..fac22d765a 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
@@ -1,4 +1,5 @@
 Imports NUnit.Framework
+Imports TUGraz.VectoCommon.Utils
 Imports VectoAuxiliaries
 Imports VectoAuxiliaries.Electrics
 Imports VectoAuxiliaries.Pneumatics
@@ -6,113 +7,99 @@ Imports VectoAuxiliaries.Hvac
 
 
 Namespace UnitTests
+	<TestFixture()>
+	Public Class M1_AverageHVACLoadDemandTests
+		Private Const _GOODMAP As String = "TestFiles\testAlternatorMap.aalt"
+		Private Const _SSMMAP As String = "TestFiles\ssm.Ahsm"
+		Private Const _BusDatabase As String = "TestFiles\BusDatabase.abdb"
 
-<TestFixture()>
-Public Class M1_AverageHVACLoadDemandTests
+		Private signals As ISignals = New Signals With {.EngineSpeed = 2000}
+		Private powernetVoltage As Double = 26.3
+		Private ssm As ISSMTOOL = New SSMTOOL(_SSMMAP, New HVACConstants())
 
-  Private Const _GOODMAP As String = "TestFiles\testAlternatorMap.aalt"
-  Private Const _SSMMAP As String = "TestFiles\ssm.Ahsm
-  Private Const _BusDatabase As String ="TestFiles\BusDatabase.abdb
 
-Private signals As ISignals = New Signals With {.EngineSpeed=2000}
-Private powernetVoltage As Single = 26.3
-        Private ssm As ISSMTOOL = New SSMTOOL(_SSMMAP, New HVACConstants())
+		Private m0 As IM0_NonSmart_AlternatorsSetEfficiency
+		Private alternatorMap As IAlternatorMap = New AlternatorMap(_GOODMAP)
+		Private alternatorGearEfficiency As Single = 0.8
+		Private compressorGrearEfficiency As Single = 0.8
 
 
-Private m0 As IM0_NonSmart_AlternatorsSetEfficiency
-Private alternatorMap As IAlternatorMap = New AlternatorMap(_GOODMAP)
-Private alternatorGearEfficiency As Single = 0.8
-Private compressorGrearEfficiency As Single = 0.8
+		Public Sub New()
 
+			alternatorMap.Initialise()
 
-Public Sub new()
+			ssm.Load(_SSMMAP)
 
-alternatorMap.Initialise()
+			m0 = New M0_NonSmart_AlternatorsSetEfficiency(New ElectricalConsumerList(powernetVoltage, 0.096, True),
+														alternatorMap,powernetVoltage.SI(Of Volt), signals, ssm)
+		End Sub
 
-   ssm.Load( _SSMMAP )
+		Private Function GETM1Instance() As IM1_AverageHVACLoadDemand
 
-   m0 = New M0_NonSmart_AlternatorsSetEfficiency(New ElectricalConsumerList(powernetVoltage,0.096,True),alternatorMap,powernetVoltage,signals,ssm )
+			ssm.Load(_SSMMAP)
 
+			Return New M1_AverageHVACLoadDemand(m0,
+												alternatorGearEfficiency,
+												compressorGrearEfficiency,
+												powernetVoltage.SI(Of Volt),
+												signals,
+												ssm)
+		End Function
 
-End Sub
 
-Private function GETM1Instance()  As IM1_AverageHVACLoadDemand
+		<Test()>
+		Public Sub CreateNew()
 
-ssm.Load( _SSMMAP )
+			Dim target As IM1_AverageHVACLoadDemand = GETM1Instance()
 
-return  New M1_AverageHVACLoadDemand( m0,
-                                       alternatorGearEfficiency,
-                                       compressorGrearEfficiency,
-                                       powernetVoltage,
-                                       signals,
-                                       ssm)
-End Function
+			Assert.NotNull(target)
+		End Sub
 
 
+		<Test()>
+		Public Sub GetAveragePowerDemandAtCrankFromHVACMechanicsWattsTest()
 
-<Test()>
-Public Sub CreateNew()
 
-  Dim target As IM1_AverageHVACLoadDemand = GETM1Instance()
+			Dim target As IM1_AverageHVACLoadDemand = GETM1Instance()
+			Dim expected As Single = 1580.276
+			Dim actual As Watt = target.AveragePowerDemandAtCrankFromHVACMechanicalsWatts
 
-  Assert.NotNull(target)
+			Assert.AreEqual(expected, actual.Value(), 0.001)
+		End Sub
 
-End Sub
+		<Test()>
+		Public Sub AveragePowerDemandAtCrankFromHVACElectricsWattsTest()
 
 
+			Dim target As IM1_AverageHVACLoadDemand = GETM1Instance()
+			Dim expected As Single = 0
+			Dim actual As Watt = target.AveragePowerDemandAtCrankFromHVACElectricsWatts
 
-<Test()>
-Public Sub GetAveragePowerDemandAtCrankFromHVACMechanicsWattsTest()
+			Assert.AreEqual(expected, actual.Value(), 0.001)
+		End Sub
 
+		<Test()>
+		Public Sub AveragePowerDemandAtAlternatorFromHVACElectricsWattsTest()
 
-   Dim target As IM1_AverageHVACLoadDemand = GETM1Instance()
-            Dim expected As Single = 1580.276
-   dim actual as Single = target.AveragePowerDemandAtCrankFromHVACMechanicalsWatts
 
-   Assert.AreEqual( expected , actual)
+			Dim target As IM1_AverageHVACLoadDemand = GETM1Instance()
+			Dim expected As Single = 0
+			Dim actual As Watt = target.AveragePowerDemandAtAlternatorFromHVACElectricsWatts
 
-End Sub
+			Assert.AreEqual(expected, actual.Value(), 0.001)
+		End Sub
 
-<Test()>
-Public Sub AveragePowerDemandAtCrankFromHVACElectricsWattsTest()
+		<Test()>
+		Public Sub HVACFuelingLitresPerHourTest()
 
 
-   Dim target As IM1_AverageHVACLoadDemand = GETM1Instance()
-            Dim expected As Single = 0
-   dim actual as Single = target.AveragePowerDemandAtCrankFromHVACElectricsWatts
-
-   Assert.AreEqual( expected , actual)
-
-End Sub
-
-<Test()>
-Public Sub AveragePowerDemandAtAlternatorFromHVACElectricsWattsTest()
-
-
-   Dim target As IM1_AverageHVACLoadDemand = GETM1Instance()
-            Dim expected As Single = 0
-   dim actual as Single = target.AveragePowerDemandAtAlternatorFromHVACElectricsWatts
-
-   Assert.AreEqual( expected , actual)
-
-End Sub
-
-<Test()>
-Public Sub HVACFuelingLitresPerHourTest()
-
-
-   Dim target As IM1_AverageHVACLoadDemand = GETM1Instance()
-   Dim expected As Single = 0
-   dim actual as Single = target.HVACFuelingLitresPerHour
-
-   Assert.AreEqual( expected , actual)
-
-End Sub
-
-End Class
-
+			Dim target As IM1_AverageHVACLoadDemand = GETM1Instance()
+			Dim expected As Single = 0
+			Dim actual As LiterPerHour = target.HVACFuelingLitresPerHour()
 
+			Assert.AreEqual(expected, actual.Value(), 0.001)
+		End Sub
+	End Class
 End Namespace
 
 
-
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
index 199bd699fd..d2b4ed7e5e 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
@@ -1,6 +1,7 @@
 Imports VectoAuxiliaries.Electrics
 Imports VectoAuxiliaries.Hvac
 Imports NUnit.Framework
+Imports TUGraz.VectoCommon.Utils
 Imports VectoAuxiliariesTests.Mocks
 Imports VectoAuxiliaries
 
@@ -40,12 +41,12 @@ Namespace UnitTests
 
 			Dim altMap As IAlternatorMap = CType(New AlternatorMap("testfiles\testAlternatorMap.aalt"), IAlternatorMap)
 			altMap.Initialise()
-			Dim m0 As New M0_NonSmart_AlternatorsSetEfficiency(consumers, altMap, 26.3, signals, GetSSM())
+			Dim m0 As New M0_NonSmart_AlternatorsSetEfficiency(consumers, altMap, 26.3.SI(Of Volt), signals, GetSSM())
 
 			'Get Consumers.
 
 
-			Return New M2_AverageElectricalLoadDemand(consumers, m0, 0.8, 26.3, signals)
+			Return New M2_AverageElectricalLoadDemand(consumers, m0, 0.8, 26.3.SI(Of Volt), signals)
 		End Function
 
 #End Region
@@ -63,16 +64,16 @@ Namespace UnitTests
 
 			Dim expected As Single = 1594.61572
 			Dim target As M2_AverageElectricalLoadDemand = GetAverageElectricalDemandInstance()
-			Dim actual As Single = target.GetAveragePowerDemandAtAlternator()
-			Assert.AreEqual(expected, actual)
+			Dim actual As Watt = target.GetAveragePowerDemandAtAlternator()
+			Assert.AreEqual(expected, actual.Value(), 0.001)
 		End Sub
 
 		<Test()>
 		Public Sub GetAveragePowerAtCrankTest()
 			Dim target As M2_AverageElectricalLoadDemand = GetAverageElectricalDemandInstance()
 			Dim expected As Single = 10914.6543
-			Dim actual As Single = target.GetAveragePowerAtCrankFromElectrics()
-			Assert.AreEqual(expected, actual)
+			Dim actual As Watt = target.GetAveragePowerAtCrankFromElectrics()
+			Assert.AreEqual(expected, actual.Value(), 0.001)
 		End Sub
 	End Class
 End Namespace
\ No newline at end of file
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb
index f4ebc85e01..cf312c5c89 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb
@@ -1,4 +1,5 @@
 Imports NUnit.Framework
+Imports TUGraz.VectoCommon.Utils
 Imports VectoAuxiliaries.Pneumatics
 Imports VectoAuxiliariesTests.Mocks
 Imports VectoAuxiliaries.Electrics
@@ -45,7 +46,10 @@ Namespace UnitTests
 
 			Dim alternatoMap As New AlternatorMap(_altMap)
 			alternatoMap.Initialise()
-			Dim m0 As New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers, alternatoMap, _powerNetVoltage, _signals, GetSSM())
+			Dim _
+				m0 As _
+					New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers, alternatoMap, _powerNetVoltage.SI(Of Volt), _signals,
+															GetSSM())
 
 			'Results Cards
 			Dim readings = New List(Of SmartResult)
@@ -67,7 +71,7 @@ Namespace UnitTests
 		Public Sub CreateNewTest()
 
 			Initialise()
-			_target = New M5__SmartAlternatorSetGeneration(_m05, _powerNetVoltage, _altGearPullyEfficiency)
+			_target = New M5__SmartAlternatorSetGeneration(_m05, _powerNetVoltage.SI(Of Volt), _altGearPullyEfficiency)
 			Assert.IsNotNull(_target)
 		End Sub
 
@@ -75,34 +79,34 @@ Namespace UnitTests
 		Public Sub PowerAtCrankIdleWatts()
 
 			Initialise()
-			_target = New M5__SmartAlternatorSetGeneration(_m05, _powerNetVoltage, _altGearPullyEfficiency)
+			_target = New M5__SmartAlternatorSetGeneration(_m05, _powerNetVoltage.SI(Of Volt), _altGearPullyEfficiency)
 			Dim expected As Single = 1641.35791
-			Dim actual As Single = _target.AlternatorsGenerationPowerAtCrankIdleWatts()
+			Dim actual As Watt = _target.AlternatorsGenerationPowerAtCrankIdleWatts()
 
-			Assert.AreEqual(expected, actual)
+			Assert.AreEqual(expected, actual.Value(), 0.001)
 		End Sub
 
 		<Test()>
 		Public Sub PowerAtCrankTractionWatts()
 
 			Initialise()
-			_target = New M5__SmartAlternatorSetGeneration(_m05, _powerNetVoltage, _altGearPullyEfficiency)
+			_target = New M5__SmartAlternatorSetGeneration(_m05, _powerNetVoltage.SI(Of Volt), _altGearPullyEfficiency)
 			Dim expected As Single = 1641.35791
-			Dim actual As Single = _target.AlternatorsGenerationPowerAtCrankTractionOnWatts()
+			Dim actual As Watt = _target.AlternatorsGenerationPowerAtCrankTractionOnWatts()
 
-			Assert.AreEqual(expected, actual)
+			Assert.AreEqual(expected, actual.Value(), 0.001)
 		End Sub
 
 		<Test()>
 		Public Sub PowerAtCrankOverrunWatts()
 
 			Initialise()
-			_target = New M5__SmartAlternatorSetGeneration(_m05, _powerNetVoltage, _altGearPullyEfficiency)
+			_target = New M5__SmartAlternatorSetGeneration(_m05, _powerNetVoltage.SI(Of Volt), _altGearPullyEfficiency)
 			Dim expected As Single = 1641.35791F
 
-			Dim actual As Single = _target.AlternatorsGenerationPowerAtCrankOverrunWatts()
+			Dim actual As Watt = _target.AlternatorsGenerationPowerAtCrankOverrunWatts()
 
-			Assert.AreEqual(expected, actual)
+			Assert.AreEqual(expected, actual.Value(), 0.001)
 		End Sub
 	End Class
 End Namespace
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb
index 832e3de2a6..bdfb63952c 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb
@@ -5,128 +5,112 @@ Imports VectoAuxiliaries.DownstreamModules
 Imports NUnit.Framework
 Imports VectoAuxiliaries
 Imports Moq
+Imports TUGraz.VectoCommon.Utils
 
 Namespace UnitTests
-
-<TestFixture()>
-Public Class M6Test
-
-Private M1 As New M1_Mock(100, 200, 300, 50)
-Private M2 As New M2_Mock(120, 130)
-Private M3 As New M3_Mock(200, 5000)
-Private M4 As New M4_Mock(100, 2, 200, 100, 100)
-Private M5 As New M5_Mock(200, 50, 80)
-Private Signals As New Signals()
-
-Private Function GetStandardInstanceM6() As IM6
-
- M1 = New M1_Mock(100, 200, 300, 50)
- M2 = New M2_Mock(120, 130)
- M3 = New M3_Mock(200, 5000)
- M4 = New M4_Mock(100, 2, 200, 100, 100)
- M5 = New M5_Mock(200, 50, 80)
-
- Return   New M6(M1,M2,M3,M4,M5,Signals)
-
-End Function
-
-Public Sub new ()
-
-Signals.EngineMotoringPower=100
-Signals.EngineDrivelinePower=150
-Signals.PreExistingAuxPower=30
-
-
-End Sub
-
-<Test()>
-Public Sub CreateNewM6Instance()
-
-Dim target As IM6 = GetStandardInstanceM6()
-
-Assert.IsNotNull( target)
-
-End Sub
-
-
-'Test Cases Supplied by Mike Preston.
-        <Test()> _
-        <TestCase(100, 100, 100, 100, 20, 20, 40, 100, 100, 100, 0.1F, -0.55F, False, 0, 0, 0, 20, 0, 100, 20, 200, 0)> _
-        <TestCase(100, 100, 100, 100, 20, 20, 40, 100, 100, 100, 100, -550, True, 0, 0, 0, 20, 0, 100, 20, 200, 0)> _
-        Public Sub MikesConditionsTest(M1_1 As Single, _
-                                M1_2 As Single, _
-                                M2_1 As Single, _
-                                M3_1 As Single, _
-                                M4_1 As Single, _
-                                M4_2 As Single, _
-                                M4_3 As Single, _
-                                M5_1 As Single, _
-                                M5_2 As Single, _
-                                AUX As Single, _
-                                EMP As Single, _
-                                EDP As Single, _
-                                SM As Boolean, _
-                                OUT1 As Single, _
-                                OUT2 As Single, _
-                                OUT3 As Single, _
-                                OUT4 As Single, _
-                                OUT5 As Single, _
-                                OUT6 As Single, _
-                                OUT7 As Single, _
-                                OUT8 As Single, _
-                                OUT9 As Single)
-
-
-            Dim M1 = New M1_Mock()
-            Dim M2 = New M2_Mock()
-            Dim M3 = New M3_Mock()
-            Dim M4 = New M4_Mock()
-            Dim M5 = New M5_Mock()
-
-            Dim signals As New Signals()
-
-
-            M1._AveragePowerDemandAtCrankFromHVACMechanicalsWatts = M1_1
-            M1._AveragePowerDemandAtCrankFromHVACElectricsWatts = M1_2
-            M2._GetAveragePowerAtCrankFromElectrics = M2_1
-            M3._GetAveragePowerDemandAtCrankFromPneumatics = M3_1
-            M4._PowerCompressorOff = M4_1
-            M4._PowerDifference = M4_2
-            M4._PowerCompressorOn = M4_3
-            M5._AlternatorsGenerationPowerAtCrankTractionOnWatts = M5_1
-            M5._AlternatorsGenerationPowerAtCrankOverrunWatts = M5_2
-
-
-
-            signals.EngineMotoringPower = EMP
-            signals.PreExistingAuxPower = AUX
-            signals.EngineDrivelinePower = EDP
-            signals.SmartElectrics = SM
-
-
-            Dim target As New M6(M1, M2, M3, M4, M5, signals)
-
-            Assert.AreEqual(OUT1, target.OverrunFlag)
-            Assert.AreEqual(OUT2, target.SmartElecAndPneumaticsCompressorFlag)
-            Assert.AreEqual(OUT3, target.SmartElecAndPneumaticAltPowerGenAtCrank)
-            Assert.AreEqual(OUT4, target.SmartElecAndPneumaticAirCompPowerGenAtCrank)
-            Assert.AreEqual(OUT5, target.SmartElecOnlyAltPowerGenAtCrank)
-            Assert.AreEqual(OUT6, target.AveragePowerDemandAtCrankFromPneumatics)
-            Assert.AreEqual(OUT7, target.SmartElecAndPneumaticAirCompPowerGenAtCrank)
-            Assert.AreEqual(OUT8, target.AvgPowerDemandAtCrankFromElectricsIncHVAC)
-            Assert.AreEqual(OUT9, target.SmartPneumaticsOnlyCompressorFlag)
-
-
-
-
-        End Sub
-
-
-End Class
-
-
-
+	<TestFixture()>
+	Public Class M6Test
+		Private M1 As New M1_Mock(100, 200, 300, 50)
+		Private M2 As New M2_Mock(120, 130)
+		Private M3 As New M3_Mock(200, 5000)
+		Private M4 As New M4_Mock(100, 2, 200, 100, 100)
+		Private M5 As New M5_Mock(200, 50, 80)
+		Private Signals As New Signals()
+
+		Private Function GetStandardInstanceM6() As IM6
+
+			M1 = New M1_Mock(100, 200, 300, 50)
+			M2 = New M2_Mock(120, 130)
+			M3 = New M3_Mock(200, 5000)
+			M4 = New M4_Mock(100, 2, 200, 100, 100)
+			M5 = New M5_Mock(200, 50, 80)
+
+			Return New M6(M1, M2, M3, M4, M5, Signals)
+		End Function
+
+		Public Sub New()
+
+			Signals.EngineMotoringPower = 100
+			Signals.EngineDrivelinePower = 150
+			Signals.PreExistingAuxPower = 30
+		End Sub
+
+		<Test()>
+		Public Sub CreateNewM6Instance()
+
+			Dim target As IM6 = GetStandardInstanceM6()
+
+			Assert.IsNotNull(target)
+		End Sub
+
+
+		'Test Cases Supplied by Mike Preston.
+		<Test()> _
+		<TestCase(100, 100, 100, 100, 20, 20, 40, 100, 100, 100, 0.1F, -0.55, False, False, False, 0, 20, 0, 100, 20, 200, False)> _
+		<TestCase(100, 100, 100, 100, 20, 20, 40, 100, 100, 100, 100, -550, True, False, False, 0, 20, 0, 100, 20, 200, False)>
+		Public Sub MikesConditionsTest(M1_1 As Double,
+										M1_2 As Double,
+										M2_1 As Double,
+										M3_1 As Double,
+										M4_1 As Double,
+										M4_2 As Double,
+										M4_3 As Double,
+										M5_1 As Double,
+										M5_2 As Double,
+										AUX As Double,
+										EMP As Double,
+										EDP As Double,
+										SM As Boolean,
+										OUT1 As Boolean,
+										OUT2 As Boolean,
+										OUT3 As Double,
+										OUT4 As Double,
+										OUT5 As Double,
+										OUT6 As Double,
+										OUT7 As Double,
+										OUT8 As Double,
+										OUT9 As Boolean)
+
+
+			Dim M1 = New M1_Mock()
+			Dim M2 = New M2_Mock()
+			Dim M3 = New M3_Mock()
+			Dim M4 = New M4_Mock()
+			Dim M5 = New M5_Mock()
+
+			Dim signals As New Signals()
+
+
+			M1._AveragePowerDemandAtCrankFromHVACMechanicalsWatts = M1_1.SI(Of Watt)()
+			M1._AveragePowerDemandAtCrankFromHVACElectricsWatts = M1_2.SI(Of Watt)()
+			M2._GetAveragePowerAtCrankFromElectrics = M2_1.SI(Of Watt)()
+			M3._GetAveragePowerDemandAtCrankFromPneumatics = M3_1.SI(Of Watt)()
+			M4._PowerCompressorOff = M4_1.SI(Of Watt)()
+			M4._PowerDifference = M4_2.SI(Of Watt)()
+			M4._PowerCompressorOn = M4_3.SI(Of Watt)()
+			M5._AlternatorsGenerationPowerAtCrankTractionOnWatts = M5_1.SI(Of Watt)()
+			M5._AlternatorsGenerationPowerAtCrankOverrunWatts = M5_2.SI(Of Watt)()
+
+
+			signals.EngineMotoringPower = EMP
+			signals.PreExistingAuxPower = AUX
+			signals.EngineDrivelinePower = EDP
+			signals.SmartElectrics = SM
+
+
+			Dim target As New M6(M1, M2, M3, M4, M5, signals)
+
+			Assert.AreEqual(OUT1, target.OverrunFlag)
+			Assert.AreEqual(OUT2, target.SmartElecAndPneumaticsCompressorFlag)
+			Assert.AreEqual(OUT3, target.SmartElecAndPneumaticAltPowerGenAtCrank.Value(), 0.001)
+			Assert.AreEqual(OUT4, target.SmartElecAndPneumaticAirCompPowerGenAtCrank.Value(), 0.001)
+			Assert.AreEqual(OUT5, target.SmartElecOnlyAltPowerGenAtCrank.Value(), 0.001)
+			Assert.AreEqual(OUT6, target.AveragePowerDemandAtCrankFromPneumatics.Value(), 0.001)
+			Assert.AreEqual(OUT7, target.SmartElecAndPneumaticAirCompPowerGenAtCrank.Value(), 0.001)
+			Assert.AreEqual(OUT8, target.AvgPowerDemandAtCrankFromElectricsIncHVAC.Value(), 0.001)
+			Assert.AreEqual(OUT9, target.SmartPneumaticsOnlyCompressorFlag)
+		End Sub
+	End Class
 End Namespace
 
 
-
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M7Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M7Tests.vb
index 42aa22d216..f87c43e7eb 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M7Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M7Tests.vb
@@ -3,109 +3,100 @@ Imports VectoAuxiliaries.Pneumatics
 Imports VectoAuxiliaries.Hvac
 Imports VectoAuxiliaries.DownstreamModules
 Imports NUnit.Framework
+Imports TUGraz.VectoCommon.Utils
 Imports VectoAuxiliaries
 
 Namespace UnitTests
-
-<TestFixture()> _
-Public Class M7Test
-
-private M5 As M5_Mock
-Private M6 As M6_MOCK
-Private Signals As ISignals
-
-Public Sub new ()
-
-M5 = New M5_Mock( 100,110,120)
-M6 = New M6_Mock(100,0,0,110,120,0,130,140,150)
-Signals = New Signals()
-
-End Sub
-
-<Test()>
-Public Sub CreateNew_M7InstanceTest()
- Dim target As IM7 = New M7(M5,M6,Signals)
- Assert.IsNotNull(target)
-End Sub
-
-'IP1  M5 : Alternators Generation Power At Crank (Traction ) (Single )
-'IP2  M5 : Alternators Generation Power At Crank (Idle )     (Single )
-'IP3  Signals : IDLE            (Boolean )
-'IP4  M6      :Overrun Flag     (Integer )
-'IP5  Signals : Clutch engaged  (Boolean )
-'IP6  Signals : InNuetral       (Boolean )
-'IP7  M6      : SmartElectricalAndPneumatic:AlternatorPowerGen@Crank
-'IP8  M6      : SmartElectricalAndPneumatic:AirCompPowerGen@Crank
-'IP9  M6      : SmartElectricalOnly:AlternatorPowerGen@Crank
-'IP10 M6      : AveragePowerDemand@CrankFromPneumatics
-'IP11 M6      : SmartPneumaticsOnly:AirComprPowerGen@Crank
-'OP1  Op1     :Smart Electrical & Pneumatic Aux : Alternator power gen @ Crank
-'OP2  OP2     :Smart Electrical & Pneumatic Aux : Air comp   power gen @ Crank
-'OP3  OP3     :Smart Electrical Aux : Alternator             Power Gen @ Crank
-'OP4  OP4     :Smart Electrical Aux : Ait Compressor         Power Gen @ Crank 
-<Test()> _
-<TestCase(100,200,false,0,false,true,300,400,500,600,700,200,600,200,600)> _
-<TestCase(100,200,true,0,false,true,300,400,500,600,700,200,600,200,600)> _
-<TestCase(100,200,false,1,true,false,300,400,500,600,700,300,400,500,700)> _
-Public Sub InputOutputTests(byval IP1 As Single,  _
-                            byval IP2 As Single,  _
-                            byval IP3 As Boolean, _
-                            byval IP4 As Single,  _
-                            byval IP5 As Boolean, _
-                            byval IP6 As Boolean, _
-                            byval IP7 As Single,  _
-                            byval IP8 As Single,  _
-                            byval IP9 As single,  _
-                            byval IP10 As Single, _
-                            byval IP11 As Single, _
-                            byval OP1  As Single, _
-                            byval OP2  As Single, _
-                            byval OP3  As Single, _
-                            byval OP4  As Single  )
-
-                            'Instantiate new mocks.
-                            M5 = New M5_Mock()
-                            M6 = New M6_Mock()                         
-                            Signals = New Signals()
-
-                            'Assign from TestCaseValues
-                            M5._AlternatorsGenerationPowerAtCrankTractionOnWatts=IP1
-                            M5._AlternatorsGenerationPowerAtCrankIdleWatts=IP2
-                            Signals.Idle=IP3
-                            M6._OverrunFlag=IP4
-                            Signals.ClutchEngaged=IP5 
-                            Signals.InNeutral=IP6 
-                            M6._SmartElecAndPneumaticAltPowerGenAtCrank=IP7
-                            M6._SmartElecAndPneumaticAirCompPowerGenAtCrank=IP8
-                            M6._SmartElecOnlyAltPowerGenAtCrank=IP9
-                            M6._AveragePowerDemandAtCrankFromPneumatics=IP10
-                            M6._SmartPneumaticOnlyAirCompPowerGenAtCrank=IP11
-
-
-            'Create Instance of M7 from 
-            Dim target As IM7 = New M7(M5,M6,Signals)
-
-            Dim OP1act As Single   = target.SmartElectricalAndPneumaticAuxAltPowerGenAtCrank
-            Dim OP2act As Single   = target.SmartElectricalAndPneumaticAuxAirCompPowerGenAtCrank
-            Dim OP3act As Single   = target.SmartElectricalOnlyAuxAltPowerGenAtCrank
-            Dim OP4act As Single   = target.SmartPneumaticOnlyAuxAirCompPowerGenAtCrank
-            
-            Assert.AreEqual(OP1, OP1act)
-            Assert.AreEqual(OP2, OP2act)
-            Assert.AreEqual(OP3, OP3act)
-            Assert.AreEqual(OP4, OP4act)
-             
-
- Assert.IsNotNull(target)
-
-End Sub
-
-
-End Class
-
-
-
+	<TestFixture()>
+	Public Class M7Test
+		Private M5 As M5_Mock
+		Private M6 As M6_Mock
+		Private Signals As ISignals
+
+		Public Sub New()
+
+			M5 = New M5_Mock(100, 110, 120)
+			M6 = New M6_Mock(100, 0, 0, 110, 120, 0, 130, 140, 150)
+			Signals = New Signals()
+		End Sub
+
+		<Test()>
+		Public Sub CreateNew_M7InstanceTest()
+			Dim target As IM7 = New M7(M5, M6, Signals)
+			Assert.IsNotNull(target)
+		End Sub
+
+		'IP1  M5 : Alternators Generation Power At Crank (Traction ) (Single )
+		'IP2  M5 : Alternators Generation Power At Crank (Idle )     (Single )
+		'IP3  Signals : IDLE            (Boolean )
+		'IP4  M6      :Overrun Flag     (Integer )
+		'IP5  Signals : Clutch engaged  (Boolean )
+		'IP6  Signals : InNuetral       (Boolean )
+		'IP7  M6      : SmartElectricalAndPneumatic:AlternatorPowerGen@Crank
+		'IP8  M6      : SmartElectricalAndPneumatic:AirCompPowerGen@Crank
+		'IP9  M6      : SmartElectricalOnly:AlternatorPowerGen@Crank
+		'IP10 M6      : AveragePowerDemand@CrankFromPneumatics
+		'IP11 M6      : SmartPneumaticsOnly:AirComprPowerGen@Crank
+		'OP1  Op1     :Smart Electrical & Pneumatic Aux : Alternator power gen @ Crank
+		'OP2  OP2     :Smart Electrical & Pneumatic Aux : Air comp   power gen @ Crank
+		'OP3  OP3     :Smart Electrical Aux : Alternator             Power Gen @ Crank
+		'OP4  OP4     :Smart Electrical Aux : Ait Compressor         Power Gen @ Crank 
+		<Test()> _
+		<TestCase(100, 200, False, 0, False, True, 300, 400, 500, 600, 700, 200, 600, 200, 600)> _
+		<TestCase(100, 200, True, 0, False, True, 300, 400, 500, 600, 700, 200, 600, 200, 600)> _
+		<TestCase(100, 200, False, 1, True, False, 300, 400, 500, 600, 700, 300, 400, 500, 700)>
+		Public Sub InputOutputTests(ByVal IP1 As Double,
+									ByVal IP2 As Double,
+									ByVal IP3 As Boolean,
+									ByVal IP4 As Double,
+									ByVal IP5 As Boolean,
+									ByVal IP6 As Boolean,
+									ByVal IP7 As Double,
+									ByVal IP8 As Double,
+									ByVal IP9 As Double,
+									ByVal IP10 As Double,
+									ByVal IP11 As Double,
+									ByVal OP1 As Double,
+									ByVal OP2 As Double,
+									ByVal OP3 As Double,
+									ByVal OP4 As Double)
+
+			'Instantiate new mocks.
+			M5 = New M5_Mock()
+			M6 = New M6_Mock()
+			Signals = New Signals()
+
+			'Assign from TestCaseValues
+			M5._AlternatorsGenerationPowerAtCrankTractionOnWatts = IP1.SI(Of Watt)()
+			M5._AlternatorsGenerationPowerAtCrankIdleWatts = IP2.SI(Of Watt)()
+			Signals.Idle = IP3
+			M6._OverrunFlag = IP4
+			Signals.ClutchEngaged = IP5
+			Signals.InNeutral = IP6
+			M6._SmartElecAndPneumaticAltPowerGenAtCrank = IP7.SI(Of Watt)()
+			M6._SmartElecAndPneumaticAirCompPowerGenAtCrank = IP8.SI(Of Watt)()
+			M6._SmartElecOnlyAltPowerGenAtCrank = IP9.SI(Of Watt)()
+			M6._AveragePowerDemandAtCrankFromPneumatics = IP10.SI(Of Watt)()
+			M6._SmartPneumaticOnlyAirCompPowerGenAtCrank = IP11.SI(Of Watt)()
+
+
+			'Create Instance of M7 from 
+			Dim target As IM7 = New M7(M5, M6, Signals)
+
+			Dim OP1act As Double = target.SmartElectricalAndPneumaticAuxAltPowerGenAtCrank().Value()
+			Dim OP2act As Double = target.SmartElectricalAndPneumaticAuxAirCompPowerGenAtCrank().Value()
+			Dim OP3act As Double = target.SmartElectricalOnlyAuxAltPowerGenAtCrank().Value()
+			Dim OP4act As Double = target.SmartPneumaticOnlyAuxAirCompPowerGenAtCrank.Value()
+
+			Assert.AreEqual(OP1, OP1act, 0.001)
+			Assert.AreEqual(OP2, OP2act, 0.001)
+			Assert.AreEqual(OP3, OP3act, 0.001)
+			Assert.AreEqual(OP4, OP4act, 0.001)
+
+
+			Assert.IsNotNull(target)
+		End Sub
+	End Class
 End Namespace
 
 
-
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M8Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M8Tests.vb
index f411f0e077..6f180ab8bf 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M8Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M8Tests.vb
@@ -5,132 +5,123 @@ Imports VectoAuxiliaries.DownstreamModules
 Imports NUnit.Framework
 Imports VectoAuxiliaries
 Imports Moq
+Imports TUGraz.VectoCommon.Utils
 
 Namespace UnitTests
-
-<TestFixture()> _
-Public Class M8Tests
-
-<Test()> _
-Public Sub CreateInstanceTest()
-
- 'Arrange
- Dim m1MOCK     = New Mock(Of IM1_AverageHVACLoadDemand )()
- Dim m6Mock     = new Mock(Of IM6 )()
- Dim m7MOCK     = New Mock(Of IM7 )()
- Dim sigsMock   = New Mock(Of ISignals)()
- 
- 'Act
- Dim target As IM8 = New M8(m1MOCK.Object, m6Mock.Object, m7MOCK.Object, sigsMock.Object)
-
- 'Assert
- Assert.IsNotNull( target )
-
-End Sub
-
-
-<Test()> _
-<TestCase(10,20,30,40,50,60,70,0,1,FALSE,FALSE,140 ,40 ,1 )> _
-<TestCase(10,20,30,40,50,60,70,1,0,FALSE,TRUE ,120 ,40 ,1 )> _
-<TestCase(10,20,30,40,50,60,70,1,0,TRUE,FALSE ,120 ,20 ,0 )> _
-<TestCase(10,20,30,40,50,60,70,0,1,TRUE,TRUE  , 60 ,20 ,0 )> _
-Public sub ValueInOutTest( IP1 As Single,
-                           IP2 As Single,
-                           IP3 As Single,
-                           IP4 As Single,
-                           IP5 As Single,
-                           IP6 As Single,
-                           IP7 As Single,
-                           IP8 as Integer,
-                           IP9 as Integer,
-                           IP10 As Boolean,
-                           IP11 As Boolean,
-                           OUT1 As Single,
-                           OUT2 As Single,
-                           OUT3 As Single)
-
- 'Arrange
- Dim m1MOCK     = New Mock(Of IM1_AverageHVACLoadDemand )()
- Dim m6Mock     = new Mock(Of IM6 )()
- Dim m7MOCK     = New Mock(Of IM7 )()
- Dim sigsMock   = New Mock(Of ISignals)()
-
- m1MOCK.Setup   ( Function(x) x.AveragePowerDemandAtCrankFromHVACMechanicalsWatts    ).Returns(IP1 )
- m7MOCK.Setup   ( Function(x) x.SmartElectricalAndPneumaticAuxAltPowerGenAtCrank     ).Returns(IP2 )
- m7MOCK.Setup   ( Function(x) x.SmartElectricalAndPneumaticAuxAirCompPowerGenAtCrank ).Returns(IP3 )
- m7MOCK.Setup   ( Function(x) x.SmartElectricalOnlyAuxAltPowerGenAtCrank             ).Returns(IP4 )
- m7MOCK.Setup   ( Function(x) x.SmartPneumaticOnlyAuxAirCompPowerGenAtCrank          ).Returns(IP5 )
- m6Mock.Setup   ( Function(x) x.AvgPowerDemandAtCrankFromElectricsIncHVAC            ).Returns(IP6 )
- m6Mock.Setup   ( Function(x) x.AveragePowerDemandAtCrankFromPneumatics              ).Returns(IP7 )
- m6Mock.Setup   ( Function(x) x.SmartElecAndPneumaticsCompressorFlag                 ).Returns(IP8 )
- m6Mock.Setup   ( Function(x) x.SmartPneumaticsOnlyCompressorFlag                    ).Returns(IP9 )
- sigsMock.Setup ( Function(x) x.SmartPneumatics                                      ).Returns(IP10)
- sigsMock.Setup ( Function(x) x.SmartElectrics                                       ).Returns(IP11)
-
- 'Act
- Dim target As IM8 = New M8(m1MOCK.Object, m6Mock.Object, m7MOCK.Object, sigsMock.Object)
-
-'Assert
- Assert.AreEqual(OUT1, target.AuxPowerAtCrankFromElectricalHVACAndPneumaticsAncillaries )
- Assert.AreEqual(OUT2, target.SmartElectricalAlternatorPowerGenAtCrank                  )
- Assert.AreEqual(OUT3, target.CompressorFlag                                            )
-
-End Sub
-
-<Test()> _
-<TestCase(10,20,30,40,50,60,70,0,1,FALSE,FALSE,TRUE,0 ,40 ,1 )> _
-<TestCase(10,20,30,40,50,60,70,0,1,FALSE,FALSE,FALSE,140 ,40 ,1 )> _
-Public sub TestIdlingFunction( IP1 As Single,
-                               IP2 As Single,
-                               IP3 As Single,
-                               IP4 As Single,
-                               IP5 As Single,
-                               IP6 As Single,
-                               IP7 As Single,
-                               IP8 as Integer,
-                               IP9 as Integer,
-                               IP10 As Boolean,
-                               IP11 As Boolean,
-                               IP12 As Boolean,
-                               OUT1 As Single,
-                               OUT2 As Single,
-                               OUT3 As Single)
-
- 'Arrange
- Dim m1MOCK     = New Mock(Of IM1_AverageHVACLoadDemand )()
- Dim m6Mock     = new Mock(Of IM6 )()
- Dim m7MOCK     = New Mock(Of IM7 )()
- Dim sigsMock   = New Mock(Of ISignals)()
-
- m1MOCK.Setup   ( Function(x) x.AveragePowerDemandAtCrankFromHVACMechanicalsWatts    ).Returns(IP1 )
- m7MOCK.Setup   ( Function(x) x.SmartElectricalAndPneumaticAuxAltPowerGenAtCrank     ).Returns(IP2 )
- m7MOCK.Setup   ( Function(x) x.SmartElectricalAndPneumaticAuxAirCompPowerGenAtCrank ).Returns(IP3 )
- m7MOCK.Setup   ( Function(x) x.SmartElectricalOnlyAuxAltPowerGenAtCrank             ).Returns(IP4 )
- m7MOCK.Setup   ( Function(x) x.SmartPneumaticOnlyAuxAirCompPowerGenAtCrank          ).Returns(IP5 )
- m6Mock.Setup   ( Function(x) x.AvgPowerDemandAtCrankFromElectricsIncHVAC            ).Returns(IP6 )
- m6Mock.Setup   ( Function(x) x.AveragePowerDemandAtCrankFromPneumatics              ).Returns(IP7 )
- m6Mock.Setup   ( Function(x) x.SmartElecAndPneumaticsCompressorFlag                 ).Returns(IP8 )
- m6Mock.Setup   ( Function(x) x.SmartPneumaticsOnlyCompressorFlag                    ).Returns(IP9 )
- sigsMock.Setup ( Function(x) x.SmartPneumatics                                      ).Returns(IP10)
- sigsMock.Setup ( Function(x) x.SmartElectrics                                       ).Returns(IP11)
- sigsMock.Setup ( Function(x) x.EngineStopped                                        ).Returns(IP12)
-
-
- 'Act
- Dim target As IM8 = New M8(m1MOCK.Object, m6Mock.Object, m7MOCK.Object, sigsMock.Object)
-
-'Assert
- Assert.AreEqual(OUT1, target.AuxPowerAtCrankFromElectricalHVACAndPneumaticsAncillaries )
- Assert.AreEqual(OUT2, target.SmartElectricalAlternatorPowerGenAtCrank                  )
- Assert.AreEqual(OUT3, target.CompressorFlag                                            )
-
-End Sub
-
-
-
-End Class
-
+	<TestFixture()>
+	Public Class M8Tests
+		<Test()>
+		Public Sub CreateInstanceTest()
+
+			'Arrange
+			Dim m1MOCK = New Mock(Of IM1_AverageHVACLoadDemand)()
+			Dim m6Mock = New Mock(Of IM6)()
+			Dim m7MOCK = New Mock(Of IM7)()
+			Dim sigsMock = New Mock(Of ISignals)()
+
+			'Act
+			Dim target As IM8 = New M8(m1MOCK.Object, m6Mock.Object, m7MOCK.Object, sigsMock.Object)
+
+			'Assert
+			Assert.IsNotNull(target)
+		End Sub
+
+
+		<Test()> _
+		<TestCase(10, 20, 30, 40, 50, 60, 70, 0, 1, False, False, 140, 40, True)> _
+		<TestCase(10, 20, 30, 40, 50, 60, 70, 1, 0, False, True, 120, 40, True)> _
+		<TestCase(10, 20, 30, 40, 50, 60, 70, 1, 0, True, False, 120, 20, False)> _
+		<TestCase(10, 20, 30, 40, 50, 60, 70, 0, 1, True, True, 60, 20, False)>
+		Public Sub ValueInOutTest(IP1 As Double,
+								IP2 As Double,
+								IP3 As Double,
+								IP4 As Double,
+								IP5 As Double,
+								IP6 As Double,
+								IP7 As Double,
+								IP8 As Integer,
+								IP9 As Integer,
+								IP10 As Boolean,
+								IP11 As Boolean,
+								OUT1 As Double,
+								OUT2 As Double,
+								OUT3 As Boolean)
+
+			'Arrange
+			Dim m1MOCK = New Mock(Of IM1_AverageHVACLoadDemand)()
+			Dim m6Mock = New Mock(Of IM6)()
+			Dim m7MOCK = New Mock(Of IM7)()
+			Dim sigsMock = New Mock(Of ISignals)()
+
+			m1MOCK.Setup(Function(x) x.AveragePowerDemandAtCrankFromHVACMechanicalsWatts).Returns(IP1.SI(Of Watt))
+			m7MOCK.Setup(Function(x) x.SmartElectricalAndPneumaticAuxAltPowerGenAtCrank()).Returns(IP2.SI(Of Watt))
+			m7MOCK.Setup(Function(x) x.SmartElectricalAndPneumaticAuxAirCompPowerGenAtCrank()).Returns(IP3.SI(Of Watt))
+			m7MOCK.Setup(Function(x) x.SmartElectricalOnlyAuxAltPowerGenAtCrank()).Returns(IP4.SI(Of Watt))
+			m7MOCK.Setup(Function(x) x.SmartPneumaticOnlyAuxAirCompPowerGenAtCrank).Returns(IP5.SI(Of Watt))
+			m6Mock.Setup(Function(x) x.AvgPowerDemandAtCrankFromElectricsIncHVAC).Returns(IP6.SI(Of Watt))
+			m6Mock.Setup(Function(x) x.AveragePowerDemandAtCrankFromPneumatics).Returns(IP7.SI(Of Watt))
+			m6Mock.Setup(Function(x) x.SmartElecAndPneumaticsCompressorFlag).Returns(IP8)
+			m6Mock.Setup(Function(x) x.SmartPneumaticsOnlyCompressorFlag).Returns(IP9)
+			sigsMock.Setup(Function(x) x.SmartPneumatics).Returns(IP10)
+			sigsMock.Setup(Function(x) x.SmartElectrics).Returns(IP11)
+
+			'Act
+			Dim target As IM8 = New M8(m1MOCK.Object, m6Mock.Object, m7MOCK.Object, sigsMock.Object)
+
+			'Assert
+			Assert.AreEqual(OUT1, target.AuxPowerAtCrankFromElectricalHVACAndPneumaticsAncillaries.Value(), 0.001)
+			Assert.AreEqual(OUT2, target.SmartElectricalAlternatorPowerGenAtCrank.Value(), 0.001)
+			Assert.AreEqual(OUT3, target.CompressorFlag)
+		End Sub
+
+		<Test()> _
+		<TestCase(10, 20, 30, 40, 50, 60, 70, 0, 1, False, False, True, 0, 40, True)> _
+		<TestCase(10, 20, 30, 40, 50, 60, 70, 0, 1, False, False, False, 140, 40, True)>
+		Public Sub TestIdlingFunction(IP1 As Double,
+									IP2 As Double,
+									IP3 As Double,
+									IP4 As Double,
+									IP5 As Double,
+									IP6 As Double,
+									IP7 As Double,
+									IP8 As Integer,
+									IP9 As Integer,
+									IP10 As Boolean,
+									IP11 As Boolean,
+									IP12 As Boolean,
+									OUT1 As Double,
+									OUT2 As Double,
+									OUT3 As Boolean)
+
+			'Arrange
+			Dim m1MOCK = New Mock(Of IM1_AverageHVACLoadDemand)()
+			Dim m6Mock = New Mock(Of IM6)()
+			Dim m7MOCK = New Mock(Of IM7)()
+			Dim sigsMock = New Mock(Of ISignals)()
+
+			m1MOCK.Setup(Function(x) x.AveragePowerDemandAtCrankFromHVACMechanicalsWatts).Returns(IP1.SI(Of Watt))
+			m7MOCK.Setup(Function(x) x.SmartElectricalAndPneumaticAuxAltPowerGenAtCrank()).Returns(IP2.SI(Of Watt))
+			m7MOCK.Setup(Function(x) x.SmartElectricalAndPneumaticAuxAirCompPowerGenAtCrank()).Returns(IP3.SI(Of Watt))
+			m7MOCK.Setup(Function(x) x.SmartElectricalOnlyAuxAltPowerGenAtCrank()).Returns(IP4.SI(Of Watt))
+			m7MOCK.Setup(Function(x) x.SmartPneumaticOnlyAuxAirCompPowerGenAtCrank).Returns(IP5.SI(Of Watt))
+			m6Mock.Setup(Function(x) x.AvgPowerDemandAtCrankFromElectricsIncHVAC).Returns(IP6.SI(Of Watt))
+			m6Mock.Setup(Function(x) x.AveragePowerDemandAtCrankFromPneumatics).Returns(IP7.SI(Of Watt))
+			m6Mock.Setup(Function(x) x.SmartElecAndPneumaticsCompressorFlag).Returns(IP8)
+			m6Mock.Setup(Function(x) x.SmartPneumaticsOnlyCompressorFlag).Returns(IP9)
+			sigsMock.Setup(Function(x) x.SmartPneumatics).Returns(IP10)
+			sigsMock.Setup(Function(x) x.SmartElectrics).Returns(IP11)
+			sigsMock.Setup(Function(x) x.EngineStopped).Returns(IP12)
+
+
+			'Act
+			Dim target As IM8 = New M8(m1MOCK.Object, m6Mock.Object, m7MOCK.Object, sigsMock.Object)
+
+			'Assert
+			Assert.AreEqual(OUT1, target.AuxPowerAtCrankFromElectricalHVACAndPneumaticsAncillaries.Value(), 0.001)
+			Assert.AreEqual(OUT2, target.SmartElectricalAlternatorPowerGenAtCrank.Value(), 0.001)
+			Assert.AreEqual(OUT3, target.CompressorFlag)
+		End Sub
+	End Class
 End Namespace
 
 
-
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb
index 4af64fab9a..ea356b0f88 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb
@@ -5,31 +5,32 @@ Imports VectoAuxiliaries.DownstreamModules
 Imports NUnit.Framework
 Imports VectoAuxiliaries
 Imports Moq
+Imports TUGraz.VectoCommon.Utils
 
 Namespace UnitTests
 	<TestFixture()>
 	Public Class M9Tests
 		<Test()> _
-		<TestCase(50, 50, 400, 200, 100, 1200, 50, 0, 0, 0.5F, False, 50.0F, 0, 0.181108221F, 0.180887148F)> _
-		<TestCase(50, 50, 400, 200, 100, 1200, 50, 1, 0, 0.5F, False, 50.0F, 0, 0.181108221F, 0.180887148F)> _
-		<TestCase(50, 50, 400, 200, 100, 1200, 50, 0, 1, 0.5F, False, 50.0F, 0, 0.181108221F, 0.180887148F)> _
-		<TestCase(50, 50, 400, 200, 100, 1200, 50, 1, 1, 0.5F, False, 50.0F, 0, 0.181108221F, 0.180887148F)> _
-		<TestCase(50, 50, 400, 200, 100, 1200, 50, 1, 1, 0.5F, True, 0, 0, 0, 0)>
-		Public Sub ValuesInOutTests(IP1 As Single,
-									IP2 As Single,
-									IP3 As Single,
-									IP4 As Single,
-									IP5 As Single,
-									IP6 As Single,
-									IP7 As Single,
-									IP8 As Single,
-									IP9 As Single,
-									IP10 As Single,
+		<TestCase(50, 50, 400, 200, 100, 1200, 50, 0, 0, 0.5, False, 50.0F, 0, 0.181108221, 0.180887148)> _
+		<TestCase(50, 50, 400, 200, 100, 1200, 50, 1, 0, 0.5, False, 50.0F, 0, 0.181108221, 0.180887148)> _
+		<TestCase(50, 50, 400, 200, 100, 1200, 50, 0, 1, 0.5, False, 50.0F, 0, 0.181108221, 0.180887148)> _
+		<TestCase(50, 50, 400, 200, 100, 1200, 50, 1, 1, 0.5, False, 50.0F, 0, 0.181108221, 0.180887148)> _
+		<TestCase(50, 50, 400, 200, 100, 1200, 50, 1, 1, 0.5, True, 0, 0, 0, 0)>
+		Public Sub ValuesInOutTests(IP1 As Double,
+									IP2 As Double,
+									IP3 As Double,
+									IP4 As Double,
+									IP5 As Double,
+									IP6 As Double,
+									IP7 As Double,
+									IP8 As Double,
+									IP9 As Double,
+									IP10 As Double,
 									IP11 As Boolean,
-									AG1 As Single,
-									AG2 As Single,
-									AG3 As Single,
-									AG4 As Single)
+									AG1 As Double,
+									AG2 As Double,
+									AG3 As Double,
+									AG4 As Double)
 
 			Dim m1Mock As New Mock(Of IM1_AverageHVACLoadDemand)
 			Dim m4Mock As New Mock(Of IM4_AirCompressor)
@@ -39,13 +40,13 @@ Namespace UnitTests
 			Dim sgnlsMock As New Mock(Of ISignals)
 			Dim psac As New Mock(Of IPneumaticsAuxilliariesConfig)
 
-			m6Mock.Setup(Function(x) x.AvgPowerDemandAtCrankFromElectricsIncHVAC).Returns(IP1)
-			m1Mock.Setup(Function(x) x.AveragePowerDemandAtCrankFromHVACMechanicalsWatts).Returns(IP2)
-			m4Mock.Setup(Function(x) x.GetPowerCompressorOn).Returns(IP3)
-			m4Mock.Setup(Function(x) x.GetPowerCompressorOff).Returns(IP4)
+			m6Mock.Setup(Function(x) x.AvgPowerDemandAtCrankFromElectricsIncHVAC).Returns(IP1.SI(Of Watt))
+			m1Mock.Setup(Function(x) x.AveragePowerDemandAtCrankFromHVACMechanicalsWatts).Returns(IP2.SI(Of Watt))
+			m4Mock.Setup(Function(x) x.GetPowerCompressorOn).Returns(IP3.SI(Of Watt))
+			m4Mock.Setup(Function(x) x.GetPowerCompressorOff).Returns(IP4.SI(Of Watt))
 			sgnlsMock.Setup(Function(x) x.EngineDrivelineTorque).Returns(IP5)
 			sgnlsMock.Setup(Function(x) x.EngineSpeed).Returns(IP6)
-			m4Mock.Setup(Function(x) x.GetFlowRate).Returns(IP7)
+			m4Mock.Setup(Function(x) x.GetFlowRate).Returns(IP7.SI(Of NormLiterPerSecond))
 			m6Mock.Setup(Function(x) x.OverrunFlag).Returns(IP8)
 			m8Mock.Setup(Function(x) x.CompressorFlag).Returns(IP9)
 			psac.Setup(Function(x) x.OverrunUtilisationForCompressionFraction).Returns(IP10)
@@ -55,32 +56,32 @@ Namespace UnitTests
 				target As _
 					New M9(m1Mock.Object, m4Mock.Object, m6Mock.Object, m8Mock.Object, fMapMock, psac.Object, sgnlsMock.Object)
 
-			target.CycleStep(1)
+			target.CycleStep(1.SI(Of Second))
 
-			Assert.AreEqual(target.LitresOfAirCompressorOnContinually, AG1)
-			Assert.AreEqual(target.LitresOfAirCompressorOnOnlyInOverrun, AG2)
-			Assert.AreEqual(target.TotalCycleFuelConsumptionCompressorOnContinuously, AG3, 0.000001)
-			Assert.AreEqual(target.TotalCycleFuelConsumptionCompressorOffContinuously, AG4, 0.000001)
+			Assert.AreEqual(target.LitresOfAirCompressorOnContinually.Value(), AG1, 0.000001)
+			Assert.AreEqual(target.LitresOfAirCompressorOnOnlyInOverrun.Value(), AG2, 0.000001)
+			Assert.AreEqual(target.TotalCycleFuelConsumptionCompressorOnContinuously.Value(), AG3, 0.000001)
+			Assert.AreEqual(target.TotalCycleFuelConsumptionCompressorOffContinuously.Value(), AG4, 0.000001)
 		End Sub
 
 
 		<Test()> _
 		<TestCase(50, 50, 400, 200, 100, 1200, 50, 0, 0, 0.5F, False, 50.0F, 0, 0.181108221F, 0.180887148F)>
-		Public Sub NEGATIVEINTERPADJUSTMENTValuesInOutTests(IP1 As Single,
-															IP2 As Single,
-															IP3 As Single,
-															IP4 As Single,
-															IP5 As Single,
-															IP6 As Single,
-															IP7 As Single,
-															IP8 As Single,
-															IP9 As Single,
-															IP10 As Single,
+		Public Sub NEGATIVEINTERPADJUSTMENTValuesInOutTests(IP1 As Double,
+															IP2 As Double,
+															IP3 As Double,
+															IP4 As Double,
+															IP5 As Double,
+															IP6 As Double,
+															IP7 As Double,
+															IP8 As Double,
+															IP9 As Double,
+															IP10 As Double,
 															IP11 As Boolean,
-															AG1 As Single,
-															AG2 As Single,
-															AG3 As Single,
-															AG4 As Single)
+															AG1 As Double,
+															AG2 As Double,
+															AG3 As Double,
+															AG4 As Double)
 
 			Dim m1Mock As New Mock(Of IM1_AverageHVACLoadDemand)
 			Dim m4Mock As New Mock(Of IM4_AirCompressor)
@@ -90,14 +91,14 @@ Namespace UnitTests
 			Dim sgnlsMock As New Mock(Of ISignals)
 			Dim psac As New Mock(Of IPneumaticsAuxilliariesConfig)
 
-			fMapMock.Setup(Function(x) x.GetFuelConsumption(1, 1)).Returns(-1)
-			m6Mock.Setup(Function(x) x.AvgPowerDemandAtCrankFromElectricsIncHVAC).Returns(IP1)
-			m1Mock.Setup(Function(x) x.AveragePowerDemandAtCrankFromHVACMechanicalsWatts).Returns(IP2)
-			m4Mock.Setup(Function(x) x.GetPowerCompressorOn).Returns(IP3)
-			m4Mock.Setup(Function(x) x.GetPowerCompressorOff).Returns(IP4)
+			fMapMock.Setup(Function(x) x.GetFuelConsumption(1.SI(Of NewtonMeter), 1)).Returns(-1.SI(Of GramPerSecond)())
+			m6Mock.Setup(Function(x) x.AvgPowerDemandAtCrankFromElectricsIncHVAC).Returns(IP1.SI(Of Watt))
+			m1Mock.Setup(Function(x) x.AveragePowerDemandAtCrankFromHVACMechanicalsWatts).Returns(IP2.SI(Of Watt))
+			m4Mock.Setup(Function(x) x.GetPowerCompressorOn).Returns(IP3.SI(Of Watt))
+			m4Mock.Setup(Function(x) x.GetPowerCompressorOff).Returns(IP4.SI(Of Watt))
 			sgnlsMock.Setup(Function(x) x.EngineDrivelineTorque).Returns(IP5)
 			sgnlsMock.Setup(Function(x) x.EngineSpeed).Returns(IP6)
-			m4Mock.Setup(Function(x) x.GetFlowRate).Returns(IP7)
+			m4Mock.Setup(Function(x) x.GetFlowRate).Returns(IP7.SI(Of NormLiterPerSecond))
 			m6Mock.Setup(Function(x) x.OverrunFlag).Returns(IP8)
 			m8Mock.Setup(Function(x) x.CompressorFlag).Returns(IP9)
 			psac.Setup(Function(x) x.OverrunUtilisationForCompressionFraction).Returns(IP10)
@@ -107,12 +108,12 @@ Namespace UnitTests
 				target As _
 					New M9(m1Mock.Object, m4Mock.Object, m6Mock.Object, m8Mock.Object, fMapMock.Object, psac.Object, sgnlsMock.Object)
 
-			target.CycleStep(1)
+			target.CycleStep(1.SI(Of Second))
 
-			Assert.AreEqual(target.LitresOfAirCompressorOnContinually, AG1)
-			Assert.AreEqual(target.LitresOfAirCompressorOnOnlyInOverrun, AG2)
-			Assert.AreEqual(target.TotalCycleFuelConsumptionCompressorOnContinuously, 0)
-			Assert.AreEqual(target.TotalCycleFuelConsumptionCompressorOffContinuously, 0)
+			Assert.AreEqual(target.LitresOfAirCompressorOnContinually.Value(), AG1, 0.000001)
+			Assert.AreEqual(target.LitresOfAirCompressorOnOnlyInOverrun.Value(), AG2, 0.000001)
+			Assert.AreEqual(target.TotalCycleFuelConsumptionCompressorOnContinuously.Value(), 0, 0.000001)
+			Assert.AreEqual(target.TotalCycleFuelConsumptionCompressorOffContinuously.Value(), 0, 0.000001)
 		End Sub
 	End Class
 End Namespace
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/ResultCardTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/ResultCardTests.vb
index 4cca398036..130b56579f 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/ResultCardTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/ResultCardTests.vb
@@ -1,202 +1,178 @@
 Imports NUnit.Framework
+Imports TUGraz.VectoCommon.Utils
 Imports VectoAuxiliaries.Electrics
 
 <TestFixture()>
 Public Class ResultCardTests
+	Private results As New List(Of SmartResult)
+	Private unorderedResults As New List(Of SmartResult)
 
-Private results As New List(Of SmartResult)
-Private unorderedResults As New List(of SmartResult)
+	Private resultCard As ResultCard
+	Private unorderedResultCard As ResultCard
 
-Private resultCard As ResultCard
-Private unorderedResultCard As ResultCard
 
+	Public Sub New()
 
-Public Sub New()
+		results.Add(New SmartResult(20, 18))
+		results.Add(New SmartResult(30, 27))
+		results.Add(New SmartResult(40, 36))
+		results.Add(New SmartResult(50, 45))
 
-results.Add(new SmartResult(20, 18))
-results.Add(new SmartResult(30, 27))
-results.Add(new SmartResult(40, 36))
-results.Add(new SmartResult(50, 45))
+		unorderedResults.Add(New SmartResult(40, 36))
+		unorderedResults.Add(New SmartResult(30, 27))
+		unorderedResults.Add(New SmartResult(50, 45))
+		unorderedResults.Add(New SmartResult(20, 18))
 
-unorderedResults.Add(new SmartResult(40, 36))
-unorderedResults.Add(new SmartResult(30, 27))
-unorderedResults.Add(new SmartResult(50, 45))
-unorderedResults.Add(new SmartResult(20, 18))
+		'results.Add(60, 54)
 
-'results.Add(60, 54)
+		resultCard = New ResultCard(results)
 
-resultCard = New ResultCard(results)
+		unorderedResultCard = New ResultCard(unorderedResults)
+	End Sub
 
-unorderedResultCard = New ResultCard( unorderedResults)
 
+	<Test()>
+	Public Sub CreateNewResultsOKTest()
 
+		Dim target As New ResultCard(results)
 
-End Sub
+		Assert.IsNotNull(target)
+	End Sub
 
+	<Test()>
+	<ExpectedException("System.ArgumentException")>
+	Public Sub CreateNewBanResultsNullTest()
 
-<Test()>
-Public Sub CreateNewResultsOKTest()
+		Dim target As New ResultCard(Nothing)
 
- Dim target As New ResultCard(results)
+		Assert.IsNotNull(target)
+	End Sub
 
- Assert.IsNotNull(target)
 
-End Sub
+	<Test()>
+	Public Sub GetBotomBoundryValueTest()
 
-<Test()>
-<ExpectedException("System.ArgumentException")>
-Public Sub CreateNewBanResultsNullTest()
+		Dim expected As Single = 18
+		Dim actual As Ampere = resultCard.GetSmartCurrentResult(20.SI(Of Ampere))
 
- Dim target As New ResultCard(Nothing)
+		Assert.AreEqual(expected, actual.Value(), 0.001)
+	End Sub
 
- Assert.IsNotNull(target)
 
-End Sub
+	<Test()>
+	Public Sub UnorderedGetBotomBoundryValueTest()
 
+		Dim expected As Single = 18
+		Dim actual As Ampere = unorderedResultCard.GetSmartCurrentResult(20.SI(Of Ampere))
 
+		Assert.AreEqual(expected, actual.Value(), 0.001)
+	End Sub
 
 
-<Test()>
-Public Sub GetBotomBoundryValueTest()
+	<Test()>
+	Public Sub GetCentreBoundayValueTest()
 
-Dim expected As Single = 18
-Dim actual As Single = resultCard.GetSmartCurrentResult(20)
+		Dim expected As Single = 36
+		Dim actual As Ampere = resultCard.GetSmartCurrentResult(40.SI(Of Ampere))
 
-Assert.AreEqual(expected, actual)
+		Assert.AreEqual(expected, actual.Value(), 0.001)
+	End Sub
 
-End Sub
 
+	<Test()>
+	Public Sub UnorderedGetCentreBoundayValueTest()
 
-<Test()>
-Public Sub UnorderedGetBotomBoundryValueTest()
+		Dim expected As Single = 36
+		Dim actual As Ampere = unorderedResultCard.GetSmartCurrentResult(40.SI(Of Ampere))
 
-Dim expected As Single = 18
-Dim actual As Single = unorderedResultCard.GetSmartCurrentResult(20)
+		Assert.AreEqual(expected, actual.Value(), 0.001)
+	End Sub
 
-Assert.AreEqual(expected, actual)
 
-End Sub
+	<Test()>
+	Public Sub GetTopBoundaryValueTest()
 
+		Dim expected As Single = 45
+		Dim actual As Ampere = resultCard.GetSmartCurrentResult(50.SI(Of Ampere))
 
-<Test()>
-Public Sub GetCentreBoundayValueTest()
+		Assert.AreEqual(expected, actual.Value(), 0.001)
+	End Sub
 
-Dim expected As Single = 36
-Dim actual As Single = resultCard.GetSmartCurrentResult(40)
+	<Test()>
+	Public Sub UnorderedGetTopBoundaryValueTest()
 
-Assert.AreEqual(expected, actual)
+		Dim expected As Single = 45
+		Dim actual As Ampere = unorderedResultCard.GetSmartCurrentResult(50.SI(Of Ampere))
 
+		Assert.AreEqual(expected, actual.Value(), 0.001)
+	End Sub
 
-End Sub
 
+	<Test()>
+	Public Sub GetInterpolatedValue35AmpsTest()
 
-<Test()>
-Public Sub UnorderedGetCentreBoundayValueTest()
+		Dim expected As Single = 31.5
+		Dim actual As Ampere = resultCard.GetSmartCurrentResult(35.SI(Of Ampere))
 
-Dim expected As Single = 36
-Dim actual As Single = unorderedResultCard.GetSmartCurrentResult(40)
+		Assert.AreEqual(expected, actual.Value(), 0.001)
+	End Sub
 
-Assert.AreEqual(expected, actual)
 
+	<Test()>
+	Public Sub UnorderedGetInterpolatedValue35AmpsTest()
 
-End Sub
+		Dim expected As Single = 31.5
+		Dim actual As Ampere = unorderedResultCard.GetSmartCurrentResult(35.SI(Of Ampere))
 
+		Assert.AreEqual(expected, actual.Value(), 0.001)
+	End Sub
 
-<Test()>
-Public Sub GetTopBoundaryValueTest()
+	<Test()>
+	Public Sub GetExtrapolatedValue60AmpsTest()
 
-Dim expected As Single = 45
-Dim actual As Single = resultCard.GetSmartCurrentResult(50)
+		Dim expected As Single = 54
+		Dim actual As Ampere = resultCard.GetSmartCurrentResult(60.SI(Of Ampere))
 
-Assert.AreEqual(expected, actual)
+		Assert.AreEqual(expected, actual.Value(), 0.001)
+	End Sub
 
-End Sub
+	<Test()>
+	Public Sub UnorderedGetExtrapolatedValue60AmpsTest()
 
-<Test()>
-Public Sub UnorderedGetTopBoundaryValueTest()
+		Dim expected As Single = 54
+		Dim actual As Ampere = unorderedResultCard.GetSmartCurrentResult(60.SI(Of Ampere))
 
-Dim expected As Single = 45
-Dim actual As Single = unorderedResultCard.GetSmartCurrentResult(50)
+		Assert.AreEqual(expected, actual.Value(), 0.001)
+	End Sub
 
-Assert.AreEqual(expected, actual)
+	<Test()>
+	Public Sub GetExtrapolatedValue10AmpsTest()
 
-End Sub
+		Dim expected As Single = 9
+		Dim actual As Ampere = resultCard.GetSmartCurrentResult(10.SI(Of Ampere))
 
+		Assert.AreEqual(expected, actual.Value(), 0.001)
+	End Sub
 
-<Test()>
-Public Sub GetInterpolatedValue35AmpsTest()
+	<Test()>
+	Public Sub UnorderedGetExtrapolatedValue10AmpsTest()
 
-Dim expected As Single = 31.5
-Dim actual As Single = resultCard.GetSmartCurrentResult(35)
+		Dim expected As Single = 9
+		Dim actual As Ampere = unorderedResultCard.GetSmartCurrentResult(10.SI(Of Ampere))
 
-Assert.AreEqual(expected, actual)
+		Assert.AreEqual(expected, actual.Value(), 0.001)
+	End Sub
 
-End Sub
 
+	<Test()>
+	Public Sub EmptyOrInsufficientResultsTest()
 
-<Test()>
-Public Sub UnorderedGetInterpolatedValue35AmpsTest()
-
-Dim expected As Single = 31.5
-Dim actual As Single = unorderedResultCard.GetSmartCurrentResult(35)
-
-Assert.AreEqual(expected, actual)
-
-End Sub
-
-<Test()>
-Public Sub GetExtrapolatedValue60AmpsTest()
-
-Dim expected As Single = 54
-Dim actual As Single = resultCard.GetSmartCurrentResult(60)
-
-Assert.AreEqual(expected, actual)
-
-End Sub
-
-<Test()>
-Public Sub UnorderedGetExtrapolatedValue60AmpsTest()
-
-Dim expected As Single = 54
-Dim actual As Single = unorderedResultCard.GetSmartCurrentResult(60)
-
-Assert.AreEqual(expected, actual)
-
-End Sub
-
-<Test()>
-Public Sub GetExtrapolatedValue10AmpsTest()
-
-Dim expected As Single = 9
-Dim actual As Single = resultCard.GetSmartCurrentResult(10)
-
-Assert.AreEqual(expected, actual)
-
-End Sub
-
-<Test()>
-Public Sub UnorderedGetExtrapolatedValue10AmpsTest()
-
-Dim expected As Single = 9
-Dim actual As Single = unorderedResultCard.GetSmartCurrentResult(10)
-
-Assert.AreEqual(expected, actual)
-
-End Sub
-
-
-<Test()>
-Public Sub EmptyOrInsufficientResultsTest()
-
-Dim resultSet As new List(Of SmartResult)
-
-Dim expected As Single = 10
-Dim actual As Single = (New ResultCard(resultSet)).GetSmartCurrentResult(10)
-
-Assert.AreEqual(expected, actual)
-
-End Sub
+		Dim resultSet As New List(Of SmartResult)
 
+		Dim expected As Single = 10
+		Dim actual As Ampere = (New ResultCard(resultSet)).GetSmartCurrentResult(10.SI(Of Ampere))
 
+		Assert.AreEqual(expected, actual.Value(), 0.001)
+	End Sub
 End Class
 
-- 
GitLab