diff --git a/core/src/test/java/com/datastrato/gravitino/catalog/TestFilesetNormalizeDispatcher.java b/core/src/test/java/com/datastrato/gravitino/catalog/TestFilesetNormalizeDispatcher.java
index 355b736c120..8f1609145a6 100644
--- a/core/src/test/java/com/datastrato/gravitino/catalog/TestFilesetNormalizeDispatcher.java
+++ b/core/src/test/java/com/datastrato/gravitino/catalog/TestFilesetNormalizeDispatcher.java
@@ -19,15 +19,17 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-public class TestFilesetNormalizeDispatcher extends TestFilesetOperationDispatcher {
+public class TestFilesetNormalizeDispatcher extends TestOperationDispatcher {
   private static FilesetNormalizeDispatcher filesetNormalizeDispatcher;
   private static SchemaNormalizeDispatcher schemaNormalizeDispatcher;
 
   @BeforeAll
   public static void initialize() throws IOException {
     TestFilesetOperationDispatcher.initialize();
-    filesetNormalizeDispatcher = new FilesetNormalizeDispatcher(filesetOperationDispatcher);
-    schemaNormalizeDispatcher = new SchemaNormalizeDispatcher(schemaOperationDispatcher);
+    filesetNormalizeDispatcher =
+        new FilesetNormalizeDispatcher(TestFilesetOperationDispatcher.filesetOperationDispatcher);
+    schemaNormalizeDispatcher =
+        new SchemaNormalizeDispatcher(TestFilesetOperationDispatcher.schemaOperationDispatcher);
   }
 
   @Test
diff --git a/core/src/test/java/com/datastrato/gravitino/catalog/TestSchemaNormalizeDispatcher.java b/core/src/test/java/com/datastrato/gravitino/catalog/TestSchemaNormalizeDispatcher.java
index 40c26d0e9d6..9afba6906dc 100644
--- a/core/src/test/java/com/datastrato/gravitino/catalog/TestSchemaNormalizeDispatcher.java
+++ b/core/src/test/java/com/datastrato/gravitino/catalog/TestSchemaNormalizeDispatcher.java
@@ -17,13 +17,14 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-public class TestSchemaNormalizeDispatcher extends TestSchemaOperationDispatcher {
+public class TestSchemaNormalizeDispatcher extends TestOperationDispatcher {
   private static SchemaNormalizeDispatcher schemaNormalizeDispatcher;
 
   @BeforeAll
   public static void initialize() throws IOException {
     TestSchemaOperationDispatcher.initialize();
-    schemaNormalizeDispatcher = new SchemaNormalizeDispatcher(dispatcher);
+    schemaNormalizeDispatcher =
+        new SchemaNormalizeDispatcher(TestSchemaOperationDispatcher.dispatcher);
   }
 
   @Test
diff --git a/core/src/test/java/com/datastrato/gravitino/catalog/TestTableNormalizeDispatcher.java b/core/src/test/java/com/datastrato/gravitino/catalog/TestTableNormalizeDispatcher.java
index 618b608f9ab..906a987c500 100644
--- a/core/src/test/java/com/datastrato/gravitino/catalog/TestTableNormalizeDispatcher.java
+++ b/core/src/test/java/com/datastrato/gravitino/catalog/TestTableNormalizeDispatcher.java
@@ -32,15 +32,17 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-public class TestTableNormalizeDispatcher extends TestTableOperationDispatcher {
+public class TestTableNormalizeDispatcher extends TestOperationDispatcher {
   private static TableNormalizeDispatcher tableNormalizeDispatcher;
   private static SchemaNormalizeDispatcher schemaNormalizeDispatcher;
 
   @BeforeAll
   public static void initialize() throws IOException {
     TestTableOperationDispatcher.initialize();
-    tableNormalizeDispatcher = new TableNormalizeDispatcher(tableOperationDispatcher);
-    schemaNormalizeDispatcher = new SchemaNormalizeDispatcher(schemaOperationDispatcher);
+    tableNormalizeDispatcher =
+        new TableNormalizeDispatcher(TestTableOperationDispatcher.tableOperationDispatcher);
+    schemaNormalizeDispatcher =
+        new SchemaNormalizeDispatcher(TestTableOperationDispatcher.schemaOperationDispatcher);
   }
 
   @Test
diff --git a/core/src/test/java/com/datastrato/gravitino/catalog/TestTopicNormalizeDispatcher.java b/core/src/test/java/com/datastrato/gravitino/catalog/TestTopicNormalizeDispatcher.java
index ec81f9ff036..6d90a21f62b 100644
--- a/core/src/test/java/com/datastrato/gravitino/catalog/TestTopicNormalizeDispatcher.java
+++ b/core/src/test/java/com/datastrato/gravitino/catalog/TestTopicNormalizeDispatcher.java
@@ -17,15 +17,17 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-public class TestTopicNormalizeDispatcher extends TestTopicOperationDispatcher {
+public class TestTopicNormalizeDispatcher extends TestOperationDispatcher {
   private static TopicNormalizeDispatcher topicNormalizeDispatcher;
   private static SchemaNormalizeDispatcher schemaNormalizeDispatcher;
 
   @BeforeAll
   public static void initialize() throws IOException {
     TestTopicOperationDispatcher.initialize();
-    schemaNormalizeDispatcher = new SchemaNormalizeDispatcher(schemaOperationDispatcher);
-    topicNormalizeDispatcher = new TopicNormalizeDispatcher(topicOperationDispatcher);
+    schemaNormalizeDispatcher =
+        new SchemaNormalizeDispatcher(TestTopicOperationDispatcher.schemaOperationDispatcher);
+    topicNormalizeDispatcher =
+        new TopicNormalizeDispatcher(TestTopicOperationDispatcher.topicOperationDispatcher);
   }
 
   @Test