Restore original dll names, use Define constants.

This changes set has no functional change, rather it cleans
up some aspects of a previous port.

When the hfa dlls were originally ported it was not known that
C# #defines could be used in the tests, so source files that
use #if were expanded to multiple source files with the preprocessing
being done manually. This changes goes back to using the original
files with appropriate define constants in the project files.

In addition, when these dlls were ported abbreviated names were
used. This change restores the dll names to the originals.

109 files changed, 2014 insertions, 5343 deletions

diff --git a/tests/src/JIT/jit64/hfa/main/dll/common.cs b/tests/src/JIT/jit64/hfa/main/dll/common.cs
index 611832af8d..a59e25168d 100644
--- a/tests/src/JIT/jit64/hfa/main/dll/common.cs
+++ b/tests/src/JIT/jit64/hfa/main/dll/common.cs
@@ -1,34 +1,43 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
 
 using System;
 
-namespace HFATest {
-
-	public class Common {
-
-		public const int SUCC_RET_CODE = 100;
-		public const int FAIL_RET_CODE = 1;
-
-		public const float tolerance = (float)1.0E-15;
-
-		public static bool CheckResult(string testName, float actual, float expected) {
-			bool check = Math.Abs(expected - actual) <= tolerance;
-			DisplayResult(testName, actual, expected, check);
-			return check;
-		}
-
-		public static bool CheckResult(string testName, double actual, double expected) {
-			bool check = Math.Abs(expected - actual) <= tolerance;
-			DisplayResult(testName, actual, expected, check);
-			return check;
-		}
-
-		private static void DisplayResult(string testName, double actual, double expected, bool result) {
-			System.Console.Write("[" + testName + "]\t");
-			if (result) {
-				System.Console.WriteLine("PASSED");
-			} else {
-				System.Console.WriteLine("FAILED => expected = {0}, actual = {1}", expected, actual);
-			}
-		}
-	}
+namespace HFATest
+{
+    public class Common
+    {
+        public const int SUCC_RET_CODE = 100;
+        public const int FAIL_RET_CODE = 1;
+
+        public const float tolerance = (float)1.0E-15;
+
+        public static bool CheckResult(string testName, float actual, float expected)
+        {
+            bool check = Math.Abs(expected - actual) <= tolerance;
+            DisplayResult(testName, actual, expected, check);
+            return check;
+        }
+
+        public static bool CheckResult(string testName, double actual, double expected)
+        {
+            bool check = Math.Abs(expected - actual) <= tolerance;
+            DisplayResult(testName, actual, expected, check);
+            return check;
+        }
+
+        private static void DisplayResult(string testName, double actual, double expected, bool result)
+        {
+            System.Console.Write("[" + testName + "]\t");
+            if (result)
+            {
+                System.Console.WriteLine("PASSED");
+            }
+            else
+            {
+                System.Console.WriteLine("FAILED => expected = {0}, actual = {1}", expected, actual);
+            }
+        }
+    }
 }
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_common.cs b/tests/src/JIT/jit64/hfa/main/dll/hfa_common.cs
new file mode 100644
index 0000000000..11118ec7be
--- /dev/null
+++ b/tests/src/JIT/jit64/hfa/main/dll/hfa_common.cs
@@ -0,0 +1,160 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Runtime.InteropServices;
+
+namespace HFATest
+{
+#if NESTED_HFA
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct HFA01
+    {
+#if FLOAT64
+        public double f1;
+#else
+        public float f1;
+#endif
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct HFA02
+    {
+        public HFA01 hfa01;
+#if FLOAT64
+        public double f2;
+#else
+        public float f2;
+#endif
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct HFA03
+    {
+        public HFA01 hfa01;
+        public HFA02 hfa02;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct HFA05
+    {
+        public HFA02 hfa02;
+        public HFA03 hfa03;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct HFA08
+    {
+        public HFA03 hfa03;
+        public HFA05 hfa05;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct HFA11
+    {
+        public HFA03 hfa03;
+        public HFA08 hfa08;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct HFA19
+    {
+        public HFA08 hfa08;
+        public HFA11 hfa11;
+    }
+
+#else // NESTED_HFA
+
+#if FLOAT64
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct HFA01
+    {
+        public double f1;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct HFA02
+    {
+        public double f1, f2;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct HFA03
+    {
+        public double f1, f2, f3;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct HFA05
+    {
+        public double f1, f2, f3, f4, f5;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct HFA08
+    {
+        public double f1, f2, f3, f4, f5, f6, f7, f8;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct HFA11
+    {
+        public double f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct HFA19
+    {
+        public double f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15, f16, f17, f18, f19;
+    }
+
+#else
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct HFA01
+    {
+        public float f1;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct HFA02
+    {
+        public float f1, f2;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct HFA03
+    {
+        public float f1, f2, f3;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct HFA05
+    {
+        public float f1, f2, f3, f4, f5;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct HFA08
+    {
+        public float f1, f2, f3, f4, f5, f6, f7, f8;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct HFA11
+    {
+        public float f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct HFA19
+    {
+        public float f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15, f16, f17, f18, f19;
+    }
+
+#endif // FLOAT64
+
+#endif // NESTED_HFA
+}
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_common_nd.cs b/tests/src/JIT/jit64/hfa/main/dll/hfa_common_nd.cs
deleted file mode 100644
index a150e86244..0000000000
--- a/tests/src/JIT/jit64/hfa/main/dll/hfa_common_nd.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Runtime.InteropServices;
-
-namespace HFATest
-{
-    [StructLayout(LayoutKind.Sequential)]
-    public struct HFA01
-    {
-        public double f1;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    public struct HFA02
-    {
-        public HFA01 hfa01;
-        public double f2;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    public struct HFA03
-    {
-        public HFA01 hfa01;
-        public HFA02 hfa02;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    public struct HFA05
-    {
-        public HFA02 hfa02;
-        public HFA03 hfa03;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    public struct HFA08
-    {
-        public HFA03 hfa03;
-        public HFA05 hfa05;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    public struct HFA11
-    {
-        public HFA03 hfa03;
-        public HFA08 hfa08;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    public struct HFA19
-    {
-        public HFA08 hfa08;
-        public HFA11 hfa11;
-    }
-}
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_common_nf.cs b/tests/src/JIT/jit64/hfa/main/dll/hfa_common_nf.cs
deleted file mode 100644
index 93094671f5..0000000000
--- a/tests/src/JIT/jit64/hfa/main/dll/hfa_common_nf.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Runtime.InteropServices;
-
-namespace HFATest
-{
-    [StructLayout(LayoutKind.Sequential)]
-    public struct HFA01
-    {
-        public float f1;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    public struct HFA02
-    {
-        public HFA01 hfa01;
-        public float f2;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    public struct HFA03
-    {
-        public HFA01 hfa01;
-        public HFA02 hfa02;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    public struct HFA05
-    {
-        public HFA02 hfa02;
-        public HFA03 hfa03;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    public struct HFA08
-    {
-        public HFA03 hfa03;
-        public HFA05 hfa05;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    public struct HFA11
-    {
-        public HFA03 hfa03;
-        public HFA08 hfa08;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    public struct HFA19
-    {
-        public HFA08 hfa08;
-        public HFA11 hfa11;
-    }
-}
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_common_sd.cs b/tests/src/JIT/jit64/hfa/main/dll/hfa_common_sd.cs
deleted file mode 100644
index 08d6dcf981..0000000000
--- a/tests/src/JIT/jit64/hfa/main/dll/hfa_common_sd.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Runtime.InteropServices;
-
-namespace HFATest
-{
-    [StructLayout(LayoutKind.Sequential)]
-    public struct HFA01
-    {
-        public double f1;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    public struct HFA02
-    {
-        public double f1, f2;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    public struct HFA03
-    {
-        public double f1, f2, f3;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    public struct HFA05
-    {
-        public double f1, f2, f3, f4, f5;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    public struct HFA08
-    {
-        public double f1, f2, f3, f4, f5, f6, f7, f8;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    public struct HFA11
-    {
-        public double f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    public struct HFA19
-    {
-        public double f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15, f16, f17, f18, f19;
-    }
-}
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_common_sf.cs b/tests/src/JIT/jit64/hfa/main/dll/hfa_common_sf.cs
deleted file mode 100644
index c8cc49f888..0000000000
--- a/tests/src/JIT/jit64/hfa/main/dll/hfa_common_sf.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Runtime.InteropServices;
-
-namespace HFATest
-{
-    [StructLayout(LayoutKind.Sequential)]
-    public struct HFA01
-    {
-        public float f1;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    public struct HFA02
-    {
-        public float f1, f2;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    public struct HFA03
-    {
-        public float f1, f2, f3;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    public struct HFA05
-    {
-        public float f1, f2, f3, f4, f5;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    public struct HFA08
-    {
-        public float f1, f2, f3, f4, f5, f6, f7, f8;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    public struct HFA11
-    {
-        public float f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    public struct HFA19
-    {
-        public float f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15, f16, f17, f18, f19;
-    }
-}
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_interop.cs b/tests/src/JIT/jit64/hfa/main/dll/hfa_interop.cs
new file mode 100644
index 0000000000..233b9f045a
--- /dev/null
+++ b/tests/src/JIT/jit64/hfa/main/dll/hfa_interop.cs
@@ -0,0 +1,884 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Runtime.InteropServices;
+
+namespace HFATest
+{
+    public struct Config
+    {
+#if NESTED_HFA
+        public const string hfaType = "nested";
+#else
+        public const string hfaType = "simple";
+#endif
+
+#if NATIVE_IJW
+	public const string dllType = "native_ijw";
+#else
+        public const string dllType = "native_cpp";
+#endif
+
+#if FLOAT64
+        public const string floatType = "f64";
+#else
+        public const string floatType = "f32";
+#endif
+
+        public const string DllName = "hfa" + "_" + hfaType + "_" + floatType + "_" + dllType + ".dll";
+    }
+
+
+    public class TestMan
+    {
+        //---------------------------------------------
+        // Init Methods
+        // ---------------------------------------------------
+
+        [DllImport(Config.DllName, EntryPoint = "init_HFA01", CallingConvention = CallingConvention.StdCall)]
+        public static extern void Init_HFA01(out HFA01 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "init_HFA02", CallingConvention = CallingConvention.StdCall)]
+        public static extern void Init_HFA02(out HFA02 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "init_HFA03", CallingConvention = CallingConvention.StdCall)]
+        public static extern void Init_HFA03(out HFA03 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "init_HFA05", CallingConvention = CallingConvention.StdCall)]
+        public static extern void Init_HFA05(out HFA05 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "init_HFA08", CallingConvention = CallingConvention.StdCall)]
+        public static extern void Init_HFA08(out HFA08 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "init_HFA11", CallingConvention = CallingConvention.StdCall)]
+        public static extern void Init_HFA11(out HFA11 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "init_HFA19", CallingConvention = CallingConvention.StdCall)]
+        public static extern void Init_HFA19(out HFA19 hfa);
+
+
+
+        // ---------------------------------------------------
+        // Identity Methods
+        // ---------------------------------------------------
+
+        [DllImport(Config.DllName, EntryPoint = "identity_HFA01", CallingConvention = CallingConvention.StdCall)]
+        public static extern HFA01 Identity_HFA01(HFA01 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "identity_HFA02", CallingConvention = CallingConvention.StdCall)]
+        public static extern HFA02 Identity_HFA02(HFA02 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "identity_HFA03", CallingConvention = CallingConvention.StdCall)]
+        public static extern HFA03 Identity_HFA03(HFA03 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "identity_HFA05", CallingConvention = CallingConvention.StdCall)]
+        public static extern HFA05 Identity_HFA05(HFA05 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "identity_HFA08", CallingConvention = CallingConvention.StdCall)]
+        public static extern HFA08 Identity_HFA08(HFA08 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "identity_HFA11", CallingConvention = CallingConvention.StdCall)]
+        public static extern HFA11 Identity_HFA11(HFA11 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "identity_HFA19", CallingConvention = CallingConvention.StdCall)]
+        public static extern HFA19 Identity_HFA19(HFA19 hfa);
+
+
+
+        // ---------------------------------------------------
+        // Get Methods
+        // ---------------------------------------------------
+
+        [DllImport(Config.DllName, EntryPoint = "get_HFA01", CallingConvention = CallingConvention.StdCall)]
+        public static extern HFA01 Get_HFA01();
+
+        [DllImport(Config.DllName, EntryPoint = "get_HFA02", CallingConvention = CallingConvention.StdCall)]
+        public static extern HFA02 Get_HFA02();
+
+        [DllImport(Config.DllName, EntryPoint = "get_HFA03", CallingConvention = CallingConvention.StdCall)]
+        public static extern HFA03 Get_HFA03();
+
+        [DllImport(Config.DllName, EntryPoint = "get_HFA05", CallingConvention = CallingConvention.StdCall)]
+        public static extern HFA05 Get_HFA05();
+
+        [DllImport(Config.DllName, EntryPoint = "get_HFA08", CallingConvention = CallingConvention.StdCall)]
+        public static extern HFA08 Get_HFA08();
+
+        [DllImport(Config.DllName, EntryPoint = "get_HFA11", CallingConvention = CallingConvention.StdCall)]
+        public static extern HFA11 Get_HFA11();
+
+        [DllImport(Config.DllName, EntryPoint = "get_HFA19", CallingConvention = CallingConvention.StdCall)]
+        public static extern HFA19 Get_HFA19();
+
+
+
+#if FLOAT64
+
+        public static readonly double EXPECTED_SUM_HFA01 = Get_EXPECTED_SUM_HFA01();
+        public static readonly double EXPECTED_SUM_HFA02 = Get_EXPECTED_SUM_HFA02();
+        public static readonly double EXPECTED_SUM_HFA03 = Get_EXPECTED_SUM_HFA03();
+        public static readonly double EXPECTED_SUM_HFA05 = Get_EXPECTED_SUM_HFA05();
+        public static readonly double EXPECTED_SUM_HFA08 = Get_EXPECTED_SUM_HFA08();
+        public static readonly double EXPECTED_SUM_HFA11 = Get_EXPECTED_SUM_HFA11();
+        public static readonly double EXPECTED_SUM_HFA19 = Get_EXPECTED_SUM_HFA19();
+
+        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA01", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Get_EXPECTED_SUM_HFA01();
+
+        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA02", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Get_EXPECTED_SUM_HFA02();
+
+        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA03", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Get_EXPECTED_SUM_HFA03();
+
+        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA05", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Get_EXPECTED_SUM_HFA05();
+
+        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA08", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Get_EXPECTED_SUM_HFA08();
+
+        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA11", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Get_EXPECTED_SUM_HFA11();
+
+        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA19", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Get_EXPECTED_SUM_HFA19();
+
+
+        [DllImport(Config.DllName, EntryPoint = "sum_HFA01", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum_HFA01(HFA01 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum_HFA02", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum_HFA02(HFA02 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum_HFA03", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum_HFA03(HFA03 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum_HFA05", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum_HFA05(HFA05 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum_HFA08", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum_HFA08(HFA08 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum_HFA11", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum_HFA11(HFA11 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum_HFA19", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum_HFA19(HFA19 hfa);
+
+
+        [DllImport(Config.DllName, EntryPoint = "sum3_HFA01", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum3_HFA01(float v1, long v2, HFA01 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum3_HFA02", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum3_HFA02(float v1, long v2, HFA02 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum3_HFA03", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum3_HFA03(float v1, long v2, HFA03 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum3_HFA05", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum3_HFA05(float v1, long v2, HFA05 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum3_HFA08", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum3_HFA08(float v1, long v2, HFA08 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum3_HFA11", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum3_HFA11(float v1, long v2, HFA11 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum3_HFA19", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum3_HFA19(float v1, long v2, HFA19 hfa);
+
+
+        [DllImport(Config.DllName, EntryPoint = "sum5_HFA01", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum5_HFA01(long v1, double v2, int v3, sbyte v4, HFA01 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum5_HFA02", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum5_HFA02(long v1, double v2, int v3, sbyte v4, HFA02 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum5_HFA03", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum5_HFA03(long v1, double v2, int v3, sbyte v4, HFA03 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum5_HFA05", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum5_HFA05(long v1, double v2, int v3, sbyte v4, HFA05 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum5_HFA08", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum5_HFA08(long v1, double v2, int v3, sbyte v4, HFA08 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum5_HFA11", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum5_HFA11(long v1, double v2, int v3, sbyte v4, HFA11 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum5_HFA19", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum5_HFA19(long v1, double v2, int v3, sbyte v4, HFA19 hfa);
+
+
+        [DllImport(Config.DllName, EntryPoint = "sum8_HFA01", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum8_HFA01(float v1, double v2, long v3, sbyte v4, double v5, HFA01 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum8_HFA02", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum8_HFA02(float v1, double v2, long v3, sbyte v4, double v5, HFA02 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum8_HFA03", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum8_HFA03(float v1, double v2, long v3, sbyte v4, double v5, HFA03 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum8_HFA05", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum8_HFA05(float v1, double v2, long v3, sbyte v4, double v5, HFA05 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum8_HFA08", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum8_HFA08(float v1, double v2, long v3, sbyte v4, double v5, HFA08 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum8_HFA11", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum8_HFA11(float v1, double v2, long v3, sbyte v4, double v5, HFA11 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum8_HFA19", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum8_HFA19(float v1, double v2, long v3, sbyte v4, double v5, HFA19 hfa);
+
+
+        [DllImport(Config.DllName, EntryPoint = "sum11_HFA01", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum11_HFA01(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA01 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum11_HFA02", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum11_HFA02(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA02 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum11_HFA03", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum11_HFA03(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA03 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum11_HFA05", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum11_HFA05(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA05 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum11_HFA08", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum11_HFA08(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA08 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum11_HFA11", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum11_HFA11(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA11 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum11_HFA19", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum11_HFA19(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA19 hfa);
+
+
+        [DllImport(Config.DllName, EntryPoint = "sum19_HFA01", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum19_HFA01(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA01 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum19_HFA02", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum19_HFA02(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA02 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum19_HFA03", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum19_HFA03(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA03 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum19_HFA05", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum19_HFA05(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA05 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum19_HFA08", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum19_HFA08(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA08 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum19_HFA11", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum19_HFA11(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA11 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum19_HFA19", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Sum19_HFA19(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA19 hfa);
+
+
+
+        // ---------------------------------------------------
+        // Average Methods
+        // ---------------------------------------------------
+
+
+        [DllImport(Config.DllName, EntryPoint = "average_HFA01", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average_HFA01(HFA01 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "average_HFA02", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average_HFA02(HFA02 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "average_HFA03", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average_HFA03(HFA03 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "average_HFA05", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average_HFA05(HFA05 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "average_HFA08", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average_HFA08(HFA08 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "average_HFA11", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average_HFA11(HFA11 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "average_HFA19", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average_HFA19(HFA19 hfa);
+
+
+        [DllImport(Config.DllName, EntryPoint = "average3_HFA01", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average3_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3);
+
+        [DllImport(Config.DllName, EntryPoint = "average3_HFA02", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average3_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3);
+
+        [DllImport(Config.DllName, EntryPoint = "average3_HFA03", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average3_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3);
+
+        [DllImport(Config.DllName, EntryPoint = "average3_HFA05", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average3_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3);
+
+        [DllImport(Config.DllName, EntryPoint = "average3_HFA08", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average3_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3);
+
+        [DllImport(Config.DllName, EntryPoint = "average3_HFA11", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average3_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3);
+
+        [DllImport(Config.DllName, EntryPoint = "average3_HFA19", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average3_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3);
+
+
+        [DllImport(Config.DllName, EntryPoint = "average5_HFA01", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average5_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5);
+
+        [DllImport(Config.DllName, EntryPoint = "average5_HFA02", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average5_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5);
+
+        [DllImport(Config.DllName, EntryPoint = "average5_HFA03", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average5_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5);
+
+        [DllImport(Config.DllName, EntryPoint = "average5_HFA05", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average5_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5);
+
+        [DllImport(Config.DllName, EntryPoint = "average5_HFA08", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average5_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5);
+
+        [DllImport(Config.DllName, EntryPoint = "average5_HFA11", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average5_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5);
+
+        [DllImport(Config.DllName, EntryPoint = "average5_HFA19", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average5_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5);
+
+
+        [DllImport(Config.DllName, EntryPoint = "average8_HFA01", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average8_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5, HFA01 hfa6, HFA01 hfa7, HFA01 hfa8);
+
+        [DllImport(Config.DllName, EntryPoint = "average8_HFA02", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average8_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5, HFA02 hfa6, HFA02 hfa7, HFA02 hfa8);
+
+        [DllImport(Config.DllName, EntryPoint = "average8_HFA03", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average8_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5, HFA03 hfa6, HFA03 hfa7, HFA03 hfa8);
+
+        [DllImport(Config.DllName, EntryPoint = "average8_HFA05", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average8_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5, HFA05 hfa6, HFA05 hfa7, HFA05 hfa8);
+
+        [DllImport(Config.DllName, EntryPoint = "average8_HFA08", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average8_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5, HFA08 hfa6, HFA08 hfa7, HFA08 hfa8);
+
+        [DllImport(Config.DllName, EntryPoint = "average8_HFA11", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average8_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5, HFA11 hfa6, HFA11 hfa7, HFA11 hfa8);
+
+        [DllImport(Config.DllName, EntryPoint = "average8_HFA19", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average8_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5, HFA19 hfa6, HFA19 hfa7, HFA19 hfa8);
+
+
+        [DllImport(Config.DllName, EntryPoint = "average11_HFA01", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average11_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5, HFA01 hfa6, HFA01 hfa7, HFA01 hfa8, HFA01 hfa9, HFA01 hfa10, HFA01 hfa11);
+
+        [DllImport(Config.DllName, EntryPoint = "average11_HFA02", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average11_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5, HFA02 hfa6, HFA02 hfa7, HFA02 hfa8, HFA02 hfa9, HFA02 hfa10, HFA02 hfa11);
+
+        [DllImport(Config.DllName, EntryPoint = "average11_HFA03", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average11_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5, HFA03 hfa6, HFA03 hfa7, HFA03 hfa8, HFA03 hfa9, HFA03 hfa10, HFA03 hfa11);
+
+        [DllImport(Config.DllName, EntryPoint = "average11_HFA05", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average11_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5, HFA05 hfa6, HFA05 hfa7, HFA05 hfa8, HFA05 hfa9, HFA05 hfa10, HFA05 hfa11);
+
+        [DllImport(Config.DllName, EntryPoint = "average11_HFA08", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average11_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5, HFA08 hfa6, HFA08 hfa7, HFA08 hfa8, HFA08 hfa9, HFA08 hfa10, HFA08 hfa11);
+
+        [DllImport(Config.DllName, EntryPoint = "average11_HFA11", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average11_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5, HFA11 hfa6, HFA11 hfa7, HFA11 hfa8, HFA11 hfa9, HFA11 hfa10, HFA11 hfa11);
+
+        [DllImport(Config.DllName, EntryPoint = "average11_HFA19", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average11_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5, HFA19 hfa6, HFA19 hfa7, HFA19 hfa8, HFA19 hfa9, HFA19 hfa10, HFA19 hfa11);
+
+
+        [DllImport(Config.DllName, EntryPoint = "average19_HFA01", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average19_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5, HFA01 hfa6, HFA01 hfa7, HFA01 hfa8, HFA01 hfa9, HFA01 hfa10, HFA01 hfa11, HFA01 hfa12, HFA01 hfa13, HFA01 hfa14, HFA01 hfa15, HFA01 hfa16, HFA01 hfa17, HFA01 hfa18, HFA01 hfa19);
+
+        [DllImport(Config.DllName, EntryPoint = "average19_HFA02", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average19_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5, HFA02 hfa6, HFA02 hfa7, HFA02 hfa8, HFA02 hfa9, HFA02 hfa10, HFA02 hfa11, HFA02 hfa12, HFA02 hfa13, HFA02 hfa14, HFA02 hfa15, HFA02 hfa16, HFA02 hfa17, HFA02 hfa18, HFA02 hfa19);
+
+        [DllImport(Config.DllName, EntryPoint = "average19_HFA03", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average19_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5, HFA03 hfa6, HFA03 hfa7, HFA03 hfa8, HFA03 hfa9, HFA03 hfa10, HFA03 hfa11, HFA03 hfa12, HFA03 hfa13, HFA03 hfa14, HFA03 hfa15, HFA03 hfa16, HFA03 hfa17, HFA03 hfa18, HFA03 hfa19);
+
+        [DllImport(Config.DllName, EntryPoint = "average19_HFA05", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average19_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5, HFA05 hfa6, HFA05 hfa7, HFA05 hfa8, HFA05 hfa9, HFA05 hfa10, HFA05 hfa11, HFA05 hfa12, HFA05 hfa13, HFA05 hfa14, HFA05 hfa15, HFA05 hfa16, HFA05 hfa17, HFA05 hfa18, HFA05 hfa19);
+
+        [DllImport(Config.DllName, EntryPoint = "average19_HFA08", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average19_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5, HFA08 hfa6, HFA08 hfa7, HFA08 hfa8, HFA08 hfa9, HFA08 hfa10, HFA08 hfa11, HFA08 hfa12, HFA08 hfa13, HFA08 hfa14, HFA08 hfa15, HFA08 hfa16, HFA08 hfa17, HFA08 hfa18, HFA08 hfa19);
+
+        [DllImport(Config.DllName, EntryPoint = "average19_HFA11", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average19_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5, HFA11 hfa6, HFA11 hfa7, HFA11 hfa8, HFA11 hfa9, HFA11 hfa10, HFA11 hfa11, HFA11 hfa12, HFA11 hfa13, HFA11 hfa14, HFA11 hfa15, HFA11 hfa16, HFA11 hfa17, HFA11 hfa18, HFA11 hfa19);
+
+        [DllImport(Config.DllName, EntryPoint = "average19_HFA19", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Average19_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5, HFA19 hfa6, HFA19 hfa7, HFA19 hfa8, HFA19 hfa9, HFA19 hfa10, HFA19 hfa11, HFA19 hfa12, HFA19 hfa13, HFA19 hfa14, HFA19 hfa15, HFA19 hfa16, HFA19 hfa17, HFA19 hfa18, HFA19 hfa19);
+
+
+
+        // ---------------------------------------------------
+        // Add Methods
+        // ---------------------------------------------------
+
+
+        [DllImport(Config.DllName, EntryPoint = "add01_HFA01", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Add01_HFA01(HFA01 hfa1, float v1, HFA01 hfa2, int v2, HFA01 hfa3, short v3, double v4, HFA01 hfa4, HFA01 hfa5, float v5, long v6, float v7, HFA01 hfa6, float v8, HFA01 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add01_HFA02", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Add01_HFA02(HFA02 hfa1, float v1, HFA02 hfa2, int v2, HFA02 hfa3, short v3, double v4, HFA02 hfa4, HFA02 hfa5, float v5, long v6, float v7, HFA02 hfa6, float v8, HFA02 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add01_HFA03", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Add01_HFA03(HFA03 hfa1, float v1, HFA03 hfa2, int v2, HFA03 hfa3, short v3, double v4, HFA03 hfa4, HFA03 hfa5, float v5, long v6, float v7, HFA03 hfa6, float v8, HFA03 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add01_HFA05", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Add01_HFA05(HFA05 hfa1, float v1, HFA05 hfa2, int v2, HFA05 hfa3, short v3, double v4, HFA05 hfa4, HFA05 hfa5, float v5, long v6, float v7, HFA05 hfa6, float v8, HFA05 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add01_HFA08", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Add01_HFA08(HFA08 hfa1, float v1, HFA08 hfa2, int v2, HFA08 hfa3, short v3, double v4, HFA08 hfa4, HFA08 hfa5, float v5, long v6, float v7, HFA08 hfa6, float v8, HFA08 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add01_HFA11", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Add01_HFA11(HFA11 hfa1, float v1, HFA11 hfa2, int v2, HFA11 hfa3, short v3, double v4, HFA11 hfa4, HFA11 hfa5, float v5, long v6, float v7, HFA11 hfa6, float v8, HFA11 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add01_HFA19", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Add01_HFA19(HFA19 hfa1, float v1, HFA19 hfa2, int v2, HFA19 hfa3, short v3, double v4, HFA19 hfa4, HFA19 hfa5, float v5, long v6, float v7, HFA19 hfa6, float v8, HFA19 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add01_HFA00", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Add01_HFA00(HFA03 hfa1, float v1, HFA02 hfa2, int v2, HFA19 hfa3, short v3, double v4, HFA05 hfa4, HFA08 hfa5, float v5, long v6, float v7, HFA11 hfa6, float v8, HFA01 hfa7);
+
+
+        [DllImport(Config.DllName, EntryPoint = "add02_HFA01", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Add02_HFA01(HFA01 hfa1, HFA01 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA01 hfa3, double v7, float v8, HFA01 hfa4, short v9, HFA01 hfa5, float v10, HFA01 hfa6, HFA01 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add02_HFA02", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Add02_HFA02(HFA02 hfa1, HFA02 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA02 hfa3, double v7, float v8, HFA02 hfa4, short v9, HFA02 hfa5, float v10, HFA02 hfa6, HFA02 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add02_HFA03", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Add02_HFA03(HFA03 hfa1, HFA03 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA03 hfa3, double v7, float v8, HFA03 hfa4, short v9, HFA03 hfa5, float v10, HFA03 hfa6, HFA03 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add02_HFA05", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Add02_HFA05(HFA05 hfa1, HFA05 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA05 hfa3, double v7, float v8, HFA05 hfa4, short v9, HFA05 hfa5, float v10, HFA05 hfa6, HFA05 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add02_HFA08", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Add02_HFA08(HFA08 hfa1, HFA08 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA08 hfa3, double v7, float v8, HFA08 hfa4, short v9, HFA08 hfa5, float v10, HFA08 hfa6, HFA08 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add02_HFA11", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Add02_HFA11(HFA11 hfa1, HFA11 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA11 hfa3, double v7, float v8, HFA11 hfa4, short v9, HFA11 hfa5, float v10, HFA11 hfa6, HFA11 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add02_HFA19", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Add02_HFA19(HFA19 hfa1, HFA19 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA19 hfa3, double v7, float v8, HFA19 hfa4, short v9, HFA19 hfa5, float v10, HFA19 hfa6, HFA19 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add02_HFA00", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Add02_HFA00(HFA01 hfa1, HFA05 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA03 hfa3, double v7, float v8, HFA11 hfa4, short v9, HFA19 hfa5, float v10, HFA08 hfa6, HFA02 hfa7);
+
+
+
+        [DllImport(Config.DllName, EntryPoint = "add03_HFA01", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Add03_HFA01(float v1, sbyte v2, HFA01 hfa1, double v3, sbyte v4, HFA01 hfa2, long v5, short v6, int v7, HFA01 hfa3, HFA01 hfa4, float v8, HFA01 hfa5, float v9, HFA01 hfa6, float v10, HFA01 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add03_HFA02", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Add03_HFA02(float v1, sbyte v2, HFA02 hfa1, double v3, sbyte v4, HFA02 hfa2, long v5, short v6, int v7, HFA02 hfa3, HFA02 hfa4, float v8, HFA02 hfa5, float v9, HFA02 hfa6, float v10, HFA02 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add03_HFA03", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Add03_HFA03(float v1, sbyte v2, HFA03 hfa1, double v3, sbyte v4, HFA03 hfa2, long v5, short v6, int v7, HFA03 hfa3, HFA03 hfa4, float v8, HFA03 hfa5, float v9, HFA03 hfa6, float v10, HFA03 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add03_HFA05", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Add03_HFA05(float v1, sbyte v2, HFA05 hfa1, double v3, sbyte v4, HFA05 hfa2, long v5, short v6, int v7, HFA05 hfa3, HFA05 hfa4, float v8, HFA05 hfa5, float v9, HFA05 hfa6, float v10, HFA05 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add03_HFA08", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Add03_HFA08(float v1, sbyte v2, HFA08 hfa1, double v3, sbyte v4, HFA08 hfa2, long v5, short v6, int v7, HFA08 hfa3, HFA08 hfa4, float v8, HFA08 hfa5, float v9, HFA08 hfa6, float v10, HFA08 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add03_HFA11", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Add03_HFA11(float v1, sbyte v2, HFA11 hfa1, double v3, sbyte v4, HFA11 hfa2, long v5, short v6, int v7, HFA11 hfa3, HFA11 hfa4, float v8, HFA11 hfa5, float v9, HFA11 hfa6, float v10, HFA11 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add03_HFA19", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Add03_HFA19(float v1, sbyte v2, HFA19 hfa1, double v3, sbyte v4, HFA19 hfa2, long v5, short v6, int v7, HFA19 hfa3, HFA19 hfa4, float v8, HFA19 hfa5, float v9, HFA19 hfa6, float v10, HFA19 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add03_HFA00", CallingConvention = CallingConvention.StdCall)]
+        public static extern double Add03_HFA00(float v1, sbyte v2, HFA08 hfa1, double v3, sbyte v4, HFA19 hfa2, long v5, short v6, int v7, HFA03 hfa3, HFA01 hfa4, float v8, HFA11 hfa5, float v9, HFA02 hfa6, float v10, HFA05 hfa7);
+
+#else // FLOAT64
+
+        public static readonly float EXPECTED_SUM_HFA01 = Get_EXPECTED_SUM_HFA01();
+        public static readonly float EXPECTED_SUM_HFA02 = Get_EXPECTED_SUM_HFA02();
+        public static readonly float EXPECTED_SUM_HFA03 = Get_EXPECTED_SUM_HFA03();
+        public static readonly float EXPECTED_SUM_HFA05 = Get_EXPECTED_SUM_HFA05();
+        public static readonly float EXPECTED_SUM_HFA08 = Get_EXPECTED_SUM_HFA08();
+        public static readonly float EXPECTED_SUM_HFA11 = Get_EXPECTED_SUM_HFA11();
+        public static readonly float EXPECTED_SUM_HFA19 = Get_EXPECTED_SUM_HFA19();
+
+        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA01", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Get_EXPECTED_SUM_HFA01();
+
+        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA02", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Get_EXPECTED_SUM_HFA02();
+
+        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA03", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Get_EXPECTED_SUM_HFA03();
+
+        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA05", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Get_EXPECTED_SUM_HFA05();
+
+        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA08", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Get_EXPECTED_SUM_HFA08();
+
+        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA11", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Get_EXPECTED_SUM_HFA11();
+
+        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA19", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Get_EXPECTED_SUM_HFA19();
+
+
+        [DllImport(Config.DllName, EntryPoint = "sum_HFA01", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum_HFA01(HFA01 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum_HFA02", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum_HFA02(HFA02 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum_HFA03", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum_HFA03(HFA03 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum_HFA05", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum_HFA05(HFA05 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum_HFA08", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum_HFA08(HFA08 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum_HFA11", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum_HFA11(HFA11 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum_HFA19", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum_HFA19(HFA19 hfa);
+
+
+        [DllImport(Config.DllName, EntryPoint = "sum3_HFA01", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum3_HFA01(float v1, long v2, HFA01 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum3_HFA02", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum3_HFA02(float v1, long v2, HFA02 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum3_HFA03", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum3_HFA03(float v1, long v2, HFA03 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum3_HFA05", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum3_HFA05(float v1, long v2, HFA05 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum3_HFA08", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum3_HFA08(float v1, long v2, HFA08 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum3_HFA11", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum3_HFA11(float v1, long v2, HFA11 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum3_HFA19", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum3_HFA19(float v1, long v2, HFA19 hfa);
+
+
+        [DllImport(Config.DllName, EntryPoint = "sum5_HFA01", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum5_HFA01(long v1, double v2, int v3, sbyte v4, HFA01 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum5_HFA02", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum5_HFA02(long v1, double v2, int v3, sbyte v4, HFA02 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum5_HFA03", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum5_HFA03(long v1, double v2, int v3, sbyte v4, HFA03 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum5_HFA05", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum5_HFA05(long v1, double v2, int v3, sbyte v4, HFA05 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum5_HFA08", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum5_HFA08(long v1, double v2, int v3, sbyte v4, HFA08 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum5_HFA11", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum5_HFA11(long v1, double v2, int v3, sbyte v4, HFA11 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum5_HFA19", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum5_HFA19(long v1, double v2, int v3, sbyte v4, HFA19 hfa);
+
+
+        [DllImport(Config.DllName, EntryPoint = "sum8_HFA01", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum8_HFA01(float v1, double v2, long v3, sbyte v4, double v5, HFA01 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum8_HFA02", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum8_HFA02(float v1, double v2, long v3, sbyte v4, double v5, HFA02 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum8_HFA03", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum8_HFA03(float v1, double v2, long v3, sbyte v4, double v5, HFA03 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum8_HFA05", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum8_HFA05(float v1, double v2, long v3, sbyte v4, double v5, HFA05 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum8_HFA08", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum8_HFA08(float v1, double v2, long v3, sbyte v4, double v5, HFA08 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum8_HFA11", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum8_HFA11(float v1, double v2, long v3, sbyte v4, double v5, HFA11 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum8_HFA19", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum8_HFA19(float v1, double v2, long v3, sbyte v4, double v5, HFA19 hfa);
+
+
+        [DllImport(Config.DllName, EntryPoint = "sum11_HFA01", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum11_HFA01(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA01 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum11_HFA02", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum11_HFA02(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA02 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum11_HFA03", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum11_HFA03(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA03 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum11_HFA05", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum11_HFA05(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA05 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum11_HFA08", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum11_HFA08(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA08 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum11_HFA11", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum11_HFA11(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA11 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum11_HFA19", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum11_HFA19(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA19 hfa);
+
+
+        [DllImport(Config.DllName, EntryPoint = "sum19_HFA01", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum19_HFA01(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA01 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum19_HFA02", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum19_HFA02(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA02 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum19_HFA03", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum19_HFA03(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA03 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum19_HFA05", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum19_HFA05(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA05 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum19_HFA08", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum19_HFA08(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA08 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum19_HFA11", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum19_HFA11(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA11 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "sum19_HFA19", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Sum19_HFA19(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA19 hfa);
+
+
+
+        // ---------------------------------------------------
+        // Average Methods
+        // ---------------------------------------------------
+
+
+        [DllImport(Config.DllName, EntryPoint = "average_HFA01", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average_HFA01(HFA01 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "average_HFA02", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average_HFA02(HFA02 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "average_HFA03", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average_HFA03(HFA03 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "average_HFA05", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average_HFA05(HFA05 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "average_HFA08", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average_HFA08(HFA08 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "average_HFA11", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average_HFA11(HFA11 hfa);
+
+        [DllImport(Config.DllName, EntryPoint = "average_HFA19", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average_HFA19(HFA19 hfa);
+
+
+        [DllImport(Config.DllName, EntryPoint = "average3_HFA01", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average3_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3);
+
+        [DllImport(Config.DllName, EntryPoint = "average3_HFA02", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average3_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3);
+
+        [DllImport(Config.DllName, EntryPoint = "average3_HFA03", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average3_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3);
+
+        [DllImport(Config.DllName, EntryPoint = "average3_HFA05", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average3_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3);
+
+        [DllImport(Config.DllName, EntryPoint = "average3_HFA08", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average3_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3);
+
+        [DllImport(Config.DllName, EntryPoint = "average3_HFA11", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average3_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3);
+
+        [DllImport(Config.DllName, EntryPoint = "average3_HFA19", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average3_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3);
+
+
+        [DllImport(Config.DllName, EntryPoint = "average5_HFA01", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average5_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5);
+
+        [DllImport(Config.DllName, EntryPoint = "average5_HFA02", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average5_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5);
+
+        [DllImport(Config.DllName, EntryPoint = "average5_HFA03", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average5_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5);
+
+        [DllImport(Config.DllName, EntryPoint = "average5_HFA05", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average5_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5);
+
+        [DllImport(Config.DllName, EntryPoint = "average5_HFA08", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average5_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5);
+
+        [DllImport(Config.DllName, EntryPoint = "average5_HFA11", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average5_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5);
+
+        [DllImport(Config.DllName, EntryPoint = "average5_HFA19", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average5_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5);
+
+
+        [DllImport(Config.DllName, EntryPoint = "average8_HFA01", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average8_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5, HFA01 hfa6, HFA01 hfa7, HFA01 hfa8);
+
+        [DllImport(Config.DllName, EntryPoint = "average8_HFA02", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average8_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5, HFA02 hfa6, HFA02 hfa7, HFA02 hfa8);
+
+        [DllImport(Config.DllName, EntryPoint = "average8_HFA03", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average8_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5, HFA03 hfa6, HFA03 hfa7, HFA03 hfa8);
+
+        [DllImport(Config.DllName, EntryPoint = "average8_HFA05", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average8_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5, HFA05 hfa6, HFA05 hfa7, HFA05 hfa8);
+
+        [DllImport(Config.DllName, EntryPoint = "average8_HFA08", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average8_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5, HFA08 hfa6, HFA08 hfa7, HFA08 hfa8);
+
+        [DllImport(Config.DllName, EntryPoint = "average8_HFA11", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average8_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5, HFA11 hfa6, HFA11 hfa7, HFA11 hfa8);
+
+        [DllImport(Config.DllName, EntryPoint = "average8_HFA19", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average8_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5, HFA19 hfa6, HFA19 hfa7, HFA19 hfa8);
+
+
+        [DllImport(Config.DllName, EntryPoint = "average11_HFA01", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average11_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5, HFA01 hfa6, HFA01 hfa7, HFA01 hfa8, HFA01 hfa9, HFA01 hfa10, HFA01 hfa11);
+
+        [DllImport(Config.DllName, EntryPoint = "average11_HFA02", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average11_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5, HFA02 hfa6, HFA02 hfa7, HFA02 hfa8, HFA02 hfa9, HFA02 hfa10, HFA02 hfa11);
+
+        [DllImport(Config.DllName, EntryPoint = "average11_HFA03", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average11_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5, HFA03 hfa6, HFA03 hfa7, HFA03 hfa8, HFA03 hfa9, HFA03 hfa10, HFA03 hfa11);
+
+        [DllImport(Config.DllName, EntryPoint = "average11_HFA05", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average11_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5, HFA05 hfa6, HFA05 hfa7, HFA05 hfa8, HFA05 hfa9, HFA05 hfa10, HFA05 hfa11);
+
+        [DllImport(Config.DllName, EntryPoint = "average11_HFA08", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average11_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5, HFA08 hfa6, HFA08 hfa7, HFA08 hfa8, HFA08 hfa9, HFA08 hfa10, HFA08 hfa11);
+
+        [DllImport(Config.DllName, EntryPoint = "average11_HFA11", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average11_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5, HFA11 hfa6, HFA11 hfa7, HFA11 hfa8, HFA11 hfa9, HFA11 hfa10, HFA11 hfa11);
+
+        [DllImport(Config.DllName, EntryPoint = "average11_HFA19", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average11_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5, HFA19 hfa6, HFA19 hfa7, HFA19 hfa8, HFA19 hfa9, HFA19 hfa10, HFA19 hfa11);
+
+
+        [DllImport(Config.DllName, EntryPoint = "average19_HFA01", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average19_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5, HFA01 hfa6, HFA01 hfa7, HFA01 hfa8, HFA01 hfa9, HFA01 hfa10, HFA01 hfa11, HFA01 hfa12, HFA01 hfa13, HFA01 hfa14, HFA01 hfa15, HFA01 hfa16, HFA01 hfa17, HFA01 hfa18, HFA01 hfa19);
+
+        [DllImport(Config.DllName, EntryPoint = "average19_HFA02", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average19_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5, HFA02 hfa6, HFA02 hfa7, HFA02 hfa8, HFA02 hfa9, HFA02 hfa10, HFA02 hfa11, HFA02 hfa12, HFA02 hfa13, HFA02 hfa14, HFA02 hfa15, HFA02 hfa16, HFA02 hfa17, HFA02 hfa18, HFA02 hfa19);
+
+        [DllImport(Config.DllName, EntryPoint = "average19_HFA03", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average19_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5, HFA03 hfa6, HFA03 hfa7, HFA03 hfa8, HFA03 hfa9, HFA03 hfa10, HFA03 hfa11, HFA03 hfa12, HFA03 hfa13, HFA03 hfa14, HFA03 hfa15, HFA03 hfa16, HFA03 hfa17, HFA03 hfa18, HFA03 hfa19);
+
+        [DllImport(Config.DllName, EntryPoint = "average19_HFA05", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average19_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5, HFA05 hfa6, HFA05 hfa7, HFA05 hfa8, HFA05 hfa9, HFA05 hfa10, HFA05 hfa11, HFA05 hfa12, HFA05 hfa13, HFA05 hfa14, HFA05 hfa15, HFA05 hfa16, HFA05 hfa17, HFA05 hfa18, HFA05 hfa19);
+
+        [DllImport(Config.DllName, EntryPoint = "average19_HFA08", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average19_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5, HFA08 hfa6, HFA08 hfa7, HFA08 hfa8, HFA08 hfa9, HFA08 hfa10, HFA08 hfa11, HFA08 hfa12, HFA08 hfa13, HFA08 hfa14, HFA08 hfa15, HFA08 hfa16, HFA08 hfa17, HFA08 hfa18, HFA08 hfa19);
+
+        [DllImport(Config.DllName, EntryPoint = "average19_HFA11", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average19_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5, HFA11 hfa6, HFA11 hfa7, HFA11 hfa8, HFA11 hfa9, HFA11 hfa10, HFA11 hfa11, HFA11 hfa12, HFA11 hfa13, HFA11 hfa14, HFA11 hfa15, HFA11 hfa16, HFA11 hfa17, HFA11 hfa18, HFA11 hfa19);
+
+        [DllImport(Config.DllName, EntryPoint = "average19_HFA19", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Average19_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5, HFA19 hfa6, HFA19 hfa7, HFA19 hfa8, HFA19 hfa9, HFA19 hfa10, HFA19 hfa11, HFA19 hfa12, HFA19 hfa13, HFA19 hfa14, HFA19 hfa15, HFA19 hfa16, HFA19 hfa17, HFA19 hfa18, HFA19 hfa19);
+
+
+
+        // ---------------------------------------------------
+        // Add Methods
+        // ---------------------------------------------------
+
+
+        [DllImport(Config.DllName, EntryPoint = "add01_HFA01", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Add01_HFA01(HFA01 hfa1, float v1, HFA01 hfa2, int v2, HFA01 hfa3, short v3, double v4, HFA01 hfa4, HFA01 hfa5, float v5, long v6, float v7, HFA01 hfa6, float v8, HFA01 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add01_HFA02", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Add01_HFA02(HFA02 hfa1, float v1, HFA02 hfa2, int v2, HFA02 hfa3, short v3, double v4, HFA02 hfa4, HFA02 hfa5, float v5, long v6, float v7, HFA02 hfa6, float v8, HFA02 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add01_HFA03", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Add01_HFA03(HFA03 hfa1, float v1, HFA03 hfa2, int v2, HFA03 hfa3, short v3, double v4, HFA03 hfa4, HFA03 hfa5, float v5, long v6, float v7, HFA03 hfa6, float v8, HFA03 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add01_HFA05", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Add01_HFA05(HFA05 hfa1, float v1, HFA05 hfa2, int v2, HFA05 hfa3, short v3, double v4, HFA05 hfa4, HFA05 hfa5, float v5, long v6, float v7, HFA05 hfa6, float v8, HFA05 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add01_HFA08", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Add01_HFA08(HFA08 hfa1, float v1, HFA08 hfa2, int v2, HFA08 hfa3, short v3, double v4, HFA08 hfa4, HFA08 hfa5, float v5, long v6, float v7, HFA08 hfa6, float v8, HFA08 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add01_HFA11", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Add01_HFA11(HFA11 hfa1, float v1, HFA11 hfa2, int v2, HFA11 hfa3, short v3, double v4, HFA11 hfa4, HFA11 hfa5, float v5, long v6, float v7, HFA11 hfa6, float v8, HFA11 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add01_HFA19", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Add01_HFA19(HFA19 hfa1, float v1, HFA19 hfa2, int v2, HFA19 hfa3, short v3, double v4, HFA19 hfa4, HFA19 hfa5, float v5, long v6, float v7, HFA19 hfa6, float v8, HFA19 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add01_HFA00", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Add01_HFA00(HFA03 hfa1, float v1, HFA02 hfa2, int v2, HFA19 hfa3, short v3, double v4, HFA05 hfa4, HFA08 hfa5, float v5, long v6, float v7, HFA11 hfa6, float v8, HFA01 hfa7);
+
+
+        [DllImport(Config.DllName, EntryPoint = "add02_HFA01", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Add02_HFA01(HFA01 hfa1, HFA01 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA01 hfa3, double v7, float v8, HFA01 hfa4, short v9, HFA01 hfa5, float v10, HFA01 hfa6, HFA01 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add02_HFA02", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Add02_HFA02(HFA02 hfa1, HFA02 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA02 hfa3, double v7, float v8, HFA02 hfa4, short v9, HFA02 hfa5, float v10, HFA02 hfa6, HFA02 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add02_HFA03", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Add02_HFA03(HFA03 hfa1, HFA03 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA03 hfa3, double v7, float v8, HFA03 hfa4, short v9, HFA03 hfa5, float v10, HFA03 hfa6, HFA03 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add02_HFA05", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Add02_HFA05(HFA05 hfa1, HFA05 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA05 hfa3, double v7, float v8, HFA05 hfa4, short v9, HFA05 hfa5, float v10, HFA05 hfa6, HFA05 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add02_HFA08", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Add02_HFA08(HFA08 hfa1, HFA08 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA08 hfa3, double v7, float v8, HFA08 hfa4, short v9, HFA08 hfa5, float v10, HFA08 hfa6, HFA08 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add02_HFA11", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Add02_HFA11(HFA11 hfa1, HFA11 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA11 hfa3, double v7, float v8, HFA11 hfa4, short v9, HFA11 hfa5, float v10, HFA11 hfa6, HFA11 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add02_HFA19", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Add02_HFA19(HFA19 hfa1, HFA19 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA19 hfa3, double v7, float v8, HFA19 hfa4, short v9, HFA19 hfa5, float v10, HFA19 hfa6, HFA19 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add02_HFA00", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Add02_HFA00(HFA01 hfa1, HFA05 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA03 hfa3, double v7, float v8, HFA11 hfa4, short v9, HFA19 hfa5, float v10, HFA08 hfa6, HFA02 hfa7);
+
+
+
+        [DllImport(Config.DllName, EntryPoint = "add03_HFA01", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Add03_HFA01(float v1, sbyte v2, HFA01 hfa1, double v3, sbyte v4, HFA01 hfa2, long v5, short v6, int v7, HFA01 hfa3, HFA01 hfa4, float v8, HFA01 hfa5, float v9, HFA01 hfa6, float v10, HFA01 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add03_HFA02", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Add03_HFA02(float v1, sbyte v2, HFA02 hfa1, double v3, sbyte v4, HFA02 hfa2, long v5, short v6, int v7, HFA02 hfa3, HFA02 hfa4, float v8, HFA02 hfa5, float v9, HFA02 hfa6, float v10, HFA02 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add03_HFA03", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Add03_HFA03(float v1, sbyte v2, HFA03 hfa1, double v3, sbyte v4, HFA03 hfa2, long v5, short v6, int v7, HFA03 hfa3, HFA03 hfa4, float v8, HFA03 hfa5, float v9, HFA03 hfa6, float v10, HFA03 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add03_HFA05", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Add03_HFA05(float v1, sbyte v2, HFA05 hfa1, double v3, sbyte v4, HFA05 hfa2, long v5, short v6, int v7, HFA05 hfa3, HFA05 hfa4, float v8, HFA05 hfa5, float v9, HFA05 hfa6, float v10, HFA05 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add03_HFA08", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Add03_HFA08(float v1, sbyte v2, HFA08 hfa1, double v3, sbyte v4, HFA08 hfa2, long v5, short v6, int v7, HFA08 hfa3, HFA08 hfa4, float v8, HFA08 hfa5, float v9, HFA08 hfa6, float v10, HFA08 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add03_HFA11", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Add03_HFA11(float v1, sbyte v2, HFA11 hfa1, double v3, sbyte v4, HFA11 hfa2, long v5, short v6, int v7, HFA11 hfa3, HFA11 hfa4, float v8, HFA11 hfa5, float v9, HFA11 hfa6, float v10, HFA11 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add03_HFA19", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Add03_HFA19(float v1, sbyte v2, HFA19 hfa1, double v3, sbyte v4, HFA19 hfa2, long v5, short v6, int v7, HFA19 hfa3, HFA19 hfa4, float v8, HFA19 hfa5, float v9, HFA19 hfa6, float v10, HFA19 hfa7);
+
+        [DllImport(Config.DllName, EntryPoint = "add03_HFA00", CallingConvention = CallingConvention.StdCall)]
+        public static extern float Add03_HFA00(float v1, sbyte v2, HFA08 hfa1, double v3, sbyte v4, HFA19 hfa2, long v5, short v6, int v7, HFA03 hfa3, HFA01 hfa4, float v8, HFA11 hfa5, float v9, HFA02 hfa6, float v10, HFA05 hfa7);
+
+#endif // FLOAT64
+    }
+}
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_interop_nd.cs b/tests/src/JIT/jit64/hfa/main/dll/hfa_interop_nd.cs
deleted file mode 100644
index 57528d2757..0000000000
--- a/tests/src/JIT/jit64/hfa/main/dll/hfa_interop_nd.cs
+++ /dev/null
@@ -1,483 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Runtime.InteropServices;
-
-namespace HFATest
-{
-
-    public struct Config
-    {
-
-        public const string hfaType = "nested";
-        public const string dllType = "native_cpp";
-        public const string floatType = "f64";
-        public const string DllName = "hfa" + "_" + hfaType + "_" + floatType + "_" + dllType;
-    }
-
-    public class TestMan
-    {
-
-        //---------------------------------------------
-        // Init Methods
-        // ---------------------------------------------------
-
-        [DllImport(Config.DllName, EntryPoint = "init_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Init_HFA01(out HFA01 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "init_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Init_HFA02(out HFA02 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "init_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Init_HFA03(out HFA03 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "init_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Init_HFA05(out HFA05 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "init_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Init_HFA08(out HFA08 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "init_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Init_HFA11(out HFA11 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "init_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Init_HFA19(out HFA19 hfa);
-
-
-
-        // ---------------------------------------------------
-        // Identity Methods
-        // ---------------------------------------------------
-
-        [DllImport(Config.DllName, EntryPoint = "identity_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA01 Identity_HFA01(HFA01 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "identity_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA02 Identity_HFA02(HFA02 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "identity_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA03 Identity_HFA03(HFA03 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "identity_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA05 Identity_HFA05(HFA05 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "identity_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA08 Identity_HFA08(HFA08 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "identity_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA11 Identity_HFA11(HFA11 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "identity_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA19 Identity_HFA19(HFA19 hfa);
-
-
-
-        // ---------------------------------------------------
-        // Get Methods
-        // ---------------------------------------------------
-
-        [DllImport(Config.DllName, EntryPoint = "get_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA01 Get_HFA01();
-
-        [DllImport(Config.DllName, EntryPoint = "get_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA02 Get_HFA02();
-
-        [DllImport(Config.DllName, EntryPoint = "get_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA03 Get_HFA03();
-
-        [DllImport(Config.DllName, EntryPoint = "get_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA05 Get_HFA05();
-
-        [DllImport(Config.DllName, EntryPoint = "get_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA08 Get_HFA08();
-
-        [DllImport(Config.DllName, EntryPoint = "get_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA11 Get_HFA11();
-
-        [DllImport(Config.DllName, EntryPoint = "get_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA19 Get_HFA19();
-
-
-        public static readonly double EXPECTED_SUM_HFA01 = Get_EXPECTED_SUM_HFA01();
-        public static readonly double EXPECTED_SUM_HFA02 = Get_EXPECTED_SUM_HFA02();
-        public static readonly double EXPECTED_SUM_HFA03 = Get_EXPECTED_SUM_HFA03();
-        public static readonly double EXPECTED_SUM_HFA05 = Get_EXPECTED_SUM_HFA05();
-        public static readonly double EXPECTED_SUM_HFA08 = Get_EXPECTED_SUM_HFA08();
-        public static readonly double EXPECTED_SUM_HFA11 = Get_EXPECTED_SUM_HFA11();
-        public static readonly double EXPECTED_SUM_HFA19 = Get_EXPECTED_SUM_HFA19();
-
-        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Get_EXPECTED_SUM_HFA01();
-
-        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Get_EXPECTED_SUM_HFA02();
-
-        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Get_EXPECTED_SUM_HFA03();
-
-        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Get_EXPECTED_SUM_HFA05();
-
-        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Get_EXPECTED_SUM_HFA08();
-
-        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Get_EXPECTED_SUM_HFA11();
-
-        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Get_EXPECTED_SUM_HFA19();
-
-
-        [DllImport(Config.DllName, EntryPoint = "sum_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum_HFA01(HFA01 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum_HFA02(HFA02 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum_HFA03(HFA03 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum_HFA05(HFA05 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum_HFA08(HFA08 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum_HFA11(HFA11 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum_HFA19(HFA19 hfa);
-
-
-        [DllImport(Config.DllName, EntryPoint = "sum3_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum3_HFA01(float v1, long v2, HFA01 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum3_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum3_HFA02(float v1, long v2, HFA02 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum3_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum3_HFA03(float v1, long v2, HFA03 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum3_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum3_HFA05(float v1, long v2, HFA05 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum3_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum3_HFA08(float v1, long v2, HFA08 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum3_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum3_HFA11(float v1, long v2, HFA11 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum3_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum3_HFA19(float v1, long v2, HFA19 hfa);
-
-
-        [DllImport(Config.DllName, EntryPoint = "sum5_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum5_HFA01(long v1, double v2, int v3, sbyte v4, HFA01 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum5_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum5_HFA02(long v1, double v2, int v3, sbyte v4, HFA02 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum5_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum5_HFA03(long v1, double v2, int v3, sbyte v4, HFA03 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum5_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum5_HFA05(long v1, double v2, int v3, sbyte v4, HFA05 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum5_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum5_HFA08(long v1, double v2, int v3, sbyte v4, HFA08 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum5_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum5_HFA11(long v1, double v2, int v3, sbyte v4, HFA11 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum5_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum5_HFA19(long v1, double v2, int v3, sbyte v4, HFA19 hfa);
-
-
-        [DllImport(Config.DllName, EntryPoint = "sum8_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum8_HFA01(float v1, double v2, long v3, sbyte v4, double v5, HFA01 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum8_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum8_HFA02(float v1, double v2, long v3, sbyte v4, double v5, HFA02 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum8_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum8_HFA03(float v1, double v2, long v3, sbyte v4, double v5, HFA03 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum8_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum8_HFA05(float v1, double v2, long v3, sbyte v4, double v5, HFA05 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum8_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum8_HFA08(float v1, double v2, long v3, sbyte v4, double v5, HFA08 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum8_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum8_HFA11(float v1, double v2, long v3, sbyte v4, double v5, HFA11 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum8_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum8_HFA19(float v1, double v2, long v3, sbyte v4, double v5, HFA19 hfa);
-
-
-        [DllImport(Config.DllName, EntryPoint = "sum11_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum11_HFA01(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA01 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum11_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum11_HFA02(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA02 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum11_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum11_HFA03(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA03 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum11_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum11_HFA05(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA05 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum11_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum11_HFA08(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA08 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum11_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum11_HFA11(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA11 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum11_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum11_HFA19(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA19 hfa);
-
-
-        [DllImport(Config.DllName, EntryPoint = "sum19_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum19_HFA01(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA01 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum19_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum19_HFA02(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA02 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum19_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum19_HFA03(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA03 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum19_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum19_HFA05(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA05 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum19_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum19_HFA08(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA08 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum19_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum19_HFA11(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA11 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum19_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum19_HFA19(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA19 hfa);
-
-
-
-        // ---------------------------------------------------
-        // Average Methods
-        // ---------------------------------------------------
-
-
-        [DllImport(Config.DllName, EntryPoint = "average_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average_HFA01(HFA01 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "average_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average_HFA02(HFA02 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "average_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average_HFA03(HFA03 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "average_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average_HFA05(HFA05 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "average_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average_HFA08(HFA08 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "average_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average_HFA11(HFA11 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "average_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average_HFA19(HFA19 hfa);
-
-
-        [DllImport(Config.DllName, EntryPoint = "average3_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average3_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3);
-
-        [DllImport(Config.DllName, EntryPoint = "average3_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average3_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3);
-
-        [DllImport(Config.DllName, EntryPoint = "average3_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average3_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3);
-
-        [DllImport(Config.DllName, EntryPoint = "average3_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average3_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3);
-
-        [DllImport(Config.DllName, EntryPoint = "average3_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average3_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3);
-
-        [DllImport(Config.DllName, EntryPoint = "average3_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average3_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3);
-
-        [DllImport(Config.DllName, EntryPoint = "average3_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average3_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3);
-
-
-        [DllImport(Config.DllName, EntryPoint = "average5_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average5_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5);
-
-        [DllImport(Config.DllName, EntryPoint = "average5_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average5_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5);
-
-        [DllImport(Config.DllName, EntryPoint = "average5_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average5_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5);
-
-        [DllImport(Config.DllName, EntryPoint = "average5_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average5_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5);
-
-        [DllImport(Config.DllName, EntryPoint = "average5_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average5_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5);
-
-        [DllImport(Config.DllName, EntryPoint = "average5_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average5_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5);
-
-        [DllImport(Config.DllName, EntryPoint = "average5_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average5_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5);
-
-
-        [DllImport(Config.DllName, EntryPoint = "average8_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average8_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5, HFA01 hfa6, HFA01 hfa7, HFA01 hfa8);
-
-        [DllImport(Config.DllName, EntryPoint = "average8_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average8_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5, HFA02 hfa6, HFA02 hfa7, HFA02 hfa8);
-
-        [DllImport(Config.DllName, EntryPoint = "average8_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average8_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5, HFA03 hfa6, HFA03 hfa7, HFA03 hfa8);
-
-        [DllImport(Config.DllName, EntryPoint = "average8_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average8_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5, HFA05 hfa6, HFA05 hfa7, HFA05 hfa8);
-
-        [DllImport(Config.DllName, EntryPoint = "average8_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average8_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5, HFA08 hfa6, HFA08 hfa7, HFA08 hfa8);
-
-        [DllImport(Config.DllName, EntryPoint = "average8_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average8_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5, HFA11 hfa6, HFA11 hfa7, HFA11 hfa8);
-
-        [DllImport(Config.DllName, EntryPoint = "average8_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average8_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5, HFA19 hfa6, HFA19 hfa7, HFA19 hfa8);
-
-
-        [DllImport(Config.DllName, EntryPoint = "average11_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average11_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5, HFA01 hfa6, HFA01 hfa7, HFA01 hfa8, HFA01 hfa9, HFA01 hfa10, HFA01 hfa11);
-
-        [DllImport(Config.DllName, EntryPoint = "average11_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average11_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5, HFA02 hfa6, HFA02 hfa7, HFA02 hfa8, HFA02 hfa9, HFA02 hfa10, HFA02 hfa11);
-
-        [DllImport(Config.DllName, EntryPoint = "average11_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average11_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5, HFA03 hfa6, HFA03 hfa7, HFA03 hfa8, HFA03 hfa9, HFA03 hfa10, HFA03 hfa11);
-
-        [DllImport(Config.DllName, EntryPoint = "average11_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average11_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5, HFA05 hfa6, HFA05 hfa7, HFA05 hfa8, HFA05 hfa9, HFA05 hfa10, HFA05 hfa11);
-
-        [DllImport(Config.DllName, EntryPoint = "average11_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average11_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5, HFA08 hfa6, HFA08 hfa7, HFA08 hfa8, HFA08 hfa9, HFA08 hfa10, HFA08 hfa11);
-
-        [DllImport(Config.DllName, EntryPoint = "average11_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average11_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5, HFA11 hfa6, HFA11 hfa7, HFA11 hfa8, HFA11 hfa9, HFA11 hfa10, HFA11 hfa11);
-
-        [DllImport(Config.DllName, EntryPoint = "average11_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average11_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5, HFA19 hfa6, HFA19 hfa7, HFA19 hfa8, HFA19 hfa9, HFA19 hfa10, HFA19 hfa11);
-
-
-        [DllImport(Config.DllName, EntryPoint = "average19_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average19_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5, HFA01 hfa6, HFA01 hfa7, HFA01 hfa8, HFA01 hfa9, HFA01 hfa10, HFA01 hfa11, HFA01 hfa12, HFA01 hfa13, HFA01 hfa14, HFA01 hfa15, HFA01 hfa16, HFA01 hfa17, HFA01 hfa18, HFA01 hfa19);
-
-        [DllImport(Config.DllName, EntryPoint = "average19_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average19_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5, HFA02 hfa6, HFA02 hfa7, HFA02 hfa8, HFA02 hfa9, HFA02 hfa10, HFA02 hfa11, HFA02 hfa12, HFA02 hfa13, HFA02 hfa14, HFA02 hfa15, HFA02 hfa16, HFA02 hfa17, HFA02 hfa18, HFA02 hfa19);
-
-        [DllImport(Config.DllName, EntryPoint = "average19_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average19_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5, HFA03 hfa6, HFA03 hfa7, HFA03 hfa8, HFA03 hfa9, HFA03 hfa10, HFA03 hfa11, HFA03 hfa12, HFA03 hfa13, HFA03 hfa14, HFA03 hfa15, HFA03 hfa16, HFA03 hfa17, HFA03 hfa18, HFA03 hfa19);
-
-        [DllImport(Config.DllName, EntryPoint = "average19_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average19_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5, HFA05 hfa6, HFA05 hfa7, HFA05 hfa8, HFA05 hfa9, HFA05 hfa10, HFA05 hfa11, HFA05 hfa12, HFA05 hfa13, HFA05 hfa14, HFA05 hfa15, HFA05 hfa16, HFA05 hfa17, HFA05 hfa18, HFA05 hfa19);
-
-        [DllImport(Config.DllName, EntryPoint = "average19_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average19_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5, HFA08 hfa6, HFA08 hfa7, HFA08 hfa8, HFA08 hfa9, HFA08 hfa10, HFA08 hfa11, HFA08 hfa12, HFA08 hfa13, HFA08 hfa14, HFA08 hfa15, HFA08 hfa16, HFA08 hfa17, HFA08 hfa18, HFA08 hfa19);
-
-        [DllImport(Config.DllName, EntryPoint = "average19_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average19_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5, HFA11 hfa6, HFA11 hfa7, HFA11 hfa8, HFA11 hfa9, HFA11 hfa10, HFA11 hfa11, HFA11 hfa12, HFA11 hfa13, HFA11 hfa14, HFA11 hfa15, HFA11 hfa16, HFA11 hfa17, HFA11 hfa18, HFA11 hfa19);
-
-        [DllImport(Config.DllName, EntryPoint = "average19_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average19_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5, HFA19 hfa6, HFA19 hfa7, HFA19 hfa8, HFA19 hfa9, HFA19 hfa10, HFA19 hfa11, HFA19 hfa12, HFA19 hfa13, HFA19 hfa14, HFA19 hfa15, HFA19 hfa16, HFA19 hfa17, HFA19 hfa18, HFA19 hfa19);
-
-
-
-        // ---------------------------------------------------
-        // Add Methods
-        // ---------------------------------------------------
-
-
-        [DllImport(Config.DllName, EntryPoint = "add01_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add01_HFA01(HFA01 hfa1, float v1, HFA01 hfa2, int v2, HFA01 hfa3, short v3, double v4, HFA01 hfa4, HFA01 hfa5, float v5, long v6, float v7, HFA01 hfa6, float v8, HFA01 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add01_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add01_HFA02(HFA02 hfa1, float v1, HFA02 hfa2, int v2, HFA02 hfa3, short v3, double v4, HFA02 hfa4, HFA02 hfa5, float v5, long v6, float v7, HFA02 hfa6, float v8, HFA02 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add01_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add01_HFA03(HFA03 hfa1, float v1, HFA03 hfa2, int v2, HFA03 hfa3, short v3, double v4, HFA03 hfa4, HFA03 hfa5, float v5, long v6, float v7, HFA03 hfa6, float v8, HFA03 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add01_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add01_HFA05(HFA05 hfa1, float v1, HFA05 hfa2, int v2, HFA05 hfa3, short v3, double v4, HFA05 hfa4, HFA05 hfa5, float v5, long v6, float v7, HFA05 hfa6, float v8, HFA05 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add01_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add01_HFA08(HFA08 hfa1, float v1, HFA08 hfa2, int v2, HFA08 hfa3, short v3, double v4, HFA08 hfa4, HFA08 hfa5, float v5, long v6, float v7, HFA08 hfa6, float v8, HFA08 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add01_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add01_HFA11(HFA11 hfa1, float v1, HFA11 hfa2, int v2, HFA11 hfa3, short v3, double v4, HFA11 hfa4, HFA11 hfa5, float v5, long v6, float v7, HFA11 hfa6, float v8, HFA11 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add01_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add01_HFA19(HFA19 hfa1, float v1, HFA19 hfa2, int v2, HFA19 hfa3, short v3, double v4, HFA19 hfa4, HFA19 hfa5, float v5, long v6, float v7, HFA19 hfa6, float v8, HFA19 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add01_HFA00", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add01_HFA00(HFA03 hfa1, float v1, HFA02 hfa2, int v2, HFA19 hfa3, short v3, double v4, HFA05 hfa4, HFA08 hfa5, float v5, long v6, float v7, HFA11 hfa6, float v8, HFA01 hfa7);
-
-
-        [DllImport(Config.DllName, EntryPoint = "add02_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add02_HFA01(HFA01 hfa1, HFA01 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA01 hfa3, double v7, float v8, HFA01 hfa4, short v9, HFA01 hfa5, float v10, HFA01 hfa6, HFA01 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add02_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add02_HFA02(HFA02 hfa1, HFA02 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA02 hfa3, double v7, float v8, HFA02 hfa4, short v9, HFA02 hfa5, float v10, HFA02 hfa6, HFA02 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add02_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add02_HFA03(HFA03 hfa1, HFA03 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA03 hfa3, double v7, float v8, HFA03 hfa4, short v9, HFA03 hfa5, float v10, HFA03 hfa6, HFA03 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add02_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add02_HFA05(HFA05 hfa1, HFA05 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA05 hfa3, double v7, float v8, HFA05 hfa4, short v9, HFA05 hfa5, float v10, HFA05 hfa6, HFA05 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add02_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add02_HFA08(HFA08 hfa1, HFA08 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA08 hfa3, double v7, float v8, HFA08 hfa4, short v9, HFA08 hfa5, float v10, HFA08 hfa6, HFA08 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add02_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add02_HFA11(HFA11 hfa1, HFA11 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA11 hfa3, double v7, float v8, HFA11 hfa4, short v9, HFA11 hfa5, float v10, HFA11 hfa6, HFA11 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add02_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add02_HFA19(HFA19 hfa1, HFA19 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA19 hfa3, double v7, float v8, HFA19 hfa4, short v9, HFA19 hfa5, float v10, HFA19 hfa6, HFA19 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add02_HFA00", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add02_HFA00(HFA01 hfa1, HFA05 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA03 hfa3, double v7, float v8, HFA11 hfa4, short v9, HFA19 hfa5, float v10, HFA08 hfa6, HFA02 hfa7);
-
-
-
-        [DllImport(Config.DllName, EntryPoint = "add03_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add03_HFA01(float v1, sbyte v2, HFA01 hfa1, double v3, sbyte v4, HFA01 hfa2, long v5, short v6, int v7, HFA01 hfa3, HFA01 hfa4, float v8, HFA01 hfa5, float v9, HFA01 hfa6, float v10, HFA01 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add03_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add03_HFA02(float v1, sbyte v2, HFA02 hfa1, double v3, sbyte v4, HFA02 hfa2, long v5, short v6, int v7, HFA02 hfa3, HFA02 hfa4, float v8, HFA02 hfa5, float v9, HFA02 hfa6, float v10, HFA02 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add03_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add03_HFA03(float v1, sbyte v2, HFA03 hfa1, double v3, sbyte v4, HFA03 hfa2, long v5, short v6, int v7, HFA03 hfa3, HFA03 hfa4, float v8, HFA03 hfa5, float v9, HFA03 hfa6, float v10, HFA03 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add03_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add03_HFA05(float v1, sbyte v2, HFA05 hfa1, double v3, sbyte v4, HFA05 hfa2, long v5, short v6, int v7, HFA05 hfa3, HFA05 hfa4, float v8, HFA05 hfa5, float v9, HFA05 hfa6, float v10, HFA05 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add03_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add03_HFA08(float v1, sbyte v2, HFA08 hfa1, double v3, sbyte v4, HFA08 hfa2, long v5, short v6, int v7, HFA08 hfa3, HFA08 hfa4, float v8, HFA08 hfa5, float v9, HFA08 hfa6, float v10, HFA08 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add03_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add03_HFA11(float v1, sbyte v2, HFA11 hfa1, double v3, sbyte v4, HFA11 hfa2, long v5, short v6, int v7, HFA11 hfa3, HFA11 hfa4, float v8, HFA11 hfa5, float v9, HFA11 hfa6, float v10, HFA11 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add03_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add03_HFA19(float v1, sbyte v2, HFA19 hfa1, double v3, sbyte v4, HFA19 hfa2, long v5, short v6, int v7, HFA19 hfa3, HFA19 hfa4, float v8, HFA19 hfa5, float v9, HFA19 hfa6, float v10, HFA19 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add03_HFA00", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add03_HFA00(float v1, sbyte v2, HFA08 hfa1, double v3, sbyte v4, HFA19 hfa2, long v5, short v6, int v7, HFA03 hfa3, HFA01 hfa4, float v8, HFA11 hfa5, float v9, HFA02 hfa6, float v10, HFA05 hfa7);
-    }
-}
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_interop_nf.cs b/tests/src/JIT/jit64/hfa/main/dll/hfa_interop_nf.cs
deleted file mode 100644
index 77c260b0d6..0000000000
--- a/tests/src/JIT/jit64/hfa/main/dll/hfa_interop_nf.cs
+++ /dev/null
@@ -1,485 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Runtime.InteropServices;
-
-namespace HFATest
-{
-
-    public struct Config
-    {
-
-        public const string hfaType = "nested";
-        public const string dllType = "native_cpp";
-        public const string floatType = "f32";
-        public const string DllName = "hfa" + "_" + hfaType + "_" + floatType + "_" + dllType;
-    }
-
-
-    public class TestMan
-    {
-
-        //---------------------------------------------
-        // Init Methods
-        // ---------------------------------------------------
-
-        [DllImport(Config.DllName, EntryPoint = "init_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Init_HFA01(out HFA01 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "init_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Init_HFA02(out HFA02 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "init_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Init_HFA03(out HFA03 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "init_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Init_HFA05(out HFA05 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "init_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Init_HFA08(out HFA08 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "init_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Init_HFA11(out HFA11 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "init_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Init_HFA19(out HFA19 hfa);
-
-
-
-        // ---------------------------------------------------
-        // Identity Methods
-        // ---------------------------------------------------
-
-        [DllImport(Config.DllName, EntryPoint = "identity_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA01 Identity_HFA01(HFA01 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "identity_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA02 Identity_HFA02(HFA02 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "identity_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA03 Identity_HFA03(HFA03 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "identity_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA05 Identity_HFA05(HFA05 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "identity_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA08 Identity_HFA08(HFA08 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "identity_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA11 Identity_HFA11(HFA11 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "identity_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA19 Identity_HFA19(HFA19 hfa);
-
-
-
-        // ---------------------------------------------------
-        // Get Methods
-        // ---------------------------------------------------
-
-        [DllImport(Config.DllName, EntryPoint = "get_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA01 Get_HFA01();
-
-        [DllImport(Config.DllName, EntryPoint = "get_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA02 Get_HFA02();
-
-        [DllImport(Config.DllName, EntryPoint = "get_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA03 Get_HFA03();
-
-        [DllImport(Config.DllName, EntryPoint = "get_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA05 Get_HFA05();
-
-        [DllImport(Config.DllName, EntryPoint = "get_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA08 Get_HFA08();
-
-        [DllImport(Config.DllName, EntryPoint = "get_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA11 Get_HFA11();
-
-        [DllImport(Config.DllName, EntryPoint = "get_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA19 Get_HFA19();
-
-
-
-        public static readonly float EXPECTED_SUM_HFA01 = Get_EXPECTED_SUM_HFA01();
-        public static readonly float EXPECTED_SUM_HFA02 = Get_EXPECTED_SUM_HFA02();
-        public static readonly float EXPECTED_SUM_HFA03 = Get_EXPECTED_SUM_HFA03();
-        public static readonly float EXPECTED_SUM_HFA05 = Get_EXPECTED_SUM_HFA05();
-        public static readonly float EXPECTED_SUM_HFA08 = Get_EXPECTED_SUM_HFA08();
-        public static readonly float EXPECTED_SUM_HFA11 = Get_EXPECTED_SUM_HFA11();
-        public static readonly float EXPECTED_SUM_HFA19 = Get_EXPECTED_SUM_HFA19();
-
-        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Get_EXPECTED_SUM_HFA01();
-
-        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Get_EXPECTED_SUM_HFA02();
-
-        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Get_EXPECTED_SUM_HFA03();
-
-        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Get_EXPECTED_SUM_HFA05();
-
-        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Get_EXPECTED_SUM_HFA08();
-
-        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Get_EXPECTED_SUM_HFA11();
-
-        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Get_EXPECTED_SUM_HFA19();
-
-
-        [DllImport(Config.DllName, EntryPoint = "sum_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum_HFA01(HFA01 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum_HFA02(HFA02 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum_HFA03(HFA03 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum_HFA05(HFA05 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum_HFA08(HFA08 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum_HFA11(HFA11 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum_HFA19(HFA19 hfa);
-
-
-        [DllImport(Config.DllName, EntryPoint = "sum3_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum3_HFA01(float v1, long v2, HFA01 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum3_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum3_HFA02(float v1, long v2, HFA02 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum3_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum3_HFA03(float v1, long v2, HFA03 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum3_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum3_HFA05(float v1, long v2, HFA05 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum3_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum3_HFA08(float v1, long v2, HFA08 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum3_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum3_HFA11(float v1, long v2, HFA11 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum3_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum3_HFA19(float v1, long v2, HFA19 hfa);
-
-
-        [DllImport(Config.DllName, EntryPoint = "sum5_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum5_HFA01(long v1, double v2, int v3, sbyte v4, HFA01 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum5_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum5_HFA02(long v1, double v2, int v3, sbyte v4, HFA02 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum5_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum5_HFA03(long v1, double v2, int v3, sbyte v4, HFA03 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum5_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum5_HFA05(long v1, double v2, int v3, sbyte v4, HFA05 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum5_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum5_HFA08(long v1, double v2, int v3, sbyte v4, HFA08 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum5_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum5_HFA11(long v1, double v2, int v3, sbyte v4, HFA11 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum5_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum5_HFA19(long v1, double v2, int v3, sbyte v4, HFA19 hfa);
-
-
-        [DllImport(Config.DllName, EntryPoint = "sum8_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum8_HFA01(float v1, double v2, long v3, sbyte v4, double v5, HFA01 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum8_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum8_HFA02(float v1, double v2, long v3, sbyte v4, double v5, HFA02 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum8_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum8_HFA03(float v1, double v2, long v3, sbyte v4, double v5, HFA03 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum8_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum8_HFA05(float v1, double v2, long v3, sbyte v4, double v5, HFA05 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum8_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum8_HFA08(float v1, double v2, long v3, sbyte v4, double v5, HFA08 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum8_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum8_HFA11(float v1, double v2, long v3, sbyte v4, double v5, HFA11 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum8_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum8_HFA19(float v1, double v2, long v3, sbyte v4, double v5, HFA19 hfa);
-
-
-        [DllImport(Config.DllName, EntryPoint = "sum11_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum11_HFA01(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA01 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum11_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum11_HFA02(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA02 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum11_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum11_HFA03(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA03 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum11_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum11_HFA05(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA05 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum11_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum11_HFA08(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA08 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum11_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum11_HFA11(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA11 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum11_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum11_HFA19(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA19 hfa);
-
-
-        [DllImport(Config.DllName, EntryPoint = "sum19_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum19_HFA01(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA01 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum19_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum19_HFA02(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA02 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum19_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum19_HFA03(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA03 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum19_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum19_HFA05(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA05 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum19_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum19_HFA08(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA08 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum19_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum19_HFA11(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA11 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum19_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum19_HFA19(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA19 hfa);
-
-
-
-        // ---------------------------------------------------
-        // Average Methods
-        // ---------------------------------------------------
-
-
-        [DllImport(Config.DllName, EntryPoint = "average_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average_HFA01(HFA01 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "average_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average_HFA02(HFA02 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "average_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average_HFA03(HFA03 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "average_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average_HFA05(HFA05 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "average_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average_HFA08(HFA08 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "average_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average_HFA11(HFA11 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "average_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average_HFA19(HFA19 hfa);
-
-
-        [DllImport(Config.DllName, EntryPoint = "average3_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average3_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3);
-
-        [DllImport(Config.DllName, EntryPoint = "average3_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average3_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3);
-
-        [DllImport(Config.DllName, EntryPoint = "average3_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average3_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3);
-
-        [DllImport(Config.DllName, EntryPoint = "average3_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average3_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3);
-
-        [DllImport(Config.DllName, EntryPoint = "average3_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average3_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3);
-
-        [DllImport(Config.DllName, EntryPoint = "average3_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average3_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3);
-
-        [DllImport(Config.DllName, EntryPoint = "average3_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average3_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3);
-
-
-        [DllImport(Config.DllName, EntryPoint = "average5_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average5_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5);
-
-        [DllImport(Config.DllName, EntryPoint = "average5_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average5_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5);
-
-        [DllImport(Config.DllName, EntryPoint = "average5_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average5_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5);
-
-        [DllImport(Config.DllName, EntryPoint = "average5_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average5_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5);
-
-        [DllImport(Config.DllName, EntryPoint = "average5_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average5_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5);
-
-        [DllImport(Config.DllName, EntryPoint = "average5_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average5_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5);
-
-        [DllImport(Config.DllName, EntryPoint = "average5_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average5_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5);
-
-
-        [DllImport(Config.DllName, EntryPoint = "average8_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average8_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5, HFA01 hfa6, HFA01 hfa7, HFA01 hfa8);
-
-        [DllImport(Config.DllName, EntryPoint = "average8_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average8_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5, HFA02 hfa6, HFA02 hfa7, HFA02 hfa8);
-
-        [DllImport(Config.DllName, EntryPoint = "average8_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average8_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5, HFA03 hfa6, HFA03 hfa7, HFA03 hfa8);
-
-        [DllImport(Config.DllName, EntryPoint = "average8_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average8_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5, HFA05 hfa6, HFA05 hfa7, HFA05 hfa8);
-
-        [DllImport(Config.DllName, EntryPoint = "average8_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average8_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5, HFA08 hfa6, HFA08 hfa7, HFA08 hfa8);
-
-        [DllImport(Config.DllName, EntryPoint = "average8_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average8_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5, HFA11 hfa6, HFA11 hfa7, HFA11 hfa8);
-
-        [DllImport(Config.DllName, EntryPoint = "average8_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average8_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5, HFA19 hfa6, HFA19 hfa7, HFA19 hfa8);
-
-
-        [DllImport(Config.DllName, EntryPoint = "average11_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average11_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5, HFA01 hfa6, HFA01 hfa7, HFA01 hfa8, HFA01 hfa9, HFA01 hfa10, HFA01 hfa11);
-
-        [DllImport(Config.DllName, EntryPoint = "average11_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average11_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5, HFA02 hfa6, HFA02 hfa7, HFA02 hfa8, HFA02 hfa9, HFA02 hfa10, HFA02 hfa11);
-
-        [DllImport(Config.DllName, EntryPoint = "average11_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average11_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5, HFA03 hfa6, HFA03 hfa7, HFA03 hfa8, HFA03 hfa9, HFA03 hfa10, HFA03 hfa11);
-
-        [DllImport(Config.DllName, EntryPoint = "average11_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average11_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5, HFA05 hfa6, HFA05 hfa7, HFA05 hfa8, HFA05 hfa9, HFA05 hfa10, HFA05 hfa11);
-
-        [DllImport(Config.DllName, EntryPoint = "average11_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average11_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5, HFA08 hfa6, HFA08 hfa7, HFA08 hfa8, HFA08 hfa9, HFA08 hfa10, HFA08 hfa11);
-
-        [DllImport(Config.DllName, EntryPoint = "average11_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average11_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5, HFA11 hfa6, HFA11 hfa7, HFA11 hfa8, HFA11 hfa9, HFA11 hfa10, HFA11 hfa11);
-
-        [DllImport(Config.DllName, EntryPoint = "average11_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average11_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5, HFA19 hfa6, HFA19 hfa7, HFA19 hfa8, HFA19 hfa9, HFA19 hfa10, HFA19 hfa11);
-
-
-        [DllImport(Config.DllName, EntryPoint = "average19_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average19_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5, HFA01 hfa6, HFA01 hfa7, HFA01 hfa8, HFA01 hfa9, HFA01 hfa10, HFA01 hfa11, HFA01 hfa12, HFA01 hfa13, HFA01 hfa14, HFA01 hfa15, HFA01 hfa16, HFA01 hfa17, HFA01 hfa18, HFA01 hfa19);
-
-        [DllImport(Config.DllName, EntryPoint = "average19_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average19_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5, HFA02 hfa6, HFA02 hfa7, HFA02 hfa8, HFA02 hfa9, HFA02 hfa10, HFA02 hfa11, HFA02 hfa12, HFA02 hfa13, HFA02 hfa14, HFA02 hfa15, HFA02 hfa16, HFA02 hfa17, HFA02 hfa18, HFA02 hfa19);
-
-        [DllImport(Config.DllName, EntryPoint = "average19_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average19_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5, HFA03 hfa6, HFA03 hfa7, HFA03 hfa8, HFA03 hfa9, HFA03 hfa10, HFA03 hfa11, HFA03 hfa12, HFA03 hfa13, HFA03 hfa14, HFA03 hfa15, HFA03 hfa16, HFA03 hfa17, HFA03 hfa18, HFA03 hfa19);
-
-        [DllImport(Config.DllName, EntryPoint = "average19_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average19_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5, HFA05 hfa6, HFA05 hfa7, HFA05 hfa8, HFA05 hfa9, HFA05 hfa10, HFA05 hfa11, HFA05 hfa12, HFA05 hfa13, HFA05 hfa14, HFA05 hfa15, HFA05 hfa16, HFA05 hfa17, HFA05 hfa18, HFA05 hfa19);
-
-        [DllImport(Config.DllName, EntryPoint = "average19_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average19_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5, HFA08 hfa6, HFA08 hfa7, HFA08 hfa8, HFA08 hfa9, HFA08 hfa10, HFA08 hfa11, HFA08 hfa12, HFA08 hfa13, HFA08 hfa14, HFA08 hfa15, HFA08 hfa16, HFA08 hfa17, HFA08 hfa18, HFA08 hfa19);
-
-        [DllImport(Config.DllName, EntryPoint = "average19_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average19_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5, HFA11 hfa6, HFA11 hfa7, HFA11 hfa8, HFA11 hfa9, HFA11 hfa10, HFA11 hfa11, HFA11 hfa12, HFA11 hfa13, HFA11 hfa14, HFA11 hfa15, HFA11 hfa16, HFA11 hfa17, HFA11 hfa18, HFA11 hfa19);
-
-        [DllImport(Config.DllName, EntryPoint = "average19_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average19_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5, HFA19 hfa6, HFA19 hfa7, HFA19 hfa8, HFA19 hfa9, HFA19 hfa10, HFA19 hfa11, HFA19 hfa12, HFA19 hfa13, HFA19 hfa14, HFA19 hfa15, HFA19 hfa16, HFA19 hfa17, HFA19 hfa18, HFA19 hfa19);
-
-
-
-        // ---------------------------------------------------
-        // Add Methods
-        // ---------------------------------------------------
-
-
-        [DllImport(Config.DllName, EntryPoint = "add01_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add01_HFA01(HFA01 hfa1, float v1, HFA01 hfa2, int v2, HFA01 hfa3, short v3, double v4, HFA01 hfa4, HFA01 hfa5, float v5, long v6, float v7, HFA01 hfa6, float v8, HFA01 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add01_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add01_HFA02(HFA02 hfa1, float v1, HFA02 hfa2, int v2, HFA02 hfa3, short v3, double v4, HFA02 hfa4, HFA02 hfa5, float v5, long v6, float v7, HFA02 hfa6, float v8, HFA02 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add01_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add01_HFA03(HFA03 hfa1, float v1, HFA03 hfa2, int v2, HFA03 hfa3, short v3, double v4, HFA03 hfa4, HFA03 hfa5, float v5, long v6, float v7, HFA03 hfa6, float v8, HFA03 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add01_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add01_HFA05(HFA05 hfa1, float v1, HFA05 hfa2, int v2, HFA05 hfa3, short v3, double v4, HFA05 hfa4, HFA05 hfa5, float v5, long v6, float v7, HFA05 hfa6, float v8, HFA05 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add01_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add01_HFA08(HFA08 hfa1, float v1, HFA08 hfa2, int v2, HFA08 hfa3, short v3, double v4, HFA08 hfa4, HFA08 hfa5, float v5, long v6, float v7, HFA08 hfa6, float v8, HFA08 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add01_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add01_HFA11(HFA11 hfa1, float v1, HFA11 hfa2, int v2, HFA11 hfa3, short v3, double v4, HFA11 hfa4, HFA11 hfa5, float v5, long v6, float v7, HFA11 hfa6, float v8, HFA11 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add01_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add01_HFA19(HFA19 hfa1, float v1, HFA19 hfa2, int v2, HFA19 hfa3, short v3, double v4, HFA19 hfa4, HFA19 hfa5, float v5, long v6, float v7, HFA19 hfa6, float v8, HFA19 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add01_HFA00", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add01_HFA00(HFA03 hfa1, float v1, HFA02 hfa2, int v2, HFA19 hfa3, short v3, double v4, HFA05 hfa4, HFA08 hfa5, float v5, long v6, float v7, HFA11 hfa6, float v8, HFA01 hfa7);
-
-
-        [DllImport(Config.DllName, EntryPoint = "add02_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add02_HFA01(HFA01 hfa1, HFA01 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA01 hfa3, double v7, float v8, HFA01 hfa4, short v9, HFA01 hfa5, float v10, HFA01 hfa6, HFA01 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add02_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add02_HFA02(HFA02 hfa1, HFA02 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA02 hfa3, double v7, float v8, HFA02 hfa4, short v9, HFA02 hfa5, float v10, HFA02 hfa6, HFA02 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add02_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add02_HFA03(HFA03 hfa1, HFA03 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA03 hfa3, double v7, float v8, HFA03 hfa4, short v9, HFA03 hfa5, float v10, HFA03 hfa6, HFA03 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add02_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add02_HFA05(HFA05 hfa1, HFA05 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA05 hfa3, double v7, float v8, HFA05 hfa4, short v9, HFA05 hfa5, float v10, HFA05 hfa6, HFA05 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add02_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add02_HFA08(HFA08 hfa1, HFA08 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA08 hfa3, double v7, float v8, HFA08 hfa4, short v9, HFA08 hfa5, float v10, HFA08 hfa6, HFA08 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add02_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add02_HFA11(HFA11 hfa1, HFA11 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA11 hfa3, double v7, float v8, HFA11 hfa4, short v9, HFA11 hfa5, float v10, HFA11 hfa6, HFA11 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add02_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add02_HFA19(HFA19 hfa1, HFA19 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA19 hfa3, double v7, float v8, HFA19 hfa4, short v9, HFA19 hfa5, float v10, HFA19 hfa6, HFA19 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add02_HFA00", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add02_HFA00(HFA01 hfa1, HFA05 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA03 hfa3, double v7, float v8, HFA11 hfa4, short v9, HFA19 hfa5, float v10, HFA08 hfa6, HFA02 hfa7);
-
-
-
-        [DllImport(Config.DllName, EntryPoint = "add03_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add03_HFA01(float v1, sbyte v2, HFA01 hfa1, double v3, sbyte v4, HFA01 hfa2, long v5, short v6, int v7, HFA01 hfa3, HFA01 hfa4, float v8, HFA01 hfa5, float v9, HFA01 hfa6, float v10, HFA01 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add03_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add03_HFA02(float v1, sbyte v2, HFA02 hfa1, double v3, sbyte v4, HFA02 hfa2, long v5, short v6, int v7, HFA02 hfa3, HFA02 hfa4, float v8, HFA02 hfa5, float v9, HFA02 hfa6, float v10, HFA02 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add03_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add03_HFA03(float v1, sbyte v2, HFA03 hfa1, double v3, sbyte v4, HFA03 hfa2, long v5, short v6, int v7, HFA03 hfa3, HFA03 hfa4, float v8, HFA03 hfa5, float v9, HFA03 hfa6, float v10, HFA03 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add03_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add03_HFA05(float v1, sbyte v2, HFA05 hfa1, double v3, sbyte v4, HFA05 hfa2, long v5, short v6, int v7, HFA05 hfa3, HFA05 hfa4, float v8, HFA05 hfa5, float v9, HFA05 hfa6, float v10, HFA05 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add03_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add03_HFA08(float v1, sbyte v2, HFA08 hfa1, double v3, sbyte v4, HFA08 hfa2, long v5, short v6, int v7, HFA08 hfa3, HFA08 hfa4, float v8, HFA08 hfa5, float v9, HFA08 hfa6, float v10, HFA08 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add03_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add03_HFA11(float v1, sbyte v2, HFA11 hfa1, double v3, sbyte v4, HFA11 hfa2, long v5, short v6, int v7, HFA11 hfa3, HFA11 hfa4, float v8, HFA11 hfa5, float v9, HFA11 hfa6, float v10, HFA11 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add03_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add03_HFA19(float v1, sbyte v2, HFA19 hfa1, double v3, sbyte v4, HFA19 hfa2, long v5, short v6, int v7, HFA19 hfa3, HFA19 hfa4, float v8, HFA19 hfa5, float v9, HFA19 hfa6, float v10, HFA19 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add03_HFA00", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add03_HFA00(float v1, sbyte v2, HFA08 hfa1, double v3, sbyte v4, HFA19 hfa2, long v5, short v6, int v7, HFA03 hfa3, HFA01 hfa4, float v8, HFA11 hfa5, float v9, HFA02 hfa6, float v10, HFA05 hfa7);
-    }
-}
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_interop_sd.cs b/tests/src/JIT/jit64/hfa/main/dll/hfa_interop_sd.cs
deleted file mode 100644
index 21e9f1a685..0000000000
--- a/tests/src/JIT/jit64/hfa/main/dll/hfa_interop_sd.cs
+++ /dev/null
@@ -1,484 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Runtime.InteropServices;
-
-namespace HFATest
-{
-
-    public struct Config
-    {
-
-        public const string hfaType = "simple";
-        public const string dllType = "native_cpp";
-        public const string floatType = "f64";
-        public const string DllName = "hfa" + "_" + hfaType + "_" + floatType + "_" + dllType;
-    }
-
-
-    public class TestMan
-    {
-
-        //---------------------------------------------
-        // Init Methods
-        // ---------------------------------------------------
-
-        [DllImport(Config.DllName, EntryPoint = "init_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Init_HFA01(out HFA01 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "init_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Init_HFA02(out HFA02 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "init_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Init_HFA03(out HFA03 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "init_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Init_HFA05(out HFA05 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "init_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Init_HFA08(out HFA08 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "init_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Init_HFA11(out HFA11 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "init_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Init_HFA19(out HFA19 hfa);
-
-
-
-        // ---------------------------------------------------
-        // Identity Methods
-        // ---------------------------------------------------
-
-        [DllImport(Config.DllName, EntryPoint = "identity_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA01 Identity_HFA01(HFA01 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "identity_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA02 Identity_HFA02(HFA02 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "identity_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA03 Identity_HFA03(HFA03 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "identity_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA05 Identity_HFA05(HFA05 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "identity_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA08 Identity_HFA08(HFA08 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "identity_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA11 Identity_HFA11(HFA11 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "identity_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA19 Identity_HFA19(HFA19 hfa);
-
-
-
-        // ---------------------------------------------------
-        // Get Methods
-        // ---------------------------------------------------
-
-        [DllImport(Config.DllName, EntryPoint = "get_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA01 Get_HFA01();
-
-        [DllImport(Config.DllName, EntryPoint = "get_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA02 Get_HFA02();
-
-        [DllImport(Config.DllName, EntryPoint = "get_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA03 Get_HFA03();
-
-        [DllImport(Config.DllName, EntryPoint = "get_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA05 Get_HFA05();
-
-        [DllImport(Config.DllName, EntryPoint = "get_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA08 Get_HFA08();
-
-        [DllImport(Config.DllName, EntryPoint = "get_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA11 Get_HFA11();
-
-        [DllImport(Config.DllName, EntryPoint = "get_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA19 Get_HFA19();
-
-
-        public static readonly double EXPECTED_SUM_HFA01 = Get_EXPECTED_SUM_HFA01();
-        public static readonly double EXPECTED_SUM_HFA02 = Get_EXPECTED_SUM_HFA02();
-        public static readonly double EXPECTED_SUM_HFA03 = Get_EXPECTED_SUM_HFA03();
-        public static readonly double EXPECTED_SUM_HFA05 = Get_EXPECTED_SUM_HFA05();
-        public static readonly double EXPECTED_SUM_HFA08 = Get_EXPECTED_SUM_HFA08();
-        public static readonly double EXPECTED_SUM_HFA11 = Get_EXPECTED_SUM_HFA11();
-        public static readonly double EXPECTED_SUM_HFA19 = Get_EXPECTED_SUM_HFA19();
-
-        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Get_EXPECTED_SUM_HFA01();
-
-        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Get_EXPECTED_SUM_HFA02();
-
-        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Get_EXPECTED_SUM_HFA03();
-
-        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Get_EXPECTED_SUM_HFA05();
-
-        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Get_EXPECTED_SUM_HFA08();
-
-        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Get_EXPECTED_SUM_HFA11();
-
-        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Get_EXPECTED_SUM_HFA19();
-
-
-        [DllImport(Config.DllName, EntryPoint = "sum_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum_HFA01(HFA01 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum_HFA02(HFA02 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum_HFA03(HFA03 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum_HFA05(HFA05 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum_HFA08(HFA08 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum_HFA11(HFA11 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum_HFA19(HFA19 hfa);
-
-
-        [DllImport(Config.DllName, EntryPoint = "sum3_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum3_HFA01(float v1, long v2, HFA01 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum3_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum3_HFA02(float v1, long v2, HFA02 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum3_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum3_HFA03(float v1, long v2, HFA03 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum3_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum3_HFA05(float v1, long v2, HFA05 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum3_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum3_HFA08(float v1, long v2, HFA08 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum3_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum3_HFA11(float v1, long v2, HFA11 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum3_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum3_HFA19(float v1, long v2, HFA19 hfa);
-
-
-        [DllImport(Config.DllName, EntryPoint = "sum5_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum5_HFA01(long v1, double v2, int v3, sbyte v4, HFA01 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum5_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum5_HFA02(long v1, double v2, int v3, sbyte v4, HFA02 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum5_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum5_HFA03(long v1, double v2, int v3, sbyte v4, HFA03 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum5_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum5_HFA05(long v1, double v2, int v3, sbyte v4, HFA05 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum5_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum5_HFA08(long v1, double v2, int v3, sbyte v4, HFA08 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum5_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum5_HFA11(long v1, double v2, int v3, sbyte v4, HFA11 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum5_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum5_HFA19(long v1, double v2, int v3, sbyte v4, HFA19 hfa);
-
-
-        [DllImport(Config.DllName, EntryPoint = "sum8_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum8_HFA01(float v1, double v2, long v3, sbyte v4, double v5, HFA01 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum8_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum8_HFA02(float v1, double v2, long v3, sbyte v4, double v5, HFA02 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum8_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum8_HFA03(float v1, double v2, long v3, sbyte v4, double v5, HFA03 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum8_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum8_HFA05(float v1, double v2, long v3, sbyte v4, double v5, HFA05 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum8_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum8_HFA08(float v1, double v2, long v3, sbyte v4, double v5, HFA08 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum8_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum8_HFA11(float v1, double v2, long v3, sbyte v4, double v5, HFA11 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum8_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum8_HFA19(float v1, double v2, long v3, sbyte v4, double v5, HFA19 hfa);
-
-
-        [DllImport(Config.DllName, EntryPoint = "sum11_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum11_HFA01(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA01 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum11_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum11_HFA02(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA02 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum11_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum11_HFA03(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA03 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum11_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum11_HFA05(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA05 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum11_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum11_HFA08(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA08 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum11_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum11_HFA11(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA11 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum11_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum11_HFA19(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA19 hfa);
-
-
-        [DllImport(Config.DllName, EntryPoint = "sum19_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum19_HFA01(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA01 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum19_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum19_HFA02(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA02 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum19_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum19_HFA03(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA03 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum19_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum19_HFA05(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA05 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum19_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum19_HFA08(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA08 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum19_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum19_HFA11(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA11 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum19_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Sum19_HFA19(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA19 hfa);
-
-
-
-        // ---------------------------------------------------
-        // Average Methods
-        // ---------------------------------------------------
-
-
-        [DllImport(Config.DllName, EntryPoint = "average_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average_HFA01(HFA01 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "average_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average_HFA02(HFA02 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "average_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average_HFA03(HFA03 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "average_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average_HFA05(HFA05 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "average_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average_HFA08(HFA08 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "average_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average_HFA11(HFA11 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "average_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average_HFA19(HFA19 hfa);
-
-
-        [DllImport(Config.DllName, EntryPoint = "average3_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average3_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3);
-
-        [DllImport(Config.DllName, EntryPoint = "average3_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average3_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3);
-
-        [DllImport(Config.DllName, EntryPoint = "average3_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average3_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3);
-
-        [DllImport(Config.DllName, EntryPoint = "average3_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average3_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3);
-
-        [DllImport(Config.DllName, EntryPoint = "average3_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average3_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3);
-
-        [DllImport(Config.DllName, EntryPoint = "average3_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average3_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3);
-
-        [DllImport(Config.DllName, EntryPoint = "average3_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average3_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3);
-
-
-        [DllImport(Config.DllName, EntryPoint = "average5_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average5_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5);
-
-        [DllImport(Config.DllName, EntryPoint = "average5_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average5_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5);
-
-        [DllImport(Config.DllName, EntryPoint = "average5_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average5_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5);
-
-        [DllImport(Config.DllName, EntryPoint = "average5_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average5_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5);
-
-        [DllImport(Config.DllName, EntryPoint = "average5_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average5_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5);
-
-        [DllImport(Config.DllName, EntryPoint = "average5_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average5_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5);
-
-        [DllImport(Config.DllName, EntryPoint = "average5_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average5_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5);
-
-
-        [DllImport(Config.DllName, EntryPoint = "average8_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average8_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5, HFA01 hfa6, HFA01 hfa7, HFA01 hfa8);
-
-        [DllImport(Config.DllName, EntryPoint = "average8_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average8_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5, HFA02 hfa6, HFA02 hfa7, HFA02 hfa8);
-
-        [DllImport(Config.DllName, EntryPoint = "average8_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average8_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5, HFA03 hfa6, HFA03 hfa7, HFA03 hfa8);
-
-        [DllImport(Config.DllName, EntryPoint = "average8_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average8_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5, HFA05 hfa6, HFA05 hfa7, HFA05 hfa8);
-
-        [DllImport(Config.DllName, EntryPoint = "average8_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average8_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5, HFA08 hfa6, HFA08 hfa7, HFA08 hfa8);
-
-        [DllImport(Config.DllName, EntryPoint = "average8_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average8_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5, HFA11 hfa6, HFA11 hfa7, HFA11 hfa8);
-
-        [DllImport(Config.DllName, EntryPoint = "average8_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average8_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5, HFA19 hfa6, HFA19 hfa7, HFA19 hfa8);
-
-
-        [DllImport(Config.DllName, EntryPoint = "average11_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average11_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5, HFA01 hfa6, HFA01 hfa7, HFA01 hfa8, HFA01 hfa9, HFA01 hfa10, HFA01 hfa11);
-
-        [DllImport(Config.DllName, EntryPoint = "average11_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average11_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5, HFA02 hfa6, HFA02 hfa7, HFA02 hfa8, HFA02 hfa9, HFA02 hfa10, HFA02 hfa11);
-
-        [DllImport(Config.DllName, EntryPoint = "average11_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average11_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5, HFA03 hfa6, HFA03 hfa7, HFA03 hfa8, HFA03 hfa9, HFA03 hfa10, HFA03 hfa11);
-
-        [DllImport(Config.DllName, EntryPoint = "average11_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average11_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5, HFA05 hfa6, HFA05 hfa7, HFA05 hfa8, HFA05 hfa9, HFA05 hfa10, HFA05 hfa11);
-
-        [DllImport(Config.DllName, EntryPoint = "average11_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average11_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5, HFA08 hfa6, HFA08 hfa7, HFA08 hfa8, HFA08 hfa9, HFA08 hfa10, HFA08 hfa11);
-
-        [DllImport(Config.DllName, EntryPoint = "average11_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average11_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5, HFA11 hfa6, HFA11 hfa7, HFA11 hfa8, HFA11 hfa9, HFA11 hfa10, HFA11 hfa11);
-
-        [DllImport(Config.DllName, EntryPoint = "average11_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average11_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5, HFA19 hfa6, HFA19 hfa7, HFA19 hfa8, HFA19 hfa9, HFA19 hfa10, HFA19 hfa11);
-
-
-        [DllImport(Config.DllName, EntryPoint = "average19_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average19_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5, HFA01 hfa6, HFA01 hfa7, HFA01 hfa8, HFA01 hfa9, HFA01 hfa10, HFA01 hfa11, HFA01 hfa12, HFA01 hfa13, HFA01 hfa14, HFA01 hfa15, HFA01 hfa16, HFA01 hfa17, HFA01 hfa18, HFA01 hfa19);
-
-        [DllImport(Config.DllName, EntryPoint = "average19_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average19_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5, HFA02 hfa6, HFA02 hfa7, HFA02 hfa8, HFA02 hfa9, HFA02 hfa10, HFA02 hfa11, HFA02 hfa12, HFA02 hfa13, HFA02 hfa14, HFA02 hfa15, HFA02 hfa16, HFA02 hfa17, HFA02 hfa18, HFA02 hfa19);
-
-        [DllImport(Config.DllName, EntryPoint = "average19_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average19_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5, HFA03 hfa6, HFA03 hfa7, HFA03 hfa8, HFA03 hfa9, HFA03 hfa10, HFA03 hfa11, HFA03 hfa12, HFA03 hfa13, HFA03 hfa14, HFA03 hfa15, HFA03 hfa16, HFA03 hfa17, HFA03 hfa18, HFA03 hfa19);
-
-        [DllImport(Config.DllName, EntryPoint = "average19_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average19_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5, HFA05 hfa6, HFA05 hfa7, HFA05 hfa8, HFA05 hfa9, HFA05 hfa10, HFA05 hfa11, HFA05 hfa12, HFA05 hfa13, HFA05 hfa14, HFA05 hfa15, HFA05 hfa16, HFA05 hfa17, HFA05 hfa18, HFA05 hfa19);
-
-        [DllImport(Config.DllName, EntryPoint = "average19_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average19_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5, HFA08 hfa6, HFA08 hfa7, HFA08 hfa8, HFA08 hfa9, HFA08 hfa10, HFA08 hfa11, HFA08 hfa12, HFA08 hfa13, HFA08 hfa14, HFA08 hfa15, HFA08 hfa16, HFA08 hfa17, HFA08 hfa18, HFA08 hfa19);
-
-        [DllImport(Config.DllName, EntryPoint = "average19_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average19_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5, HFA11 hfa6, HFA11 hfa7, HFA11 hfa8, HFA11 hfa9, HFA11 hfa10, HFA11 hfa11, HFA11 hfa12, HFA11 hfa13, HFA11 hfa14, HFA11 hfa15, HFA11 hfa16, HFA11 hfa17, HFA11 hfa18, HFA11 hfa19);
-
-        [DllImport(Config.DllName, EntryPoint = "average19_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Average19_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5, HFA19 hfa6, HFA19 hfa7, HFA19 hfa8, HFA19 hfa9, HFA19 hfa10, HFA19 hfa11, HFA19 hfa12, HFA19 hfa13, HFA19 hfa14, HFA19 hfa15, HFA19 hfa16, HFA19 hfa17, HFA19 hfa18, HFA19 hfa19);
-
-
-
-        // ---------------------------------------------------
-        // Add Methods
-        // ---------------------------------------------------
-
-
-        [DllImport(Config.DllName, EntryPoint = "add01_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add01_HFA01(HFA01 hfa1, float v1, HFA01 hfa2, int v2, HFA01 hfa3, short v3, double v4, HFA01 hfa4, HFA01 hfa5, float v5, long v6, float v7, HFA01 hfa6, float v8, HFA01 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add01_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add01_HFA02(HFA02 hfa1, float v1, HFA02 hfa2, int v2, HFA02 hfa3, short v3, double v4, HFA02 hfa4, HFA02 hfa5, float v5, long v6, float v7, HFA02 hfa6, float v8, HFA02 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add01_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add01_HFA03(HFA03 hfa1, float v1, HFA03 hfa2, int v2, HFA03 hfa3, short v3, double v4, HFA03 hfa4, HFA03 hfa5, float v5, long v6, float v7, HFA03 hfa6, float v8, HFA03 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add01_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add01_HFA05(HFA05 hfa1, float v1, HFA05 hfa2, int v2, HFA05 hfa3, short v3, double v4, HFA05 hfa4, HFA05 hfa5, float v5, long v6, float v7, HFA05 hfa6, float v8, HFA05 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add01_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add01_HFA08(HFA08 hfa1, float v1, HFA08 hfa2, int v2, HFA08 hfa3, short v3, double v4, HFA08 hfa4, HFA08 hfa5, float v5, long v6, float v7, HFA08 hfa6, float v8, HFA08 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add01_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add01_HFA11(HFA11 hfa1, float v1, HFA11 hfa2, int v2, HFA11 hfa3, short v3, double v4, HFA11 hfa4, HFA11 hfa5, float v5, long v6, float v7, HFA11 hfa6, float v8, HFA11 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add01_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add01_HFA19(HFA19 hfa1, float v1, HFA19 hfa2, int v2, HFA19 hfa3, short v3, double v4, HFA19 hfa4, HFA19 hfa5, float v5, long v6, float v7, HFA19 hfa6, float v8, HFA19 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add01_HFA00", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add01_HFA00(HFA03 hfa1, float v1, HFA02 hfa2, int v2, HFA19 hfa3, short v3, double v4, HFA05 hfa4, HFA08 hfa5, float v5, long v6, float v7, HFA11 hfa6, float v8, HFA01 hfa7);
-
-
-        [DllImport(Config.DllName, EntryPoint = "add02_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add02_HFA01(HFA01 hfa1, HFA01 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA01 hfa3, double v7, float v8, HFA01 hfa4, short v9, HFA01 hfa5, float v10, HFA01 hfa6, HFA01 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add02_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add02_HFA02(HFA02 hfa1, HFA02 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA02 hfa3, double v7, float v8, HFA02 hfa4, short v9, HFA02 hfa5, float v10, HFA02 hfa6, HFA02 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add02_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add02_HFA03(HFA03 hfa1, HFA03 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA03 hfa3, double v7, float v8, HFA03 hfa4, short v9, HFA03 hfa5, float v10, HFA03 hfa6, HFA03 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add02_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add02_HFA05(HFA05 hfa1, HFA05 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA05 hfa3, double v7, float v8, HFA05 hfa4, short v9, HFA05 hfa5, float v10, HFA05 hfa6, HFA05 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add02_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add02_HFA08(HFA08 hfa1, HFA08 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA08 hfa3, double v7, float v8, HFA08 hfa4, short v9, HFA08 hfa5, float v10, HFA08 hfa6, HFA08 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add02_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add02_HFA11(HFA11 hfa1, HFA11 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA11 hfa3, double v7, float v8, HFA11 hfa4, short v9, HFA11 hfa5, float v10, HFA11 hfa6, HFA11 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add02_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add02_HFA19(HFA19 hfa1, HFA19 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA19 hfa3, double v7, float v8, HFA19 hfa4, short v9, HFA19 hfa5, float v10, HFA19 hfa6, HFA19 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add02_HFA00", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add02_HFA00(HFA01 hfa1, HFA05 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA03 hfa3, double v7, float v8, HFA11 hfa4, short v9, HFA19 hfa5, float v10, HFA08 hfa6, HFA02 hfa7);
-
-
-
-        [DllImport(Config.DllName, EntryPoint = "add03_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add03_HFA01(float v1, sbyte v2, HFA01 hfa1, double v3, sbyte v4, HFA01 hfa2, long v5, short v6, int v7, HFA01 hfa3, HFA01 hfa4, float v8, HFA01 hfa5, float v9, HFA01 hfa6, float v10, HFA01 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add03_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add03_HFA02(float v1, sbyte v2, HFA02 hfa1, double v3, sbyte v4, HFA02 hfa2, long v5, short v6, int v7, HFA02 hfa3, HFA02 hfa4, float v8, HFA02 hfa5, float v9, HFA02 hfa6, float v10, HFA02 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add03_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add03_HFA03(float v1, sbyte v2, HFA03 hfa1, double v3, sbyte v4, HFA03 hfa2, long v5, short v6, int v7, HFA03 hfa3, HFA03 hfa4, float v8, HFA03 hfa5, float v9, HFA03 hfa6, float v10, HFA03 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add03_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add03_HFA05(float v1, sbyte v2, HFA05 hfa1, double v3, sbyte v4, HFA05 hfa2, long v5, short v6, int v7, HFA05 hfa3, HFA05 hfa4, float v8, HFA05 hfa5, float v9, HFA05 hfa6, float v10, HFA05 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add03_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add03_HFA08(float v1, sbyte v2, HFA08 hfa1, double v3, sbyte v4, HFA08 hfa2, long v5, short v6, int v7, HFA08 hfa3, HFA08 hfa4, float v8, HFA08 hfa5, float v9, HFA08 hfa6, float v10, HFA08 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add03_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add03_HFA11(float v1, sbyte v2, HFA11 hfa1, double v3, sbyte v4, HFA11 hfa2, long v5, short v6, int v7, HFA11 hfa3, HFA11 hfa4, float v8, HFA11 hfa5, float v9, HFA11 hfa6, float v10, HFA11 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add03_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add03_HFA19(float v1, sbyte v2, HFA19 hfa1, double v3, sbyte v4, HFA19 hfa2, long v5, short v6, int v7, HFA19 hfa3, HFA19 hfa4, float v8, HFA19 hfa5, float v9, HFA19 hfa6, float v10, HFA19 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add03_HFA00", CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Add03_HFA00(float v1, sbyte v2, HFA08 hfa1, double v3, sbyte v4, HFA19 hfa2, long v5, short v6, int v7, HFA03 hfa3, HFA01 hfa4, float v8, HFA11 hfa5, float v9, HFA02 hfa6, float v10, HFA05 hfa7);
-    }
-}
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_interop_sf.cs b/tests/src/JIT/jit64/hfa/main/dll/hfa_interop_sf.cs
deleted file mode 100644
index d551112236..0000000000
--- a/tests/src/JIT/jit64/hfa/main/dll/hfa_interop_sf.cs
+++ /dev/null
@@ -1,484 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Runtime.InteropServices;
-
-namespace HFATest
-{
-
-    public struct Config
-    {
-
-        public const string hfaType = "simple";
-        public const string dllType = "native_cpp";
-        public const string floatType = "f32";
-        public const string DllName = "hfa" + "_" + hfaType + "_" + floatType + "_" + dllType;
-    }
-
-
-    public class TestMan
-    {
-
-        //---------------------------------------------
-        // Init Methods
-        // ---------------------------------------------------
-
-        [DllImport(Config.DllName, EntryPoint = "init_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Init_HFA01(out HFA01 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "init_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Init_HFA02(out HFA02 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "init_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Init_HFA03(out HFA03 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "init_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Init_HFA05(out HFA05 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "init_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Init_HFA08(out HFA08 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "init_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Init_HFA11(out HFA11 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "init_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Init_HFA19(out HFA19 hfa);
-
-
-
-        // ---------------------------------------------------
-        // Identity Methods
-        // ---------------------------------------------------
-
-        [DllImport(Config.DllName, EntryPoint = "identity_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA01 Identity_HFA01(HFA01 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "identity_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA02 Identity_HFA02(HFA02 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "identity_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA03 Identity_HFA03(HFA03 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "identity_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA05 Identity_HFA05(HFA05 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "identity_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA08 Identity_HFA08(HFA08 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "identity_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA11 Identity_HFA11(HFA11 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "identity_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA19 Identity_HFA19(HFA19 hfa);
-
-
-
-        // ---------------------------------------------------
-        // Get Methods
-        // ---------------------------------------------------
-
-        [DllImport(Config.DllName, EntryPoint = "get_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA01 Get_HFA01();
-
-        [DllImport(Config.DllName, EntryPoint = "get_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA02 Get_HFA02();
-
-        [DllImport(Config.DllName, EntryPoint = "get_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA03 Get_HFA03();
-
-        [DllImport(Config.DllName, EntryPoint = "get_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA05 Get_HFA05();
-
-        [DllImport(Config.DllName, EntryPoint = "get_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA08 Get_HFA08();
-
-        [DllImport(Config.DllName, EntryPoint = "get_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA11 Get_HFA11();
-
-        [DllImport(Config.DllName, EntryPoint = "get_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern HFA19 Get_HFA19();
-
-
-        public static readonly float EXPECTED_SUM_HFA01 = Get_EXPECTED_SUM_HFA01();
-        public static readonly float EXPECTED_SUM_HFA02 = Get_EXPECTED_SUM_HFA02();
-        public static readonly float EXPECTED_SUM_HFA03 = Get_EXPECTED_SUM_HFA03();
-        public static readonly float EXPECTED_SUM_HFA05 = Get_EXPECTED_SUM_HFA05();
-        public static readonly float EXPECTED_SUM_HFA08 = Get_EXPECTED_SUM_HFA08();
-        public static readonly float EXPECTED_SUM_HFA11 = Get_EXPECTED_SUM_HFA11();
-        public static readonly float EXPECTED_SUM_HFA19 = Get_EXPECTED_SUM_HFA19();
-
-        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Get_EXPECTED_SUM_HFA01();
-
-        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Get_EXPECTED_SUM_HFA02();
-
-        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Get_EXPECTED_SUM_HFA03();
-
-        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Get_EXPECTED_SUM_HFA05();
-
-        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Get_EXPECTED_SUM_HFA08();
-
-        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Get_EXPECTED_SUM_HFA11();
-
-        [DllImport(Config.DllName, EntryPoint = "get_EXPECTED_SUM_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Get_EXPECTED_SUM_HFA19();
-
-
-        [DllImport(Config.DllName, EntryPoint = "sum_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum_HFA01(HFA01 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum_HFA02(HFA02 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum_HFA03(HFA03 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum_HFA05(HFA05 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum_HFA08(HFA08 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum_HFA11(HFA11 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum_HFA19(HFA19 hfa);
-
-
-        [DllImport(Config.DllName, EntryPoint = "sum3_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum3_HFA01(float v1, long v2, HFA01 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum3_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum3_HFA02(float v1, long v2, HFA02 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum3_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum3_HFA03(float v1, long v2, HFA03 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum3_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum3_HFA05(float v1, long v2, HFA05 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum3_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum3_HFA08(float v1, long v2, HFA08 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum3_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum3_HFA11(float v1, long v2, HFA11 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum3_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum3_HFA19(float v1, long v2, HFA19 hfa);
-
-
-        [DllImport(Config.DllName, EntryPoint = "sum5_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum5_HFA01(long v1, double v2, int v3, sbyte v4, HFA01 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum5_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum5_HFA02(long v1, double v2, int v3, sbyte v4, HFA02 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum5_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum5_HFA03(long v1, double v2, int v3, sbyte v4, HFA03 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum5_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum5_HFA05(long v1, double v2, int v3, sbyte v4, HFA05 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum5_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum5_HFA08(long v1, double v2, int v3, sbyte v4, HFA08 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum5_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum5_HFA11(long v1, double v2, int v3, sbyte v4, HFA11 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum5_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum5_HFA19(long v1, double v2, int v3, sbyte v4, HFA19 hfa);
-
-
-        [DllImport(Config.DllName, EntryPoint = "sum8_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum8_HFA01(float v1, double v2, long v3, sbyte v4, double v5, HFA01 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum8_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum8_HFA02(float v1, double v2, long v3, sbyte v4, double v5, HFA02 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum8_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum8_HFA03(float v1, double v2, long v3, sbyte v4, double v5, HFA03 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum8_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum8_HFA05(float v1, double v2, long v3, sbyte v4, double v5, HFA05 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum8_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum8_HFA08(float v1, double v2, long v3, sbyte v4, double v5, HFA08 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum8_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum8_HFA11(float v1, double v2, long v3, sbyte v4, double v5, HFA11 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum8_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum8_HFA19(float v1, double v2, long v3, sbyte v4, double v5, HFA19 hfa);
-
-
-        [DllImport(Config.DllName, EntryPoint = "sum11_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum11_HFA01(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA01 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum11_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum11_HFA02(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA02 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum11_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum11_HFA03(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA03 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum11_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum11_HFA05(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA05 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum11_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum11_HFA08(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA08 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum11_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum11_HFA11(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA11 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum11_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum11_HFA19(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA19 hfa);
-
-
-        [DllImport(Config.DllName, EntryPoint = "sum19_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum19_HFA01(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA01 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum19_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum19_HFA02(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA02 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum19_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum19_HFA03(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA03 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum19_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum19_HFA05(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA05 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum19_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum19_HFA08(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA08 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum19_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum19_HFA11(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA11 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "sum19_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Sum19_HFA19(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA19 hfa);
-
-
-
-        // ---------------------------------------------------
-        // Average Methods
-        // ---------------------------------------------------
-
-
-        [DllImport(Config.DllName, EntryPoint = "average_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average_HFA01(HFA01 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "average_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average_HFA02(HFA02 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "average_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average_HFA03(HFA03 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "average_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average_HFA05(HFA05 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "average_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average_HFA08(HFA08 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "average_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average_HFA11(HFA11 hfa);
-
-        [DllImport(Config.DllName, EntryPoint = "average_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average_HFA19(HFA19 hfa);
-
-
-        [DllImport(Config.DllName, EntryPoint = "average3_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average3_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3);
-
-        [DllImport(Config.DllName, EntryPoint = "average3_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average3_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3);
-
-        [DllImport(Config.DllName, EntryPoint = "average3_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average3_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3);
-
-        [DllImport(Config.DllName, EntryPoint = "average3_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average3_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3);
-
-        [DllImport(Config.DllName, EntryPoint = "average3_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average3_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3);
-
-        [DllImport(Config.DllName, EntryPoint = "average3_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average3_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3);
-
-        [DllImport(Config.DllName, EntryPoint = "average3_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average3_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3);
-
-
-        [DllImport(Config.DllName, EntryPoint = "average5_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average5_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5);
-
-        [DllImport(Config.DllName, EntryPoint = "average5_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average5_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5);
-
-        [DllImport(Config.DllName, EntryPoint = "average5_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average5_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5);
-
-        [DllImport(Config.DllName, EntryPoint = "average5_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average5_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5);
-
-        [DllImport(Config.DllName, EntryPoint = "average5_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average5_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5);
-
-        [DllImport(Config.DllName, EntryPoint = "average5_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average5_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5);
-
-        [DllImport(Config.DllName, EntryPoint = "average5_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average5_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5);
-
-
-        [DllImport(Config.DllName, EntryPoint = "average8_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average8_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5, HFA01 hfa6, HFA01 hfa7, HFA01 hfa8);
-
-        [DllImport(Config.DllName, EntryPoint = "average8_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average8_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5, HFA02 hfa6, HFA02 hfa7, HFA02 hfa8);
-
-        [DllImport(Config.DllName, EntryPoint = "average8_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average8_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5, HFA03 hfa6, HFA03 hfa7, HFA03 hfa8);
-
-        [DllImport(Config.DllName, EntryPoint = "average8_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average8_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5, HFA05 hfa6, HFA05 hfa7, HFA05 hfa8);
-
-        [DllImport(Config.DllName, EntryPoint = "average8_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average8_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5, HFA08 hfa6, HFA08 hfa7, HFA08 hfa8);
-
-        [DllImport(Config.DllName, EntryPoint = "average8_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average8_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5, HFA11 hfa6, HFA11 hfa7, HFA11 hfa8);
-
-        [DllImport(Config.DllName, EntryPoint = "average8_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average8_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5, HFA19 hfa6, HFA19 hfa7, HFA19 hfa8);
-
-
-        [DllImport(Config.DllName, EntryPoint = "average11_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average11_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5, HFA01 hfa6, HFA01 hfa7, HFA01 hfa8, HFA01 hfa9, HFA01 hfa10, HFA01 hfa11);
-
-        [DllImport(Config.DllName, EntryPoint = "average11_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average11_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5, HFA02 hfa6, HFA02 hfa7, HFA02 hfa8, HFA02 hfa9, HFA02 hfa10, HFA02 hfa11);
-
-        [DllImport(Config.DllName, EntryPoint = "average11_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average11_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5, HFA03 hfa6, HFA03 hfa7, HFA03 hfa8, HFA03 hfa9, HFA03 hfa10, HFA03 hfa11);
-
-        [DllImport(Config.DllName, EntryPoint = "average11_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average11_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5, HFA05 hfa6, HFA05 hfa7, HFA05 hfa8, HFA05 hfa9, HFA05 hfa10, HFA05 hfa11);
-
-        [DllImport(Config.DllName, EntryPoint = "average11_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average11_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5, HFA08 hfa6, HFA08 hfa7, HFA08 hfa8, HFA08 hfa9, HFA08 hfa10, HFA08 hfa11);
-
-        [DllImport(Config.DllName, EntryPoint = "average11_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average11_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5, HFA11 hfa6, HFA11 hfa7, HFA11 hfa8, HFA11 hfa9, HFA11 hfa10, HFA11 hfa11);
-
-        [DllImport(Config.DllName, EntryPoint = "average11_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average11_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5, HFA19 hfa6, HFA19 hfa7, HFA19 hfa8, HFA19 hfa9, HFA19 hfa10, HFA19 hfa11);
-
-
-        [DllImport(Config.DllName, EntryPoint = "average19_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average19_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5, HFA01 hfa6, HFA01 hfa7, HFA01 hfa8, HFA01 hfa9, HFA01 hfa10, HFA01 hfa11, HFA01 hfa12, HFA01 hfa13, HFA01 hfa14, HFA01 hfa15, HFA01 hfa16, HFA01 hfa17, HFA01 hfa18, HFA01 hfa19);
-
-        [DllImport(Config.DllName, EntryPoint = "average19_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average19_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5, HFA02 hfa6, HFA02 hfa7, HFA02 hfa8, HFA02 hfa9, HFA02 hfa10, HFA02 hfa11, HFA02 hfa12, HFA02 hfa13, HFA02 hfa14, HFA02 hfa15, HFA02 hfa16, HFA02 hfa17, HFA02 hfa18, HFA02 hfa19);
-
-        [DllImport(Config.DllName, EntryPoint = "average19_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average19_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5, HFA03 hfa6, HFA03 hfa7, HFA03 hfa8, HFA03 hfa9, HFA03 hfa10, HFA03 hfa11, HFA03 hfa12, HFA03 hfa13, HFA03 hfa14, HFA03 hfa15, HFA03 hfa16, HFA03 hfa17, HFA03 hfa18, HFA03 hfa19);
-
-        [DllImport(Config.DllName, EntryPoint = "average19_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average19_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5, HFA05 hfa6, HFA05 hfa7, HFA05 hfa8, HFA05 hfa9, HFA05 hfa10, HFA05 hfa11, HFA05 hfa12, HFA05 hfa13, HFA05 hfa14, HFA05 hfa15, HFA05 hfa16, HFA05 hfa17, HFA05 hfa18, HFA05 hfa19);
-
-        [DllImport(Config.DllName, EntryPoint = "average19_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average19_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5, HFA08 hfa6, HFA08 hfa7, HFA08 hfa8, HFA08 hfa9, HFA08 hfa10, HFA08 hfa11, HFA08 hfa12, HFA08 hfa13, HFA08 hfa14, HFA08 hfa15, HFA08 hfa16, HFA08 hfa17, HFA08 hfa18, HFA08 hfa19);
-
-        [DllImport(Config.DllName, EntryPoint = "average19_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average19_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5, HFA11 hfa6, HFA11 hfa7, HFA11 hfa8, HFA11 hfa9, HFA11 hfa10, HFA11 hfa11, HFA11 hfa12, HFA11 hfa13, HFA11 hfa14, HFA11 hfa15, HFA11 hfa16, HFA11 hfa17, HFA11 hfa18, HFA11 hfa19);
-
-        [DllImport(Config.DllName, EntryPoint = "average19_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Average19_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5, HFA19 hfa6, HFA19 hfa7, HFA19 hfa8, HFA19 hfa9, HFA19 hfa10, HFA19 hfa11, HFA19 hfa12, HFA19 hfa13, HFA19 hfa14, HFA19 hfa15, HFA19 hfa16, HFA19 hfa17, HFA19 hfa18, HFA19 hfa19);
-
-
-
-        // ---------------------------------------------------
-        // Add Methods
-        // ---------------------------------------------------
-
-
-        [DllImport(Config.DllName, EntryPoint = "add01_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add01_HFA01(HFA01 hfa1, float v1, HFA01 hfa2, int v2, HFA01 hfa3, short v3, double v4, HFA01 hfa4, HFA01 hfa5, float v5, long v6, float v7, HFA01 hfa6, float v8, HFA01 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add01_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add01_HFA02(HFA02 hfa1, float v1, HFA02 hfa2, int v2, HFA02 hfa3, short v3, double v4, HFA02 hfa4, HFA02 hfa5, float v5, long v6, float v7, HFA02 hfa6, float v8, HFA02 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add01_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add01_HFA03(HFA03 hfa1, float v1, HFA03 hfa2, int v2, HFA03 hfa3, short v3, double v4, HFA03 hfa4, HFA03 hfa5, float v5, long v6, float v7, HFA03 hfa6, float v8, HFA03 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add01_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add01_HFA05(HFA05 hfa1, float v1, HFA05 hfa2, int v2, HFA05 hfa3, short v3, double v4, HFA05 hfa4, HFA05 hfa5, float v5, long v6, float v7, HFA05 hfa6, float v8, HFA05 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add01_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add01_HFA08(HFA08 hfa1, float v1, HFA08 hfa2, int v2, HFA08 hfa3, short v3, double v4, HFA08 hfa4, HFA08 hfa5, float v5, long v6, float v7, HFA08 hfa6, float v8, HFA08 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add01_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add01_HFA11(HFA11 hfa1, float v1, HFA11 hfa2, int v2, HFA11 hfa3, short v3, double v4, HFA11 hfa4, HFA11 hfa5, float v5, long v6, float v7, HFA11 hfa6, float v8, HFA11 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add01_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add01_HFA19(HFA19 hfa1, float v1, HFA19 hfa2, int v2, HFA19 hfa3, short v3, double v4, HFA19 hfa4, HFA19 hfa5, float v5, long v6, float v7, HFA19 hfa6, float v8, HFA19 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add01_HFA00", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add01_HFA00(HFA03 hfa1, float v1, HFA02 hfa2, int v2, HFA19 hfa3, short v3, double v4, HFA05 hfa4, HFA08 hfa5, float v5, long v6, float v7, HFA11 hfa6, float v8, HFA01 hfa7);
-
-
-        [DllImport(Config.DllName, EntryPoint = "add02_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add02_HFA01(HFA01 hfa1, HFA01 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA01 hfa3, double v7, float v8, HFA01 hfa4, short v9, HFA01 hfa5, float v10, HFA01 hfa6, HFA01 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add02_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add02_HFA02(HFA02 hfa1, HFA02 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA02 hfa3, double v7, float v8, HFA02 hfa4, short v9, HFA02 hfa5, float v10, HFA02 hfa6, HFA02 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add02_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add02_HFA03(HFA03 hfa1, HFA03 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA03 hfa3, double v7, float v8, HFA03 hfa4, short v9, HFA03 hfa5, float v10, HFA03 hfa6, HFA03 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add02_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add02_HFA05(HFA05 hfa1, HFA05 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA05 hfa3, double v7, float v8, HFA05 hfa4, short v9, HFA05 hfa5, float v10, HFA05 hfa6, HFA05 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add02_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add02_HFA08(HFA08 hfa1, HFA08 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA08 hfa3, double v7, float v8, HFA08 hfa4, short v9, HFA08 hfa5, float v10, HFA08 hfa6, HFA08 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add02_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add02_HFA11(HFA11 hfa1, HFA11 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA11 hfa3, double v7, float v8, HFA11 hfa4, short v9, HFA11 hfa5, float v10, HFA11 hfa6, HFA11 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add02_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add02_HFA19(HFA19 hfa1, HFA19 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA19 hfa3, double v7, float v8, HFA19 hfa4, short v9, HFA19 hfa5, float v10, HFA19 hfa6, HFA19 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add02_HFA00", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add02_HFA00(HFA01 hfa1, HFA05 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA03 hfa3, double v7, float v8, HFA11 hfa4, short v9, HFA19 hfa5, float v10, HFA08 hfa6, HFA02 hfa7);
-
-
-
-        [DllImport(Config.DllName, EntryPoint = "add03_HFA01", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add03_HFA01(float v1, sbyte v2, HFA01 hfa1, double v3, sbyte v4, HFA01 hfa2, long v5, short v6, int v7, HFA01 hfa3, HFA01 hfa4, float v8, HFA01 hfa5, float v9, HFA01 hfa6, float v10, HFA01 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add03_HFA02", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add03_HFA02(float v1, sbyte v2, HFA02 hfa1, double v3, sbyte v4, HFA02 hfa2, long v5, short v6, int v7, HFA02 hfa3, HFA02 hfa4, float v8, HFA02 hfa5, float v9, HFA02 hfa6, float v10, HFA02 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add03_HFA03", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add03_HFA03(float v1, sbyte v2, HFA03 hfa1, double v3, sbyte v4, HFA03 hfa2, long v5, short v6, int v7, HFA03 hfa3, HFA03 hfa4, float v8, HFA03 hfa5, float v9, HFA03 hfa6, float v10, HFA03 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add03_HFA05", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add03_HFA05(float v1, sbyte v2, HFA05 hfa1, double v3, sbyte v4, HFA05 hfa2, long v5, short v6, int v7, HFA05 hfa3, HFA05 hfa4, float v8, HFA05 hfa5, float v9, HFA05 hfa6, float v10, HFA05 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add03_HFA08", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add03_HFA08(float v1, sbyte v2, HFA08 hfa1, double v3, sbyte v4, HFA08 hfa2, long v5, short v6, int v7, HFA08 hfa3, HFA08 hfa4, float v8, HFA08 hfa5, float v9, HFA08 hfa6, float v10, HFA08 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add03_HFA11", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add03_HFA11(float v1, sbyte v2, HFA11 hfa1, double v3, sbyte v4, HFA11 hfa2, long v5, short v6, int v7, HFA11 hfa3, HFA11 hfa4, float v8, HFA11 hfa5, float v9, HFA11 hfa6, float v10, HFA11 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add03_HFA19", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add03_HFA19(float v1, sbyte v2, HFA19 hfa1, double v3, sbyte v4, HFA19 hfa2, long v5, short v6, int v7, HFA19 hfa3, HFA19 hfa4, float v8, HFA19 hfa5, float v9, HFA19 hfa6, float v10, HFA19 hfa7);
-
-        [DllImport(Config.DllName, EntryPoint = "add03_HFA00", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Add03_HFA00(float v1, sbyte v2, HFA08 hfa1, double v3, sbyte v4, HFA19 hfa2, long v5, short v6, int v7, HFA03 hfa3, HFA01 hfa4, float v8, HFA11 hfa5, float v9, HFA02 hfa6, float v10, HFA05 hfa7);
-    }
-}
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_managed_sd.cs b/tests/src/JIT/jit64/hfa/main/dll/hfa_managed.cs
index ea0f51fb8a..d579946a3f 100644
--- a/tests/src/JIT/jit64/hfa/main/dll/hfa_managed_sd.cs
+++ b/tests/src/JIT/jit64/hfa/main/dll/hfa_managed.cs
@@ -4,11 +4,28 @@
 
 namespace HFATest
 {
-
     public class TestMan
     {
-
-
+#if NESTED_HFA
+#if FLOAT64
+        public const double EXPECTED_SUM_HFA01 = 1;
+        public const double EXPECTED_SUM_HFA02 = 3;
+        public const double EXPECTED_SUM_HFA03 = 4;
+        public const double EXPECTED_SUM_HFA05 = 7;
+        public const double EXPECTED_SUM_HFA08 = 11;
+        public const double EXPECTED_SUM_HFA11 = 15;
+        public const double EXPECTED_SUM_HFA19 = 26;
+#else
+        public const float EXPECTED_SUM_HFA01 = 1;
+        public const float EXPECTED_SUM_HFA02 = 3;
+        public const float EXPECTED_SUM_HFA03 = 4;
+        public const float EXPECTED_SUM_HFA05 = 7;
+        public const float EXPECTED_SUM_HFA08 = 11;
+        public const float EXPECTED_SUM_HFA11 = 15;
+        public const float EXPECTED_SUM_HFA19 = 26;
+#endif
+#else
+#if FLOAT64
         public const double EXPECTED_SUM_HFA01 = 1;
         public const double EXPECTED_SUM_HFA02 = 3;
         public const double EXPECTED_SUM_HFA03 = 6;
@@ -16,6 +33,16 @@ namespace HFATest
         public const double EXPECTED_SUM_HFA08 = 36;
         public const double EXPECTED_SUM_HFA11 = 66;
         public const double EXPECTED_SUM_HFA19 = 190;
+#else
+        public const float EXPECTED_SUM_HFA01 = 1;
+        public const float EXPECTED_SUM_HFA02 = 3;
+        public const float EXPECTED_SUM_HFA03 = 6;
+        public const float EXPECTED_SUM_HFA05 = 15;
+        public const float EXPECTED_SUM_HFA08 = 36;
+        public const float EXPECTED_SUM_HFA11 = 66;
+        public const float EXPECTED_SUM_HFA19 = 190;
+#endif
+#endif
 
 
         // --------------------------------------------------------------
@@ -29,28 +56,47 @@ namespace HFATest
 
         public static void Init_HFA02(out HFA02 hfa)
         {
+#if NESTED_HFA
+            Init_HFA01(out hfa.hfa01);
+            hfa.f2 = 2;
+#else
             hfa.f1 = 1;
             hfa.f2 = 2;
+#endif
         }
 
         public static void Init_HFA03(out HFA03 hfa)
         {
+#if NESTED_HFA
+            Init_HFA01(out hfa.hfa01);
+            Init_HFA02(out hfa.hfa02);
+#else
             hfa.f1 = 1;
             hfa.f2 = 2;
             hfa.f3 = 3;
+#endif
         }
 
         public static void Init_HFA05(out HFA05 hfa)
         {
+#if NESTED_HFA
+            Init_HFA02(out hfa.hfa02);
+            Init_HFA03(out hfa.hfa03);
+#else
             hfa.f1 = 1;
             hfa.f2 = 2;
             hfa.f3 = 3;
             hfa.f4 = 4;
             hfa.f5 = 5;
+#endif
         }
 
         public static void Init_HFA08(out HFA08 hfa)
         {
+#if NESTED_HFA
+            Init_HFA03(out hfa.hfa03);
+            Init_HFA05(out hfa.hfa05);
+#else
             hfa.f1 = 1;
             hfa.f2 = 2;
             hfa.f3 = 3;
@@ -59,10 +105,15 @@ namespace HFATest
             hfa.f6 = 6;
             hfa.f7 = 7;
             hfa.f8 = 8;
+#endif
         }
 
         public static void Init_HFA11(out HFA11 hfa)
         {
+#if NESTED_HFA
+            Init_HFA03(out hfa.hfa03);
+            Init_HFA08(out hfa.hfa08);
+#else
             hfa.f1 = 1;
             hfa.f2 = 2;
             hfa.f3 = 3;
@@ -74,10 +125,15 @@ namespace HFATest
             hfa.f9 = 9;
             hfa.f10 = 10;
             hfa.f11 = 11;
+#endif
         }
 
         public static void Init_HFA19(out HFA19 hfa)
         {
+#if NESTED_HFA
+            Init_HFA08(out hfa.hfa08);
+            Init_HFA11(out hfa.hfa11);
+#else
             hfa.f1 = 1;
             hfa.f2 = 2;
             hfa.f3 = 3;
@@ -97,6 +153,7 @@ namespace HFATest
             hfa.f17 = 17;
             hfa.f18 = 18;
             hfa.f19 = 19;
+#endif
         }
 
 
@@ -199,47 +256,99 @@ namespace HFATest
         // Sum methods
         // --------------------------------------------------------------
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum_HFA01(HFA01 hfa)
         {
             return hfa.f1;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum_HFA02(HFA02 hfa)
         {
+#if NESTED_HFA
+            return Sum_HFA01(hfa.hfa01) + hfa.f2;
+#else
             return hfa.f1 + hfa.f2;
+#endif
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum_HFA03(HFA03 hfa)
         {
+#if NESTED_HFA
+            return Sum_HFA01(hfa.hfa01) + Sum_HFA02(hfa.hfa02);
+#else
             return hfa.f1 + hfa.f2 + hfa.f3;
+#endif
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum_HFA05(HFA05 hfa)
         {
+#if NESTED_HFA
+            return Sum_HFA02(hfa.hfa02) + Sum_HFA03(hfa.hfa03);
+#else
             return hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5;
+#endif
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum_HFA08(HFA08 hfa)
         {
+#if NESTED_HFA
+            return Sum_HFA03(hfa.hfa03) + Sum_HFA05(hfa.hfa05);
+#else
             return hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5 + hfa.f6 + hfa.f7 + hfa.f8;
+#endif
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum_HFA11(HFA11 hfa)
         {
+#if NESTED_HFA
+            return Sum_HFA03(hfa.hfa03) + Sum_HFA08(hfa.hfa08);
+#else
             return hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5 + hfa.f6 + hfa.f7 + hfa.f8 + hfa.f9 + hfa.f10 + hfa.f11;
+#endif
         }
 
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum_HFA19(HFA19 hfa)
         {
+#if NESTED_HFA
+            return Sum_HFA08(hfa.hfa08) + Sum_HFA11(hfa.hfa11);
+#else
             return hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5 + hfa.f6 + hfa.f7 + hfa.f8 + hfa.f9 + hfa.f10 + hfa.f11 + hfa.f12 + hfa.f13 + hfa.f14 + hfa.f15 + hfa.f16 + hfa.f17 + hfa.f18 + hfa.f19;
+#endif
         }
 
 
@@ -248,52 +357,104 @@ namespace HFATest
         // Sum3 methods
         // --------------------------------------------------------------
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum3_HFA01(float v1, long v2, HFA01 hfa)
         {
             return (float)v1 + (float)v2 + hfa.f1;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum3_HFA02(float v1, long v2, HFA02 hfa)
         {
             return (float)v1 + (float)v2 +
+#if NESTED_HFA
+                Sum_HFA01(hfa.hfa01) + hfa.f2;
+#else
                 hfa.f1 + hfa.f2;
+#endif
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum3_HFA03(float v1, long v2, HFA03 hfa)
         {
             return (float)v1 + (float)v2 +
+#if NESTED_HFA
+                Sum_HFA01(hfa.hfa01) + Sum_HFA02(hfa.hfa02);
+#else
                 hfa.f1 + hfa.f2 + hfa.f3;
+#endif
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum3_HFA05(float v1, long v2, HFA05 hfa)
         {
             return (float)v1 + (float)v2 +
+#if NESTED_HFA
+                Sum_HFA02(hfa.hfa02) + Sum_HFA03(hfa.hfa03);
+#else
                 hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5;
+#endif
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum3_HFA08(float v1, long v2, HFA08 hfa)
         {
             return (float)v1 + (float)v2 +
+#if NESTED_HFA
+                Sum_HFA03(hfa.hfa03) + Sum_HFA05(hfa.hfa05);
+#else
                 hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5 + hfa.f6 + hfa.f7 + hfa.f8;
+#endif
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum3_HFA11(float v1, long v2, HFA11 hfa)
         {
             return (float)v1 + (float)v2 +
+#if NESTED_HFA
+                Sum_HFA03(hfa.hfa03) + Sum_HFA08(hfa.hfa08);
+#else
                 hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5 + hfa.f6 + hfa.f7 + hfa.f8 + hfa.f9 + hfa.f10 + hfa.f11;
+#endif
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum3_HFA19(float v1, long v2, HFA19 hfa)
         {
             return (float)v1 + (float)v2 +
+#if NESTED_HFA
+                Sum_HFA08(hfa.hfa08) + Sum_HFA11(hfa.hfa11);
+#else
                 hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5 + hfa.f6 + hfa.f7 + hfa.f8 + hfa.f9 + hfa.f10 + hfa.f11 + hfa.f12 + hfa.f13 + hfa.f14 + hfa.f15 + hfa.f16 + hfa.f17 + hfa.f18 + hfa.f19;
+#endif
         }
 
 
@@ -302,53 +463,105 @@ namespace HFATest
         // Sum5 methods
         // --------------------------------------------------------------
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum5_HFA01(long v1, double v2, int v3, sbyte v4, HFA01 hfa)
         {
             return (float)v1 + (float)v2 + (float)v3 + (float)v4 +
                 hfa.f1;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum5_HFA02(long v1, double v2, int v3, sbyte v4, HFA02 hfa)
         {
             return (float)v1 + (float)v2 + (float)v3 + (float)v4 +
+#if NESTED_HFA
+                Sum_HFA01(hfa.hfa01) + hfa.f2;
+#else
                 hfa.f1 + hfa.f2;
+#endif
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum5_HFA03(long v1, double v2, int v3, sbyte v4, HFA03 hfa)
         {
             return (float)v1 + (float)v2 + (float)v3 + (float)v4 +
+#if NESTED_HFA
+                Sum_HFA01(hfa.hfa01) + Sum_HFA02(hfa.hfa02);
+#else
                 hfa.f1 + hfa.f2 + hfa.f3;
+#endif
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum5_HFA05(long v1, double v2, int v3, sbyte v4, HFA05 hfa)
         {
             return (float)v1 + (float)v2 + (float)v3 + (float)v4 +
+#if NESTED_HFA
+                Sum_HFA02(hfa.hfa02) + Sum_HFA03(hfa.hfa03);
+#else
                 hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5;
+#endif
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum5_HFA08(long v1, double v2, int v3, sbyte v4, HFA08 hfa)
         {
             return (float)v1 + (float)v2 + (float)v3 + (float)v4 +
+#if NESTED_HFA
+                Sum_HFA03(hfa.hfa03) + Sum_HFA05(hfa.hfa05);
+#else
                 hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5 + hfa.f6 + hfa.f7 + hfa.f8;
+#endif
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum5_HFA11(long v1, double v2, int v3, sbyte v4, HFA11 hfa)
         {
             return (float)v1 + (float)v2 + (float)v3 + (float)v4 +
+#if NESTED_HFA
+                Sum_HFA03(hfa.hfa03) + Sum_HFA08(hfa.hfa08);
+#else
                 hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5 + hfa.f6 + hfa.f7 + hfa.f8 + hfa.f9 + hfa.f10 + hfa.f11;
+#endif
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum5_HFA19(long v1, double v2, int v3, sbyte v4, HFA19 hfa)
         {
             return (float)v1 + (float)v2 + (float)v3 + (float)v4 +
+#if NESTED_HFA
+                Sum_HFA08(hfa.hfa08) + Sum_HFA11(hfa.hfa11);
+#else
                 hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5 + hfa.f6 + hfa.f7 + hfa.f8 + hfa.f9 + hfa.f10 + hfa.f11 + hfa.f12 + hfa.f13 + hfa.f14 + hfa.f15 + hfa.f16 + hfa.f17 + hfa.f18 + hfa.f19;
+#endif
         }
 
 
@@ -357,53 +570,105 @@ namespace HFATest
         // Sum8 methods
         // --------------------------------------------------------------
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum8_HFA01(float v1, double v2, long v3, sbyte v4, double v5, HFA01 hfa)
         {
             return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 +
                 hfa.f1;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum8_HFA02(float v1, double v2, long v3, sbyte v4, double v5, HFA02 hfa)
         {
             return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 +
+#if NESTED_HFA
+                Sum_HFA01(hfa.hfa01) + hfa.f2;
+#else
                 hfa.f1 + hfa.f2;
+#endif
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum8_HFA03(float v1, double v2, long v3, sbyte v4, double v5, HFA03 hfa)
         {
             return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 +
+#if NESTED_HFA
+                Sum_HFA01(hfa.hfa01) + Sum_HFA02(hfa.hfa02);
+#else
                 hfa.f1 + hfa.f2 + hfa.f3;
+#endif
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum8_HFA05(float v1, double v2, long v3, sbyte v4, double v5, HFA05 hfa)
         {
             return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 +
+#if NESTED_HFA
+                Sum_HFA02(hfa.hfa02) + Sum_HFA03(hfa.hfa03);
+#else
                 hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5;
+#endif
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum8_HFA08(float v1, double v2, long v3, sbyte v4, double v5, HFA08 hfa)
         {
             return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 +
+#if NESTED_HFA
+                Sum_HFA03(hfa.hfa03) + Sum_HFA05(hfa.hfa05);
+#else
                 hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5 + hfa.f6 + hfa.f7 + hfa.f8;
+#endif
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum8_HFA11(float v1, double v2, long v3, sbyte v4, double v5, HFA11 hfa)
         {
             return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 +
+#if NESTED_HFA
+                Sum_HFA03(hfa.hfa03) + Sum_HFA08(hfa.hfa08);
+#else
                 hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5 + hfa.f6 + hfa.f7 + hfa.f8 + hfa.f9 + hfa.f10 + hfa.f11;
+#endif
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum8_HFA19(float v1, double v2, long v3, sbyte v4, double v5, HFA19 hfa)
         {
             return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 +
+#if NESTED_HFA
+                Sum_HFA08(hfa.hfa08) + Sum_HFA11(hfa.hfa11);
+#else
                 hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5 + hfa.f6 + hfa.f7 + hfa.f8 + hfa.f9 + hfa.f10 + hfa.f11 + hfa.f12 + hfa.f13 + hfa.f14 + hfa.f15 + hfa.f16 + hfa.f17 + hfa.f18 + hfa.f19;
+#endif
         }
 
 
@@ -412,53 +677,105 @@ namespace HFATest
         // Sum11 methods
         // --------------------------------------------------------------
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum11_HFA01(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA01 hfa)
         {
             return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 +
                 hfa.f1;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum11_HFA02(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA02 hfa)
         {
             return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 +
+#if NESTED_HFA
+                Sum_HFA01(hfa.hfa01) + hfa.f2;
+#else
                 hfa.f1 + hfa.f2;
+#endif
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum11_HFA03(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA03 hfa)
         {
             return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 +
+#if NESTED_HFA
+                Sum_HFA01(hfa.hfa01) + Sum_HFA02(hfa.hfa02);
+#else
                 hfa.f1 + hfa.f2 + hfa.f3;
+#endif
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum11_HFA05(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA05 hfa)
         {
             return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 +
+#if NESTED_HFA
+                Sum_HFA02(hfa.hfa02) + Sum_HFA03(hfa.hfa03);
+#else
                 hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5;
+#endif
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum11_HFA08(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA08 hfa)
         {
             return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 +
+#if NESTED_HFA
+                Sum_HFA03(hfa.hfa03) + Sum_HFA05(hfa.hfa05);
+#else
                 hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5 + hfa.f6 + hfa.f7 + hfa.f8;
+#endif
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum11_HFA11(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA11 hfa)
         {
             return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 +
+#if NESTED_HFA
+                Sum_HFA03(hfa.hfa03) + Sum_HFA08(hfa.hfa08);
+#else
                 hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5 + hfa.f6 + hfa.f7 + hfa.f8 + hfa.f9 + hfa.f10 + hfa.f11;
+#endif
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum11_HFA19(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA19 hfa)
         {
             return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 +
+#if NESTED_HFA
+                Sum_HFA08(hfa.hfa08) + Sum_HFA11(hfa.hfa11);
+#else
                 hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5 + hfa.f6 + hfa.f7 + hfa.f8 + hfa.f9 + hfa.f10 + hfa.f11 + hfa.f12 + hfa.f13 + hfa.f14 + hfa.f15 + hfa.f16 + hfa.f17 + hfa.f18 + hfa.f19;
+#endif
         }
 
 
@@ -467,53 +784,105 @@ namespace HFATest
         // Sum19 methods
         // --------------------------------------------------------------
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum19_HFA01(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA01 hfa)
         {
             return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10 + (float)v11 + (float)v12 + (float)v13 +
                 hfa.f1;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum19_HFA02(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA02 hfa)
         {
             return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10 + (float)v11 + (float)v12 + (float)v13 +
+#if NESTED_HFA
+                Sum_HFA01(hfa.hfa01) + hfa.f2;
+#else
                 hfa.f1 + hfa.f2;
+#endif
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum19_HFA03(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA03 hfa)
         {
             return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10 + (float)v11 + (float)v12 + (float)v13 +
+#if NESTED_HFA
+                Sum_HFA01(hfa.hfa01) + Sum_HFA02(hfa.hfa02);
+#else
                 hfa.f1 + hfa.f2 + hfa.f3;
+#endif
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum19_HFA05(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA05 hfa)
         {
             return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10 + (float)v11 + (float)v12 + (float)v13 +
+#if NESTED_HFA
+                Sum_HFA02(hfa.hfa02) + Sum_HFA03(hfa.hfa03);
+#else
                 hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5;
+#endif
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum19_HFA08(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA08 hfa)
         {
             return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10 + (float)v11 + (float)v12 + (float)v13 +
+#if NESTED_HFA
+                Sum_HFA03(hfa.hfa03) + Sum_HFA05(hfa.hfa05);
+#else
                 hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5 + hfa.f6 + hfa.f7 + hfa.f8;
+#endif
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum19_HFA11(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA11 hfa)
         {
             return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10 + (float)v11 + (float)v12 + (float)v13 +
+#if NESTED_HFA
+                Sum_HFA03(hfa.hfa03) + Sum_HFA08(hfa.hfa08);
+#else
                 hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5 + hfa.f6 + hfa.f7 + hfa.f8 + hfa.f9 + hfa.f10 + hfa.f11;
+#endif
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Sum19_HFA19(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA19 hfa)
         {
             return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10 + (float)v11 + (float)v12 + (float)v13 +
+#if NESTED_HFA
+                Sum_HFA08(hfa.hfa08) + Sum_HFA11(hfa.hfa11);
+#else
                 hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5 + hfa.f6 + hfa.f7 + hfa.f8 + hfa.f9 + hfa.f10 + hfa.f11 + hfa.f12 + hfa.f13 + hfa.f14 + hfa.f15 + hfa.f16 + hfa.f17 + hfa.f18 + hfa.f19;
+#endif
         }
 
 
@@ -523,43 +892,71 @@ namespace HFATest
         // Average methods
         // --------------------------------------------------------------
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average_HFA01(HFA01 hfa)
         {
             return Sum_HFA01(hfa) / 1;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average_HFA02(HFA02 hfa)
         {
             return Sum_HFA02(hfa) / 2;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average_HFA03(HFA03 hfa)
         {
             return Sum_HFA03(hfa) / 3;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average_HFA05(HFA05 hfa)
         {
             return Sum_HFA05(hfa) / 5;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average_HFA08(HFA08 hfa)
         {
             return Sum_HFA08(hfa) / 8;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average_HFA11(HFA11 hfa)
         {
             return Sum_HFA11(hfa) / 11;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average_HFA19(HFA19 hfa)
         {
             return Sum_HFA19(hfa) / 19;
@@ -570,44 +967,72 @@ namespace HFATest
         // Average3 methods
         // --------------------------------------------------------------
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average3_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3)
         {
             return (Average_HFA01(hfa1) + Average_HFA01(hfa2) + Average_HFA01(hfa3)) / 3;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average3_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3)
         {
             return (Average_HFA02(hfa1) + Average_HFA02(hfa2) + Average_HFA02(hfa3)) / 3;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average3_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3)
         {
             return (Average_HFA03(hfa1) + Average_HFA03(hfa2) + Average_HFA03(hfa3)) / 3;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average3_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3)
         {
             return (Average_HFA05(hfa1) + Average_HFA05(hfa2) + Average_HFA05(hfa3)) / 3;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average3_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3)
         {
             return (Average_HFA08(hfa1) + Average_HFA08(hfa2) + Average_HFA08(hfa3)) / 3;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average3_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3)
         {
             return (Average_HFA11(hfa1) + Average_HFA11(hfa2) + Average_HFA11(hfa3)) / 3;
         }
 
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average3_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3)
         {
             return (Average_HFA19(hfa1) + Average_HFA19(hfa2) + Average_HFA19(hfa3)) / 3;
@@ -618,44 +1043,72 @@ namespace HFATest
         // Average5 methods
         // --------------------------------------------------------------
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average5_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5)
         {
             return ((Average3_HFA01(hfa1, hfa2, hfa3) * 3) + Average_HFA01(hfa4) + Average_HFA01(hfa5)) / 5;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average5_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5)
         {
             return ((Average3_HFA02(hfa1, hfa2, hfa3) * 3) + Average_HFA02(hfa4) + Average_HFA02(hfa5)) / 5;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average5_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5)
         {
             return ((Average3_HFA03(hfa1, hfa2, hfa3) * 3) + Average_HFA03(hfa4) + Average_HFA03(hfa5)) / 5;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average5_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5)
         {
             return ((Average3_HFA05(hfa1, hfa2, hfa3) * 3) + Average_HFA05(hfa4) + Average_HFA05(hfa5)) / 5;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average5_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5)
         {
             return ((Average3_HFA08(hfa1, hfa2, hfa3) * 3) + Average_HFA08(hfa4) + Average_HFA08(hfa5)) / 5;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average5_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5)
         {
             return ((Average3_HFA11(hfa1, hfa2, hfa3) * 3) + Average_HFA11(hfa4) + Average_HFA11(hfa5)) / 5;
         }
 
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average5_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5)
         {
             return ((Average3_HFA19(hfa1, hfa2, hfa3) * 3) + Average_HFA19(hfa4) + Average_HFA19(hfa5)) / 5;
@@ -666,44 +1119,72 @@ namespace HFATest
         // Average8 methods
         // --------------------------------------------------------------
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average8_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5, HFA01 hfa6, HFA01 hfa7, HFA01 hfa8)
         {
             return ((Average3_HFA01(hfa1, hfa2, hfa3) * 3) + (Average5_HFA01(hfa4, hfa5, hfa6, hfa7, hfa8) * 5)) / 8;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average8_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5, HFA02 hfa6, HFA02 hfa7, HFA02 hfa8)
         {
             return ((Average3_HFA02(hfa1, hfa2, hfa3) * 3) + (Average5_HFA02(hfa4, hfa5, hfa6, hfa7, hfa8) * 5)) / 8;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average8_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5, HFA03 hfa6, HFA03 hfa7, HFA03 hfa8)
         {
             return ((Average3_HFA03(hfa1, hfa2, hfa3) * 3) + (Average5_HFA03(hfa4, hfa5, hfa6, hfa7, hfa8) * 5)) / 8;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average8_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5, HFA05 hfa6, HFA05 hfa7, HFA05 hfa8)
         {
             return ((Average3_HFA05(hfa1, hfa2, hfa3) * 3) + (Average5_HFA05(hfa4, hfa5, hfa6, hfa7, hfa8) * 5)) / 8;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average8_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5, HFA08 hfa6, HFA08 hfa7, HFA08 hfa8)
         {
             return ((Average3_HFA08(hfa1, hfa2, hfa3) * 3) + (Average5_HFA08(hfa4, hfa5, hfa6, hfa7, hfa8) * 5)) / 8;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average8_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5, HFA11 hfa6, HFA11 hfa7, HFA11 hfa8)
         {
             return ((Average3_HFA11(hfa1, hfa2, hfa3) * 3) + (Average5_HFA11(hfa4, hfa5, hfa6, hfa7, hfa8) * 5)) / 8;
         }
 
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average8_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5, HFA19 hfa6, HFA19 hfa7, HFA19 hfa8)
         {
             return ((Average3_HFA19(hfa1, hfa2, hfa3) * 3) + (Average5_HFA19(hfa4, hfa5, hfa6, hfa7, hfa8) * 5)) / 8;
@@ -714,49 +1195,77 @@ namespace HFATest
         // Average11 methods
         // --------------------------------------------------------------
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average11_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5, HFA01 hfa6, HFA01 hfa7, HFA01 hfa8, HFA01 hfa9, HFA01 hfa10, HFA01 hfa11)
         {
             return ((Average3_HFA01(hfa1, hfa2, hfa3) * 3) + (Average8_HFA01(hfa4, hfa5, hfa6, hfa7, hfa8, hfa9, hfa10, hfa11) * 8)) / 11;
         }
 
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average11_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5, HFA02 hfa6, HFA02 hfa7, HFA02 hfa8, HFA02 hfa9, HFA02 hfa10, HFA02 hfa11)
         {
             return ((Average3_HFA02(hfa1, hfa2, hfa3) * 3) + (Average8_HFA02(hfa4, hfa5, hfa6, hfa7, hfa8, hfa9, hfa10, hfa11) * 8)) / 11;
         }
 
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average11_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5, HFA03 hfa6, HFA03 hfa7, HFA03 hfa8, HFA03 hfa9, HFA03 hfa10, HFA03 hfa11)
         {
             return ((Average3_HFA03(hfa1, hfa2, hfa3) * 3) + (Average8_HFA03(hfa4, hfa5, hfa6, hfa7, hfa8, hfa9, hfa10, hfa11) * 8)) / 11;
         }
 
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average11_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5, HFA05 hfa6, HFA05 hfa7, HFA05 hfa8, HFA05 hfa9, HFA05 hfa10, HFA05 hfa11)
         {
             return ((Average3_HFA05(hfa1, hfa2, hfa3) * 3) + (Average8_HFA05(hfa4, hfa5, hfa6, hfa7, hfa8, hfa9, hfa10, hfa11) * 8)) / 11;
         }
 
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average11_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5, HFA08 hfa6, HFA08 hfa7, HFA08 hfa8, HFA08 hfa9, HFA08 hfa10, HFA08 hfa11)
         {
             return ((Average3_HFA08(hfa1, hfa2, hfa3) * 3) + (Average8_HFA08(hfa4, hfa5, hfa6, hfa7, hfa8, hfa9, hfa10, hfa11) * 8)) / 11;
         }
 
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average11_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5, HFA11 hfa6, HFA11 hfa7, HFA11 hfa8, HFA11 hfa9, HFA11 hfa10, HFA11 hfa11)
         {
             return ((Average3_HFA11(hfa1, hfa2, hfa3) * 3) + (Average8_HFA11(hfa4, hfa5, hfa6, hfa7, hfa8, hfa9, hfa10, hfa11) * 8)) / 11;
         }
 
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average11_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5, HFA19 hfa6, HFA19 hfa7, HFA19 hfa8, HFA19 hfa9, HFA19 hfa10, HFA19 hfa11)
         {
             return ((Average3_HFA19(hfa1, hfa2, hfa3) * 3) + (Average8_HFA19(hfa4, hfa5, hfa6, hfa7, hfa8, hfa9, hfa10, hfa11) * 8)) / 11;
@@ -768,49 +1277,77 @@ namespace HFATest
         // Average19 methods
         // --------------------------------------------------------------
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average19_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5, HFA01 hfa6, HFA01 hfa7, HFA01 hfa8, HFA01 hfa9, HFA01 hfa10, HFA01 hfa11, HFA01 hfa12, HFA01 hfa13, HFA01 hfa14, HFA01 hfa15, HFA01 hfa16, HFA01 hfa17, HFA01 hfa18, HFA01 hfa19)
         {
             return ((Average8_HFA01(hfa1, hfa2, hfa3, hfa4, hfa5, hfa6, hfa7, hfa8) * 8) + (Average11_HFA01(hfa9, hfa10, hfa11, hfa12, hfa13, hfa14, hfa15, hfa16, hfa17, hfa18, hfa19) * 11)) / 19;
         }
 
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average19_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5, HFA02 hfa6, HFA02 hfa7, HFA02 hfa8, HFA02 hfa9, HFA02 hfa10, HFA02 hfa11, HFA02 hfa12, HFA02 hfa13, HFA02 hfa14, HFA02 hfa15, HFA02 hfa16, HFA02 hfa17, HFA02 hfa18, HFA02 hfa19)
         {
             return ((Average8_HFA02(hfa1, hfa2, hfa3, hfa4, hfa5, hfa6, hfa7, hfa8) * 8) + (Average11_HFA02(hfa9, hfa10, hfa11, hfa12, hfa13, hfa14, hfa15, hfa16, hfa17, hfa18, hfa19) * 11)) / 19;
         }
 
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average19_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5, HFA03 hfa6, HFA03 hfa7, HFA03 hfa8, HFA03 hfa9, HFA03 hfa10, HFA03 hfa11, HFA03 hfa12, HFA03 hfa13, HFA03 hfa14, HFA03 hfa15, HFA03 hfa16, HFA03 hfa17, HFA03 hfa18, HFA03 hfa19)
         {
             return ((Average8_HFA03(hfa1, hfa2, hfa3, hfa4, hfa5, hfa6, hfa7, hfa8) * 8) + (Average11_HFA03(hfa9, hfa10, hfa11, hfa12, hfa13, hfa14, hfa15, hfa16, hfa17, hfa18, hfa19) * 11)) / 19;
         }
 
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average19_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5, HFA05 hfa6, HFA05 hfa7, HFA05 hfa8, HFA05 hfa9, HFA05 hfa10, HFA05 hfa11, HFA05 hfa12, HFA05 hfa13, HFA05 hfa14, HFA05 hfa15, HFA05 hfa16, HFA05 hfa17, HFA05 hfa18, HFA05 hfa19)
         {
             return ((Average8_HFA05(hfa1, hfa2, hfa3, hfa4, hfa5, hfa6, hfa7, hfa8) * 8) + (Average11_HFA05(hfa9, hfa10, hfa11, hfa12, hfa13, hfa14, hfa15, hfa16, hfa17, hfa18, hfa19) * 11)) / 19;
         }
 
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average19_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5, HFA08 hfa6, HFA08 hfa7, HFA08 hfa8, HFA08 hfa9, HFA08 hfa10, HFA08 hfa11, HFA08 hfa12, HFA08 hfa13, HFA08 hfa14, HFA08 hfa15, HFA08 hfa16, HFA08 hfa17, HFA08 hfa18, HFA08 hfa19)
         {
             return ((Average8_HFA08(hfa1, hfa2, hfa3, hfa4, hfa5, hfa6, hfa7, hfa8) * 8) + (Average11_HFA08(hfa9, hfa10, hfa11, hfa12, hfa13, hfa14, hfa15, hfa16, hfa17, hfa18, hfa19) * 11)) / 19;
         }
 
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average19_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5, HFA11 hfa6, HFA11 hfa7, HFA11 hfa8, HFA11 hfa9, HFA11 hfa10, HFA11 hfa11, HFA11 hfa12, HFA11 hfa13, HFA11 hfa14, HFA11 hfa15, HFA11 hfa16, HFA11 hfa17, HFA11 hfa18, HFA11 hfa19)
         {
             return ((Average8_HFA11(hfa1, hfa2, hfa3, hfa4, hfa5, hfa6, hfa7, hfa8) * 8) + (Average11_HFA11(hfa9, hfa10, hfa11, hfa12, hfa13, hfa14, hfa15, hfa16, hfa17, hfa18, hfa19) * 11)) / 19;
         }
 
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Average19_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5, HFA19 hfa6, HFA19 hfa7, HFA19 hfa8, HFA19 hfa9, HFA19 hfa10, HFA19 hfa11, HFA19 hfa12, HFA19 hfa13, HFA19 hfa14, HFA19 hfa15, HFA19 hfa16, HFA19 hfa17, HFA19 hfa18, HFA19 hfa19)
         {
             return ((Average8_HFA19(hfa1, hfa2, hfa3, hfa4, hfa5, hfa6, hfa7, hfa8) * 8) + (Average11_HFA19(hfa9, hfa10, hfa11, hfa12, hfa13, hfa14, hfa15, hfa16, hfa17, hfa18, hfa19) * 11)) / 19;
@@ -823,49 +1360,81 @@ namespace HFATest
         // Add01 methods
         // --------------------------------------------------------------
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Add01_HFA01(HFA01 hfa1, float v1, HFA01 hfa2, int v2, HFA01 hfa3, short v3, double v4, HFA01 hfa4, HFA01 hfa5, float v5, long v6, float v7, HFA01 hfa6, float v8, HFA01 hfa7)
         {
             return (Sum_HFA01(hfa1) + Sum_HFA01(hfa2) + Sum_HFA01(hfa3) + Sum_HFA01(hfa4) + Sum_HFA01(hfa5) + Sum_HFA01(hfa6) + Sum_HFA01(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Add01_HFA02(HFA02 hfa1, float v1, HFA02 hfa2, int v2, HFA02 hfa3, short v3, double v4, HFA02 hfa4, HFA02 hfa5, float v5, long v6, float v7, HFA02 hfa6, float v8, HFA02 hfa7)
         {
             return (Sum_HFA02(hfa1) + Sum_HFA02(hfa2) + Sum_HFA02(hfa3) + Sum_HFA02(hfa4) + Sum_HFA02(hfa5) + Sum_HFA02(hfa6) + Sum_HFA02(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Add01_HFA03(HFA03 hfa1, float v1, HFA03 hfa2, int v2, HFA03 hfa3, short v3, double v4, HFA03 hfa4, HFA03 hfa5, float v5, long v6, float v7, HFA03 hfa6, float v8, HFA03 hfa7)
         {
             return (Sum_HFA03(hfa1) + Sum_HFA03(hfa2) + Sum_HFA03(hfa3) + Sum_HFA03(hfa4) + Sum_HFA03(hfa5) + Sum_HFA03(hfa6) + Sum_HFA03(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Add01_HFA05(HFA05 hfa1, float v1, HFA05 hfa2, int v2, HFA05 hfa3, short v3, double v4, HFA05 hfa4, HFA05 hfa5, float v5, long v6, float v7, HFA05 hfa6, float v8, HFA05 hfa7)
         {
             return (Sum_HFA05(hfa1) + Sum_HFA05(hfa2) + Sum_HFA05(hfa3) + Sum_HFA05(hfa4) + Sum_HFA05(hfa5) + Sum_HFA05(hfa6) + Sum_HFA05(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Add01_HFA08(HFA08 hfa1, float v1, HFA08 hfa2, int v2, HFA08 hfa3, short v3, double v4, HFA08 hfa4, HFA08 hfa5, float v5, long v6, float v7, HFA08 hfa6, float v8, HFA08 hfa7)
         {
             return (Sum_HFA08(hfa1) + Sum_HFA08(hfa2) + Sum_HFA08(hfa3) + Sum_HFA08(hfa4) + Sum_HFA08(hfa5) + Sum_HFA08(hfa6) + Sum_HFA08(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Add01_HFA11(HFA11 hfa1, float v1, HFA11 hfa2, int v2, HFA11 hfa3, short v3, double v4, HFA11 hfa4, HFA11 hfa5, float v5, long v6, float v7, HFA11 hfa6, float v8, HFA11 hfa7)
         {
             return (Sum_HFA11(hfa1) + Sum_HFA11(hfa2) + Sum_HFA11(hfa3) + Sum_HFA11(hfa4) + Sum_HFA11(hfa5) + Sum_HFA11(hfa6) + Sum_HFA11(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Add01_HFA19(HFA19 hfa1, float v1, HFA19 hfa2, int v2, HFA19 hfa3, short v3, double v4, HFA19 hfa4, HFA19 hfa5, float v5, long v6, float v7, HFA19 hfa6, float v8, HFA19 hfa7)
         {
             return (Sum_HFA19(hfa1) + Sum_HFA19(hfa2) + Sum_HFA19(hfa3) + Sum_HFA19(hfa4) + Sum_HFA19(hfa5) + Sum_HFA19(hfa6) + Sum_HFA19(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Add01_HFA00(HFA03 hfa1, float v1, HFA02 hfa2, int v2, HFA19 hfa3, short v3, double v4, HFA05 hfa4, HFA08 hfa5, float v5, long v6, float v7, HFA11 hfa6, float v8, HFA01 hfa7)
         {
             return (Sum_HFA03(hfa1) + Sum_HFA02(hfa2) + Sum_HFA19(hfa3) + Sum_HFA05(hfa4) + Sum_HFA08(hfa5) + Sum_HFA11(hfa6) + Sum_HFA01(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8;
@@ -876,50 +1445,82 @@ namespace HFATest
         // Add02 methods
         // --------------------------------------------------------------
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Add02_HFA01(HFA01 hfa1, HFA01 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA01 hfa3, double v7, float v8, HFA01 hfa4, short v9, HFA01 hfa5, float v10, HFA01 hfa6, HFA01 hfa7)
         {
             return (Sum_HFA01(hfa1) + Sum_HFA01(hfa2) + Sum_HFA01(hfa3) + Sum_HFA01(hfa4) + Sum_HFA01(hfa5) + Sum_HFA01(hfa6) + Sum_HFA01(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Add02_HFA02(HFA02 hfa1, HFA02 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA02 hfa3, double v7, float v8, HFA02 hfa4, short v9, HFA02 hfa5, float v10, HFA02 hfa6, HFA02 hfa7)
         {
             return (Sum_HFA02(hfa1) + Sum_HFA02(hfa2) + Sum_HFA02(hfa3) + Sum_HFA02(hfa4) + Sum_HFA02(hfa5) + Sum_HFA02(hfa6) + Sum_HFA02(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Add02_HFA03(HFA03 hfa1, HFA03 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA03 hfa3, double v7, float v8, HFA03 hfa4, short v9, HFA03 hfa5, float v10, HFA03 hfa6, HFA03 hfa7)
         {
             return (Sum_HFA03(hfa1) + Sum_HFA03(hfa2) + Sum_HFA03(hfa3) + Sum_HFA03(hfa4) + Sum_HFA03(hfa5) + Sum_HFA03(hfa6) + Sum_HFA03(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Add02_HFA05(HFA05 hfa1, HFA05 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA05 hfa3, double v7, float v8, HFA05 hfa4, short v9, HFA05 hfa5, float v10, HFA05 hfa6, HFA05 hfa7)
         {
             return (Sum_HFA05(hfa1) + Sum_HFA05(hfa2) + Sum_HFA05(hfa3) + Sum_HFA05(hfa4) + Sum_HFA05(hfa5) + Sum_HFA05(hfa6) + Sum_HFA05(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Add02_HFA08(HFA08 hfa1, HFA08 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA08 hfa3, double v7, float v8, HFA08 hfa4, short v9, HFA08 hfa5, float v10, HFA08 hfa6, HFA08 hfa7)
         {
             return (Sum_HFA08(hfa1) + Sum_HFA08(hfa2) + Sum_HFA08(hfa3) + Sum_HFA08(hfa4) + Sum_HFA08(hfa5) + Sum_HFA08(hfa6) + Sum_HFA08(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Add02_HFA11(HFA11 hfa1, HFA11 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA11 hfa3, double v7, float v8, HFA11 hfa4, short v9, HFA11 hfa5, float v10, HFA11 hfa6, HFA11 hfa7)
         {
             return (Sum_HFA11(hfa1) + Sum_HFA11(hfa2) + Sum_HFA11(hfa3) + Sum_HFA11(hfa4) + Sum_HFA11(hfa5) + Sum_HFA11(hfa6) + Sum_HFA11(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
         }
 
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Add02_HFA19(HFA19 hfa1, HFA19 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA19 hfa3, double v7, float v8, HFA19 hfa4, short v9, HFA19 hfa5, float v10, HFA19 hfa6, HFA19 hfa7)
         {
             return (Sum_HFA19(hfa1) + Sum_HFA19(hfa2) + Sum_HFA19(hfa3) + Sum_HFA19(hfa4) + Sum_HFA19(hfa5) + Sum_HFA19(hfa6) + Sum_HFA19(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Add02_HFA00(HFA01 hfa1, HFA05 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA03 hfa3, double v7, float v8, HFA11 hfa4, short v9, HFA19 hfa5, float v10, HFA08 hfa6, HFA02 hfa7)
         {
             return (Sum_HFA01(hfa1) + Sum_HFA05(hfa2) + Sum_HFA03(hfa3) + Sum_HFA11(hfa4) + Sum_HFA19(hfa5) + Sum_HFA08(hfa6) + Sum_HFA02(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
@@ -930,54 +1531,84 @@ namespace HFATest
         // Add03 methods
         // --------------------------------------------------------------
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Add03_HFA01(float v1, sbyte v2, HFA01 hfa1, double v3, sbyte v4, HFA01 hfa2, long v5, short v6, int v7, HFA01 hfa3, HFA01 hfa4, float v8, HFA01 hfa5, float v9, HFA01 hfa6, float v10, HFA01 hfa7)
         {
             return (Sum_HFA01(hfa1) + Sum_HFA01(hfa2) + Sum_HFA01(hfa3) + Sum_HFA01(hfa4) + Sum_HFA01(hfa5) + Sum_HFA01(hfa6) + Sum_HFA01(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Add03_HFA02(float v1, sbyte v2, HFA02 hfa1, double v3, sbyte v4, HFA02 hfa2, long v5, short v6, int v7, HFA02 hfa3, HFA02 hfa4, float v8, HFA02 hfa5, float v9, HFA02 hfa6, float v10, HFA02 hfa7)
         {
             return (Sum_HFA02(hfa1) + Sum_HFA02(hfa2) + Sum_HFA02(hfa3) + Sum_HFA02(hfa4) + Sum_HFA02(hfa5) + Sum_HFA02(hfa6) + Sum_HFA02(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Add03_HFA03(float v1, sbyte v2, HFA03 hfa1, double v3, sbyte v4, HFA03 hfa2, long v5, short v6, int v7, HFA03 hfa3, HFA03 hfa4, float v8, HFA03 hfa5, float v9, HFA03 hfa6, float v10, HFA03 hfa7)
         {
             return (Sum_HFA03(hfa1) + Sum_HFA03(hfa2) + Sum_HFA03(hfa3) + Sum_HFA03(hfa4) + Sum_HFA03(hfa5) + Sum_HFA03(hfa6) + Sum_HFA03(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Add03_HFA05(float v1, sbyte v2, HFA05 hfa1, double v3, sbyte v4, HFA05 hfa2, long v5, short v6, int v7, HFA05 hfa3, HFA05 hfa4, float v8, HFA05 hfa5, float v9, HFA05 hfa6, float v10, HFA05 hfa7)
         {
             return (Sum_HFA05(hfa1) + Sum_HFA05(hfa2) + Sum_HFA05(hfa3) + Sum_HFA05(hfa4) + Sum_HFA05(hfa5) + Sum_HFA05(hfa6) + Sum_HFA05(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Add03_HFA08(float v1, sbyte v2, HFA08 hfa1, double v3, sbyte v4, HFA08 hfa2, long v5, short v6, int v7, HFA08 hfa3, HFA08 hfa4, float v8, HFA08 hfa5, float v9, HFA08 hfa6, float v10, HFA08 hfa7)
         {
             return (Sum_HFA08(hfa1) + Sum_HFA08(hfa2) + Sum_HFA08(hfa3) + Sum_HFA08(hfa4) + Sum_HFA08(hfa5) + Sum_HFA08(hfa6) + Sum_HFA08(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Add03_HFA11(float v1, sbyte v2, HFA11 hfa1, double v3, sbyte v4, HFA11 hfa2, long v5, short v6, int v7, HFA11 hfa3, HFA11 hfa4, float v8, HFA11 hfa5, float v9, HFA11 hfa6, float v10, HFA11 hfa7)
         {
             return (Sum_HFA11(hfa1) + Sum_HFA11(hfa2) + Sum_HFA11(hfa3) + Sum_HFA11(hfa4) + Sum_HFA11(hfa5) + Sum_HFA11(hfa6) + Sum_HFA11(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Add03_HFA19(float v1, sbyte v2, HFA19 hfa1, double v3, sbyte v4, HFA19 hfa2, long v5, short v6, int v7, HFA19 hfa3, HFA19 hfa4, float v8, HFA19 hfa5, float v9, HFA19 hfa6, float v10, HFA19 hfa7)
         {
             return (Sum_HFA19(hfa1) + Sum_HFA19(hfa2) + Sum_HFA19(hfa3) + Sum_HFA19(hfa4) + Sum_HFA19(hfa5) + Sum_HFA19(hfa6) + Sum_HFA19(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
         }
 
+#if FLOAT64
         public static double
+#else
+        public static float
+#endif
             Add03_HFA00(float v1, sbyte v2, HFA08 hfa1, double v3, sbyte v4, HFA19 hfa2, long v5, short v6, int v7, HFA03 hfa3, HFA01 hfa4, float v8, HFA11 hfa5, float v9, HFA02 hfa6, float v10, HFA05 hfa7)
         {
             return (Sum_HFA08(hfa1) + Sum_HFA19(hfa2) + Sum_HFA03(hfa3) + Sum_HFA01(hfa4) + Sum_HFA11(hfa5) + Sum_HFA02(hfa6) + Sum_HFA05(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
         }
-
-
     }
 }
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_managed_nd.cs b/tests/src/JIT/jit64/hfa/main/dll/hfa_managed_nd.cs
deleted file mode 100644
index 689f9434e4..0000000000
--- a/tests/src/JIT/jit64/hfa/main/dll/hfa_managed_nd.cs
+++ /dev/null
@@ -1,946 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace HFATest
-{
-
-    public class TestMan
-    {
-
-        public const double EXPECTED_SUM_HFA01 = 1;
-        public const double EXPECTED_SUM_HFA02 = 3;
-        public const double EXPECTED_SUM_HFA03 = 4;
-        public const double EXPECTED_SUM_HFA05 = 7;
-        public const double EXPECTED_SUM_HFA08 = 11;
-        public const double EXPECTED_SUM_HFA11 = 15;
-        public const double EXPECTED_SUM_HFA19 = 26;
-
-
-        // --------------------------------------------------------------
-        // Init methods
-        // --------------------------------------------------------------
-
-        public static void Init_HFA01(out HFA01 hfa)
-        {
-            hfa.f1 = 1;
-        }
-
-        public static void Init_HFA02(out HFA02 hfa)
-        {
-            Init_HFA01(out hfa.hfa01);
-            hfa.f2 = 2;
-        }
-
-        public static void Init_HFA03(out HFA03 hfa)
-        {
-            Init_HFA01(out hfa.hfa01);
-            Init_HFA02(out hfa.hfa02);
-        }
-
-        public static void Init_HFA05(out HFA05 hfa)
-        {
-            Init_HFA02(out hfa.hfa02);
-            Init_HFA03(out hfa.hfa03);
-        }
-
-        public static void Init_HFA08(out HFA08 hfa)
-        {
-            Init_HFA03(out hfa.hfa03);
-            Init_HFA05(out hfa.hfa05);
-        }
-
-        public static void Init_HFA11(out HFA11 hfa)
-        {
-            Init_HFA03(out hfa.hfa03);
-            Init_HFA08(out hfa.hfa08);
-        }
-
-        public static void Init_HFA19(out HFA19 hfa)
-        {
-            Init_HFA08(out hfa.hfa08);
-            Init_HFA11(out hfa.hfa11);
-        }
-
-
-
-        // --------------------------------------------------------------
-        // Identity methods
-        // --------------------------------------------------------------
-
-        public static HFA01 Identity_HFA01(HFA01 hfa)
-        {
-            return hfa;
-        }
-
-        public static HFA02 Identity_HFA02(HFA02 hfa)
-        {
-            return hfa;
-        }
-
-        public static HFA03 Identity_HFA03(HFA03 hfa)
-        {
-            return hfa;
-        }
-
-        public static HFA05 Identity_HFA05(HFA05 hfa)
-        {
-            return hfa;
-        }
-
-        public static HFA08 Identity_HFA08(HFA08 hfa)
-        {
-            return hfa;
-        }
-
-        public static HFA11 Identity_HFA11(HFA11 hfa)
-        {
-            return hfa;
-        }
-
-        public static HFA19 Identity_HFA19(HFA19 hfa)
-        {
-            return hfa;
-        }
-
-
-        // --------------------------------------------------------------
-        // Get methods
-        // --------------------------------------------------------------
-
-        public static HFA01 Get_HFA01()
-        {
-            HFA01 hfa;
-            Init_HFA01(out hfa);
-            return hfa;
-        }
-
-        public static HFA02 Get_HFA02()
-        {
-            HFA02 hfa;
-            Init_HFA02(out hfa);
-            return hfa;
-        }
-
-        public static HFA03 Get_HFA03()
-        {
-            HFA03 hfa;
-            Init_HFA03(out hfa);
-            return hfa;
-        }
-
-        public static HFA05 Get_HFA05()
-        {
-            HFA05 hfa;
-            Init_HFA05(out hfa);
-            return hfa;
-        }
-
-        public static HFA08 Get_HFA08()
-        {
-            HFA08 hfa;
-            Init_HFA08(out hfa);
-            return hfa;
-        }
-
-        public static HFA11 Get_HFA11()
-        {
-            HFA11 hfa;
-            Init_HFA11(out hfa);
-            return hfa;
-        }
-
-        public static HFA19 Get_HFA19()
-        {
-            HFA19 hfa;
-            Init_HFA19(out hfa);
-            return hfa;
-        }
-
-
-        // --------------------------------------------------------------
-        // Sum methods
-        // --------------------------------------------------------------
-
-        public static double
-            Sum_HFA01(HFA01 hfa)
-        {
-            return hfa.f1;
-        }
-
-        public static double
-            Sum_HFA02(HFA02 hfa)
-        {
-            return Sum_HFA01(hfa.hfa01) + hfa.f2;
-        }
-
-        public static double
-            Sum_HFA03(HFA03 hfa)
-        {
-            return Sum_HFA01(hfa.hfa01) + Sum_HFA02(hfa.hfa02);
-        }
-
-        public static double
-            Sum_HFA05(HFA05 hfa)
-        {
-            return Sum_HFA02(hfa.hfa02) + Sum_HFA03(hfa.hfa03);
-        }
-
-        public static double
-            Sum_HFA08(HFA08 hfa)
-        {
-            return Sum_HFA03(hfa.hfa03) + Sum_HFA05(hfa.hfa05);
-        }
-
-        public static double
-            Sum_HFA11(HFA11 hfa)
-        {
-            return Sum_HFA03(hfa.hfa03) + Sum_HFA08(hfa.hfa08);
-        }
-
-
-        public static double
-            Sum_HFA19(HFA19 hfa)
-        {
-            return Sum_HFA08(hfa.hfa08) + Sum_HFA11(hfa.hfa11);
-        }
-
-
-
-        // --------------------------------------------------------------
-        // Sum3 methods
-        // --------------------------------------------------------------
-
-        public static double
-            Sum3_HFA01(float v1, long v2, HFA01 hfa)
-        {
-            return (float)v1 + (float)v2 + hfa.f1;
-        }
-
-        public static double
-            Sum3_HFA02(float v1, long v2, HFA02 hfa)
-        {
-            return (float)v1 + (float)v2 +
-                Sum_HFA01(hfa.hfa01) + hfa.f2;
-        }
-
-        public static double
-            Sum3_HFA03(float v1, long v2, HFA03 hfa)
-        {
-            return (float)v1 + (float)v2 +
-                Sum_HFA01(hfa.hfa01) + Sum_HFA02(hfa.hfa02);
-        }
-
-        public static double
-            Sum3_HFA05(float v1, long v2, HFA05 hfa)
-        {
-            return (float)v1 + (float)v2 +
-                Sum_HFA02(hfa.hfa02) + Sum_HFA03(hfa.hfa03);
-        }
-
-        public static double
-            Sum3_HFA08(float v1, long v2, HFA08 hfa)
-        {
-            return (float)v1 + (float)v2 +
-                Sum_HFA03(hfa.hfa03) + Sum_HFA05(hfa.hfa05);
-        }
-
-        public static double
-            Sum3_HFA11(float v1, long v2, HFA11 hfa)
-        {
-            return (float)v1 + (float)v2 +
-                Sum_HFA03(hfa.hfa03) + Sum_HFA08(hfa.hfa08);
-        }
-
-        public static double
-            Sum3_HFA19(float v1, long v2, HFA19 hfa)
-        {
-            return (float)v1 + (float)v2 +
-                Sum_HFA08(hfa.hfa08) + Sum_HFA11(hfa.hfa11);
-        }
-
-
-
-        // --------------------------------------------------------------
-        // Sum5 methods
-        // --------------------------------------------------------------
-
-        public static double
-            Sum5_HFA01(long v1, double v2, int v3, sbyte v4, HFA01 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 +
-                hfa.f1;
-        }
-
-        public static double
-            Sum5_HFA02(long v1, double v2, int v3, sbyte v4, HFA02 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 +
-                Sum_HFA01(hfa.hfa01) + hfa.f2;
-        }
-
-        public static double
-            Sum5_HFA03(long v1, double v2, int v3, sbyte v4, HFA03 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 +
-                Sum_HFA01(hfa.hfa01) + Sum_HFA02(hfa.hfa02);
-        }
-
-        public static double
-            Sum5_HFA05(long v1, double v2, int v3, sbyte v4, HFA05 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 +
-                Sum_HFA02(hfa.hfa02) + Sum_HFA03(hfa.hfa03);
-        }
-
-        public static double
-            Sum5_HFA08(long v1, double v2, int v3, sbyte v4, HFA08 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 +
-                Sum_HFA03(hfa.hfa03) + Sum_HFA05(hfa.hfa05);
-        }
-
-        public static double
-            Sum5_HFA11(long v1, double v2, int v3, sbyte v4, HFA11 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 +
-                Sum_HFA03(hfa.hfa03) + Sum_HFA08(hfa.hfa08);
-        }
-
-        public static double
-            Sum5_HFA19(long v1, double v2, int v3, sbyte v4, HFA19 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 +
-                Sum_HFA08(hfa.hfa08) + Sum_HFA11(hfa.hfa11);
-        }
-
-
-
-        // --------------------------------------------------------------
-        // Sum8 methods
-        // --------------------------------------------------------------
-
-        public static double
-            Sum8_HFA01(float v1, double v2, long v3, sbyte v4, double v5, HFA01 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 +
-                hfa.f1;
-        }
-
-        public static double
-            Sum8_HFA02(float v1, double v2, long v3, sbyte v4, double v5, HFA02 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 +
-                Sum_HFA01(hfa.hfa01) + hfa.f2;
-        }
-
-        public static double
-            Sum8_HFA03(float v1, double v2, long v3, sbyte v4, double v5, HFA03 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 +
-                Sum_HFA01(hfa.hfa01) + Sum_HFA02(hfa.hfa02);
-        }
-
-        public static double
-            Sum8_HFA05(float v1, double v2, long v3, sbyte v4, double v5, HFA05 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 +
-                Sum_HFA02(hfa.hfa02) + Sum_HFA03(hfa.hfa03);
-        }
-
-        public static double
-            Sum8_HFA08(float v1, double v2, long v3, sbyte v4, double v5, HFA08 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 +
-                Sum_HFA03(hfa.hfa03) + Sum_HFA05(hfa.hfa05);
-        }
-
-        public static double
-            Sum8_HFA11(float v1, double v2, long v3, sbyte v4, double v5, HFA11 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 +
-                Sum_HFA03(hfa.hfa03) + Sum_HFA08(hfa.hfa08);
-        }
-
-        public static double
-            Sum8_HFA19(float v1, double v2, long v3, sbyte v4, double v5, HFA19 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 +
-                Sum_HFA08(hfa.hfa08) + Sum_HFA11(hfa.hfa11);
-        }
-
-
-
-        // --------------------------------------------------------------
-        // Sum11 methods
-        // --------------------------------------------------------------
-
-        public static double
-            Sum11_HFA01(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA01 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 +
-                hfa.f1;
-        }
-
-        public static double
-            Sum11_HFA02(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA02 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 +
-                Sum_HFA01(hfa.hfa01) + hfa.f2;
-        }
-
-        public static double
-            Sum11_HFA03(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA03 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 +
-                Sum_HFA01(hfa.hfa01) + Sum_HFA02(hfa.hfa02);
-        }
-
-        public static double
-            Sum11_HFA05(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA05 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 +
-                Sum_HFA02(hfa.hfa02) + Sum_HFA03(hfa.hfa03);
-        }
-
-        public static double
-            Sum11_HFA08(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA08 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 +
-                Sum_HFA03(hfa.hfa03) + Sum_HFA05(hfa.hfa05);
-        }
-
-        public static double
-            Sum11_HFA11(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA11 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 +
-                Sum_HFA03(hfa.hfa03) + Sum_HFA08(hfa.hfa08);
-        }
-
-        public static double
-            Sum11_HFA19(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA19 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 +
-                Sum_HFA08(hfa.hfa08) + Sum_HFA11(hfa.hfa11);
-        }
-
-
-
-        // --------------------------------------------------------------
-        // Sum19 methods
-        // --------------------------------------------------------------
-
-        public static double
-            Sum19_HFA01(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA01 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10 + (float)v11 + (float)v12 + (float)v13 +
-                hfa.f1;
-        }
-
-        public static double
-            Sum19_HFA02(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA02 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10 + (float)v11 + (float)v12 + (float)v13 +
-                Sum_HFA01(hfa.hfa01) + hfa.f2;
-        }
-
-        public static double
-            Sum19_HFA03(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA03 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10 + (float)v11 + (float)v12 + (float)v13 +
-                Sum_HFA01(hfa.hfa01) + Sum_HFA02(hfa.hfa02);
-        }
-
-        public static double
-            Sum19_HFA05(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA05 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10 + (float)v11 + (float)v12 + (float)v13 +
-                Sum_HFA02(hfa.hfa02) + Sum_HFA03(hfa.hfa03);
-        }
-
-        public static double
-            Sum19_HFA08(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA08 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10 + (float)v11 + (float)v12 + (float)v13 +
-                Sum_HFA03(hfa.hfa03) + Sum_HFA05(hfa.hfa05);
-        }
-
-        public static double
-            Sum19_HFA11(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA11 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10 + (float)v11 + (float)v12 + (float)v13 +
-                Sum_HFA03(hfa.hfa03) + Sum_HFA08(hfa.hfa08);
-        }
-
-        public static double
-            Sum19_HFA19(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA19 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10 + (float)v11 + (float)v12 + (float)v13 +
-                Sum_HFA08(hfa.hfa08) + Sum_HFA11(hfa.hfa11);
-        }
-
-
-
-
-        // --------------------------------------------------------------
-        // Average methods
-        // --------------------------------------------------------------
-
-        public static double
-            Average_HFA01(HFA01 hfa)
-        {
-            return Sum_HFA01(hfa) / 1;
-        }
-
-        public static double
-            Average_HFA02(HFA02 hfa)
-        {
-            return Sum_HFA02(hfa) / 2;
-        }
-
-        public static double
-            Average_HFA03(HFA03 hfa)
-        {
-            return Sum_HFA03(hfa) / 3;
-        }
-
-        public static double
-            Average_HFA05(HFA05 hfa)
-        {
-            return Sum_HFA05(hfa) / 5;
-        }
-
-        public static double
-            Average_HFA08(HFA08 hfa)
-        {
-            return Sum_HFA08(hfa) / 8;
-        }
-
-        public static double
-            Average_HFA11(HFA11 hfa)
-        {
-            return Sum_HFA11(hfa) / 11;
-        }
-
-        public static double
-            Average_HFA19(HFA19 hfa)
-        {
-            return Sum_HFA19(hfa) / 19;
-        }
-
-
-        // --------------------------------------------------------------
-        // Average3 methods
-        // --------------------------------------------------------------
-
-        public static double
-            Average3_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3)
-        {
-            return (Average_HFA01(hfa1) + Average_HFA01(hfa2) + Average_HFA01(hfa3)) / 3;
-        }
-
-        public static double
-            Average3_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3)
-        {
-            return (Average_HFA02(hfa1) + Average_HFA02(hfa2) + Average_HFA02(hfa3)) / 3;
-        }
-
-        public static double
-            Average3_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3)
-        {
-            return (Average_HFA03(hfa1) + Average_HFA03(hfa2) + Average_HFA03(hfa3)) / 3;
-        }
-
-        public static double
-            Average3_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3)
-        {
-            return (Average_HFA05(hfa1) + Average_HFA05(hfa2) + Average_HFA05(hfa3)) / 3;
-        }
-
-        public static double
-            Average3_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3)
-        {
-            return (Average_HFA08(hfa1) + Average_HFA08(hfa2) + Average_HFA08(hfa3)) / 3;
-        }
-
-        public static double
-            Average3_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3)
-        {
-            return (Average_HFA11(hfa1) + Average_HFA11(hfa2) + Average_HFA11(hfa3)) / 3;
-        }
-
-
-        public static double
-            Average3_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3)
-        {
-            return (Average_HFA19(hfa1) + Average_HFA19(hfa2) + Average_HFA19(hfa3)) / 3;
-        }
-
-
-        // --------------------------------------------------------------
-        // Average5 methods
-        // --------------------------------------------------------------
-
-        public static double
-            Average5_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5)
-        {
-            return ((Average3_HFA01(hfa1, hfa2, hfa3) * 3) + Average_HFA01(hfa4) + Average_HFA01(hfa5)) / 5;
-        }
-
-        public static double
-            Average5_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5)
-        {
-            return ((Average3_HFA02(hfa1, hfa2, hfa3) * 3) + Average_HFA02(hfa4) + Average_HFA02(hfa5)) / 5;
-        }
-
-        public static double
-            Average5_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5)
-        {
-            return ((Average3_HFA03(hfa1, hfa2, hfa3) * 3) + Average_HFA03(hfa4) + Average_HFA03(hfa5)) / 5;
-        }
-
-        public static double
-            Average5_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5)
-        {
-            return ((Average3_HFA05(hfa1, hfa2, hfa3) * 3) + Average_HFA05(hfa4) + Average_HFA05(hfa5)) / 5;
-        }
-
-        public static double
-            Average5_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5)
-        {
-            return ((Average3_HFA08(hfa1, hfa2, hfa3) * 3) + Average_HFA08(hfa4) + Average_HFA08(hfa5)) / 5;
-        }
-
-        public static double
-            Average5_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5)
-        {
-            return ((Average3_HFA11(hfa1, hfa2, hfa3) * 3) + Average_HFA11(hfa4) + Average_HFA11(hfa5)) / 5;
-        }
-
-
-        public static double
-            Average5_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5)
-        {
-            return ((Average3_HFA19(hfa1, hfa2, hfa3) * 3) + Average_HFA19(hfa4) + Average_HFA19(hfa5)) / 5;
-        }
-
-
-        // --------------------------------------------------------------
-        // Average8 methods
-        // --------------------------------------------------------------
-
-        public static double
-            Average8_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5, HFA01 hfa6, HFA01 hfa7, HFA01 hfa8)
-        {
-            return ((Average3_HFA01(hfa1, hfa2, hfa3) * 3) + (Average5_HFA01(hfa4, hfa5, hfa6, hfa7, hfa8) * 5)) / 8;
-        }
-
-        public static double
-            Average8_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5, HFA02 hfa6, HFA02 hfa7, HFA02 hfa8)
-        {
-            return ((Average3_HFA02(hfa1, hfa2, hfa3) * 3) + (Average5_HFA02(hfa4, hfa5, hfa6, hfa7, hfa8) * 5)) / 8;
-        }
-
-        public static double
-            Average8_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5, HFA03 hfa6, HFA03 hfa7, HFA03 hfa8)
-        {
-            return ((Average3_HFA03(hfa1, hfa2, hfa3) * 3) + (Average5_HFA03(hfa4, hfa5, hfa6, hfa7, hfa8) * 5)) / 8;
-        }
-
-        public static double
-            Average8_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5, HFA05 hfa6, HFA05 hfa7, HFA05 hfa8)
-        {
-            return ((Average3_HFA05(hfa1, hfa2, hfa3) * 3) + (Average5_HFA05(hfa4, hfa5, hfa6, hfa7, hfa8) * 5)) / 8;
-        }
-
-        public static double
-            Average8_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5, HFA08 hfa6, HFA08 hfa7, HFA08 hfa8)
-        {
-            return ((Average3_HFA08(hfa1, hfa2, hfa3) * 3) + (Average5_HFA08(hfa4, hfa5, hfa6, hfa7, hfa8) * 5)) / 8;
-        }
-
-        public static double
-            Average8_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5, HFA11 hfa6, HFA11 hfa7, HFA11 hfa8)
-        {
-            return ((Average3_HFA11(hfa1, hfa2, hfa3) * 3) + (Average5_HFA11(hfa4, hfa5, hfa6, hfa7, hfa8) * 5)) / 8;
-        }
-
-
-        public static double
-            Average8_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5, HFA19 hfa6, HFA19 hfa7, HFA19 hfa8)
-        {
-            return ((Average3_HFA19(hfa1, hfa2, hfa3) * 3) + (Average5_HFA19(hfa4, hfa5, hfa6, hfa7, hfa8) * 5)) / 8;
-        }
-
-
-        // --------------------------------------------------------------
-        // Average11 methods
-        // --------------------------------------------------------------
-
-        public static double
-            Average11_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5, HFA01 hfa6, HFA01 hfa7, HFA01 hfa8, HFA01 hfa9, HFA01 hfa10, HFA01 hfa11)
-        {
-            return ((Average3_HFA01(hfa1, hfa2, hfa3) * 3) + (Average8_HFA01(hfa4, hfa5, hfa6, hfa7, hfa8, hfa9, hfa10, hfa11) * 8)) / 11;
-        }
-
-
-        public static double
-            Average11_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5, HFA02 hfa6, HFA02 hfa7, HFA02 hfa8, HFA02 hfa9, HFA02 hfa10, HFA02 hfa11)
-        {
-            return ((Average3_HFA02(hfa1, hfa2, hfa3) * 3) + (Average8_HFA02(hfa4, hfa5, hfa6, hfa7, hfa8, hfa9, hfa10, hfa11) * 8)) / 11;
-        }
-
-
-        public static double
-            Average11_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5, HFA03 hfa6, HFA03 hfa7, HFA03 hfa8, HFA03 hfa9, HFA03 hfa10, HFA03 hfa11)
-        {
-            return ((Average3_HFA03(hfa1, hfa2, hfa3) * 3) + (Average8_HFA03(hfa4, hfa5, hfa6, hfa7, hfa8, hfa9, hfa10, hfa11) * 8)) / 11;
-        }
-
-
-        public static double
-            Average11_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5, HFA05 hfa6, HFA05 hfa7, HFA05 hfa8, HFA05 hfa9, HFA05 hfa10, HFA05 hfa11)
-        {
-            return ((Average3_HFA05(hfa1, hfa2, hfa3) * 3) + (Average8_HFA05(hfa4, hfa5, hfa6, hfa7, hfa8, hfa9, hfa10, hfa11) * 8)) / 11;
-        }
-
-
-        public static double
-            Average11_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5, HFA08 hfa6, HFA08 hfa7, HFA08 hfa8, HFA08 hfa9, HFA08 hfa10, HFA08 hfa11)
-        {
-            return ((Average3_HFA08(hfa1, hfa2, hfa3) * 3) + (Average8_HFA08(hfa4, hfa5, hfa6, hfa7, hfa8, hfa9, hfa10, hfa11) * 8)) / 11;
-        }
-
-
-        public static double
-            Average11_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5, HFA11 hfa6, HFA11 hfa7, HFA11 hfa8, HFA11 hfa9, HFA11 hfa10, HFA11 hfa11)
-        {
-            return ((Average3_HFA11(hfa1, hfa2, hfa3) * 3) + (Average8_HFA11(hfa4, hfa5, hfa6, hfa7, hfa8, hfa9, hfa10, hfa11) * 8)) / 11;
-        }
-
-
-        public static double
-            Average11_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5, HFA19 hfa6, HFA19 hfa7, HFA19 hfa8, HFA19 hfa9, HFA19 hfa10, HFA19 hfa11)
-        {
-            return ((Average3_HFA19(hfa1, hfa2, hfa3) * 3) + (Average8_HFA19(hfa4, hfa5, hfa6, hfa7, hfa8, hfa9, hfa10, hfa11) * 8)) / 11;
-        }
-
-
-
-        // --------------------------------------------------------------
-        // Average19 methods
-        // --------------------------------------------------------------
-
-        public static double
-            Average19_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5, HFA01 hfa6, HFA01 hfa7, HFA01 hfa8, HFA01 hfa9, HFA01 hfa10, HFA01 hfa11, HFA01 hfa12, HFA01 hfa13, HFA01 hfa14, HFA01 hfa15, HFA01 hfa16, HFA01 hfa17, HFA01 hfa18, HFA01 hfa19)
-        {
-            return ((Average8_HFA01(hfa1, hfa2, hfa3, hfa4, hfa5, hfa6, hfa7, hfa8) * 8) + (Average11_HFA01(hfa9, hfa10, hfa11, hfa12, hfa13, hfa14, hfa15, hfa16, hfa17, hfa18, hfa19) * 11)) / 19;
-        }
-
-
-        public static double
-            Average19_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5, HFA02 hfa6, HFA02 hfa7, HFA02 hfa8, HFA02 hfa9, HFA02 hfa10, HFA02 hfa11, HFA02 hfa12, HFA02 hfa13, HFA02 hfa14, HFA02 hfa15, HFA02 hfa16, HFA02 hfa17, HFA02 hfa18, HFA02 hfa19)
-        {
-            return ((Average8_HFA02(hfa1, hfa2, hfa3, hfa4, hfa5, hfa6, hfa7, hfa8) * 8) + (Average11_HFA02(hfa9, hfa10, hfa11, hfa12, hfa13, hfa14, hfa15, hfa16, hfa17, hfa18, hfa19) * 11)) / 19;
-        }
-
-
-        public static double
-            Average19_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5, HFA03 hfa6, HFA03 hfa7, HFA03 hfa8, HFA03 hfa9, HFA03 hfa10, HFA03 hfa11, HFA03 hfa12, HFA03 hfa13, HFA03 hfa14, HFA03 hfa15, HFA03 hfa16, HFA03 hfa17, HFA03 hfa18, HFA03 hfa19)
-        {
-            return ((Average8_HFA03(hfa1, hfa2, hfa3, hfa4, hfa5, hfa6, hfa7, hfa8) * 8) + (Average11_HFA03(hfa9, hfa10, hfa11, hfa12, hfa13, hfa14, hfa15, hfa16, hfa17, hfa18, hfa19) * 11)) / 19;
-        }
-
-
-        public static double
-            Average19_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5, HFA05 hfa6, HFA05 hfa7, HFA05 hfa8, HFA05 hfa9, HFA05 hfa10, HFA05 hfa11, HFA05 hfa12, HFA05 hfa13, HFA05 hfa14, HFA05 hfa15, HFA05 hfa16, HFA05 hfa17, HFA05 hfa18, HFA05 hfa19)
-        {
-            return ((Average8_HFA05(hfa1, hfa2, hfa3, hfa4, hfa5, hfa6, hfa7, hfa8) * 8) + (Average11_HFA05(hfa9, hfa10, hfa11, hfa12, hfa13, hfa14, hfa15, hfa16, hfa17, hfa18, hfa19) * 11)) / 19;
-        }
-
-
-        public static double
-            Average19_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5, HFA08 hfa6, HFA08 hfa7, HFA08 hfa8, HFA08 hfa9, HFA08 hfa10, HFA08 hfa11, HFA08 hfa12, HFA08 hfa13, HFA08 hfa14, HFA08 hfa15, HFA08 hfa16, HFA08 hfa17, HFA08 hfa18, HFA08 hfa19)
-        {
-            return ((Average8_HFA08(hfa1, hfa2, hfa3, hfa4, hfa5, hfa6, hfa7, hfa8) * 8) + (Average11_HFA08(hfa9, hfa10, hfa11, hfa12, hfa13, hfa14, hfa15, hfa16, hfa17, hfa18, hfa19) * 11)) / 19;
-        }
-
-
-        public static double
-            Average19_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5, HFA11 hfa6, HFA11 hfa7, HFA11 hfa8, HFA11 hfa9, HFA11 hfa10, HFA11 hfa11, HFA11 hfa12, HFA11 hfa13, HFA11 hfa14, HFA11 hfa15, HFA11 hfa16, HFA11 hfa17, HFA11 hfa18, HFA11 hfa19)
-        {
-            return ((Average8_HFA11(hfa1, hfa2, hfa3, hfa4, hfa5, hfa6, hfa7, hfa8) * 8) + (Average11_HFA11(hfa9, hfa10, hfa11, hfa12, hfa13, hfa14, hfa15, hfa16, hfa17, hfa18, hfa19) * 11)) / 19;
-        }
-
-
-        public static double
-            Average19_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5, HFA19 hfa6, HFA19 hfa7, HFA19 hfa8, HFA19 hfa9, HFA19 hfa10, HFA19 hfa11, HFA19 hfa12, HFA19 hfa13, HFA19 hfa14, HFA19 hfa15, HFA19 hfa16, HFA19 hfa17, HFA19 hfa18, HFA19 hfa19)
-        {
-            return ((Average8_HFA19(hfa1, hfa2, hfa3, hfa4, hfa5, hfa6, hfa7, hfa8) * 8) + (Average11_HFA19(hfa9, hfa10, hfa11, hfa12, hfa13, hfa14, hfa15, hfa16, hfa17, hfa18, hfa19) * 11)) / 19;
-        }
-
-
-
-
-        // --------------------------------------------------------------
-        // Add01 methods
-        // --------------------------------------------------------------
-
-        public static double
-            Add01_HFA01(HFA01 hfa1, float v1, HFA01 hfa2, int v2, HFA01 hfa3, short v3, double v4, HFA01 hfa4, HFA01 hfa5, float v5, long v6, float v7, HFA01 hfa6, float v8, HFA01 hfa7)
-        {
-            return (Sum_HFA01(hfa1) + Sum_HFA01(hfa2) + Sum_HFA01(hfa3) + Sum_HFA01(hfa4) + Sum_HFA01(hfa5) + Sum_HFA01(hfa6) + Sum_HFA01(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8;
-        }
-
-        public static double
-            Add01_HFA02(HFA02 hfa1, float v1, HFA02 hfa2, int v2, HFA02 hfa3, short v3, double v4, HFA02 hfa4, HFA02 hfa5, float v5, long v6, float v7, HFA02 hfa6, float v8, HFA02 hfa7)
-        {
-            return (Sum_HFA02(hfa1) + Sum_HFA02(hfa2) + Sum_HFA02(hfa3) + Sum_HFA02(hfa4) + Sum_HFA02(hfa5) + Sum_HFA02(hfa6) + Sum_HFA02(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8;
-        }
-
-        public static double
-            Add01_HFA03(HFA03 hfa1, float v1, HFA03 hfa2, int v2, HFA03 hfa3, short v3, double v4, HFA03 hfa4, HFA03 hfa5, float v5, long v6, float v7, HFA03 hfa6, float v8, HFA03 hfa7)
-        {
-            return (Sum_HFA03(hfa1) + Sum_HFA03(hfa2) + Sum_HFA03(hfa3) + Sum_HFA03(hfa4) + Sum_HFA03(hfa5) + Sum_HFA03(hfa6) + Sum_HFA03(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8;
-        }
-
-        public static double
-            Add01_HFA05(HFA05 hfa1, float v1, HFA05 hfa2, int v2, HFA05 hfa3, short v3, double v4, HFA05 hfa4, HFA05 hfa5, float v5, long v6, float v7, HFA05 hfa6, float v8, HFA05 hfa7)
-        {
-            return (Sum_HFA05(hfa1) + Sum_HFA05(hfa2) + Sum_HFA05(hfa3) + Sum_HFA05(hfa4) + Sum_HFA05(hfa5) + Sum_HFA05(hfa6) + Sum_HFA05(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8;
-        }
-
-        public static double
-            Add01_HFA08(HFA08 hfa1, float v1, HFA08 hfa2, int v2, HFA08 hfa3, short v3, double v4, HFA08 hfa4, HFA08 hfa5, float v5, long v6, float v7, HFA08 hfa6, float v8, HFA08 hfa7)
-        {
-            return (Sum_HFA08(hfa1) + Sum_HFA08(hfa2) + Sum_HFA08(hfa3) + Sum_HFA08(hfa4) + Sum_HFA08(hfa5) + Sum_HFA08(hfa6) + Sum_HFA08(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8;
-        }
-
-        public static double
-            Add01_HFA11(HFA11 hfa1, float v1, HFA11 hfa2, int v2, HFA11 hfa3, short v3, double v4, HFA11 hfa4, HFA11 hfa5, float v5, long v6, float v7, HFA11 hfa6, float v8, HFA11 hfa7)
-        {
-            return (Sum_HFA11(hfa1) + Sum_HFA11(hfa2) + Sum_HFA11(hfa3) + Sum_HFA11(hfa4) + Sum_HFA11(hfa5) + Sum_HFA11(hfa6) + Sum_HFA11(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8;
-        }
-
-        public static double
-            Add01_HFA19(HFA19 hfa1, float v1, HFA19 hfa2, int v2, HFA19 hfa3, short v3, double v4, HFA19 hfa4, HFA19 hfa5, float v5, long v6, float v7, HFA19 hfa6, float v8, HFA19 hfa7)
-        {
-            return (Sum_HFA19(hfa1) + Sum_HFA19(hfa2) + Sum_HFA19(hfa3) + Sum_HFA19(hfa4) + Sum_HFA19(hfa5) + Sum_HFA19(hfa6) + Sum_HFA19(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8;
-        }
-
-        public static double
-            Add01_HFA00(HFA03 hfa1, float v1, HFA02 hfa2, int v2, HFA19 hfa3, short v3, double v4, HFA05 hfa4, HFA08 hfa5, float v5, long v6, float v7, HFA11 hfa6, float v8, HFA01 hfa7)
-        {
-            return (Sum_HFA03(hfa1) + Sum_HFA02(hfa2) + Sum_HFA19(hfa3) + Sum_HFA05(hfa4) + Sum_HFA08(hfa5) + Sum_HFA11(hfa6) + Sum_HFA01(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8;
-        }
-
-
-        // --------------------------------------------------------------
-        // Add02 methods
-        // --------------------------------------------------------------
-
-        public static double
-            Add02_HFA01(HFA01 hfa1, HFA01 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA01 hfa3, double v7, float v8, HFA01 hfa4, short v9, HFA01 hfa5, float v10, HFA01 hfa6, HFA01 hfa7)
-        {
-            return (Sum_HFA01(hfa1) + Sum_HFA01(hfa2) + Sum_HFA01(hfa3) + Sum_HFA01(hfa4) + Sum_HFA01(hfa5) + Sum_HFA01(hfa6) + Sum_HFA01(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static double
-            Add02_HFA02(HFA02 hfa1, HFA02 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA02 hfa3, double v7, float v8, HFA02 hfa4, short v9, HFA02 hfa5, float v10, HFA02 hfa6, HFA02 hfa7)
-        {
-            return (Sum_HFA02(hfa1) + Sum_HFA02(hfa2) + Sum_HFA02(hfa3) + Sum_HFA02(hfa4) + Sum_HFA02(hfa5) + Sum_HFA02(hfa6) + Sum_HFA02(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static double
-            Add02_HFA03(HFA03 hfa1, HFA03 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA03 hfa3, double v7, float v8, HFA03 hfa4, short v9, HFA03 hfa5, float v10, HFA03 hfa6, HFA03 hfa7)
-        {
-            return (Sum_HFA03(hfa1) + Sum_HFA03(hfa2) + Sum_HFA03(hfa3) + Sum_HFA03(hfa4) + Sum_HFA03(hfa5) + Sum_HFA03(hfa6) + Sum_HFA03(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static double
-            Add02_HFA05(HFA05 hfa1, HFA05 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA05 hfa3, double v7, float v8, HFA05 hfa4, short v9, HFA05 hfa5, float v10, HFA05 hfa6, HFA05 hfa7)
-        {
-            return (Sum_HFA05(hfa1) + Sum_HFA05(hfa2) + Sum_HFA05(hfa3) + Sum_HFA05(hfa4) + Sum_HFA05(hfa5) + Sum_HFA05(hfa6) + Sum_HFA05(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static double
-            Add02_HFA08(HFA08 hfa1, HFA08 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA08 hfa3, double v7, float v8, HFA08 hfa4, short v9, HFA08 hfa5, float v10, HFA08 hfa6, HFA08 hfa7)
-        {
-            return (Sum_HFA08(hfa1) + Sum_HFA08(hfa2) + Sum_HFA08(hfa3) + Sum_HFA08(hfa4) + Sum_HFA08(hfa5) + Sum_HFA08(hfa6) + Sum_HFA08(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static double
-            Add02_HFA11(HFA11 hfa1, HFA11 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA11 hfa3, double v7, float v8, HFA11 hfa4, short v9, HFA11 hfa5, float v10, HFA11 hfa6, HFA11 hfa7)
-        {
-            return (Sum_HFA11(hfa1) + Sum_HFA11(hfa2) + Sum_HFA11(hfa3) + Sum_HFA11(hfa4) + Sum_HFA11(hfa5) + Sum_HFA11(hfa6) + Sum_HFA11(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-
-        public static double
-            Add02_HFA19(HFA19 hfa1, HFA19 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA19 hfa3, double v7, float v8, HFA19 hfa4, short v9, HFA19 hfa5, float v10, HFA19 hfa6, HFA19 hfa7)
-        {
-            return (Sum_HFA19(hfa1) + Sum_HFA19(hfa2) + Sum_HFA19(hfa3) + Sum_HFA19(hfa4) + Sum_HFA19(hfa5) + Sum_HFA19(hfa6) + Sum_HFA19(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static double
-            Add02_HFA00(HFA01 hfa1, HFA05 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA03 hfa3, double v7, float v8, HFA11 hfa4, short v9, HFA19 hfa5, float v10, HFA08 hfa6, HFA02 hfa7)
-        {
-            return (Sum_HFA01(hfa1) + Sum_HFA05(hfa2) + Sum_HFA03(hfa3) + Sum_HFA11(hfa4) + Sum_HFA19(hfa5) + Sum_HFA08(hfa6) + Sum_HFA02(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-
-        // --------------------------------------------------------------
-        // Add03 methods
-        // --------------------------------------------------------------
-
-        public static double
-            Add03_HFA01(float v1, sbyte v2, HFA01 hfa1, double v3, sbyte v4, HFA01 hfa2, long v5, short v6, int v7, HFA01 hfa3, HFA01 hfa4, float v8, HFA01 hfa5, float v9, HFA01 hfa6, float v10, HFA01 hfa7)
-        {
-            return (Sum_HFA01(hfa1) + Sum_HFA01(hfa2) + Sum_HFA01(hfa3) + Sum_HFA01(hfa4) + Sum_HFA01(hfa5) + Sum_HFA01(hfa6) + Sum_HFA01(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static double
-            Add03_HFA02(float v1, sbyte v2, HFA02 hfa1, double v3, sbyte v4, HFA02 hfa2, long v5, short v6, int v7, HFA02 hfa3, HFA02 hfa4, float v8, HFA02 hfa5, float v9, HFA02 hfa6, float v10, HFA02 hfa7)
-        {
-            return (Sum_HFA02(hfa1) + Sum_HFA02(hfa2) + Sum_HFA02(hfa3) + Sum_HFA02(hfa4) + Sum_HFA02(hfa5) + Sum_HFA02(hfa6) + Sum_HFA02(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static double
-            Add03_HFA03(float v1, sbyte v2, HFA03 hfa1, double v3, sbyte v4, HFA03 hfa2, long v5, short v6, int v7, HFA03 hfa3, HFA03 hfa4, float v8, HFA03 hfa5, float v9, HFA03 hfa6, float v10, HFA03 hfa7)
-        {
-            return (Sum_HFA03(hfa1) + Sum_HFA03(hfa2) + Sum_HFA03(hfa3) + Sum_HFA03(hfa4) + Sum_HFA03(hfa5) + Sum_HFA03(hfa6) + Sum_HFA03(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static double
-            Add03_HFA05(float v1, sbyte v2, HFA05 hfa1, double v3, sbyte v4, HFA05 hfa2, long v5, short v6, int v7, HFA05 hfa3, HFA05 hfa4, float v8, HFA05 hfa5, float v9, HFA05 hfa6, float v10, HFA05 hfa7)
-        {
-            return (Sum_HFA05(hfa1) + Sum_HFA05(hfa2) + Sum_HFA05(hfa3) + Sum_HFA05(hfa4) + Sum_HFA05(hfa5) + Sum_HFA05(hfa6) + Sum_HFA05(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static double
-            Add03_HFA08(float v1, sbyte v2, HFA08 hfa1, double v3, sbyte v4, HFA08 hfa2, long v5, short v6, int v7, HFA08 hfa3, HFA08 hfa4, float v8, HFA08 hfa5, float v9, HFA08 hfa6, float v10, HFA08 hfa7)
-        {
-            return (Sum_HFA08(hfa1) + Sum_HFA08(hfa2) + Sum_HFA08(hfa3) + Sum_HFA08(hfa4) + Sum_HFA08(hfa5) + Sum_HFA08(hfa6) + Sum_HFA08(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static double
-            Add03_HFA11(float v1, sbyte v2, HFA11 hfa1, double v3, sbyte v4, HFA11 hfa2, long v5, short v6, int v7, HFA11 hfa3, HFA11 hfa4, float v8, HFA11 hfa5, float v9, HFA11 hfa6, float v10, HFA11 hfa7)
-        {
-            return (Sum_HFA11(hfa1) + Sum_HFA11(hfa2) + Sum_HFA11(hfa3) + Sum_HFA11(hfa4) + Sum_HFA11(hfa5) + Sum_HFA11(hfa6) + Sum_HFA11(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static double
-            Add03_HFA19(float v1, sbyte v2, HFA19 hfa1, double v3, sbyte v4, HFA19 hfa2, long v5, short v6, int v7, HFA19 hfa3, HFA19 hfa4, float v8, HFA19 hfa5, float v9, HFA19 hfa6, float v10, HFA19 hfa7)
-        {
-            return (Sum_HFA19(hfa1) + Sum_HFA19(hfa2) + Sum_HFA19(hfa3) + Sum_HFA19(hfa4) + Sum_HFA19(hfa5) + Sum_HFA19(hfa6) + Sum_HFA19(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static double
-            Add03_HFA00(float v1, sbyte v2, HFA08 hfa1, double v3, sbyte v4, HFA19 hfa2, long v5, short v6, int v7, HFA03 hfa3, HFA01 hfa4, float v8, HFA11 hfa5, float v9, HFA02 hfa6, float v10, HFA05 hfa7)
-        {
-            return (Sum_HFA08(hfa1) + Sum_HFA19(hfa2) + Sum_HFA03(hfa3) + Sum_HFA01(hfa4) + Sum_HFA11(hfa5) + Sum_HFA02(hfa6) + Sum_HFA05(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-
-    }
-}
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_managed_nf.cs b/tests/src/JIT/jit64/hfa/main/dll/hfa_managed_nf.cs
deleted file mode 100644
index 6a0bc21eae..0000000000
--- a/tests/src/JIT/jit64/hfa/main/dll/hfa_managed_nf.cs
+++ /dev/null
@@ -1,948 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-
-namespace HFATest
-{
-
-    public class TestMan
-    {
-
-
-        public const float EXPECTED_SUM_HFA01 = 1;
-        public const float EXPECTED_SUM_HFA02 = 3;
-        public const float EXPECTED_SUM_HFA03 = 4;
-        public const float EXPECTED_SUM_HFA05 = 7;
-        public const float EXPECTED_SUM_HFA08 = 11;
-        public const float EXPECTED_SUM_HFA11 = 15;
-        public const float EXPECTED_SUM_HFA19 = 26;
-
-
-        // --------------------------------------------------------------
-        // Init methods
-        // --------------------------------------------------------------
-
-        public static void Init_HFA01(out HFA01 hfa)
-        {
-            hfa.f1 = 1;
-        }
-
-        public static void Init_HFA02(out HFA02 hfa)
-        {
-            Init_HFA01(out hfa.hfa01);
-            hfa.f2 = 2;
-        }
-
-        public static void Init_HFA03(out HFA03 hfa)
-        {
-            Init_HFA01(out hfa.hfa01);
-            Init_HFA02(out hfa.hfa02);
-        }
-
-        public static void Init_HFA05(out HFA05 hfa)
-        {
-            Init_HFA02(out hfa.hfa02);
-            Init_HFA03(out hfa.hfa03);
-        }
-
-        public static void Init_HFA08(out HFA08 hfa)
-        {
-            Init_HFA03(out hfa.hfa03);
-            Init_HFA05(out hfa.hfa05);
-        }
-
-        public static void Init_HFA11(out HFA11 hfa)
-        {
-            Init_HFA03(out hfa.hfa03);
-            Init_HFA08(out hfa.hfa08);
-        }
-
-        public static void Init_HFA19(out HFA19 hfa)
-        {
-            Init_HFA08(out hfa.hfa08);
-            Init_HFA11(out hfa.hfa11);
-        }
-
-
-
-        // --------------------------------------------------------------
-        // Identity methods
-        // --------------------------------------------------------------
-
-        public static HFA01 Identity_HFA01(HFA01 hfa)
-        {
-            return hfa;
-        }
-
-        public static HFA02 Identity_HFA02(HFA02 hfa)
-        {
-            return hfa;
-        }
-
-        public static HFA03 Identity_HFA03(HFA03 hfa)
-        {
-            return hfa;
-        }
-
-        public static HFA05 Identity_HFA05(HFA05 hfa)
-        {
-            return hfa;
-        }
-
-        public static HFA08 Identity_HFA08(HFA08 hfa)
-        {
-            return hfa;
-        }
-
-        public static HFA11 Identity_HFA11(HFA11 hfa)
-        {
-            return hfa;
-        }
-
-        public static HFA19 Identity_HFA19(HFA19 hfa)
-        {
-            return hfa;
-        }
-
-
-        // --------------------------------------------------------------
-        // Get methods
-        // --------------------------------------------------------------
-
-        public static HFA01 Get_HFA01()
-        {
-            HFA01 hfa;
-            Init_HFA01(out hfa);
-            return hfa;
-        }
-
-        public static HFA02 Get_HFA02()
-        {
-            HFA02 hfa;
-            Init_HFA02(out hfa);
-            return hfa;
-        }
-
-        public static HFA03 Get_HFA03()
-        {
-            HFA03 hfa;
-            Init_HFA03(out hfa);
-            return hfa;
-        }
-
-        public static HFA05 Get_HFA05()
-        {
-            HFA05 hfa;
-            Init_HFA05(out hfa);
-            return hfa;
-        }
-
-        public static HFA08 Get_HFA08()
-        {
-            HFA08 hfa;
-            Init_HFA08(out hfa);
-            return hfa;
-        }
-
-        public static HFA11 Get_HFA11()
-        {
-            HFA11 hfa;
-            Init_HFA11(out hfa);
-            return hfa;
-        }
-
-        public static HFA19 Get_HFA19()
-        {
-            HFA19 hfa;
-            Init_HFA19(out hfa);
-            return hfa;
-        }
-
-
-        // --------------------------------------------------------------
-        // Sum methods
-        // --------------------------------------------------------------
-
-        public static float
-            Sum_HFA01(HFA01 hfa)
-        {
-            return hfa.f1;
-        }
-
-        public static float
-            Sum_HFA02(HFA02 hfa)
-        {
-            return Sum_HFA01(hfa.hfa01) + hfa.f2;
-        }
-
-        public static float
-            Sum_HFA03(HFA03 hfa)
-        {
-            return Sum_HFA01(hfa.hfa01) + Sum_HFA02(hfa.hfa02);
-        }
-
-        public static float
-            Sum_HFA05(HFA05 hfa)
-        {
-            return Sum_HFA02(hfa.hfa02) + Sum_HFA03(hfa.hfa03);
-        }
-
-        public static float
-            Sum_HFA08(HFA08 hfa)
-        {
-            return Sum_HFA03(hfa.hfa03) + Sum_HFA05(hfa.hfa05);
-        }
-
-        public static float
-            Sum_HFA11(HFA11 hfa)
-        {
-            return Sum_HFA03(hfa.hfa03) + Sum_HFA08(hfa.hfa08);
-        }
-
-
-        public static float
-            Sum_HFA19(HFA19 hfa)
-        {
-            return Sum_HFA08(hfa.hfa08) + Sum_HFA11(hfa.hfa11);
-        }
-
-
-
-        // --------------------------------------------------------------
-        // Sum3 methods
-        // --------------------------------------------------------------
-
-        public static float
-            Sum3_HFA01(float v1, long v2, HFA01 hfa)
-        {
-            return (float)v1 + (float)v2 + hfa.f1;
-        }
-
-        public static float
-            Sum3_HFA02(float v1, long v2, HFA02 hfa)
-        {
-            return (float)v1 + (float)v2 +
-                Sum_HFA01(hfa.hfa01) + hfa.f2;
-        }
-
-        public static float
-            Sum3_HFA03(float v1, long v2, HFA03 hfa)
-        {
-            return (float)v1 + (float)v2 +
-                Sum_HFA01(hfa.hfa01) + Sum_HFA02(hfa.hfa02);
-        }
-
-        public static float
-            Sum3_HFA05(float v1, long v2, HFA05 hfa)
-        {
-            return (float)v1 + (float)v2 +
-                Sum_HFA02(hfa.hfa02) + Sum_HFA03(hfa.hfa03);
-        }
-
-        public static float
-            Sum3_HFA08(float v1, long v2, HFA08 hfa)
-        {
-            return (float)v1 + (float)v2 +
-                Sum_HFA03(hfa.hfa03) + Sum_HFA05(hfa.hfa05);
-        }
-
-        public static float
-            Sum3_HFA11(float v1, long v2, HFA11 hfa)
-        {
-            return (float)v1 + (float)v2 +
-                Sum_HFA03(hfa.hfa03) + Sum_HFA08(hfa.hfa08);
-        }
-
-        public static float
-            Sum3_HFA19(float v1, long v2, HFA19 hfa)
-        {
-            return (float)v1 + (float)v2 +
-                Sum_HFA08(hfa.hfa08) + Sum_HFA11(hfa.hfa11);
-        }
-
-
-
-        // --------------------------------------------------------------
-        // Sum5 methods
-        // --------------------------------------------------------------
-
-        public static float
-            Sum5_HFA01(long v1, double v2, int v3, sbyte v4, HFA01 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 +
-                hfa.f1;
-        }
-
-        public static float
-            Sum5_HFA02(long v1, double v2, int v3, sbyte v4, HFA02 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 +
-                Sum_HFA01(hfa.hfa01) + hfa.f2;
-        }
-
-        public static float
-            Sum5_HFA03(long v1, double v2, int v3, sbyte v4, HFA03 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 +
-                Sum_HFA01(hfa.hfa01) + Sum_HFA02(hfa.hfa02);
-        }
-
-        public static float
-            Sum5_HFA05(long v1, double v2, int v3, sbyte v4, HFA05 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 +
-                Sum_HFA02(hfa.hfa02) + Sum_HFA03(hfa.hfa03);
-        }
-
-        public static float
-            Sum5_HFA08(long v1, double v2, int v3, sbyte v4, HFA08 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 +
-                Sum_HFA03(hfa.hfa03) + Sum_HFA05(hfa.hfa05);
-        }
-
-        public static float
-            Sum5_HFA11(long v1, double v2, int v3, sbyte v4, HFA11 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 +
-                Sum_HFA03(hfa.hfa03) + Sum_HFA08(hfa.hfa08);
-        }
-
-        public static float
-            Sum5_HFA19(long v1, double v2, int v3, sbyte v4, HFA19 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 +
-                Sum_HFA08(hfa.hfa08) + Sum_HFA11(hfa.hfa11);
-        }
-
-
-
-        // --------------------------------------------------------------
-        // Sum8 methods
-        // --------------------------------------------------------------
-
-        public static float
-            Sum8_HFA01(float v1, double v2, long v3, sbyte v4, double v5, HFA01 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 +
-                hfa.f1;
-        }
-
-        public static float
-            Sum8_HFA02(float v1, double v2, long v3, sbyte v4, double v5, HFA02 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 +
-                Sum_HFA01(hfa.hfa01) + hfa.f2;
-        }
-
-        public static float
-            Sum8_HFA03(float v1, double v2, long v3, sbyte v4, double v5, HFA03 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 +
-                Sum_HFA01(hfa.hfa01) + Sum_HFA02(hfa.hfa02);
-        }
-
-        public static float
-            Sum8_HFA05(float v1, double v2, long v3, sbyte v4, double v5, HFA05 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 +
-                Sum_HFA02(hfa.hfa02) + Sum_HFA03(hfa.hfa03);
-        }
-
-        public static float
-            Sum8_HFA08(float v1, double v2, long v3, sbyte v4, double v5, HFA08 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 +
-                Sum_HFA03(hfa.hfa03) + Sum_HFA05(hfa.hfa05);
-        }
-
-        public static float
-            Sum8_HFA11(float v1, double v2, long v3, sbyte v4, double v5, HFA11 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 +
-                Sum_HFA03(hfa.hfa03) + Sum_HFA08(hfa.hfa08);
-        }
-
-        public static float
-            Sum8_HFA19(float v1, double v2, long v3, sbyte v4, double v5, HFA19 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 +
-                Sum_HFA08(hfa.hfa08) + Sum_HFA11(hfa.hfa11);
-        }
-
-
-
-        // --------------------------------------------------------------
-        // Sum11 methods
-        // --------------------------------------------------------------
-
-        public static float
-            Sum11_HFA01(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA01 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 +
-                hfa.f1;
-        }
-
-        public static float
-            Sum11_HFA02(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA02 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 +
-                Sum_HFA01(hfa.hfa01) + hfa.f2;
-        }
-
-        public static float
-            Sum11_HFA03(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA03 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 +
-                Sum_HFA01(hfa.hfa01) + Sum_HFA02(hfa.hfa02);
-        }
-
-        public static float
-            Sum11_HFA05(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA05 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 +
-                Sum_HFA02(hfa.hfa02) + Sum_HFA03(hfa.hfa03);
-        }
-
-        public static float
-            Sum11_HFA08(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA08 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 +
-                Sum_HFA03(hfa.hfa03) + Sum_HFA05(hfa.hfa05);
-        }
-
-        public static float
-            Sum11_HFA11(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA11 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 +
-                Sum_HFA03(hfa.hfa03) + Sum_HFA08(hfa.hfa08);
-        }
-
-        public static float
-            Sum11_HFA19(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA19 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 +
-                Sum_HFA08(hfa.hfa08) + Sum_HFA11(hfa.hfa11);
-        }
-
-
-
-        // --------------------------------------------------------------
-        // Sum19 methods
-        // --------------------------------------------------------------
-
-        public static float
-            Sum19_HFA01(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA01 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10 + (float)v11 + (float)v12 + (float)v13 +
-                hfa.f1;
-        }
-
-        public static float
-            Sum19_HFA02(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA02 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10 + (float)v11 + (float)v12 + (float)v13 +
-                Sum_HFA01(hfa.hfa01) + hfa.f2;
-        }
-
-        public static float
-            Sum19_HFA03(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA03 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10 + (float)v11 + (float)v12 + (float)v13 +
-                Sum_HFA01(hfa.hfa01) + Sum_HFA02(hfa.hfa02);
-        }
-
-        public static float
-            Sum19_HFA05(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA05 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10 + (float)v11 + (float)v12 + (float)v13 +
-                Sum_HFA02(hfa.hfa02) + Sum_HFA03(hfa.hfa03);
-        }
-
-        public static float
-            Sum19_HFA08(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA08 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10 + (float)v11 + (float)v12 + (float)v13 +
-                Sum_HFA03(hfa.hfa03) + Sum_HFA05(hfa.hfa05);
-        }
-
-        public static float
-            Sum19_HFA11(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA11 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10 + (float)v11 + (float)v12 + (float)v13 +
-                Sum_HFA03(hfa.hfa03) + Sum_HFA08(hfa.hfa08);
-        }
-
-        public static float
-            Sum19_HFA19(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA19 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10 + (float)v11 + (float)v12 + (float)v13 +
-                Sum_HFA08(hfa.hfa08) + Sum_HFA11(hfa.hfa11);
-        }
-
-
-
-
-        // --------------------------------------------------------------
-        // Average methods
-        // --------------------------------------------------------------
-
-        public static float
-            Average_HFA01(HFA01 hfa)
-        {
-            return Sum_HFA01(hfa) / 1;
-        }
-
-        public static float
-            Average_HFA02(HFA02 hfa)
-        {
-            return Sum_HFA02(hfa) / 2;
-        }
-
-        public static float
-            Average_HFA03(HFA03 hfa)
-        {
-            return Sum_HFA03(hfa) / 3;
-        }
-
-        public static float
-            Average_HFA05(HFA05 hfa)
-        {
-            return Sum_HFA05(hfa) / 5;
-        }
-
-        public static float
-            Average_HFA08(HFA08 hfa)
-        {
-            return Sum_HFA08(hfa) / 8;
-        }
-
-        public static float
-            Average_HFA11(HFA11 hfa)
-        {
-            return Sum_HFA11(hfa) / 11;
-        }
-
-        public static float
-            Average_HFA19(HFA19 hfa)
-        {
-            return Sum_HFA19(hfa) / 19;
-        }
-
-
-        // --------------------------------------------------------------
-        // Average3 methods
-        // --------------------------------------------------------------
-
-        public static float
-            Average3_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3)
-        {
-            return (Average_HFA01(hfa1) + Average_HFA01(hfa2) + Average_HFA01(hfa3)) / 3;
-        }
-
-        public static float
-            Average3_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3)
-        {
-            return (Average_HFA02(hfa1) + Average_HFA02(hfa2) + Average_HFA02(hfa3)) / 3;
-        }
-
-        public static float
-            Average3_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3)
-        {
-            return (Average_HFA03(hfa1) + Average_HFA03(hfa2) + Average_HFA03(hfa3)) / 3;
-        }
-
-        public static float
-            Average3_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3)
-        {
-            return (Average_HFA05(hfa1) + Average_HFA05(hfa2) + Average_HFA05(hfa3)) / 3;
-        }
-
-        public static float
-            Average3_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3)
-        {
-            return (Average_HFA08(hfa1) + Average_HFA08(hfa2) + Average_HFA08(hfa3)) / 3;
-        }
-
-        public static float
-            Average3_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3)
-        {
-            return (Average_HFA11(hfa1) + Average_HFA11(hfa2) + Average_HFA11(hfa3)) / 3;
-        }
-
-
-        public static float
-            Average3_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3)
-        {
-            return (Average_HFA19(hfa1) + Average_HFA19(hfa2) + Average_HFA19(hfa3)) / 3;
-        }
-
-
-        // --------------------------------------------------------------
-        // Average5 methods
-        // --------------------------------------------------------------
-
-        public static float
-            Average5_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5)
-        {
-            return ((Average3_HFA01(hfa1, hfa2, hfa3) * 3) + Average_HFA01(hfa4) + Average_HFA01(hfa5)) / 5;
-        }
-
-        public static float
-            Average5_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5)
-        {
-            return ((Average3_HFA02(hfa1, hfa2, hfa3) * 3) + Average_HFA02(hfa4) + Average_HFA02(hfa5)) / 5;
-        }
-
-        public static float
-            Average5_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5)
-        {
-            return ((Average3_HFA03(hfa1, hfa2, hfa3) * 3) + Average_HFA03(hfa4) + Average_HFA03(hfa5)) / 5;
-        }
-
-        public static float
-            Average5_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5)
-        {
-            return ((Average3_HFA05(hfa1, hfa2, hfa3) * 3) + Average_HFA05(hfa4) + Average_HFA05(hfa5)) / 5;
-        }
-
-        public static float
-            Average5_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5)
-        {
-            return ((Average3_HFA08(hfa1, hfa2, hfa3) * 3) + Average_HFA08(hfa4) + Average_HFA08(hfa5)) / 5;
-        }
-
-        public static float
-            Average5_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5)
-        {
-            return ((Average3_HFA11(hfa1, hfa2, hfa3) * 3) + Average_HFA11(hfa4) + Average_HFA11(hfa5)) / 5;
-        }
-
-
-        public static float
-            Average5_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5)
-        {
-            return ((Average3_HFA19(hfa1, hfa2, hfa3) * 3) + Average_HFA19(hfa4) + Average_HFA19(hfa5)) / 5;
-        }
-
-
-        // --------------------------------------------------------------
-        // Average8 methods
-        // --------------------------------------------------------------
-
-        public static float
-            Average8_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5, HFA01 hfa6, HFA01 hfa7, HFA01 hfa8)
-        {
-            return ((Average3_HFA01(hfa1, hfa2, hfa3) * 3) + (Average5_HFA01(hfa4, hfa5, hfa6, hfa7, hfa8) * 5)) / 8;
-        }
-
-        public static float
-            Average8_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5, HFA02 hfa6, HFA02 hfa7, HFA02 hfa8)
-        {
-            return ((Average3_HFA02(hfa1, hfa2, hfa3) * 3) + (Average5_HFA02(hfa4, hfa5, hfa6, hfa7, hfa8) * 5)) / 8;
-        }
-
-        public static float
-            Average8_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5, HFA03 hfa6, HFA03 hfa7, HFA03 hfa8)
-        {
-            return ((Average3_HFA03(hfa1, hfa2, hfa3) * 3) + (Average5_HFA03(hfa4, hfa5, hfa6, hfa7, hfa8) * 5)) / 8;
-        }
-
-        public static float
-            Average8_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5, HFA05 hfa6, HFA05 hfa7, HFA05 hfa8)
-        {
-            return ((Average3_HFA05(hfa1, hfa2, hfa3) * 3) + (Average5_HFA05(hfa4, hfa5, hfa6, hfa7, hfa8) * 5)) / 8;
-        }
-
-        public static float
-            Average8_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5, HFA08 hfa6, HFA08 hfa7, HFA08 hfa8)
-        {
-            return ((Average3_HFA08(hfa1, hfa2, hfa3) * 3) + (Average5_HFA08(hfa4, hfa5, hfa6, hfa7, hfa8) * 5)) / 8;
-        }
-
-        public static float
-            Average8_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5, HFA11 hfa6, HFA11 hfa7, HFA11 hfa8)
-        {
-            return ((Average3_HFA11(hfa1, hfa2, hfa3) * 3) + (Average5_HFA11(hfa4, hfa5, hfa6, hfa7, hfa8) * 5)) / 8;
-        }
-
-
-        public static float
-            Average8_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5, HFA19 hfa6, HFA19 hfa7, HFA19 hfa8)
-        {
-            return ((Average3_HFA19(hfa1, hfa2, hfa3) * 3) + (Average5_HFA19(hfa4, hfa5, hfa6, hfa7, hfa8) * 5)) / 8;
-        }
-
-
-        // --------------------------------------------------------------
-        // Average11 methods
-        // --------------------------------------------------------------
-
-        public static float
-            Average11_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5, HFA01 hfa6, HFA01 hfa7, HFA01 hfa8, HFA01 hfa9, HFA01 hfa10, HFA01 hfa11)
-        {
-            return ((Average3_HFA01(hfa1, hfa2, hfa3) * 3) + (Average8_HFA01(hfa4, hfa5, hfa6, hfa7, hfa8, hfa9, hfa10, hfa11) * 8)) / 11;
-        }
-
-
-        public static float
-            Average11_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5, HFA02 hfa6, HFA02 hfa7, HFA02 hfa8, HFA02 hfa9, HFA02 hfa10, HFA02 hfa11)
-        {
-            return ((Average3_HFA02(hfa1, hfa2, hfa3) * 3) + (Average8_HFA02(hfa4, hfa5, hfa6, hfa7, hfa8, hfa9, hfa10, hfa11) * 8)) / 11;
-        }
-
-
-        public static float
-            Average11_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5, HFA03 hfa6, HFA03 hfa7, HFA03 hfa8, HFA03 hfa9, HFA03 hfa10, HFA03 hfa11)
-        {
-            return ((Average3_HFA03(hfa1, hfa2, hfa3) * 3) + (Average8_HFA03(hfa4, hfa5, hfa6, hfa7, hfa8, hfa9, hfa10, hfa11) * 8)) / 11;
-        }
-
-
-        public static float
-            Average11_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5, HFA05 hfa6, HFA05 hfa7, HFA05 hfa8, HFA05 hfa9, HFA05 hfa10, HFA05 hfa11)
-        {
-            return ((Average3_HFA05(hfa1, hfa2, hfa3) * 3) + (Average8_HFA05(hfa4, hfa5, hfa6, hfa7, hfa8, hfa9, hfa10, hfa11) * 8)) / 11;
-        }
-
-
-        public static float
-            Average11_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5, HFA08 hfa6, HFA08 hfa7, HFA08 hfa8, HFA08 hfa9, HFA08 hfa10, HFA08 hfa11)
-        {
-            return ((Average3_HFA08(hfa1, hfa2, hfa3) * 3) + (Average8_HFA08(hfa4, hfa5, hfa6, hfa7, hfa8, hfa9, hfa10, hfa11) * 8)) / 11;
-        }
-
-
-        public static float
-            Average11_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5, HFA11 hfa6, HFA11 hfa7, HFA11 hfa8, HFA11 hfa9, HFA11 hfa10, HFA11 hfa11)
-        {
-            return ((Average3_HFA11(hfa1, hfa2, hfa3) * 3) + (Average8_HFA11(hfa4, hfa5, hfa6, hfa7, hfa8, hfa9, hfa10, hfa11) * 8)) / 11;
-        }
-
-
-        public static float
-            Average11_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5, HFA19 hfa6, HFA19 hfa7, HFA19 hfa8, HFA19 hfa9, HFA19 hfa10, HFA19 hfa11)
-        {
-            return ((Average3_HFA19(hfa1, hfa2, hfa3) * 3) + (Average8_HFA19(hfa4, hfa5, hfa6, hfa7, hfa8, hfa9, hfa10, hfa11) * 8)) / 11;
-        }
-
-
-
-        // --------------------------------------------------------------
-        // Average19 methods
-        // --------------------------------------------------------------
-
-        public static float
-            Average19_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5, HFA01 hfa6, HFA01 hfa7, HFA01 hfa8, HFA01 hfa9, HFA01 hfa10, HFA01 hfa11, HFA01 hfa12, HFA01 hfa13, HFA01 hfa14, HFA01 hfa15, HFA01 hfa16, HFA01 hfa17, HFA01 hfa18, HFA01 hfa19)
-        {
-            return ((Average8_HFA01(hfa1, hfa2, hfa3, hfa4, hfa5, hfa6, hfa7, hfa8) * 8) + (Average11_HFA01(hfa9, hfa10, hfa11, hfa12, hfa13, hfa14, hfa15, hfa16, hfa17, hfa18, hfa19) * 11)) / 19;
-        }
-
-
-        public static float
-            Average19_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5, HFA02 hfa6, HFA02 hfa7, HFA02 hfa8, HFA02 hfa9, HFA02 hfa10, HFA02 hfa11, HFA02 hfa12, HFA02 hfa13, HFA02 hfa14, HFA02 hfa15, HFA02 hfa16, HFA02 hfa17, HFA02 hfa18, HFA02 hfa19)
-        {
-            return ((Average8_HFA02(hfa1, hfa2, hfa3, hfa4, hfa5, hfa6, hfa7, hfa8) * 8) + (Average11_HFA02(hfa9, hfa10, hfa11, hfa12, hfa13, hfa14, hfa15, hfa16, hfa17, hfa18, hfa19) * 11)) / 19;
-        }
-
-
-        public static float
-            Average19_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5, HFA03 hfa6, HFA03 hfa7, HFA03 hfa8, HFA03 hfa9, HFA03 hfa10, HFA03 hfa11, HFA03 hfa12, HFA03 hfa13, HFA03 hfa14, HFA03 hfa15, HFA03 hfa16, HFA03 hfa17, HFA03 hfa18, HFA03 hfa19)
-        {
-            return ((Average8_HFA03(hfa1, hfa2, hfa3, hfa4, hfa5, hfa6, hfa7, hfa8) * 8) + (Average11_HFA03(hfa9, hfa10, hfa11, hfa12, hfa13, hfa14, hfa15, hfa16, hfa17, hfa18, hfa19) * 11)) / 19;
-        }
-
-
-        public static float
-            Average19_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5, HFA05 hfa6, HFA05 hfa7, HFA05 hfa8, HFA05 hfa9, HFA05 hfa10, HFA05 hfa11, HFA05 hfa12, HFA05 hfa13, HFA05 hfa14, HFA05 hfa15, HFA05 hfa16, HFA05 hfa17, HFA05 hfa18, HFA05 hfa19)
-        {
-            return ((Average8_HFA05(hfa1, hfa2, hfa3, hfa4, hfa5, hfa6, hfa7, hfa8) * 8) + (Average11_HFA05(hfa9, hfa10, hfa11, hfa12, hfa13, hfa14, hfa15, hfa16, hfa17, hfa18, hfa19) * 11)) / 19;
-        }
-
-
-        public static float
-            Average19_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5, HFA08 hfa6, HFA08 hfa7, HFA08 hfa8, HFA08 hfa9, HFA08 hfa10, HFA08 hfa11, HFA08 hfa12, HFA08 hfa13, HFA08 hfa14, HFA08 hfa15, HFA08 hfa16, HFA08 hfa17, HFA08 hfa18, HFA08 hfa19)
-        {
-            return ((Average8_HFA08(hfa1, hfa2, hfa3, hfa4, hfa5, hfa6, hfa7, hfa8) * 8) + (Average11_HFA08(hfa9, hfa10, hfa11, hfa12, hfa13, hfa14, hfa15, hfa16, hfa17, hfa18, hfa19) * 11)) / 19;
-        }
-
-
-        public static float
-            Average19_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5, HFA11 hfa6, HFA11 hfa7, HFA11 hfa8, HFA11 hfa9, HFA11 hfa10, HFA11 hfa11, HFA11 hfa12, HFA11 hfa13, HFA11 hfa14, HFA11 hfa15, HFA11 hfa16, HFA11 hfa17, HFA11 hfa18, HFA11 hfa19)
-        {
-            return ((Average8_HFA11(hfa1, hfa2, hfa3, hfa4, hfa5, hfa6, hfa7, hfa8) * 8) + (Average11_HFA11(hfa9, hfa10, hfa11, hfa12, hfa13, hfa14, hfa15, hfa16, hfa17, hfa18, hfa19) * 11)) / 19;
-        }
-
-
-        public static float
-            Average19_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5, HFA19 hfa6, HFA19 hfa7, HFA19 hfa8, HFA19 hfa9, HFA19 hfa10, HFA19 hfa11, HFA19 hfa12, HFA19 hfa13, HFA19 hfa14, HFA19 hfa15, HFA19 hfa16, HFA19 hfa17, HFA19 hfa18, HFA19 hfa19)
-        {
-            return ((Average8_HFA19(hfa1, hfa2, hfa3, hfa4, hfa5, hfa6, hfa7, hfa8) * 8) + (Average11_HFA19(hfa9, hfa10, hfa11, hfa12, hfa13, hfa14, hfa15, hfa16, hfa17, hfa18, hfa19) * 11)) / 19;
-        }
-
-
-
-
-        // --------------------------------------------------------------
-        // Add01 methods
-        // --------------------------------------------------------------
-
-        public static float
-            Add01_HFA01(HFA01 hfa1, float v1, HFA01 hfa2, int v2, HFA01 hfa3, short v3, double v4, HFA01 hfa4, HFA01 hfa5, float v5, long v6, float v7, HFA01 hfa6, float v8, HFA01 hfa7)
-        {
-            return (Sum_HFA01(hfa1) + Sum_HFA01(hfa2) + Sum_HFA01(hfa3) + Sum_HFA01(hfa4) + Sum_HFA01(hfa5) + Sum_HFA01(hfa6) + Sum_HFA01(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8;
-        }
-
-        public static float
-            Add01_HFA02(HFA02 hfa1, float v1, HFA02 hfa2, int v2, HFA02 hfa3, short v3, double v4, HFA02 hfa4, HFA02 hfa5, float v5, long v6, float v7, HFA02 hfa6, float v8, HFA02 hfa7)
-        {
-            return (Sum_HFA02(hfa1) + Sum_HFA02(hfa2) + Sum_HFA02(hfa3) + Sum_HFA02(hfa4) + Sum_HFA02(hfa5) + Sum_HFA02(hfa6) + Sum_HFA02(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8;
-        }
-
-        public static float
-            Add01_HFA03(HFA03 hfa1, float v1, HFA03 hfa2, int v2, HFA03 hfa3, short v3, double v4, HFA03 hfa4, HFA03 hfa5, float v5, long v6, float v7, HFA03 hfa6, float v8, HFA03 hfa7)
-        {
-            return (Sum_HFA03(hfa1) + Sum_HFA03(hfa2) + Sum_HFA03(hfa3) + Sum_HFA03(hfa4) + Sum_HFA03(hfa5) + Sum_HFA03(hfa6) + Sum_HFA03(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8;
-        }
-
-        public static float
-            Add01_HFA05(HFA05 hfa1, float v1, HFA05 hfa2, int v2, HFA05 hfa3, short v3, double v4, HFA05 hfa4, HFA05 hfa5, float v5, long v6, float v7, HFA05 hfa6, float v8, HFA05 hfa7)
-        {
-            return (Sum_HFA05(hfa1) + Sum_HFA05(hfa2) + Sum_HFA05(hfa3) + Sum_HFA05(hfa4) + Sum_HFA05(hfa5) + Sum_HFA05(hfa6) + Sum_HFA05(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8;
-        }
-
-        public static float
-            Add01_HFA08(HFA08 hfa1, float v1, HFA08 hfa2, int v2, HFA08 hfa3, short v3, double v4, HFA08 hfa4, HFA08 hfa5, float v5, long v6, float v7, HFA08 hfa6, float v8, HFA08 hfa7)
-        {
-            return (Sum_HFA08(hfa1) + Sum_HFA08(hfa2) + Sum_HFA08(hfa3) + Sum_HFA08(hfa4) + Sum_HFA08(hfa5) + Sum_HFA08(hfa6) + Sum_HFA08(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8;
-        }
-
-        public static float
-            Add01_HFA11(HFA11 hfa1, float v1, HFA11 hfa2, int v2, HFA11 hfa3, short v3, double v4, HFA11 hfa4, HFA11 hfa5, float v5, long v6, float v7, HFA11 hfa6, float v8, HFA11 hfa7)
-        {
-            return (Sum_HFA11(hfa1) + Sum_HFA11(hfa2) + Sum_HFA11(hfa3) + Sum_HFA11(hfa4) + Sum_HFA11(hfa5) + Sum_HFA11(hfa6) + Sum_HFA11(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8;
-        }
-
-        public static float
-            Add01_HFA19(HFA19 hfa1, float v1, HFA19 hfa2, int v2, HFA19 hfa3, short v3, double v4, HFA19 hfa4, HFA19 hfa5, float v5, long v6, float v7, HFA19 hfa6, float v8, HFA19 hfa7)
-        {
-            return (Sum_HFA19(hfa1) + Sum_HFA19(hfa2) + Sum_HFA19(hfa3) + Sum_HFA19(hfa4) + Sum_HFA19(hfa5) + Sum_HFA19(hfa6) + Sum_HFA19(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8;
-        }
-
-        public static float
-            Add01_HFA00(HFA03 hfa1, float v1, HFA02 hfa2, int v2, HFA19 hfa3, short v3, double v4, HFA05 hfa4, HFA08 hfa5, float v5, long v6, float v7, HFA11 hfa6, float v8, HFA01 hfa7)
-        {
-            return (Sum_HFA03(hfa1) + Sum_HFA02(hfa2) + Sum_HFA19(hfa3) + Sum_HFA05(hfa4) + Sum_HFA08(hfa5) + Sum_HFA11(hfa6) + Sum_HFA01(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8;
-        }
-
-
-        // --------------------------------------------------------------
-        // Add02 methods
-        // --------------------------------------------------------------
-
-        public static float
-            Add02_HFA01(HFA01 hfa1, HFA01 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA01 hfa3, double v7, float v8, HFA01 hfa4, short v9, HFA01 hfa5, float v10, HFA01 hfa6, HFA01 hfa7)
-        {
-            return (Sum_HFA01(hfa1) + Sum_HFA01(hfa2) + Sum_HFA01(hfa3) + Sum_HFA01(hfa4) + Sum_HFA01(hfa5) + Sum_HFA01(hfa6) + Sum_HFA01(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static float
-            Add02_HFA02(HFA02 hfa1, HFA02 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA02 hfa3, double v7, float v8, HFA02 hfa4, short v9, HFA02 hfa5, float v10, HFA02 hfa6, HFA02 hfa7)
-        {
-            return (Sum_HFA02(hfa1) + Sum_HFA02(hfa2) + Sum_HFA02(hfa3) + Sum_HFA02(hfa4) + Sum_HFA02(hfa5) + Sum_HFA02(hfa6) + Sum_HFA02(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static float
-            Add02_HFA03(HFA03 hfa1, HFA03 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA03 hfa3, double v7, float v8, HFA03 hfa4, short v9, HFA03 hfa5, float v10, HFA03 hfa6, HFA03 hfa7)
-        {
-            return (Sum_HFA03(hfa1) + Sum_HFA03(hfa2) + Sum_HFA03(hfa3) + Sum_HFA03(hfa4) + Sum_HFA03(hfa5) + Sum_HFA03(hfa6) + Sum_HFA03(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static float
-            Add02_HFA05(HFA05 hfa1, HFA05 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA05 hfa3, double v7, float v8, HFA05 hfa4, short v9, HFA05 hfa5, float v10, HFA05 hfa6, HFA05 hfa7)
-        {
-            return (Sum_HFA05(hfa1) + Sum_HFA05(hfa2) + Sum_HFA05(hfa3) + Sum_HFA05(hfa4) + Sum_HFA05(hfa5) + Sum_HFA05(hfa6) + Sum_HFA05(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static float
-            Add02_HFA08(HFA08 hfa1, HFA08 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA08 hfa3, double v7, float v8, HFA08 hfa4, short v9, HFA08 hfa5, float v10, HFA08 hfa6, HFA08 hfa7)
-        {
-            return (Sum_HFA08(hfa1) + Sum_HFA08(hfa2) + Sum_HFA08(hfa3) + Sum_HFA08(hfa4) + Sum_HFA08(hfa5) + Sum_HFA08(hfa6) + Sum_HFA08(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static float
-            Add02_HFA11(HFA11 hfa1, HFA11 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA11 hfa3, double v7, float v8, HFA11 hfa4, short v9, HFA11 hfa5, float v10, HFA11 hfa6, HFA11 hfa7)
-        {
-            return (Sum_HFA11(hfa1) + Sum_HFA11(hfa2) + Sum_HFA11(hfa3) + Sum_HFA11(hfa4) + Sum_HFA11(hfa5) + Sum_HFA11(hfa6) + Sum_HFA11(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-
-        public static float
-            Add02_HFA19(HFA19 hfa1, HFA19 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA19 hfa3, double v7, float v8, HFA19 hfa4, short v9, HFA19 hfa5, float v10, HFA19 hfa6, HFA19 hfa7)
-        {
-            return (Sum_HFA19(hfa1) + Sum_HFA19(hfa2) + Sum_HFA19(hfa3) + Sum_HFA19(hfa4) + Sum_HFA19(hfa5) + Sum_HFA19(hfa6) + Sum_HFA19(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static float
-            Add02_HFA00(HFA01 hfa1, HFA05 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA03 hfa3, double v7, float v8, HFA11 hfa4, short v9, HFA19 hfa5, float v10, HFA08 hfa6, HFA02 hfa7)
-        {
-            return (Sum_HFA01(hfa1) + Sum_HFA05(hfa2) + Sum_HFA03(hfa3) + Sum_HFA11(hfa4) + Sum_HFA19(hfa5) + Sum_HFA08(hfa6) + Sum_HFA02(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-
-        // --------------------------------------------------------------
-        // Add03 methods
-        // --------------------------------------------------------------
-
-        public static float
-            Add03_HFA01(float v1, sbyte v2, HFA01 hfa1, double v3, sbyte v4, HFA01 hfa2, long v5, short v6, int v7, HFA01 hfa3, HFA01 hfa4, float v8, HFA01 hfa5, float v9, HFA01 hfa6, float v10, HFA01 hfa7)
-        {
-            return (Sum_HFA01(hfa1) + Sum_HFA01(hfa2) + Sum_HFA01(hfa3) + Sum_HFA01(hfa4) + Sum_HFA01(hfa5) + Sum_HFA01(hfa6) + Sum_HFA01(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static float
-            Add03_HFA02(float v1, sbyte v2, HFA02 hfa1, double v3, sbyte v4, HFA02 hfa2, long v5, short v6, int v7, HFA02 hfa3, HFA02 hfa4, float v8, HFA02 hfa5, float v9, HFA02 hfa6, float v10, HFA02 hfa7)
-        {
-            return (Sum_HFA02(hfa1) + Sum_HFA02(hfa2) + Sum_HFA02(hfa3) + Sum_HFA02(hfa4) + Sum_HFA02(hfa5) + Sum_HFA02(hfa6) + Sum_HFA02(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static float
-            Add03_HFA03(float v1, sbyte v2, HFA03 hfa1, double v3, sbyte v4, HFA03 hfa2, long v5, short v6, int v7, HFA03 hfa3, HFA03 hfa4, float v8, HFA03 hfa5, float v9, HFA03 hfa6, float v10, HFA03 hfa7)
-        {
-            return (Sum_HFA03(hfa1) + Sum_HFA03(hfa2) + Sum_HFA03(hfa3) + Sum_HFA03(hfa4) + Sum_HFA03(hfa5) + Sum_HFA03(hfa6) + Sum_HFA03(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static float
-            Add03_HFA05(float v1, sbyte v2, HFA05 hfa1, double v3, sbyte v4, HFA05 hfa2, long v5, short v6, int v7, HFA05 hfa3, HFA05 hfa4, float v8, HFA05 hfa5, float v9, HFA05 hfa6, float v10, HFA05 hfa7)
-        {
-            return (Sum_HFA05(hfa1) + Sum_HFA05(hfa2) + Sum_HFA05(hfa3) + Sum_HFA05(hfa4) + Sum_HFA05(hfa5) + Sum_HFA05(hfa6) + Sum_HFA05(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static float
-            Add03_HFA08(float v1, sbyte v2, HFA08 hfa1, double v3, sbyte v4, HFA08 hfa2, long v5, short v6, int v7, HFA08 hfa3, HFA08 hfa4, float v8, HFA08 hfa5, float v9, HFA08 hfa6, float v10, HFA08 hfa7)
-        {
-            return (Sum_HFA08(hfa1) + Sum_HFA08(hfa2) + Sum_HFA08(hfa3) + Sum_HFA08(hfa4) + Sum_HFA08(hfa5) + Sum_HFA08(hfa6) + Sum_HFA08(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static float
-            Add03_HFA11(float v1, sbyte v2, HFA11 hfa1, double v3, sbyte v4, HFA11 hfa2, long v5, short v6, int v7, HFA11 hfa3, HFA11 hfa4, float v8, HFA11 hfa5, float v9, HFA11 hfa6, float v10, HFA11 hfa7)
-        {
-            return (Sum_HFA11(hfa1) + Sum_HFA11(hfa2) + Sum_HFA11(hfa3) + Sum_HFA11(hfa4) + Sum_HFA11(hfa5) + Sum_HFA11(hfa6) + Sum_HFA11(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static float
-            Add03_HFA19(float v1, sbyte v2, HFA19 hfa1, double v3, sbyte v4, HFA19 hfa2, long v5, short v6, int v7, HFA19 hfa3, HFA19 hfa4, float v8, HFA19 hfa5, float v9, HFA19 hfa6, float v10, HFA19 hfa7)
-        {
-            return (Sum_HFA19(hfa1) + Sum_HFA19(hfa2) + Sum_HFA19(hfa3) + Sum_HFA19(hfa4) + Sum_HFA19(hfa5) + Sum_HFA19(hfa6) + Sum_HFA19(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static float
-            Add03_HFA00(float v1, sbyte v2, HFA08 hfa1, double v3, sbyte v4, HFA19 hfa2, long v5, short v6, int v7, HFA03 hfa3, HFA01 hfa4, float v8, HFA11 hfa5, float v9, HFA02 hfa6, float v10, HFA05 hfa7)
-        {
-            return (Sum_HFA08(hfa1) + Sum_HFA19(hfa2) + Sum_HFA03(hfa3) + Sum_HFA01(hfa4) + Sum_HFA11(hfa5) + Sum_HFA02(hfa6) + Sum_HFA05(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-
-    }
-}
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_managed_nf.csproj b/tests/src/JIT/jit64/hfa/main/dll/hfa_managed_nf.csproj
deleted file mode 100644
index 89bd338353..0000000000
--- a/tests/src/JIT/jit64/hfa/main/dll/hfa_managed_nf.csproj
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <CLRTestKind>BuildOnly</CLRTestKind>
-   <GenerateRunScript>false</GenerateRunScript> 
-  </PropertyGroup>
-  <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
-  <ItemGroup>
-    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
-      <Visible>False</Visible>
-    </CodeAnalysisDependentAssemblyPaths>
-  </ItemGroup>
-  <PropertyGroup>
-    <DebugType></DebugType>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="hfa_managed_nf.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)extra\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="hfa_common_nf.csproj" />
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_managed_sd.csproj b/tests/src/JIT/jit64/hfa/main/dll/hfa_managed_sd.csproj
deleted file mode 100644
index 7e2792b4c5..0000000000
--- a/tests/src/JIT/jit64/hfa/main/dll/hfa_managed_sd.csproj
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <CLRTestKind>BuildOnly</CLRTestKind>
-   <GenerateRunScript>false</GenerateRunScript> 
-  </PropertyGroup>
-  <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
-  <ItemGroup>
-    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
-      <Visible>False</Visible>
-    </CodeAnalysisDependentAssemblyPaths>
-  </ItemGroup>
-  <PropertyGroup>
-    <DebugType></DebugType>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="hfa_managed_sd.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)extra\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="hfa_common_sd.csproj" />
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_managed_sf.cs b/tests/src/JIT/jit64/hfa/main/dll/hfa_managed_sf.cs
deleted file mode 100644
index b30b0b62c6..0000000000
--- a/tests/src/JIT/jit64/hfa/main/dll/hfa_managed_sf.cs
+++ /dev/null
@@ -1,983 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace HFATest
-{
-
-    public class TestMan
-    {
-
-
-        public const float EXPECTED_SUM_HFA01 = 1;
-        public const float EXPECTED_SUM_HFA02 = 3;
-        public const float EXPECTED_SUM_HFA03 = 6;
-        public const float EXPECTED_SUM_HFA05 = 15;
-        public const float EXPECTED_SUM_HFA08 = 36;
-        public const float EXPECTED_SUM_HFA11 = 66;
-        public const float EXPECTED_SUM_HFA19 = 190;
-
-
-        // --------------------------------------------------------------
-        // Init methods
-        // --------------------------------------------------------------
-
-        public static void Init_HFA01(out HFA01 hfa)
-        {
-            hfa.f1 = 1;
-        }
-
-        public static void Init_HFA02(out HFA02 hfa)
-        {
-            hfa.f1 = 1;
-            hfa.f2 = 2;
-        }
-
-        public static void Init_HFA03(out HFA03 hfa)
-        {
-            hfa.f1 = 1;
-            hfa.f2 = 2;
-            hfa.f3 = 3;
-        }
-
-        public static void Init_HFA05(out HFA05 hfa)
-        {
-            hfa.f1 = 1;
-            hfa.f2 = 2;
-            hfa.f3 = 3;
-            hfa.f4 = 4;
-            hfa.f5 = 5;
-        }
-
-        public static void Init_HFA08(out HFA08 hfa)
-        {
-            hfa.f1 = 1;
-            hfa.f2 = 2;
-            hfa.f3 = 3;
-            hfa.f4 = 4;
-            hfa.f5 = 5;
-            hfa.f6 = 6;
-            hfa.f7 = 7;
-            hfa.f8 = 8;
-        }
-
-        public static void Init_HFA11(out HFA11 hfa)
-        {
-            hfa.f1 = 1;
-            hfa.f2 = 2;
-            hfa.f3 = 3;
-            hfa.f4 = 4;
-            hfa.f5 = 5;
-            hfa.f6 = 6;
-            hfa.f7 = 7;
-            hfa.f8 = 8;
-            hfa.f9 = 9;
-            hfa.f10 = 10;
-            hfa.f11 = 11;
-        }
-
-        public static void Init_HFA19(out HFA19 hfa)
-        {
-            hfa.f1 = 1;
-            hfa.f2 = 2;
-            hfa.f3 = 3;
-            hfa.f4 = 4;
-            hfa.f5 = 5;
-            hfa.f6 = 6;
-            hfa.f7 = 7;
-            hfa.f8 = 8;
-            hfa.f9 = 9;
-            hfa.f10 = 10;
-            hfa.f11 = 11;
-            hfa.f12 = 12;
-            hfa.f13 = 13;
-            hfa.f14 = 14;
-            hfa.f15 = 15;
-            hfa.f16 = 16;
-            hfa.f17 = 17;
-            hfa.f18 = 18;
-            hfa.f19 = 19;
-        }
-
-
-
-        // --------------------------------------------------------------
-        // Identity methods
-        // --------------------------------------------------------------
-
-        public static HFA01 Identity_HFA01(HFA01 hfa)
-        {
-            return hfa;
-        }
-
-        public static HFA02 Identity_HFA02(HFA02 hfa)
-        {
-            return hfa;
-        }
-
-        public static HFA03 Identity_HFA03(HFA03 hfa)
-        {
-            return hfa;
-        }
-
-        public static HFA05 Identity_HFA05(HFA05 hfa)
-        {
-            return hfa;
-        }
-
-        public static HFA08 Identity_HFA08(HFA08 hfa)
-        {
-            return hfa;
-        }
-
-        public static HFA11 Identity_HFA11(HFA11 hfa)
-        {
-            return hfa;
-        }
-
-        public static HFA19 Identity_HFA19(HFA19 hfa)
-        {
-            return hfa;
-        }
-
-
-        // --------------------------------------------------------------
-        // Get methods
-        // --------------------------------------------------------------
-
-        public static HFA01 Get_HFA01()
-        {
-            HFA01 hfa;
-            Init_HFA01(out hfa);
-            return hfa;
-        }
-
-        public static HFA02 Get_HFA02()
-        {
-            HFA02 hfa;
-            Init_HFA02(out hfa);
-            return hfa;
-        }
-
-        public static HFA03 Get_HFA03()
-        {
-            HFA03 hfa;
-            Init_HFA03(out hfa);
-            return hfa;
-        }
-
-        public static HFA05 Get_HFA05()
-        {
-            HFA05 hfa;
-            Init_HFA05(out hfa);
-            return hfa;
-        }
-
-        public static HFA08 Get_HFA08()
-        {
-            HFA08 hfa;
-            Init_HFA08(out hfa);
-            return hfa;
-        }
-
-        public static HFA11 Get_HFA11()
-        {
-            HFA11 hfa;
-            Init_HFA11(out hfa);
-            return hfa;
-        }
-
-        public static HFA19 Get_HFA19()
-        {
-            HFA19 hfa;
-            Init_HFA19(out hfa);
-            return hfa;
-        }
-
-
-        // --------------------------------------------------------------
-        // Sum methods
-        // --------------------------------------------------------------
-
-        public static float
-            Sum_HFA01(HFA01 hfa)
-        {
-            return hfa.f1;
-        }
-
-        public static float
-            Sum_HFA02(HFA02 hfa)
-        {
-            return hfa.f1 + hfa.f2;
-        }
-
-        public static float
-            Sum_HFA03(HFA03 hfa)
-        {
-            return hfa.f1 + hfa.f2 + hfa.f3;
-        }
-
-        public static float
-            Sum_HFA05(HFA05 hfa)
-        {
-            return hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5;
-        }
-
-        public static float
-            Sum_HFA08(HFA08 hfa)
-        {
-            return hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5 + hfa.f6 + hfa.f7 + hfa.f8;
-        }
-
-        public static float
-            Sum_HFA11(HFA11 hfa)
-        {
-            return hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5 + hfa.f6 + hfa.f7 + hfa.f8 + hfa.f9 + hfa.f10 + hfa.f11;
-        }
-
-
-        public static float
-            Sum_HFA19(HFA19 hfa)
-        {
-            return hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5 + hfa.f6 + hfa.f7 + hfa.f8 + hfa.f9 + hfa.f10 + hfa.f11 + hfa.f12 + hfa.f13 + hfa.f14 + hfa.f15 + hfa.f16 + hfa.f17 + hfa.f18 + hfa.f19;
-        }
-
-
-
-        // --------------------------------------------------------------
-        // Sum3 methods
-        // --------------------------------------------------------------
-
-        public static float
-            Sum3_HFA01(float v1, long v2, HFA01 hfa)
-        {
-            return (float)v1 + (float)v2 + hfa.f1;
-        }
-
-        public static float
-            Sum3_HFA02(float v1, long v2, HFA02 hfa)
-        {
-            return (float)v1 + (float)v2 +
-                hfa.f1 + hfa.f2;
-        }
-
-        public static float
-            Sum3_HFA03(float v1, long v2, HFA03 hfa)
-        {
-            return (float)v1 + (float)v2 +
-                hfa.f1 + hfa.f2 + hfa.f3;
-        }
-
-        public static float
-            Sum3_HFA05(float v1, long v2, HFA05 hfa)
-        {
-            return (float)v1 + (float)v2 +
-                hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5;
-        }
-
-        public static float
-            Sum3_HFA08(float v1, long v2, HFA08 hfa)
-        {
-            return (float)v1 + (float)v2 +
-                hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5 + hfa.f6 + hfa.f7 + hfa.f8;
-        }
-
-        public static float
-            Sum3_HFA11(float v1, long v2, HFA11 hfa)
-        {
-            return (float)v1 + (float)v2 +
-                hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5 + hfa.f6 + hfa.f7 + hfa.f8 + hfa.f9 + hfa.f10 + hfa.f11;
-        }
-
-        public static float
-            Sum3_HFA19(float v1, long v2, HFA19 hfa)
-        {
-            return (float)v1 + (float)v2 +
-                hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5 + hfa.f6 + hfa.f7 + hfa.f8 + hfa.f9 + hfa.f10 + hfa.f11 + hfa.f12 + hfa.f13 + hfa.f14 + hfa.f15 + hfa.f16 + hfa.f17 + hfa.f18 + hfa.f19;
-        }
-
-
-
-        // --------------------------------------------------------------
-        // Sum5 methods
-        // --------------------------------------------------------------
-
-        public static float
-            Sum5_HFA01(long v1, double v2, int v3, sbyte v4, HFA01 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 +
-                hfa.f1;
-        }
-
-        public static float
-            Sum5_HFA02(long v1, double v2, int v3, sbyte v4, HFA02 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 +
-                hfa.f1 + hfa.f2;
-        }
-
-        public static float
-            Sum5_HFA03(long v1, double v2, int v3, sbyte v4, HFA03 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 +
-                hfa.f1 + hfa.f2 + hfa.f3;
-        }
-
-        public static float
-            Sum5_HFA05(long v1, double v2, int v3, sbyte v4, HFA05 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 +
-                hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5;
-        }
-
-        public static float
-            Sum5_HFA08(long v1, double v2, int v3, sbyte v4, HFA08 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 +
-                hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5 + hfa.f6 + hfa.f7 + hfa.f8;
-        }
-
-        public static float
-            Sum5_HFA11(long v1, double v2, int v3, sbyte v4, HFA11 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 +
-                hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5 + hfa.f6 + hfa.f7 + hfa.f8 + hfa.f9 + hfa.f10 + hfa.f11;
-        }
-
-        public static float
-            Sum5_HFA19(long v1, double v2, int v3, sbyte v4, HFA19 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 +
-                hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5 + hfa.f6 + hfa.f7 + hfa.f8 + hfa.f9 + hfa.f10 + hfa.f11 + hfa.f12 + hfa.f13 + hfa.f14 + hfa.f15 + hfa.f16 + hfa.f17 + hfa.f18 + hfa.f19;
-        }
-
-
-
-        // --------------------------------------------------------------
-        // Sum8 methods
-        // --------------------------------------------------------------
-
-        public static float
-            Sum8_HFA01(float v1, double v2, long v3, sbyte v4, double v5, HFA01 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 +
-                hfa.f1;
-        }
-
-        public static float
-            Sum8_HFA02(float v1, double v2, long v3, sbyte v4, double v5, HFA02 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 +
-                hfa.f1 + hfa.f2;
-        }
-
-        public static float
-            Sum8_HFA03(float v1, double v2, long v3, sbyte v4, double v5, HFA03 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 +
-                hfa.f1 + hfa.f2 + hfa.f3;
-        }
-
-        public static float
-            Sum8_HFA05(float v1, double v2, long v3, sbyte v4, double v5, HFA05 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 +
-                hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5;
-        }
-
-        public static float
-            Sum8_HFA08(float v1, double v2, long v3, sbyte v4, double v5, HFA08 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 +
-                hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5 + hfa.f6 + hfa.f7 + hfa.f8;
-        }
-
-        public static float
-            Sum8_HFA11(float v1, double v2, long v3, sbyte v4, double v5, HFA11 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 +
-                hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5 + hfa.f6 + hfa.f7 + hfa.f8 + hfa.f9 + hfa.f10 + hfa.f11;
-        }
-
-        public static float
-            Sum8_HFA19(float v1, double v2, long v3, sbyte v4, double v5, HFA19 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 +
-                hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5 + hfa.f6 + hfa.f7 + hfa.f8 + hfa.f9 + hfa.f10 + hfa.f11 + hfa.f12 + hfa.f13 + hfa.f14 + hfa.f15 + hfa.f16 + hfa.f17 + hfa.f18 + hfa.f19;
-        }
-
-
-
-        // --------------------------------------------------------------
-        // Sum11 methods
-        // --------------------------------------------------------------
-
-        public static float
-            Sum11_HFA01(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA01 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 +
-                hfa.f1;
-        }
-
-        public static float
-            Sum11_HFA02(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA02 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 +
-                hfa.f1 + hfa.f2;
-        }
-
-        public static float
-            Sum11_HFA03(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA03 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 +
-                hfa.f1 + hfa.f2 + hfa.f3;
-        }
-
-        public static float
-            Sum11_HFA05(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA05 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 +
-                hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5;
-        }
-
-        public static float
-            Sum11_HFA08(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA08 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 +
-                hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5 + hfa.f6 + hfa.f7 + hfa.f8;
-        }
-
-        public static float
-            Sum11_HFA11(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA11 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 +
-                hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5 + hfa.f6 + hfa.f7 + hfa.f8 + hfa.f9 + hfa.f10 + hfa.f11;
-        }
-
-        public static float
-            Sum11_HFA19(double v1, float v2, float v3, int v4, float v5, long v6, double v7, float v8, HFA19 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 +
-                hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5 + hfa.f6 + hfa.f7 + hfa.f8 + hfa.f9 + hfa.f10 + hfa.f11 + hfa.f12 + hfa.f13 + hfa.f14 + hfa.f15 + hfa.f16 + hfa.f17 + hfa.f18 + hfa.f19;
-        }
-
-
-
-        // --------------------------------------------------------------
-        // Sum19 methods
-        // --------------------------------------------------------------
-
-        public static float
-            Sum19_HFA01(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA01 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10 + (float)v11 + (float)v12 + (float)v13 +
-                hfa.f1;
-        }
-
-        public static float
-            Sum19_HFA02(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA02 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10 + (float)v11 + (float)v12 + (float)v13 +
-                hfa.f1 + hfa.f2;
-        }
-
-        public static float
-            Sum19_HFA03(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA03 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10 + (float)v11 + (float)v12 + (float)v13 +
-                hfa.f1 + hfa.f2 + hfa.f3;
-        }
-
-        public static float
-            Sum19_HFA05(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA05 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10 + (float)v11 + (float)v12 + (float)v13 +
-                hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5;
-        }
-
-        public static float
-            Sum19_HFA08(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA08 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10 + (float)v11 + (float)v12 + (float)v13 +
-                hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5 + hfa.f6 + hfa.f7 + hfa.f8;
-        }
-
-        public static float
-            Sum19_HFA11(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA11 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10 + (float)v11 + (float)v12 + (float)v13 +
-                hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5 + hfa.f6 + hfa.f7 + hfa.f8 + hfa.f9 + hfa.f10 + hfa.f11;
-        }
-
-        public static float
-            Sum19_HFA19(float v1, double v2, float v3, double v4, float v5, double v6, float v7, double v8, float v9, double v10, float v11, double v12, float v13, HFA19 hfa)
-        {
-            return (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10 + (float)v11 + (float)v12 + (float)v13 +
-                hfa.f1 + hfa.f2 + hfa.f3 + hfa.f4 + hfa.f5 + hfa.f6 + hfa.f7 + hfa.f8 + hfa.f9 + hfa.f10 + hfa.f11 + hfa.f12 + hfa.f13 + hfa.f14 + hfa.f15 + hfa.f16 + hfa.f17 + hfa.f18 + hfa.f19;
-        }
-
-
-
-
-        // --------------------------------------------------------------
-        // Average methods
-        // --------------------------------------------------------------
-
-        public static float
-            Average_HFA01(HFA01 hfa)
-        {
-            return Sum_HFA01(hfa) / 1;
-        }
-
-        public static float
-            Average_HFA02(HFA02 hfa)
-        {
-            return Sum_HFA02(hfa) / 2;
-        }
-
-        public static float
-            Average_HFA03(HFA03 hfa)
-        {
-            return Sum_HFA03(hfa) / 3;
-        }
-
-        public static float
-            Average_HFA05(HFA05 hfa)
-        {
-            return Sum_HFA05(hfa) / 5;
-        }
-
-        public static float
-            Average_HFA08(HFA08 hfa)
-        {
-            return Sum_HFA08(hfa) / 8;
-        }
-
-        public static float
-            Average_HFA11(HFA11 hfa)
-        {
-            return Sum_HFA11(hfa) / 11;
-        }
-
-        public static float
-            Average_HFA19(HFA19 hfa)
-        {
-            return Sum_HFA19(hfa) / 19;
-        }
-
-
-        // --------------------------------------------------------------
-        // Average3 methods
-        // --------------------------------------------------------------
-
-        public static float
-            Average3_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3)
-        {
-            return (Average_HFA01(hfa1) + Average_HFA01(hfa2) + Average_HFA01(hfa3)) / 3;
-        }
-
-        public static float
-            Average3_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3)
-        {
-            return (Average_HFA02(hfa1) + Average_HFA02(hfa2) + Average_HFA02(hfa3)) / 3;
-        }
-
-        public static float
-            Average3_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3)
-        {
-            return (Average_HFA03(hfa1) + Average_HFA03(hfa2) + Average_HFA03(hfa3)) / 3;
-        }
-
-        public static float
-            Average3_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3)
-        {
-            return (Average_HFA05(hfa1) + Average_HFA05(hfa2) + Average_HFA05(hfa3)) / 3;
-        }
-
-        public static float
-            Average3_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3)
-        {
-            return (Average_HFA08(hfa1) + Average_HFA08(hfa2) + Average_HFA08(hfa3)) / 3;
-        }
-
-        public static float
-            Average3_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3)
-        {
-            return (Average_HFA11(hfa1) + Average_HFA11(hfa2) + Average_HFA11(hfa3)) / 3;
-        }
-
-
-        public static float
-            Average3_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3)
-        {
-            return (Average_HFA19(hfa1) + Average_HFA19(hfa2) + Average_HFA19(hfa3)) / 3;
-        }
-
-
-        // --------------------------------------------------------------
-        // Average5 methods
-        // --------------------------------------------------------------
-
-        public static float
-            Average5_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5)
-        {
-            return ((Average3_HFA01(hfa1, hfa2, hfa3) * 3) + Average_HFA01(hfa4) + Average_HFA01(hfa5)) / 5;
-        }
-
-        public static float
-            Average5_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5)
-        {
-            return ((Average3_HFA02(hfa1, hfa2, hfa3) * 3) + Average_HFA02(hfa4) + Average_HFA02(hfa5)) / 5;
-        }
-
-        public static float
-            Average5_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5)
-        {
-            return ((Average3_HFA03(hfa1, hfa2, hfa3) * 3) + Average_HFA03(hfa4) + Average_HFA03(hfa5)) / 5;
-        }
-
-        public static float
-            Average5_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5)
-        {
-            return ((Average3_HFA05(hfa1, hfa2, hfa3) * 3) + Average_HFA05(hfa4) + Average_HFA05(hfa5)) / 5;
-        }
-
-        public static float
-            Average5_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5)
-        {
-            return ((Average3_HFA08(hfa1, hfa2, hfa3) * 3) + Average_HFA08(hfa4) + Average_HFA08(hfa5)) / 5;
-        }
-
-        public static float
-            Average5_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5)
-        {
-            return ((Average3_HFA11(hfa1, hfa2, hfa3) * 3) + Average_HFA11(hfa4) + Average_HFA11(hfa5)) / 5;
-        }
-
-
-        public static float
-            Average5_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5)
-        {
-            return ((Average3_HFA19(hfa1, hfa2, hfa3) * 3) + Average_HFA19(hfa4) + Average_HFA19(hfa5)) / 5;
-        }
-
-
-        // --------------------------------------------------------------
-        // Average8 methods
-        // --------------------------------------------------------------
-
-        public static float
-            Average8_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5, HFA01 hfa6, HFA01 hfa7, HFA01 hfa8)
-        {
-            return ((Average3_HFA01(hfa1, hfa2, hfa3) * 3) + (Average5_HFA01(hfa4, hfa5, hfa6, hfa7, hfa8) * 5)) / 8;
-        }
-
-        public static float
-            Average8_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5, HFA02 hfa6, HFA02 hfa7, HFA02 hfa8)
-        {
-            return ((Average3_HFA02(hfa1, hfa2, hfa3) * 3) + (Average5_HFA02(hfa4, hfa5, hfa6, hfa7, hfa8) * 5)) / 8;
-        }
-
-        public static float
-            Average8_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5, HFA03 hfa6, HFA03 hfa7, HFA03 hfa8)
-        {
-            return ((Average3_HFA03(hfa1, hfa2, hfa3) * 3) + (Average5_HFA03(hfa4, hfa5, hfa6, hfa7, hfa8) * 5)) / 8;
-        }
-
-        public static float
-            Average8_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5, HFA05 hfa6, HFA05 hfa7, HFA05 hfa8)
-        {
-            return ((Average3_HFA05(hfa1, hfa2, hfa3) * 3) + (Average5_HFA05(hfa4, hfa5, hfa6, hfa7, hfa8) * 5)) / 8;
-        }
-
-        public static float
-            Average8_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5, HFA08 hfa6, HFA08 hfa7, HFA08 hfa8)
-        {
-            return ((Average3_HFA08(hfa1, hfa2, hfa3) * 3) + (Average5_HFA08(hfa4, hfa5, hfa6, hfa7, hfa8) * 5)) / 8;
-        }
-
-        public static float
-            Average8_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5, HFA11 hfa6, HFA11 hfa7, HFA11 hfa8)
-        {
-            return ((Average3_HFA11(hfa1, hfa2, hfa3) * 3) + (Average5_HFA11(hfa4, hfa5, hfa6, hfa7, hfa8) * 5)) / 8;
-        }
-
-
-        public static float
-            Average8_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5, HFA19 hfa6, HFA19 hfa7, HFA19 hfa8)
-        {
-            return ((Average3_HFA19(hfa1, hfa2, hfa3) * 3) + (Average5_HFA19(hfa4, hfa5, hfa6, hfa7, hfa8) * 5)) / 8;
-        }
-
-
-        // --------------------------------------------------------------
-        // Average11 methods
-        // --------------------------------------------------------------
-
-        public static float
-            Average11_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5, HFA01 hfa6, HFA01 hfa7, HFA01 hfa8, HFA01 hfa9, HFA01 hfa10, HFA01 hfa11)
-        {
-            return ((Average3_HFA01(hfa1, hfa2, hfa3) * 3) + (Average8_HFA01(hfa4, hfa5, hfa6, hfa7, hfa8, hfa9, hfa10, hfa11) * 8)) / 11;
-        }
-
-
-        public static float
-            Average11_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5, HFA02 hfa6, HFA02 hfa7, HFA02 hfa8, HFA02 hfa9, HFA02 hfa10, HFA02 hfa11)
-        {
-            return ((Average3_HFA02(hfa1, hfa2, hfa3) * 3) + (Average8_HFA02(hfa4, hfa5, hfa6, hfa7, hfa8, hfa9, hfa10, hfa11) * 8)) / 11;
-        }
-
-
-        public static float
-            Average11_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5, HFA03 hfa6, HFA03 hfa7, HFA03 hfa8, HFA03 hfa9, HFA03 hfa10, HFA03 hfa11)
-        {
-            return ((Average3_HFA03(hfa1, hfa2, hfa3) * 3) + (Average8_HFA03(hfa4, hfa5, hfa6, hfa7, hfa8, hfa9, hfa10, hfa11) * 8)) / 11;
-        }
-
-
-        public static float
-            Average11_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5, HFA05 hfa6, HFA05 hfa7, HFA05 hfa8, HFA05 hfa9, HFA05 hfa10, HFA05 hfa11)
-        {
-            return ((Average3_HFA05(hfa1, hfa2, hfa3) * 3) + (Average8_HFA05(hfa4, hfa5, hfa6, hfa7, hfa8, hfa9, hfa10, hfa11) * 8)) / 11;
-        }
-
-
-        public static float
-            Average11_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5, HFA08 hfa6, HFA08 hfa7, HFA08 hfa8, HFA08 hfa9, HFA08 hfa10, HFA08 hfa11)
-        {
-            return ((Average3_HFA08(hfa1, hfa2, hfa3) * 3) + (Average8_HFA08(hfa4, hfa5, hfa6, hfa7, hfa8, hfa9, hfa10, hfa11) * 8)) / 11;
-        }
-
-
-        public static float
-            Average11_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5, HFA11 hfa6, HFA11 hfa7, HFA11 hfa8, HFA11 hfa9, HFA11 hfa10, HFA11 hfa11)
-        {
-            return ((Average3_HFA11(hfa1, hfa2, hfa3) * 3) + (Average8_HFA11(hfa4, hfa5, hfa6, hfa7, hfa8, hfa9, hfa10, hfa11) * 8)) / 11;
-        }
-
-
-        public static float
-            Average11_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5, HFA19 hfa6, HFA19 hfa7, HFA19 hfa8, HFA19 hfa9, HFA19 hfa10, HFA19 hfa11)
-        {
-            return ((Average3_HFA19(hfa1, hfa2, hfa3) * 3) + (Average8_HFA19(hfa4, hfa5, hfa6, hfa7, hfa8, hfa9, hfa10, hfa11) * 8)) / 11;
-        }
-
-
-
-        // --------------------------------------------------------------
-        // Average19 methods
-        // --------------------------------------------------------------
-
-        public static float
-            Average19_HFA01(HFA01 hfa1, HFA01 hfa2, HFA01 hfa3, HFA01 hfa4, HFA01 hfa5, HFA01 hfa6, HFA01 hfa7, HFA01 hfa8, HFA01 hfa9, HFA01 hfa10, HFA01 hfa11, HFA01 hfa12, HFA01 hfa13, HFA01 hfa14, HFA01 hfa15, HFA01 hfa16, HFA01 hfa17, HFA01 hfa18, HFA01 hfa19)
-        {
-            return ((Average8_HFA01(hfa1, hfa2, hfa3, hfa4, hfa5, hfa6, hfa7, hfa8) * 8) + (Average11_HFA01(hfa9, hfa10, hfa11, hfa12, hfa13, hfa14, hfa15, hfa16, hfa17, hfa18, hfa19) * 11)) / 19;
-        }
-
-
-        public static float
-            Average19_HFA02(HFA02 hfa1, HFA02 hfa2, HFA02 hfa3, HFA02 hfa4, HFA02 hfa5, HFA02 hfa6, HFA02 hfa7, HFA02 hfa8, HFA02 hfa9, HFA02 hfa10, HFA02 hfa11, HFA02 hfa12, HFA02 hfa13, HFA02 hfa14, HFA02 hfa15, HFA02 hfa16, HFA02 hfa17, HFA02 hfa18, HFA02 hfa19)
-        {
-            return ((Average8_HFA02(hfa1, hfa2, hfa3, hfa4, hfa5, hfa6, hfa7, hfa8) * 8) + (Average11_HFA02(hfa9, hfa10, hfa11, hfa12, hfa13, hfa14, hfa15, hfa16, hfa17, hfa18, hfa19) * 11)) / 19;
-        }
-
-
-        public static float
-            Average19_HFA03(HFA03 hfa1, HFA03 hfa2, HFA03 hfa3, HFA03 hfa4, HFA03 hfa5, HFA03 hfa6, HFA03 hfa7, HFA03 hfa8, HFA03 hfa9, HFA03 hfa10, HFA03 hfa11, HFA03 hfa12, HFA03 hfa13, HFA03 hfa14, HFA03 hfa15, HFA03 hfa16, HFA03 hfa17, HFA03 hfa18, HFA03 hfa19)
-        {
-            return ((Average8_HFA03(hfa1, hfa2, hfa3, hfa4, hfa5, hfa6, hfa7, hfa8) * 8) + (Average11_HFA03(hfa9, hfa10, hfa11, hfa12, hfa13, hfa14, hfa15, hfa16, hfa17, hfa18, hfa19) * 11)) / 19;
-        }
-
-
-        public static float
-            Average19_HFA05(HFA05 hfa1, HFA05 hfa2, HFA05 hfa3, HFA05 hfa4, HFA05 hfa5, HFA05 hfa6, HFA05 hfa7, HFA05 hfa8, HFA05 hfa9, HFA05 hfa10, HFA05 hfa11, HFA05 hfa12, HFA05 hfa13, HFA05 hfa14, HFA05 hfa15, HFA05 hfa16, HFA05 hfa17, HFA05 hfa18, HFA05 hfa19)
-        {
-            return ((Average8_HFA05(hfa1, hfa2, hfa3, hfa4, hfa5, hfa6, hfa7, hfa8) * 8) + (Average11_HFA05(hfa9, hfa10, hfa11, hfa12, hfa13, hfa14, hfa15, hfa16, hfa17, hfa18, hfa19) * 11)) / 19;
-        }
-
-
-        public static float
-            Average19_HFA08(HFA08 hfa1, HFA08 hfa2, HFA08 hfa3, HFA08 hfa4, HFA08 hfa5, HFA08 hfa6, HFA08 hfa7, HFA08 hfa8, HFA08 hfa9, HFA08 hfa10, HFA08 hfa11, HFA08 hfa12, HFA08 hfa13, HFA08 hfa14, HFA08 hfa15, HFA08 hfa16, HFA08 hfa17, HFA08 hfa18, HFA08 hfa19)
-        {
-            return ((Average8_HFA08(hfa1, hfa2, hfa3, hfa4, hfa5, hfa6, hfa7, hfa8) * 8) + (Average11_HFA08(hfa9, hfa10, hfa11, hfa12, hfa13, hfa14, hfa15, hfa16, hfa17, hfa18, hfa19) * 11)) / 19;
-        }
-
-
-        public static float
-            Average19_HFA11(HFA11 hfa1, HFA11 hfa2, HFA11 hfa3, HFA11 hfa4, HFA11 hfa5, HFA11 hfa6, HFA11 hfa7, HFA11 hfa8, HFA11 hfa9, HFA11 hfa10, HFA11 hfa11, HFA11 hfa12, HFA11 hfa13, HFA11 hfa14, HFA11 hfa15, HFA11 hfa16, HFA11 hfa17, HFA11 hfa18, HFA11 hfa19)
-        {
-            return ((Average8_HFA11(hfa1, hfa2, hfa3, hfa4, hfa5, hfa6, hfa7, hfa8) * 8) + (Average11_HFA11(hfa9, hfa10, hfa11, hfa12, hfa13, hfa14, hfa15, hfa16, hfa17, hfa18, hfa19) * 11)) / 19;
-        }
-
-
-        public static float
-            Average19_HFA19(HFA19 hfa1, HFA19 hfa2, HFA19 hfa3, HFA19 hfa4, HFA19 hfa5, HFA19 hfa6, HFA19 hfa7, HFA19 hfa8, HFA19 hfa9, HFA19 hfa10, HFA19 hfa11, HFA19 hfa12, HFA19 hfa13, HFA19 hfa14, HFA19 hfa15, HFA19 hfa16, HFA19 hfa17, HFA19 hfa18, HFA19 hfa19)
-        {
-            return ((Average8_HFA19(hfa1, hfa2, hfa3, hfa4, hfa5, hfa6, hfa7, hfa8) * 8) + (Average11_HFA19(hfa9, hfa10, hfa11, hfa12, hfa13, hfa14, hfa15, hfa16, hfa17, hfa18, hfa19) * 11)) / 19;
-        }
-
-
-
-
-        // --------------------------------------------------------------
-        // Add01 methods
-        // --------------------------------------------------------------
-
-        public static float
-            Add01_HFA01(HFA01 hfa1, float v1, HFA01 hfa2, int v2, HFA01 hfa3, short v3, double v4, HFA01 hfa4, HFA01 hfa5, float v5, long v6, float v7, HFA01 hfa6, float v8, HFA01 hfa7)
-        {
-            return (Sum_HFA01(hfa1) + Sum_HFA01(hfa2) + Sum_HFA01(hfa3) + Sum_HFA01(hfa4) + Sum_HFA01(hfa5) + Sum_HFA01(hfa6) + Sum_HFA01(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8;
-        }
-
-        public static float
-            Add01_HFA02(HFA02 hfa1, float v1, HFA02 hfa2, int v2, HFA02 hfa3, short v3, double v4, HFA02 hfa4, HFA02 hfa5, float v5, long v6, float v7, HFA02 hfa6, float v8, HFA02 hfa7)
-        {
-            return (Sum_HFA02(hfa1) + Sum_HFA02(hfa2) + Sum_HFA02(hfa3) + Sum_HFA02(hfa4) + Sum_HFA02(hfa5) + Sum_HFA02(hfa6) + Sum_HFA02(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8;
-        }
-
-        public static float
-            Add01_HFA03(HFA03 hfa1, float v1, HFA03 hfa2, int v2, HFA03 hfa3, short v3, double v4, HFA03 hfa4, HFA03 hfa5, float v5, long v6, float v7, HFA03 hfa6, float v8, HFA03 hfa7)
-        {
-            return (Sum_HFA03(hfa1) + Sum_HFA03(hfa2) + Sum_HFA03(hfa3) + Sum_HFA03(hfa4) + Sum_HFA03(hfa5) + Sum_HFA03(hfa6) + Sum_HFA03(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8;
-        }
-
-        public static float
-            Add01_HFA05(HFA05 hfa1, float v1, HFA05 hfa2, int v2, HFA05 hfa3, short v3, double v4, HFA05 hfa4, HFA05 hfa5, float v5, long v6, float v7, HFA05 hfa6, float v8, HFA05 hfa7)
-        {
-            return (Sum_HFA05(hfa1) + Sum_HFA05(hfa2) + Sum_HFA05(hfa3) + Sum_HFA05(hfa4) + Sum_HFA05(hfa5) + Sum_HFA05(hfa6) + Sum_HFA05(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8;
-        }
-
-        public static float
-            Add01_HFA08(HFA08 hfa1, float v1, HFA08 hfa2, int v2, HFA08 hfa3, short v3, double v4, HFA08 hfa4, HFA08 hfa5, float v5, long v6, float v7, HFA08 hfa6, float v8, HFA08 hfa7)
-        {
-            return (Sum_HFA08(hfa1) + Sum_HFA08(hfa2) + Sum_HFA08(hfa3) + Sum_HFA08(hfa4) + Sum_HFA08(hfa5) + Sum_HFA08(hfa6) + Sum_HFA08(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8;
-        }
-
-        public static float
-            Add01_HFA11(HFA11 hfa1, float v1, HFA11 hfa2, int v2, HFA11 hfa3, short v3, double v4, HFA11 hfa4, HFA11 hfa5, float v5, long v6, float v7, HFA11 hfa6, float v8, HFA11 hfa7)
-        {
-            return (Sum_HFA11(hfa1) + Sum_HFA11(hfa2) + Sum_HFA11(hfa3) + Sum_HFA11(hfa4) + Sum_HFA11(hfa5) + Sum_HFA11(hfa6) + Sum_HFA11(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8;
-        }
-
-        public static float
-            Add01_HFA19(HFA19 hfa1, float v1, HFA19 hfa2, int v2, HFA19 hfa3, short v3, double v4, HFA19 hfa4, HFA19 hfa5, float v5, long v6, float v7, HFA19 hfa6, float v8, HFA19 hfa7)
-        {
-            return (Sum_HFA19(hfa1) + Sum_HFA19(hfa2) + Sum_HFA19(hfa3) + Sum_HFA19(hfa4) + Sum_HFA19(hfa5) + Sum_HFA19(hfa6) + Sum_HFA19(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8;
-        }
-
-        public static float
-            Add01_HFA00(HFA03 hfa1, float v1, HFA02 hfa2, int v2, HFA19 hfa3, short v3, double v4, HFA05 hfa4, HFA08 hfa5, float v5, long v6, float v7, HFA11 hfa6, float v8, HFA01 hfa7)
-        {
-            return (Sum_HFA03(hfa1) + Sum_HFA02(hfa2) + Sum_HFA19(hfa3) + Sum_HFA05(hfa4) + Sum_HFA08(hfa5) + Sum_HFA11(hfa6) + Sum_HFA01(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8;
-        }
-
-
-        // --------------------------------------------------------------
-        // Add02 methods
-        // --------------------------------------------------------------
-
-        public static float
-            Add02_HFA01(HFA01 hfa1, HFA01 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA01 hfa3, double v7, float v8, HFA01 hfa4, short v9, HFA01 hfa5, float v10, HFA01 hfa6, HFA01 hfa7)
-        {
-            return (Sum_HFA01(hfa1) + Sum_HFA01(hfa2) + Sum_HFA01(hfa3) + Sum_HFA01(hfa4) + Sum_HFA01(hfa5) + Sum_HFA01(hfa6) + Sum_HFA01(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static float
-            Add02_HFA02(HFA02 hfa1, HFA02 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA02 hfa3, double v7, float v8, HFA02 hfa4, short v9, HFA02 hfa5, float v10, HFA02 hfa6, HFA02 hfa7)
-        {
-            return (Sum_HFA02(hfa1) + Sum_HFA02(hfa2) + Sum_HFA02(hfa3) + Sum_HFA02(hfa4) + Sum_HFA02(hfa5) + Sum_HFA02(hfa6) + Sum_HFA02(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static float
-            Add02_HFA03(HFA03 hfa1, HFA03 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA03 hfa3, double v7, float v8, HFA03 hfa4, short v9, HFA03 hfa5, float v10, HFA03 hfa6, HFA03 hfa7)
-        {
-            return (Sum_HFA03(hfa1) + Sum_HFA03(hfa2) + Sum_HFA03(hfa3) + Sum_HFA03(hfa4) + Sum_HFA03(hfa5) + Sum_HFA03(hfa6) + Sum_HFA03(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static float
-            Add02_HFA05(HFA05 hfa1, HFA05 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA05 hfa3, double v7, float v8, HFA05 hfa4, short v9, HFA05 hfa5, float v10, HFA05 hfa6, HFA05 hfa7)
-        {
-            return (Sum_HFA05(hfa1) + Sum_HFA05(hfa2) + Sum_HFA05(hfa3) + Sum_HFA05(hfa4) + Sum_HFA05(hfa5) + Sum_HFA05(hfa6) + Sum_HFA05(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static float
-            Add02_HFA08(HFA08 hfa1, HFA08 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA08 hfa3, double v7, float v8, HFA08 hfa4, short v9, HFA08 hfa5, float v10, HFA08 hfa6, HFA08 hfa7)
-        {
-            return (Sum_HFA08(hfa1) + Sum_HFA08(hfa2) + Sum_HFA08(hfa3) + Sum_HFA08(hfa4) + Sum_HFA08(hfa5) + Sum_HFA08(hfa6) + Sum_HFA08(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static float
-            Add02_HFA11(HFA11 hfa1, HFA11 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA11 hfa3, double v7, float v8, HFA11 hfa4, short v9, HFA11 hfa5, float v10, HFA11 hfa6, HFA11 hfa7)
-        {
-            return (Sum_HFA11(hfa1) + Sum_HFA11(hfa2) + Sum_HFA11(hfa3) + Sum_HFA11(hfa4) + Sum_HFA11(hfa5) + Sum_HFA11(hfa6) + Sum_HFA11(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-
-        public static float
-            Add02_HFA19(HFA19 hfa1, HFA19 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA19 hfa3, double v7, float v8, HFA19 hfa4, short v9, HFA19 hfa5, float v10, HFA19 hfa6, HFA19 hfa7)
-        {
-            return (Sum_HFA19(hfa1) + Sum_HFA19(hfa2) + Sum_HFA19(hfa3) + Sum_HFA19(hfa4) + Sum_HFA19(hfa5) + Sum_HFA19(hfa6) + Sum_HFA19(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static float
-            Add02_HFA00(HFA01 hfa1, HFA05 hfa2, long v1, short v2, float v3, int v4, double v5, float v6, HFA03 hfa3, double v7, float v8, HFA11 hfa4, short v9, HFA19 hfa5, float v10, HFA08 hfa6, HFA02 hfa7)
-        {
-            return (Sum_HFA01(hfa1) + Sum_HFA05(hfa2) + Sum_HFA03(hfa3) + Sum_HFA11(hfa4) + Sum_HFA19(hfa5) + Sum_HFA08(hfa6) + Sum_HFA02(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-
-        // --------------------------------------------------------------
-        // Add03 methods
-        // --------------------------------------------------------------
-
-        public static float
-            Add03_HFA01(float v1, sbyte v2, HFA01 hfa1, double v3, sbyte v4, HFA01 hfa2, long v5, short v6, int v7, HFA01 hfa3, HFA01 hfa4, float v8, HFA01 hfa5, float v9, HFA01 hfa6, float v10, HFA01 hfa7)
-        {
-            return (Sum_HFA01(hfa1) + Sum_HFA01(hfa2) + Sum_HFA01(hfa3) + Sum_HFA01(hfa4) + Sum_HFA01(hfa5) + Sum_HFA01(hfa6) + Sum_HFA01(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static float
-            Add03_HFA02(float v1, sbyte v2, HFA02 hfa1, double v3, sbyte v4, HFA02 hfa2, long v5, short v6, int v7, HFA02 hfa3, HFA02 hfa4, float v8, HFA02 hfa5, float v9, HFA02 hfa6, float v10, HFA02 hfa7)
-        {
-            return (Sum_HFA02(hfa1) + Sum_HFA02(hfa2) + Sum_HFA02(hfa3) + Sum_HFA02(hfa4) + Sum_HFA02(hfa5) + Sum_HFA02(hfa6) + Sum_HFA02(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static float
-            Add03_HFA03(float v1, sbyte v2, HFA03 hfa1, double v3, sbyte v4, HFA03 hfa2, long v5, short v6, int v7, HFA03 hfa3, HFA03 hfa4, float v8, HFA03 hfa5, float v9, HFA03 hfa6, float v10, HFA03 hfa7)
-        {
-            return (Sum_HFA03(hfa1) + Sum_HFA03(hfa2) + Sum_HFA03(hfa3) + Sum_HFA03(hfa4) + Sum_HFA03(hfa5) + Sum_HFA03(hfa6) + Sum_HFA03(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static float
-            Add03_HFA05(float v1, sbyte v2, HFA05 hfa1, double v3, sbyte v4, HFA05 hfa2, long v5, short v6, int v7, HFA05 hfa3, HFA05 hfa4, float v8, HFA05 hfa5, float v9, HFA05 hfa6, float v10, HFA05 hfa7)
-        {
-            return (Sum_HFA05(hfa1) + Sum_HFA05(hfa2) + Sum_HFA05(hfa3) + Sum_HFA05(hfa4) + Sum_HFA05(hfa5) + Sum_HFA05(hfa6) + Sum_HFA05(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static float
-            Add03_HFA08(float v1, sbyte v2, HFA08 hfa1, double v3, sbyte v4, HFA08 hfa2, long v5, short v6, int v7, HFA08 hfa3, HFA08 hfa4, float v8, HFA08 hfa5, float v9, HFA08 hfa6, float v10, HFA08 hfa7)
-        {
-            return (Sum_HFA08(hfa1) + Sum_HFA08(hfa2) + Sum_HFA08(hfa3) + Sum_HFA08(hfa4) + Sum_HFA08(hfa5) + Sum_HFA08(hfa6) + Sum_HFA08(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static float
-            Add03_HFA11(float v1, sbyte v2, HFA11 hfa1, double v3, sbyte v4, HFA11 hfa2, long v5, short v6, int v7, HFA11 hfa3, HFA11 hfa4, float v8, HFA11 hfa5, float v9, HFA11 hfa6, float v10, HFA11 hfa7)
-        {
-            return (Sum_HFA11(hfa1) + Sum_HFA11(hfa2) + Sum_HFA11(hfa3) + Sum_HFA11(hfa4) + Sum_HFA11(hfa5) + Sum_HFA11(hfa6) + Sum_HFA11(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static float
-            Add03_HFA19(float v1, sbyte v2, HFA19 hfa1, double v3, sbyte v4, HFA19 hfa2, long v5, short v6, int v7, HFA19 hfa3, HFA19 hfa4, float v8, HFA19 hfa5, float v9, HFA19 hfa6, float v10, HFA19 hfa7)
-        {
-            return (Sum_HFA19(hfa1) + Sum_HFA19(hfa2) + Sum_HFA19(hfa3) + Sum_HFA19(hfa4) + Sum_HFA19(hfa5) + Sum_HFA19(hfa6) + Sum_HFA19(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-        public static float
-            Add03_HFA00(float v1, sbyte v2, HFA08 hfa1, double v3, sbyte v4, HFA19 hfa2, long v5, short v6, int v7, HFA03 hfa3, HFA01 hfa4, float v8, HFA11 hfa5, float v9, HFA02 hfa6, float v10, HFA05 hfa7)
-        {
-            return (Sum_HFA08(hfa1) + Sum_HFA19(hfa2) + Sum_HFA03(hfa3) + Sum_HFA01(hfa4) + Sum_HFA11(hfa5) + Sum_HFA02(hfa6) + Sum_HFA05(hfa7)) + (float)v1 + (float)v2 + (float)v3 + (float)v4 + (float)v5 + (float)v6 + (float)v7 + (float)v8 + (float)v9 + (float)v10;
-        }
-
-
-    }
-}
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_common_sd.csproj b/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f32_common.csproj
index ab317b6b65..26c231c578 100644
--- a/tests/src/JIT/jit64/hfa/main/dll/hfa_common_sd.csproj
+++ b/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f32_common.csproj
@@ -29,9 +29,10 @@
   </ItemGroup>
   <PropertyGroup>
     <DebugType></DebugType>
+    <DefineConstants>$(DefineConstants);NESTED_HFA;FLOAT32</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="hfa_common_sd.cs" />
+    <Compile Include="hfa_common.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_interop_sf.csproj b/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f32_interop_cpp.csproj
index f0d3ece18b..a974107a68 100644
--- a/tests/src/JIT/jit64/hfa/main/dll/hfa_interop_sf.csproj
+++ b/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f32_interop_cpp.csproj
@@ -29,9 +29,10 @@
   </ItemGroup>
   <PropertyGroup>
     <DebugType></DebugType>
+    <DefineConstants>$(DefineConstants);NESTED_HFA;FLOAT32;NATIVE_CPP</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="hfa_interop_sf.cs" />
+    <Compile Include="hfa_interop.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
@@ -44,7 +45,7 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="hfa_common_sf.csproj" />
+    <ProjectReference Include="hfa_nested_f32_common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_interop_nd.csproj b/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f32_managed.csproj
index abb58b1f96..e4432fc6d3 100644
--- a/tests/src/JIT/jit64/hfa/main/dll/hfa_interop_nd.csproj
+++ b/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f32_managed.csproj
@@ -29,9 +29,10 @@
   </ItemGroup>
   <PropertyGroup>
     <DebugType></DebugType>
+    <DefineConstants>$(DefineConstants);NESTED_HFA;FLOAT32</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="hfa_interop_nd.cs" />
+    <Compile Include="hfa_managed.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
@@ -39,14 +40,13 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="hfa_common_nd.csproj" />
-    <ProjectReference Include="CMakelists.txt" />
-  </ItemGroup>
   <PropertyGroup>
     <ProjectJson>$(JitPackagesConfigFileDirectory)extra\project.json</ProjectJson>
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
   </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="hfa_nested_f32_common.csproj" />
+  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_common_nd.csproj b/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f64_common.csproj
index daa0202fed..20d653291d 100644
--- a/tests/src/JIT/jit64/hfa/main/dll/hfa_common_nd.csproj
+++ b/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f64_common.csproj
@@ -29,9 +29,10 @@
   </ItemGroup>
   <PropertyGroup>
     <DebugType></DebugType>
+    <DefineConstants>$(DefineConstants);NESTED_HFA;FLOAT64</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="hfa_common_nd.cs" />
+    <Compile Include="hfa_common.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f64_interop_cpp.csproj b/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f64_interop_cpp.csproj
new file mode 100644
index 0000000000..8b7a53e238
--- /dev/null
+++ b/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f64_interop_cpp.csproj
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
+    <CLRTestKind>BuildOnly</CLRTestKind>
+   <GenerateRunScript>false</GenerateRunScript> 
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup>
+    <DebugType></DebugType>
+    <DefineConstants>$(DefineConstants);NESTED_HFA;FLOAT64;NATIVE_CPP</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="hfa_interop.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="hfa_nested_f64_common.csproj" />
+    <ProjectReference Include="CMakelists.txt" />
+  </ItemGroup>
+  <PropertyGroup>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)extra\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
+  </PropertyGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup> 
+</Project>
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_interop_nf.csproj b/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f64_managed.csproj
index 8d6fadfe46..56cbc8611c 100644
--- a/tests/src/JIT/jit64/hfa/main/dll/hfa_interop_nf.csproj
+++ b/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f64_managed.csproj
@@ -29,9 +29,10 @@
   </ItemGroup>
   <PropertyGroup>
     <DebugType></DebugType>
+    <DefineConstants>$(DefineConstants);NESTED_HFA;FLOAT64</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="hfa_interop_nf.cs" />
+    <Compile Include="hfa_managed.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
@@ -44,7 +45,7 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="hfa_common_nf.csproj" />
+    <ProjectReference Include="hfa_nested_f64_common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_common_sf.csproj b/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f32_common.csproj
index d352e75cd8..9b374bf7c8 100644
--- a/tests/src/JIT/jit64/hfa/main/dll/hfa_common_sf.csproj
+++ b/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f32_common.csproj
@@ -29,9 +29,10 @@
   </ItemGroup>
   <PropertyGroup>
     <DebugType></DebugType>
+    <DefineConstants>$(DefineConstants);SIMPLE_HFA;FLOAT32</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="hfa_common_sf.cs" />
+    <Compile Include="hfa_common.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f32_interop_cpp.csproj b/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f32_interop_cpp.csproj
new file mode 100644
index 0000000000..fd733ba049
--- /dev/null
+++ b/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f32_interop_cpp.csproj
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
+    <CLRTestKind>BuildOnly</CLRTestKind>
+   <GenerateRunScript>false</GenerateRunScript> 
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup>
+    <DebugType></DebugType>
+    <DefineConstants>$(DefineConstants);SIMPLE_HFA;FLOAT32;NATIVE_CPP</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="hfa_interop.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <PropertyGroup>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)extra\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="hfa_simple_f32_common.csproj" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup> 
+</Project>
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_managed_sf.csproj b/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f32_managed.csproj
index fd12ff5cc3..b868e3c915 100644
--- a/tests/src/JIT/jit64/hfa/main/dll/hfa_managed_sf.csproj
+++ b/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f32_managed.csproj
@@ -29,9 +29,10 @@
   </ItemGroup>
   <PropertyGroup>
     <DebugType></DebugType>
+    <DefineConstants>$(DefineConstants);SIMPLE_HFA;FLOAT32</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="hfa_managed_sf.cs" />
+    <Compile Include="hfa_managed.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
@@ -44,7 +45,7 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="hfa_common_sf.csproj" />
+    <ProjectReference Include="hfa_simple_f32_common.csproj" />
   </ItemGroup>
  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_common_nf.csproj b/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f64_common.csproj
index 918b360985..60b5c6a8a4 100644
--- a/tests/src/JIT/jit64/hfa/main/dll/hfa_common_nf.csproj
+++ b/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f64_common.csproj
@@ -29,9 +29,10 @@
   </ItemGroup>
   <PropertyGroup>
     <DebugType></DebugType>
+    <DefineConstants>$(DefineConstants);SIMPLE_HFA;FLOAT64</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="hfa_common_nf.cs" />
+    <Compile Include="hfa_common.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_interop_sd.csproj b/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f64_interop_cpp.csproj
index bd7cb40c25..4521a14b16 100644
--- a/tests/src/JIT/jit64/hfa/main/dll/hfa_interop_sd.csproj
+++ b/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f64_interop_cpp.csproj
@@ -29,9 +29,10 @@
   </ItemGroup>
   <PropertyGroup>
     <DebugType></DebugType>
+    <DefineConstants>$(DefineConstants);SIMPLE_HFA;FLOAT64;NATIVE_CPP</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="hfa_interop_sd.cs" />
+    <Compile Include="hfa_interop.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
@@ -44,7 +45,7 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
   </PropertyGroup> 
   <ItemGroup>
-    <ProjectReference Include="hfa_common_sd.csproj" />
+    <ProjectReference Include="hfa_simple_f64_common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_managed_nd.csproj b/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f64_managed.csproj
index 792db97a04..7093ff12f1 100644
--- a/tests/src/JIT/jit64/hfa/main/dll/hfa_managed_nd.csproj
+++ b/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f64_managed.csproj
@@ -29,9 +29,10 @@
   </ItemGroup>
   <PropertyGroup>
     <DebugType></DebugType>
+    <DefineConstants>$(DefineConstants);SIMPLE_HFA;FLOAT64</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="hfa_managed_nd.cs" />
+    <Compile Include="hfa_managed.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
@@ -44,7 +45,7 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="hfa_common_nd.csproj" />
+    <ProjectReference Include="hfa_simple_f64_common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_nd0A_d.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_nd0A_d.csproj
index 54ae37cacf..d7765d4346 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_nd0A_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_nd0A_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nd.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_nd.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_nd0A_r.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_nd0A_r.csproj
index 54ae37cacf..d7765d4346 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_nd0A_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_nd0A_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nd.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_nd.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_nd2A_d.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_nd2A_d.csproj
index accbacbef9..765139018c 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_nd2A_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_nd2A_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nd.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_nd.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_nd2A_r.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_nd2A_r.csproj
index accbacbef9..765139018c 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_nd2A_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_nd2A_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nd.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_nd.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_nf0A_d.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_nf0A_d.csproj
index 1e110e3942..cc8ca32700 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_nf0A_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_nf0A_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nf.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_nf.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_nf0A_r.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_nf0A_r.csproj
index 1e110e3942..cc8ca32700 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_nf0A_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_nf0A_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nf.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_nf.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_nf2A_d.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_nf2A_d.csproj
index f9defb40fa..8764fa6b7b 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_nf2A_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_nf2A_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nf.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_nf.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_nf2A_r.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_nf2A_r.csproj
index f9defb40fa..8764fa6b7b 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_nf2A_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_nf2A_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nf.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_nf.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_sd0A_d.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_sd0A_d.csproj
index eef114d299..ca4454d586 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_sd0A_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_sd0A_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sd.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_sd.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_sd0A_r.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_sd0A_r.csproj
index eef114d299..ca4454d586 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_sd0A_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_sd0A_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sd.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_sd.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_sd2A_d.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_sd2A_d.csproj
index b5194b1003..e482862982 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_sd2A_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_sd2A_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sd.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_sd.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_sd2A_r.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_sd2A_r.csproj
index b5194b1003..e482862982 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_sd2A_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_sd2A_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sd.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_sd.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_sf0A_d.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_sf0A_d.csproj
index a1db171c0a..3514c2694b 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_sf0A_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_sf0A_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sf.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_sf.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_sf0A_r.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_sf0A_r.csproj
index a1db171c0a..3514c2694b 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_sf0A_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_sf0A_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sf.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_sf.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_sf2A_d.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_sf2A_d.csproj
index c2738ddb3a..b1ff989a1c 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_sf2A_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_sf2A_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sf.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_sf.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_sf2A_r.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_sf2A_r.csproj
index c2738ddb3a..b1ff989a1c 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_sf2A_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_sf2A_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sf.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_sf.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testB/hfa_nd0B_d.csproj b/tests/src/JIT/jit64/hfa/main/testB/hfa_nd0B_d.csproj
index bd35a778b1..3d1cf19447 100644
--- a/tests/src/JIT/jit64/hfa/main/testB/hfa_nd0B_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testB/hfa_nd0B_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nd.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_nd.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testB/hfa_nd0B_r.csproj b/tests/src/JIT/jit64/hfa/main/testB/hfa_nd0B_r.csproj
index 5f1cb12655..07d7e98b86 100644
--- a/tests/src/JIT/jit64/hfa/main/testB/hfa_nd0B_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testB/hfa_nd0B_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nd.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_nd.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testB/hfa_nd2B_d.csproj b/tests/src/JIT/jit64/hfa/main/testB/hfa_nd2B_d.csproj
index ff378a7209..0fb19f249f 100644
--- a/tests/src/JIT/jit64/hfa/main/testB/hfa_nd2B_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testB/hfa_nd2B_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nd.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_nd.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testB/hfa_nd2B_r.csproj b/tests/src/JIT/jit64/hfa/main/testB/hfa_nd2B_r.csproj
index 662fc33dc8..a6f7f50b77 100644
--- a/tests/src/JIT/jit64/hfa/main/testB/hfa_nd2B_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testB/hfa_nd2B_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nd.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_nd.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testB/hfa_nf0B_d.csproj b/tests/src/JIT/jit64/hfa/main/testB/hfa_nf0B_d.csproj
index 7a216984af..e14c119159 100644
--- a/tests/src/JIT/jit64/hfa/main/testB/hfa_nf0B_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testB/hfa_nf0B_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nf.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_nf.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testB/hfa_nf0B_r.csproj b/tests/src/JIT/jit64/hfa/main/testB/hfa_nf0B_r.csproj
index 0702851735..4a34bf31af 100644
--- a/tests/src/JIT/jit64/hfa/main/testB/hfa_nf0B_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testB/hfa_nf0B_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nf.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_nf.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testB/hfa_nf2B_d.csproj b/tests/src/JIT/jit64/hfa/main/testB/hfa_nf2B_d.csproj
index 7d8c6222f1..005bb2cf29 100644
--- a/tests/src/JIT/jit64/hfa/main/testB/hfa_nf2B_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testB/hfa_nf2B_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nf.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_nf.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testB/hfa_nf2B_r.csproj b/tests/src/JIT/jit64/hfa/main/testB/hfa_nf2B_r.csproj
index d5af183a6c..936187373c 100644
--- a/tests/src/JIT/jit64/hfa/main/testB/hfa_nf2B_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testB/hfa_nf2B_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nf.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_nf.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testB/hfa_sd0B_d.csproj b/tests/src/JIT/jit64/hfa/main/testB/hfa_sd0B_d.csproj
index 649737e6b3..aa1d27c6fa 100644
--- a/tests/src/JIT/jit64/hfa/main/testB/hfa_sd0B_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testB/hfa_sd0B_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sd.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_sd.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testB/hfa_sd0B_r.csproj b/tests/src/JIT/jit64/hfa/main/testB/hfa_sd0B_r.csproj
index 47d9be2261..809a0b5180 100644
--- a/tests/src/JIT/jit64/hfa/main/testB/hfa_sd0B_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testB/hfa_sd0B_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sd.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_sd.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testB/hfa_sd2B_d.csproj b/tests/src/JIT/jit64/hfa/main/testB/hfa_sd2B_d.csproj
index 92bcf63d93..3712739fc9 100644
--- a/tests/src/JIT/jit64/hfa/main/testB/hfa_sd2B_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testB/hfa_sd2B_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sd.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_sd.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testB/hfa_sd2B_r.csproj b/tests/src/JIT/jit64/hfa/main/testB/hfa_sd2B_r.csproj
index d7774d378a..7e197be2f0 100644
--- a/tests/src/JIT/jit64/hfa/main/testB/hfa_sd2B_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testB/hfa_sd2B_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sd.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_sd.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testB/hfa_sf0B_d.csproj b/tests/src/JIT/jit64/hfa/main/testB/hfa_sf0B_d.csproj
index 0b3ca15986..6480ceccb5 100644
--- a/tests/src/JIT/jit64/hfa/main/testB/hfa_sf0B_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testB/hfa_sf0B_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sf.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_sf.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testB/hfa_sf0B_r.csproj b/tests/src/JIT/jit64/hfa/main/testB/hfa_sf0B_r.csproj
index 166426f4df..3867052c17 100644
--- a/tests/src/JIT/jit64/hfa/main/testB/hfa_sf0B_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testB/hfa_sf0B_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sf.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_sf.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testB/hfa_sf2B_d.csproj b/tests/src/JIT/jit64/hfa/main/testB/hfa_sf2B_d.csproj
index e88298055a..09c5ff78f6 100644
--- a/tests/src/JIT/jit64/hfa/main/testB/hfa_sf2B_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testB/hfa_sf2B_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sf.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_sf.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testB/hfa_sf2B_r.csproj b/tests/src/JIT/jit64/hfa/main/testB/hfa_sf2B_r.csproj
index 7646edbbb4..7263a19803 100644
--- a/tests/src/JIT/jit64/hfa/main/testB/hfa_sf2B_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testB/hfa_sf2B_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sf.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_sf.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_nd0C_d.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_nd0C_d.csproj
index af9abe1dfa..7e27fd2134 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_nd0C_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_nd0C_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nd.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_nd.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_nd0C_r.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_nd0C_r.csproj
index af9abe1dfa..7e27fd2134 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_nd0C_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_nd0C_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nd.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_nd.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_nd2C_d.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_nd2C_d.csproj
index 6e8d68db71..82ee5d12c0 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_nd2C_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_nd2C_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nd.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_nd.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_nd2C_r.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_nd2C_r.csproj
index 6e8d68db71..82ee5d12c0 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_nd2C_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_nd2C_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nd.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_nd.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_nf0C_d.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_nf0C_d.csproj
index 9200497136..649c2a57dc 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_nf0C_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_nf0C_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nf.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_nf.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_nf0C_r.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_nf0C_r.csproj
index 9200497136..649c2a57dc 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_nf0C_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_nf0C_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nf.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_nf.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_nf2C_d.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_nf2C_d.csproj
index af6968f2e9..30d1a94dd7 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_nf2C_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_nf2C_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nf.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_nf.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_nf2C_r.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_nf2C_r.csproj
index af6968f2e9..30d1a94dd7 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_nf2C_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_nf2C_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nf.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_nf.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_sd0C_d.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_sd0C_d.csproj
index 0ba73204fd..e82a2a224e 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_sd0C_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_sd0C_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sd.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_sd.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_sd0C_r.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_sd0C_r.csproj
index 0ba73204fd..e82a2a224e 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_sd0C_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_sd0C_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sd.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_sd.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_sd2C_d.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_sd2C_d.csproj
index 82a58e3d1b..84a22c9134 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_sd2C_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_sd2C_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sd.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_sd.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_sd2C_r.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_sd2C_r.csproj
index 82a58e3d1b..84a22c9134 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_sd2C_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_sd2C_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sd.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_sd.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_sf0C_d.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_sf0C_d.csproj
index 747d205dd3..285005f948 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_sf0C_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_sf0C_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sf.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_sf.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_sf0C_r.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_sf0C_r.csproj
index 747d205dd3..285005f948 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_sf0C_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_sf0C_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sf.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_sf.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_sf2C_d.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_sf2C_d.csproj
index 14f902b5b7..f62cb4b99e 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_sf2C_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_sf2C_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sf.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_sf.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_sf2C_r.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_sf2C_r.csproj
index 14f902b5b7..f62cb4b99e 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_sf2C_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_sf2C_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sf.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_sf.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_nd0E_d.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_nd0E_d.csproj
index 470f05eaf6..1c6ece6940 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_nd0E_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_nd0E_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nd.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_nd.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_nd0E_r.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_nd0E_r.csproj
index 470f05eaf6..1c6ece6940 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_nd0E_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_nd0E_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nd.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_nd.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_nd2E_d.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_nd2E_d.csproj
index 232c859f5f..3b20fdcfff 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_nd2E_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_nd2E_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nd.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_nd.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_nd2E_r.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_nd2E_r.csproj
index 232c859f5f..3b20fdcfff 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_nd2E_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_nd2E_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nd.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_nd.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_nf0E_d.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_nf0E_d.csproj
index 6078824c6c..3e51d47f47 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_nf0E_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_nf0E_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nf.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_nf.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_nf0E_r.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_nf0E_r.csproj
index 6078824c6c..3e51d47f47 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_nf0E_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_nf0E_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nf.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_nf.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_nf2E_d.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_nf2E_d.csproj
index da4a4bf81a..bc0f205b96 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_nf2E_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_nf2E_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nf.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_nf.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_nf2E_r.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_nf2E_r.csproj
index da4a4bf81a..bc0f205b96 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_nf2E_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_nf2E_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nf.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_nf.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_sd0E_d.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_sd0E_d.csproj
index 0581ae2046..5a7c47d0ad 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_sd0E_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_sd0E_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sd.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_sd.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_sd0E_r.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_sd0E_r.csproj
index 0581ae2046..5a7c47d0ad 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_sd0E_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_sd0E_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sd.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_sd.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_sd2E_d.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_sd2E_d.csproj
index 2cb9e8be7f..df41a527bd 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_sd2E_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_sd2E_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sd.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_sd.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_sd2E_r.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_sd2E_r.csproj
index 2cb9e8be7f..df41a527bd 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_sd2E_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_sd2E_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sd.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_sd.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_sf0E_d.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_sf0E_d.csproj
index ba52ae52c7..950a0b9c0a 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_sf0E_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_sf0E_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sf.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_sf.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_sf0E_r.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_sf0E_r.csproj
index ba52ae52c7..950a0b9c0a 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_sf0E_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_sf0E_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sf.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_sf.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_sf2E_d.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_sf2E_d.csproj
index d08fa9a21f..4bbc8cc656 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_sf2E_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_sf2E_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sf.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_sf.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_sf2E_r.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_sf2E_r.csproj
index d08fa9a21f..4bbc8cc656 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_sf2E_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_sf2E_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sf.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_sf.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_nd0G_d.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_nd0G_d.csproj
index 7cf5825cc7..3bca7add2a 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_nd0G_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_nd0G_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nd.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_nd.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_nd0G_r.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_nd0G_r.csproj
index 7cf5825cc7..3bca7add2a 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_nd0G_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_nd0G_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nd.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_nd.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_nd2G_d.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_nd2G_d.csproj
index 08d40ef7f4..f28a45e1d2 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_nd2G_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_nd2G_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nd.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_nd.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_nd2G_r.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_nd2G_r.csproj
index 08d40ef7f4..f28a45e1d2 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_nd2G_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_nd2G_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nd.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_nd.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f64_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_nf0G_d.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_nf0G_d.csproj
index b268c8f4ef..fae4add71a 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_nf0G_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_nf0G_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nf.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_nf.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_nf0G_r.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_nf0G_r.csproj
index b268c8f4ef..fae4add71a 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_nf0G_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_nf0G_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nf.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_nf.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_nf2G_d.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_nf2G_d.csproj
index 5765cb53e0..ab79aee07f 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_nf2G_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_nf2G_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nf.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_nf.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_nf2G_r.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_nf2G_r.csproj
index 5765cb53e0..ab79aee07f 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_nf2G_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_nf2G_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_nf.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_nf.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_nested_f32_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_sd0G_d.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_sd0G_d.csproj
index d3bde46f51..64c46bc406 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_sd0G_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_sd0G_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sd.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_sd.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_sd0G_r.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_sd0G_r.csproj
index d3bde46f51..64c46bc406 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_sd0G_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_sd0G_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sd.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_sd.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_sd2G_d.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_sd2G_d.csproj
index 6cdde77d6c..96f31701f9 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_sd2G_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_sd2G_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sd.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_sd.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_sd2G_r.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_sd2G_r.csproj
index 6cdde77d6c..96f31701f9 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_sd2G_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_sd2G_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sd.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_sd.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f64_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_sf0G_d.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_sf0G_d.csproj
index 122a44e294..c38bdc98b5 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_sf0G_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_sf0G_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sf.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_sf.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_sf0G_r.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_sf0G_r.csproj
index 122a44e294..c38bdc98b5 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_sf0G_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_sf0G_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sf.csproj" />
-    <ProjectReference Include="..\dll\hfa_managed_sf.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_managed.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_sf2G_d.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_sf2G_d.csproj
index edfa3eb8eb..79bc8a3a26 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_sf2G_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_sf2G_d.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sf.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_sf.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_sf2G_r.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_sf2G_r.csproj
index edfa3eb8eb..79bc8a3a26 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_sf2G_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_sf2G_r.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
-    <ProjectReference Include="..\dll\hfa_common_sf.csproj" />
-    <ProjectReference Include="..\dll\hfa_interop_sf.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
+    <ProjectReference Include="..\dll\hfa_simple_f32_interop_cpp.csproj" />
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />