diff --git a/VECTO/GUI/MainForm.Designer.vb b/VECTO/GUI/MainForm.Designer.vb
index d1f43898f3e7e3326c0fd1f583aeb892a9c9e330..53e8d3fd348d7003c1c13700131f0a86fa83d20a 100644
--- a/VECTO/GUI/MainForm.Designer.vb
+++ b/VECTO/GUI/MainForm.Designer.vb
@@ -59,6 +59,8 @@ Partial Class MainForm
         Me.ButtonGENadd = New System.Windows.Forms.Button()
         Me.TabPgOptions = New System.Windows.Forms.TabPage()
         Me.PanelOptAllg = New System.Windows.Forms.Panel()
+        Me.gbXMLHashValidation = New System.Windows.Forms.GroupBox()
+        Me.cbValidateXMLDeclarationJobs = New System.Windows.Forms.CheckBox()
         Me.GroupBox4 = New System.Windows.Forms.GroupBox()
         Me.BtTCfileBrowse = New System.Windows.Forms.Button()
         Me.tbOutputFolder = New System.Windows.Forms.TextBox()
@@ -126,6 +128,7 @@ Partial Class MainForm
         CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).BeginInit
         Me.TabPgOptions.SuspendLayout
         Me.PanelOptAllg.SuspendLayout
+        Me.gbXMLHashValidation.SuspendLayout
         Me.GroupBox4.SuspendLayout
         Me.GroupBox3.SuspendLayout
         Me.GroupBox2.SuspendLayout
@@ -142,6 +145,7 @@ Partial Class MainForm
         '
         'StatusBAR
         '
+        Me.StatusBAR.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.StatusBAR.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripLbStatus, Me.ToolStripProgBarJob, Me.ToolStripProgBarOverall})
         Me.StatusBAR.Location = New System.Drawing.Point(0, 648)
         Me.StatusBAR.Name = "StatusBAR"
@@ -380,6 +384,7 @@ Partial Class MainForm
         '
         'PanelOptAllg
         '
+        Me.PanelOptAllg.Controls.Add(Me.gbXMLHashValidation)
         Me.PanelOptAllg.Controls.Add(Me.GroupBox4)
         Me.PanelOptAllg.Controls.Add(Me.GroupBox3)
         Me.PanelOptAllg.Controls.Add(Me.GroupBox2)
@@ -389,6 +394,26 @@ Partial Class MainForm
         Me.PanelOptAllg.Size = New System.Drawing.Size(1022, 290)
         Me.PanelOptAllg.TabIndex = 0
         '
+        'gbXMLHashValidation
+        '
+        Me.gbXMLHashValidation.Controls.Add(Me.cbValidateXMLDeclarationJobs)
+        Me.gbXMLHashValidation.Location = New System.Drawing.Point(183, 56)
+        Me.gbXMLHashValidation.Name = "gbXMLHashValidation"
+        Me.gbXMLHashValidation.Size = New System.Drawing.Size(260, 72)
+        Me.gbXMLHashValidation.TabIndex = 20
+        Me.gbXMLHashValidation.TabStop = false
+        Me.gbXMLHashValidation.Text = "XML Declaration Jobs"
+        '
+        'cbValidateXMLDeclarationJobs
+        '
+        Me.cbValidateXMLDeclarationJobs.AutoSize = true
+        Me.cbValidateXMLDeclarationJobs.Location = New System.Drawing.Point(6, 19)
+        Me.cbValidateXMLDeclarationJobs.Name = "cbValidateXMLDeclarationJobs"
+        Me.cbValidateXMLDeclarationJobs.Size = New System.Drawing.Size(222, 17)
+        Me.cbValidateXMLDeclarationJobs.TabIndex = 0
+        Me.cbValidateXMLDeclarationJobs.Text = "Validate Hashes of XML Declaration Jobs"
+        Me.cbValidateXMLDeclarationJobs.UseVisualStyleBackColor = true
+        '
         'GroupBox4
         '
         Me.GroupBox4.Controls.Add(Me.BtTCfileBrowse)
@@ -546,6 +571,7 @@ Partial Class MainForm
         Me.LvDEVoptions.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader4, Me.ColumnHeader7, Me.ColumnHeader5, Me.ColumnHeader6, Me.ColumnHeader8, Me.ColumnHeader9})
         Me.LvDEVoptions.FullRowSelect = true
         Me.LvDEVoptions.GridLines = true
+        Me.LvDEVoptions.HideSelection = false
         Me.LvDEVoptions.Location = New System.Drawing.Point(6, 6)
         Me.LvDEVoptions.MultiSelect = false
         Me.LvDEVoptions.Name = "LvDEVoptions"
@@ -586,6 +612,7 @@ Partial Class MainForm
         '
         'ConMenFilelist
         '
+        Me.ConMenFilelist.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.ConMenFilelist.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ShowInFolderMenuItem, Me.SaveListToolStripMenuItem, Me.LoadListToolStripMenuItem, Me.LoadDefaultListToolStripMenuItem, Me.ClearListToolStripMenuItem})
         Me.ConMenFilelist.Name = "ConMenFilelist"
         Me.ConMenFilelist.ShowImageMargin = false
@@ -631,6 +658,7 @@ Partial Class MainForm
         Me.LvMsg.FullRowSelect = true
         Me.LvMsg.GridLines = true
         Me.LvMsg.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable
+        Me.LvMsg.HideSelection = false
         Me.LvMsg.LabelWrap = false
         Me.LvMsg.Location = New System.Drawing.Point(0, 0)
         Me.LvMsg.Margin = New System.Windows.Forms.Padding(0)
@@ -681,10 +709,11 @@ Partial Class MainForm
         '
         Me.ToolStrip1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
         Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
+        Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripSeparator2, Me.ToolStripDrDnBtTools, Me.ToolStripDrDnBtInfo})
         Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
         Me.ToolStrip1.Name = "ToolStrip1"
-        Me.ToolStrip1.Size = New System.Drawing.Size(1045, 25)
+        Me.ToolStrip1.Size = New System.Drawing.Size(1045, 31)
         Me.ToolStrip1.TabIndex = 11
         Me.ToolStrip1.Text = "ToolStrip1"
         '
@@ -694,7 +723,7 @@ Partial Class MainForm
         Me.ToolStripBtNew.Image = Global.TUGraz.VECTO.My.Resources.Resources.blue_document_icon
         Me.ToolStripBtNew.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripBtNew.Name = "ToolStripBtNew"
-        Me.ToolStripBtNew.Size = New System.Drawing.Size(23, 22)
+        Me.ToolStripBtNew.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripBtNew.Text = "ToolStripBtNew"
         Me.ToolStripBtNew.ToolTipText = "New Job File"
         '
@@ -704,14 +733,14 @@ Partial Class MainForm
         Me.ToolStripBtOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
         Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripBtOpen.Name = "ToolStripBtOpen"
-        Me.ToolStripBtOpen.Size = New System.Drawing.Size(23, 22)
+        Me.ToolStripBtOpen.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripBtOpen.Text = "ToolStripButton1"
         Me.ToolStripBtOpen.ToolTipText = "Open File..."
         '
         'ToolStripSeparator2
         '
         Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
-        Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 25)
+        Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 31)
         '
         'ToolStripDrDnBtTools
         '
@@ -719,66 +748,66 @@ Partial Class MainForm
         Me.ToolStripDrDnBtTools.Image = Global.TUGraz.VECTO.My.Resources.Resources.Misc_Tools_icon
         Me.ToolStripDrDnBtTools.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripDrDnBtTools.Name = "ToolStripDrDnBtTools"
-        Me.ToolStripDrDnBtTools.Size = New System.Drawing.Size(63, 22)
+        Me.ToolStripDrDnBtTools.Size = New System.Drawing.Size(71, 28)
         Me.ToolStripDrDnBtTools.Text = "Tools"
         '
         'GENEditorToolStripMenuItem1
         '
         Me.GENEditorToolStripMenuItem1.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
         Me.GENEditorToolStripMenuItem1.Name = "GENEditorToolStripMenuItem1"
-        Me.GENEditorToolStripMenuItem1.Size = New System.Drawing.Size(152, 22)
+        Me.GENEditorToolStripMenuItem1.Size = New System.Drawing.Size(160, 30)
         Me.GENEditorToolStripMenuItem1.Text = "Job Editor"
         '
         'EPTPJobEditorToolStripMenuItem
         '
         Me.EPTPJobEditorToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
         Me.EPTPJobEditorToolStripMenuItem.Name = "EPTPJobEditorToolStripMenuItem"
-        Me.EPTPJobEditorToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
+        Me.EPTPJobEditorToolStripMenuItem.Size = New System.Drawing.Size(160, 30)
         Me.EPTPJobEditorToolStripMenuItem.Text = "VTP Job Editor"
         '
         'VEHEditorToolStripMenuItem
         '
         Me.VEHEditorToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VEH
         Me.VEHEditorToolStripMenuItem.Name = "VEHEditorToolStripMenuItem"
-        Me.VEHEditorToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
+        Me.VEHEditorToolStripMenuItem.Size = New System.Drawing.Size(160, 30)
         Me.VEHEditorToolStripMenuItem.Text = "Vehicle Editor"
         '
         'EngineEditorToolStripMenuItem
         '
         Me.EngineEditorToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_ENG
         Me.EngineEditorToolStripMenuItem.Name = "EngineEditorToolStripMenuItem"
-        Me.EngineEditorToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
+        Me.EngineEditorToolStripMenuItem.Size = New System.Drawing.Size(160, 30)
         Me.EngineEditorToolStripMenuItem.Text = "Engine Editor"
         '
         'GearboxEditorToolStripMenuItem
         '
         Me.GearboxEditorToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_GBX
         Me.GearboxEditorToolStripMenuItem.Name = "GearboxEditorToolStripMenuItem"
-        Me.GearboxEditorToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
+        Me.GearboxEditorToolStripMenuItem.Size = New System.Drawing.Size(160, 30)
         Me.GearboxEditorToolStripMenuItem.Text = "Gearbox Editor"
         '
         'GraphToolStripMenuItem
         '
         Me.GraphToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_Graph
         Me.GraphToolStripMenuItem.Name = "GraphToolStripMenuItem"
-        Me.GraphToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
+        Me.GraphToolStripMenuItem.Size = New System.Drawing.Size(160, 30)
         Me.GraphToolStripMenuItem.Text = "Graph"
         '
         'ToolStripSeparator6
         '
         Me.ToolStripSeparator6.Name = "ToolStripSeparator6"
-        Me.ToolStripSeparator6.Size = New System.Drawing.Size(149, 6)
+        Me.ToolStripSeparator6.Size = New System.Drawing.Size(157, 6)
         '
         'OpenLogToolStripMenuItem
         '
         Me.OpenLogToolStripMenuItem.Name = "OpenLogToolStripMenuItem"
-        Me.OpenLogToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
+        Me.OpenLogToolStripMenuItem.Size = New System.Drawing.Size(160, 30)
         Me.OpenLogToolStripMenuItem.Text = "Open Log"
         '
         'SettingsToolStripMenuItem
         '
         Me.SettingsToolStripMenuItem.Name = "SettingsToolStripMenuItem"
-        Me.SettingsToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
+        Me.SettingsToolStripMenuItem.Size = New System.Drawing.Size(160, 30)
         Me.SettingsToolStripMenuItem.Text = "Settings"
         '
         'ToolStripDrDnBtInfo
@@ -787,7 +816,7 @@ Partial Class MainForm
         Me.ToolStripDrDnBtInfo.Image = Global.TUGraz.VECTO.My.Resources.Resources.Help_icon
         Me.ToolStripDrDnBtInfo.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripDrDnBtInfo.Name = "ToolStripDrDnBtInfo"
-        Me.ToolStripDrDnBtInfo.Size = New System.Drawing.Size(61, 22)
+        Me.ToolStripDrDnBtInfo.Size = New System.Drawing.Size(69, 28)
         Me.ToolStripDrDnBtInfo.Text = "Help"
         '
         'UserManualToolStripMenuItem
@@ -821,6 +850,7 @@ Partial Class MainForm
         '
         'CmDEV
         '
+        Me.CmDEV.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.CmDEV.Name = "CmDEV"
         Me.CmDEV.ShowImageMargin = false
         Me.CmDEV.Size = New System.Drawing.Size(36, 4)
@@ -831,6 +861,7 @@ Partial Class MainForm
         '
         'CmOpenFile
         '
+        Me.CmOpenFile.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.OpenInGraphWindowToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
         Me.CmOpenFile.Name = "CmOpenFile"
         Me.CmOpenFile.ShowImageMargin = false
@@ -885,6 +916,8 @@ Partial Class MainForm
         CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).EndInit
         Me.TabPgOptions.ResumeLayout(false)
         Me.PanelOptAllg.ResumeLayout(false)
+        Me.gbXMLHashValidation.ResumeLayout(false)
+        Me.gbXMLHashValidation.PerformLayout
         Me.GroupBox4.ResumeLayout(false)
         Me.GroupBox4.PerformLayout
         Me.GroupBox3.ResumeLayout(false)
@@ -1000,4 +1033,6 @@ End Sub
     Friend WithEvents tbOutputFolder As TextBox
     Friend WithEvents BtTCfileBrowse As Button
     Friend WithEvents Label2 As Label
+    Friend WithEvents gbXMLHashValidation As GroupBox
+    Friend WithEvents cbValidateXMLDeclarationJobs As CheckBox
 End Class
diff --git a/VECTO/GUI/MainForm.resx b/VECTO/GUI/MainForm.resx
index b00fb45de6f7935415bddf8185a50c0bcac9ba1c..df927555f49bdd76bde69313c6de52fd505ff1ab 100644
--- a/VECTO/GUI/MainForm.resx
+++ b/VECTO/GUI/MainForm.resx
@@ -223,6 +223,9 @@
   <metadata name="CmOpenFile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>732, 12</value>
   </metadata>
+  <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>850, 12</value>
+  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>49</value>
   </metadata>
diff --git a/VECTO/GUI/MainForm.vb b/VECTO/GUI/MainForm.vb
index 8c8a951d38535783be95b2e733053b42d81aeddb..5db0b7aa20efb2ee04a176fa6f35c23545cca486 100644
--- a/VECTO/GUI/MainForm.vb
+++ b/VECTO/GUI/MainForm.vb
@@ -1005,6 +1005,7 @@ Imports TUGraz.VectoCore.Utils
                 runsFactory.ModalResults1Hz = Cfg.Mod1Hz
                 runsFactory.Validate = cbValidateRunData.Checked
                 runsFactory.ActualModalData = cbActVmod.Checked
+                runsFactory.ValidateComponentHashes = cbValidateXMLDeclarationJobs.Checked
 
                 For Each runId As Integer In jobContainer.AddRuns(runsFactory)
                     fileWriters.Add(runId, fileWriter)
diff --git a/VECTO/Input Files/VectoJob.vb b/VECTO/Input Files/VectoJob.vb
index 42ab4f4e593b600323a3f4c35a5b00132f499aa0..a1904254eb9068f5c0d900dccdc74cf5ad917a95 100644
--- a/VECTO/Input Files/VectoJob.vb	
+++ b/VECTO/Input Files/VectoJob.vb	
@@ -602,6 +602,10 @@ Public Class VectoJob
         End Get
     End Property
 
+    Public Sub ValidateComponentHashes() Implements IDeclarationInputDataProvider.ValidateComponentHashes
+        Throw New NotImplementedException
+    End Sub
+
     Public ReadOnly Property XMLHash As XElement Implements IDeclarationInputDataProvider.XMLHash
         Get
             Return Nothing
diff --git a/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs b/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs
index 3b26742df8a1f307f110a2e3549de0d7388f0230..d65ac6cd801b995da130967f18bed2f8379f77d7 100644
--- a/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs
+++ b/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs
@@ -44,6 +44,8 @@ namespace TUGraz.VectoCommon.InputData
 	{
 		IDeclarationJobInputData JobInputData { get; }
 
+		void ValidateComponentHashes();
+
 		XElement XMLHash { get; }
 	}
 
diff --git a/VectoCommon/VectoHashing/VectoHash.cs b/VectoCommon/VectoHashing/VectoHash.cs
index ac1a362332b1eeaf3f22759e2a2582fbcfdb6154..01679936682cf3c71269b04202d6082d81489ee2 100644
--- a/VectoCommon/VectoHashing/VectoHash.cs
+++ b/VectoCommon/VectoHashing/VectoHash.cs
@@ -37,6 +37,7 @@ using System.Linq;
 using System.Security.Cryptography.X509Certificates;
 using System.Xml;
 using System.Xml.Linq;
+using TUGraz.VectoCommon.Exceptions;
 using TUGraz.VectoCommon.Hashing;
 using TUGraz.VectoCommon.Resources;
 using TUGraz.VectoCommon.Utils;
@@ -459,5 +460,30 @@ namespace TUGraz.VectoHashing
 			}
 			return nodes[0].InnerText;
 		}
+
+		public static void ValidateJob(XmlDocument doc)
+		{
+			var h = VectoHash.Load(doc);
+			var components = h.GetContainigComponents().GroupBy(s => s)
+				.Select(g => new { Entry = g.Key, Count = g.Count() });
+			var invalid = new List<string>();
+			foreach (var component in components) {
+				if (component.Entry == VectoComponents.Vehicle) {
+					continue;
+				}
+				for (var i = 0; i < component.Count; i++) {
+					//var readHash = h.ReadHash(component.Entry, i);
+					if (!h.ValidateHash(component.Entry, i)) {
+						var read = h.ReadHash(component.Entry, i);
+						var computed = h.ComputeHash(component.Entry, i);
+						invalid.Add($"Hash for component {component.Entry} ({i + 1}) invalid. Read: '{read}', Computed: '{computed}'");
+					}
+				}
+			}
+
+			if (invalid.Count > 0) {
+				throw new VectoException(invalid.JoinString(System.Environment.NewLine));
+			}
+		}
 	}
 }
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
index 9806032bac7a6ed8a982e218e4331287dd09bf77..82bd1d0435ae6884d7918d04874dbd8f7475d13d 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
@@ -102,6 +102,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			get { return this; }
 		}
 
+		public void ValidateComponentHashes()
+		{
+			throw new NotImplementedException();
+		}
+
 		public XElement XMLHash
 		{
 			get { return new XElement(XMLNames.DI_Signature); }
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
index bc46a7e4013c285e365b1b276df45b0497210a01..1688c1d6b30279bc805162519581f55ce28a43a3 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
@@ -265,6 +265,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			get { return this; }
 		}
 
+		public void ValidateComponentHashes()
+		{
+			
+		}
+
 		public XElement XMLHash
 		{
 			get { return new XElement(XMLNames.DI_Signature); }
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationInputDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationInputDataProvider.cs
index 9c125841f2286c830b084f79a3a3392f661f01ee..1a88530b1ea4182f055b8eb67dab8711727bd6df 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationInputDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationInputDataProvider.cs
@@ -91,6 +91,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration
 		}
 
 
+		public void ValidateComponentHashes()
+		{
+			VectoHash.ValidateJob(Document);
+		}
+
 		public virtual XElement XMLHash { get; private set; }
 	}
 
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationJobInputDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationJobInputDataProvider.cs
index 28baa39d3d9429fa139c9cec2eedb57c1b7d0cec..e9b68cd7f52a4d9ee4d8e0a63f5d35d2a81272da 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationJobInputDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationJobInputDataProvider.cs
@@ -35,6 +35,7 @@ using TUGraz.VectoCommon.InputData;
 using TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Interfaces;
 using TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader;
 using TUGraz.VectoCore.Utils;
+using TUGraz.VectoHashing;
 
 namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 {
diff --git a/VectoCore/VectoCore/InputData/IVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/IVectoRunDataFactory.cs
index d24a72e7c2b0ab8268fe3a0a3b46df63291b54da..8f5f8e516b2a0389e28ac14276bd943c41175b8e 100644
--- a/VectoCore/VectoCore/InputData/IVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/IVectoRunDataFactory.cs
@@ -30,6 +30,7 @@
 */
 
 using System.Collections.Generic;
+using TUGraz.VectoCommon.InputData;
 using TUGraz.VectoCore.Models.Simulation.Data;
 
 namespace TUGraz.VectoCore.InputData
@@ -37,5 +38,7 @@ namespace TUGraz.VectoCore.InputData
 	public interface IVectoRunDataFactory
 	{
 		IEnumerable<VectoRunData> NextRun();
+
+		IInputDataProvider DataProvider { get; }
 	}
 }
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
index 9a9222af851eee7dcdd62010f563444368c96162..02ef8b8637f8463dcecebfd131101aa5ee82214e 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
@@ -193,6 +193,11 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
 			}
 		}
 
+		public IInputDataProvider DataProvider
+		{
+			get { return InputDataProvider; }
+		}
+
 		private IEnumerable<VectoRunData> VectoRunDataNonExempted()
 		{
 			
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactory.cs
index 95b9a88f4d4d96b732ad7d83412b0d0a20185e84..e48d99ed431b8cf40f66cbfeff000d3fb444bb56 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactory.cs
@@ -66,8 +66,12 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
 		public IVTPReport Report;
 		protected ShiftStrategyParameters GearshiftData;
 
-		public DeclarationVTPModeVectoRunDataFactory(IVTPDeclarationInputDataProvider ivtpProvider, IVTPReport report) : this(
-			ivtpProvider.JobInputData, report) { }
+		public DeclarationVTPModeVectoRunDataFactory(IVTPDeclarationInputDataProvider ivtpProvider, IVTPReport report) :
+			this(
+				ivtpProvider.JobInputData, report)
+		{
+			DataProvider = ivtpProvider;
+		}
 
 		protected DeclarationVTPModeVectoRunDataFactory(IVTPDeclarationJobInputData job, IVTPReport report)
 		{
@@ -219,6 +223,8 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
 			
 		}
 
+		public IInputDataProvider DataProvider { get; }
+
 		protected virtual AuxFanData GetFanData()
 		{
 			return new AuxFanData() {
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
index d5bcdc581e215a5b8ba927bac989b8e311dcb1bb..f08fd005adcdd9c1e701f7a2749eef6807c45b85 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
@@ -174,6 +174,9 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
 			}
 		}
 
-		
+		public IInputDataProvider DataProvider
+		{
+			get { return InputDataProvider; }
+		}
 	}
 }
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs b/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs
index d882a0866fd895751a1b3cf191358e77a6895370..1888e9190cd1081402580d8b906e61f4819f5bd8 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs
@@ -59,13 +59,14 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 		private readonly ExecutionMode _mode;
 
 		public SimulatorFactory(ExecutionMode mode, IInputDataProvider dataProvider, IOutputDataWriter writer,
-			IDeclarationReport declarationReport = null, IVTPReport vtpReport = null, bool validate = true)
+			IDeclarationReport declarationReport = null, IVTPReport vtpReport = null, bool validate = true, bool validateHashes = false)
 		{
 			Log.Info("########## VectoCore Version {0} ##########", Assembly.GetExecutingAssembly().GetName().Version);
 			JobNumber = Interlocked.Increment(ref _jobNumberCounter);
 			_mode = mode;
 			ModWriter = writer;
 			Validate = validate;
+			ValidateComponentHashes = validateHashes;
 
 			int workerThreads;
 			int completionThreads;
@@ -87,6 +88,8 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 			}
 		}
 
+		public bool ValidateComponentHashes { get; set; }
+
 		private void CreateDeclarationDataReader(IInputDataProvider dataProvider, IDeclarationReport declarationReport, IVTPReport vtpReport)
 		{
 			if (dataProvider is IVTPDeclarationInputDataProvider) {
@@ -146,6 +149,10 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 			var i = 0;
 			var warning1Hz = false;
 
+			if (ValidateComponentHashes && DataReader.DataProvider is IDeclarationInputDataProvider declDataProvider) {
+				declDataProvider.ValidateComponentHashes();
+			}
+
 			foreach (var data in DataReader.NextRun()) {
 				var current = i++;
 				var d = data;
diff --git a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsConventional.cs b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsConventional.cs
index 6a6dcef4c19dbdc21daaac371054459095d83764..241580445dd02ba24f44cbddf4d3b00c9b85bf9e 100644
--- a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsConventional.cs
+++ b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsConventional.cs
@@ -240,7 +240,8 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
 			var factory = new SimulatorFactory(ExecutionMode.Declaration, inputData, writer) {
 				WriteModalResults = true,
 				//ActualModalData = true,
-				Validate = false
+				Validate = false,
+				ValidateComponentHashes = false
 			};
 			var sumContainer = new SummaryDataContainer(writer);
 			var jobContainer = new JobContainer(sumContainer);
@@ -267,7 +268,8 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
 			var factory = new SimulatorFactory(ExecutionMode.Declaration, inputData, writer) {
 				WriteModalResults = true,
 				//ActualModalData = true,
-				Validate = false
+				Validate = false,
+				ValidateComponentHashes = false
 			};
 			var sumContainer = new SummaryDataContainer(writer);
 			var jobContainer = new JobContainer(sumContainer);
diff --git a/VectoCore/VectoCoreTest/Integration/Declaration/ADASVehicleTest.cs b/VectoCore/VectoCoreTest/Integration/Declaration/ADASVehicleTest.cs
index 2d8f2ab437e58d360da444931c7ad918f93e9f6b..bc10ce9f3a9ad3d23509468ce485effe24bea98e 100644
--- a/VectoCore/VectoCoreTest/Integration/Declaration/ADASVehicleTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/Declaration/ADASVehicleTest.cs
@@ -104,7 +104,8 @@ namespace TUGraz.VectoCore.Tests.Integration.Declaration
 			var inputData = xmlInputReader.CreateDeclaration(modified); //.ReadJsonJob(relativeJobPath);
 			var factory = new SimulatorFactory(ExecutionMode.Declaration, inputData, writer) {
 				WriteModalResults = true,
-				ActualModalData = true
+				ActualModalData = true,
+				ValidateComponentHashes = false
 			};
 			var jobContainer = new JobContainer(new MockSumWriter());
 
diff --git a/VectoCore/VectoCoreTest/Integration/Declaration/EngineInputDataTests.cs b/VectoCore/VectoCoreTest/Integration/Declaration/EngineInputDataTests.cs
index 44b1a5c71de1fd8cf5ed06292c8835d97c250954..921c40b4425926e6b487dce9cad366ccb78f12a4 100644
--- a/VectoCore/VectoCoreTest/Integration/Declaration/EngineInputDataTests.cs
+++ b/VectoCore/VectoCoreTest/Integration/Declaration/EngineInputDataTests.cs
@@ -95,7 +95,9 @@ namespace TUGraz.VectoCore.Tests.Integration.Declaration
 			}
 			var inputDataProvider = xmlInputReader.CreateDeclaration(modified);
 			
-			var factory = new SimulatorFactory(ExecutionMode.Declaration, inputDataProvider, null, validate: false);
+			var factory = new SimulatorFactory(ExecutionMode.Declaration, inputDataProvider, null, validate: false) {
+				ValidateComponentHashes = false
+			};
 			var first = factory.SimulationRuns().ToArray().First();
 
 			var modData = ((ModalDataContainer)first.GetContainer().ModalData).Data;
diff --git a/VectoCore/VectoCoreTest/Integration/Declaration/NaturalGasVehicles.cs b/VectoCore/VectoCoreTest/Integration/Declaration/NaturalGasVehicles.cs
index 35ba4fd2aef09f1308ef67770b01fa4f862ffcc6..2f774dd629e143850abacc2def92442dc7f24713 100644
--- a/VectoCore/VectoCoreTest/Integration/Declaration/NaturalGasVehicles.cs
+++ b/VectoCore/VectoCoreTest/Integration/Declaration/NaturalGasVehicles.cs
@@ -102,7 +102,8 @@ namespace TUGraz.VectoCore.Tests.Integration.Declaration
 			var inputData = xmlInputReader.CreateDeclaration(modified);
 			var factory = new SimulatorFactory(ExecutionMode.Declaration, inputData, writer) {
 				WriteModalResults = true,
-				ActualModalData = true
+				ActualModalData = true,
+				ValidateComponentHashes = false
 			};
 			var jobContainer = new JobContainer(new MockSumWriter());
 
diff --git a/VectoCore/VectoCoreTest/Integration/Declaration/VocationalVehicleTest.cs b/VectoCore/VectoCoreTest/Integration/Declaration/VocationalVehicleTest.cs
index 5ba005d27d896110d8845db08cfe8bc9e5bc105c..a55d217d383acbd217e138c0443f20bb2745fd60 100644
--- a/VectoCore/VectoCoreTest/Integration/Declaration/VocationalVehicleTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/Declaration/VocationalVehicleTest.cs
@@ -74,7 +74,8 @@ namespace TUGraz.VectoCore.Tests.Integration
 			var inputData = xmlInputReader.CreateDeclaration(filename);
 			var factory = new SimulatorFactory(ExecutionMode.Declaration, inputData, writer) {
 				WriteModalResults = true,
-				ActualModalData = true
+				ActualModalData = true,
+				ValidateComponentHashes = false
 			};
 			var jobContainer = new JobContainer(new MockSumWriter());
 
diff --git a/VectoCore/VectoCoreTest/Integration/TorqueLimitsTest.cs b/VectoCore/VectoCoreTest/Integration/TorqueLimitsTest.cs
index 9a0edbd5ac2cbf82502810685c3dd24cdafc84d7..b88fc462dfa198a76ee66cacc93eaca245df4884 100644
--- a/VectoCore/VectoCoreTest/Integration/TorqueLimitsTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/TorqueLimitsTest.cs
@@ -353,7 +353,8 @@ namespace TUGraz.VectoCore.Tests.Integration
 			var fileWriter = new FileOutputWriter(jobFile);
 			var factory = new SimulatorFactory(ExecutionMode.Declaration, inputData, fileWriter) {
 				WriteModalResults = true,
-				Validate = false
+				Validate = false,
+				ValidateComponentHashes = false
 			};
 			var sumData = new SummaryDataContainer(fileWriter);
 			var jobContainer = new JobContainer(sumData);
diff --git a/VectoCore/VectoCoreTest/Integration/VTP/VTPTest.cs b/VectoCore/VectoCoreTest/Integration/VTP/VTPTest.cs
index 091df93e0e933da4a21a7b00c47399e800dd4ad9..c7c31ec504d13da656a0f8ac41937e1de3236241 100644
--- a/VectoCore/VectoCoreTest/Integration/VTP/VTPTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/VTP/VTPTest.cs
@@ -102,6 +102,7 @@ namespace TUGraz.VectoCore.Tests.Integration.VTP
 				WriteModalResults = true,
 				ActualModalData = false,
 				Validate = false,
+				ValidateComponentHashes = false
 			};
 
 			jobContainer.AddRuns(runsFactory);
@@ -136,6 +137,7 @@ namespace TUGraz.VectoCore.Tests.Integration.VTP
 				WriteModalResults = true,
 				ActualModalData = false,
 				Validate = false,
+				ValidateComponentHashes = false
 			};
 
 			jobContainer.AddRuns(runsFactory);
@@ -173,6 +175,7 @@ namespace TUGraz.VectoCore.Tests.Integration.VTP
 				WriteModalResults = true,
 				ActualModalData = false,
 				Validate = false,
+				ValidateComponentHashes = false
 			};
 
 			jobContainer.AddRuns(runsFactory);
diff --git a/VectoCore/VectoCoreTest/Integration/XMLReportTest.cs b/VectoCore/VectoCoreTest/Integration/XMLReportTest.cs
index 85794472e1e55d3736aa3f3b867e21141ddb9e4c..66e747f0db83f70d4f022e61000d3c847b263745 100644
--- a/VectoCore/VectoCoreTest/Integration/XMLReportTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/XMLReportTest.cs
@@ -142,7 +142,8 @@ namespace TUGraz.VectoCore.Tests.Integration
             {
                 WriteModalResults = false,
                 Validate = false,
-            };
+				ValidateComponentHashes = false
+			};
             jobContainer.AddRuns(runsFactory);
 
             // no need to run the simulation, we only check whether the meta-data is correct, no results are considered
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationAdapterCreateVocationalVehicleTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationAdapterCreateVocationalVehicleTest.cs
index b751d5cc077386c8dc221b23e72f416fbdd32eed..a1e8166ed385bc60fbab456d0f32ff0e1831b336 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationAdapterCreateVocationalVehicleTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationAdapterCreateVocationalVehicleTest.cs
@@ -67,6 +67,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration.DataAdapter
 			var runsFactory = new SimulatorFactory(ExecutionMode.Declaration, dataProvider, null, xmlReport) {
 				WriteModalResults = false,
 				Validate = false,
+				ValidateComponentHashes = false
 			};
 			jobContainer.AddRuns(runsFactory);
 
diff --git a/VectoCore/VectoCoreTest/Reports/ModDataTest.cs b/VectoCore/VectoCoreTest/Reports/ModDataTest.cs
index 2d81617781b3b94e27d6ecf039bdf1cf92e95452..f32c0816687b102939e347c3e92286f6464f52ce 100644
--- a/VectoCore/VectoCoreTest/Reports/ModDataTest.cs
+++ b/VectoCore/VectoCoreTest/Reports/ModDataTest.cs
@@ -176,6 +176,7 @@ namespace TUGraz.VectoCore.Tests.Reports
 			var inputData = xmlInputReader.CreateDeclaration(filename);
 			var factory = new SimulatorFactory(ExecutionMode.Declaration, inputData, writer) {
 				WriteModalResults = true,
+				ValidateComponentHashes = false
 			};
 			var jobContainer = new JobContainer(new MockSumWriter());
 
diff --git a/VectoCore/VectoCoreTest/Reports/SumWriterTest.cs b/VectoCore/VectoCoreTest/Reports/SumWriterTest.cs
index a8cec9a4ea85784df87cc53a742e35669119a4a1..dac500bd7c2402abb11077fa60fe7ed605cf5732 100644
--- a/VectoCore/VectoCoreTest/Reports/SumWriterTest.cs
+++ b/VectoCore/VectoCoreTest/Reports/SumWriterTest.cs
@@ -292,7 +292,8 @@ namespace TUGraz.VectoCore.Tests.Reports
 			var inputData = xmlInputReader.CreateDeclaration(jobFile);
 			var factory = new SimulatorFactory(ExecutionMode.Declaration, inputData, writer) {
 				WriteModalResults = true,
-				ActualModalData = true
+				ActualModalData = true,
+				ValidateComponentHashes = false
 			};
 			var sumWriter = new SummaryDataContainer(writer);
 			var jobContainer = new JobContainer(sumWriter);
@@ -324,7 +325,8 @@ namespace TUGraz.VectoCore.Tests.Reports
 			var inputData = xmlInputReader.CreateDeclaration(jobFile);
 			var factory = new SimulatorFactory(ExecutionMode.Declaration, inputData, writer) {
 				WriteModalResults = true,
-				ActualModalData = true
+				ActualModalData = true,
+				ValidateComponentHashes = false
 			};
 			var sumWriter = new SummaryDataContainer(writer);
 			var jobContainer = new JobContainer(sumWriter);
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-1_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-1_EURO6_2018.xml
index acf1d421b3c9e75840ca0eea31b085a5f278c4f2..7e62dadaad29c350d1178872ed95068e0e2c4089 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-1_EURO6_2018.xml	
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-1_EURO6_2018.xml	
@@ -213,11 +213,11 @@
         <Signature>
           <Reference URI="#ENG-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>2N74uZB1zupYuseShFi9v7OGFxiSVtJC35VxUDMoI8E=</DigestValue>
           </Reference>
         </Signature>
       </Engine>
@@ -326,11 +326,11 @@
         <Signature>
           <Reference URI="#GBX-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>OvMfxr2a0dS+AAt0DmpCEmlrbsm4T1VFFhah4sf6Dak=</DigestValue>
           </Reference>
         </Signature>
       </Gearbox>
@@ -360,11 +360,11 @@
         <Signature>
           <Reference URI="#AXLGEAR-3.800" xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>HrG5G9WZjgQqeezhuke0r3jGUcg8x/2NR6wI+NlWIFU=</DigestValue>
           </Reference>
         </Signature>
       </Axlegear>
@@ -389,11 +389,11 @@
                 <Signature>
                   <Reference URI="#TYRE-235_75R17.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
                     <Transforms>
-                      <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+                      <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                       <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                     </Transforms>
                     <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                    <DigestValue></DigestValue>
+                    <DigestValue>tpYGCDnzWENiEFwBE7dy2j1/EN8l+a5+M9O1CvFxF0I=</DigestValue>
                   </Reference>
                 </Signature>
               </Tyre>
@@ -416,11 +416,11 @@
                 <Signature>
                   <Reference URI="#TYRE-235_75R17.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
                     <Transforms>
-                      <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+                      <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                       <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                     </Transforms>
                     <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                    <DigestValue></DigestValue>
+                    <DigestValue>nyMndGr91he3nIw3A0WxzvTti4l+b/Xse89Wxh8Oybs=</DigestValue>
                   </Reference>
                 </Signature>
               </Tyre>
@@ -461,11 +461,11 @@
         <Signature>
           <Reference URI="#Airdrag-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>rEXeeQHUIzgSy9rc3tzLjwz2g4ot70PKkD0Rb0wlQyo=</DigestValue>
           </Reference>
         </Signature>
       </AirDrag>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-2_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-2_EURO6_2018.xml
index dc5decd5014c643488b25c2e1c4993c81e52c384..cd72da19fb1cb5463d33762d2ca536a073537d82 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-2_EURO6_2018.xml	
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-2_EURO6_2018.xml	
@@ -213,11 +213,11 @@
         <Signature>
           <Reference URI="#ENG-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>wZSdlNvmc44wRsA32Ypd8uu7ee9oz5Q/WfHqOw4OuxA=</DigestValue>
           </Reference>
         </Signature>
       </Engine>
@@ -326,11 +326,11 @@
         <Signature>
           <Reference URI="#GBX-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>W6rTkSv9YJzUVbvTsjzd1Bz2Ub0BJu/2JFqsSBqDYz8=</DigestValue>
           </Reference>
         </Signature>
       </Gearbox>
@@ -360,11 +360,11 @@
         <Signature>
           <Reference URI="#AXLGEAR-4.180" xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>3TEWYpmC1sQfHkkLnc9gkLXoOijzLvK5IOvCWgCWqo4=</DigestValue>
           </Reference>
         </Signature>
       </Axlegear>
@@ -389,11 +389,11 @@
                 <Signature>
                   <Reference URI="#TYRE-265_70R19.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
                     <Transforms>
-                      <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+                      <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                       <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                     </Transforms>
                     <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                    <DigestValue></DigestValue>
+                    <DigestValue>IzUf5XqkL1HjrQ149GQjvMFFe5arsdfuk4eWRuiYXVM=</DigestValue>
                   </Reference>
                 </Signature>
               </Tyre>
@@ -416,11 +416,11 @@
                 <Signature>
                   <Reference URI="#TYRE-265_70R19.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
                     <Transforms>
-                      <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+                      <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                       <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                     </Transforms>
                     <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                    <DigestValue></DigestValue>
+                    <DigestValue>Xx8WYutrGf8/EDQBIOaszUHfQ4egJ+osxPoEQ9YAT64=</DigestValue>
                   </Reference>
                 </Signature>
               </Tyre>
@@ -461,11 +461,11 @@
         <Signature>
           <Reference URI="#Airdrag-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>mpWAKODDRlrj80NNgQ5Eyxz0/4H7u7pgVTxM2Fqkli4=</DigestValue>
           </Reference>
         </Signature>
       </AirDrag>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-3_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-3_EURO6_2018.xml
index ef39358017b9985604b2adf7df5756c46d3109f4..c00332e2dc3a87dd4508d1aa70644a8182e31f5d 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-3_EURO6_2018.xml	
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-3_EURO6_2018.xml	
@@ -213,11 +213,11 @@
         <Signature>
           <Reference URI="#ENG-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>G6ea3r0o+7hWv+l1BB5A9RgF1YVuhdjmvb4EO+1a3ew=</DigestValue>
           </Reference>
         </Signature>
       </Engine>
@@ -326,11 +326,11 @@
         <Signature>
           <Reference URI="#GBX-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>6LHOGDKGZw8xVV2PY8Ay2ZIJfUKzV7XFnNHPVkhMwB8=</DigestValue>
           </Reference>
         </Signature>
       </Gearbox>
@@ -360,11 +360,11 @@
         <Signature>
           <Reference URI="#AXLGEAR-4.000" xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>SMq9a5gdmmM8ar0iYiMGE25TS8a1FmLAOUpGzGo4l20=</DigestValue>
           </Reference>
         </Signature>
       </Axlegear>
@@ -389,11 +389,11 @@
                 <Signature>
                   <Reference URI="#TYRE-285_70R19.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
                     <Transforms>
-                      <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+                      <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                       <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                     </Transforms>
                     <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                    <DigestValue></DigestValue>
+                    <DigestValue>C1phguXMbFuHRYheY3bhjp40uhFf/3/jOVigiKLtaqo=</DigestValue>
                   </Reference>
                 </Signature>
               </Tyre>
@@ -416,11 +416,11 @@
                 <Signature>
                   <Reference URI="#TYRE-285_70R19.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
                     <Transforms>
-                      <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+                      <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                       <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                     </Transforms>
                     <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                    <DigestValue></DigestValue>
+                    <DigestValue>C1phguXMbFuHRYheY3bhjp40uhFf/3/jOVigiKLtaqo=</DigestValue>
                   </Reference>
                 </Signature>
               </Tyre>
@@ -461,11 +461,11 @@
         <Signature>
           <Reference URI="#Airdrag-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>plyHp97PnpnR7KiBRtuyhoFSTxdX6H9e5iUuyN956M4=</DigestValue>
           </Reference>
         </Signature>
       </AirDrag>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml
index 6b7b491c29dbae1b3d1eb0f1aa94bd7cfd3aa5e3..4af64a80ebc6f6e6a72661b5937c75e1ed7f8ac8 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml	
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml	
@@ -172,11 +172,11 @@
         <Signature>
           <Reference URI="#ENG-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>Qopsh1Vl1hMZm3dXckSN52lU+l3GV8YFmko7RsUonlI=</DigestValue>
           </Reference>
         </Signature>
       </Engine>
@@ -375,11 +375,11 @@
         <Signature>
           <Reference URI="#GBX-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>TqWu4iboNUH0sJq1A8YbOY/dCoSVhytECIoMX9k6maI=</DigestValue>
           </Reference>
         </Signature>
       </Gearbox>
@@ -428,11 +428,11 @@
         <Signature>
           <Reference URI="#RET-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>2L7Of9Q/3fpHZwCDgdNnWOyHhbE6MQW9EpEpXaEZM/I=</DigestValue>
           </Reference>
         </Signature>
       </Retarder>
@@ -462,11 +462,11 @@
         <Signature>
           <Reference URI="#AXLGEAR-2.640" xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>W/l/H2F+lf3kRxb3Q5Y0WmlH3GhW47E+KDLncpPMYB4=</DigestValue>
           </Reference>
         </Signature>
       </Axlegear>
@@ -491,11 +491,11 @@
                 <Signature>
                   <Reference URI="#TYRE-315_70R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
                     <Transforms>
-                      <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+                      <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                       <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                     </Transforms>
                     <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                    <DigestValue></DigestValue>
+                    <DigestValue>/UJYsn8dZPK67VQDFfe4gWha9zBQUMy6ghqA3w5v3RY=</DigestValue>
                   </Reference>
                 </Signature>
               </Tyre>
@@ -518,11 +518,11 @@
                 <Signature>
                   <Reference URI="#TYRE-315_70R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
                     <Transforms>
-                      <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+                      <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                       <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                     </Transforms>
                     <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                    <DigestValue></DigestValue>
+                    <DigestValue>RIFMXagg/MwaCxWRtJLx3xQxffkHM3WrcmUhnxw5FBs=</DigestValue>
                   </Reference>
                 </Signature>
               </Tyre>
@@ -563,11 +563,11 @@
         <Signature>
           <Reference URI="#Airdrag-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>h2FHTaElcG3m41/f+0I4fjfe/JqTCGd4d/CaoZAKzJ8=</DigestValue>
           </Reference>
         </Signature>
       </AirDrag>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_6x2_vehicle-class-9_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_6x2_vehicle-class-9_EURO6_2018.xml
index 0a8016124b260f06ecfd2bdc14a13674cdb81456..02b0890ad32c9b6fdc6924b494ed5b4f23aacca7 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_6x2_vehicle-class-9_EURO6_2018.xml	
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_6x2_vehicle-class-9_EURO6_2018.xml	
@@ -172,11 +172,11 @@
         <Signature>
           <Reference URI="#ENG-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>cDq3ibGETyVr3mZ4aoWJAhDnlOTQuNJVL6CdHgZ28f8=</DigestValue>
           </Reference>
         </Signature>
       </Engine>
@@ -375,11 +375,11 @@
         <Signature>
           <Reference URI="#GBX-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>WTmv+MUAiIitIhBt71+SN2TD8dN3MUEsy/8AnMdXv6w=</DigestValue>
           </Reference>
         </Signature>
       </Gearbox>
@@ -428,11 +428,11 @@
         <Signature>
           <Reference URI="#RET-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>aMn6oAYA4iHc8lp/Tws3jnNauBV5yhPm05jlDZj4CVg=</DigestValue>
           </Reference>
         </Signature>
       </Retarder>
@@ -462,11 +462,11 @@
         <Signature>
           <Reference URI="#AXLGEAR-2.640" xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>cmAk5S6kYq9Ty56NYVT+HqekSGMioYM/BQAY2shFHj4=</DigestValue>
           </Reference>
         </Signature>
       </Axlegear>
@@ -491,11 +491,11 @@
                 <Signature>
                   <Reference URI="#TYRE-315_70R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
                     <Transforms>
-                      <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+                      <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                       <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                     </Transforms>
                     <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                    <DigestValue></DigestValue>
+                    <DigestValue>mAWCB2llf9uPjfFt5MErevAwKZdUrc2J1PXcN6uzXjA=</DigestValue>
                   </Reference>
                 </Signature>
               </Tyre>
@@ -518,11 +518,11 @@
                 <Signature>
                   <Reference URI="#TYRE-315_70R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
                     <Transforms>
-                      <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+                      <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                       <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                     </Transforms>
                     <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                    <DigestValue></DigestValue>
+                    <DigestValue>3/8iB7kQHrjJKBbykeHzUSHDJQ757utl+s9s760lfbY=</DigestValue>
                   </Reference>
                 </Signature>
               </Tyre>
@@ -545,11 +545,11 @@
                 <Signature>
                   <Reference URI="#TYRE-315_70R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
                     <Transforms>
-                      <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+                      <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                       <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                     </Transforms>
                     <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                    <DigestValue></DigestValue>
+                    <DigestValue>mAWCB2llf9uPjfFt5MErevAwKZdUrc2J1PXcN6uzXjA=</DigestValue>
                   </Reference>
                 </Signature>
               </Tyre>
@@ -590,11 +590,11 @@
         <Signature>
           <Reference URI="#Airdrag-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>5xaQNDmoKN06ZkBZPCRVf2+FFvx63LYqgMyf8e4fn+o=</DigestValue>
           </Reference>
         </Signature>
       </AirDrag>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_6x4_vehicle-class-11_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_6x4_vehicle-class-11_EURO6_2018.xml
index 11dde054e5c4d359c388a2899f46659bf0769bc3..520255efca1367d1e7d6fefd53dabcf9e3749a6c 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_6x4_vehicle-class-11_EURO6_2018.xml	
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_6x4_vehicle-class-11_EURO6_2018.xml	
@@ -171,11 +171,11 @@
         <Signature>
           <Reference URI="#ENG-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>WirsjLfaklspkNkRW20UUHTERXef0zdeTJ/ZlMVc4H4=</DigestValue>
           </Reference>
         </Signature>
       </Engine>
@@ -374,11 +374,11 @@
         <Signature>
           <Reference URI="#GBX-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>UdQ/GIRInC7UsRh+3QJ60+lUM5fhDnfLds3I+vpmgtw=</DigestValue>
           </Reference>
         </Signature>
       </Gearbox>
@@ -408,11 +408,11 @@
         <Signature>
           <Reference URI="#AXLGEAR-3.500" xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>Opl7H8gw8H7MsaLqWK7bE8q0hXPwPDk6cUmliv1WKy0=</DigestValue>
           </Reference>
         </Signature>
       </Axlegear>
@@ -437,11 +437,11 @@
                 <Signature>
                   <Reference URI="#TYRE-315_80R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
                     <Transforms>
-                      <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+                      <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                       <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                     </Transforms>
                     <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                    <DigestValue></DigestValue>
+                    <DigestValue>EJWMOq13HRg8zpniCkIuzhRarsnzNLDQz0CovJ0x9ew=</DigestValue>
                   </Reference>
                 </Signature>
               </Tyre>
@@ -464,11 +464,11 @@
                 <Signature>
                   <Reference URI="#TYRE-315_80R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
                     <Transforms>
-                      <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+                      <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                       <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                     </Transforms>
                     <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                    <DigestValue></DigestValue>
+                    <DigestValue>NlNCMTThuXPxA/jFBpO13a6BHB/gfibeuory6OZbim0=</DigestValue>
                   </Reference>
                 </Signature>
               </Tyre>
@@ -491,11 +491,11 @@
                 <Signature>
                   <Reference URI="#TYRE-315_80R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
                     <Transforms>
-                      <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+                      <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                       <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                     </Transforms>
                     <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                    <DigestValue></DigestValue>
+                    <DigestValue>NlNCMTThuXPxA/jFBpO13a6BHB/gfibeuory6OZbim0=</DigestValue>
                   </Reference>
                 </Signature>
               </Tyre>
@@ -536,11 +536,11 @@
         <Signature>
           <Reference URI="#Airdrag-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>W5TxlVWMlMZe2Z1j7KVN5tFDXYtAu7kXG8nmqUasJYM=</DigestValue>
           </Reference>
         </Signature>
       </AirDrag>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_8x4_vehicle-class-16_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_8x4_vehicle-class-16_EURO6_2018.xml
index fc9a49d0aead644492f8640ef7434e6d7fd18e78..84768955c3f71400842d1bce224aa7f06289f136 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_8x4_vehicle-class-16_EURO6_2018.xml	
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_8x4_vehicle-class-16_EURO6_2018.xml	
@@ -171,11 +171,11 @@
         <Signature>
           <Reference URI="#ENG-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>XyzAZfWRa7r+mYhhy+eCzYeARqiWVABJX0gIYdtmDnc=</DigestValue>
           </Reference>
         </Signature>
       </Engine>
@@ -374,11 +374,11 @@
         <Signature>
           <Reference URI="#GBX-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>Hd6UdBbGAO+hvNAwUY8MjLRWUgTUnAsRj+hf1MkeAdg=</DigestValue>
           </Reference>
         </Signature>
       </Gearbox>
@@ -408,11 +408,11 @@
         <Signature>
           <Reference URI="#AXLGEAR-3.500" xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>Czn2LksaM/fNaU0AS9NKl8MPNOI1CKA1Vxd5vdLKsdg=</DigestValue>
           </Reference>
         </Signature>
       </Axlegear>
@@ -437,11 +437,11 @@
                 <Signature>
                   <Reference URI="#TYRE-315_80R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
                     <Transforms>
-                      <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+                      <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                       <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                     </Transforms>
                     <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                    <DigestValue></DigestValue>
+                    <DigestValue>MRvyC4b18mZ78P8CEBOg2QRkXkWEbDjZPRHxyhYNScU=</DigestValue>
                   </Reference>
                 </Signature>
               </Tyre>
@@ -464,11 +464,11 @@
                 <Signature>
                   <Reference URI="#TYRE-315_80R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
                     <Transforms>
-                      <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+                      <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                       <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                     </Transforms>
                     <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                    <DigestValue></DigestValue>
+                    <DigestValue>MRvyC4b18mZ78P8CEBOg2QRkXkWEbDjZPRHxyhYNScU=</DigestValue>
                   </Reference>
                 </Signature>
               </Tyre>
@@ -491,11 +491,11 @@
                 <Signature>
                   <Reference URI="#TYRE-315_80R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
                     <Transforms>
-                      <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+                      <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                       <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                     </Transforms>
                     <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                    <DigestValue></DigestValue>
+                    <DigestValue>ZYAEJWcCH+Hejuj9gHoT8SbzNUIVPAo2fr2aYtv8oCk=</DigestValue>
                   </Reference>
                 </Signature>
               </Tyre>
@@ -518,11 +518,11 @@
                 <Signature>
                   <Reference URI="#TYRE-315_80R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
                     <Transforms>
-                      <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+                      <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                       <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                     </Transforms>
                     <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                    <DigestValue></DigestValue>
+                    <DigestValue>ZYAEJWcCH+Hejuj9gHoT8SbzNUIVPAo2fr2aYtv8oCk=</DigestValue>
                   </Reference>
                 </Signature>
               </Tyre>
@@ -563,11 +563,11 @@
         <Signature>
           <Reference URI="#Airdrag-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>tUYjk37vKmjQEtYGQXh0mgMSYssPl3siYq8mHrYbLeE=</DigestValue>
           </Reference>
         </Signature>
       </AirDrag>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018.xml
index ed78e2df859c1ab0fdc802dedfb98c0f4d6761de..e84c886b322c6441e13050e609043ba6d8107888 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018.xml
@@ -172,11 +172,11 @@
         <Signature>
           <Reference URI="#ENG-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>6sggaAnNLxdg6FEoWFq857e3wgydUVXZNR0XqVFvdoM=</DigestValue>
           </Reference>
         </Signature>
       </Engine>
@@ -375,11 +375,11 @@
         <Signature>
           <Reference URI="#GBX-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>ugwnE36S6oBsLj1rzSi4Gs/ACHDcHzRGmuI+UYL0mrw=</DigestValue>
           </Reference>
         </Signature>
       </Gearbox>
@@ -428,11 +428,11 @@
         <Signature>
           <Reference URI="#RET-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>Ob7BA/zyL35rmPQkIpXPxPvpwm9e73KP/Ukdix5pg4I=</DigestValue>
           </Reference>
         </Signature>
       </Retarder>
@@ -462,11 +462,11 @@
         <Signature>
           <Reference URI="#AXLGEAR-2.640" xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>EIZgx2VESsyWx0g0B6LNPy6DvbHRmNOHiEHlO2vQoYc=</DigestValue>
           </Reference>
         </Signature>
       </Axlegear>
@@ -491,11 +491,11 @@
                 <Signature>
                   <Reference URI="#TYRE-315_70R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
                     <Transforms>
-                      <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+                      <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                       <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                     </Transforms>
                     <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                    <DigestValue></DigestValue>
+                    <DigestValue>tjc2hQjPOm5U++TtCs21pBefREEwFgXx8xZEWM5jDBw=</DigestValue>
                   </Reference>
                 </Signature>
               </Tyre>
@@ -518,11 +518,11 @@
                 <Signature>
                   <Reference URI="#TYRE-315_70R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
                     <Transforms>
-                      <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+                      <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                       <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                     </Transforms>
                     <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                    <DigestValue></DigestValue>
+                    <DigestValue>jK+VKd2lvg6gmMm+DcQ45MjWBuR1PTWGsEzJN0eCUjo=</DigestValue>
                   </Reference>
                 </Signature>
               </Tyre>
@@ -563,11 +563,11 @@
         <Signature>
           <Reference URI="#Airdrag-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>Z1PQIl+dwdCgx2Y+5EhNOeBDCdGgFay0TPxbyHYwFUY=</DigestValue>
           </Reference>
         </Signature>
       </AirDrag>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_FlatFCMap.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_FlatFCMap.xml
index a89857f85c79e902e0902daf56a6f29f0fc470d7..34d72dc111001931b6feaa26de67c6b845d8ec96 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_FlatFCMap.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_FlatFCMap.xml
@@ -71,11 +71,11 @@
         <Signature>
           <Reference URI="#ENG-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>GGduktibblOwBckM3NUtb0URg0GQOjoX+PP3N+1WPyg=</DigestValue>
           </Reference>
         </Signature>
       </Engine>
@@ -274,11 +274,11 @@
         <Signature>
           <Reference URI="#GBX-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>ugwnE36S6oBsLj1rzSi4Gs/ACHDcHzRGmuI+UYL0mrw=</DigestValue>
           </Reference>
         </Signature>
       </Gearbox>
@@ -327,11 +327,11 @@
         <Signature>
           <Reference URI="#RET-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>Ob7BA/zyL35rmPQkIpXPxPvpwm9e73KP/Ukdix5pg4I=</DigestValue>
           </Reference>
         </Signature>
       </Retarder>
@@ -361,11 +361,11 @@
         <Signature>
           <Reference URI="#AXLGEAR-2.640" xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>EIZgx2VESsyWx0g0B6LNPy6DvbHRmNOHiEHlO2vQoYc=</DigestValue>
           </Reference>
         </Signature>
       </Axlegear>
@@ -390,11 +390,11 @@
                 <Signature>
                   <Reference URI="#TYRE-315_70R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
                     <Transforms>
-                      <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+                      <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                       <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                     </Transforms>
                     <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                    <DigestValue></DigestValue>
+                    <DigestValue>tjc2hQjPOm5U++TtCs21pBefREEwFgXx8xZEWM5jDBw=</DigestValue>
                   </Reference>
                 </Signature>
               </Tyre>
@@ -417,11 +417,11 @@
                 <Signature>
                   <Reference URI="#TYRE-315_70R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
                     <Transforms>
-                      <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+                      <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                       <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                     </Transforms>
                     <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                    <DigestValue></DigestValue>
+                    <DigestValue>jK+VKd2lvg6gmMm+DcQ45MjWBuR1PTWGsEzJN0eCUjo=</DigestValue>
                   </Reference>
                 </Signature>
               </Tyre>
@@ -462,11 +462,11 @@
         <Signature>
           <Reference URI="#Airdrag-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>Z1PQIl+dwdCgx2Y+5EhNOeBDCdGgFay0TPxbyHYwFUY=</DigestValue>
           </Reference>
         </Signature>
       </AirDrag>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_IncreasingFCMap.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_IncreasingFCMap.xml
index 9605825fed25fc1f2ed5f7988e63752a0eedfcfb..338e165acbdd8427bd54a5fd2ad9a2b1fcacb9e6 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_IncreasingFCMap.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_IncreasingFCMap.xml
@@ -71,11 +71,11 @@
         <Signature>
           <Reference URI="#ENG-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>XKonALVKLyJCCglrcYDlHA/ICyOjDjkgwKZpAgExmBU=</DigestValue>
           </Reference>
         </Signature>
       </Engine>
@@ -274,11 +274,11 @@
         <Signature>
           <Reference URI="#GBX-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>ugwnE36S6oBsLj1rzSi4Gs/ACHDcHzRGmuI+UYL0mrw=</DigestValue>
           </Reference>
         </Signature>
       </Gearbox>
@@ -327,11 +327,11 @@
         <Signature>
           <Reference URI="#RET-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>Ob7BA/zyL35rmPQkIpXPxPvpwm9e73KP/Ukdix5pg4I=</DigestValue>
           </Reference>
         </Signature>
       </Retarder>
@@ -361,11 +361,11 @@
         <Signature>
           <Reference URI="#AXLGEAR-2.640" xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>EIZgx2VESsyWx0g0B6LNPy6DvbHRmNOHiEHlO2vQoYc=</DigestValue>
           </Reference>
         </Signature>
       </Axlegear>
@@ -390,11 +390,11 @@
                 <Signature>
                   <Reference URI="#TYRE-315_70R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
                     <Transforms>
-                      <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+                      <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                       <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                     </Transforms>
                     <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                    <DigestValue></DigestValue>
+                    <DigestValue>tjc2hQjPOm5U++TtCs21pBefREEwFgXx8xZEWM5jDBw=</DigestValue>
                   </Reference>
                 </Signature>
               </Tyre>
@@ -417,11 +417,11 @@
                 <Signature>
                   <Reference URI="#TYRE-315_70R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
                     <Transforms>
-                      <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+                      <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                       <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                     </Transforms>
                     <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                    <DigestValue></DigestValue>
+                    <DigestValue>jK+VKd2lvg6gmMm+DcQ45MjWBuR1PTWGsEzJN0eCUjo=</DigestValue>
                   </Reference>
                 </Signature>
               </Tyre>
@@ -462,11 +462,11 @@
         <Signature>
           <Reference URI="#Airdrag-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>Z1PQIl+dwdCgx2Y+5EhNOeBDCdGgFay0TPxbyHYwFUY=</DigestValue>
           </Reference>
         </Signature>
       </AirDrag>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_6x2_vehicle-class-10_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_6x2_vehicle-class-10_EURO6_2018.xml
index f0259bb06c899f7c9c8664db645a17b56acb82f0..31404f5e7c42d639a718c18fe65375bb9b6b2760 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_6x2_vehicle-class-10_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_6x2_vehicle-class-10_EURO6_2018.xml
@@ -172,11 +172,11 @@
         <Signature>
           <Reference URI="#ENG-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>+t4AHQaPQBoVLbql2HULUhpOOuEVpzJOws9u6WldSfQ=</DigestValue>
           </Reference>
         </Signature>
       </Engine>
@@ -375,11 +375,11 @@
         <Signature>
           <Reference URI="#GBX-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>kEOZJH014r+/1QafZvcjDEKSphbx9F1MlF/S/k1cjwI=</DigestValue>
           </Reference>
         </Signature>
       </Gearbox>
@@ -428,11 +428,11 @@
         <Signature>
           <Reference URI="#RET-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>cqQlNUNPAdqO6SnCF0Y5Dg9y389p5PRgh0y/0292Qs4=</DigestValue>
           </Reference>
         </Signature>
       </Retarder>
@@ -462,11 +462,11 @@
         <Signature>
           <Reference URI="#AXLGEAR-2.640" xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>BM8NbvqYkOn/eUOkhm4MJHW5X2fPXKADKwz1bZrIkFE=</DigestValue>
           </Reference>
         </Signature>
       </Axlegear>
@@ -491,11 +491,11 @@
                 <Signature>
                   <Reference URI="#TYRE-315_70R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
                     <Transforms>
-                      <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+                      <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                       <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                     </Transforms>
                     <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                    <DigestValue></DigestValue>
+                    <DigestValue>/tyCjPAvyCB35XP9YXVic/0qbHE7ahK1p3lY5Kek2cE=</DigestValue>
                   </Reference>
                 </Signature>
               </Tyre>
@@ -518,11 +518,11 @@
                 <Signature>
                   <Reference URI="#TYRE-315_70R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
                     <Transforms>
-                      <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+                      <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                       <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                     </Transforms>
                     <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                    <DigestValue></DigestValue>
+                    <DigestValue>dgMLTeg532oyEnB4Wf0IuIUeXBiZEyfz41eHURPK5rw=</DigestValue>
                   </Reference>
                 </Signature>
               </Tyre>
@@ -545,11 +545,11 @@
                 <Signature>
                   <Reference URI="#TYRE-315_70R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
                     <Transforms>
-                      <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+                      <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                       <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                     </Transforms>
                     <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                    <DigestValue></DigestValue>
+                    <DigestValue>/tyCjPAvyCB35XP9YXVic/0qbHE7ahK1p3lY5Kek2cE=</DigestValue>
                   </Reference>
                 </Signature>
               </Tyre>
@@ -590,11 +590,11 @@
         <Signature>
           <Reference URI="#Airdrag-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>MLSTnQxJZX/TXZJP3wGW2/DZkvbmyGKz9+Hbhoc4aBA=</DigestValue>
           </Reference>
         </Signature>
       </AirDrag>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_6x4_vehicle-class-12_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_6x4_vehicle-class-12_EURO6_2018.xml
index 92203b94eb71d1d86f8d7a35e9bba98a3aefa4cd..3bce11f2144d285ce80d245764e3a01a05fad077 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_6x4_vehicle-class-12_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_6x4_vehicle-class-12_EURO6_2018.xml
@@ -171,11 +171,11 @@
         <Signature>
           <Reference URI="#ENG-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>atvBAfzD4KrMhNoeRxAGk4BVVT8gG9VRuXGpedQHI6U=</DigestValue>
           </Reference>
         </Signature>
       </Engine>
@@ -374,11 +374,11 @@
         <Signature>
           <Reference URI="#GBX-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>TZy5Itjobu+2ZvryCkGihwIO7tSRMgYj0jP31DkYRjk=</DigestValue>
           </Reference>
         </Signature>
       </Gearbox>
@@ -408,11 +408,11 @@
         <Signature>
           <Reference URI="#AXLGEAR-3.500" xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>+9uHe2Iy/ynD2QIZ274sxKtK9LIbyXG4cF8kyDbObEE=</DigestValue>
           </Reference>
         </Signature>
       </Axlegear>
@@ -437,11 +437,11 @@
                 <Signature>
                   <Reference URI="#TYRE-315_80R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
                     <Transforms>
-                      <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+                      <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                       <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                     </Transforms>
                     <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                    <DigestValue></DigestValue>
+                    <DigestValue>Ailinmbw9u5/JTBXE64J1vbQhViVsoVxFPJ/Q9eAjc4=</DigestValue>
                   </Reference>
                 </Signature>
               </Tyre>
@@ -464,11 +464,11 @@
                 <Signature>
                   <Reference URI="#TYRE-315_80R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
                     <Transforms>
-                      <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+                      <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                       <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                     </Transforms>
                     <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                    <DigestValue></DigestValue>
+                    <DigestValue>m7f7kAasGdWCzdIRxUHH+8CjudIH23wwnOUff3KfgPU=</DigestValue>
                   </Reference>
                 </Signature>
               </Tyre>
@@ -491,11 +491,11 @@
                 <Signature>
                   <Reference URI="#TYRE-315_80R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
                     <Transforms>
-                      <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+                      <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                       <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                     </Transforms>
                     <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                    <DigestValue></DigestValue>
+                    <DigestValue>m7f7kAasGdWCzdIRxUHH+8CjudIH23wwnOUff3KfgPU=</DigestValue>
                   </Reference>
                 </Signature>
               </Tyre>
@@ -536,11 +536,11 @@
         <Signature>
           <Reference URI="#Airdrag-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
-              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
               <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
             </Transforms>
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-            <DigestValue></DigestValue>
+            <DigestValue>kCQ1Z1W1sWSkeAq4rUOT/ZXHld7xtfHMPb1IeHp0bO0=</DigestValue>
           </Reference>
         </Signature>
       </AirDrag>
diff --git a/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs b/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs
index c9d98c9723f6ac5278fe1815260fb8a5820daa4b..c5dd9bd0c71bb8c8b1680622b285c2e7dad1ce25 100644
--- a/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs
@@ -133,6 +133,7 @@ namespace TUGraz.VectoCore.Tests.XML
 				WriteModalResults = false,
 				ActualModalData = false,
 				Validate = false,
+				ValidateComponentHashes = false,
 			};
 
 			var runs = runsFactory.SimulationRuns().ToArray();
diff --git a/VectoCore/VectoCoreTest/XML/XMLReportTest.cs b/VectoCore/VectoCoreTest/XML/XMLReportTest.cs
index f81f4b2bfb8e40c9c2d7b72854d23a349102d92e..b6a16d46a10277b1e38624372180b049a4836d7d 100644
--- a/VectoCore/VectoCoreTest/XML/XMLReportTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLReportTest.cs
@@ -86,6 +86,7 @@ namespace TUGraz.VectoCore.Tests.XML
 				WriteModalResults = false,
 				ActualModalData = false,
 				Validate = false,
+				ValidateComponentHashes = false
 			};
 			jobContainer.AddRuns(runsFactory);
 			jobContainer.Execute();