diff --git a/Tests/HelpersBillingTest.cs b/Tests/Helpers/BillingTest.cs
similarity index 93%
rename from Tests/HelpersBillingTest.cs
rename to Tests/Helpers/BillingTest.cs
index 9437504..03a6649 100644
--- a/Tests/HelpersBillingTest.cs
+++ b/Tests/Helpers/BillingTest.cs
@@ -2,9 +2,9 @@
 using Microsoft.Data.Sqlite;
 using System.Reflection;
 
-namespace Tests {
+namespace Tests.Helpers {
     [TestFixture]
-    public class HelpersBillingTest {
+    public class BillingTest {
 
         private SqliteConnection? Connection;
 
diff --git a/Tests/HelpersUtilsTest.cs b/Tests/Helpers/UtilsTest.cs
similarity index 98%
rename from Tests/HelpersUtilsTest.cs
rename to Tests/Helpers/UtilsTest.cs
index cf7b613..ca520d2 100644
--- a/Tests/HelpersUtilsTest.cs
+++ b/Tests/Helpers/UtilsTest.cs
@@ -1,8 +1,8 @@
 using Elwig.Helpers;
 
-namespace Tests {
+namespace Tests.Helpers {
     [TestFixture]
-    public class HelpersUtilsTest {
+    public class UtilsTest {
 
         private static readonly double[,] Gradation = new double[,] {
             { 14.0,  68.0 },
diff --git a/Tests/HelpersValidatorTest.cs b/Tests/Helpers/ValidatorTest.cs
similarity index 98%
rename from Tests/HelpersValidatorTest.cs
rename to Tests/Helpers/ValidatorTest.cs
index d4e22ae..cc43b12 100644
--- a/Tests/HelpersValidatorTest.cs
+++ b/Tests/Helpers/ValidatorTest.cs
@@ -1,10 +1,10 @@
 using Elwig.Helpers;
 using System.Windows.Controls;
 
-namespace Tests {
+namespace Tests.Helpers {
     [TestFixture]
     [Apartment(ApartmentState.STA)]
-    public class HelpersValidatorTest {
+    public class ValidatorTest {
 
         private static TextBox TB(string value, int caret = 0) {
             return new() {