diff --git a/tfx/dsl/placeholder/proto_placeholder_test.py b/tfx/dsl/placeholder/proto_placeholder_test.py
index 167f083c04..b92f1ef7e9 100644
--- a/tfx/dsl/placeholder/proto_placeholder_test.py
+++ b/tfx/dsl/placeholder/proto_placeholder_test.py
@@ -73,9 +73,9 @@ def parse_text_proto(
 # at pipeline runtime. There are additional DSL-only test cases in
 # ./placeholder_test.py and additional resolution-only test cases in
 # dsl/compiler/placeholder_utils_test.py
-class ProtoPlaceholderTest(tf.test.TestCase):
+class MakeProtoPlaceholderTest(tf.test.TestCase):
 
-  def testMakeProtoPlaceholder_Empty(self):
+  def test_Empty(self):
     self.assertEqual(
         '',
         resolve(
@@ -83,7 +83,7 @@ def testMakeProtoPlaceholder_Empty(self):
         ),
     )
 
-  def testMakeProtoPlaceholder_BaseOnly(self):
+  def test_BaseOnly(self):
     actual = resolve(
         ph.make_proto(
             execution_invocation_pb2.ExecutionInvocation(tmp_dir='/foo')
@@ -96,7 +96,7 @@ def testMakeProtoPlaceholder_BaseOnly(self):
         parse_text_proto(actual),
     )
 
-  def testMakeProtoPlaceholder_FieldOnly(self):
+  def test_FieldOnly(self):
     actual = resolve(_ExecutionInvocation(tmp_dir='/foo'))
     self.assertProtoEquals(
         """
@@ -105,7 +105,7 @@ def testMakeProtoPlaceholder_FieldOnly(self):
         parse_text_proto(actual),
     )
 
-  def testMakeProtoPlaceholder_ScalarFieldTypes(self):
+  def test_ScalarFieldTypes(self):
     def _resolve_and_parse(p: ph.Placeholder) -> metadata_store_pb2.Value:
       return parse_text_proto(resolve(p), metadata_store_pb2.Value)
 
@@ -127,7 +127,7 @@ def _resolve_and_parse(p: ph.Placeholder) -> metadata_store_pb2.Value:
         _resolve_and_parse(_MetadataStoreValue(bool_value=True)),
     )
 
-  def testMakeProtoPlaceholder_EnumField(self):
+  def test_EnumField(self):
     actual = resolve(
         _UpdateOptions(reload_policy=pipeline_pb2.UpdateOptions.PARTIAL)
     )
@@ -138,7 +138,7 @@ def testMakeProtoPlaceholder_EnumField(self):
         parse_text_proto(actual, pipeline_pb2.UpdateOptions),
     )
 
-  def testMakeProtoPlaceholder_FieldPlaceholder(self):
+  def test_FieldPlaceholder(self):
     actual = resolve(
         _ExecutionInvocation(tmp_dir=ph.execution_invocation().pipeline_run_id)
     )
@@ -149,7 +149,7 @@ def testMakeProtoPlaceholder_FieldPlaceholder(self):
         parse_text_proto(actual),
     )
 
-  def testMakeProtoPlaceholder_EnumStringPlaceholder(self):
+  def test_EnumStringPlaceholder(self):
     actual = resolve(
         _UpdateOptions(reload_policy=ph.exec_property('reload_policy')),
         exec_properties={'reload_policy': 'ALL'},
@@ -161,7 +161,7 @@ def testMakeProtoPlaceholder_EnumStringPlaceholder(self):
         parse_text_proto(actual, pipeline_pb2.UpdateOptions),
     )
 
-  def testMakeProtoPlaceholder_EnumIntPlaceholder(self):
+  def test_EnumIntPlaceholder(self):
     actual = resolve(
         _UpdateOptions(reload_policy=ph.exec_property('reload_policy')),
         exec_properties={'reload_policy': 1},
@@ -173,7 +173,7 @@ def testMakeProtoPlaceholder_EnumIntPlaceholder(self):
         parse_text_proto(actual, pipeline_pb2.UpdateOptions),
     )
 
-  def testMakeProtoPlaceholder_EmptyFieldPlaceholder(self):
+  def test_EmptyFieldPlaceholder(self):
     actual = resolve(
         _ExecutionInvocation(tmp_dir=ph.execution_invocation().frontend_url)
     )
@@ -184,17 +184,17 @@ def testMakeProtoPlaceholder_EmptyFieldPlaceholder(self):
         parse_text_proto(actual),
     )
 
-  def testMakeProtoPlaceholder_NoneIntoOptionalField(self):
+  def test_NoneIntoOptionalField(self):
     actual = resolve(_ExecutionInvocation(tmp_dir=None))
     self.assertProtoEquals('', parse_text_proto(actual))
 
-  def testMakeProtoPlaceholder_NonePlaceholderIntoOptionalField(self):
+  def test_NonePlaceholderIntoOptionalField(self):
     actual = resolve(
         _ExecutionInvocation(tmp_dir=ph.execution_invocation().frontend_url)
     )
     self.assertProtoEquals('', parse_text_proto(actual))
 
-  def testMakeProtoPlaceholder_NoneExecPropIntoOptionalField(self):
+  def test_NoneExecPropIntoOptionalField(self):
     # When an exec prop has type Union[T, None] and the user passes None, it is
     # actually completely absent from the exec_properties dict in
     # ExecutionInvocation.
@@ -207,7 +207,7 @@ def testMakeProtoPlaceholder_NoneExecPropIntoOptionalField(self):
         parse_text_proto(actual, pipeline_pb2.UpdateOptions),
     )
 
-  def testMakeProtoPlaceholder_BareSubmessage(self):
+  def test_BareSubmessage(self):
     actual = resolve(
         _ExecutionInvocation(
             pipeline_info=pipeline_pb2.PipelineInfo(id='foo-id')
@@ -222,7 +222,7 @@ def testMakeProtoPlaceholder_BareSubmessage(self):
         parse_text_proto(actual),
     )
 
-  def testMakeProtoPlaceholder_SubmessageDict(self):
+  def test_SubmessageDict(self):
     actual = resolve(_ExecutionInvocation(pipeline_info=dict(id='foo-id')))
     self.assertProtoEquals(
         """
@@ -233,7 +233,7 @@ def testMakeProtoPlaceholder_SubmessageDict(self):
         parse_text_proto(actual),
     )
 
-  def testMakeProtoPlaceholder_SubmessageMakeProtoPlaceholder(self):
+  def test_SubmessageMakeProtoPlaceholder(self):
     actual = resolve(
         _ExecutionInvocation(
             pipeline_info=ph.make_proto(
@@ -251,7 +251,7 @@ def testMakeProtoPlaceholder_SubmessageMakeProtoPlaceholder(self):
         parse_text_proto(actual),
     )
 
-  def testMakeProtoPlaceholder_SubmessageProtoGetterPlaceholder(self):
+  def test_SubmessageProtoGetterPlaceholder(self):
     actual = resolve(
         _ExecutionInvocation(
             pipeline_info=ph.execution_invocation().pipeline_info
@@ -266,7 +266,7 @@ def testMakeProtoPlaceholder_SubmessageProtoGetterPlaceholder(self):
         parse_text_proto(actual),
     )
 
-  def testMakeProtoPlaceholder_SubmessageOverwrite(self):
+  def test_SubmessageOverwrite(self):
     actual = resolve(
         ph.make_proto(
             execution_invocation_pb2.ExecutionInvocation(
@@ -289,11 +289,11 @@ def testMakeProtoPlaceholder_SubmessageOverwrite(self):
         parse_text_proto(actual),
     )
 
-  def testMakeProtoPlaceholder_NoneIntoSubmessage(self):
+  def test_NoneIntoSubmessage(self):
     actual = resolve(_ExecutionInvocation(pipeline_info=None))
     self.assertProtoEquals('', parse_text_proto(actual))
 
-  def testMakeProtoPlaceholder_EmptyPlaceholderIntoSubmessage(self):
+  def test_EmptyPlaceholderIntoSubmessage(self):
     actual = resolve(
         _ExecutionInvocation(
             pipeline_node=ph.execution_invocation().pipeline_node
@@ -306,7 +306,7 @@ def testMakeProtoPlaceholder_EmptyPlaceholderIntoSubmessage(self):
         parse_text_proto(actual),
     )
 
-  def testMakeProtoPlaceholder_RepeatedField(self):
+  def test_RepeatedField(self):
     actual = resolve(
         ph.make_proto(
             execution_invocation_pb2.ExecutionInvocation(
@@ -335,7 +335,7 @@ def testMakeProtoPlaceholder_RepeatedField(self):
         parse_text_proto(actual),
     )
 
-  def testMakeProtoPlaceholder_RepeatedFieldSingleItem(self):
+  def test_RepeatedFieldSingleItem(self):
     actual = resolve(
         _ExecutionInvocation(
             pipeline_node=ph.make_proto(
@@ -355,7 +355,7 @@ def testMakeProtoPlaceholder_RepeatedFieldSingleItem(self):
         parse_text_proto(actual),
     )
 
-  def testMakeProtoPlaceholder_RepeatedFieldFalsyItem(self):
+  def test_RepeatedFieldFalsyItem(self):
     actual = resolve(
         ph.make_proto(
             execution_invocation_pb2.ExecutionInvocation(
@@ -379,13 +379,13 @@ def testMakeProtoPlaceholder_RepeatedFieldFalsyItem(self):
         parse_text_proto(actual),
     )
 
-  def testMakeProtoPlaceholder_NoneIntoRepeatedField(self):
+  def test_NoneIntoRepeatedField(self):
     actual = resolve(
         ph.make_proto(pipeline_pb2.PipelineNode(), upstream_nodes=None)
     )
     self.assertProtoEquals('', parse_text_proto(actual))
 
-  def testMakeProtoPlaceholder_EmptyPlaceholderListIntoRepeatedField(self):
+  def test_EmptyPlaceholderListIntoRepeatedField(self):
     actual = resolve(
         ph.make_proto(
             pipeline_pb2.PipelineNode(),
@@ -394,7 +394,7 @@ def testMakeProtoPlaceholder_EmptyPlaceholderListIntoRepeatedField(self):
     )
     self.assertProtoEquals('', parse_text_proto(actual))
 
-  def testMakeProtoPlaceholder_EmptyListPlaceholderIntoRepeatedField(self):
+  def test_EmptyListPlaceholderIntoRepeatedField(self):
     actual = resolve(
         ph.make_proto(
             pipeline_pb2.PipelineNode(), upstream_nodes=ph.make_list([])
@@ -402,7 +402,7 @@ def testMakeProtoPlaceholder_EmptyListPlaceholderIntoRepeatedField(self):
     )
     self.assertProtoEquals('', parse_text_proto(actual))
 
-  def testMakeProtoPlaceholder_RepeatedSubmessage(self):
+  def test_RepeatedSubmessage(self):
     actual = resolve(
         ph.make_proto(
             pipeline_pb2.StructuralRuntimeParameter(),
@@ -429,7 +429,7 @@ def testMakeProtoPlaceholder_RepeatedSubmessage(self):
         parse_text_proto(actual, pipeline_pb2.StructuralRuntimeParameter),
     )
 
-  def testMakeProtoPlaceholder_AnySubmessageBareMessage(self):
+  def test_AnySubmessageBareMessage(self):
     actual = resolve(
         _MetadataStoreValue(
             proto_value=pipeline_pb2.PipelineNode(
@@ -449,7 +449,7 @@ def testMakeProtoPlaceholder_AnySubmessageBareMessage(self):
         parse_text_proto(actual, metadata_store_pb2.Value),
     )
 
-  def testMakeProtoPlaceholder_AnySubmessagePlaceholder(self):
+  def test_AnySubmessagePlaceholder(self):
     actual = resolve(
         _MetadataStoreValue(
             # We can directly assign a message of any type and it will pack it.
@@ -472,7 +472,7 @@ def testMakeProtoPlaceholder_AnySubmessagePlaceholder(self):
         parse_text_proto(actual, metadata_store_pb2.Value),
     )
 
-  def testMakeProtoPlaceholder_NonePlaceholderIntoAnySubmessage(self):
+  def test_NonePlaceholderIntoAnySubmessage(self):
     actual = resolve(
         _MetadataStoreValue(proto_value=ph.execution_invocation().pipeline_node)
     )
@@ -485,7 +485,7 @@ def testMakeProtoPlaceholder_NonePlaceholderIntoAnySubmessage(self):
         parse_text_proto(actual, metadata_store_pb2.Value),
     )
 
-  def testMakeProtoPlaceholder_MapFieldScalarValue(self):
+  def test_MapFieldScalarValue(self):
     actual = resolve(
         _ExecutionInvocation(
             extra_flags={
@@ -508,7 +508,7 @@ def testMakeProtoPlaceholder_MapFieldScalarValue(self):
         parse_text_proto(actual),
     )
 
-  def testMakeProtoPlaceholder_MapFieldScalarPlaceholderValue(self):
+  def test_MapFieldScalarPlaceholderValue(self):
     actual = resolve(
         _ExecutionInvocation(
             extra_flags={
@@ -531,7 +531,7 @@ def testMakeProtoPlaceholder_MapFieldScalarPlaceholderValue(self):
         parse_text_proto(actual),
     )
 
-  def testMakeProtoPlaceholder_MapFieldScalarNoneValue(self):
+  def test_MapFieldScalarNoneValue(self):
     actual = resolve(
         _ExecutionInvocation(
             extra_flags={
@@ -552,7 +552,7 @@ def testMakeProtoPlaceholder_MapFieldScalarNoneValue(self):
         parse_text_proto(actual),
     )
 
-  def testMakeProtoPlaceholder_MapFieldSubmessageValue(self):
+  def test_MapFieldSubmessageValue(self):
     actual = resolve(
         _ExecutionInvocation(
             execution_properties={
@@ -581,7 +581,7 @@ def testMakeProtoPlaceholder_MapFieldSubmessageValue(self):
         parse_text_proto(actual),
     )
 
-  def testMakeProtoPlaceholder_MapFieldSubmessageNoneValue(self):
+  def test_MapFieldSubmessageNoneValue(self):
     actual = resolve(
         _ExecutionInvocation(
             execution_properties={
@@ -603,7 +603,7 @@ def testMakeProtoPlaceholder_MapFieldSubmessageNoneValue(self):
         parse_text_proto(actual),
     )
 
-  def testMakeProtoPlaceholder_MapFieldPlaceholderKey(self):
+  def test_MapFieldPlaceholderKey(self):
     actual = resolve(
         _ExecutionInvocation(
             extra_flags=[
@@ -621,7 +621,7 @@ def testMakeProtoPlaceholder_MapFieldPlaceholderKey(self):
         parse_text_proto(actual),
     )
 
-  def testMakeProtoPlaceholder_RejectsMapFieldScalarNoneKey(self):
+  def test_RejectsMapFieldScalarNoneKey(self):
     with self.assertRaises(ValueError):
       resolve(
           _ExecutionInvocation(
@@ -635,13 +635,13 @@ def testMakeProtoPlaceholder_RejectsMapFieldScalarNoneKey(self):
     with self.assertRaises(ValueError):
       resolve(_ExecutionInvocation(extra_flags={None: 'foo'}))
 
-  def testMakeProtoPlaceholder_MapFieldScalarValueEmpty(self):
+  def test_MapFieldScalarValueEmpty(self):
     actual = resolve(_ExecutionInvocation(extra_flags={}))
     self.assertProtoEquals('', parse_text_proto(actual))
     actual = resolve(_ExecutionInvocation(extra_flags=[]))
     self.assertProtoEquals('', parse_text_proto(actual))
 
-  def testMakeProtoPlaceholder_PlusItemGetter(self):
+  def test_PlusItemGetter(self):
     actual = resolve(
         _ExecutionInvocation(
             pipeline_node=ph.make_proto(
@@ -657,7 +657,7 @@ def testMakeProtoPlaceholder_PlusItemGetter(self):
     )
     self.assertProtoEquals('test-run-id-foo', actual)
 
-  def test_MakeProtoPlaceholder_BinarySerializationBase64(self):
+  def test_BinarySerializationBase64(self):
     actual = resolve(
         ph.make_proto(
             execution_invocation_pb2.ExecutionInvocation(