diff --git a/google-cloud-datastore/lib/google/cloud/datastore/service.rb b/google-cloud-datastore/lib/google/cloud/datastore/service.rb
index d2cc65c83874..f27d859b787e 100644
--- a/google-cloud-datastore/lib/google/cloud/datastore/service.rb
+++ b/google-cloud-datastore/lib/google/cloud/datastore/service.rb
@@ -107,12 +107,11 @@ def run_query query, namespace = nil, consistency: nil, transaction: nil
           end
 
           execute do
-            service.run_query project,
-                              partition_id,
-                              read_options: read_options,
-                              query: query,
-                              gql_query: gql_query,
-                              options: default_options
+            service.run_query project, partition_id: partition_id,
+                                       read_options: read_options,
+                                       query: query,
+                                       gql_query: gql_query,
+                                       options: default_options
           end
         end
 
@@ -144,8 +143,10 @@ def begin_transaction read_only: nil, previous_transaction: nil
         def commit mutations, transaction: nil
           mode =  transaction.nil? ? :NON_TRANSACTIONAL : :TRANSACTIONAL
           execute do
-            service.commit project, mode, mutations, transaction: transaction,
-                                                     options: default_options
+            service.commit project, mode: mode,
+                                    mutations: mutations,
+                                    transaction: transaction,
+                                    options: default_options
           end
         end
 
diff --git a/google-cloud-datastore/support/doctest_helper.rb b/google-cloud-datastore/support/doctest_helper.rb
index 0f97826c87e9..5c1af6c0b0c1 100644
--- a/google-cloud-datastore/support/doctest_helper.rb
+++ b/google-cloud-datastore/support/doctest_helper.rb
@@ -113,26 +113,26 @@ def mock_datastore
 
   doctest.before("Google::Cloud#datastore") do
     mock_datastore do |mock|
-      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", :NON_TRANSACTIONAL, Array, Hash]
+      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", Hash]
     end
   end
 
   doctest.before("Google::Cloud.datastore") do
     mock_datastore do |mock|
-      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", :NON_TRANSACTIONAL, Array, Hash]
+      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", Hash]
     end
   end
 
   doctest.before("Google::Cloud::Datastore") do
     mock_datastore do |mock|
       mock.expect :lookup, lookup_res, ["my-todo-project", Array, Hash]
-      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", :NON_TRANSACTIONAL, Array, Hash]
+      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", Hash]
     end
   end
 
   doctest.before("Google::Cloud::Datastore.new") do
     mock_datastore do |mock|
-      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", :NON_TRANSACTIONAL, Array, Hash]
+      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", Hash]
     end
   end
 
@@ -140,19 +140,19 @@ def mock_datastore
 
   doctest.before("Google::Cloud::Datastore::Commit") do
     mock_datastore do |mock|
-      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", :NON_TRANSACTIONAL, Array, Hash]
+      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", Hash]
     end
   end
 
   doctest.before("Google::Cloud::Datastore::Cursor") do
     mock_datastore do |mock|
-      mock.expect :run_query, run_query_res, ["my-todo-project", nil, Hash]
+      mock.expect :run_query, run_query_res, ["my-todo-project", Hash]
     end
   end
 
   doctest.before("Google::Cloud::Datastore::Dataset") do
     mock_datastore do |mock|
-      mock.expect :run_query, run_query_res, ["my-todo-project", nil, Hash]
+      mock.expect :run_query, run_query_res, ["my-todo-project", Hash]
     end
   end
 
@@ -164,47 +164,47 @@ def mock_datastore
 
   doctest.before("Google::Cloud::Datastore::Dataset#save") do
     mock_datastore do |mock|
-      mock.expect :commit, OpenStruct.new(mutation_results: [entity_grpc("Task", 123456)]), ["my-todo-project", :NON_TRANSACTIONAL, Array, Hash]
+      mock.expect :commit, OpenStruct.new(mutation_results: [entity_grpc("Task", 123456)]), ["my-todo-project", Hash]
     end
   end
 
   doctest.before("Google::Cloud::Datastore::Dataset#save@Update an existing entity:") do
     mock_datastore do |mock|
       mock.expect :lookup, lookup_res, ["my-todo-project", Array, Hash]
-      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", :NON_TRANSACTIONAL, Array, Hash]
+      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", Hash]
     end
   end
 
   doctest.before("Google::Cloud::Datastore::Dataset#insert") do
     mock_datastore do |mock|
-      mock.expect :commit, OpenStruct.new(mutation_results: [entity_grpc("Task", 123456)]), ["my-todo-project", :NON_TRANSACTIONAL, Array, Hash]
+      mock.expect :commit, OpenStruct.new(mutation_results: [entity_grpc("Task", 123456)]), ["my-todo-project", Hash]
     end
   end
 
   doctest.before("Google::Cloud::Datastore::Dataset#update") do
     mock_datastore do |mock|
       mock.expect :lookup, lookup_res, ["my-todo-project", Array, Hash]
-      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", :NON_TRANSACTIONAL, Array, Hash]
+      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", Hash]
     end
   end
 
   doctest.before("Google::Cloud::Datastore::Dataset#update@Update multiple new entities in a batch:") do
     mock_datastore do |mock|
-      mock.expect :run_query, run_query_res, ["my-todo-project", nil, Hash]
-      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", :NON_TRANSACTIONAL, Array, Hash]
+      mock.expect :run_query, run_query_res, ["my-todo-project", Hash]
+      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", Hash]
     end
   end
 
   doctest.before("Google::Cloud::Datastore::Dataset#delete") do
     mock_datastore do |mock|
       mock.expect :lookup, lookup_res, ["my-todo-project", Array, Hash]
-      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", :NON_TRANSACTIONAL, Array, Hash]
+      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", Hash]
     end
   end
 
   doctest.before("Google::Cloud::Datastore::Dataset#commit") do
     mock_datastore do |mock|
-      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", :NON_TRANSACTIONAL, Array, Hash]
+      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", Hash]
     end
   end
 
@@ -216,19 +216,19 @@ def mock_datastore
 
   doctest.before("Google::Cloud::Datastore::Dataset#run@Run an ancestor query with eventual consistency:") do
     mock_datastore do |mock|
-      mock.expect :run_query, run_query_res, ["my-todo-project", nil, Hash]
+      mock.expect :run_query, run_query_res, ["my-todo-project", Hash]
     end
   end
 
   doctest.before("Google::Cloud::Datastore::Dataset#run@Run the query within a namespace with the `namespace` option:") do
     mock_datastore do |mock|
-      mock.expect :run_query, run_query_res, ["my-todo-project", Google::Datastore::V1::PartitionId, Hash]
+      mock.expect :run_query, run_query_res, ["my-todo-project", Hash]
     end
   end
 
   doctest.before("Google::Cloud::Datastore::Dataset#run@Run the GQL query within a namespace with `namespace` option:") do
     mock_datastore do |mock|
-      mock.expect :run_query, run_query_res, ["my-todo-project", Google::Datastore::V1::PartitionId, Hash]
+      mock.expect :run_query, run_query_res, ["my-todo-project", Hash]
     end
   end
 
@@ -236,7 +236,7 @@ def mock_datastore
     mock_datastore do |mock|
       mock.expect :begin_transaction, begin_tx_res, ["my-todo-project", transaction_options: nil]
       mock.expect :lookup, lookup_res, ["my-todo-project", Array, Hash]
-      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", :TRANSACTIONAL, Array, Hash]
+      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", Hash]
     end
   end
 
@@ -244,8 +244,8 @@ def mock_datastore
     mock_datastore do |mock|
       mock.expect :begin_transaction, begin_tx_res, ["my-todo-project", Hash]
       mock.expect :lookup, lookup_res, ["my-todo-project", Array, Hash]
-      mock.expect :run_query, run_query_res, ["my-todo-project", nil, Hash]
-      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", :TRANSACTIONAL, Array, Hash]
+      mock.expect :run_query, run_query_res, ["my-todo-project", Hash]
+      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", Hash]
     end
   end
 
@@ -257,8 +257,8 @@ def mock_datastore
 
   doctest.before("Google::Cloud::Datastore::Dataset::QueryResults") do
     mock_datastore do |mock|
-      mock.expect :run_query, run_query_res, ["my-todo-project", nil, Hash]
-      mock.expect :run_query, run_query_res(:NO_MORE_RESULTS), ["my-todo-project", nil, Hash]
+      mock.expect :run_query, run_query_res, ["my-todo-project", Hash]
+      mock.expect :run_query, run_query_res(:NO_MORE_RESULTS), ["my-todo-project", Hash]
     end
   end
 
@@ -271,20 +271,20 @@ def mock_datastore
   doctest.before("Google::Cloud::Datastore::Entity#key=") do
     mock_datastore do |mock|
       mock.expect :lookup, lookup_res, ["my-todo-project", Array, Hash]
-      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", :NON_TRANSACTIONAL, Array, Hash]
+      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", Hash]
     end
   end
 
   doctest.before("Google::Cloud::Datastore::Entity#properties") do
     mock_datastore do |mock|
       mock.expect :lookup, lookup_res, ["my-todo-project", Array, Hash]
-      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", :NON_TRANSACTIONAL, Array, Hash]
+      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", Hash]
     end
   end
 
   doctest.before("Google::Cloud::Datastore::GqlQuery") do
     mock_datastore do |mock|
-      mock.expect :run_query, run_query_res, ["my-todo-project", nil, Hash]
+      mock.expect :run_query, run_query_res, ["my-todo-project", Hash]
     end
   end
 
@@ -297,19 +297,19 @@ def mock_datastore
   doctest.before("Google::Cloud::Datastore::Key#parent") do
     mock_datastore do |mock|
       mock.expect :lookup, lookup_res, ["my-todo-project", Array, Hash]
-      mock.expect :run_query, run_query_res, ["my-todo-project", nil, Hash]
+      mock.expect :run_query, run_query_res, ["my-todo-project", Hash]
     end
   end
 
   doctest.before("Google::Cloud::Datastore::Query") do
     mock_datastore do |mock|
-      mock.expect :run_query, run_query_res, ["my-todo-project", nil, Hash]
+      mock.expect :run_query, run_query_res, ["my-todo-project", Hash]
     end
   end
 
   doctest.before("Google::Cloud::Datastore::Query@Run the query within a namespace with the `namespace` option:") do
     mock_datastore do |mock|
-      mock.expect :run_query, run_query_res, ["my-todo-project", Google::Datastore::V1::PartitionId, Hash]
+      mock.expect :run_query, run_query_res, ["my-todo-project", Hash]
     end
   end
 
@@ -317,8 +317,8 @@ def mock_datastore
     mock_datastore do |mock|
       mock.expect :begin_transaction, begin_tx_res, ["my-todo-project", Hash]
       mock.expect :lookup, lookup_res, ["my-todo-project", Array, Hash]
-      mock.expect :run_query, run_query_res, ["my-todo-project", nil, Hash]
-      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", :TRANSACTIONAL, Array, Hash]
+      mock.expect :run_query, run_query_res, ["my-todo-project", Hash]
+      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", Hash]
     end
   end
 
@@ -326,8 +326,8 @@ def mock_datastore
     mock_datastore do |mock|
       mock.expect :begin_transaction, begin_tx_res, ["my-todo-project", Hash]
       mock.expect :lookup, lookup_res, ["my-todo-project", Array, Hash]
-      mock.expect :run_query, run_query_res, ["my-todo-project", nil, Hash]
-      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", :TRANSACTIONAL, Array, Hash]
+      mock.expect :run_query, run_query_res, ["my-todo-project", Hash]
+      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", Hash]
     end
   end
 
@@ -335,7 +335,7 @@ def mock_datastore
     mock_datastore do |mock|
       mock.expect :begin_transaction, begin_tx_res, ["my-todo-project", Hash]
       mock.expect :lookup, lookup_res, ["my-todo-project", Array, Hash]
-      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", :TRANSACTIONAL, Array, Hash]
+      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", Hash]
     end
   end
 
@@ -343,7 +343,7 @@ def mock_datastore
     mock_datastore do |mock|
       mock.expect :begin_transaction, begin_tx_res, ["my-todo-project", Hash]
       mock.expect :lookup, lookup_res, ["my-todo-project", Array, Hash]
-      mock.expect :run_query, run_query_res, ["my-todo-project", nil, Hash]
+      mock.expect :run_query, run_query_res, ["my-todo-project", Hash]
       mock.expect :rollback, OpenStruct.new(mutation_results: []), ["my-todo-project", String, Hash]
     end
   end
@@ -351,25 +351,25 @@ def mock_datastore
   doctest.before("Google::Cloud::Datastore::ReadOnlyTransaction#run") do
     mock_datastore do |mock|
       mock.expect :begin_transaction, begin_tx_res, ["my-todo-project", Hash]
-      mock.expect :run_query, run_query_res, ["my-todo-project", nil, Hash]
-      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", :TRANSACTIONAL, Array, Hash]
+      mock.expect :run_query, run_query_res, ["my-todo-project", Hash]
+      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", Hash]
     end
   end
 
   doctest.before("Google::Cloud::Datastore::ReadOnlyTransaction#query") do
     mock_datastore do |mock|
       mock.expect :begin_transaction, begin_tx_res, ["my-todo-project", Hash]
-      mock.expect :run_query, run_query_res, ["my-todo-project", nil, Hash]
-      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", :TRANSACTIONAL, Array, Hash]
+      mock.expect :run_query, run_query_res, ["my-todo-project", Hash]
+      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", Hash]
     end
   end
 
   doctest.before("Google::Cloud::Datastore::ReadOnlyTransaction#gql") do
     mock_datastore do |mock|
       mock.expect :begin_transaction, begin_tx_res, ["my-todo-project", Hash]
-      mock.expect :run_query, run_query_res, ["my-todo-project", nil, Hash]
-      mock.expect :run_query, run_query_res, ["my-todo-project", nil, Hash]
-      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", :TRANSACTIONAL, Array, Hash]
+      mock.expect :run_query, run_query_res, ["my-todo-project", Hash]
+      mock.expect :run_query, run_query_res, ["my-todo-project", Hash]
+      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", Hash]
     end
   end
 
@@ -377,7 +377,7 @@ def mock_datastore
     mock_datastore do |mock|
       mock.expect :begin_transaction, begin_tx_res, ["my-todo-project", Hash]
       mock.expect :lookup, lookup_res, ["my-todo-project", Array, Hash]
-      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", :TRANSACTIONAL, Array, Hash]
+      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", Hash]
     end
   end
 
@@ -385,7 +385,7 @@ def mock_datastore
     mock_datastore do |mock|
       mock.expect :begin_transaction, begin_tx_res, ["my-todo-project", transaction_options: nil]
       mock.expect :lookup, lookup_res, ["my-todo-project", Array, Hash]
-      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", :TRANSACTIONAL, Array, Hash]
+      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", Hash]
     end
   end
 
@@ -393,8 +393,8 @@ def mock_datastore
     mock_datastore do |mock|
       mock.expect :begin_transaction, begin_tx_res, ["my-todo-project", transaction_options: nil]
       mock.expect :lookup, lookup_res, ["my-todo-project", Array, Hash]
-      mock.expect :run_query, run_query_res, ["my-todo-project", nil, Hash]
-      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", :TRANSACTIONAL, Array, Hash]
+      mock.expect :run_query, run_query_res, ["my-todo-project", Hash]
+      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", Hash]
     end
   end
 
@@ -402,7 +402,7 @@ def mock_datastore
     mock_datastore do |mock|
       mock.expect :begin_transaction, begin_tx_res, ["my-todo-project", transaction_options: nil]
       mock.expect :lookup, lookup_res, ["my-todo-project", Array, Hash]
-      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", :TRANSACTIONAL, Array, Hash]
+      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", Hash]
     end
   end
 
@@ -410,23 +410,23 @@ def mock_datastore
     mock_datastore do |mock|
       mock.expect :begin_transaction, begin_tx_res, ["my-todo-project", transaction_options: nil]
       mock.expect :lookup, lookup_res, ["my-todo-project", Array, Hash]
-      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", :TRANSACTIONAL, Array, Hash]
+      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", Hash]
     end
   end
 
   doctest.before("Google::Cloud::Datastore::Transaction#run") do
     mock_datastore do |mock|
       mock.expect :begin_transaction, begin_tx_res, ["my-todo-project", transaction_options: nil]
-      mock.expect :run_query, run_query_res, ["my-todo-project", nil, Hash]
-      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", :TRANSACTIONAL, Array, Hash]
+      mock.expect :run_query, run_query_res, ["my-todo-project", Hash]
+      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", Hash]
     end
   end
 
   doctest.before("Google::Cloud::Datastore::Transaction#run@Run the query within a namespace with the `namespace` option:") do
     mock_datastore do |mock|
       mock.expect :begin_transaction, begin_tx_res, ["my-todo-project", transaction_options: nil]
-      mock.expect :run_query, run_query_res, ["my-todo-project", Google::Datastore::V1::PartitionId, Hash]
-      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", :TRANSACTIONAL, Array, Hash]
+      mock.expect :run_query, run_query_res, ["my-todo-project", Hash]
+      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", Hash]
     end
   end
 
@@ -434,7 +434,7 @@ def mock_datastore
     mock_datastore do |mock|
       mock.expect :begin_transaction, begin_tx_res, ["my-todo-project", transaction_options: nil]
       mock.expect :lookup, lookup_res, ["my-todo-project", Array, Hash]
-      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", :TRANSACTIONAL, Array, Hash]
+      mock.expect :commit, OpenStruct.new(mutation_results: []), ["my-todo-project", Hash]
     end
   end
 end
diff --git a/google-cloud-datastore/test/google/cloud/datastore/dataset_test.rb b/google-cloud-datastore/test/google/cloud/datastore/dataset_test.rb
index 408190a394a3..d01e8531b70a 100644
--- a/google-cloud-datastore/test/google/cloud/datastore/dataset_test.rb
+++ b/google-cloud-datastore/test/google/cloud/datastore/dataset_test.rb
@@ -111,7 +111,7 @@
       end.to_grpc)
     mode = :NON_TRANSACTIONAL
     mutations = [mutation]
-    dataset.service.mocked_service.expect :commit, commit_res, [project, mode, mutations, transaction: nil, options: default_options]
+    dataset.service.mocked_service.expect :commit, commit_res, [project, mode: mode, mutations: mutations, transaction: nil, options: default_options]
 
     entity = Google::Cloud::Datastore::Entity.new.tap do |e|
       e.key = Google::Cloud::Datastore::Key.new "ds-test", "thingie"
@@ -134,7 +134,7 @@
 
     mode = :NON_TRANSACTIONAL
     mutations = [mutation]
-    dataset.service.mocked_service.expect :commit, commit_res, [project, mode, mutations, transaction: nil, options: default_options]
+    dataset.service.mocked_service.expect :commit, commit_res, [project, mode: mode, mutations: mutations, transaction: nil, options: default_options]
 
     entity = Google::Cloud::Datastore::Entity.new.tap do |e|
       e.key = Google::Cloud::Datastore::Key.new "ds-test"
@@ -158,7 +158,7 @@
 
     mode = :NON_TRANSACTIONAL
     mutations = [mutation]
-    dataset.service.mocked_service.expect :commit, commit_res, [project, mode, mutations, transaction: nil, options: default_options]
+    dataset.service.mocked_service.expect :commit, commit_res, [project, mode: mode, mutations: mutations, transaction: nil, options: default_options]
 
     entity = Google::Cloud::Datastore::Entity.new.tap do |e|
       e.key = Google::Cloud::Datastore::Key.new "ds-test", "thingie"
@@ -180,7 +180,7 @@
 
     mode = :NON_TRANSACTIONAL
     mutations = [mutation]
-    dataset.service.mocked_service.expect :commit, commit_res, [project, mode, mutations, transaction: nil, options: default_options]
+    dataset.service.mocked_service.expect :commit, commit_res, [project, mode: mode, mutations: mutations, transaction: nil, options: default_options]
 
     entity = Google::Cloud::Datastore::Entity.new.tap do |e|
       e.key = Google::Cloud::Datastore::Key.new "ds-test"
@@ -207,7 +207,7 @@
     mode = :NON_TRANSACTIONAL
     mutations = [mutation1, mutation2]
 
-    dataset.service.mocked_service.expect :commit, multiple_commit_res, [project, mode, mutations, transaction: nil, options: default_options]
+    dataset.service.mocked_service.expect :commit, multiple_commit_res, [project, mode: mode, mutations: mutations, transaction: nil, options: default_options]
 
     entity1 = Google::Cloud::Datastore::Entity.new.tap do |e|
       e.key = Google::Cloud::Datastore::Key.new "ds-test", "thingie"
@@ -238,7 +238,7 @@
     mode = :NON_TRANSACTIONAL
     mutations = [mutation1, mutation2]
 
-    dataset.service.mocked_service.expect :commit, multiple_commit_res, [project, mode, mutations, transaction: nil, options: default_options]
+    dataset.service.mocked_service.expect :commit, multiple_commit_res, [project, mode: mode, mutations: mutations, transaction: nil, options: default_options]
 
     entity1 = Google::Cloud::Datastore::Entity.new.tap do |e|
       e.key = Google::Cloud::Datastore::Key.new "ds-test", "thingie"
@@ -266,7 +266,7 @@
 
     mode = :NON_TRANSACTIONAL
     mutations = [mutation]
-    dataset.service.mocked_service.expect :commit, commit_res, [project, mode, mutations, transaction: nil, options: default_options]
+    dataset.service.mocked_service.expect :commit, commit_res, [project, mode: mode, mutations: mutations, transaction: nil, options: default_options]
 
     entity = Google::Cloud::Datastore::Entity.new.tap do |e|
       e.key = Google::Cloud::Datastore::Key.new "ds-test", "thingie"
@@ -288,7 +288,7 @@
 
     mode = :NON_TRANSACTIONAL
     mutations = [mutation]
-    dataset.service.mocked_service.expect :commit, commit_res, [project, mode, mutations, transaction: nil, options: default_options]
+    dataset.service.mocked_service.expect :commit, commit_res, [project, mode: mode, mutations: mutations, transaction: nil, options: default_options]
 
     entity = Google::Cloud::Datastore::Entity.new.tap do |e|
       e.key = Google::Cloud::Datastore::Key.new "ds-test"
@@ -316,7 +316,7 @@
     mode = :NON_TRANSACTIONAL
     mutations = [mutation1, mutation2]
 
-    dataset.service.mocked_service.expect :commit, multiple_commit_res, [project, mode, mutations, transaction: nil, options: default_options]
+    dataset.service.mocked_service.expect :commit, multiple_commit_res, [project, mode: mode, mutations: mutations, transaction: nil, options: default_options]
 
     entity1 = Google::Cloud::Datastore::Entity.new.tap do |e|
       e.key = Google::Cloud::Datastore::Key.new "ds-test", "thingie"
@@ -348,7 +348,7 @@
     mode = :NON_TRANSACTIONAL
     mutations = [mutation1, mutation2]
 
-    dataset.service.mocked_service.expect :commit, multiple_commit_res, [project, mode, mutations, transaction: nil, options: default_options]
+    dataset.service.mocked_service.expect :commit, multiple_commit_res, [project, mode: mode, mutations: mutations, transaction: nil, options: default_options]
 
     entity1 = Google::Cloud::Datastore::Entity.new.tap do |e|
       e.key = Google::Cloud::Datastore::Key.new "ds-test", "thingie"
@@ -375,7 +375,7 @@
       end.to_grpc)
     mode = :NON_TRANSACTIONAL
     mutations = [mutation]
-    dataset.service.mocked_service.expect :commit, commit_res, [project, mode, mutations, transaction: nil, options: default_options]
+    dataset.service.mocked_service.expect :commit, commit_res, [project, mode: mode, mutations: mutations, transaction: nil, options: default_options]
 
     entity = Google::Cloud::Datastore::Entity.new.tap do |e|
       e.key = Google::Cloud::Datastore::Key.new "ds-test", "thingie"
@@ -404,7 +404,7 @@
     mode = :NON_TRANSACTIONAL
     mutations = [mutation1, mutation2]
 
-    dataset.service.mocked_service.expect :commit, multiple_commit_res, [project, mode, mutations, transaction: nil, options: default_options]
+    dataset.service.mocked_service.expect :commit, multiple_commit_res, [project, mode: mode, mutations: mutations, transaction: nil, options: default_options]
 
     entity1 = Google::Cloud::Datastore::Entity.new.tap do |e|
       e.key = Google::Cloud::Datastore::Key.new "ds-test", "thingie"
@@ -437,7 +437,7 @@
     mode = :NON_TRANSACTIONAL
     mutations = [mutation1, mutation2]
 
-    dataset.service.mocked_service.expect :commit, multiple_commit_res, [project, mode, mutations, transaction: nil, options: default_options]
+    dataset.service.mocked_service.expect :commit, multiple_commit_res, [project, mode: mode, mutations: mutations, transaction: nil, options: default_options]
 
     entity1 = Google::Cloud::Datastore::Entity.new.tap do |e|
       e.key = Google::Cloud::Datastore::Key.new "ds-test", "thingie"
@@ -627,7 +627,7 @@
     )
     mode = :NON_TRANSACTIONAL
     mutations = [mutation]
-    dataset.service.mocked_service.expect :commit, commit_res, [project, mode, mutations, transaction: nil, options: default_options]
+    dataset.service.mocked_service.expect :commit, commit_res, [project, mode: mode, mutations: mutations, transaction: nil, options: default_options]
 
     entity = Google::Cloud::Datastore::Entity.new.tap do |e|
       e.key = Google::Cloud::Datastore::Key.new "ds-test", "thingie"
@@ -644,7 +644,7 @@
     mode = :NON_TRANSACTIONAL
     mutations = [mutation1, mutation2]
 
-    dataset.service.mocked_service.expect :commit, multiple_commit_res, [project, mode, mutations, transaction: nil, options: default_options]
+    dataset.service.mocked_service.expect :commit, multiple_commit_res, [project, mode: mode, mutations: mutations, transaction: nil, options: default_options]
 
     entity1 = Google::Cloud::Datastore::Entity.new.tap do |e|
       e.key = Google::Cloud::Datastore::Key.new "ds-test", "thingie"
@@ -665,7 +665,7 @@
     mode = :NON_TRANSACTIONAL
     mutations = [mutation1, mutation2]
 
-    dataset.service.mocked_service.expect :commit, multiple_commit_res, [project, mode, mutations, transaction: nil, options: default_options]
+    dataset.service.mocked_service.expect :commit, multiple_commit_res, [project, mode: mode, mutations: mutations, transaction: nil, options: default_options]
 
     entity1 = Google::Cloud::Datastore::Entity.new.tap do |e|
       e.key = Google::Cloud::Datastore::Key.new "ds-test", "thingie"
@@ -684,7 +684,7 @@
     )
     mode = :NON_TRANSACTIONAL
     mutations = [mutation]
-    dataset.service.mocked_service.expect :commit, commit_res, [project, mode, mutations, transaction: nil, options: default_options]
+    dataset.service.mocked_service.expect :commit, commit_res, [project, mode: mode, mutations: mutations, transaction: nil, options: default_options]
 
     key = Google::Cloud::Datastore::Key.new "ds-test", "thingie"
     dataset.delete key
@@ -698,7 +698,7 @@
     mode = :NON_TRANSACTIONAL
     mutations = [mutation1, mutation2]
 
-    dataset.service.mocked_service.expect :commit, multiple_commit_res, [project, mode, mutations, transaction: nil, options: default_options]
+    dataset.service.mocked_service.expect :commit, multiple_commit_res, [project, mode: mode, mutations: mutations, transaction: nil, options: default_options]
 
     entity1 = Google::Cloud::Datastore::Entity.new.tap do |e|
       e.key = Google::Cloud::Datastore::Key.new "ds-test", "thingie"
@@ -719,7 +719,7 @@
     mode = :NON_TRANSACTIONAL
     mutations = [mutation1, mutation2]
 
-    dataset.service.mocked_service.expect :commit, multiple_commit_res, [project, mode, mutations, transaction: nil, options: default_options]
+    dataset.service.mocked_service.expect :commit, multiple_commit_res, [project, mode: mode, mutations: mutations, transaction: nil, options: default_options]
 
     entity1 = Google::Cloud::Datastore::Entity.new.tap do |e|
       e.key = Google::Cloud::Datastore::Key.new "ds-test", "thingie"
@@ -733,7 +733,7 @@
   end
 
   it "run will fulfill a query" do
-    dataset.service.mocked_service.expect :run_query, run_query_res, [project, nil, read_options: nil, query: query.to_grpc, gql_query: nil, options: default_options]
+    dataset.service.mocked_service.expect :run_query, run_query_res, [project, partition_id: nil, read_options: nil, query: query.to_grpc, gql_query: nil, options: default_options]
 
     entities = dataset.run query
     entities.count.must_equal 2
@@ -771,7 +771,7 @@
                    end.to_grpc), Google::Datastore::V1::Mutation.new(
                                  delete: Google::Cloud::Datastore::Key.new("ds-test", "to-be-deleted").to_grpc)
     ]
-    dataset.service.mocked_service.expect :commit, commit_res, [project, mode, mutations, transaction: nil, options: default_options]
+    dataset.service.mocked_service.expect :commit, commit_res, [project, mode: mode, mutations: mutations, transaction: nil, options: default_options]
 
     entity_to_be_saved = Google::Cloud::Datastore::Entity.new.tap do |e|
       e.key = Google::Cloud::Datastore::Key.new "ds-test", "to-be-saved"
@@ -791,7 +791,7 @@
   end
 
   it "run_query will fulfill a query" do
-    dataset.service.mocked_service.expect :run_query, run_query_res, [project, nil, read_options: nil, query: query.to_grpc, gql_query: nil, options: default_options]
+    dataset.service.mocked_service.expect :run_query, run_query_res, [project, partition_id: nil, read_options: nil, query: query.to_grpc, gql_query: nil, options: default_options]
 
     entities = dataset.run_query query
     entities.count.must_equal 2
@@ -821,7 +821,7 @@
 
   it "run_query will fulfill a query with a namespace" do
     partition_id = Google::Datastore::V1::PartitionId.new(namespace_id: "foobar")
-    dataset.service.mocked_service.expect :run_query, run_query_res, [project, partition_id, read_options: nil, query: query.to_grpc, gql_query: nil, options: default_options]
+    dataset.service.mocked_service.expect :run_query, run_query_res, [project, partition_id: partition_id, read_options: nil, query: query.to_grpc, gql_query: nil, options: default_options]
 
     entities = dataset.run_query query, namespace: "foobar"
     entities.count.must_equal 2
@@ -850,7 +850,7 @@
   end
 
   it "run will fulfill a gql query" do
-    dataset.service.mocked_service.expect :run_query, run_query_res, [project, nil, read_options: nil, query: nil, gql_query: gql_query_grpc, options: default_options]
+    dataset.service.mocked_service.expect :run_query, run_query_res, [project, partition_id: nil, read_options: nil, query: nil, gql_query: gql_query_grpc, options: default_options]
 
     gql = dataset.gql "SELECT * FROM Task"
     entities = dataset.run gql
@@ -882,7 +882,7 @@
 
   it "run will fulfill a gql query with a namespace" do
     partition_id = Google::Datastore::V1::PartitionId.new(namespace_id: "foobar")
-    dataset.service.mocked_service.expect :run_query, run_query_res, [project, partition_id, read_options: nil, query: nil, gql_query: gql_query_grpc, options: default_options]
+    dataset.service.mocked_service.expect :run_query, run_query_res, [project, partition_id: partition_id, read_options: nil, query: nil, gql_query: gql_query_grpc, options: default_options]
 
     gql = dataset.gql "SELECT * FROM Task"
     entities = dataset.run gql, namespace: "foobar"
@@ -913,7 +913,7 @@
   end
 
   it "run_query will fulfill a gql query" do
-    dataset.service.mocked_service.expect :run_query, run_query_res, [project, nil, read_options: nil, query: nil, gql_query: gql_query_grpc, options: default_options]
+    dataset.service.mocked_service.expect :run_query, run_query_res, [project, partition_id: nil, read_options: nil, query: nil, gql_query: gql_query_grpc, options: default_options]
 
     gql = dataset.gql "SELECT * FROM Task"
     entities = dataset.run_query gql
@@ -945,7 +945,7 @@
 
   it "run_query will fulfill a gql query with a namespace" do
     partition_id = Google::Datastore::V1::PartitionId.new(namespace_id: "foobar")
-    dataset.service.mocked_service.expect :run_query, run_query_res, [project, partition_id, read_options: nil, query: nil, gql_query: gql_query_grpc, options: default_options]
+    dataset.service.mocked_service.expect :run_query, run_query_res, [project, partition_id: partition_id, read_options: nil, query: nil, gql_query: gql_query_grpc, options: default_options]
 
     gql = dataset.gql "SELECT * FROM Task"
     entities = dataset.run_query gql, namespace: "foobar"
@@ -1181,7 +1181,7 @@
         e["name"] = "thingamajig"
       end.to_grpc)
     dataset.service.mocked_service.expect :begin_transaction, begin_tx_res, [project, transaction_options: nil]
-    dataset.service.mocked_service.expect :commit, commit_res, [project, :TRANSACTIONAL, [mutation], transaction: tx_id, options: default_options]
+    dataset.service.mocked_service.expect :commit, commit_res, [project, mode: :TRANSACTIONAL, mutations: [mutation], transaction: tx_id, options: default_options]
 
     entity = Google::Cloud::Datastore::Entity.new.tap do |e|
       e.key = Google::Cloud::Datastore::Key.new "ds-test"
diff --git a/google-cloud-datastore/test/google/cloud/datastore/lookup_results/find_all_test.rb b/google-cloud-datastore/test/google/cloud/datastore/lookup_results/find_all_test.rb
index 57ebf37d0317..9ce618594c66 100644
--- a/google-cloud-datastore/test/google/cloud/datastore/lookup_results/find_all_test.rb
+++ b/google-cloud-datastore/test/google/cloud/datastore/lookup_results/find_all_test.rb
@@ -135,7 +135,7 @@
       # )]
     )
     dataset.service.mocked_service.expect :begin_transaction, begin_tx_res, [project, transaction_options: nil]
-    dataset.service.mocked_service.expect :commit, commit_res, [project, :TRANSACTIONAL, [], transaction: tx_id, options: default_options]
+    dataset.service.mocked_service.expect :commit, commit_res, [project, mode: :TRANSACTIONAL, mutations: [], transaction: tx_id, options: default_options]
     read_options = Google::Datastore::V1::ReadOptions.new(transaction: tx_id)
     dataset.service.mocked_service.expect :lookup, first_lookup_res,  [project, first_keys, read_options: read_options, options: default_options]
     dataset.service.mocked_service.expect :lookup, second_lookup_res, [project, second_keys, read_options: read_options, options: default_options]
@@ -233,7 +233,7 @@
       # )]
     )
     dataset.service.mocked_service.expect :begin_transaction, begin_tx_res, [project, transaction_options: nil]
-    dataset.service.mocked_service.expect :commit, commit_res, [project, :TRANSACTIONAL, [], transaction: tx_id, options: default_options]
+    dataset.service.mocked_service.expect :commit, commit_res, [project, mode: :TRANSACTIONAL, mutations: [], transaction: tx_id, options: default_options]
     read_options = Google::Datastore::V1::ReadOptions.new(transaction: tx_id)
     dataset.service.mocked_service.expect :lookup, first_lookup_res,  [project, first_keys, read_options: read_options, options: default_options]
     dataset.service.mocked_service.expect :lookup, second_lookup_res, [project, second_keys, read_options: read_options, options: default_options]
@@ -297,7 +297,7 @@
       # )]
     )
     dataset.service.mocked_service.expect :begin_transaction, begin_tx_res, [project, transaction_options: nil]
-    dataset.service.mocked_service.expect :commit, commit_res, [project, :TRANSACTIONAL, [], transaction: tx_id, options: default_options]
+    dataset.service.mocked_service.expect :commit, commit_res, [project, mode: :TRANSACTIONAL, mutations: [], transaction: tx_id, options: default_options]
     read_options = Google::Datastore::V1::ReadOptions.new(transaction: tx_id)
     dataset.service.mocked_service.expect :lookup, first_lookup_res,  [project, first_keys, read_options: read_options, options: default_options]
     dataset.service.mocked_service.expect :lookup, second_lookup_res, [project, second_keys, read_options: read_options, options: default_options]
diff --git a/google-cloud-datastore/test/google/cloud/datastore/query_results/all_test.rb b/google-cloud-datastore/test/google/cloud/datastore/query_results/all_test.rb
index 53e349efeae2..322ffcece9aa 100644
--- a/google-cloud-datastore/test/google/cloud/datastore/query_results/all_test.rb
+++ b/google-cloud-datastore/test/google/cloud/datastore/query_results/all_test.rb
@@ -59,8 +59,8 @@
 
   before do
     dataset.service.mocked_service = Minitest::Mock.new
-    dataset.service.mocked_service.expect :run_query, first_run_query_res, [project, nil, read_options: nil, query: first_run_query, gql_query: nil, options: default_options]
-    dataset.service.mocked_service.expect :run_query, next_run_query_res, [project, nil, read_options: nil, query: next_run_query, gql_query: nil, options: default_options]
+    dataset.service.mocked_service.expect :run_query, first_run_query_res, [project, partition_id: nil, read_options: nil, query: first_run_query, gql_query: nil, options: default_options]
+    dataset.service.mocked_service.expect :run_query, next_run_query_res, [project, partition_id: nil, read_options: nil, query: next_run_query, gql_query: nil, options: default_options]
   end
 
   after do
diff --git a/google-cloud-datastore/test/google/cloud/datastore/query_results/all_with_more_test.rb b/google-cloud-datastore/test/google/cloud/datastore/query_results/all_with_more_test.rb
index d2636dba963e..c1916e709a02 100644
--- a/google-cloud-datastore/test/google/cloud/datastore/query_results/all_with_more_test.rb
+++ b/google-cloud-datastore/test/google/cloud/datastore/query_results/all_with_more_test.rb
@@ -60,8 +60,8 @@
 
   before do
     dataset.service.mocked_service = Minitest::Mock.new
-    dataset.service.mocked_service.expect :run_query, first_run_query_res, [project, nil, read_options: nil, query: first_run_query, gql_query: nil, options: default_options]
-    dataset.service.mocked_service.expect :run_query, next_run_query_res, [project, nil, read_options: nil, query: next_run_query, gql_query: nil, options: default_options]
+    dataset.service.mocked_service.expect :run_query, first_run_query_res, [project, partition_id: nil, read_options: nil, query: first_run_query, gql_query: nil, options: default_options]
+    dataset.service.mocked_service.expect :run_query, next_run_query_res, [project, partition_id: nil, read_options: nil, query: next_run_query, gql_query: nil, options: default_options]
   end
 
   after do
diff --git a/google-cloud-datastore/test/google/cloud/datastore/query_results/all_with_offset_test.rb b/google-cloud-datastore/test/google/cloud/datastore/query_results/all_with_offset_test.rb
index bae7d301bcd9..ee56a358fb4b 100644
--- a/google-cloud-datastore/test/google/cloud/datastore/query_results/all_with_offset_test.rb
+++ b/google-cloud-datastore/test/google/cloud/datastore/query_results/all_with_offset_test.rb
@@ -60,8 +60,8 @@
 
   before do
     dataset.service.mocked_service = Minitest::Mock.new
-    dataset.service.mocked_service.expect :run_query, first_run_query_res, [project, nil, read_options: nil, query: first_run_query, gql_query: nil, options: default_options]
-    dataset.service.mocked_service.expect :run_query, next_run_query_res, [project, nil, read_options: nil, query: next_run_query, gql_query: nil, options: default_options]
+    dataset.service.mocked_service.expect :run_query, first_run_query_res, [project, partition_id: nil, read_options: nil, query: first_run_query, gql_query: nil, options: default_options]
+    dataset.service.mocked_service.expect :run_query, next_run_query_res, [project, partition_id: nil, read_options: nil, query: next_run_query, gql_query: nil, options: default_options]
   end
 
   after do
diff --git a/google-cloud-datastore/test/google/cloud/datastore/query_results_test.rb b/google-cloud-datastore/test/google/cloud/datastore/query_results_test.rb
index 3511ad835521..a1b5e52fce22 100644
--- a/google-cloud-datastore/test/google/cloud/datastore/query_results_test.rb
+++ b/google-cloud-datastore/test/google/cloud/datastore/query_results_test.rb
@@ -68,7 +68,7 @@
 
   it "has more_results not_finished" do
     query = Google::Cloud::Datastore::Query.new.kind("User")
-    dataset.service.mocked_service.expect :run_query, run_query_res_not_finished, [project, nil, read_options: nil, query: query.to_grpc, gql_query: nil, options: default_options]
+    dataset.service.mocked_service.expect :run_query, run_query_res_not_finished, [project, partition_id: nil, read_options: nil, query: query.to_grpc, gql_query: nil, options: default_options]
 
     entities = dataset.run query
     entities.count.must_equal 2
@@ -97,7 +97,7 @@
   end
 
   it "has more_results more_after_limit" do
-    dataset.service.mocked_service.expect :run_query, run_query_res_more_after_limit, [project, nil, read_options: nil, query: query.to_grpc, gql_query: nil, options: default_options]
+    dataset.service.mocked_service.expect :run_query, run_query_res_more_after_limit, [project, partition_id: nil, read_options: nil, query: query.to_grpc, gql_query: nil, options: default_options]
 
     entities = dataset.run query
     entities.count.must_equal 2
@@ -126,7 +126,7 @@
   end
 
   it "has more_results more_after_cursor" do
-    dataset.service.mocked_service.expect :run_query, run_query_res_more_after_cursor, [project, nil, read_options: nil, query: query.to_grpc, gql_query: nil, options: default_options]
+    dataset.service.mocked_service.expect :run_query, run_query_res_more_after_cursor, [project, partition_id: nil, read_options: nil, query: query.to_grpc, gql_query: nil, options: default_options]
 
     entities = dataset.run query
     entities.count.must_equal 2
@@ -155,7 +155,7 @@
   end
 
   it "has more_results no_more" do
-    dataset.service.mocked_service.expect :run_query, run_query_res_no_more, [project, nil, read_options: nil, query: query.to_grpc, gql_query: nil, options: default_options]
+    dataset.service.mocked_service.expect :run_query, run_query_res_no_more, [project, partition_id: nil, read_options: nil, query: query.to_grpc, gql_query: nil, options: default_options]
 
     entities = dataset.run query
     entities.count.must_equal 2
diff --git a/google-cloud-datastore/test/google/cloud/datastore/read_only_transaction_test.rb b/google-cloud-datastore/test/google/cloud/datastore/read_only_transaction_test.rb
index 17897167b197..b13ca16d25dd 100644
--- a/google-cloud-datastore/test/google/cloud/datastore/read_only_transaction_test.rb
+++ b/google-cloud-datastore/test/google/cloud/datastore/read_only_transaction_test.rb
@@ -97,7 +97,7 @@
 
   it "run will fulfill a query" do
     query_grpc = Google::Cloud::Datastore::Query.new.kind("User").to_grpc
-    transaction.service.mocked_service.expect :run_query, run_query_res, [project, nil, read_options: read_options, query: query_grpc, gql_query: nil, options: default_options]
+    transaction.service.mocked_service.expect :run_query, run_query_res, [project, partition_id: nil, read_options: read_options, query: query_grpc, gql_query: nil, options: default_options]
 
     query = Google::Cloud::Datastore::Query.new.kind("User")
     entities = transaction.run query
@@ -115,7 +115,7 @@
   end
 
   it "run will fulfill a gql query" do
-    transaction.service.mocked_service.expect :run_query, run_query_res, [project, nil, read_options: read_options, query: nil, gql_query: gql_query_grpc, options: default_options]
+    transaction.service.mocked_service.expect :run_query, run_query_res, [project, partition_id: nil, read_options: read_options, query: nil, gql_query: gql_query_grpc, options: default_options]
 
     gql = transaction.gql "SELECT * FROM Task"
     entities = transaction.run gql
diff --git a/google-cloud-datastore/test/google/cloud/datastore/transaction_test.rb b/google-cloud-datastore/test/google/cloud/datastore/transaction_test.rb
index 4cc2b954b5be..66ffac54554e 100644
--- a/google-cloud-datastore/test/google/cloud/datastore/transaction_test.rb
+++ b/google-cloud-datastore/test/google/cloud/datastore/transaction_test.rb
@@ -305,7 +305,7 @@
       Google::Datastore::V1::Mutation.new(
         delete: Google::Cloud::Datastore::Key.new("ds-test", "to-be-deleted").to_grpc)
     ]
-    transaction.service.mocked_service.expect :commit, commit_res, [project, mode, mutations, transaction: tx_id, options: default_options]
+    transaction.service.mocked_service.expect :commit, commit_res, [project, mode: mode, mutations: mutations, transaction: tx_id, options: default_options]
 
     entity_to_be_saved = Google::Cloud::Datastore::Entity.new.tap do |e|
       e.key = Google::Cloud::Datastore::Key.new "ds-test", "to-be-saved"
@@ -364,7 +364,7 @@
   it "run will fulfill a query" do
     query_grpc = Google::Cloud::Datastore::Query.new.kind("User").to_grpc
     read_options = Google::Datastore::V1::ReadOptions.new(transaction: tx_id)
-    transaction.service.mocked_service.expect :run_query, run_query_res, [project, nil, read_options: read_options, query: query_grpc, gql_query: nil, options: default_options]
+    transaction.service.mocked_service.expect :run_query, run_query_res, [project, partition_id: nil, read_options: read_options, query: query_grpc, gql_query: nil, options: default_options]
 
     query = Google::Cloud::Datastore::Query.new.kind("User")
     entities = transaction.run query
@@ -393,7 +393,7 @@
           e["name"] = "thingamajig"
         end.to_grpc)
     ]
-    transaction.service.mocked_service.expect :commit, commit_res, [project, mode, mutations, transaction: tx_id, options: default_options]
+    transaction.service.mocked_service.expect :commit, commit_res, [project, mode: mode, mutations: mutations, transaction: tx_id, options: default_options]
 
     entity = Google::Cloud::Datastore::Entity.new.tap do |e|
       e.key = Google::Cloud::Datastore::Key.new "ds-test", "thingie"
@@ -422,7 +422,7 @@
           e["name"] = "thingamajig"
         end.to_grpc)
     ]
-    transaction.service.mocked_service.expect :commit, commit_res, [project, mode, mutations, transaction: tx_id, options: default_options]
+    transaction.service.mocked_service.expect :commit, commit_res, [project, mode: mode, mutations: mutations, transaction: tx_id, options: default_options]
 
     entity = Google::Cloud::Datastore::Entity.new.tap do |e|
       e.key = Google::Cloud::Datastore::Key.new "ds-test"