diff --git a/test/Libraries/SystemTestServices/SystemTestBase.cs b/test/Libraries/SystemTestServices/SystemTestBase.cs
index 774a09abb68..24390bbf9e9 100644
--- a/test/Libraries/SystemTestServices/SystemTestBase.cs
+++ b/test/Libraries/SystemTestServices/SystemTestBase.cs
@@ -194,7 +194,8 @@ protected virtual void StartDynamo(TestSessionConfiguration testConfig)
                     StartInTestMode = true,
                     PathResolver = pathResolver,
                     GeometryFactoryPath = preloader.GeometryFactoryPath,
-                    ProcessMode = TaskProcessMode.Synchronous
+                    ProcessMode = TaskProcessMode.Synchronous,
+                    DynamoCorePath = testConfig.DynamoCorePath
                 });
 
             ViewModel = DynamoViewModel.Start(
@@ -305,15 +306,29 @@ public void AssertPreviewCount(string guid, int count)
             Assert.AreEqual(count, data.GetElements().ToList().Count);
         }
 
-        public NodeModel GetNode<T>(string guid) where T : NodeModel
+        /// <summary>
+        /// Returns the NodeModel corresponding to the input guid
+        /// </summary>
+        /// <typeparam name="T">A NodeModel (or derived) type</typeparam>
+        /// <param name="guid">The node Guid</param>
+        /// <returns></returns>
+        /// <exception cref="Exception"></exception>
+        [Obsolete("This method will be removed in a future version of Dynamo")]
+        public NodeModel GetNode<T>(string guid) where T : class
         {
+            bool isNodeModel = typeof(T) == typeof(NodeModel);
+            bool isDerivedFromNodeModel = typeof(T).IsSubclassOf(typeof(NodeModel));
+            if ( !isNodeModel && !isDerivedFromNodeModel)
+            {
+                throw new Exception($"{typeof(T)} is not of type NodeModel");
+            }
             var allNodes = ViewModel.Model.CurrentWorkspace.Nodes;
             var nodes = allNodes.Where(x => string.CompareOrdinal(x.GUID.ToString(), guid) == 0);
             if (nodes.Count() < 1)
                 return null;
             else if (nodes.Count() > 1)
                 throw new Exception("There are more than one nodes with the same GUID!");
-            return nodes.ElementAt(0) as T;
+            return nodes.ElementAt(0);
         }
 
         public object GetPreviewValue(string guid)
diff --git a/tools/NuGet/build_props/DynamoVisualProgramming.Tests.props b/tools/NuGet/build_props/DynamoVisualProgramming.Tests.props
new file mode 100644
index 00000000000..b9be3bf82b4
--- /dev/null
+++ b/tools/NuGet/build_props/DynamoVisualProgramming.Tests.props
@@ -0,0 +1,9 @@
+<Project>
+    <ItemGroup>
+        <Content Include="$(MSBuildThisFileDirectory)TestServices.dll.config">
+            <Link>TestServices.dll.config</Link>
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+            <Visible>True</Visible>
+        </Content>
+    </ItemGroup>
+</Project>
diff --git a/tools/NuGet/build_props/TestServices.dll.config b/tools/NuGet/build_props/TestServices.dll.config
new file mode 100644
index 00000000000..0d8d234ba38
--- /dev/null
+++ b/tools/NuGet/build_props/TestServices.dll.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <appSettings>
+        <add key="DynamoBasePath" value=""/>
+        <add key="RequestedLibraryVersion2" value=""/>
+    </appSettings>
+</configuration>
diff --git a/tools/NuGet/template-nuget/DynamoVisualProgramming.Core.nuspec b/tools/NuGet/template-nuget/DynamoVisualProgramming.Core.nuspec
index bd2127d8cd4..d4e0c3df2d1 100644
--- a/tools/NuGet/template-nuget/DynamoVisualProgramming.Core.nuspec
+++ b/tools/NuGet/template-nuget/DynamoVisualProgramming.Core.nuspec
@@ -10,27 +10,15 @@
         <icon>content\images\logo.png</icon>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>
-            Assemblies required to start a DynamoModel and execute DesignScript code. Contains the following files:
-            1) DynamoApplications.dll
-            2) DynamoCore.dll
-            3) DynamoInstallDetective.dll
-            4) DynamoShapeManager.dll
-            5) DynamoUtilities.dll
-            6) ProtoCore.dll
-            7) DesignScriptBuiltin.dll
-            8) VMDataBridge.dll
-            9) DSCPython.dll
-            10) DynamoPackages.dll
+            Assemblies required to reference core APIs from Dynamo.
         </description>
         <summary>This package contains the core assemblies for Dynamo.</summary>
         <copyright>Copyright Autodesk 2023</copyright>
         <dependencies>
-            <!--TODO - why do we reference nunit from dynamo core? This is an odd partial collection of dependencies to mark.-->
             <group targetFramework="$TargetFramework$">
-                <dependency id="NUnit" version="3.13.3"/>
                 <dependency id="DynamoVisualProgramming.ZeroTouchLibrary" version="$Version$"/>
+                <!--NewtonSoft types are exposed in Dynamo public APIs-->
                 <dependency id="Newtonsoft.Json" version="13.0.1"/>
-                <dependency id="System.Collections.Immutable" version="5.0.0"/>
             </group>
         </dependencies>
     </metadata>
@@ -57,4 +45,4 @@
         <file src="DynamoPackages.xml" target="lib\$TargetFramework$" />
         <file src="..\..\..\doc\distrib\Images\logo_square_32x32.png" target="content\images\logo.png" />
     </files>
-</package>
+</package>
\ No newline at end of file
diff --git a/tools/NuGet/template-nuget/DynamoVisualProgramming.DynamoCoreNodes.nuspec b/tools/NuGet/template-nuget/DynamoVisualProgramming.DynamoCoreNodes.nuspec
index 26bcb36c694..1041a024aa8 100644
--- a/tools/NuGet/template-nuget/DynamoVisualProgramming.DynamoCoreNodes.nuspec
+++ b/tools/NuGet/template-nuget/DynamoVisualProgramming.DynamoCoreNodes.nuspec
@@ -10,13 +10,7 @@
         <icon>content\images\logo.png</icon>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>
-            Reference the core node types for Dynamo. It contains the following files:
-            1) Analysis.dll
-            2) GeometryColor.dll
-            3) DSCoreNodes.dll
-            4) CoreNodeModels.dll
-            5) Watch3DNodeModels.dll
-            6) UnitNodeModels.dll
+            Reference the core node types for Dynamo.
         </description>
         <copyright>Copyright Autodesk 2023</copyright>
         <dependencies>
diff --git a/tools/NuGet/template-nuget/DynamoVisualProgramming.Tests.nuspec b/tools/NuGet/template-nuget/DynamoVisualProgramming.Tests.nuspec
index 2e1ccddb92c..5b47ba3dfaf 100644
--- a/tools/NuGet/template-nuget/DynamoVisualProgramming.Tests.nuspec
+++ b/tools/NuGet/template-nuget/DynamoVisualProgramming.Tests.nuspec
@@ -9,23 +9,30 @@
         <projectUrl>https://github.com/DynamoDS/Dynamo</projectUrl>
         <icon>content\images\logo.png</icon>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>Unit and system test infrastructure for Dynamo. It contains the following files:
-        1) DynamoCoreTests.dll
-        2) SystemTestServices.dll
-        3) TestServices.dll</description>
+        <description>Unit and system test infrastructure for Dynamo.</description>
         <summary>This package contains all that is required to get up and running creating tests for Dynamo libraries.</summary>
         <copyright>Copyright Autodesk 2023</copyright>
         <dependencies>
             <group targetFramework="$TargetFramework$">
-                <dependency id="DynamoVisualProgramming.Core" version="$Version$"/>
+                <dependency id="DynamoVisualProgramming.Core" version="$Version$" exclude="runtime" />
+                 <dependency id="DynamoVisualProgramming.DynamoServices" version="$Version$" />
+                 <dependency id="Microsoft.NET.Test.Sdk" version="17.3.2" />
+                <dependency id="NUnit" version="3.13.3" />
+                <dependency id="NUnit3TestAdapter" version="4.2.1" />
             </group>
         </dependencies>
+        <contentFiles>
+        </contentFiles>
     </metadata>
     <files>
         <!--These assemblies are referenced from the bin directory since they are not harvested for the installer-->
         <file src="..\..\..\bin\AnyCPU\Release\DynamoCoreTests.dll" target="lib\$TargetFramework$" />
         <file src="..\..\..\bin\AnyCPU\Release\SystemTestServices.dll" target="lib\$TargetFramework$" />
         <file src="..\..\..\bin\AnyCPU\Release\TestServices.dll" target="lib\$TargetFramework$" />
+        
+        <file src="..\..\..\tools\Nuget\build_props\TestServices.dll.config" target="build" />
+        <file src="..\..\..\tools\Nuget\build_props\DynamoVisualProgramming.Tests.props" target="build" />
+        
         <file src="..\..\..\doc\distrib\Images\logo_square_32x32.png" target="content\images\logo.png" />
     </files>
 </package>
diff --git a/tools/NuGet/template-nuget/DynamoVisualProgramming.WpfUILibrary.nuspec b/tools/NuGet/template-nuget/DynamoVisualProgramming.WpfUILibrary.nuspec
index 84a8254e081..f93449ba0fc 100644
--- a/tools/NuGet/template-nuget/DynamoVisualProgramming.WpfUILibrary.nuspec
+++ b/tools/NuGet/template-nuget/DynamoVisualProgramming.WpfUILibrary.nuspec
@@ -10,18 +10,10 @@
         <icon>content\images\logo.png</icon>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>
-            Build node libraries for Dynamo with custom UI in WPF. It contains the following files:
-            1) DynamoCoreWpf.dll
-            2) CoreNodeModelsWpf.dll
+            Build node libraries for Dynamo with custom UI in WPF.
         </description>
         <summary>This package contains all that is required to get up and running building nodes for the Dynamo Visual Programming language with custom UI in WPF.</summary>
         <copyright>Copyright Autodesk 2023</copyright>
-        <frameworkAssemblies>
-            <frameworkAssembly assemblyName="System.Xaml" targetFramework="net48"/>
-            <frameworkAssembly assemblyName="WindowsBase" targetFramework="net48"/>
-            <frameworkAssembly assemblyName="PresentationCore" targetFramework="net48"/>
-            <frameworkAssembly assemblyName="PresentationFramework" targetFramework="net48"/>
-        </frameworkAssemblies>
         <dependencies>
             <group targetFramework="$TargetFramework$">
                 <dependency id="DynamoVisualProgramming.Core" version="$Version$"/>
diff --git a/tools/NuGet/template-nuget/DynamoVisualProgramming.ZeroTouchLibrary.nuspec b/tools/NuGet/template-nuget/DynamoVisualProgramming.ZeroTouchLibrary.nuspec
index b756cebe764..6d58e8088cf 100644
--- a/tools/NuGet/template-nuget/DynamoVisualProgramming.ZeroTouchLibrary.nuspec
+++ b/tools/NuGet/template-nuget/DynamoVisualProgramming.ZeroTouchLibrary.nuspec
@@ -9,9 +9,7 @@
         <projectUrl>https://github.com/DynamoDS/Dynamo</projectUrl>
         <icon>content\images\logo.png</icon>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>Build zero touch node libraries for Dynamo. It contains the following files:
-        1) DynamoUnits.dll
-        2) ProtoGeometry.dll</description>
+        <description>Build zero touch node libraries for Dynamo.</description>
         <summary>This package contains all that is required to get up and running building zero touch libraries for the Dynamo Visual Programming language.</summary>
         <copyright>Copyright Autodesk 2023</copyright>
         <dependencies>
@@ -29,4 +27,4 @@
         
         <file src="..\..\..\doc\distrib\Images\logo_square_32x32.png" target="content\images\logo.png" />
     </files>
-</package>
+</package>
\ No newline at end of file