diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposer.java
index 16531e389b..cd172478cf 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposer.java
@@ -38,6 +38,7 @@
 import com.google.api.generator.engine.ast.ExprStatement;
 import com.google.api.generator.engine.ast.MethodDefinition;
 import com.google.api.generator.engine.ast.MethodInvocationExpr;
+import com.google.api.generator.engine.ast.NewObjectExpr;
 import com.google.api.generator.engine.ast.Reference;
 import com.google.api.generator.engine.ast.ScopeNode;
 import com.google.api.generator.engine.ast.Statement;
@@ -189,15 +190,10 @@ private static MethodDefinition createStartStaticServerMethod(
     VariableExpr mockServiceVarExpr =
         classMemberVarExprs.get(getMockServiceVarName(service.name()));
     VariableExpr serviceHelperVarExpr = classMemberVarExprs.get(SERVICE_HELPER_VAR_NAME);
-    // TODO(miraleung): Actually intantiate this.
     Expr initMockServiceExpr =
         AssignmentExpr.builder()
             .setVariableExpr(mockServiceVarExpr)
-            .setValueExpr(
-                MethodInvocationExpr.builder()
-                    .setMethodName("newMockTodo")
-                    .setReturnType(mockServiceVarExpr.type())
-                    .build())
+            .setValueExpr(NewObjectExpr.builder().setType(mockServiceVarExpr.type()).build())
             .build();
 
     MethodInvocationExpr firstArg =
@@ -218,15 +214,14 @@ private static MethodDefinition createStartStaticServerMethod(
             .setMethodName("asList")
             .setArguments(Arrays.asList(mockServiceVarExpr))
             .build();
-    // TODO(miraleung): Actually intantiate this.
+
     Expr initServiceHelperExpr =
         AssignmentExpr.builder()
             .setVariableExpr(serviceHelperVarExpr)
             .setValueExpr(
-                MethodInvocationExpr.builder()
-                    .setMethodName("newMockServiceHelperTodo")
+                NewObjectExpr.builder()
+                    .setType(serviceHelperVarExpr.type())
                     .setArguments(Arrays.asList(firstArg, secondArg))
-                    .setReturnType(serviceHelperVarExpr.type())
                     .build())
             .build();
 
diff --git a/src/test/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposerTest.java
index c7e48d8b0a..090428c836 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposerTest.java
+++ b/src/test/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposerTest.java
@@ -86,9 +86,9 @@ public void generateServiceClasses() {
           + "\n"
           + "  @BeforeClass\n"
           + "  public static void startStaticServer() {\n"
-          + "    mockEcho = newMockTodo();\n"
+          + "    mockEcho = new MockEcho();\n"
           + "    mockServiceHelper =\n"
-          + "        newMockServiceHelperTodo(\n"
+          + "        new MockServiceHelper(\n"
           + "            UUID.randomUUID().toString(), Arrays.<MockGrpcService>asList(mockEcho));\n"
           + "    mockServiceHelper.start();\n"
           + "  }\n"