From 6e6148dab6ed402c5dafd036609a6b27a16ccbe5 Mon Sep 17 00:00:00 2001
From: "Burns, Terry" <Terry.Burns@ricardo.com>
Date: Mon, 19 Jan 2015 11:53:09 +0000
Subject: [PATCH] Old AuxillaryEnvironment ( Spelt incorrectly by the way )
 Excluded Test References in TestSuite are replaced with AuxiliaryConfig
 General TAB Fuel Map Selector Hidden ( Not Needed For Vecto ) New Label
 "Reserved for future expansion" added to General Tab Buttons on
 AuxiliaryConfig repositioned slightly.

git-tfs-id: [http://tfs00.element.root.com:8080/tfs/TFSCollection]$/VECTO;C1727
---
 .../UI/frmAuxiliaryConfig.Designer.vb         | 299 +++++++++---------
 .../UI/frmAuxiliaryConfig.resx                |  10 +-
 .../VectoAuxiliaries/VectoAuxiliaries.vbproj  |   1 -
 .../TestFiles/auxiliaryConfigKEEP.json        |   2 +-
 .../AuxiliaryEnvironmentComparisonTests.vb    | 200 ++++++------
 5 files changed, 264 insertions(+), 248 deletions(-)

diff --git a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.Designer.vb b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.Designer.vb
index 1ca2abdb2e..22bd753c92 100644
--- a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.Designer.vb
+++ b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.Designer.vb
@@ -24,18 +24,18 @@ Partial Class frmAuxiliaryConfig
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAuxiliaryConfig))
-        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.pnlMain = New System.Windows.Forms.Panel()
         Me.btnCancel = New System.Windows.Forms.Button()
         Me.btnSave = New System.Windows.Forms.Button()
@@ -68,6 +68,8 @@ Partial Class frmAuxiliaryConfig
         Me.lblPowerNetVoltage = New System.Windows.Forms.Label()
         Me.tabPneumaticConfig = New System.Windows.Forms.TabPage()
         Me.pnlPneumaticsUserInput = New System.Windows.Forms.Panel()
+        Me.btnOpenAPAC = New System.Windows.Forms.Button()
+        Me.btnOpenACMP = New System.Windows.Forms.Button()
         Me.btnActuationsMap = New System.Windows.Forms.Button()
         Me.btnCompressorMap = New System.Windows.Forms.Button()
         Me.lblPneumaticsVariablesTitle = New System.Windows.Forms.Label()
@@ -117,6 +119,7 @@ Partial Class frmAuxiliaryConfig
         Me.txtPerStopBrakeActuationNIperKG = New System.Windows.Forms.TextBox()
         Me.txtSmartRegenFractionTotalAirDemand = New System.Windows.Forms.TextBox()
         Me.tabHVACConfig = New System.Windows.Forms.TabPage()
+        Me.btnOpenAHSM = New System.Windows.Forms.Button()
         Me.btnSSMBSource = New System.Windows.Forms.Button()
         Me.lblSSMFilePath = New System.Windows.Forms.Label()
         Me.txtSSMFilePath = New System.Windows.Forms.TextBox()
@@ -134,9 +137,7 @@ Partial Class frmAuxiliaryConfig
         Me.CmFiles = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.btnOpenACMP = New System.Windows.Forms.Button()
-        Me.btnOpenAPAC = New System.Windows.Forms.Button()
-        Me.btnOpenAHSM = New System.Windows.Forms.Button()
+        Me.Label1 = New System.Windows.Forms.Label()
         Me.pnlMain.SuspendLayout
         Me.tabMain.SuspendLayout
         Me.tabGeneralConfig.SuspendLayout
@@ -167,7 +168,7 @@ Partial Class frmAuxiliaryConfig
         '
         'btnCancel
         '
-        Me.btnCancel.Location = New System.Drawing.Point(746, 750)
+        Me.btnCancel.Location = New System.Drawing.Point(843, 750)
         Me.btnCancel.Name = "btnCancel"
         Me.btnCancel.Size = New System.Drawing.Size(75, 23)
         Me.btnCancel.TabIndex = 5
@@ -176,7 +177,7 @@ Partial Class frmAuxiliaryConfig
         '
         'btnSave
         '
-        Me.btnSave.Location = New System.Drawing.Point(535, 748)
+        Me.btnSave.Location = New System.Drawing.Point(745, 748)
         Me.btnSave.Name = "btnSave"
         Me.btnSave.Size = New System.Drawing.Size(85, 25)
         Me.btnSave.TabIndex = 10
@@ -200,6 +201,7 @@ Partial Class frmAuxiliaryConfig
         '
         'tabGeneralConfig
         '
+        Me.tabGeneralConfig.Controls.Add(Me.Label1)
         Me.tabGeneralConfig.Controls.Add(Me.btnFuelMap)
         Me.tabGeneralConfig.Controls.Add(Me.lblFuelMap)
         Me.tabGeneralConfig.Controls.Add(Me.txtFuelMap)
@@ -215,28 +217,31 @@ Partial Class frmAuxiliaryConfig
         '
         'btnFuelMap
         '
-        Me.btnFuelMap.Location = New System.Drawing.Point(749, 69)
+        Me.btnFuelMap.Location = New System.Drawing.Point(791, 204)
         Me.btnFuelMap.Name = "btnFuelMap"
         Me.btnFuelMap.Size = New System.Drawing.Size(38, 23)
         Me.btnFuelMap.TabIndex = 9
         Me.btnFuelMap.Text = ". . . "
         Me.btnFuelMap.UseVisualStyleBackColor = true
+        Me.btnFuelMap.Visible = false
         '
         'lblFuelMap
         '
         Me.lblFuelMap.AutoSize = true
-        Me.lblFuelMap.Location = New System.Drawing.Point(37, 70)
+        Me.lblFuelMap.Location = New System.Drawing.Point(79, 205)
         Me.lblFuelMap.Name = "lblFuelMap"
         Me.lblFuelMap.Size = New System.Drawing.Size(51, 13)
         Me.lblFuelMap.TabIndex = 8
         Me.lblFuelMap.Text = "Fuel Map"
+        Me.lblFuelMap.Visible = false
         '
         'txtFuelMap
         '
-        Me.txtFuelMap.Location = New System.Drawing.Point(94, 69)
+        Me.txtFuelMap.Location = New System.Drawing.Point(136, 204)
         Me.txtFuelMap.Name = "txtFuelMap"
         Me.txtFuelMap.Size = New System.Drawing.Size(649, 20)
         Me.txtFuelMap.TabIndex = 7
+        Me.txtFuelMap.Visible = false
         '
         'cboCycle
         '
@@ -305,97 +310,97 @@ Partial Class frmAuxiliaryConfig
         '
         'gvResultsCardOverrun
         '
-        DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
-        DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gvResultsCardOverrun.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1
+        DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+        DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.gvResultsCardOverrun.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle13
         Me.gvResultsCardOverrun.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
-        DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gvResultsCardOverrun.DefaultCellStyle = DataGridViewCellStyle2
+        DataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+        DataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gvResultsCardOverrun.DefaultCellStyle = DataGridViewCellStyle14
         Me.gvResultsCardOverrun.Location = New System.Drawing.Point(590, 451)
         Me.gvResultsCardOverrun.Name = "gvResultsCardOverrun"
-        DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
-        DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gvResultsCardOverrun.RowHeadersDefaultCellStyle = DataGridViewCellStyle3
+        DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+        DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.gvResultsCardOverrun.RowHeadersDefaultCellStyle = DataGridViewCellStyle15
         Me.gvResultsCardOverrun.Size = New System.Drawing.Size(246, 125)
         Me.gvResultsCardOverrun.TabIndex = 18
         '
         'gvResultsCardTraction
         '
-        DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
-        DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gvResultsCardTraction.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4
+        DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+        DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.gvResultsCardTraction.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle16
         Me.gvResultsCardTraction.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
-        DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gvResultsCardTraction.DefaultCellStyle = DataGridViewCellStyle5
+        DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+        DataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gvResultsCardTraction.DefaultCellStyle = DataGridViewCellStyle17
         Me.gvResultsCardTraction.Location = New System.Drawing.Point(311, 451)
         Me.gvResultsCardTraction.Name = "gvResultsCardTraction"
-        DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
-        DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gvResultsCardTraction.RowHeadersDefaultCellStyle = DataGridViewCellStyle6
+        DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+        DataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.gvResultsCardTraction.RowHeadersDefaultCellStyle = DataGridViewCellStyle18
         Me.gvResultsCardTraction.Size = New System.Drawing.Size(258, 125)
         Me.gvResultsCardTraction.TabIndex = 17
         '
         'gvResultsCardIdle
         '
-        DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
-        DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gvResultsCardIdle.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle7
+        DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+        DataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.gvResultsCardIdle.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle19
         Me.gvResultsCardIdle.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
-        DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gvResultsCardIdle.DefaultCellStyle = DataGridViewCellStyle8
+        DataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+        DataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gvResultsCardIdle.DefaultCellStyle = DataGridViewCellStyle20
         Me.gvResultsCardIdle.Location = New System.Drawing.Point(35, 451)
         Me.gvResultsCardIdle.Name = "gvResultsCardIdle"
-        DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
-        DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gvResultsCardIdle.RowHeadersDefaultCellStyle = DataGridViewCellStyle9
+        DataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+        DataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.gvResultsCardIdle.RowHeadersDefaultCellStyle = DataGridViewCellStyle21
         Me.gvResultsCardIdle.Size = New System.Drawing.Size(256, 125)
         Me.gvResultsCardIdle.TabIndex = 16
         '
@@ -447,33 +452,33 @@ Partial Class frmAuxiliaryConfig
         '
         'gvElectricalConsumables
         '
-        DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
-        DataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gvElectricalConsumables.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle10
+        DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+        DataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.gvElectricalConsumables.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle22
         Me.gvElectricalConsumables.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
-        DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gvElectricalConsumables.DefaultCellStyle = DataGridViewCellStyle11
+        DataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+        DataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gvElectricalConsumables.DefaultCellStyle = DataGridViewCellStyle23
         Me.gvElectricalConsumables.Location = New System.Drawing.Point(33, 170)
         Me.gvElectricalConsumables.Name = "gvElectricalConsumables"
-        DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
-        DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gvElectricalConsumables.RowHeadersDefaultCellStyle = DataGridViewCellStyle12
+        DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+        DataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.gvElectricalConsumables.RowHeadersDefaultCellStyle = DataGridViewCellStyle24
         Me.gvElectricalConsumables.Size = New System.Drawing.Size(803, 250)
         Me.gvElectricalConsumables.TabIndex = 10
         '
@@ -583,6 +588,24 @@ Partial Class frmAuxiliaryConfig
         Me.pnlPneumaticsUserInput.Size = New System.Drawing.Size(491, 576)
         Me.pnlPneumaticsUserInput.TabIndex = 53
         '
+        'btnOpenAPAC
+        '
+        Me.btnOpenAPAC.Image = CType(resources.GetObject("btnOpenAPAC.Image"),System.Drawing.Image)
+        Me.btnOpenAPAC.Location = New System.Drawing.Point(456, 345)
+        Me.btnOpenAPAC.Name = "btnOpenAPAC"
+        Me.btnOpenAPAC.Size = New System.Drawing.Size(28, 20)
+        Me.btnOpenAPAC.TabIndex = 54
+        Me.btnOpenAPAC.UseVisualStyleBackColor = true
+        '
+        'btnOpenACMP
+        '
+        Me.btnOpenACMP.Image = CType(resources.GetObject("btnOpenACMP.Image"),System.Drawing.Image)
+        Me.btnOpenACMP.Location = New System.Drawing.Point(456, 60)
+        Me.btnOpenACMP.Name = "btnOpenACMP"
+        Me.btnOpenACMP.Size = New System.Drawing.Size(28, 20)
+        Me.btnOpenACMP.TabIndex = 53
+        Me.btnOpenACMP.UseVisualStyleBackColor = true
+        '
         'btnActuationsMap
         '
         Me.btnActuationsMap.Location = New System.Drawing.Point(412, 343)
@@ -1051,6 +1074,15 @@ Partial Class frmAuxiliaryConfig
         Me.tabHVACConfig.Text = "HVAC"
         Me.tabHVACConfig.UseVisualStyleBackColor = true
         '
+        'btnOpenAHSM
+        '
+        Me.btnOpenAHSM.Image = CType(resources.GetObject("btnOpenAHSM.Image"),System.Drawing.Image)
+        Me.btnOpenAHSM.Location = New System.Drawing.Point(777, 83)
+        Me.btnOpenAHSM.Name = "btnOpenAHSM"
+        Me.btnOpenAHSM.Size = New System.Drawing.Size(28, 20)
+        Me.btnOpenAHSM.TabIndex = 55
+        Me.btnOpenAHSM.UseVisualStyleBackColor = true
+        '
         'btnSSMBSource
         '
         Me.btnSSMBSource.Location = New System.Drawing.Point(712, 82)
@@ -1173,32 +1205,16 @@ Partial Class frmAuxiliaryConfig
         Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
         Me.ShowInFolderToolStripMenuItem.Text = "Open In Folder"
         '
-        'btnOpenACMP
+        'Label1
         '
-        Me.btnOpenACMP.Image = CType(resources.GetObject("btnOpenACMP.Image"),System.Drawing.Image)
-        Me.btnOpenACMP.Location = New System.Drawing.Point(456, 60)
-        Me.btnOpenACMP.Name = "btnOpenACMP"
-        Me.btnOpenACMP.Size = New System.Drawing.Size(28, 20)
-        Me.btnOpenACMP.TabIndex = 53
-        Me.btnOpenACMP.UseVisualStyleBackColor = true
-        '
-        'btnOpenAPAC
-        '
-        Me.btnOpenAPAC.Image = CType(resources.GetObject("btnOpenAPAC.Image"),System.Drawing.Image)
-        Me.btnOpenAPAC.Location = New System.Drawing.Point(456, 345)
-        Me.btnOpenAPAC.Name = "btnOpenAPAC"
-        Me.btnOpenAPAC.Size = New System.Drawing.Size(28, 20)
-        Me.btnOpenAPAC.TabIndex = 54
-        Me.btnOpenAPAC.UseVisualStyleBackColor = true
-        '
-        'btnOpenAHSM
-        '
-        Me.btnOpenAHSM.Image = CType(resources.GetObject("btnOpenAHSM.Image"),System.Drawing.Image)
-        Me.btnOpenAHSM.Location = New System.Drawing.Point(777, 83)
-        Me.btnOpenAHSM.Name = "btnOpenAHSM"
-        Me.btnOpenAHSM.Size = New System.Drawing.Size(28, 20)
-        Me.btnOpenAHSM.TabIndex = 55
-        Me.btnOpenAHSM.UseVisualStyleBackColor = true
+        Me.Label1.AutoSize = true
+        Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 14!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+        Me.Label1.ForeColor = System.Drawing.Color.Lime
+        Me.Label1.Location = New System.Drawing.Point(82, 59)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(364, 24)
+        Me.Label1.TabIndex = 10
+        Me.Label1.Text = "This Area Is reserved for future expansion."
         '
         'frmAuxiliaryConfig
         '
@@ -1333,5 +1349,6 @@ End Sub
     Friend WithEvents btnOpenACMP As System.Windows.Forms.Button
     Friend WithEvents btnOpenAPAC As System.Windows.Forms.Button
     Friend WithEvents btnOpenAHSM As System.Windows.Forms.Button
+    Friend WithEvents Label1 As System.Windows.Forms.Label
 
 End Class
diff --git a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.resx b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.resx
index ff9a1388e3..11392e0077 100644
--- a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.resx
+++ b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.resx
@@ -121,7 +121,7 @@
   <data name="btnAALTOpen.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAACxAAAAsQAa0jvXUAAAAGYktHRAD/AP8A/6C9p5MAAAAHdElNRQfdAw8KGzD/z7E3
+        YQUAAAAJcEhZcwAACw8AAAsPAZL5A6UAAAAGYktHRAD/AP8A/6C9p5MAAAAHdElNRQfdAw8KGzD/z7E3
         AAACLElEQVQ4T2OgCggMDGQysg5n1zcPZjewDGU3tApjB/GNbWAYxA9ld3V1ZoFqQQX+4UVO+XVrFxU0
         bN2QW7dpfVb1hvUZFevWp5evXZ9esR7I3rQ+v3b9yryS7mx3d1deqDYE8IpobUqsf/Dfp+DFf8+8Z//d
         c578d8169N8l4+F/p/QHQPzwf2DBzf9xuYtOMfBaykO1IUBadmXFpTs//x+9+O3f0Qtf/4PwkfNfwPjw
@@ -137,7 +137,7 @@
   <data name="btnOpenAPAC.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAACw4AAAsOAUC+4UEAAAAGYktHRAD/AP8A/6C9p5MAAAAHdElNRQfdAw8KGzD/z7E3
+        YQUAAAAJcEhZcwAACw0AAAsNAe0HwCwAAAAGYktHRAD/AP8A/6C9p5MAAAAHdElNRQfdAw8KGzD/z7E3
         AAACLElEQVQ4T2OgCggMDGQysg5n1zcPZjewDGU3tApjB/GNbWAYxA9ld3V1ZoFqQQX+4UVO+XVrFxU0
         bN2QW7dpfVb1hvUZFevWp5evXZ9esR7I3rQ+v3b9yryS7mx3d1deqDYE8IpobUqsf/Dfp+DFf8+8Z//d
         c578d8169N8l4+F/p/QHQPzwf2DBzf9xuYtOMfBaykO1IUBadmXFpTs//x+9+O3f0Qtf/4PwkfNfwPjw
@@ -153,7 +153,7 @@
   <data name="btnOpenACMP.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAACw8AAAsPAZL5A6UAAAAGYktHRAD/AP8A/6C9p5MAAAAHdElNRQfdAw8KGzD/z7E3
+        YQUAAAAJcEhZcwAACw4AAAsOAUC+4UEAAAAGYktHRAD/AP8A/6C9p5MAAAAHdElNRQfdAw8KGzD/z7E3
         AAACLElEQVQ4T2OgCggMDGQysg5n1zcPZjewDGU3tApjB/GNbWAYxA9ld3V1ZoFqQQX+4UVO+XVrFxU0
         bN2QW7dpfVb1hvUZFevWp5evXZ9esR7I3rQ+v3b9yryS7mx3d1deqDYE8IpobUqsf/Dfp+DFf8+8Z//d
         c578d8169N8l4+F/p/QHQPzwf2DBzf9xuYtOMfBaykO1IUBadmXFpTs//x+9+O3f0Qtf/4PwkfNfwPjw
@@ -169,7 +169,7 @@
   <data name="btnOpenAHSM.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAACw0AAAsNAe0HwCwAAAAGYktHRAD/AP8A/6C9p5MAAAAHdElNRQfdAw8KGzD/z7E3
+        YQUAAAAJcEhZcwAACwwAAAsMAT9AIsgAAAAGYktHRAD/AP8A/6C9p5MAAAAHdElNRQfdAw8KGzD/z7E3
         AAACLElEQVQ4T2OgCggMDGQysg5n1zcPZjewDGU3tApjB/GNbWAYxA9ld3V1ZoFqQQX+4UVO+XVrFxU0
         bN2QW7dpfVb1hvUZFevWp5evXZ9esR7I3rQ+v3b9yryS7mx3d1deqDYE8IpobUqsf/Dfp+DFf8+8Z//d
         c578d8169N8l4+F/p/QHQPzwf2DBzf9xuYtOMfBaykO1IUBadmXFpTs//x+9+O3f0Qtf/4PwkfNfwPjw
@@ -189,7 +189,7 @@
     <value>168, 17</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>169</value>
+    <value>35</value>
   </metadata>
   <metadata name="Timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>543, 19</value>
diff --git a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
index bad9767443..a51dcfada1 100644
--- a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
+++ b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
@@ -78,7 +78,6 @@
   <ItemGroup>
     <Compile Include="AdvancedAuxiliaries.vb" />
     <Compile Include="AuxiliaryConfig.vb" />
-    <Compile Include="AuxillaryEnvironment.vb" />
     <Compile Include="DownstreamModules\cDelaunayMap.vb" />
     <Compile Include="DownstreamModules\cFile V3.vb" />
     <Compile Include="DownstreamModules\cMAP.vb" />
diff --git a/VECTOAux/VectoAuxiliariesTests/TestFiles/auxiliaryConfigKEEP.json b/VECTOAux/VectoAuxiliariesTests/TestFiles/auxiliaryConfigKEEP.json
index 093fa96c7b..c6a009e44c 100644
--- a/VECTOAux/VectoAuxiliariesTests/TestFiles/auxiliaryConfigKEEP.json
+++ b/VECTOAux/VectoAuxiliariesTests/TestFiles/auxiliaryConfigKEEP.json
@@ -1,5 +1,5 @@
 {
-  "$type": "VectoAuxiliaries.AuxillaryEnvironment, VectoAuxiliaries",
+  "$type": "VectoAuxiliaries.AuxiliaryConfig, VectoAuxiliaries",
   "M0": null,
   "M05": null,
   "M1": null,
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentComparisonTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentComparisonTests.vb
index 1e0bd0d885..8ea31566d7 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentComparisonTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentComparisonTests.vb
@@ -16,8 +16,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub BasicEqualCompareTest()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")'auxFresh.ShallowCopy()
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")'auxFresh.ShallowCopy()
     Dim compareResult As Boolean
     
     'Act
@@ -31,8 +31,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub BasicUnequalTest()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     
     'Act
@@ -50,8 +50,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub ElectricalUserConfig_AlternatorGearEfficiency_UnequalTest()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxNow.ElectricalUserInputsConfig.AlternatorGearEfficiency= If( auxNow.ElectricalUserInputsConfig.AlternatorGearEfficiency+0.1>1, 1, auxNow.ElectricalUserInputsConfig.AlternatorGearEfficiency+0.1)
 
@@ -66,8 +66,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub ElectricalUserConfig_AlternatorMap_UnequalTest()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxNow.ElectricalUserInputsConfig.AlternatorMap = auxNow.ElectricalUserInputsConfig.AlternatorMap & "X"
 
@@ -82,8 +82,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub ElectricalUserConfig_DoorActuationTimeSecond_UnequalTest()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxNow.ElectricalUserInputsConfig.DoorActuationTimeSecond+=1
 
@@ -98,8 +98,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub ElectricalUserConfig_Consumers_Unequal_Count_UnequalTest()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items.RemoveAt(0)
 
@@ -114,8 +114,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub ElectricalUserConfig_Unequal_Consumers_AvgConsumptionAmps_UnequalTest()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).AvgConsumptionAmps+=1
 
@@ -130,8 +130,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub ElectricalUserConfig_Unequal_Consumers_BaseVehicle_UnequalTest()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).BaseVehicle= NOT auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).BaseVehicle
 
@@ -146,8 +146,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub ElectricalUserConfig_Unequal_Consumers_Category_UnequalTest()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     Dim cat As String = auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).Category
     auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).Category= cat & "x"
@@ -163,8 +163,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub ElectricalUserConfig_Unequal_Consumers_ConsumerName_UnequalTest()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     Dim cname As String = auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).ConsumerName
     auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).ConsumerName= cName & "x"
@@ -180,8 +180,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub ElectricalUserConfig_Unequal_Consumers_NominalConsumptionAmps_UnequalTest()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     Dim cname As single = auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).NominalConsumptionAmps
     auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).NominalConsumptionAmps+=1
@@ -197,8 +197,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub ElectricalUserConfig_Unequal_Consumers_NumberInActualVehicle_UnequalTest()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     Dim cname As single = auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).NumberInActualVehicle
     auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).NumberInActualVehicle+=1
@@ -214,8 +214,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub ElectricalUserConfig_Unequal_Consumers_PhaseIdle_TractionOn_UnequalTest()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     Dim cname As single = auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).PhaseIdle_TractionOn
     auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).PhaseIdle_TractionOn+=1
@@ -231,8 +231,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub ElectricalUserConfig_Unequal_ResultCardIdle_UnequalCount_UnequalTest()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxNow.ElectricalUserInputsConfig.ResultCardIdle.Results.Add( New SmartResult(50,49))
 
@@ -247,8 +247,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub ElectricalUserConfig_Unequal_ResultCardTraction_UnequalCount_UnequalTest()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxNow.ElectricalUserInputsConfig.ResultCardTraction.Results.Add( New SmartResult(50,49))
 
@@ -263,8 +263,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub ElectricalUserConfig_Unequal_ResultCardOverrun_UnequalCount_UnequalTest()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxNow.ElectricalUserInputsConfig.ResultCardOverrun.Results.Add( New SmartResult(50,49))
 
@@ -279,8 +279,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub ElectricalUserConfig_Unequal_ResultCardIdle_AMPS_UnequalTest()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxFresh.ElectricalUserInputsConfig.ResultCardIdle.Results.Add( New SmartResult(50,49))
     auxNow.ElectricalUserInputsConfig.ResultCardIdle.Results.Add( New SmartResult(49,49))
@@ -296,8 +296,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub ElectricalUserConfig_Unequal_ResultCardIdle_UnEqualAMPS_UnequalTest()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxFresh.ElectricalUserInputsConfig.ResultCardIdle.Results.Add( New SmartResult(49,49))
     auxNow.ElectricalUserInputsConfig.ResultCardIdle.Results.Add( New SmartResult(50,49))
@@ -313,8 +313,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub ElectricalUserConfig_Unequal_ResultCardIdle_UnEqualSMARTAMPS_UnequalTest()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxFresh.ElectricalUserInputsConfig.ResultCardIdle.Results.Add( New SmartResult(49,51))
     auxNow.ElectricalUserInputsConfig.ResultCardIdle.Results.Add( New SmartResult(49,50))
@@ -330,8 +330,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub ElectricalUserConfig_Unequal_ResultCardTraction_AMPS_UnequalTest()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxFresh.ElectricalUserInputsConfig.ResultCardTraction.Results.Add( New SmartResult(50,49))
     auxNow.ElectricalUserInputsConfig.ResultCardTraction.Results.Add( New SmartResult(51,49))
@@ -347,8 +347,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub ElectricalUserConfig_Unequal_ResultCardTraction_UnEqualAMPS_UnequalTest()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxFresh.ElectricalUserInputsConfig.ResultCardIdle.Results.Add( New SmartResult(49,49))
     auxNow.ElectricalUserInputsConfig.ResultCardIdle.Results.Add( New SmartResult(50,49))
@@ -364,8 +364,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub ElectricalUserConfig_Unequal_ResultCardTraction_UnEqualSMARTAMPS_UnequalTest()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxFresh.ElectricalUserInputsConfig.ResultCardIdle.Results.Add( New SmartResult(49,49))
     auxNow.ElectricalUserInputsConfig.ResultCardIdle.Results.Add( New SmartResult(49,50))
@@ -381,8 +381,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub ElectricalUserConfig_Unequal_ResultCardOverrun_AMPS_UnequalTest()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxFresh.ElectricalUserInputsConfig.ResultCardOverrun.Results.Add( New SmartResult(50,49))
     auxNow.ElectricalUserInputsConfig.ResultCardOverrun.Results.Add( New SmartResult(50,48))
@@ -398,8 +398,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub ElectricalUserConfig_Unequal_ResultCardOverrun_UnEqualAMPS_UnequalTest()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxFresh.ElectricalUserInputsConfig.ResultCardOverrun.Results.Add( New SmartResult(49,49))
     auxNow.ElectricalUserInputsConfig.ResultCardOverrun.Results.Add( New SmartResult(50,49))
@@ -415,8 +415,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub ElectricalUserConfig_Unequal_ResultCardOverrun_UnEqualSMARTAMPS_UnequalTest()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxFresh.ElectricalUserInputsConfig.ResultCardOverrun.Results.Add( New SmartResult(49,49))
     auxNow.ElectricalUserInputsConfig.ResultCardOverrun.Results.Add( New SmartResult(49,50))
@@ -432,8 +432,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub ElectricalUserConfig_Unequal_PowernetVoltage_UnEqualSMARTAMPS_UnequalTest()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxNow.ElectricalUserInputsConfig.PowerNetVoltage+=1
    
@@ -448,8 +448,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub ElectricalUserConfig_Unequal_SmarElectrics_UnEqualSMARTAMPS_UnequalTest()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxNow.ElectricalUserInputsConfig.SmartElectrical= Not auxNow.ElectricalUserInputsConfig.SmartElectrical
     
@@ -469,8 +469,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub PneumaticsAuxuiliaryConfig_AdBlueNIperMinute_Enequal()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxNow.PneumaticAuxillariesConfig.AdBlueNIperMinute+=1
   
@@ -485,8 +485,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub PneumaticsAuxuiliaryConfig_AirControlledSuspensionNIperMinute_Enequal()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxNow.PneumaticAuxillariesConfig.AirControlledSuspensionNIperMinute+=1
 
@@ -501,8 +501,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub PneumaticsAuxuiliaryConfig_BrakingNoRetarderNIperKG_Enequal()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxNow.PneumaticAuxillariesConfig.BrakingNoRetarderNIperKG+=1
 
@@ -517,8 +517,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub PneumaticsAuxuiliaryConfig_BrakingWithRetarderNIperKG_Enequal()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxNow.PneumaticAuxillariesConfig.BrakingWithRetarderNIperKG+=1
 
@@ -533,8 +533,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub PneumaticsAuxuiliaryConfig_BreakingPerKneelingNIperKGinMM_Enequal()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxNow.PneumaticAuxillariesConfig.BreakingPerKneelingNIperKGinMM+=1
 
@@ -549,8 +549,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub PneumaticsAuxuiliaryConfig_DeadVolBlowOutsPerLitresperHour_Enequal()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxNow.PneumaticAuxillariesConfig.DeadVolBlowOutsPerLitresperHour+=1   
 
@@ -565,8 +565,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub PneumaticsAuxuiliaryConfig_DeadVolumeLitres_Enequal()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxNow.PneumaticAuxillariesConfig.DeadVolumeLitres+=1    
 
@@ -581,8 +581,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub PneumaticsAuxuiliaryConfig_NonSmartRegenFractionTotalAirDemand_Enequal()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxNow.PneumaticAuxillariesConfig.NonSmartRegenFractionTotalAirDemand+=1    
 
@@ -597,8 +597,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub PneumaticsAuxuiliaryConfig_OverrunUtilisationForCompressionFraction_Enequal()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxNow.PneumaticAuxillariesConfig.OverrunUtilisationForCompressionFraction+=1    
 
@@ -613,8 +613,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub PneumaticsAuxuiliaryConfig_PerDoorOpeningNI_Enequal()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxNow.PneumaticAuxillariesConfig.PerDoorOpeningNI+=1    
 
@@ -629,8 +629,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub PneumaticsAuxuiliaryConfig_PerStopBrakeActuationNIperKG_Enequal()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxNow.PneumaticAuxillariesConfig.PerStopBrakeActuationNIperKG+=1    
 
@@ -645,8 +645,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub PneumaticsUserInputsConfig_SmartRegenFractionTotalAirDemand_Enequal()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxNow.PneumaticAuxillariesConfig.SmartRegenFractionTotalAirDemand+=1    
 
@@ -666,8 +666,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub PneumaticUserInputsConfig_ActuationsMap_Enequal()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxNow.PneumaticUserInputsConfig.ActuationsMap = auxNow.PneumaticUserInputsConfig.ActuationsMap & "x"    
 
@@ -682,8 +682,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub PneumaticUserInputsConfig_AdBlueDosing_Enequal()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxNow.PneumaticUserInputsConfig.AdBlueDosing = auxNow.PneumaticUserInputsConfig.AdBlueDosing & "x"   
      
@@ -698,8 +698,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub PneumaticUserInputsConfig_AirSuspensionControl_Enequal()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxNow.PneumaticUserInputsConfig.AirSuspensionControl = auxNow.PneumaticUserInputsConfig.AirSuspensionControl & "x"    
 
@@ -714,8 +714,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub PneumaticUserInputsConfig_CompressorGearEfficiency_Enequal()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxNow.PneumaticUserInputsConfig.CompressorGearEfficiency = If( auxNow.PneumaticUserInputsConfig.CompressorGearEfficiency-0.1<0,0,auxNow.PneumaticUserInputsConfig.CompressorGearEfficiency-0.1)
         
@@ -731,8 +731,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub PneumaticUserInputsConfig_CompressorGearRatio_Enequal()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean 
     auxNow.PneumaticUserInputsConfig.CompressorGearRatio +=1
 
@@ -746,8 +746,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub PneumaticUserInputsConfig_CompressorMap_Enequal()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     
 
@@ -765,8 +765,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub PneumaticUserInputsConfig_Doors_Enequal()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxNow.PneumaticUserInputsConfig.Doors = auxNow.PneumaticUserInputsConfig.Doors & "x"
 
@@ -782,8 +782,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub PneumaticUserInputsConfig_KneelingHeightMillimeters_Enequal()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxNow.PneumaticUserInputsConfig.KneelingHeightMillimeters +=1   
      
@@ -797,8 +797,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub PneumaticUserInputsConfig_RetarderBrake_Enequal()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean    
     auxNow.PneumaticUserInputsConfig.RetarderBrake = Not auxNow.PneumaticUserInputsConfig.RetarderBrake 
 
@@ -812,8 +812,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub PneumaticUserInputsConfig_SmartAirCompression_Enequal()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxNow.PneumaticUserInputsConfig.SmartAirCompression = Not auxNow.PneumaticUserInputsConfig.SmartAirCompression 
 
@@ -829,8 +829,8 @@ Public Class AuxiliaryComparisonTests
     Public Sub PneumaticUserInputsConfig_SmartRegeneration_Enequal()
 
     'Arrange
-    Dim auxFresh = New AuxillaryEnvironment("")
-    Dim auxNow   = New AuxillaryEnvironment("")
+    Dim auxFresh = New AuxiliaryConfig("")
+    Dim auxNow   = New AuxiliaryConfig("")
     Dim compareResult As Boolean
     auxNow.PneumaticUserInputsConfig.SmartRegeneration = Not auxNow.PneumaticUserInputsConfig.SmartRegeneration 
    
-- 
GitLab