diff --git a/.props/Test.props b/.props/Test.props
index b35d0ef7d..ec22bd2f1 100644
--- a/.props/Test.props
+++ b/.props/Test.props
@@ -8,4 +8,8 @@
   <Import Project=".\_Common.props" />
   <Import Project=".\_AnalyzerSettings.props" />
 
+  <PropertyGroup>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
 </Project>
\ No newline at end of file
diff --git a/LOGGING/test/DiagnosticSourceListener.Tests/DiagnosticSourceListener.Tests.csproj b/LOGGING/test/DiagnosticSourceListener.Tests/DiagnosticSourceListener.Tests.csproj
index 780145afa..edbcac41c 100644
--- a/LOGGING/test/DiagnosticSourceListener.Tests/DiagnosticSourceListener.Tests.csproj
+++ b/LOGGING/test/DiagnosticSourceListener.Tests/DiagnosticSourceListener.Tests.csproj
@@ -4,7 +4,6 @@
     <RootNamespace>Microsoft.ApplicationInsights.DiagnosticSourceListener.Tests</RootNamespace>
     <AssemblyName>Microsoft.ApplicationInsights.DiagnosticSourceListener.Tests</AssemblyName>
     <TargetFrameworks>netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/LOGGING/test/EtwCollector.Tests/EtwCollector.Tests.csproj b/LOGGING/test/EtwCollector.Tests/EtwCollector.Tests.csproj
index 5a3c80126..05a78719e 100644
--- a/LOGGING/test/EtwCollector.Tests/EtwCollector.Tests.csproj
+++ b/LOGGING/test/EtwCollector.Tests/EtwCollector.Tests.csproj
@@ -4,8 +4,6 @@
     <RootNamespace>Microsoft.ApplicationInsights.EtwCollector.Tests</RootNamespace>
     <AssemblyName>Microsoft.ApplicationInsights.EtwCollector.Tests</AssemblyName>
     <TargetFrameworks>net46</TargetFrameworks>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/LOGGING/test/EtwCollector.Tests/Properties/AssemblyInfo.cs b/LOGGING/test/EtwCollector.Tests/Properties/AssemblyInfo.cs
index 323353bc0..61380c0a4 100644
--- a/LOGGING/test/EtwCollector.Tests/Properties/AssemblyInfo.cs
+++ b/LOGGING/test/EtwCollector.Tests/Properties/AssemblyInfo.cs
@@ -2,13 +2,6 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Microsoft.ApplicationInsights.EtwCollector.Tests")]
-[assembly: AssemblyProduct("Microsoft.ApplicationInsights.EtwCollector.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
-
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
diff --git a/LOGGING/test/EventSourceListener.Tests/EventSourceListener.Tests.csproj b/LOGGING/test/EventSourceListener.Tests/EventSourceListener.Tests.csproj
index 7f7b411f6..481daccf5 100644
--- a/LOGGING/test/EventSourceListener.Tests/EventSourceListener.Tests.csproj
+++ b/LOGGING/test/EventSourceListener.Tests/EventSourceListener.Tests.csproj
@@ -4,8 +4,6 @@
     <RootNamespace>Microsoft.ApplicationInsights.EventSourceListener.Tests</RootNamespace>
     <AssemblyName>Microsoft.ApplicationInsights.EventSourceListener.Tests</AssemblyName>
     <TargetFrameworks>netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>    
diff --git a/LOGGING/test/EventSourceListener.Tests/Properties/AssemblyInfo.cs b/LOGGING/test/EventSourceListener.Tests/Properties/AssemblyInfo.cs
index 6f0f41b8f..efe4c5e29 100644
--- a/LOGGING/test/EventSourceListener.Tests/Properties/AssemblyInfo.cs
+++ b/LOGGING/test/EventSourceListener.Tests/Properties/AssemblyInfo.cs
@@ -8,13 +8,6 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Microsoft.ApplicationInsights.EventSourceListener.Tests")]
-[assembly: AssemblyProduct("Microsoft.ApplicationInsights.EventSourceListener.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
-
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
diff --git a/LOGGING/test/ILogger.Tests/ILogger.Tests.csproj b/LOGGING/test/ILogger.Tests/ILogger.Tests.csproj
index 30244c670..00dcc62cb 100644
--- a/LOGGING/test/ILogger.Tests/ILogger.Tests.csproj
+++ b/LOGGING/test/ILogger.Tests/ILogger.Tests.csproj
@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <TargetFrameworks>netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/LOGGING/test/Log4NetAppender.Tests/Log4NetAppender.Tests.csproj b/LOGGING/test/Log4NetAppender.Tests/Log4NetAppender.Tests.csproj
index b0956b61b..102b6f64e 100644
--- a/LOGGING/test/Log4NetAppender.Tests/Log4NetAppender.Tests.csproj
+++ b/LOGGING/test/Log4NetAppender.Tests/Log4NetAppender.Tests.csproj
@@ -5,7 +5,6 @@
     <RootNamespace>Microsoft.ApplicationInsights.Log4NetAppender.Tests</RootNamespace>
     <AssemblyName>Microsoft.ApplicationInsights.Log4NetAppender.Tests</AssemblyName>
     <TargetFrameworks>net45;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/LOGGING/test/Log4NetAppender.Tests/Properties/AssemblyInfo.cs b/LOGGING/test/Log4NetAppender.Tests/Properties/AssemblyInfo.cs
index 93b972807..3ffd2469d 100644
--- a/LOGGING/test/Log4NetAppender.Tests/Properties/AssemblyInfo.cs
+++ b/LOGGING/test/Log4NetAppender.Tests/Properties/AssemblyInfo.cs
@@ -9,18 +9,6 @@ using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Log4NetAppender.Tests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Log4NetAppender.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
diff --git a/LOGGING/test/NLogTarget.Tests/NLogTarget.Tests.csproj b/LOGGING/test/NLogTarget.Tests/NLogTarget.Tests.csproj
index 3f73e3207..e32fd7687 100644
--- a/LOGGING/test/NLogTarget.Tests/NLogTarget.Tests.csproj
+++ b/LOGGING/test/NLogTarget.Tests/NLogTarget.Tests.csproj
@@ -5,7 +5,6 @@
     <RootNamespace>Microsoft.ApplicationInsights.NLogTarget.Tests</RootNamespace>
     <AssemblyName>Microsoft.ApplicationInsights.NLogTarget.Tests</AssemblyName>
     <TargetFrameworks>net45;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/LOGGING/test/NLogTarget.Tests/Properties/AssemblyInfo.cs b/LOGGING/test/NLogTarget.Tests/Properties/AssemblyInfo.cs
index abb8b02f1..0c749f6cd 100644
--- a/LOGGING/test/NLogTarget.Tests/Properties/AssemblyInfo.cs
+++ b/LOGGING/test/NLogTarget.Tests/Properties/AssemblyInfo.cs
@@ -9,18 +9,6 @@ using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("NLogTarget.Tests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("NLogTarget.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
diff --git a/LOGGING/test/TraceListener.Tests/Properties/AssemblyInfo.cs b/LOGGING/test/TraceListener.Tests/Properties/AssemblyInfo.cs
index 408b30adb..817469834 100644
--- a/LOGGING/test/TraceListener.Tests/Properties/AssemblyInfo.cs
+++ b/LOGGING/test/TraceListener.Tests/Properties/AssemblyInfo.cs
@@ -9,18 +9,6 @@ using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("TraceListener.Tests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("TraceListener.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
diff --git a/LOGGING/test/TraceListener.Tests/TraceListener.Tests.csproj b/LOGGING/test/TraceListener.Tests/TraceListener.Tests.csproj
index 50035ebac..72f6e7073 100644
--- a/LOGGING/test/TraceListener.Tests/TraceListener.Tests.csproj
+++ b/LOGGING/test/TraceListener.Tests/TraceListener.Tests.csproj
@@ -5,7 +5,6 @@
     <RootNamespace>Microsoft.ApplicationInsights.TraceListener.Tests</RootNamespace>
     <AssemblyName>Microsoft.ApplicationInsights.TraceListener.Tests</AssemblyName>
     <TargetFrameworks>net45;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/LOGGING/test/Xdt.Tests/Properties/AssemblyInfo.cs b/LOGGING/test/Xdt.Tests/Properties/AssemblyInfo.cs
index 65b1134a2..d2ee8a62a 100644
--- a/LOGGING/test/Xdt.Tests/Properties/AssemblyInfo.cs
+++ b/LOGGING/test/Xdt.Tests/Properties/AssemblyInfo.cs
@@ -9,18 +9,6 @@ using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Xdt.Tests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Xdt.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2014")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
diff --git a/LOGGING/test/Xdt.Tests/Xdt.Tests.csproj b/LOGGING/test/Xdt.Tests/Xdt.Tests.csproj
index eea52611b..2f97200ad 100644
--- a/LOGGING/test/Xdt.Tests/Xdt.Tests.csproj
+++ b/LOGGING/test/Xdt.Tests/Xdt.Tests.csproj
@@ -5,7 +5,6 @@
     <RootNamespace>Xdt.Tests</RootNamespace>
     <AssemblyName>Xdt.Tests</AssemblyName>
     <TargetFramework>net45</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/NETCORE/src/Microsoft.ApplicationInsights.WorkerService/Microsoft.ApplicationInsights.WorkerService.csproj b/NETCORE/src/Microsoft.ApplicationInsights.WorkerService/Microsoft.ApplicationInsights.WorkerService.csproj
index 8eb7756d7..19d140894 100644
--- a/NETCORE/src/Microsoft.ApplicationInsights.WorkerService/Microsoft.ApplicationInsights.WorkerService.csproj
+++ b/NETCORE/src/Microsoft.ApplicationInsights.WorkerService/Microsoft.ApplicationInsights.WorkerService.csproj
@@ -1,16 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="$(PropsRoot)\Product.props" />
 
-  <PropertyGroup>
-    <!-- Override settings from Nupkg.props. I don't know why the NetCore projects need this and the others don't. -->
-    <GenerateAssemblyVersionAttribute>true</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>true</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyInformationalVersionAttribute>true</GenerateAssemblyInformationalVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>true</GenerateAssemblyDescriptionAttribute>
-    <GenerateAssemblyProductAttribute>true</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyTitleAttribute>true</GenerateAssemblyTitleAttribute>
-  </PropertyGroup>
-
   <PropertyGroup>
     <AssemblyName>Microsoft.ApplicationInsights.WorkerService</AssemblyName>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
diff --git a/WEB/Src/DependencyCollector/DependencyCollector.Tests/DependencyCollector.Tests.csproj b/WEB/Src/DependencyCollector/DependencyCollector.Tests/DependencyCollector.Tests.csproj
index c4199282f..1dfaaf97e 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector.Tests/DependencyCollector.Tests.csproj
+++ b/WEB/Src/DependencyCollector/DependencyCollector.Tests/DependencyCollector.Tests.csproj
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net45;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
-    <AssemblyName>Microsoft.ApplicationInsights.DependencyCollector.NetCore.Tests</AssemblyName>
+    <AssemblyName>Microsoft.ApplicationInsights.DependencyCollector.Tests</AssemblyName>
     <PackageId>Microsoft.AI.DependencyCollector.Tests</PackageId>
 
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
diff --git a/WEB/Src/DependencyCollector/DependencyCollector/Properties/AssemblyInfo.cs b/WEB/Src/DependencyCollector/DependencyCollector/Properties/AssemblyInfo.cs
index f0682814a..896f1366f 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector/Properties/AssemblyInfo.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector/Properties/AssemblyInfo.cs
@@ -9,9 +9,7 @@ using System.Runtime.InteropServices;
 
 [assembly: ComVisible(false)]
 
-[assembly: InternalsVisibleTo("Microsoft.ApplicationInsights.DependencyCollector.Net45.Tests, PublicKey=" + AssemblyInfo.PublicKey)]
-[assembly: InternalsVisibleTo("Microsoft.ApplicationInsights.DependencyCollector.Net46.Tests, PublicKey=" + AssemblyInfo.PublicKey)]
-[assembly: InternalsVisibleTo("Microsoft.ApplicationInsights.DependencyCollector.NetCore.Tests, PublicKey=" + AssemblyInfo.PublicKey)]
+[assembly: InternalsVisibleTo("Microsoft.ApplicationInsights.DependencyCollector.Tests, PublicKey=" + AssemblyInfo.PublicKey)]
 
 // Assembly dynamically generated by Moq in unit tests
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=" + AssemblyInfo.MoqPublicKey)]
diff --git a/WEB/Src/HostingStartup/HostingStartup.Tests/HostingStartup.Tests.csproj b/WEB/Src/HostingStartup/HostingStartup.Tests/HostingStartup.Tests.csproj
index 497ab2039..9f389e379 100644
--- a/WEB/Src/HostingStartup/HostingStartup.Tests/HostingStartup.Tests.csproj
+++ b/WEB/Src/HostingStartup/HostingStartup.Tests/HostingStartup.Tests.csproj
@@ -5,7 +5,6 @@
     <RootNamespace>Microsoft.ApplicationInsights.HostingStartup.Tests</RootNamespace>
     <AssemblyName>Microsoft.ApplicationInsights.HostingStartup.Tests</AssemblyName>
     <TargetFrameworks>net45</TargetFrameworks>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/WEB/Src/HostingStartup/HostingStartup.Tests/Properties/AssemblyInfo.cs b/WEB/Src/HostingStartup/HostingStartup.Tests/Properties/AssemblyInfo.cs
index 305bc43c4..3ffd2469d 100644
--- a/WEB/Src/HostingStartup/HostingStartup.Tests/Properties/AssemblyInfo.cs
+++ b/WEB/Src/HostingStartup/HostingStartup.Tests/Properties/AssemblyInfo.cs
@@ -9,18 +9,6 @@ using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("HostingStartup.Tests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("HostingStartup.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
diff --git a/WEB/Src/PerformanceCollector/Xdt.Tests/Xdt.Tests.csproj b/WEB/Src/PerformanceCollector/Xdt.Tests/Xdt.Tests.csproj
index 62e3afa7c..8f9bc2b07 100644
--- a/WEB/Src/PerformanceCollector/Xdt.Tests/Xdt.Tests.csproj
+++ b/WEB/Src/PerformanceCollector/Xdt.Tests/Xdt.Tests.csproj
@@ -6,7 +6,6 @@
     <AssemblyName>Xdt.Tests</AssemblyName>
     <TargetFrameworks>net45</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <IsPackable>false</IsPackable>
   </PropertyGroup>
   
   <ItemGroup>
diff --git a/WEB/Src/Web/Web.Tests/Web.Tests.csproj b/WEB/Src/Web/Web.Tests/Web.Tests.csproj
index 08d5f3b14..cf637fae6 100644
--- a/WEB/Src/Web/Web.Tests/Web.Tests.csproj
+++ b/WEB/Src/Web/Web.Tests/Web.Tests.csproj
@@ -4,7 +4,6 @@
   <PropertyGroup>
     <AssemblyName>Microsoft.ApplicationInsights.Web.Tests</AssemblyName>
     <TargetFrameworks>net45</TargetFrameworks>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
   <ItemGroup>