diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.csproj b/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.csproj
index 860c2292..f345d43d 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.csproj
+++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.csproj
@@ -40,7 +40,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="BouncyCastle.Cryptography" Version="2.0.0" />
+        <PackageReference Include="BouncyCastle.Cryptography" Version="2.1.1" />
         <PackageReference Include="System.ValueTuple" Version="4.5.0" Condition="'$(TargetFramework)' == 'net461'" />
 		<PackageReference Include="SKIT.FlurlHttpClient.Common" Version="2.6.0" />
     </ItemGroup>
diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/SKIT.FlurlHttpClient.Wechat.TenpayV3.csproj b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/SKIT.FlurlHttpClient.Wechat.TenpayV3.csproj
index 1a04e351..7701d2f7 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/SKIT.FlurlHttpClient.Wechat.TenpayV3.csproj
+++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/SKIT.FlurlHttpClient.Wechat.TenpayV3.csproj
@@ -40,7 +40,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="BouncyCastle.Cryptography" Version="2.0.0" />
+        <PackageReference Include="BouncyCastle.Cryptography" Version="2.1.1" />
         <PackageReference Include="System.ValueTuple" Version="4.5.0" Condition="'$(TargetFramework)' == 'net461'" />
 		<PackageReference Include="SKIT.FlurlHttpClient.Common" Version="2.6.0" />
     </ItemGroup>
diff --git a/test/SKIT.FlurlHttpClient.Wechat.Ads.UnitTests/TestCase_HashUtilityTests.cs b/test/SKIT.FlurlHttpClient.Wechat.Ads.UnitTests/TestCase_ToolsHashUtilityTests.cs
similarity index 89%
rename from test/SKIT.FlurlHttpClient.Wechat.Ads.UnitTests/TestCase_HashUtilityTests.cs
rename to test/SKIT.FlurlHttpClient.Wechat.Ads.UnitTests/TestCase_ToolsHashUtilityTests.cs
index ea2b0c88..fdd99c2d 100644
--- a/test/SKIT.FlurlHttpClient.Wechat.Ads.UnitTests/TestCase_HashUtilityTests.cs
+++ b/test/SKIT.FlurlHttpClient.Wechat.Ads.UnitTests/TestCase_ToolsHashUtilityTests.cs
@@ -1,8 +1,8 @@
-using Xunit;
+using Xunit;
 
 namespace SKIT.FlurlHttpClient.Wechat.Ads.UnitTests
 {
-    public class TestCase_HashUtilityTests
+    public class TestCase_ToolsHashUtilityTests
     {
         [Fact(DisplayName = "测试用例：MD5 信息摘要")]
         public void TestMD5Hash()
diff --git a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/TestCase_AESUtilityTests.cs b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/TestCase_ToolsAESUtilityTests.cs
similarity index 94%
rename from test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/TestCase_AESUtilityTests.cs
rename to test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/TestCase_ToolsAESUtilityTests.cs
index f4f9d9b6..0e154e47 100644
--- a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/TestCase_AESUtilityTests.cs
+++ b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/TestCase_ToolsAESUtilityTests.cs
@@ -1,8 +1,8 @@
-using Xunit;
+using Xunit;
 
 namespace SKIT.FlurlHttpClient.Wechat.Api.UnitTests
 {
-    public class TestCase_AESUtilityTests
+    public class TestCase_ToolsAESUtilityTests
     {
         [Fact(DisplayName = "测试用例：AES-CBC 解密")]
         public void TestAESCBCDecryption()
diff --git a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/TestCase_HashUtilityTests.cs b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/TestCase_ToolsHashUtilityTests.cs
similarity index 95%
rename from test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/TestCase_HashUtilityTests.cs
rename to test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/TestCase_ToolsHashUtilityTests.cs
index 27096caf..995b962f 100644
--- a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/TestCase_HashUtilityTests.cs
+++ b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/TestCase_ToolsHashUtilityTests.cs
@@ -1,8 +1,8 @@
-using Xunit;
+using Xunit;
 
 namespace SKIT.FlurlHttpClient.Wechat.Api.UnitTests
 {
-    public class TestCase_HashUtilityTests
+    public class TestCase_ToolsHashUtilityTests
     {
         [Fact(DisplayName = "测试用例：SHA-1 信息摘要")]
         public void TestSHA1Hash()
diff --git a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/TestCase_WechatEventDataCryptorTests.cs b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/TestCase_ToolsWxMsgCryptorTests.cs
similarity index 98%
rename from test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/TestCase_WechatEventDataCryptorTests.cs
rename to test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/TestCase_ToolsWxMsgCryptorTests.cs
index bd77f8a4..b42d5e31 100644
--- a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/TestCase_WechatEventDataCryptorTests.cs
+++ b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/TestCase_ToolsWxMsgCryptorTests.cs
@@ -2,7 +2,7 @@ using Xunit;
 
 namespace SKIT.FlurlHttpClient.Wechat.Api.UnitTests
 {
-    public class TestCase_WxMsgCryptorTests
+    public class TestCase_ToolsWxMsgCryptorTests
     {
         [Fact(DisplayName = "测试用例：验签并解密回调数据")]
         public void TestVerifyAndDecryptEvent()
diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/TestCase_SM3UtilityTests.cs b/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/TestCase_ToolsSM3UtilityTests.cs
similarity index 91%
rename from test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/TestCase_SM3UtilityTests.cs
rename to test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/TestCase_ToolsSM3UtilityTests.cs
index 658e811c..32638930 100644
--- a/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/TestCase_SM3UtilityTests.cs
+++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/TestCase_ToolsSM3UtilityTests.cs
@@ -1,9 +1,9 @@
-using System;
+using System;
 using Xunit;
 
 namespace SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests
 {
-    public class TestCase_SM3UtilityTests
+    public class TestCase_ToolsSM3UtilityTests
     {
         [Fact(DisplayName = "测试用例：计算 SM3 哈希值")]
         public void TestSM3Hash()
diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/TestCase_SM4UtilityTests.cs b/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/TestCase_ToolsSM4UtilityTests.cs
similarity index 95%
rename from test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/TestCase_SM4UtilityTests.cs
rename to test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/TestCase_ToolsSM4UtilityTests.cs
index c19c2fda..2a0f5114 100644
--- a/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/TestCase_SM4UtilityTests.cs
+++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/TestCase_ToolsSM4UtilityTests.cs
@@ -1,8 +1,8 @@
-using Xunit;
+using Xunit;
 
 namespace SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests
 {
-    public class TestCase_SM4UtilityTests
+    public class TestCase_ToolsSM4UtilityTests
     {
         [Fact(DisplayName = "测试用例：SM4 加密")]
         public void TestSM4Encrypt()
diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/TestCase_AESUtilityTests.cs b/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/TestCase_ToolsAESUtilityTests.cs
similarity index 91%
rename from test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/TestCase_AESUtilityTests.cs
rename to test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/TestCase_ToolsAESUtilityTests.cs
index 6f5d338a..636b04d9 100644
--- a/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/TestCase_AESUtilityTests.cs
+++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/TestCase_ToolsAESUtilityTests.cs
@@ -1,10 +1,10 @@
-using System;
+using System;
 using System.Text;
 using Xunit;
 
 namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests
 {
-    public class TestCase_AESUtilityTests
+    public class TestCase_ToolsAESUtilityTests
     {
         [Fact(DisplayName = "测试用例：AES-ECB 解密")]
         public void TestAESGCMDecrypt()
diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/TestCase_XmlUtilityTests.cs b/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/TestCase_ToolsXmlUtilityTests.cs
similarity index 92%
rename from test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/TestCase_XmlUtilityTests.cs
rename to test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/TestCase_ToolsXmlUtilityTests.cs
index d7e10486..3659c293 100644
--- a/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/TestCase_XmlUtilityTests.cs
+++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/TestCase_ToolsXmlUtilityTests.cs
@@ -3,7 +3,7 @@ using Xunit;
 
 namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests
 {
-    public class TestCase_XmlUtilityTests
+    public class TestCase_ToolsXmlUtilityTests
     {
         [Fact(DisplayName = "测试用例：XML2JSON")]
         public void TestXmlConvertToJson()
diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_AESUtilityTests.cs b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_ToolsAESUtilityTests.cs
similarity index 98%
rename from test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_AESUtilityTests.cs
rename to test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_ToolsAESUtilityTests.cs
index 0de853bd..ec0db349 100644
--- a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_AESUtilityTests.cs
+++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_ToolsAESUtilityTests.cs
@@ -2,7 +2,7 @@ using Xunit;
 
 namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests
 {
-    public class TestCase_AESUtilityTests
+    public class TestCase_ToolsAESUtilityTests
     {
         [Fact(DisplayName = "测试用例：AES-GCM 解密")]
         public void TestAESGCMDecrypt()
diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_HashUtilityTests.cs b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_ToolsHashUtilityTests.cs
similarity index 88%
rename from test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_HashUtilityTests.cs
rename to test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_ToolsHashUtilityTests.cs
index 480a5307..72f30431 100644
--- a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_HashUtilityTests.cs
+++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_ToolsHashUtilityTests.cs
@@ -1,8 +1,8 @@
-using Xunit;
+using Xunit;
 
 namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests
 {
-    public class TestCase_HashUtilityTests
+    public class TestCase_ToolsHashUtilityTests
     {
         [Fact(DisplayName = "测试用例：SHA-256 信息摘要")]
         public void TestSHA256Hash()
diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_RSAUtilityTests.cs b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_ToolsRSAUtilityTests.cs
similarity index 99%
rename from test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_RSAUtilityTests.cs
rename to test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_ToolsRSAUtilityTests.cs
index fb1703ce..c57674b5 100644
--- a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_RSAUtilityTests.cs
+++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_ToolsRSAUtilityTests.cs
@@ -3,7 +3,7 @@ using Xunit;
 
 namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests
 {
-    public class TestCase_RSAUtilityTests
+    public class TestCase_ToolsRSAUtilityTests
     {
         // 此处测试的 RSA 证书/公钥/私钥是自签名生成的，仅供执行 RSA 相关的单元测试，不能用于调用微信支付 API。
         private const string RSA_CERT_SN = "3050f72e2dce03e7efe49557dd231d176649afbd";
diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_SM2UtilityTests.cs b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_ToolsSM2UtilityTests.cs
similarity index 99%
rename from test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_SM2UtilityTests.cs
rename to test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_ToolsSM2UtilityTests.cs
index 31db08d6..433905d8 100644
--- a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_SM2UtilityTests.cs
+++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_ToolsSM2UtilityTests.cs
@@ -4,7 +4,7 @@ using Xunit;
 
 namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests
 {
-    public class TestCase_SM2UtilityTests
+    public class TestCase_ToolsSM2UtilityTests
     {
         // 此处测试的 SM2 证书/公钥/私钥是自签名生成的，仅供执行 SM2 相关的单元测试，不能用于调用微信支付 API。
         private const string SM2_CERT_SN = "e5a81b02429d8d08";
diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_SM3UtilityTests.cs b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_ToolsSM3UtilityTests.cs
similarity index 93%
rename from test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_SM3UtilityTests.cs
rename to test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_ToolsSM3UtilityTests.cs
index edaf878a..1591498b 100644
--- a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_SM3UtilityTests.cs
+++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_ToolsSM3UtilityTests.cs
@@ -3,7 +3,7 @@ using Xunit;
 
 namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests
 {
-    public class TestCase_SM3UtilityTests
+    public class TestCase_ToolsSM3UtilityTests
     {
         [Fact(DisplayName = "测试用例：计算 SM3 哈希值")]
         public void TestSM3Hash()
diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_SM4UtilityTests.cs b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_ToolsSM4UtilityTests.cs
similarity index 98%
rename from test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_SM4UtilityTests.cs
rename to test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_ToolsSM4UtilityTests.cs
index ad0148fe..749c7cad 100644
--- a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_SM4UtilityTests.cs
+++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_ToolsSM4UtilityTests.cs
@@ -3,7 +3,7 @@ using Xunit;
 
 namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests
 {
-    public class TestCase_SM4UtilityTests
+    public class TestCase_ToolsSM4UtilityTests
     {
         [Fact(DisplayName = "测试用例：SM4-GCM 解密")]
         public void TestSM4GCMDecrypt()