diff --git a/src/functional_test_runner/__tests__/fixtures/with_es_archiver/archives/test_archive/mappings.json b/src/functional_test_runner/__tests__/fixtures/with_es_archiver/archives/test_archive/mappings.json
index 3910d4757788f..9407214157cae 100644
--- a/src/functional_test_runner/__tests__/fixtures/with_es_archiver/archives/test_archive/mappings.json
+++ b/src/functional_test_runner/__tests__/fixtures/with_es_archiver/archives/test_archive/mappings.json
@@ -12,231 +12,235 @@
       }
     },
     "mappings": {
-      "url": {
-        "dynamic": "strict",
+      "doc": {
         "properties": {
-          "accessCount": {
-            "type": "long"
-          },
-          "accessDate": {
-            "type": "date"
-          },
-          "createDate": {
-            "type": "date"
-          },
           "url": {
-            "type": "text",
-            "fields": {
-              "keyword": {
-                "type": "keyword",
-                "ignore_above": 2048
+            "dynamic": "strict",
+            "properties": {
+              "accessCount": {
+                "type": "long"
+              },
+              "accessDate": {
+                "type": "date"
+              },
+              "createDate": {
+                "type": "date"
+              },
+              "url": {
+                "type": "text",
+                "fields": {
+                  "keyword": {
+                    "type": "keyword",
+                    "ignore_above": 2048
+                  }
+                }
               }
             }
-          }
-        }
-      },
-      "visualization": {
-        "dynamic": "strict",
-        "properties": {
-          "description": {
-            "type": "text"
           },
-          "kibanaSavedObjectMeta": {
+          "visualization": {
+            "dynamic": "strict",
             "properties": {
-              "searchSourceJSON": {
+              "description": {
+                "type": "text"
+              },
+              "kibanaSavedObjectMeta": {
+                "properties": {
+                  "searchSourceJSON": {
+                    "type": "text"
+                  }
+                }
+              },
+              "savedSearchId": {
+                "type": "keyword"
+              },
+              "title": {
+                "type": "text"
+              },
+              "uiStateJSON": {
+                "type": "text"
+              },
+              "version": {
+                "type": "integer"
+              },
+              "visState": {
                 "type": "text"
               }
             }
           },
-          "savedSearchId": {
-            "type": "keyword"
-          },
-          "title": {
-            "type": "text"
-          },
-          "uiStateJSON": {
-            "type": "text"
-          },
-          "version": {
-            "type": "integer"
-          },
-          "visState": {
-            "type": "text"
-          }
-        }
-      },
-      "timelion-sheet": {
-        "dynamic": "strict",
-        "properties": {
-          "description": {
-            "type": "text"
-          },
-          "hits": {
-            "type": "integer"
-          },
-          "kibanaSavedObjectMeta": {
+          "timelion-sheet": {
+            "dynamic": "strict",
             "properties": {
-              "searchSourceJSON": {
+              "description": {
+                "type": "text"
+              },
+              "hits": {
+                "type": "integer"
+              },
+              "kibanaSavedObjectMeta": {
+                "properties": {
+                  "searchSourceJSON": {
+                    "type": "text"
+                  }
+                }
+              },
+              "timelion_chart_height": {
+                "type": "integer"
+              },
+              "timelion_columns": {
+                "type": "integer"
+              },
+              "timelion_interval": {
+                "type": "keyword"
+              },
+              "timelion_other_interval": {
+                "type": "keyword"
+              },
+              "timelion_rows": {
+                "type": "integer"
+              },
+              "timelion_sheet": {
+                "type": "text"
+              },
+              "title": {
                 "type": "text"
+              },
+              "version": {
+                "type": "integer"
               }
             }
           },
-          "timelion_chart_height": {
-            "type": "integer"
-          },
-          "timelion_columns": {
-            "type": "integer"
-          },
-          "timelion_interval": {
-            "type": "keyword"
-          },
-          "timelion_other_interval": {
-            "type": "keyword"
-          },
-          "timelion_rows": {
-            "type": "integer"
-          },
-          "timelion_sheet": {
-            "type": "text"
-          },
-          "title": {
-            "type": "text"
-          },
-          "version": {
-            "type": "integer"
-          }
-        }
-      },
-      "config": {
-        "dynamic": "true",
-        "properties": {
-          "buildNum": {
-            "type": "keyword"
-          }
-        }
-      },
-      "server": {
-        "dynamic": "strict",
-        "properties": {
-          "uuid": {
-            "type": "keyword"
-          }
-        }
-      },
-      "index-pattern": {
-        "dynamic": "strict",
-        "properties": {
-          "fieldFormatMap": {
-            "type": "text"
-          },
-          "fields": {
-            "type": "text"
-          },
-          "intervalName": {
-            "type": "keyword"
-          },
-          "notExpandable": {
-            "type": "boolean"
-          },
-          "sourceFilters": {
-            "type": "text"
-          },
-          "timeFieldName": {
-            "type": "keyword"
-          },
-          "title": {
-            "type": "text"
-          }
-        }
-      },
-      "_default_": {
-        "dynamic": "strict"
-      },
-      "search": {
-        "dynamic": "strict",
-        "properties": {
-          "columns": {
-            "type": "keyword"
-          },
-          "description": {
-            "type": "text"
+          "config": {
+            "dynamic": "true",
+            "properties": {
+              "buildNum": {
+                "type": "keyword"
+              }
+            }
           },
-          "hits": {
-            "type": "integer"
+          "server": {
+            "dynamic": "strict",
+            "properties": {
+              "uuid": {
+                "type": "keyword"
+              }
+            }
           },
-          "kibanaSavedObjectMeta": {
+          "index-pattern": {
+            "dynamic": "strict",
             "properties": {
-              "searchSourceJSON": {
+              "fieldFormatMap": {
+                "type": "text"
+              },
+              "fields": {
+                "type": "text"
+              },
+              "intervalName": {
+                "type": "keyword"
+              },
+              "notExpandable": {
+                "type": "boolean"
+              },
+              "sourceFilters": {
+                "type": "text"
+              },
+              "timeFieldName": {
+                "type": "keyword"
+              },
+              "title": {
                 "type": "text"
               }
             }
           },
-          "sort": {
-            "type": "keyword"
-          },
-          "title": {
-            "type": "text"
-          },
-          "version": {
-            "type": "integer"
-          }
-        }
-      },
-      "dashboard": {
-        "dynamic": "strict",
-        "properties": {
-          "description": {
-            "type": "text"
-          },
-          "hits": {
-            "type": "integer"
+          "_default_": {
+            "dynamic": "strict"
           },
-          "kibanaSavedObjectMeta": {
+          "search": {
+            "dynamic": "strict",
             "properties": {
-              "searchSourceJSON": {
+              "columns": {
+                "type": "keyword"
+              },
+              "description": {
                 "type": "text"
+              },
+              "hits": {
+                "type": "integer"
+              },
+              "kibanaSavedObjectMeta": {
+                "properties": {
+                  "searchSourceJSON": {
+                    "type": "text"
+                  }
+                }
+              },
+              "sort": {
+                "type": "keyword"
+              },
+              "title": {
+                "type": "text"
+              },
+              "version": {
+                "type": "integer"
               }
             }
           },
-          "optionsJSON": {
-            "type": "text"
-          },
-          "panelsJSON": {
-            "type": "text"
-          },
-          "refreshInterval": {
+          "dashboard": {
+            "dynamic": "strict",
             "properties": {
-              "display": {
+              "description": {
+                "type": "text"
+              },
+              "hits": {
+                "type": "integer"
+              },
+              "kibanaSavedObjectMeta": {
+                "properties": {
+                  "searchSourceJSON": {
+                    "type": "text"
+                  }
+                }
+              },
+              "optionsJSON": {
+                "type": "text"
+              },
+              "panelsJSON": {
+                "type": "text"
+              },
+              "refreshInterval": {
+                "properties": {
+                  "display": {
+                    "type": "keyword"
+                  },
+                  "pause": {
+                    "type": "boolean"
+                  },
+                  "section": {
+                    "type": "integer"
+                  },
+                  "value": {
+                    "type": "integer"
+                  }
+                }
+              },
+              "timeFrom": {
                 "type": "keyword"
               },
-              "pause": {
+              "timeRestore": {
                 "type": "boolean"
               },
-              "section": {
-                "type": "integer"
+              "timeTo": {
+                "type": "keyword"
+              },
+              "title": {
+                "type": "text"
               },
-              "value": {
+              "uiStateJSON": {
+                "type": "text"
+              },
+              "version": {
                 "type": "integer"
               }
             }
-          },
-          "timeFrom": {
-            "type": "keyword"
-          },
-          "timeRestore": {
-            "type": "boolean"
-          },
-          "timeTo": {
-            "type": "keyword"
-          },
-          "title": {
-            "type": "text"
-          },
-          "uiStateJSON": {
-            "type": "text"
-          },
-          "version": {
-            "type": "integer"
           }
         }
       }