diff --git a/x-pack/legacy/plugins/maps/public/connected_components/layer_addpanel/source_select/source_select.js b/x-pack/legacy/plugins/maps/public/connected_components/layer_addpanel/source_select/source_select.js
index b34a432bec88c0..67cc17ebaa2241 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/layer_addpanel/source_select/source_select.js
+++ b/x-pack/legacy/plugins/maps/public/connected_components/layer_addpanel/source_select/source_select.js
@@ -5,7 +5,8 @@
  */
 
 import React, { Fragment } from 'react';
-import { getLayerWizards } from '../../../layers/layer_wizard_registry';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { getLayerWizards } from '../../../../../../../plugins/maps/public/layers/layer_wizard_registry';
 import { EuiTitle, EuiSpacer, EuiCard, EuiIcon } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import _ from 'lodash';
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/metrics_expression.test.js b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/metrics_expression.test.js
index e4e3776c8e92ca..d8bf8622494484 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/metrics_expression.test.js
+++ b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/metrics_expression.test.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-jest.mock('../../../../components/metrics_editor', () => ({
+jest.mock('../../../../../../../../plugins/maps/public/components/metric_editor', () => ({
   MetricsEditor: () => {
     return <div>mockMetricsEditor</div>;
   },
diff --git a/x-pack/legacy/plugins/maps/public/plugin.ts b/x-pack/legacy/plugins/maps/public/plugin.ts
index 696ec73400df54..0fa7e1106a6df1 100644
--- a/x-pack/legacy/plugins/maps/public/plugin.ts
+++ b/x-pack/legacy/plugins/maps/public/plugin.ts
@@ -4,9 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import './layers/layer_wizard_registry';
-import './layers/sources/source_registry';
-import './layers/load_layer_wizards';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import '../../../../plugins/maps/public/layers/layer_wizard_registry';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import '../../../../plugins/maps/public/layers/sources/source_registry';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import '../../../../plugins/maps/public/layers/load_layer_wizards';
 
 import { Plugin, CoreStart, CoreSetup } from 'src/core/public';
 // @ts-ignore
diff --git a/x-pack/legacy/plugins/maps/public/selectors/map_selectors.js b/x-pack/legacy/plugins/maps/public/selectors/map_selectors.js
index fe90a179cb1d41..59346e4c6fb989 100644
--- a/x-pack/legacy/plugins/maps/public/selectors/map_selectors.js
+++ b/x-pack/legacy/plugins/maps/public/selectors/map_selectors.js
@@ -26,7 +26,8 @@ import {
 } from '../../../../../plugins/maps/public/reducers/util';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { InnerJoin } from '../../../../../plugins/maps/public/layers/joins/inner_join';
-import { getSourceByType } from '../layers/sources/source_registry';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { getSourceByType } from '../../../../../plugins/maps/public/layers/sources/source_registry';
 
 function createLayerInstance(layerDescriptor, inspectorAdapters) {
   const source = createSourceInstance(layerDescriptor.sourceDescriptor, inspectorAdapters);
diff --git a/x-pack/legacy/plugins/maps/public/selectors/map_selectors.test.js b/x-pack/legacy/plugins/maps/public/selectors/map_selectors.test.js
index 1a5ab633a569f9..77bd29259647ce 100644
--- a/x-pack/legacy/plugins/maps/public/selectors/map_selectors.test.js
+++ b/x-pack/legacy/plugins/maps/public/selectors/map_selectors.test.js
@@ -4,11 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-jest.mock('../layers/vector_layer', () => {});
-jest.mock('../layers/blended_vector_layer', () => {});
-jest.mock('../layers/heatmap_layer', () => {});
-jest.mock('../layers/vector_tile_layer', () => {});
-jest.mock('../layers/joins/inner_join', () => {});
+jest.mock('../../../../../plugins/maps/public/layers/vector_layer', () => {});
+jest.mock('../../../../../plugins/maps/public/layers/blended_vector_layer', () => {});
+jest.mock('../../../../../plugins/maps/public/layers/heatmap_layer', () => {});
+jest.mock('../../../../../plugins/maps/public/layers/vector_tile_layer', () => {});
+jest.mock('../../../../../plugins/maps/public/layers/joins/inner_join', () => {});
 jest.mock('../../../../../plugins/maps/public/reducers/non_serializable_instances', () => ({
   getInspectorAdapters: () => {
     return {};
diff --git a/x-pack/plugins/maps/public/components/__snapshots__/add_tooltip_field_popover.test.js.snap b/x-pack/plugins/maps/public/components/__snapshots__/add_tooltip_field_popover.test.js.snap
new file mode 100644
index 00000000000000..d0cdbe7243abe4
--- /dev/null
+++ b/x-pack/plugins/maps/public/components/__snapshots__/add_tooltip_field_popover.test.js.snap
@@ -0,0 +1,159 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Should remove selected fields from selectable 1`] = `
+<EuiPopover
+  anchorPosition="leftCenter"
+  button={
+    <EuiButtonEmpty
+      iconType="plusInCircleFilled"
+      isDisabled={false}
+      onClick={[Function]}
+      size="xs"
+    >
+      <FormattedMessage
+        defaultMessage="Add"
+        id="xpack.maps.tooltipSelector.togglePopoverLabel"
+        values={Object {}}
+      />
+    </EuiButtonEmpty>
+  }
+  closePopover={[Function]}
+  display="inlineBlock"
+  hasArrow={true}
+  id="addTooltipFieldPopover"
+  isOpen={false}
+  ownFocus={true}
+  panelPaddingSize="none"
+>
+  <EuiSelectable
+    onChange={[Function]}
+    options={
+      Array [
+        Object {
+          "label": "@timestamp",
+          "prepend": <FieldIcon
+            className="eui-alignMiddle"
+            fill="none"
+            type="date"
+          />,
+          "value": "@timestamp",
+        },
+      ]
+    }
+    searchProps={
+      Object {
+        "compressed": true,
+      }
+    }
+    searchable={true}
+    singleSelection={false}
+  >
+    <Component />
+  </EuiSelectable>
+  <EuiSpacer
+    size="xs"
+  />
+  <EuiPopoverFooter>
+    <EuiTextAlign
+      textAlign="right"
+    >
+      <EuiButton
+        fill={true}
+        isDisabled={true}
+        onClick={[Function]}
+        size="s"
+      >
+        Add
+      </EuiButton>
+    </EuiTextAlign>
+  </EuiPopoverFooter>
+</EuiPopover>
+`;
+
+exports[`Should render 1`] = `
+<EuiPopover
+  anchorPosition="leftCenter"
+  button={
+    <EuiButtonEmpty
+      iconType="plusInCircleFilled"
+      isDisabled={false}
+      onClick={[Function]}
+      size="xs"
+    >
+      <FormattedMessage
+        defaultMessage="Add"
+        id="xpack.maps.tooltipSelector.togglePopoverLabel"
+        values={Object {}}
+      />
+    </EuiButtonEmpty>
+  }
+  closePopover={[Function]}
+  display="inlineBlock"
+  hasArrow={true}
+  id="addTooltipFieldPopover"
+  isOpen={false}
+  ownFocus={true}
+  panelPaddingSize="none"
+>
+  <EuiSelectable
+    onChange={[Function]}
+    options={
+      Array [
+        Object {
+          "label": "@timestamp",
+          "prepend": <FieldIcon
+            className="eui-alignMiddle"
+            fill="none"
+            type="date"
+          />,
+          "value": "@timestamp",
+        },
+        Object {
+          "label": "custom label for prop1",
+          "prepend": <FieldIcon
+            className="eui-alignMiddle"
+            fill="none"
+            type="string"
+          />,
+          "value": "prop1",
+        },
+        Object {
+          "label": "prop2",
+          "prepend": <FieldIcon
+            className="eui-alignMiddle"
+            fill="none"
+            type="string"
+          />,
+          "value": "prop2",
+        },
+      ]
+    }
+    searchProps={
+      Object {
+        "compressed": true,
+      }
+    }
+    searchable={true}
+    singleSelection={false}
+  >
+    <Component />
+  </EuiSelectable>
+  <EuiSpacer
+    size="xs"
+  />
+  <EuiPopoverFooter>
+    <EuiTextAlign
+      textAlign="right"
+    >
+      <EuiButton
+        fill={true}
+        isDisabled={true}
+        onClick={[Function]}
+        size="s"
+      >
+        Add
+      </EuiButton>
+    </EuiTextAlign>
+  </EuiPopoverFooter>
+</EuiPopover>
+`;
diff --git a/x-pack/plugins/maps/public/components/__snapshots__/tooltip_selector.test.js.snap b/x-pack/plugins/maps/public/components/__snapshots__/tooltip_selector.test.js.snap
new file mode 100644
index 00000000000000..e21f034161a878
--- /dev/null
+++ b/x-pack/plugins/maps/public/components/__snapshots__/tooltip_selector.test.js.snap
@@ -0,0 +1,49 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`TooltipSelector should render component 1`] = `
+<div>
+  <EuiDragDropContext
+    onDragEnd={[Function]}
+  >
+    <EuiDroppable
+      droppableId="mapLayerTOC"
+      spacing="none"
+    >
+      <Component />
+    </EuiDroppable>
+  </EuiDragDropContext>
+  <EuiSpacer
+    size="s"
+  />
+  <EuiTextAlign
+    textAlign="center"
+  >
+    <AddTooltipFieldPopover
+      fields={
+        Array [
+          Object {
+            "label": "ISO 3166-1 alpha-2 code",
+            "name": "iso2",
+            "type": "string",
+          },
+          Object {
+            "label": "foobar_label",
+            "name": "iso3",
+            "type": "string",
+          },
+        ]
+      }
+      onAdd={[Function]}
+      selectedFields={
+        Array [
+          Object {
+            "label": "foobar_label",
+            "name": "iso2",
+            "type": "foobar_type",
+          },
+        ]
+      }
+    />
+  </EuiTextAlign>
+</div>
+`;
diff --git a/x-pack/plugins/maps/public/components/__snapshots__/validated_range.test.js.snap b/x-pack/plugins/maps/public/components/__snapshots__/validated_range.test.js.snap
new file mode 100644
index 00000000000000..1faf4f0c1105c7
--- /dev/null
+++ b/x-pack/plugins/maps/public/components/__snapshots__/validated_range.test.js.snap
@@ -0,0 +1,72 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Should display error message when value is outside of range 1`] = `
+<div>
+  <EuiRange
+    compressed={false}
+    fullWidth={false}
+    isLoading={false}
+    levels={Array []}
+    max={10}
+    min={0}
+    onChange={[Function]}
+    showInput={false}
+    showLabels={false}
+    showRange={false}
+    showTicks={false}
+    showValue={false}
+    step={1}
+    value="11"
+  />
+  <EuiFormErrorText>
+    <FormattedMessage
+      defaultMessage="Must be between {min} and {max}"
+      id="xpack.maps.validatedRange.rangeErrorMessage"
+      values={
+        Object {
+          "max": 10,
+          "min": 0,
+        }
+      }
+    />
+  </EuiFormErrorText>
+</div>
+`;
+
+exports[`Should pass slider props to slider 1`] = `
+<EuiRange
+  compressed={false}
+  fullWidth={false}
+  isLoading={false}
+  levels={Array []}
+  max={10}
+  min={0}
+  onChange={[Function]}
+  showInput={true}
+  showLabels={true}
+  showRange={true}
+  showTicks={false}
+  showValue={false}
+  step={1}
+  value="3"
+/>
+`;
+
+exports[`Should render slider 1`] = `
+<EuiRange
+  compressed={false}
+  fullWidth={false}
+  isLoading={false}
+  levels={Array []}
+  max={10}
+  min={0}
+  onChange={[Function]}
+  showInput={false}
+  showLabels={false}
+  showRange={false}
+  showTicks={false}
+  showValue={false}
+  step={1}
+  value="3"
+/>
+`;
diff --git a/x-pack/plugins/maps/public/meta.test.js b/x-pack/plugins/maps/public/meta.test.js
index 64dd73fe109ff2..d83f2adb35ef7f 100644
--- a/x-pack/plugins/maps/public/meta.test.js
+++ b/x-pack/plugins/maps/public/meta.test.js
@@ -9,39 +9,24 @@ import { getEMSClient } from './meta';
 
 jest.mock('@elastic/ems-client');
 
-jest.mock('ui/chrome', () => ({
-  getBasePath: () => {
-    return '<basepath>';
-  },
-  getInjected(key) {
-    if (key === 'proxyElasticMapsServiceInMaps') {
-      return false;
-    } else if (key === 'isEmsEnabled') {
-      return true;
-    } else if (key === 'emsFileApiUrl') {
-      return 'https://file-api';
-    } else if (key === 'emsTileApiUrl') {
-      return 'https://tile-api';
-    }
-  },
-  getUiSettingsClient: () => {
-    return {
-      get: () => {
-        return '';
-      },
+describe('default use without proxy', () => {
+  beforeEach(() => {
+    require('./kibana_services').getInjectedVarFunc = () => key => {
+      if (key === 'proxyElasticMapsServiceInMaps') {
+        return false;
+      } else if (key === 'isEmsEnabled') {
+        return true;
+      } else if (key === 'emsFileApiUrl') {
+        return 'https://file-api';
+      } else if (key === 'emsTileApiUrl') {
+        return 'https://tile-api';
+      }
     };
-  },
-}));
-
-jest.mock('./kibana_services', () => {
-  return {
-    getLicenseId() {
+    require('./kibana_services').getLicenseId = () => {
       return 'foobarlicenseid';
-    },
-  };
-});
+    };
+  });
 
-describe('default use without proxy', () => {
   it('should construct EMSClient with absolute file and tile API urls', async () => {
     getEMSClient();
     const mockEmsClientCall = EMSClient.mock.calls[0];