diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/delete_by_query.json b/rest-api-spec/src/main/resources/rest-api-spec/api/delete_by_query.json
index 314f27d9a80..07b55b83f88 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/delete_by_query.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/delete_by_query.json
@@ -178,9 +178,9 @@
         "description": "The throttle for this request in sub-requests per second. -1 means no throttle."
       },
       "slices": {
-        "type": "number",
+        "type": "number|auto",
         "default": 1,
-        "description": "The number of slices this task should be divided into. Defaults to 1 meaning the task isn't sliced into subtasks."
+        "description": "The number of slices this task should be divided into. Defaults to 1, meaning the task isn't sliced into subtasks."
       }
     },
     "body":{
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/enrich.delete_policy.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/enrich.delete_policy.json
index a775ca28798..2d4fd1a7baf 100644
--- a/x-pack/plugin/src/test/resources/rest-api-spec/api/enrich.delete_policy.json
+++ b/x-pack/plugin/src/test/resources/rest-api-spec/api/enrich.delete_policy.json
@@ -1,6 +1,8 @@
 {
   "enrich.delete_policy": {
-    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/enrich-delete-policy.html",
+    "documentation": {
+      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/delete-enrich-policy-api.html"
+    },
     "stability" : "stable",
     "url": {
       "paths": [
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/enrich.execute_policy.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/enrich.execute_policy.json
index b49486a0620..90413423a9d 100644
--- a/x-pack/plugin/src/test/resources/rest-api-spec/api/enrich.execute_policy.json
+++ b/x-pack/plugin/src/test/resources/rest-api-spec/api/enrich.execute_policy.json
@@ -1,6 +1,8 @@
 {
   "enrich.execute_policy": {
-    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/enrich-execute-policy.html",
+    "documentation": {
+      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/execute-enrich-policy-api.html"
+    },
     "stability" : "stable",
     "url": {
       "paths": [
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/enrich.get_policy.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/enrich.get_policy.json
index 685c24ea228..dc2ab9d9e9c 100644
--- a/x-pack/plugin/src/test/resources/rest-api-spec/api/enrich.get_policy.json
+++ b/x-pack/plugin/src/test/resources/rest-api-spec/api/enrich.get_policy.json
@@ -1,6 +1,8 @@
 {
   "enrich.get_policy": {
-    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/enrich-get-policy.html",
+    "documentation": {
+      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/get-enrich-policy-api.html"
+    },
     "stability" : "stable",
     "url": {
       "paths": [
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/enrich.put_policy.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/enrich.put_policy.json
index 7a1c02f92b9..c23bec02ab0 100644
--- a/x-pack/plugin/src/test/resources/rest-api-spec/api/enrich.put_policy.json
+++ b/x-pack/plugin/src/test/resources/rest-api-spec/api/enrich.put_policy.json
@@ -1,6 +1,8 @@
 {
   "enrich.put_policy": {
-    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/enrich-put-policy.html",
+    "documentation": {
+      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/put-enrich-policy-api.html"
+    },
     "stability" : "stable",
     "url": {
       "paths": [
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/enrich.stats.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/enrich.stats.json
index 0dda96d81fa..69175d55634 100644
--- a/x-pack/plugin/src/test/resources/rest-api-spec/api/enrich.stats.json
+++ b/x-pack/plugin/src/test/resources/rest-api-spec/api/enrich.stats.json
@@ -1,6 +1,8 @@
 {
   "enrich.stats": {
-    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/enrich-stats.html",
+    "documentation": {
+      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/enrich-stats-api.html"
+    },
     "stability" : "stable",
     "url": {
       "paths": [
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/sql.clear_cursor.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/sql.clear_cursor.json
index 392b24b2187..7cef02fb887 100644
--- a/x-pack/plugin/src/test/resources/rest-api-spec/api/sql.clear_cursor.json
+++ b/x-pack/plugin/src/test/resources/rest-api-spec/api/sql.clear_cursor.json
@@ -1,7 +1,8 @@
 {
   "sql.clear_cursor":{
     "documentation":{
-      "url":"Clear SQL cursor"
+      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-pagination.html",
+      "description":"Clears the SQL cursor"
     },
     "stability":"stable",
     "url":{
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/sql.query.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/sql.query.json
index 0fe518b5205..1c32b7b5b28 100644
--- a/x-pack/plugin/src/test/resources/rest-api-spec/api/sql.query.json
+++ b/x-pack/plugin/src/test/resources/rest-api-spec/api/sql.query.json
@@ -1,7 +1,8 @@
 {
   "sql.query":{
     "documentation":{
-      "url":"Execute SQL"
+      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-rest-overview.html",
+      "description":"Executes an SQL request"
     },
     "stability":"stable",
     "url":{
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/sql.translate.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/sql.translate.json
index 30920a3e4a3..37a66bd25c9 100644
--- a/x-pack/plugin/src/test/resources/rest-api-spec/api/sql.translate.json
+++ b/x-pack/plugin/src/test/resources/rest-api-spec/api/sql.translate.json
@@ -1,7 +1,8 @@
 {
   "sql.translate":{
     "documentation":{
-      "url":"Translate SQL into Elasticsearch queries"
+      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate.html",
+      "description":"Translates SQL into Elasticsearch queries"
     },
     "stability":"stable",
     "url":{
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/test/license/30_enterprise_license.yml b/x-pack/plugin/src/test/resources/rest-api-spec/test/license/30_enterprise_license.yml
index 09a222880d2..1d2470b5c4b 100644
--- a/x-pack/plugin/src/test/resources/rest-api-spec/test/license/30_enterprise_license.yml
+++ b/x-pack/plugin/src/test/resources/rest-api-spec/test/license/30_enterprise_license.yml
@@ -29,7 +29,7 @@ teardown:
 
   - do:
       license.get:
-        accept_enterprise: "true"
+        accept_enterprise: true
 
   ## a v5 license object has 12 attributes
   - length: { license: 12 }
@@ -41,7 +41,7 @@ teardown:
 
   - do:
       license.get:
-        accept_enterprise: "false"
+        accept_enterprise: false
 
   ## a v4 license object has 11 attributes
   - length: { license: 11 }