diff --git a/packages/form-json-schema/test/fixtures/columns-columnsExpression-exclusive.js b/packages/form-json-schema/test/fixtures/columns-columnsExpression-exclusive.js
index 08dbb43c3..633a1d385 100644
--- a/packages/form-json-schema/test/fixtures/columns-columnsExpression-exclusive.js
+++ b/packages/form-json-schema/test/fixtures/columns-columnsExpression-exclusive.js
@@ -36,7 +36,7 @@ export const errors = [
     message: 'boolean schema is false',
     params: {},
     schemaPath:
-      '#/properties/components/items/allOf/1/allOf/17/then/oneOf/0/properties/columnsExpression/false schema',
+      '#/properties/components/items/allOf/1/allOf/18/then/oneOf/0/properties/columnsExpression/false schema',
   },
   {
     instancePath: '/components/0/columns',
@@ -44,7 +44,7 @@ export const errors = [
     message: 'boolean schema is false',
     params: {},
     schemaPath:
-      '#/properties/components/items/allOf/1/allOf/17/then/oneOf/1/properties/columns/false schema',
+      '#/properties/components/items/allOf/1/allOf/18/then/oneOf/1/properties/columns/false schema',
   },
   {
     instancePath: '/components/0',
@@ -53,7 +53,7 @@ export const errors = [
     params: {
       passingSchemas: null,
     },
-    schemaPath: '#/properties/components/items/allOf/1/allOf/17/then/oneOf',
+    schemaPath: '#/properties/components/items/allOf/1/allOf/18/then/oneOf',
   },
   {
     instancePath: '/components/0',
@@ -62,6 +62,6 @@ export const errors = [
     params: {
       failingKeyword: 'then',
     },
-    schemaPath: '#/properties/components/items/allOf/1/allOf/17/if',
+    schemaPath: '#/properties/components/items/allOf/1/allOf/18/if',
   },
 ];
diff --git a/packages/form-json-schema/test/fixtures/columns-not-allowed.js b/packages/form-json-schema/test/fixtures/columns-not-allowed.js
index b5397ae60..fac8863a1 100644
--- a/packages/form-json-schema/test/fixtures/columns-not-allowed.js
+++ b/packages/form-json-schema/test/fixtures/columns-not-allowed.js
@@ -12,14 +12,14 @@ export const form = {
 export const errors = [
   {
     instancePath: '/components/0/columns',
-    schemaPath: '#/properties/components/items/allOf/1/allOf/16/then/properties/columns/false schema',
+    schemaPath: '#/properties/components/items/allOf/1/allOf/17/then/properties/columns/false schema',
     keyword: 'false schema',
     params: {},
     message: 'boolean schema is false'
   },
   {
     instancePath: '/components/0',
-    schemaPath: '#/properties/components/items/allOf/1/allOf/16/if',
+    schemaPath: '#/properties/components/items/allOf/1/allOf/17/if',
     keyword: 'if',
     params: { failingKeyword: 'then' },
     message: 'must match "then" schema'
diff --git a/packages/form-json-schema/test/fixtures/columnsExpression-not-allowed.js b/packages/form-json-schema/test/fixtures/columnsExpression-not-allowed.js
index 065a061bb..16deb54fb 100644
--- a/packages/form-json-schema/test/fixtures/columnsExpression-not-allowed.js
+++ b/packages/form-json-schema/test/fixtures/columnsExpression-not-allowed.js
@@ -12,14 +12,14 @@ export const form = {
 export const errors = [
   {
     instancePath: '/components/0/columnsExpression',
-    schemaPath: '#/properties/components/items/allOf/1/allOf/16/then/properties/columnsExpression/false schema',
+    schemaPath: '#/properties/components/items/allOf/1/allOf/17/then/properties/columnsExpression/false schema',
     keyword: 'false schema',
     params: {},
     message: 'boolean schema is false'
   },
   {
     instancePath: '/components/0',
-    schemaPath: '#/properties/components/items/allOf/1/allOf/16/if',
+    schemaPath: '#/properties/components/items/allOf/1/allOf/17/if',
     keyword: 'if',
     params: { failingKeyword: 'then' },
     message: 'must match "then" schema'
diff --git a/packages/form-json-schema/test/fixtures/dataSource-not-allowed.js b/packages/form-json-schema/test/fixtures/dataSource-not-allowed.js
index ee454b1ad..7c032b082 100644
--- a/packages/form-json-schema/test/fixtures/dataSource-not-allowed.js
+++ b/packages/form-json-schema/test/fixtures/dataSource-not-allowed.js
@@ -12,14 +12,14 @@ export const form = {
 export const errors = [
   {
     instancePath: '/components/0/dataSource',
-    schemaPath: '#/properties/components/items/allOf/1/allOf/16/then/properties/dataSource/false schema',
+    schemaPath: '#/properties/components/items/allOf/1/allOf/17/then/properties/dataSource/false schema',
     keyword: 'false schema',
     params: {},
     message: 'boolean schema is false'
   },
   {
     instancePath: '/components/0',
-    schemaPath: '#/properties/components/items/allOf/1/allOf/16/if',
+    schemaPath: '#/properties/components/items/allOf/1/allOf/17/if',
     keyword: 'if',
     params: { failingKeyword: 'then' },
     message: 'must match "then" schema'
diff --git a/packages/form-json-schema/test/fixtures/key-not-allowed.js b/packages/form-json-schema/test/fixtures/key-not-allowed.js
index f7c64c02b..51a6cd511 100644
--- a/packages/form-json-schema/test/fixtures/key-not-allowed.js
+++ b/packages/form-json-schema/test/fixtures/key-not-allowed.js
@@ -12,14 +12,14 @@ export const form = {
 export const errors = [
   {
     instancePath: '/components/0/key',
-    schemaPath: '#/properties/components/items/allOf/1/allOf/15/then/properties/key/false schema',
+    schemaPath: '#/properties/components/items/allOf/1/allOf/16/then/properties/key/false schema',
     keyword: 'false schema',
     params: {},
     message: 'boolean schema is false'
   },
   {
     instancePath: '/components/0',
-    schemaPath: '#/properties/components/items/allOf/1/allOf/15/if',
+    schemaPath: '#/properties/components/items/allOf/1/allOf/16/if',
     keyword: 'if',
     params: { failingKeyword: 'then' },
     message: 'must match "then" schema'
diff --git a/packages/form-json-schema/test/fixtures/rowCount-not-allowed.js b/packages/form-json-schema/test/fixtures/rowCount-not-allowed.js
index d7021c4ea..d6940fdea 100644
--- a/packages/form-json-schema/test/fixtures/rowCount-not-allowed.js
+++ b/packages/form-json-schema/test/fixtures/rowCount-not-allowed.js
@@ -12,14 +12,14 @@ export const form = {
 export const errors = [
   {
     instancePath: '/components/0/rowCount',
-    schemaPath: '#/properties/components/items/allOf/1/allOf/16/then/properties/rowCount/false schema',
+    schemaPath: '#/properties/components/items/allOf/1/allOf/17/then/properties/rowCount/false schema',
     keyword: 'false schema',
     params: {},
     message: 'boolean schema is false'
   },
   {
     instancePath: '/components/0',
-    schemaPath: '#/properties/components/items/allOf/1/allOf/16/if',
+    schemaPath: '#/properties/components/items/allOf/1/allOf/17/if',
     keyword: 'if',
     params: { failingKeyword: 'then' },
     message: 'must match "then" schema'