diff --git a/Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/Kernel.cs b/Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/Kernel.cs
index 7730642eb..42bd0c1c3 100644
--- a/Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/Kernel.cs
+++ b/Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/Kernel.cs
@@ -42,7 +42,7 @@ namespace Cosmos.Compiler.Tests.Bcl.System
                 ConvertTests.Execute();
                 DateTimeTests.Execute();
                 TimeSpanTests.Execute();
-
+                GuidTest.Execute();
 
                 TestController.Completed();
             }
diff --git a/Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/GuidTest.cs b/Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/GuidTest.cs
index aa0259ac4..6ad1fb4fc 100644
--- a/Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/GuidTest.cs
+++ b/Tests/Kernels/Cosmos.Compiler.Tests.Bcl.System/System/GuidTest.cs
@@ -5,7 +5,7 @@ using Cosmos.TestRunner;
 
 namespace Cosmos.Compiler.Tests.Bcl.System
 {
-    class GuidTest
+    internal static class GuidTest
     {
 
         public static void Execute()
diff --git a/Tests/Kernels/Cosmos.Compiler.Tests.Bcl/Kernel.cs b/Tests/Kernels/Cosmos.Compiler.Tests.Bcl/Kernel.cs
index f6222821f..ce2b0e66d 100644
--- a/Tests/Kernels/Cosmos.Compiler.Tests.Bcl/Kernel.cs
+++ b/Tests/Kernels/Cosmos.Compiler.Tests.Bcl/Kernel.cs
@@ -50,8 +50,6 @@ namespace Cosmos.Compiler.Tests.Bcl
                 // System.Text
                 StringBuilderTest.Execute();
                 EncodingTest.Execute();
-				
-                GuidTest.Execute();
 
                 TestController.Completed();
             }