diff --git a/core/modules/field/tests/modules/field_plugins_test/config/schema/field_plugins_test.schema.yml b/core/modules/field/tests/modules/field_plugins_test/config/schema/field_plugins_test.schema.yml
new file mode 100644
index 0000000..a7d58c0
--- /dev/null
+++ b/core/modules/field/tests/modules/field_plugins_test/config/schema/field_plugins_test.schema.yml
@@ -0,0 +1,7 @@
+field.formatter.settings.field_plugins_test_text_formatter:
+  type: field.formatter.settings.text_trimmed
+  label: 'Test text formatter display format settings'
+
+field.widget.settings.field_plugins_test_text_widget:
+  type: field.widget.settings.text_textfield
+  label: 'Test text field widget settings'
diff --git a/core/modules/field/tests/modules/field_test/config/schema/field_test.schema.yml b/core/modules/field/tests/modules/field_test/config/schema/field_test.schema.yml
index 01b3aa6..e9d41a4 100644
--- a/core/modules/field/tests/modules/field_test/config/schema/field_test.schema.yml
+++ b/core/modules/field/tests/modules/field_test/config/schema/field_test.schema.yml
@@ -1,6 +1,14 @@
+field.formatter.settings.field_test_default:
+  type: mapping
+  label: 'Field test default display format settings'
+  mapping:
+    test_formatter_setting:
+      type: string
+      label: 'Test setting'
+
 field.formatter.settings.field_test_multiple:
   type: mapping
-  label: 'field_test display format settings'
+  label: 'Multiple field test display format settings'
   mapping:
     test_formatter_setting_multiple:
       type: string
@@ -9,9 +17,33 @@ field.formatter.settings.field_test_multiple:
       type: boolean
       label: 'Test altering'
 
+field.formatter.settings.field_empty_setting:
+  type: mapping
+  label: 'Empty setting field display format settings'
+  mapping:
+    field_empty_setting:
+      type: string
+      label: 'Test setting'
+
+field.formatter.settings.field_test_with_prepare_view:
+  type: mapping
+  label: 'Field prepare step display format settings'
+  mapping:
+    test_formatter_setting_additional:
+      type: string
+      label: 'Test setting'
+
+field.widget.settings.test_field_widget:
+  type: maping
+  label: 'Test field widget settings'
+  mapping:
+    test_widget_setting:
+      type: string
+      label: 'Test setting'
+
 field.widget.settings.test_field_widget_multiple:
   type: mapping
-  label: 'field_test display format settings'
+  label: 'Test multiple field widget settings'
   mapping:
     test_widget_setting_multiple:
       type: string
@@ -19,7 +51,7 @@ field.widget.settings.test_field_widget_multiple:
 
 field.storage_settings.test_field:
   type: mapping
-  label: 'Test field settings'
+  label: 'Test field storage settings'
   mapping:
     test_field_storage_setting:
       type: string
@@ -31,9 +63,13 @@ field.storage_settings.test_field:
       type: string
       label: 'An unchangeable field storage setting'
 
+field.storage_settings.hidden_test_field:
+  type: field.storage_settings.test_field
+  label: 'Hidden test field storage settings'
+
 field.field_settings.test_field:
   type: mapping
-  label: 'Test field settings'
+  label: 'Test field field settings'
   mapping:
     test_field_setting:
       type: string
diff --git a/core/modules/link/src/Plugin/Field/FieldFormatter/LinkSeparateFormatter.php b/core/modules/link/src/Plugin/Field/FieldFormatter/LinkSeparateFormatter.php
index c88b8ff..3642a1f 100644
--- a/core/modules/link/src/Plugin/Field/FieldFormatter/LinkSeparateFormatter.php
+++ b/core/modules/link/src/Plugin/Field/FieldFormatter/LinkSeparateFormatter.php
@@ -33,7 +33,7 @@ class LinkSeparateFormatter extends LinkFormatter {
    */
   public static function defaultSettings() {
     return array(
-      'trim_length' => '80',
+      'trim_length' => 80,
       'rel' => '',
       'target' => '',
     ) + parent::defaultSettings();
diff --git a/core/modules/system/tests/modules/entity_test/config/schema/entity_test.schema.yml b/core/modules/system/tests/modules/entity_test/config/schema/entity_test.schema.yml
index 85a19e8..5a3ad02 100644
--- a/core/modules/system/tests/modules/entity_test/config/schema/entity_test.schema.yml
+++ b/core/modules/system/tests/modules/entity_test/config/schema/entity_test.schema.yml
@@ -5,3 +5,11 @@ entity_view_display.third_party.entity_test:
     foo:
       type: string
       label: 'Label for foo'
+
+field.storage_settings.shape:
+  type: mapping
+  label: 'Shape field storage settings'
+  mapping:
+    foreign_key_name:
+      type: string
+      label: 'Foreign key name'