diff --git a/testing/src/main/java/dev/cel/testing/utils/BUILD.bazel b/testing/src/main/java/dev/cel/testing/utils/BUILD.bazel
index 6c4d4479e..3017f0607 100644
--- a/testing/src/main/java/dev/cel/testing/utils/BUILD.bazel
+++ b/testing/src/main/java/dev/cel/testing/utils/BUILD.bazel
@@ -11,8 +11,6 @@ package(
 java_library(
     name = "expr_value_utils",
     srcs = ["ExprValueUtils.java"],
-    tags = [
-    ],
     deps = [
         "//common",
         "//common/internal:default_instance_message_factory",
diff --git a/testing/src/main/java/dev/cel/testing/utils/ExprValueUtils.java b/testing/src/main/java/dev/cel/testing/utils/ExprValueUtils.java
index e35e34986..acc31b08d 100644
--- a/testing/src/main/java/dev/cel/testing/utils/ExprValueUtils.java
+++ b/testing/src/main/java/dev/cel/testing/utils/ExprValueUtils.java
@@ -50,24 +50,6 @@ private ExprValueUtils() {}
   public static final TypeRegistry DEFAULT_TYPE_REGISTRY = newDefaultTypeRegistry();
   public static final ExtensionRegistry DEFAULT_EXTENSION_REGISTRY = newDefaultExtensionRegistry();
 
-  // TODO: Add support for user provided extensions.
-  private static ExtensionRegistry newDefaultExtensionRegistry() {
-    ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();
-    dev.cel.expr.conformance.proto2.TestAllTypesExtensions.registerAllExtensions(extensionRegistry);
-
-    return extensionRegistry;
-  }
-
-  private static TypeRegistry newDefaultTypeRegistry() {
-    CelDescriptors allDescriptors =
-        CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(
-            ImmutableList.of(
-                dev.cel.expr.conformance.proto2.TestAllTypes.getDescriptor().getFile(),
-                dev.cel.expr.conformance.proto3.TestAllTypes.getDescriptor().getFile()));
-
-    return TypeRegistry.newBuilder().add(allDescriptors.messageTypeDescriptors()).build();
-  }
-
   /**
    * Converts a {@link Value} to a Java native object.
    *
@@ -254,4 +236,21 @@ public static Value toValue(Object object, CelType type) throws Exception {
     throw new IllegalArgumentException(
         String.format("Unexpected result type: %s", object.getClass()));
   }
+
+  private static ExtensionRegistry newDefaultExtensionRegistry() {
+    ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();
+    dev.cel.expr.conformance.proto2.TestAllTypesExtensions.registerAllExtensions(extensionRegistry);
+
+    return extensionRegistry;
+  }
+
+  private static TypeRegistry newDefaultTypeRegistry() {
+    CelDescriptors allDescriptors =
+        CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(
+            ImmutableList.of(
+                dev.cel.expr.conformance.proto2.TestAllTypes.getDescriptor().getFile(),
+                dev.cel.expr.conformance.proto3.TestAllTypes.getDescriptor().getFile()));
+
+    return TypeRegistry.newBuilder().add(allDescriptors.messageTypeDescriptors()).build();
+  }
 }