diff --git a/src/test/java/adapting/mock/JDACommandsMock.java b/src/test/java/adapting/mock/JDACommandsMock.java
index 12e7b5a2..ecad7f79 100644
--- a/src/test/java/adapting/mock/JDACommandsMock.java
+++ b/src/test/java/adapting/mock/JDACommandsMock.java
@@ -2,10 +2,10 @@
 
 import com.github.kaktushose.jda.commands.definitions.interactions.InteractionRegistry;
 import com.github.kaktushose.jda.commands.dependency.DependencyInjector;
-import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
+import com.github.kaktushose.jda.commands.dispatching.adapter.internal.TypeAdapters;
 import com.github.kaktushose.jda.commands.dispatching.JDAEventListener;
-import com.github.kaktushose.jda.commands.dispatching.middleware.MiddlewareRegistry;
-import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
+import com.github.kaktushose.jda.commands.dispatching.middleware.internal.Middlewares;
+import com.github.kaktushose.jda.commands.dispatching.validation.internal.Validators;
 import com.github.kaktushose.jda.commands.internal.JDAContext;
 import com.github.kaktushose.jda.commands.internal.register.SlashCommandUpdater;
 
@@ -13,9 +13,9 @@
 public record JDACommandsMock(
         JDAContext jdaContext,
         JDAEventListener JDAEventListener,
-        MiddlewareRegistry middlewareRegistry,
-        TypeAdapterRegistry adapterRegistry,
-        ValidatorRegistry validatorRegistry,
+        Middlewares middlewareRegistry,
+        TypeAdapters adapterRegistry,
+        Validators validatorRegistry,
         DependencyInjector dependencyInjector,
         InteractionRegistry interactionRegistry,
         SlashCommandUpdater updater) {
diff --git a/src/test/java/commands/SlashCommandDefinitionTest.java b/src/test/java/commands/SlashCommandDefinitionTest.java
index 5f3732c7..337a35a7 100644
--- a/src/test/java/commands/SlashCommandDefinitionTest.java
+++ b/src/test/java/commands/SlashCommandDefinitionTest.java
@@ -6,9 +6,8 @@
 import com.github.kaktushose.jda.commands.definitions.description.reflective.ReflectiveDescriptor;
 import com.github.kaktushose.jda.commands.definitions.interactions.MethodBuildContext;
 import com.github.kaktushose.jda.commands.definitions.interactions.command.SlashCommandDefinition;
-import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
 import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
-import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
+import com.github.kaktushose.jda.commands.dispatching.validation.internal.Validators;
 import net.dv8tion.jda.api.interactions.commands.localization.ResourceBundleLocalizationFunction;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -24,17 +23,13 @@
 public class SlashCommandDefinitionTest {
 
     private static Class<?> controller;
-    private static ValidatorRegistry validator;
+    private static Validators validator;
 
     @BeforeAll
     public static void setup() {
         controller = CommandDefinitionTestController.class;
 
-        validator = new ValidatorRegistry();
-
-        // make sure that this type is not registered before testing
-        TypeAdapterRegistry adapter = new TypeAdapterRegistry();
-        adapter.unregister(UnsupportedType.class);
+        validator = new Validators(Map.of());
     }
 
     public static MethodBuildContext getBuildContext(Method method) {
diff --git a/src/test/java/parameters/ParameterDefinitionTest.java b/src/test/java/parameters/ParameterDefinitionTest.java
index af5a6393..1c924efc 100644
--- a/src/test/java/parameters/ParameterDefinitionTest.java
+++ b/src/test/java/parameters/ParameterDefinitionTest.java
@@ -3,7 +3,7 @@
 import com.github.kaktushose.jda.commands.annotations.constraints.Min;
 import com.github.kaktushose.jda.commands.definitions.description.ParameterDescription;
 import com.github.kaktushose.jda.commands.definitions.interactions.command.ParameterDefinition;
-import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
+import com.github.kaktushose.jda.commands.dispatching.validation.internal.Validators;
 import com.github.kaktushose.jda.commands.dispatching.validation.impl.MinimumValidator;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -13,18 +13,19 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.*;
 
 public class ParameterDefinitionTest {
 
     private static Class<?> controller;
-    private static ValidatorRegistry validatorRegistry;
+    private static Validators validatorRegistry;
 
     @BeforeAll
     public static void setup() {
         controller = ParameterTestController.class;
-        validatorRegistry = new ValidatorRegistry();
+        validatorRegistry = new Validators(Map.of());
     }
 
     private static ParameterDescription parameter(Parameter parameter) {