diff --git a/Tests/Program.cs b/Tests/Program.cs
index a0c89af..204dce9 100644
--- a/Tests/Program.cs
+++ b/Tests/Program.cs
@@ -1,5 +1,5 @@
-using Raylib;
-using static Raylib.Raylib;
+using Raylib_cs;
+using static Raylib_cs.Raylib;
 
 namespace Tests
 {
@@ -11,12 +11,12 @@ namespace Tests
             //--------------------------------------------------------------------------------------
             const int screenWidth = 800;
             const int screenHeight = 450;
-        
+
             InitWindow(screenWidth, screenHeight, "raylib [core] example - basic window");
-        
+
             SetTargetFPS(60);               // Set our game to run at 60 frames-per-second
             //--------------------------------------------------------------------------------------
-        
+
             // Main game loop
             while (!WindowShouldClose())    // Detect window close button or ESC key
             {
@@ -24,24 +24,24 @@ namespace Tests
                 //----------------------------------------------------------------------------------
                 // TODO: Update your variables here
                 //----------------------------------------------------------------------------------
-        
+
                 // Draw
                 //----------------------------------------------------------------------------------
                 BeginDrawing();
-        
+
                     ClearBackground(Color.RAYWHITE);
-        
+
                     DrawText("Congrats! You created your first window!", 190, 200, 20, Color.LIGHTGRAY);
-        
+
                 EndDrawing();
                 //----------------------------------------------------------------------------------
             }
-        
+
             // De-Initialization
             //--------------------------------------------------------------------------------------
             CloseWindow();        // Close window and OpenGL context
             //--------------------------------------------------------------------------------------
-        
+
             return;
         }
     }
diff --git a/Tests/Tests.MultiTarget.csproj b/Tests/Tests.MultiTarget.csproj
deleted file mode 100644
index e50767f..0000000
--- a/Tests/Tests.MultiTarget.csproj
+++ /dev/null
@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net45;net46;net461;net462;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
-    <ApplicationIcon>../Logo/raylib-cs.ico</ApplicationIcon>
-    <Platforms>AnyCPU;x64;x86</Platforms>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="../Bindings/*.cs" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
new file mode 100644
index 0000000..e641f0e
--- /dev/null
+++ b/Tests/Tests.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+      <OutputType>Exe</OutputType>
+      <TargetFrameworks>net47;netcoreapp3.1</TargetFrameworks>
+      <Platforms>x64</Platforms>
+    </PropertyGroup>
+
+    <PropertyGroup>
+      <ApplicationIcon>../Logo/raylib-cs.ico</ApplicationIcon>
+      <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    </PropertyGroup>
+
+    <Import Project="../netfx.props" />
+
+    <ItemGroup>
+        <None Include="../app.config" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="../Raylib-cs/Raylib-cs.csproj" />
+    </ItemGroup>
+</Project>