diff --git a/src/Hyperion.Tests/Generator/CrossFrameworkClass.cs b/src/Hyperion.Tests/Generator/CrossFrameworkClass.cs
index 081021c0..bce306b6 100644
--- a/src/Hyperion.Tests/Generator/CrossFrameworkClass.cs
+++ b/src/Hyperion.Tests/Generator/CrossFrameworkClass.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 
 namespace Hyperion.Tests.Generator
 {
@@ -40,6 +41,8 @@ public class CrossFrameworkClass
 
         public CrossFrameworkStruct Struct { get; set; }
 
+        public Type Type { get; set; }
+
         public override bool Equals(object obj)
         {
             if (!(obj is CrossFrameworkClass))
diff --git a/src/Hyperion.Tests/Generator/CrossFrameworkInitializer.cs b/src/Hyperion.Tests/Generator/CrossFrameworkInitializer.cs
index dae3431f..b08a1f4d 100644
--- a/src/Hyperion.Tests/Generator/CrossFrameworkInitializer.cs
+++ b/src/Hyperion.Tests/Generator/CrossFrameworkInitializer.cs
@@ -1,4 +1,8 @@
 using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using Hyperion.Extensions;
 
 namespace Hyperion.Tests.Generator
 {
@@ -42,7 +46,8 @@ public static CrossFrameworkClass Init()
                 UInt = uint.MaxValue,
                 ULong = ulong.MaxValue,
                 UShort = ushort.MaxValue,
-                Boolean = true
+                Boolean = true,
+                Type = typeof(int)
             };
         }
     }
diff --git a/src/Hyperion.Tests/Hyperion.Tests.csproj b/src/Hyperion.Tests/Hyperion.Tests.csproj
index cce01f9f..12a1822a 100644
--- a/src/Hyperion.Tests/Hyperion.Tests.csproj
+++ b/src/Hyperion.Tests/Hyperion.Tests.csproj
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.0;netcoreapp2.2;net461;net472</TargetFrameworks>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <LangVersion>latest</LangVersion>
     <StartupObject>Hyperion.Tests.Generator.Program</StartupObject>
@@ -22,4 +22,8 @@
     <ProjectReference Include="..\Hyperion\Hyperion.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="testfiles\" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Hyperion.Tests/testfiles/test_file_.netcoreappversionv2.0.tf b/src/Hyperion.Tests/testfiles/test_file_.netcoreappversionv2.0.tf
deleted file mode 100644
index d5a25698..00000000
Binary files a/src/Hyperion.Tests/testfiles/test_file_.netcoreappversionv2.0.tf and /dev/null differ
diff --git a/src/Hyperion.Tests/testfiles/test_file_.netcoreappversionv2.1.tf b/src/Hyperion.Tests/testfiles/test_file_.netcoreappversionv2.1.tf
deleted file mode 100644
index d5a25698..00000000
Binary files a/src/Hyperion.Tests/testfiles/test_file_.netcoreappversionv2.1.tf and /dev/null differ
diff --git a/src/Hyperion.Tests/testfiles/test_file_.netcoreappversionv2.2.tf b/src/Hyperion.Tests/testfiles/test_file_.netcoreappversionv2.2.tf
deleted file mode 100644
index d5a25698..00000000
Binary files a/src/Hyperion.Tests/testfiles/test_file_.netcoreappversionv2.2.tf and /dev/null differ
diff --git a/src/Hyperion.Tests/testfiles/test_file_.netcoreappversionv3.0.tf b/src/Hyperion.Tests/testfiles/test_file_.netcoreappversionv3.0.tf
index d5a25698..af2262a9 100644
Binary files a/src/Hyperion.Tests/testfiles/test_file_.netcoreappversionv3.0.tf and b/src/Hyperion.Tests/testfiles/test_file_.netcoreappversionv3.0.tf differ
diff --git a/src/Hyperion.Tests/testfiles/test_file_.netframeworkversionv4.6.1.tf b/src/Hyperion.Tests/testfiles/test_file_.netframeworkversionv4.7.2.tf
similarity index 85%
rename from src/Hyperion.Tests/testfiles/test_file_.netframeworkversionv4.6.1.tf
rename to src/Hyperion.Tests/testfiles/test_file_.netframeworkversionv4.7.2.tf
index 9e96ef28..cf966508 100644
Binary files a/src/Hyperion.Tests/testfiles/test_file_.netframeworkversionv4.6.1.tf and b/src/Hyperion.Tests/testfiles/test_file_.netframeworkversionv4.7.2.tf differ
diff --git a/src/Hyperion/Hyperion.csproj b/src/Hyperion/Hyperion.csproj
index e9c2a110..3703a8df 100644
--- a/src/Hyperion/Hyperion.csproj
+++ b/src/Hyperion/Hyperion.csproj
@@ -31,11 +31,11 @@
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
-    <DefineConstants>$(DefineConstants);NETSTANDARD16</DefineConstants>
+    <DefineConstants>$(DefineConstants);NETSTANDARD16;NETSTANDARD</DefineConstants>
   </PropertyGroup>
   
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <DefineConstants>$(DefineConstants);NETSTANDARD20</DefineConstants>
+    <DefineConstants>$(DefineConstants);NETSTANDARD20;NETSTANDARD</DefineConstants>
   </PropertyGroup>
   
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">