diff --git a/src/SimAI.Tests/SimAI.Tests.csproj b/src/SimAI.Tests/SimAI.Tests.csproj
index a67e001..2332136 100644
--- a/src/SimAI.Tests/SimAI.Tests.csproj
+++ b/src/SimAI.Tests/SimAI.Tests.csproj
@@ -2,7 +2,8 @@
 
  <PropertyGroup>
   <TargetFramework>net6.0</TargetFramework>
-
+  <Nullable>enable</Nullable>
+  <ImplicitUsings>enable</ImplicitUsings>
   <IsPackable>false</IsPackable>
 
   <RootNamespace>SimAntics.Tests</RootNamespace>
diff --git a/src/SimAI.Tests/UnitTest1.cs b/src/SimAI.Tests/UnitTest1.cs
deleted file mode 100644
index 638cbae..0000000
--- a/src/SimAI.Tests/UnitTest1.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using Xunit;
-
-namespace SimAI.Tests;
-
-public class UnitTest1
-   {
-       [Fact]
-       public void Test1()
-       {
-           var clock = new VMClock();
-           Console.WriteLine(clock.Ticks);
-           clock.Tick();
-           Console.WriteLine(clock.Ticks);
-       }
-   }
\ No newline at end of file
diff --git a/src/SimAI.Tests/VMClockTest.cs b/src/SimAI.Tests/VMClockTest.cs
new file mode 100644
index 0000000..9edeec9
--- /dev/null
+++ b/src/SimAI.Tests/VMClockTest.cs
@@ -0,0 +1,16 @@
+using System.Diagnostics;
+using Xunit;
+
+namespace SimAI.Tests;
+
+public class VMClockTest
+{
+ [Fact]
+ public void TickTest()
+ {
+  var clock = new VMClock();
+  Debug.WriteLine(clock.Ticks);
+  clock.Tick();
+  Debug.WriteLine(clock.Ticks);
+ }
+}
\ No newline at end of file
diff --git a/src/SimAI.Tests/VMTest.cs b/src/SimAI.Tests/VMTest.cs
index 58b8b32..f5c35fa 100644
--- a/src/SimAI.Tests/VMTest.cs
+++ b/src/SimAI.Tests/VMTest.cs
@@ -3,9 +3,9 @@
 // http://mozilla.org/MPL/2.0/.
 namespace SimAI.Tests;
 
-   public class VMTest
-   {
-       public VMTest()
-       {
-       }
-   }
+public class VMTest
+{
+ public VMTest()
+ {
+ }
+}
diff --git a/src/SimAI/Engine/VMScheduler.cs b/src/SimAI/Engine/VMScheduler.cs
index 89d78c9..f0257ac 100644
--- a/src/SimAI/Engine/VMScheduler.cs
+++ b/src/SimAI/Engine/VMScheduler.cs
@@ -18,10 +18,7 @@ public class VMScheduler
  public bool RunningNow { get; set; }
 
 
- public VMScheduler(VM vm)
- {
-  VM = vm;
- }
+ public VMScheduler(VM vm) => VM = vm;
 
  public void ScheduleTickIn(VMEntity _ent, uint delay)
  {
diff --git a/src/SimAI/Engine/VMStackFrame.cs b/src/SimAI/Engine/VMStackFrame.cs
index 2728a07..0dfb8d6 100644
--- a/src/SimAI/Engine/VMStackFrame.cs
+++ b/src/SimAI/Engine/VMStackFrame.cs
@@ -168,10 +168,6 @@ public class VMStackFrame
            ActionTree = input.ActionTree;
        }
 
-       public VMStackFrame(VMStackFrameMarshal input, VMContext context, VMThread thread)
-       {
-           Thread = thread;
-           // Load(input, context);
-       }
-       #endregion
-   }
+ public VMStackFrame(VMStackFrameMarshal input, VMContext context, VMThread thread) => Thread = thread;// Load(input, context);
+ #endregion
+}
diff --git a/src/SimAI/Marshals/VMStackFrameMarshal.cs b/src/SimAI/Marshals/VMStackFrameMarshal.cs
index 294b500..91b229f 100644
--- a/src/SimAI/Marshals/VMStackFrameMarshal.cs
+++ b/src/SimAI/Marshals/VMStackFrameMarshal.cs
@@ -19,7 +19,7 @@ public class VMStackFrameMarshal
  public int Version { get; set; }
 
  public VMStackFrameMarshal() { }
- public VMStackFrameMarshal(int version) { Version = version; }
+ public VMStackFrameMarshal(int version) => Version = version;
 
  public virtual void Deserialize(BinaryReader reader)
  {