diff --git a/src/cs/Bootsharp.Common.Test/Mocks.cs b/src/cs/Bootsharp.Common.Test/Mocks.cs
index 5854212e..3badfca4 100644
--- a/src/cs/Bootsharp.Common.Test/Mocks.cs
+++ b/src/cs/Bootsharp.Common.Test/Mocks.cs
@@ -1,6 +1,11 @@
-namespace Bootsharp.Common.Test;
+global using static Bootsharp.Common.Test.Mocks;
 
-public interface IBackend;
-public interface IFrontend;
-public class Backend : IBackend;
-public class Frontend : IFrontend;
+namespace Bootsharp.Common.Test;
+
+public static class Mocks
+{
+    public interface IBackend;
+    public interface IFrontend;
+    public class Backend : IBackend;
+    public class Frontend : IFrontend;
+}
diff --git a/src/cs/Bootsharp.Common.Test/TypesTest.cs b/src/cs/Bootsharp.Common.Test/TypesTest.cs
index 25f5fae2..f706a478 100644
--- a/src/cs/Bootsharp.Common.Test/TypesTest.cs
+++ b/src/cs/Bootsharp.Common.Test/TypesTest.cs
@@ -1,6 +1,5 @@
 using System.Reflection;
 using Bootsharp;
-using Bootsharp.Common.Test;
 
 [assembly: JSExport(typeof(IBackend))]
 [assembly: JSImport(typeof(IFrontend))]
diff --git a/src/cs/Bootsharp.Inject.Test/ExtensionsTest.cs b/src/cs/Bootsharp.Inject.Test/ExtensionsTest.cs
index 6fffab6c..44c35b03 100644
--- a/src/cs/Bootsharp.Inject.Test/ExtensionsTest.cs
+++ b/src/cs/Bootsharp.Inject.Test/ExtensionsTest.cs
@@ -30,7 +30,7 @@ public void CanInitializeGeneratedTypes ()
     public void WhenMissingRequiredDependencyErrorIsThrown ()
     {
         AddAutogenerated();
-        Assert.Contains("Failed to run Bootsharp: 'Bootsharp.Inject.Test.IBackend' dependency is not registered.",
+        Assert.Contains("Failed to run Bootsharp: 'Bootsharp.Inject.Test.Mocks+IBackend' dependency is not registered.",
             Assert.Throws<Error>(() => new ServiceCollection().AddBootsharp().BuildServiceProvider().RunBootsharp()).Message);
     }
 
diff --git a/src/cs/Bootsharp.Inject.Test/Mocks.cs b/src/cs/Bootsharp.Inject.Test/Mocks.cs
index 2f31d328..0d698357 100644
--- a/src/cs/Bootsharp.Inject.Test/Mocks.cs
+++ b/src/cs/Bootsharp.Inject.Test/Mocks.cs
@@ -1,17 +1,22 @@
-namespace Bootsharp.Inject.Test;
+global using static Bootsharp.Inject.Test.Mocks;
 
-public interface IBackend;
-public interface IFrontend;
-public class Backend : IBackend;
-public class Frontend : IFrontend;
-public class JSFrontend : IFrontend;
+namespace Bootsharp.Inject.Test;
 
-public class JSBackend
+public static class Mocks
 {
-    public static IBackend Handler { get; private set; }
+    public interface IBackend;
+    public interface IFrontend;
+    public class Backend : IBackend;
+    public class Frontend : IFrontend;
+    public class JSFrontend : IFrontend;
 
-    public JSBackend (IBackend handler)
+    public class JSBackend
     {
-        Handler = handler;
+        public static IBackend Handler { get; private set; }
+
+        public JSBackend (IBackend handler)
+        {
+            Handler = handler;
+        }
     }
 }