diff --git a/Unity-Package/Assets/root/Tests/Editor/com.IvanMurzak.Unity.MCP.ParticleSystem.Editor.Tests.asmdef b/Unity-Package/Assets/root/Tests/Editor/com.IvanMurzak.Unity.MCP.ParticleSystem.Editor.Tests.asmdef
index 4bd6685..a2e355b 100644
--- a/Unity-Package/Assets/root/Tests/Editor/com.IvanMurzak.Unity.MCP.ParticleSystem.Editor.Tests.asmdef
+++ b/Unity-Package/Assets/root/Tests/Editor/com.IvanMurzak.Unity.MCP.ParticleSystem.Editor.Tests.asmdef
@@ -5,8 +5,6 @@
         "com.IvanMurzak.Unity.MCP.Editor.Tests",
         "com.IvanMurzak.Unity.MCP.Runtime",
         "com.IvanMurzak.Unity.MCP.TestFiles",
-        "UnityEngine.TestRunner",
-        "UnityEditor.TestRunner",
         "com.IvanMurzak.Unity.MCP.ParticleSystem.Runtime",
         "com.IvanMurzak.Unity.MCP.ParticleSystem.Editor"
     ],
@@ -14,10 +12,10 @@
         "Editor"
     ],
     "excludePlatforms": [],
+    "optionalUnityReferences": ["TestAssemblies"],
     "allowUnsafeCode": false,
     "overrideReferences": true,
     "precompiledReferences": [
-        "nunit.framework.dll",
         "System.Text.Json.dll",
         "Microsoft.Extensions.Logging.Abstractions.dll",
         "Microsoft.AspNetCore.SignalR.Client.dll",
@@ -28,7 +26,9 @@
         "R3.dll"
     ],
     "autoReferenced": false,
-    "defineConstraints": [],
+    "defineConstraints": [
+        "UNITY_INCLUDE_TESTS"
+    ],
     "versionDefines": [],
     "noEngineReferences": false
 }
\ No newline at end of file
diff --git a/Unity-Package/Assets/root/Tests/Runtime/com.IvanMurzak.Unity.MCP.ParticleSystem.Tests.asmdef b/Unity-Package/Assets/root/Tests/Runtime/com.IvanMurzak.Unity.MCP.ParticleSystem.Tests.asmdef
index ae3b52a..adca93f 100644
--- a/Unity-Package/Assets/root/Tests/Runtime/com.IvanMurzak.Unity.MCP.ParticleSystem.Tests.asmdef
+++ b/Unity-Package/Assets/root/Tests/Runtime/com.IvanMurzak.Unity.MCP.ParticleSystem.Tests.asmdef
@@ -4,15 +4,14 @@
         "com.IvanMurzak.Unity.MCP.Runtime",
         "com.IvanMurzak.Unity.MCP.Tests",
         "com.IvanMurzak.Unity.MCP.TestFiles",
-        "UnityEngine.TestRunner",
         "com.IvanMurzak.Unity.MCP.ParticleSystem.Runtime"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
+    "optionalUnityReferences": ["TestAssemblies"],
     "allowUnsafeCode": false,
     "overrideReferences": true,
     "precompiledReferences": [
-        "nunit.framework.dll",
         "System.Text.Json.dll",
         "Microsoft.Extensions.Logging.Abstractions.dll",
         "Microsoft.AspNetCore.SignalR.Client.dll",
diff --git a/Unity-Package/Unity-Package.slnx b/Unity-Package/Unity-Package.slnx
index 237e66d..38419f9 100644
--- a/Unity-Package/Unity-Package.slnx
+++ b/Unity-Package/Unity-Package.slnx
@@ -1,9 +1,5 @@
 <Solution>
-  <Project Path="com.IvanMurzak.Unity.MCP.Runtime.csproj" />
-  <Project Path="com.IvanMurzak.Unity.MCP.Editor.csproj" />
-  <Project Path="com.IvanMurzak.Unity.MCP.Editor.Tests.csproj" />
   <Project Path="com.IvanMurzak.Unity.MCP.ParticleSystem.Editor.csproj" />
-  <Project Path="com.IvanMurzak.Unity.MCP.TestFiles.csproj" />
   <Project Path="com.IvanMurzak.Unity.MCP.ParticleSystem.Editor.Tests.csproj" />
   <Project Path="com.IvanMurzak.Unity.MCP.ParticleSystem.Tests.csproj" />
 </Solution>
diff --git a/Unity-Tests/2022.3.62f3/Assets/EditorTests/EditorTests.asmdef b/Unity-Tests/2022.3.62f3/Assets/EditorTests/EditorTests.asmdef
index 2d058f5..f247a5a 100644
--- a/Unity-Tests/2022.3.62f3/Assets/EditorTests/EditorTests.asmdef
+++ b/Unity-Tests/2022.3.62f3/Assets/EditorTests/EditorTests.asmdef
@@ -1,19 +1,15 @@
 {
     "name": "EditorTests",
     "rootNamespace": "",
-    "references": [
-        "UnityEngine.TestRunner",
-        "UnityEditor.TestRunner"
-    ],
+    "references": [],
     "includePlatforms": [
         "Editor"
     ],
     "excludePlatforms": [],
+    "optionalUnityReferences": ["TestAssemblies"],
     "allowUnsafeCode": false,
     "overrideReferences": true,
-    "precompiledReferences": [
-        "nunit.framework.dll"
-    ],
+    "precompiledReferences": [],
     "autoReferenced": false,
     "defineConstraints": [
         "UNITY_INCLUDE_TESTS"
diff --git a/Unity-Tests/2022.3.62f3/Assets/RuntimeTests/RuntimeTests.asmdef b/Unity-Tests/2022.3.62f3/Assets/RuntimeTests/RuntimeTests.asmdef
index 160cf40..1953463 100644
--- a/Unity-Tests/2022.3.62f3/Assets/RuntimeTests/RuntimeTests.asmdef
+++ b/Unity-Tests/2022.3.62f3/Assets/RuntimeTests/RuntimeTests.asmdef
@@ -1,17 +1,13 @@
 {
     "name": "RuntimeTests",
     "rootNamespace": "",
-    "references": [
-        "UnityEngine.TestRunner",
-        "UnityEditor.TestRunner"
-    ],
+    "references": [],
     "includePlatforms": [],
     "excludePlatforms": [],
+    "optionalUnityReferences": ["TestAssemblies"],
     "allowUnsafeCode": false,
     "overrideReferences": true,
-    "precompiledReferences": [
-        "nunit.framework.dll"
-    ],
+    "precompiledReferences": [],
     "autoReferenced": false,
     "defineConstraints": [
         "UNITY_INCLUDE_TESTS"
diff --git a/Unity-Tests/2022.3.62f3/Packages/manifest.json b/Unity-Tests/2022.3.62f3/Packages/manifest.json
index 10807d3..cde880a 100644
--- a/Unity-Tests/2022.3.62f3/Packages/manifest.json
+++ b/Unity-Tests/2022.3.62f3/Packages/manifest.json
@@ -44,5 +44,6 @@
         "org.nuget"
       ]
     }
-  ]
+  ],
+  "testables": ["com.ivanmurzak.unity.mcp.particlesystem"]
 }
\ No newline at end of file
diff --git a/Unity-Tests/2023.2.22f1/Assets/EditorTests/EditorTests.asmdef b/Unity-Tests/2023.2.22f1/Assets/EditorTests/EditorTests.asmdef
index 2d058f5..f247a5a 100644
--- a/Unity-Tests/2023.2.22f1/Assets/EditorTests/EditorTests.asmdef
+++ b/Unity-Tests/2023.2.22f1/Assets/EditorTests/EditorTests.asmdef
@@ -1,19 +1,15 @@
 {
     "name": "EditorTests",
     "rootNamespace": "",
-    "references": [
-        "UnityEngine.TestRunner",
-        "UnityEditor.TestRunner"
-    ],
+    "references": [],
     "includePlatforms": [
         "Editor"
     ],
     "excludePlatforms": [],
+    "optionalUnityReferences": ["TestAssemblies"],
     "allowUnsafeCode": false,
     "overrideReferences": true,
-    "precompiledReferences": [
-        "nunit.framework.dll"
-    ],
+    "precompiledReferences": [],
     "autoReferenced": false,
     "defineConstraints": [
         "UNITY_INCLUDE_TESTS"
diff --git a/Unity-Tests/2023.2.22f1/Assets/RuntimeTests/RuntimeTests.asmdef b/Unity-Tests/2023.2.22f1/Assets/RuntimeTests/RuntimeTests.asmdef
index 160cf40..1953463 100644
--- a/Unity-Tests/2023.2.22f1/Assets/RuntimeTests/RuntimeTests.asmdef
+++ b/Unity-Tests/2023.2.22f1/Assets/RuntimeTests/RuntimeTests.asmdef
@@ -1,17 +1,13 @@
 {
     "name": "RuntimeTests",
     "rootNamespace": "",
-    "references": [
-        "UnityEngine.TestRunner",
-        "UnityEditor.TestRunner"
-    ],
+    "references": [],
     "includePlatforms": [],
     "excludePlatforms": [],
+    "optionalUnityReferences": ["TestAssemblies"],
     "allowUnsafeCode": false,
     "overrideReferences": true,
-    "precompiledReferences": [
-        "nunit.framework.dll"
-    ],
+    "precompiledReferences": [],
     "autoReferenced": false,
     "defineConstraints": [
         "UNITY_INCLUDE_TESTS"
diff --git a/Unity-Tests/2023.2.22f1/Packages/manifest.json b/Unity-Tests/2023.2.22f1/Packages/manifest.json
index 68ea3e0..b881fdd 100644
--- a/Unity-Tests/2023.2.22f1/Packages/manifest.json
+++ b/Unity-Tests/2023.2.22f1/Packages/manifest.json
@@ -47,5 +47,6 @@
         "org.nuget"
       ]
     }
-  ]
+  ],
+  "testables": ["com.ivanmurzak.unity.mcp.particlesystem"]
 }
\ No newline at end of file
diff --git a/Unity-Tests/6000.3.1f1/Assets/EditorTests/EditorTests.asmdef b/Unity-Tests/6000.3.1f1/Assets/EditorTests/EditorTests.asmdef
index 2d058f5..f247a5a 100644
--- a/Unity-Tests/6000.3.1f1/Assets/EditorTests/EditorTests.asmdef
+++ b/Unity-Tests/6000.3.1f1/Assets/EditorTests/EditorTests.asmdef
@@ -1,19 +1,15 @@
 {
     "name": "EditorTests",
     "rootNamespace": "",
-    "references": [
-        "UnityEngine.TestRunner",
-        "UnityEditor.TestRunner"
-    ],
+    "references": [],
     "includePlatforms": [
         "Editor"
     ],
     "excludePlatforms": [],
+    "optionalUnityReferences": ["TestAssemblies"],
     "allowUnsafeCode": false,
     "overrideReferences": true,
-    "precompiledReferences": [
-        "nunit.framework.dll"
-    ],
+    "precompiledReferences": [],
     "autoReferenced": false,
     "defineConstraints": [
         "UNITY_INCLUDE_TESTS"
diff --git a/Unity-Tests/6000.3.1f1/Assets/RuntimeTests/RuntimeTests.asmdef b/Unity-Tests/6000.3.1f1/Assets/RuntimeTests/RuntimeTests.asmdef
index 160cf40..1953463 100644
--- a/Unity-Tests/6000.3.1f1/Assets/RuntimeTests/RuntimeTests.asmdef
+++ b/Unity-Tests/6000.3.1f1/Assets/RuntimeTests/RuntimeTests.asmdef
@@ -1,17 +1,13 @@
 {
     "name": "RuntimeTests",
     "rootNamespace": "",
-    "references": [
-        "UnityEngine.TestRunner",
-        "UnityEditor.TestRunner"
-    ],
+    "references": [],
     "includePlatforms": [],
     "excludePlatforms": [],
+    "optionalUnityReferences": ["TestAssemblies"],
     "allowUnsafeCode": false,
     "overrideReferences": true,
-    "precompiledReferences": [
-        "nunit.framework.dll"
-    ],
+    "precompiledReferences": [],
     "autoReferenced": false,
     "defineConstraints": [
         "UNITY_INCLUDE_TESTS"
diff --git a/Unity-Tests/6000.3.1f1/Packages/manifest.json b/Unity-Tests/6000.3.1f1/Packages/manifest.json
index 1e0a2dc..d88b17b 100644
--- a/Unity-Tests/6000.3.1f1/Packages/manifest.json
+++ b/Unity-Tests/6000.3.1f1/Packages/manifest.json
@@ -48,5 +48,6 @@
         "org.nuget"
       ]
     }
-  ]
+  ],
+  "testables": ["com.ivanmurzak.unity.mcp.particlesystem"]
 }
\ No newline at end of file