diff --git a/google-cloud-batch/src/main/java/com/google/cloud/batch/v1/BatchServiceClient.java b/google-cloud-batch/src/main/java/com/google/cloud/batch/v1/BatchServiceClient.java
index 13fe161..b0232ea 100644
--- a/google-cloud-batch/src/main/java/com/google/cloud/batch/v1/BatchServiceClient.java
+++ b/google-cloud-batch/src/main/java/com/google/cloud/batch/v1/BatchServiceClient.java
@@ -18,6 +18,7 @@
 
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
+import com.google.api.core.BetaApi;
 import com.google.api.gax.core.BackgroundResource;
 import com.google.api.gax.httpjson.longrunning.OperationsClient;
 import com.google.api.gax.longrunning.OperationFuture;
@@ -189,6 +190,7 @@ public final com.google.longrunning.OperationsClient getOperationsClient() {
    * Returns the OperationsClient that can be used to query the status of a long-running operation
    * returned by another API method call.
    */
+  @BetaApi
   public final OperationsClient getHttpJsonOperationsClient() {
     return httpJsonOperationsClient;
   }
diff --git a/google-cloud-batch/src/test/java/com/google/cloud/batch/v1/BatchServiceClientTest.java b/google-cloud-batch/src/test/java/com/google/cloud/batch/v1/BatchServiceClientTest.java
index 2f12156..931d122 100644
--- a/google-cloud-batch/src/test/java/com/google/cloud/batch/v1/BatchServiceClientTest.java
+++ b/google-cloud-batch/src/test/java/com/google/cloud/batch/v1/BatchServiceClientTest.java
@@ -27,9 +27,7 @@
 import com.google.api.gax.rpc.ApiClientHeaderProvider;
 import com.google.api.gax.rpc.InvalidArgumentException;
 import com.google.api.gax.rpc.StatusCode;
-import com.google.cloud.location.MockLocations;
 import com.google.common.collect.Lists;
-import com.google.iam.v1.MockIAMPolicy;
 import com.google.longrunning.Operation;
 import com.google.protobuf.AbstractMessage;
 import com.google.protobuf.Any;
diff --git a/google-cloud-batch/src/test/java/com/google/iam/v1/MockIAMPolicy.java b/google-cloud-batch/src/test/java/com/google/cloud/batch/v1/MockIAMPolicy.java
similarity index 97%
rename from google-cloud-batch/src/test/java/com/google/iam/v1/MockIAMPolicy.java
rename to google-cloud-batch/src/test/java/com/google/cloud/batch/v1/MockIAMPolicy.java
index 3d78598..db84032 100644
--- a/google-cloud-batch/src/test/java/com/google/iam/v1/MockIAMPolicy.java
+++ b/google-cloud-batch/src/test/java/com/google/cloud/batch/v1/MockIAMPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.iam.v1;
+package com.google.cloud.batch.v1;
 
 import com.google.api.core.BetaApi;
 import com.google.api.gax.grpc.testing.MockGrpcService;
diff --git a/google-cloud-batch/src/test/java/com/google/iam/v1/MockIAMPolicyImpl.java b/google-cloud-batch/src/test/java/com/google/cloud/batch/v1/MockIAMPolicyImpl.java
similarity index 97%
rename from google-cloud-batch/src/test/java/com/google/iam/v1/MockIAMPolicyImpl.java
rename to google-cloud-batch/src/test/java/com/google/cloud/batch/v1/MockIAMPolicyImpl.java
index 070cdbc..530cf4e 100644
--- a/google-cloud-batch/src/test/java/com/google/iam/v1/MockIAMPolicyImpl.java
+++ b/google-cloud-batch/src/test/java/com/google/cloud/batch/v1/MockIAMPolicyImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.iam.v1;
+package com.google.cloud.batch.v1;
 
 import com.google.api.core.BetaApi;
 import com.google.iam.v1.IAMPolicyGrpc.IAMPolicyImplBase;
diff --git a/google-cloud-batch/src/test/java/com/google/cloud/location/MockLocations.java b/google-cloud-batch/src/test/java/com/google/cloud/batch/v1/MockLocations.java
similarity index 97%
rename from google-cloud-batch/src/test/java/com/google/cloud/location/MockLocations.java
rename to google-cloud-batch/src/test/java/com/google/cloud/batch/v1/MockLocations.java
index 8ce43ed..75984c9 100644
--- a/google-cloud-batch/src/test/java/com/google/cloud/location/MockLocations.java
+++ b/google-cloud-batch/src/test/java/com/google/cloud/batch/v1/MockLocations.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.cloud.location;
+package com.google.cloud.batch.v1;
 
 import com.google.api.core.BetaApi;
 import com.google.api.gax.grpc.testing.MockGrpcService;
diff --git a/google-cloud-batch/src/test/java/com/google/cloud/location/MockLocationsImpl.java b/google-cloud-batch/src/test/java/com/google/cloud/batch/v1/MockLocationsImpl.java
similarity index 97%
rename from google-cloud-batch/src/test/java/com/google/cloud/location/MockLocationsImpl.java
rename to google-cloud-batch/src/test/java/com/google/cloud/batch/v1/MockLocationsImpl.java
index 344350e..859767b 100644
--- a/google-cloud-batch/src/test/java/com/google/cloud/location/MockLocationsImpl.java
+++ b/google-cloud-batch/src/test/java/com/google/cloud/batch/v1/MockLocationsImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.cloud.location;
+package com.google.cloud.batch.v1;
 
 import com.google.api.core.BetaApi;
 import com.google.cloud.location.LocationsGrpc.LocationsImplBase;