diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml
index 83e0cb56..2b3d8162 100644
--- a/.github/workflows/action.yml
+++ b/.github/workflows/action.yml
@@ -89,7 +89,7 @@ jobs:
         run: dotnet restore
       
       - name: test
-        run: dotnet test --project ./tests/NuGetUtility.Test.UrlToLicenseMapping/NuGetUtility.Test.UrlToLicenseMapping.csproj --configuration Release --no-restore
+        run: dotnet test --project ./tests/NuGetUtility.UrlToLicenseMapping.Test/NuGetUtility.UrlToLicenseMapping.Test.csproj --configuration Release --no-restore
 
   test_windows:
     runs-on: windows-latest
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9a832c3f..f7147967 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -35,7 +35,7 @@ jobs:
       - name: test
         uses: josepho0918/vstest-action@main
         with:
-          testAssembly: "*.Test.*dll"
+          testAssembly: "NuGet*.Test.dll"
           searchFolder: "tests/*/bin/Release/net9.0/"
           runInParallel: true
 
diff --git a/NuGetUtility.sln b/NuGetUtility.sln
index 0a579859..cf8a9bbe 100644
--- a/NuGetUtility.sln
+++ b/NuGetUtility.sln
@@ -47,7 +47,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VersionRangesProject", "tes
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultiTargetProjectWithDifferentDependencies", "tests\targets\MultiTargetProjectWithDifferentDependencies\MultiTargetProjectWithDifferentDependencies.csproj", "{A19BF89A-8B1F-4612-A923-08F52B53DC84}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGetUtility.Test.UrlToLicenseMapping", "tests\NuGetUtility.Test.UrlToLicenseMapping\NuGetUtility.Test.UrlToLicenseMapping.csproj", "{A77F9673-8296-4680-A713-8AC26B7DE41C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGetUtility.UrlToLicenseMapping.Test", "tests\NuGetUtility.UrlToLicenseMapping.Test\NuGetUtility.UrlToLicenseMapping.Test.csproj", "{A77F9673-8296-4680-A713-8AC26B7DE41C}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGetLicense", "src\NuGetLicense\NuGetLicense.csproj", "{AC47BC03-4D94-4E35-880A-83B7F00CCD39}"
 EndProject
diff --git a/tests/NuGetUtility.Test.UrlToLicenseMapping/NuGetUtility.Test.UrlToLicenseMapping.csproj b/tests/NuGetUtility.UrlToLicenseMapping.Test/NuGetUtility.UrlToLicenseMapping.Test.csproj
similarity index 100%
rename from tests/NuGetUtility.Test.UrlToLicenseMapping/NuGetUtility.Test.UrlToLicenseMapping.csproj
rename to tests/NuGetUtility.UrlToLicenseMapping.Test/NuGetUtility.UrlToLicenseMapping.Test.csproj
diff --git a/tests/NuGetUtility.Test.UrlToLicenseMapping/Result.cs b/tests/NuGetUtility.UrlToLicenseMapping.Test/Result.cs
similarity index 100%
rename from tests/NuGetUtility.Test.UrlToLicenseMapping/Result.cs
rename to tests/NuGetUtility.UrlToLicenseMapping.Test/Result.cs
diff --git a/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_0a0d7369b800fefd.verified.txt b/tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_0a0d7369b800fefd.verified.txt
similarity index 100%
rename from tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_0a0d7369b800fefd.verified.txt
rename to tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_0a0d7369b800fefd.verified.txt
diff --git a/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_22e062c15379c13a.verified.txt b/tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_22e062c15379c13a.verified.txt
similarity index 100%
rename from tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_22e062c15379c13a.verified.txt
rename to tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_22e062c15379c13a.verified.txt
diff --git a/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_2b7019084576ccdc.verified.txt b/tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_2b7019084576ccdc.verified.txt
similarity index 100%
rename from tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_2b7019084576ccdc.verified.txt
rename to tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_2b7019084576ccdc.verified.txt
diff --git a/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_428b264ee36ee41a.verified.txt b/tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_428b264ee36ee41a.verified.txt
similarity index 100%
rename from tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_428b264ee36ee41a.verified.txt
rename to tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_428b264ee36ee41a.verified.txt
diff --git a/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_4361ac729d63963d.verified.txt b/tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_4361ac729d63963d.verified.txt
similarity index 100%
rename from tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_4361ac729d63963d.verified.txt
rename to tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_4361ac729d63963d.verified.txt
diff --git a/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_5b045172ae56c820.verified.txt b/tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_5b045172ae56c820.verified.txt
similarity index 100%
rename from tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_5b045172ae56c820.verified.txt
rename to tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_5b045172ae56c820.verified.txt
diff --git a/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_5e3ed529434f955d.verified.txt b/tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_5e3ed529434f955d.verified.txt
similarity index 100%
rename from tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_5e3ed529434f955d.verified.txt
rename to tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_5e3ed529434f955d.verified.txt
diff --git a/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_5ee1cd856c331a32.verified.txt b/tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_5ee1cd856c331a32.verified.txt
similarity index 100%
rename from tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_5ee1cd856c331a32.verified.txt
rename to tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_5ee1cd856c331a32.verified.txt
diff --git a/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_631a3cca888994b1.verified.txt b/tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_631a3cca888994b1.verified.txt
similarity index 100%
rename from tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_631a3cca888994b1.verified.txt
rename to tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_631a3cca888994b1.verified.txt
diff --git a/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_63a0ec25be40d11a.verified.txt b/tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_63a0ec25be40d11a.verified.txt
similarity index 100%
rename from tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_63a0ec25be40d11a.verified.txt
rename to tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_63a0ec25be40d11a.verified.txt
diff --git a/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_63cad523536fe5ca.verified.txt b/tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_63cad523536fe5ca.verified.txt
similarity index 100%
rename from tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_63cad523536fe5ca.verified.txt
rename to tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_63cad523536fe5ca.verified.txt
diff --git a/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_675228b0289c97b9.verified.txt b/tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_675228b0289c97b9.verified.txt
similarity index 100%
rename from tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_675228b0289c97b9.verified.txt
rename to tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_675228b0289c97b9.verified.txt
diff --git a/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_6d2eeb842e225813.verified.txt b/tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_6d2eeb842e225813.verified.txt
similarity index 100%
rename from tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_6d2eeb842e225813.verified.txt
rename to tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_6d2eeb842e225813.verified.txt
diff --git a/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_81bab0f76a137fc6.verified.txt b/tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_81bab0f76a137fc6.verified.txt
similarity index 100%
rename from tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_81bab0f76a137fc6.verified.txt
rename to tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_81bab0f76a137fc6.verified.txt
diff --git a/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_847892e5f3e913b2.verified.txt b/tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_847892e5f3e913b2.verified.txt
similarity index 100%
rename from tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_847892e5f3e913b2.verified.txt
rename to tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_847892e5f3e913b2.verified.txt
diff --git a/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_8d04a55b9c210908.verified.txt b/tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_8d04a55b9c210908.verified.txt
similarity index 100%
rename from tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_8d04a55b9c210908.verified.txt
rename to tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_8d04a55b9c210908.verified.txt
diff --git a/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_97f12ec44714bb11.verified.txt b/tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_97f12ec44714bb11.verified.txt
similarity index 100%
rename from tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_97f12ec44714bb11.verified.txt
rename to tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_97f12ec44714bb11.verified.txt
diff --git a/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_a8bbd9c75d4635f7.verified.txt b/tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_a8bbd9c75d4635f7.verified.txt
similarity index 100%
rename from tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_a8bbd9c75d4635f7.verified.txt
rename to tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_a8bbd9c75d4635f7.verified.txt
diff --git a/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_af5348a5b9b699b2.verified.txt b/tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_af5348a5b9b699b2.verified.txt
similarity index 100%
rename from tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_af5348a5b9b699b2.verified.txt
rename to tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_af5348a5b9b699b2.verified.txt
diff --git a/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_b1be5a7303cd1845.verified.txt b/tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_b1be5a7303cd1845.verified.txt
similarity index 100%
rename from tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_b1be5a7303cd1845.verified.txt
rename to tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_b1be5a7303cd1845.verified.txt
diff --git a/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_d22662ea445fd590.verified.txt b/tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_d22662ea445fd590.verified.txt
similarity index 100%
rename from tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_d22662ea445fd590.verified.txt
rename to tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_d22662ea445fd590.verified.txt
diff --git a/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_dacc9e1876bd896e.verified.txt b/tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_dacc9e1876bd896e.verified.txt
similarity index 100%
rename from tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_dacc9e1876bd896e.verified.txt
rename to tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_dacc9e1876bd896e.verified.txt
diff --git a/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_f8d2858b1e79edd4.verified.txt b/tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_f8d2858b1e79edd4.verified.txt
similarity index 100%
rename from tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_f8d2858b1e79edd4.verified.txt
rename to tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_f8d2858b1e79edd4.verified.txt
diff --git a/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_f8d76ab11847fc56.verified.txt b/tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_f8d76ab11847fc56.verified.txt
similarity index 100%
rename from tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_f8d76ab11847fc56.verified.txt
rename to tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_f8d76ab11847fc56.verified.txt
diff --git a/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.cs b/tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.cs
similarity index 100%
rename from tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.cs
rename to tests/NuGetUtility.UrlToLicenseMapping.Test/UrlToLicenseMappingTest.cs