diff --git a/Il2CppTests/Il2CppTests.csproj b/Il2CppTests/Il2CppTests.csproj
index a416127..b2a1cd0 100644
--- a/Il2CppTests/Il2CppTests.csproj
+++ b/Il2CppTests/Il2CppTests.csproj
@@ -31,15 +31,9 @@
     <Content Include="TestExpectedResults\ExplicitInterfaces.cs" />
     <Content Include="TestExpectedResults\GameAssembly-ExplicitInterfaces-x64.cs" />
     <Content Include="TestExpectedResults\GameAssembly-ExplicitInterfaces-x86.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
     <Content Include="TestExpectedResults\GameAssembly-Scope-x64.cs" />
     <Content Include="TestExpectedResults\GameAssembly-Scope-x86.cs" />
     <Content Include="TestExpectedResults\Scope.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
     <Content Include="TestExpectedResults\GameAssembly-Properties-x64.cs" />
     <Content Include="TestExpectedResults\GameAssembly-Properties-x86.cs" />
     <Content Include="TestExpectedResults\GameAssembly-References-x64.cs" />
@@ -58,17 +52,25 @@
     <Content Include="TestExpectedResults\GameAssembly-Methods-x64.cs" />
     <Content Include="TestExpectedResults\GameAssembly-Methods-x86.cs" />
     <Content Include="TestExpectedResults\Methods.cs" />
-    <Content Include="TestSources\ExplicitInterfaces.cs" />
-    <Content Include="TestSources\Scope.cs" />
+    <Content Include="TestExpectedResults\CSharp1.cs" />
+    <Content Include="TestExpectedResults\CSharp2.cs" />
+    <Content Include="TestExpectedResults\CSharp3.cs" />
+    <Content Include="TestExpectedResults\GameAssembly-CSharp1-x64.cs" />
+    <Content Include="TestExpectedResults\GameAssembly-CSharp1-x86.cs" />
+    <Content Include="TestExpectedResults\GameAssembly-CSharp2-x64.cs" />
+    <Content Include="TestExpectedResults\GameAssembly-CSharp2-x86.cs" />
+    <Content Include="TestExpectedResults\GameAssembly-CSharp3-x64.cs" />
+    <Content Include="TestExpectedResults\GameAssembly-CSharp3-x86.cs" />
+    <Content Include="TestExpectedResults\GameAssembly-PartialGenericTypes-x64.cs" />
+    <Content Include="TestExpectedResults\GameAssembly-PartialGenericTypes-x86.cs" />
+    <Content Include="TestExpectedResults\GameAssembly-VTablesAndLayout-x64.cs" />
+    <Content Include="TestExpectedResults\GameAssembly-VTablesAndLayout-x86.cs" />
+    <Content Include="TestExpectedResults\PartialGenericTypes.cs" />
+    <Content Include="TestExpectedResults\VTablesAndLayout.cs" />
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="TestSources\ArraysAndPointers.cs" />
-    <Content Include="TestSources\CustomAttributeData.cs" />
-    <Content Include="TestSources\GenericTypes.cs" />
-    <Content Include="TestSources\Methods.cs" />
-    <Content Include="TestSources\Properties.cs" />
-    <Content Include="TestSources\References.cs" />
+    <Content Include="TestSources\**" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Il2CppTests/TestSources/CSharp1.cs b/Il2CppTests/TestSources/CSharp1.cs
new file mode 100644
index 0000000..61abc38
--- /dev/null
+++ b/Il2CppTests/TestSources/CSharp1.cs
@@ -0,0 +1,57 @@
+using System;
+
+/* C# 1.0 feature test */
+namespace Il2CppTests.TestSources
+{
+    public class SimpleClass : SimpleInterface
+    {
+        public SimpleStruct ss;
+        public int i;
+
+        public static SimpleStruct StaticFunc(SimpleStruct ss) {
+            Console.WriteLine(ss);
+            return new SimpleStruct();
+        }
+
+        public SimpleStruct InstanceFunc(SimpleStruct ss) {
+            Console.WriteLine(ss);
+            return this.ss;
+        }
+
+        public int func(int val) {
+            return val + 42;
+        }
+
+        public delegate SimpleStruct SimpleDelegate(SimpleStruct ss);
+        public event SimpleDelegate SimpleEvent;
+        public int SimpleProperty {
+            get { return 0; }
+            set { SimpleEvent(ss); }
+        }
+    }
+
+    public struct SimpleStruct : SimpleInterface
+    {
+        public SimpleClass sc;
+        public int i;
+
+        public static SimpleStruct StaticFunc(SimpleStruct ss) {
+            Console.WriteLine(ss);
+            return new SimpleStruct();
+        }
+
+        public SimpleClass InstanceFunc(SimpleStruct ss) {
+            Console.WriteLine(ss);
+            return this.sc;
+        }
+
+        public int func(int val) {
+            return ((SimpleInterface)sc).func(val) + 13;
+        }
+    }
+
+    public interface SimpleInterface
+    {
+        int func(int val);
+    }
+}
diff --git a/Il2CppTests/TestSources/CSharp2.cs b/Il2CppTests/TestSources/CSharp2.cs
new file mode 100644
index 0000000..5662844
--- /dev/null
+++ b/Il2CppTests/TestSources/CSharp2.cs
@@ -0,0 +1,100 @@
+using System;
+
+/* C# 2.0 feature test */
+namespace Il2CppTests.TestSources
+{
+    public interface GenericInterface<T>
+    {
+        T func(T v);
+        T genericMethod<T2>(T v, T2 w);
+    }
+
+    public class GenericClass<T> : GenericInterface<T>
+    {
+        public T x;
+
+        public T func(T v) {
+            return v;
+        }
+
+        public T genericMethod<T2>(T v, T2 w) {
+            return x;
+        }
+
+        public static T myMethod(T x) {
+            return x;
+        }
+
+        public virtual bool returnBool() {
+            return true;
+        }
+    }
+
+    public class DerivedGenericClass<T, T2> : GenericClass<T>, GenericInterface<T2>
+    {
+        public T2 t2;
+        public T2 func(T2 v) {
+            return t2;
+        }
+
+        public T2 genericMethod<T3>(T2 v, T3 w) {
+            return v;
+        }
+
+        public T2 newGenericMethod() {
+            return t2;
+        }
+
+        public static int Return42() {
+            return 42;
+        }
+    }
+
+    public struct GenericStruct<T> : GenericInterface<T> where T : struct
+    {
+        public T a;
+        public T func(T v) {
+            throw new NotImplementedException();
+        }
+
+        public T genericMethod<T2>(T v, T2 w) {
+            throw new NotImplementedException();
+        }
+
+        public T? genericMethod2(T x) {
+            return (new GenericClass<T>()).returnBool() ? null : (T?)x;
+        }
+
+        public static GenericStruct<T> ReturnStruct(T y) {
+            var res = new GenericStruct<T>();
+            res.a = y;
+            return res;
+        }
+    }
+
+    public interface IVariance<in T1, out T2>
+    {
+        T2 func(T1 v);
+    }
+
+    public class UseGenerics
+    {
+        public static void Main(string[] args) {
+            GenericStruct<int>[] arr = new GenericStruct<int>[3];
+            arr[0] = GenericStruct<int>.ReturnStruct(3);
+            DerivedGenericClass<string, string> gc = new DerivedGenericClass<string, string>();
+            string c = gc.func("oops");
+            Console.WriteLine(c);
+            gc.genericMethod("hello", arr[0].genericMethod2(3) ?? 0);
+            GenericInterface<string> s = gc;
+            s.genericMethod("goodbye", c);
+            GenericClass<object>.myMethod(42);
+            IVariance<string, int> q = null;
+            q.func("nope");
+
+            foreach (var v in arr) {
+                v.genericMethod(64, "nope");
+            }
+        }
+    }
+}
diff --git a/Il2CppTests/TestSources/CSharp3.cs b/Il2CppTests/TestSources/CSharp3.cs
new file mode 100644
index 0000000..950e3ed
--- /dev/null
+++ b/Il2CppTests/TestSources/CSharp3.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Linq;
+
+/* C# 3.0 feature test */
+namespace Il2CppTests.TestSources
+{
+    public class FeatureTest
+    {
+        public string AutoProp { get; set; }
+        public void AnonType() {
+            var c = new { Value = 3, Message = "Nobody" };
+            Console.WriteLine(c);
+        }
+
+        public int Linq() {
+            var scores = new int[] { 1, 2, 3, 4 };
+            var highScoresQuery =
+                from score in scores
+                where score > 80
+                orderby score descending
+                select score;
+            return highScoresQuery.Count();
+        }
+    }
+}
diff --git a/Il2CppTests/TestSources/PartialGenericTypes.cs b/Il2CppTests/TestSources/PartialGenericTypes.cs
new file mode 100644
index 0000000..8d45193
--- /dev/null
+++ b/Il2CppTests/TestSources/PartialGenericTypes.cs
@@ -0,0 +1,50 @@
+using System;
+
+/* Test for concretized and partially concretized generics */
+namespace Il2CppTests.TestSources
+{
+    public class FunkyA<AT>
+    {
+        public AT at;
+        public FunkyA() {
+        }
+        public FunkyA(AT at) {
+            this.at = at;
+        }
+        public AT rt(AT x) {
+            return x;
+        }
+    }
+
+    public class FunkyB<BT1, BT2> : FunkyA<BT2>
+    {
+        public BT1 bt1;
+        public BT2 bt2;
+        public BT2 rt1(BT1 x) {
+            return bt2;
+        }
+        public BT1 rt2(BT2 y) {
+            return bt1;
+        }
+        public FunkyA<FunkyA<BT1>> rtx(FunkyA<FunkyA<BT2>> z) {
+            return new FunkyA<FunkyA<BT1>>(new FunkyA<BT1>(bt1));
+        }
+    }
+
+    public class FunkyC<CT1, CT2, CT3> : FunkyB<CT3, CT1>
+    {
+    }
+
+    public class FunkyTest
+    {
+        public FunkyA<int> x;
+        public FunkyB<string, int> y;
+        public FunkyC<object, int, string> z;
+        void test() {
+            x.rt(0);
+            y.rt1("");
+            y.rt2(0);
+            z.rtx(null);
+        }
+    }
+}
diff --git a/Il2CppTests/TestSources/VTablesAndLayout.cs b/Il2CppTests/TestSources/VTablesAndLayout.cs
new file mode 100644
index 0000000..0af0601
--- /dev/null
+++ b/Il2CppTests/TestSources/VTablesAndLayout.cs
@@ -0,0 +1,218 @@
+using System;
+
+/* Test virtual method calls (VTables) and class layout */
+namespace Il2CppTests.TestSources
+{
+    public struct Vector3
+    {
+        public float x, y, z;
+    }
+
+    public class TestVTable
+    {
+        public interface TestInterface
+        {
+            int overrideme();
+        }
+
+        public interface TestInterface2
+        {
+            int overrideme2();
+        }
+
+        public interface TestInterface3
+        {
+            int overrideme3();
+        }
+
+        public interface IT1
+        {
+            void f1();
+            void f2();
+        }
+
+        public interface IT2
+        {
+            void f1();
+            void f3();
+        }
+
+        public interface IT3 : IT2, IT1
+        {
+            new void f2();
+            new void f1();
+        }
+
+        public class WeirdLayout1
+        {
+            public ulong x;
+            public char y;
+        }
+
+        public class WeirdLayout2 : WeirdLayout1
+        {
+            public char z;
+            public short f;
+        }
+
+        public struct TestStruct : TestInterface, TestInterface2, IT1, IT2
+        {
+            public int x;
+            public int overrideme() {
+                return 42 + x;
+            }
+
+            public int overrideme2() {
+                return 42000 * x;
+            }
+
+            public void f1() {
+
+            }
+
+            public void f2() {
+
+            }
+
+            public void f3() {
+
+            }
+        }
+
+        public class TestClass : TestInterface, TestInterface3, IT3
+        {
+            public int x;
+            public virtual int overrideme() {
+                return 64 - x;
+            }
+            public void normal1() {
+
+            }
+            public virtual int overrideme3() {
+                return -1 + x;
+            }
+            public void normal2() {
+
+            }
+            public void f1() { }
+            public void f2() { }
+            public void f3() { }
+        }
+
+        public class TestClass2 : TestClass
+        {
+            public int y;
+            public override int overrideme() {
+                return 1 + y;
+            }
+            public new void normal2() {
+
+            }
+        }
+
+        public interface ITestGeneric<T>
+        {
+            void genericFunc(T t);
+        }
+
+        public class TestGeneric<T> : ITestGeneric<T>
+        {
+            public T m_t;
+            public T[] arr;
+            public int x;
+            public TestGeneric(T[] arr) {
+                this.arr = arr;
+                this.x = 0;
+                for (int i = 0; i < arr.Length; i++) {
+                    x += arr[i].GetHashCode();
+                }
+            }
+            public void genericFunc(T t) {
+                x += arr[0].Equals(t) ? 1 : 0;
+            }
+        }
+
+        public class TestGeneric2<T1, T2> : TestGeneric<T2>
+        {
+            public T1 m_t1;
+            public T2 m_t2;
+            public TestGeneric2(T2[] t2) : base(t2) {
+
+            }
+            public void secondGenericFunc(T1 t1, T2 t2) {
+                genericFunc(t2);
+                TestGeneric<T1> tg1 = new TestGeneric<T1>(null);
+                tg1.genericFunc(t1);
+            }
+        }
+
+        public void overrideme(int x) {
+            Console.WriteLine(x);
+        }
+        public float takestruct(Vector3 a, Vector3 b, Vector3 c) {
+            return a.x + b.y + c.z;
+        }
+        public delegate void callit(int x);
+        public callit monkey;
+
+        public int doit(TestInterface ti, TestInterface2 ti2, TestInterface3 ti3) {
+            return ti.overrideme() * 2 + ti2.overrideme2() + ti3.overrideme3();
+        }
+
+        public void calltypes(ref Vector3 vin, ref Vector3 vout, ref Vector3 vref, params Vector3[] vparams) {
+            vout = vin;
+        }
+
+        public void callgeneric<T>(ITestGeneric<T> it, T t) {
+            it.genericFunc(t);
+        }
+
+        public void callints(IT1 it1, IT2 it2, IT3 it3) {
+            it1.f1();
+            it1.f2();
+            it2.f1();
+            it2.f3();
+            it3.f1();
+            it3.f2();
+            it3.f3();
+        }
+
+        public int[] intProperty { get; set; }
+        public int[] intProp2 { get { return intArray; } set { intArray = value; } }
+        private int[] intArray;
+        public object[] objArray;
+
+        void Start() {
+            if (monkey != null)
+                monkey(0);
+            TestClass i1 = new TestClass2();
+            i1.overrideme();
+            i1.overrideme3();
+            i1.normal2();
+            TestStruct i2 = new TestStruct();
+            i2.overrideme();
+            i2.overrideme2();
+            doit(i1, i2, i1);
+            doit(i2, i2, i1);
+            callints(i2, i2, i1);
+            int res = 0;
+            for (int i = 0; i < intArray.Length; i++) {
+                res += intArray[i];
+            }
+            for (int i = 0; i < objArray.Length; i++) {
+                res += (int)objArray[i];
+            }
+            ITestGeneric<int> x1 = new TestGeneric<int>(new int[] { 1, 2, 3 });
+            ITestGeneric<object> x2 = new TestGeneric<object>(new object[] { new object() });
+            callgeneric(x1, 0);
+            callgeneric(x2, "foo");
+            ITestGeneric<string> x3 = new TestGeneric2<int, string>(new string[] { "as", "de" });
+            new WeirdLayout2().f = 3;
+            x3.genericFunc("bar");
+        }
+
+        void Update() {
+            overrideme(0);
+        }
+    }
+}