diff --git a/build/Tests.lua b/build/Tests.lua
index 033f506..cc4e2e8 100644
--- a/build/Tests.lua
+++ b/build/Tests.lua
@@ -2,7 +2,7 @@
 
 local supportdir = path.getabsolute("../support")
 local catchdir = path.getabsolute("../external/catch")
-local exepath = path.join("../../build/lib/Debug/MonoEmbeddinator4000.exe")
+local exepath = "../../../build/lib/Debug/MonoEmbeddinator4000.exe"
 
 function SetupTestProject(name, extraFiles)
   objdir("!obj")
@@ -12,6 +12,7 @@ function SetupTestProject(name, extraFiles)
   SetupTestProjectC(name)
   SetupTestProjectObjC(name)
   SetupTestProjectsCSharp(name, nil, extraFiles)
+  SetupTestProjectsRunner(name)
 end
 
 function SetupManagedTestProject()
@@ -19,7 +20,7 @@ function SetupManagedTestProject()
     language "C#"  
     clr "Unsafe"
     SetupManagedProject()
-    location "."
+    location "mk"
 end
 
 function SetupTestProjectGenerator()
@@ -30,17 +31,21 @@ function SetupTestProjectGenerator()
   end
 end
 
-function SetupTestProjectGeneratorMake()
+function SetupTestProjectGeneratorMake(name, dll)
   project (name .. ".Gen")
-     location "."
+     location "mk"
      kind "Makefile"
      dependson (name .. ".Managed")
 
+     if dll == nil then
+       dll = name .. "Managed.dll"
+     end
+
      buildcommands
      {
-        "mono --debug " .. exepath .. " -gen=c -out=c -p=macos -compile -target=shared " .. name .. ".Managed.dll",
-        "mono --debug " .. exepath .. " -gen=objc -out=objc -p=macos -compile -target=shared " .. name .. ".Managed.dll",
-        "mono --debug " .. exepath .. " -gen=java -out=java -p=macos -target=shared " .. name .. ".Managed.dll"
+        "mono --debug " .. exepath .. " -gen=c -out=c -p=macos -compile -target=shared " .. dll,
+        "mono --debug " .. exepath .. " -gen=objc -out=objc -p=macos -compile -target=shared " .. dll,
+        "mono --debug " .. exepath .. " -gen=java -out=java -p=macos -target=shared " .. dll
      }
 end
 
@@ -114,8 +119,7 @@ function SetupTestProjectC(name, depends)
   end
 
   project(name .. ".C")
-    SetupNativeProject()
-    location "."
+    location "mk"
 
     kind "SharedLib"
     language "C"
@@ -125,10 +129,8 @@ function SetupTestProjectC(name, depends)
     flags { common_flags }
     files
     {
-      path.join("c", name .. ".Managed.h"),
-      path.join("c", name .. ".Managed.c"),
-      path.join(supportdir, "*.h"),
-      path.join(supportdir, "*.c"),
+      path.join("c", "*.h"),
+      path.join("c", "*.c"),
     }
 
     includedirs { supportdir }
@@ -153,21 +155,19 @@ function SetupTestProjectObjC(name, depends)
   end
 
   project(name .. ".ObjC")
-    SetupNativeProject()
-    location "."
+    location "mk"
 
     kind "SharedLib"
-    language "C++"
+    language "C"
 
     defines { "MONO_DLL_IMPORT", "MONO_M2N_DLL_EXPORT" }
 
     flags { common_flags }
     files
     {
-      path.join("objc", name .. ".Managed.h"),
-      path.join("objc", name .. ".Managed.mm"),
-      path.join(supportdir, "*.h"),
-      path.join(supportdir, "*.c"),
+      path.join("objc", "*.h"),
+      path.join("objc", "*.mm"),
+      path.join("objc", "*.c"),
     }
 
     links { "objc" }
@@ -199,11 +199,11 @@ function SetupTestProjectsCSharp(name, depends, extraFiles)
       table.insert(linktable, depends .. ".Managed")
     end
 
-    links(linktable)
+    links(linktable)  
+end
 
+function SetupTestProjectsRunner(name)
   project(name .. ".Tests")
-    SetupNativeProject()
-    location "."
 
     language "C++"
     kind "ConsoleApp"
@@ -229,5 +229,5 @@ function SetupTestProjectsCSharp(name, depends, extraFiles)
     filter { "action:vs*" }
       buildoptions { "/wd4018" } -- eglib signed/unsigned warnings
 
-    filter {}    
+    filter {}  
 end
diff --git a/tests/Basic/.gitignore b/tests/Basic/.gitignore
new file mode 100644
index 0000000..4997d1e
--- /dev/null
+++ b/tests/Basic/.gitignore
@@ -0,0 +1,3 @@
+mk/
+mk/bin/
+mk/obj
diff --git a/tests/Basic/Basic.Tests.C.cpp b/tests/Basic/Basic.Tests.C.cpp
index 91601d5..ebc4c47 100644
--- a/tests/Basic/Basic.Tests.C.cpp
+++ b/tests/Basic/Basic.Tests.C.cpp
@@ -1,10 +1,10 @@
 #define CATCH_CONFIG_MAIN
 #include <catch.hpp>
 
-#include "Basic.Managed.h"
+#include "managed.h"
 #include "glib.h"
 
-TEST_CASE("BuiltinTypes.C", "[C][BuiltinTypes]") {
+TEST_CASE("Types.C", "[C][Types]") {
     BuiltinTypes* bt = BuiltinTypes_new();
     BuiltinTypes_ReturnsVoid(bt);
     REQUIRE(BuiltinTypes_ReturnsBool(bt)   == true);
@@ -48,48 +48,49 @@ TEST_CASE("BuiltinTypes.C", "[C][BuiltinTypes]") {
     REQUIRE(strcmp(RefStr->str, "Mono") == 0);
 }
 
-TEST_CASE("ClassTypes", "[C][ClassTypes]") {
-    ClassProperties* prop = ClassProperties_new();
-    REQUIRE(ClassProperties_get_Int(prop) == 0);
-    ClassProperties_set_Int(prop, 10);
-    REQUIRE(ClassProperties_get_Int(prop) == 10);
+TEST_CASE("Properties", "[C][Properties]") {
+    REQUIRE(Properties_Query_get_UniversalAnswer() == 42);
 
-    REQUIRE(ClassProperties_get_ReadOnlyInt(prop) == 0);
+    Properties_Query* prop = Properties_Query_new();
+    REQUIRE(Properties_Query_get_IsGood(prop) == true);
+    REQUIRE(Properties_Query_get_IsBad(prop) == false);
+
+    REQUIRE(Properties_Query_get_Answer(prop) == 42);
+    Properties_Query_set_Answer(prop, 10);
+    REQUIRE(Properties_Query_get_Answer(prop) == 10);
+
+    Properties_Query_set_Secret(prop, 10);
+    REQUIRE(Properties_Query_get_IsSecret(prop) == true);
 }
 
-TEST_CASE("StaticTypes.C", "[C][StaticTypes]") {
-    REQUIRE(NonStaticClass_StaticMethod() == 0);
-    REQUIRE(StaticClass_StaticMethod() == 0);
+TEST_CASE("Enums.C", "[C][Enums]") {
+    REQUIRE(Enums_EnumTypes_PassEnum(Enum_Two) == 2);
+    REQUIRE(Enums_EnumTypes_PassEnum(Enum_Three) == 3);
+
+    REQUIRE(Enums_EnumTypes_PassEnumByte(EnumByte_Two) == 2);
+    REQUIRE(Enums_EnumTypes_PassEnumByte(EnumByte_Three) == 3);
+
+    REQUIRE(Enums_EnumTypes_PassEnumFlags(EnumFlags_FlagOne) == (1 << 0));
+    REQUIRE(Enums_EnumTypes_PassEnumFlags(EnumFlags_FlagTwo) == (1 << 2));
 }
 
-TEST_CASE("EnumTypes.C", "[C][EnumTypes]") {
-    REQUIRE(EnumTypes_PassEnum(Enum_Two) == 2);
-    REQUIRE(EnumTypes_PassEnum(Enum_Three) == 3);
-
-    REQUIRE(EnumTypes_PassEnumByte(EnumByte_Two) == 2);
-    REQUIRE(EnumTypes_PassEnumByte(EnumByte_Three) == 3);
-
-    REQUIRE(EnumTypes_PassEnumFlags(EnumFlags_FlagOne) == (1 << 0));
-    REQUIRE(EnumTypes_PassEnumFlags(EnumFlags_FlagTwo) == (1 << 2));
-}
-
-TEST_CASE("ArrayTypes.C", "[C][ArrayTypes]") {
+TEST_CASE("Arrays.C", "[C][Arrays]") {
     char _byte_arr[] = { 1, 2, 3 };
     _UnsignedcharArray _byte;
     _byte.array = g_array_sized_new(/*zero_terminated=*/false,
         /*clear=*/true, sizeof(char), G_N_ELEMENTS(_byte_arr));
     g_array_append_vals (_byte.array, _byte_arr, G_N_ELEMENTS(_byte_arr));
 
-    int _sum = ArrayTypes_SumByteArray(_byte);
+    int _sum = Arrays_ArrayTypes_SumByteArray(_byte);
     REQUIRE(_sum == 6);
 
-    _IntArray _int = ArrayTypes_ReturnsIntArray();
+    _IntArray _int = Arrays_ArrayTypes_ReturnsIntArray();
     REQUIRE(_int.array->len == 3);
     REQUIRE(g_array_index(_int.array, int, 0) == 1);
     REQUIRE(g_array_index(_int.array, int, 1) == 2);
     REQUIRE(g_array_index(_int.array, int, 2) == 3);
 
-    _CharArray _string = ArrayTypes_ReturnsStringArray();
+    _CharArray _string = Arrays_ArrayTypes_ReturnsStringArray();
     REQUIRE(_string.array->len == 3);
     REQUIRE(strcmp(g_array_index(_string.array, gchar*, 0), "1") == 0);
     REQUIRE(strcmp(g_array_index(_string.array, gchar*, 1), "2") == 0);
diff --git a/tests/Basic/Basic.Tests.ObjC.mm b/tests/Basic/Basic.Tests.ObjC.mm
index 32c5d04..80e0c70 100644
--- a/tests/Basic/Basic.Tests.ObjC.mm
+++ b/tests/Basic/Basic.Tests.ObjC.mm
@@ -1,6 +1,6 @@
 #include <catch.hpp>
 
-#include "Basic.Managed.h"
+#include "managed.h"
 #include "glib.h"
 
 TEST_CASE("BuiltinTypes.ObjC", "[ObjC][BuiltinTypes]") {
diff --git a/tests/Basic/Basic.cs b/tests/Basic/Basic.cs
deleted file mode 100644
index 180f0b0..0000000
--- a/tests/Basic/Basic.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-using System;
-using System.Linq;
-
-#region Builtin types
-
-public class BuiltinTypes
-{
-    public void ReturnsVoid() { }
-    public bool ReturnsBool() { return true; }
-    public sbyte ReturnsSByte() { return -5; }
-    public byte ReturnsByte() { return 5; }
-    public short ReturnsShort() { return -5; }
-    public ushort ReturnsUShort() { return 5; }
-    public int ReturnsInt() { return -5; }
-    public uint ReturnsUInt() { return 5; }
-    public long ReturnsLong() { return -5; }
-    public ulong ReturnsULong() { return 5; }
-    public char ReturnsChar() { return 'a'; }
-    public string ReturnsString() { return "Mono"; }
-
-    public bool PassAndReturnsBool(bool v) { return v; }
-    public sbyte PassAndReturnsSByte(sbyte v) { return v; }
-    public byte PassAndReturnsByte(byte v) { return v; }
-    public short PassAndReturnsShort(short v) { return v; }
-    public ushort PassAndReturnsUShort(ushort v) { return v; }
-    public int PassAndReturnsInt(int v) { return v; }
-    public uint PassAndReturnsUInt(uint v) { return v; }
-    public long PassAndReturnsLong(long v) { return v; }
-    public ulong PassAndReturnsULong(ulong v) { return v; }
-    public char PassAndReturnsChar(char v) { return v; }
-    public string PassAndReturnsString(string v) { return v; }
-
-    public void PassOutInt(out int v) { v = 5; }
-    public void PassRefInt(ref int v) { v = 10; }
-
-    public void PassOutString (out string v) { v = "Mono"; }
-    public void PassRefString (ref string v) { v = "Mono"; }
-}
-
-#endregion
-
-#region Arrays
-
-public static class ArrayTypes
-{
-    public static int SumByteArray(byte[] array) { return array.Sum(n => n); }
-    
-    public static int[] ReturnsIntArray() { return new int[] { 1, 2, 3 }; }
-
-    public static string[] ReturnsStringArray() { return new string[] { "1", "2", "3" }; }
-
-}
-
-#endregion
-
-#region Enums
-
-public enum Enum
-{
-    Two = 2,
-    Three
-}
-
-public enum EnumByte : byte
-{
-    Two = 2,
-    Three
-}
-
-[Flags]
-public enum EnumFlags
-{
-    FlagOne = 1 << 0,
-    FlagTwo = 1 << 2
-}
-
-public static class EnumTypes
-{
-    public static int PassEnum(Enum e) { return (int)e; }
-    public static byte PassEnumByte(EnumByte e) { return (byte)e; }
-    public static int PassEnumFlags(EnumFlags e) { return (int)e; }
-}
-
-#endregion
-
-#region Classes
-
-public class ClassProperties
-{
-    public int Int { get; set; }
-    public int ReadOnlyInt { get; }
-}
-
-public class NonStaticClass
-{
-    public static int StaticMethod() { return 0; }
-}
-
-public static class StaticClass
-{
-    public static int StaticMethod() { return 0; }
-}
-
-namespace NS1
-{
-    public class NamespacedClass
-    {
-
-    }
-}
-
-namespace NS2
-{
-    public class NamespacedClass
-    {
-        
-    }
-}
-
-#endregion
\ No newline at end of file
diff --git a/tests/Basic/Makefile b/tests/Basic/Makefile
new file mode 100644
index 0000000..c846c59
--- /dev/null
+++ b/tests/Basic/Makefile
@@ -0,0 +1,32 @@
+.PHONY: all binder managed gen compile run clean
+MAKEFLAGS += --no-builtin-rules
+
+all: binder managed gen compile run 
+
+binder:
+	msbuild /nologo /v:minimal ../../build/MonoEmbeddinator4000.sln || xbuild /nologo /v:minimal ../../build/MonoEmbeddinator4000.sln
+
+EMBEDDINATOR_EXE=../../build/lib/Debug/MonoEmbeddinator4000.exe
+MANAGED_DLL=../managed/bin/Debug/managed.dll
+
+gen:
+	mono --debug $(EMBEDDINATOR_EXE) -gen=c -out=c -p=macos -compile -target=shared $(MANAGED_DLL)
+	mono --debug $(EMBEDDINATOR_EXE) -gen=objc -out=objc -p=macos -compile -target=shared $(MANAGED_DLL)
+	mono --debug $(EMBEDDINATOR_EXE) -gen=java -out=java -p=macos -target=shared $(MANAGED_DLL)
+
+BUILD_FLAGS=/v:minimal /p:DefineConstants="NON_OBJC_SUPPORTED_TESTS"
+
+managed:
+	BUILD_FLAGS="$(BUILD_FLAGS)" make -C ../managed clean all
+	mkdir -p mk/bin/Debug
+	cp ../managed/bin/Debug/managed.dll* mk/bin/Debug 
+
+compile:
+	../../external/CppSharp/build/premake5-osx gmake
+	make -C mk
+
+run:
+	mk/bin/Debug/Basic.Tests
+
+clean:
+	rm -rf mk *.dylib Basic.Tests
\ No newline at end of file
diff --git a/tests/Basic/premake5.lua b/tests/Basic/premake5.lua
index f4cdeda..80d86ed 100644
--- a/tests/Basic/premake5.lua
+++ b/tests/Basic/premake5.lua
@@ -1,4 +1,12 @@
-group "Tests/Basic"
-name="Basic"
+include "Helpers.lua"
+include "../../build/Tests.lua"
 
-SetupTestProject("Basic")
+workspace "Basic"
+  configurations { "Debug" }
+  symbols "On"
+  location "mk"
+
+  --SetupTestProjectGeneratorMake("Basic", "managed.dll")
+  SetupTestProjectC("Basic")
+  SetupTestProjectObjC("Basic")
+  SetupTestProjectsRunner("Basic")
\ No newline at end of file
diff --git a/tests/README.md b/tests/README.md
index 2d621b9..0be1094 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -5,17 +5,8 @@ This directory contains the test suite for Embeddinator.
 
 To run the test suite, run `RunTestsuite.sh` inside this directory.
 
-The test suite is composed by a few different projects:
+The test suite is composed by a few different projects/directories:
 
-
-
-The test suite build files are automatically generated from Premake build scripts.
-
-This makes sure the test suite can be run as part of an MSBuild-based system (VS on Windows)
-as well as a POSIX-based Make system.
-
-To re-generate the test suite Make build files, run:
-
-```
-../external/CppSharp/build/premake5-osx gmake
-```
\ No newline at end of file
+	* Basic: common test driver 
+	* objc-cli: Objective-C specific test driver
+	* managed: Managed code test types
diff --git a/tests/RunTestsuite.sh b/tests/RunTestsuite.sh
index 7201e87..9cdf1d0 100755
--- a/tests/RunTestsuite.sh
+++ b/tests/RunTestsuite.sh
@@ -1,4 +1,2 @@
 CUR_DIR=$(dirname -- $0)
-msbuild /nologo /v:minimal $CUR_DIR/../build/MonoEmbeddinator4000.sln || xbuild /nologo /v:minimal $CUR_DIR/../build/MonoEmbeddinator4000.sln
-make -C $CUR_DIR
-$CUR_DIR/Basic/Basic.Tests
\ No newline at end of file
+make -C $CUR_DIR/Basic
diff --git a/tests/premake5.lua b/tests/premake5.lua
deleted file mode 100644
index 7136126..0000000
--- a/tests/premake5.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-include "Helpers.lua"
-include "../build/Tests.lua"
-
-workspace "EmbeddinatorTestsuite"
-	configurations { "Release" }
-	IncludeDir("../tests")
\ No newline at end of file