diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Options.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Options.java
index 27ff846f67b..c5952a38a5e 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Options.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Options.java
@@ -1101,7 +1101,7 @@ public boolean equals(Object o) {
       if (this.reqId == null || other.reqId == null) {
         return this.reqId == null && other.reqId == null;
       }
-      return this.reqId.equals(other.reqId);
+      return Objects.equals(this.reqId, other.reqId);
     }
   }
 }
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerException.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerException.java
index 18d9120b6ce..c5af3f48152 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerException.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerException.java
@@ -16,6 +16,7 @@
 
 package com.google.cloud.spanner;
 
+import com.google.api.core.InternalApi;
 import com.google.api.gax.rpc.ApiException;
 import com.google.api.gax.rpc.ErrorDetails;
 import com.google.cloud.grpc.BaseGrpcServiceException;
@@ -198,7 +199,8 @@ public ErrorDetails getErrorDetails() {
     return null;
   }
 
-  /** Sets the requestId. This method is meant to be used internally and not by customers. */
+  /** Sets the requestId. */
+  @InternalApi
   public void setRequestId(XGoogSpannerRequestId reqId) {
     this.requestId = reqId;
   }
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java
index fa5a7954e7d..fa90dd0fe13 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java
@@ -228,20 +228,22 @@ public static void startStaticServer() throws IOException {
     Set<String> checkMethods =
         new HashSet(
             Arrays.asList(
-                "google.spanner.v1.Spanner/BatchCreateSessions"
-                // As functionality is added, uncomment each method.
-                // "google.spanner.v1.Spanner/BatchWrite",
-                // "google.spanner.v1.Spanner/BeginTransaction",
-                // "google.spanner.v1.Spanner/CreateSession",
-                // "google.spanner.v1.Spanner/DeleteSession",
-                // "google.spanner.v1.Spanner/ExecuteBatchDml",
-                // "google.spanner.v1.Spanner/ExecuteSql",
-                // "google.spanner.v1.Spanner/ExecuteStreamingSql",
-                // "google.spanner.v1.Spanner/StreamingRead",
-                // "google.spanner.v1.Spanner/PartitionQuery",
-                // "google.spanner.v1.Spanner/PartitionRead",
-                // "google.spanner.v1.Spanner/Commit",
-                ));
+                "google.spanner.v1.Spanner/BatchCreateSessions",
+                "google.spanner.v1.Spanner/BatchWrite",
+                "google.spanner.v1.Spanner/BeginTransaction",
+                "google.spanner.v1.Spanner/Commit",
+                "google.spanner.v1.Spanner/CreateSession",
+                "google.spanner.v1.Spanner/DeleteSession",
+                "google.spanner.v1.Spanner/ExecuteBatchDml",
+                "google.spanner.v1.Spanner/ExecuteSql",
+                "google.spanner.v1.Spanner/ExecuteStreamingSql",
+                "google.spanner.v1.Spanner/GetSession",
+                "google.spanner.v1.Spanner/ListSessions",
+                "google.spanner.v1.Spanner/PartitionQuery",
+                "google.spanner.v1.Spanner/PartitionRead",
+                "google.spanner.v1.Spanner/Read",
+                "google.spanner.v1.Spanner/Rollback",
+                "google.spanner.v1.Spanner/StreamingRead"));
     xGoogReqIdInterceptor = new XGoogSpannerRequestIdTest.ServerHeaderEnforcer(checkMethods);
     executor = Executors.newSingleThreadExecutor();
     String uniqueName = InProcessServerBuilder.generateName();
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/PartitionedDmlTransactionTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/PartitionedDmlTransactionTest.java
index 3000200b02a..8f71b1278f3 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/PartitionedDmlTransactionTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/PartitionedDmlTransactionTest.java
@@ -96,6 +96,8 @@ public class PartitionedDmlTransactionTest {
   public void setup() {
     MockitoAnnotations.initMocks(this);
     when(session.getName()).thenReturn(sessionId);
+    when(session.getRequestIdCreator())
+        .thenReturn(new XGoogSpannerRequestId.NoopRequestIdCreator());
     when(session.getOptions()).thenReturn(Collections.EMPTY_MAP);
     when(session.getRequestIdCreator())
         .thenReturn(new XGoogSpannerRequestId.NoopRequestIdCreator());