diff --git a/src/Dhgms.Nucleotide.Generators/Generators/BaseGenerator.cs b/src/Dhgms.Nucleotide.Generators/Generators/BaseGenerator.cs
index 64bef723..b91ad8cb 100644
--- a/src/Dhgms.Nucleotide.Generators/Generators/BaseGenerator.cs
+++ b/src/Dhgms.Nucleotide.Generators/Generators/BaseGenerator.cs
@@ -29,7 +29,7 @@ public void Initialize(GeneratorInitializationContext context)
         public static Diagnostic InfoDiagnostic(string message)
         {
             return Diagnostic.Create(
-                "NUC-I0001",
+                "NUCI0001",
                 "Nucleotide Generation",
                 message,
                 DiagnosticSeverity.Info,
@@ -42,7 +42,7 @@ public static Diagnostic InfoDiagnostic(string message)
         public static Diagnostic ErrorDiagnostic(string message)
         {
             return Diagnostic.Create(
-                "NUC-E0001",
+                "NUCE0001",
                 "Nucleotide Generation",
                 message,
                 DiagnosticSeverity.Error,
diff --git a/src/Dhgms.Nucleotide.ModelTests/Dhgms.Nucleotide.SampleGenerator.csproj b/src/Dhgms.Nucleotide.ModelTests/Dhgms.Nucleotide.SampleGenerator.csproj
index c384d1a2..cd12fc8e 100644
--- a/src/Dhgms.Nucleotide.ModelTests/Dhgms.Nucleotide.SampleGenerator.csproj
+++ b/src/Dhgms.Nucleotide.ModelTests/Dhgms.Nucleotide.SampleGenerator.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <IsPackable>false</IsPackable>
+    <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Dhgms.Nucleotide.UnitTests/Dhgms.Nucleotide.UnitTests.csproj b/src/Dhgms.Nucleotide.UnitTests/Dhgms.Nucleotide.UnitTests.csproj
index 0881611e..674305a8 100644
--- a/src/Dhgms.Nucleotide.UnitTests/Dhgms.Nucleotide.UnitTests.csproj
+++ b/src/Dhgms.Nucleotide.UnitTests/Dhgms.Nucleotide.UnitTests.csproj
@@ -12,21 +12,12 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Foundatio.Logging.Xunit" Version="9.1.1" />
+    <PackageReference Include="Foundatio.Xunit" Version="10.6.1" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.7.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.7.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
-    <PackageReference Include="Moq" Version="4.20.69" />
     <PackageReference Include="NetTestRegimentation" Version="1.7.2" />
     <PackageReference Include="OpenCover" Version="4.7.1221" />
     <PackageReference Include="ReportGenerator" Version="5.1.24" />
-    <PackageReference Include="xunit" Version="2.5.0" />
-    <PackageReference Include="xunit.analyzers" Version="1.2.0" />
-    <PackageReference Include="xunit.runner.reporters" Version="2.5.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Dhgms.Nucleotide.UnitTests/Generators/BaseGeneratorTests.cs b/src/Dhgms.Nucleotide.UnitTests/Generators/BaseGeneratorTests.cs
index 4cc1d961..376e2f92 100644
--- a/src/Dhgms.Nucleotide.UnitTests/Generators/BaseGeneratorTests.cs
+++ b/src/Dhgms.Nucleotide.UnitTests/Generators/BaseGeneratorTests.cs
@@ -41,7 +41,7 @@ public MockAttributeData(TypedConstant constructorArg)
             protected override ImmutableArray<KeyValuePair<string, TypedConstant>> CommonNamedArguments { get; }
         }
 
-        public abstract class BaseConstructorMethod<TGenerator, TFeatureFlags, TGeneratorProcessor, TGenerationModel> : Foundatio.Logging.Xunit.TestWithLoggingBase
+        public abstract class BaseConstructorMethod<TGenerator, TFeatureFlags, TGeneratorProcessor, TGenerationModel> : Foundatio.Xunit.TestWithLoggingBase
             where TGenerator : BaseGenerator<TFeatureFlags, TGeneratorProcessor, TGenerationModel>
             where TFeatureFlags : class
             where TGeneratorProcessor : BaseGeneratorProcessor<TGenerationModel>, new()
@@ -64,7 +64,7 @@ protected BaseConstructorMethod(ITestOutputHelper output) : base(output)
             }
         }
 
-        public abstract class BaseGenerateAsyncMethod<TGenerator, TFeatureFlags, TGeneratorProcessor, TGenerationModel> : Foundatio.Logging.Xunit.TestWithLoggingBase
+        public abstract class BaseGenerateAsyncMethod<TGenerator, TFeatureFlags, TGeneratorProcessor, TGenerationModel> : Foundatio.Xunit.TestWithLoggingBase
             where TGenerator : BaseGenerator<TFeatureFlags, TGeneratorProcessor, TGenerationModel>
             where TFeatureFlags : class
             where TGeneratorProcessor : BaseGeneratorProcessor<TGenerationModel>, new()