diff --git a/src/Hosting.ts b/src/Hosting.ts
index 5cc2b1495..7a19c76f8 100644
--- a/src/Hosting.ts
+++ b/src/Hosting.ts
@@ -1,9 +1,21 @@
-import { Drawer } from '@material/mwc-drawer';
-import { ActionDetail, List } from '@material/mwc-list';
-import { ListItem } from '@material/mwc-list/mwc-list-item';
 import { html, property, query, TemplateResult } from 'lit-element';
 import { until } from 'lit-html/directives/until';
 import { translate } from 'lit-translate';
+
+import '@material/mwc-drawer';
+import '@material/mwc-icon';
+import '@material/mwc-icon-button';
+import '@material/mwc-linear-progress';
+import '@material/mwc-list';
+import '@material/mwc-list/mwc-list-item';
+import '@material/mwc-tab';
+import '@material/mwc-tab-bar';
+import '@material/mwc-top-app-bar-fixed';
+
+import { Drawer } from '@material/mwc-drawer';
+import { ActionDetail, List } from '@material/mwc-list';
+import { ListItem } from '@material/mwc-list/mwc-list-item';
+
 import { Mixin, newPendingStateEvent } from './foundation.js';
 import { LoggingElement } from './Logging.js';
 import { Plugin, PluggingElement, pluginIcons } from './Plugging.js';
diff --git a/src/Logging.ts b/src/Logging.ts
index e1fb80eb3..2b796ebd1 100644
--- a/src/Logging.ts
+++ b/src/Logging.ts
@@ -6,10 +6,20 @@ import {
   TemplateResult,
 } from 'lit-element';
 import { ifDefined } from 'lit-html/directives/if-defined';
+import { get, translate } from 'lit-translate';
 
+import '@material/mwc-button';
+import '@material/mwc-dialog';
+import '@material/mwc-icon';
+import '@material/mwc-icon-button';
+import '@material/mwc-icon-button-toggle';
+import '@material/mwc-list';
+import '@material/mwc-list/mwc-list-item';
+import '@material/mwc-snackbar';
 import { Dialog } from '@material/mwc-dialog';
 import { Snackbar } from '@material/mwc-snackbar';
 
+import './filtered-list.js';
 import {
   CommitEntry,
   ifImplemented,
@@ -25,7 +35,6 @@ import {
   OpenDocEvent,
   SclhistoryEntry,
 } from './foundation.js';
-import { get, translate } from 'lit-translate';
 import { getFilterIcon, iconColors } from './icons.js';
 import { Plugin } from './Plugging.js';
 
diff --git a/src/Plugging.ts b/src/Plugging.ts
index 2f2af7e59..608c5b8f0 100644
--- a/src/Plugging.ts
+++ b/src/Plugging.ts
@@ -4,16 +4,27 @@ import wrapHtml from 'carehtml';
 
 const html = wrapHtml(litHtml);
 
+import '@material/mwc-button';
+import '@material/mwc-dialog';
+import '@material/mwc-formfield';
+import '@material/mwc-icon';
+import '@material/mwc-list';
+import '@material/mwc-list/mwc-check-list-item';
+import '@material/mwc-list/mwc-list-item';
+import '@material/mwc-list/mwc-radio-list-item';
+import '@material/mwc-select';
+import '@material/mwc-switch';
+import '@material/mwc-textfield';
 import { Dialog } from '@material/mwc-dialog';
 import { List } from '@material/mwc-list';
+import { ListItem } from '@material/mwc-list/mwc-list-item';
+import { MultiSelectedEvent } from '@material/mwc-list/mwc-list-foundation';
 import { Select } from '@material/mwc-select';
 import { Switch } from '@material/mwc-switch';
 import { TextField } from '@material/mwc-textfield';
 
 import { ifImplemented, LitElementConstructor, Mixin } from './foundation.js';
 import { EditingElement } from './Editing.js';
-import { MultiSelectedEvent } from '@material/mwc-list/mwc-list-foundation';
-import { ListItem } from '@material/mwc-list/mwc-list-item';
 import { officialPlugins } from '../public/js/plugins.js';
 
 type PluginKind = 'editor' | 'menu' | 'validator';
diff --git a/src/Setting.ts b/src/Setting.ts
index cb48ac5ca..f587816c2 100644
--- a/src/Setting.ts
+++ b/src/Setting.ts
@@ -1,6 +1,12 @@
 import { html, property, query, TemplateResult } from 'lit-element';
 import { registerTranslateConfig, translate, use } from 'lit-translate';
 
+import '@material/mwc-button';
+import '@material/mwc-dialog';
+import '@material/mwc-formfield';
+import '@material/mwc-list/mwc-list-item';
+import '@material/mwc-select';
+import '@material/mwc-switch';
 import { Dialog } from '@material/mwc-dialog';
 import { Select } from '@material/mwc-select';
 import { Switch } from '@material/mwc-switch';
diff --git a/src/Waiting.ts b/src/Waiting.ts
index ecfb2d54d..45a73c28c 100644
--- a/src/Waiting.ts
+++ b/src/Waiting.ts
@@ -1,11 +1,12 @@
 import { html, property, TemplateResult } from 'lit-element';
 
+import '@material/mwc-circular-progress-four-color';
+
 import {
   LitElementConstructor,
   Mixin,
   PendingStateDetail,
   ifImplemented,
-  newLogEvent,
 } from './foundation.js';
 
 /** Mixin implementing
diff --git a/src/editor-container.ts b/src/editor-container.ts
index 5d3633c3a..0a34518ac 100644
--- a/src/editor-container.ts
+++ b/src/editor-container.ts
@@ -10,14 +10,16 @@ import {
 } from 'lit-element';
 import { classMap } from 'lit-html/directives/class-map';
 
-import { newWizardEvent, SCLTag, tags } from './foundation.js';
-
-import { emptyWizard, wizards } from './wizards/wizard-library.js';
-
+import '@material/mwc-icon-button';
+import '@material/mwc-list/mwc-list-item';
+import '@material/mwc-menu';
 import { Menu } from '@material/mwc-menu';
 import { IconButton } from '@material/mwc-icon-button';
 import { ListItem } from '@material/mwc-list/mwc-list-item';
 
+import { newWizardEvent, SCLTag, tags } from './foundation.js';
+import { emptyWizard, wizards } from './wizards/wizard-library.js';
+
 function childTags(element: Element | null | undefined): SCLTag[] {
   if (!element) return [];
 
diff --git a/src/editors/Communication.ts b/src/editors/Communication.ts
index edd0f173b..e7b4b0b36 100644
--- a/src/editors/Communication.ts
+++ b/src/editors/Communication.ts
@@ -1,14 +1,14 @@
 import { LitElement, html, TemplateResult, property, css } from 'lit-element';
 import { translate, get } from 'lit-translate';
 
+import '@material/mwc-fab';
+
 import {
   newWizardEvent,
   newActionEvent,
   createElement,
 } from '../foundation.js';
-
 import { selectors, styles } from './communication/foundation.js';
-
 import './communication/subnetwork-editor.js';
 import { subNetworkWizard } from './communication/subnetwork-editor.js';
 
diff --git a/src/editors/Substation.ts b/src/editors/Substation.ts
index 2d0d71b70..3a8bf271e 100644
--- a/src/editors/Substation.ts
+++ b/src/editors/Substation.ts
@@ -1,10 +1,11 @@
 import { LitElement, html, TemplateResult, property, css } from 'lit-element';
 import { get } from 'lit-translate';
 
-import { newWizardEvent } from '../foundation.js';
-import { wizards } from '../wizards/wizard-library.js';
+import '@material/mwc-fab';
 
 import '../zeroline-pane.js';
+import { newWizardEvent } from '../foundation.js';
+import { wizards } from '../wizards/wizard-library.js';
 
 /** An editor [[`plugin`]] for editing the `Substation` section. */
 export default class SubstationPlugin extends LitElement {
diff --git a/src/editors/Templates.ts b/src/editors/Templates.ts
index 28a548f0e..636afc59e 100644
--- a/src/editors/Templates.ts
+++ b/src/editors/Templates.ts
@@ -1,6 +1,12 @@
 import { LitElement, html, TemplateResult, property, css } from 'lit-element';
 import { translate } from 'lit-translate';
 
+import '@material/mwc-fab';
+import '@material/mwc-icon-button';
+import '@material/mwc-list';
+import '@material/mwc-list/mwc-list-item';
+
+import '../filtered-list.js';
 import {
   createElement,
   identity,
@@ -9,8 +15,6 @@ import {
 } from '../foundation.js';
 import { styles } from './templates/foundation.js';
 
-import '../filtered-list.js';
-
 import {
   createEnumTypeWizard,
   eNumTypeEditWizard,
diff --git a/src/editors/communication/connectedap-editor.ts b/src/editors/communication/connectedap-editor.ts
index 4fdd98eac..547cfc8c7 100644
--- a/src/editors/communication/connectedap-editor.ts
+++ b/src/editors/communication/connectedap-editor.ts
@@ -9,10 +9,18 @@ import {
 import { ifDefined } from 'lit-html/directives/if-defined';
 import { translate, get } from 'lit-translate';
 
+import '@material/mwc-checkbox';
+import '@material/mwc-fab';
+import '@material/mwc-formfield';
+import '@material/mwc-list/mwc-list-item';
+import '@material/mwc-list/mwc-check-list-item';
+import '@material/mwc-icon';
 import { Checkbox } from '@material/mwc-checkbox';
 import { List } from '@material/mwc-list';
 import { ListItemBase } from '@material/mwc-list/mwc-list-item-base';
 
+import '../../wizard-textfield.js';
+import '../../filtered-list.js';
 import {
   EditorAction,
   newWizardEvent,
@@ -25,7 +33,7 @@ import {
   createElement,
   ComplexAction,
 } from '../../foundation.js';
-
+import { selectors } from './foundation.js';
 import {
   getTypes,
   typePattern,
@@ -33,8 +41,6 @@ import {
   typeMaxLength,
 } from './p-types.js';
 
-import { selectors } from './foundation.js';
-
 /** Data needed to uniquely identify an `AccessPoint` */
 interface apAttributes {
   iedName: string;
diff --git a/src/editors/communication/subnetwork-editor.ts b/src/editors/communication/subnetwork-editor.ts
index 9d1efbe0c..3d07e7afd 100644
--- a/src/editors/communication/subnetwork-editor.ts
+++ b/src/editors/communication/subnetwork-editor.ts
@@ -8,6 +8,10 @@ import {
 } from 'lit-element';
 import { translate, get } from 'lit-translate';
 
+import '@material/mwc-icon-button';
+
+import '../../wizard-textfield.js';
+import './connectedap-editor.js';
 import {
   EditorAction,
   newWizardEvent,
@@ -22,10 +26,7 @@ import {
   createElement,
   cloneElement,
 } from '../../foundation.js';
-
 import { styles, WizardOptions, isCreateOptions } from './foundation.js';
-
-import './connectedap-editor.js';
 import { createConnectedApWizard } from './connectedap-editor.js';
 
 /** Initial attribute values suggested for `SubNetwork` creation */
diff --git a/src/editors/substation/guess-wizard.ts b/src/editors/substation/guess-wizard.ts
index 81456ad39..319ec39f1 100644
--- a/src/editors/substation/guess-wizard.ts
+++ b/src/editors/substation/guess-wizard.ts
@@ -1,6 +1,9 @@
-import { html } from 'lit-html';
+import { html } from 'lit-element';
 import { get, translate } from 'lit-translate';
 
+import '@material/mwc-list';
+import '@material/mwc-list/mwc-check-list-item';
+
 import { List } from '@material/mwc-list';
 import { ListItemBase } from '@material/mwc-list/mwc-list-item-base';
 
diff --git a/src/editors/templates/datype-wizards.ts b/src/editors/templates/datype-wizards.ts
index e6796046b..966360c6b 100644
--- a/src/editors/templates/datype-wizards.ts
+++ b/src/editors/templates/datype-wizards.ts
@@ -1,6 +1,16 @@
 import { html } from 'lit-element';
 import { get, translate } from 'lit-translate';
 
+import '@material/mwc-button';
+import '@material/mwc-list';
+import '@material/mwc-list/mwc-list-item';
+import '@material/mwc-select';
+import { List } from '@material/mwc-list';
+import { ListItem } from '@material/mwc-list/mwc-list-item';
+import { Select } from '@material/mwc-select';
+import { SingleSelectedEvent } from '@material/mwc-list/mwc-list-foundation';
+
+import '../../wizard-textfield.js';
 import {
   Create,
   EditorAction,
@@ -14,6 +24,7 @@ import {
   WizardActor,
   WizardInput,
 } from '../../foundation.js';
+import { createBDAWizard, editBDAWizard } from '../../wizards/bda.js';
 import {
   addReferencedDataTypes,
   allDataTypeSelector,
@@ -21,12 +32,6 @@ import {
   updateIDNamingAction,
 } from './foundation.js';
 
-import { List } from '@material/mwc-list';
-import { ListItem } from '@material/mwc-list/mwc-list-item';
-import { Select } from '@material/mwc-select';
-import { SingleSelectedEvent } from '@material/mwc-list/mwc-list-foundation';
-import { createBDAWizard, editBDAWizard } from '../../wizards/bda.js';
-
 export function editDaTypeWizard(
   dATypeIdentity: string,
   doc: XMLDocument
diff --git a/src/editors/templates/dotype-wizards.ts b/src/editors/templates/dotype-wizards.ts
index d3d41f938..185e3f2c1 100644
--- a/src/editors/templates/dotype-wizards.ts
+++ b/src/editors/templates/dotype-wizards.ts
@@ -1,6 +1,16 @@
 import { html } from 'lit-html';
 import { get, translate } from 'lit-translate';
 
+import '@material/mwc-button';
+import '@material/mwc-list';
+import '@material/mwc-list/mwc-list-item';
+import '@material/mwc-select';
+import { Select } from '@material/mwc-select';
+import { SingleSelectedEvent } from '@material/mwc-list/mwc-list-foundation';
+import { ListItem } from '@material/mwc-list/mwc-list-item';
+import { List } from '@material/mwc-list';
+
+import '../../wizard-textfield.js';
 import {
   cloneElement,
   Create,
@@ -16,7 +26,8 @@ import {
   WizardActor,
   WizardInput,
 } from '../../foundation.js';
-
+import { createDaWizard, editDAWizard } from '../../wizards/da.js';
+import { patterns } from '../../wizards/foundation/limits.js';
 import {
   addReferencedDataTypes,
   allDataTypeSelector,
@@ -26,13 +37,6 @@ import {
   WizardOptions,
 } from './foundation.js';
 
-import { Select } from '@material/mwc-select';
-import { SingleSelectedEvent } from '@material/mwc-list/mwc-list-foundation';
-import { ListItem } from '@material/mwc-list/mwc-list-item';
-import { List } from '@material/mwc-list';
-import { createDaWizard, editDAWizard } from '../../wizards/da.js';
-import { patterns } from '../../wizards/foundation/limits.js';
-
 function updateSDoAction(element: Element): WizardActor {
   return (inputs: WizardInput[]): EditorAction[] => {
     const name = getValue(inputs.find(i => i.label === 'name')!)!;
diff --git a/src/editors/templates/enumtype-wizard.ts b/src/editors/templates/enumtype-wizard.ts
index 50f7da39f..17b230734 100644
--- a/src/editors/templates/enumtype-wizard.ts
+++ b/src/editors/templates/enumtype-wizard.ts
@@ -1,6 +1,16 @@
 import { html } from 'lit-element';
 import { get, translate } from 'lit-translate';
 
+import '@material/mwc-button';
+import '@material/mwc-list';
+import '@material/mwc-list/mwc-list-item';
+import '@material/mwc-select';
+import { List } from '@material/mwc-list';
+import { ListItem } from '@material/mwc-list/mwc-list-item';
+import { SingleSelectedEvent } from '@material/mwc-list/mwc-list-foundation';
+import { Select } from '@material/mwc-select';
+
+import '../../wizard-textfield.js';
 import {
   cloneElement,
   createElement,
@@ -23,11 +33,6 @@ import {
   WizardOptions,
 } from './foundation.js';
 
-import { List } from '@material/mwc-list';
-import { ListItem } from '@material/mwc-list/mwc-list-item';
-import { SingleSelectedEvent } from '@material/mwc-list/mwc-list-foundation';
-import { Select } from '@material/mwc-select';
-
 function nextOrd(parent: Element): string {
   const maxOrd = Math.max(
     ...Array.from(parent.children).map(child =>
diff --git a/src/editors/templates/foundation.ts b/src/editors/templates/foundation.ts
index 4030d999e..d9a8501f4 100644
--- a/src/editors/templates/foundation.ts
+++ b/src/editors/templates/foundation.ts
@@ -1,6 +1,8 @@
 import { css, html, TemplateResult } from 'lit-element';
 import { ifDefined } from 'lit-html/directives/if-defined';
 
+import '@material/mwc-list/mwc-list-item';
+
 import {
   cloneElement,
   Create,
diff --git a/src/editors/templates/lnodetype-wizard.ts b/src/editors/templates/lnodetype-wizard.ts
index a1c33292e..c12e4f92f 100644
--- a/src/editors/templates/lnodetype-wizard.ts
+++ b/src/editors/templates/lnodetype-wizard.ts
@@ -1,6 +1,17 @@
 import { html } from 'lit-element';
 import { get, translate } from 'lit-translate';
 
+import '@material/mwc-button';
+import '@material/mwc-list';
+import '@material/mwc-list/mwc-list-item';
+import '@material/mwc-select';
+import { List } from '@material/mwc-list';
+import { ListItem } from '@material/mwc-list/mwc-list-item';
+import { Select } from '@material/mwc-select';
+import { SingleSelectedEvent } from '@material/mwc-list/mwc-list-foundation';
+
+import '../../wizard-textfield.js';
+import '../../wizard-select.js';
 import {
   cloneElement,
   Create,
@@ -18,6 +29,7 @@ import {
   WizardActor,
   WizardInput,
 } from '../../foundation.js';
+import { WizardSelect } from '../../wizard-select.js';
 import {
   addReferencedDataTypes,
   allDataTypeSelector,
@@ -28,12 +40,6 @@ import {
   WizardOptions,
 } from './foundation.js';
 
-import { List } from '@material/mwc-list';
-import { ListItem } from '@material/mwc-list/mwc-list-item';
-import { Select } from '@material/mwc-select';
-import { SingleSelectedEvent } from '@material/mwc-list/mwc-list-foundation';
-import { WizardSelect } from '../../wizard-select.js';
-
 function updateDoAction(element: Element): WizardActor {
   return (inputs: WizardInput[]): EditorAction[] => {
     const name = getValue(inputs.find(i => i.label === 'name')!)!;
diff --git a/src/filtered-list.ts b/src/filtered-list.ts
index dd59d4d36..d239da9af 100644
--- a/src/filtered-list.ts
+++ b/src/filtered-list.ts
@@ -10,6 +10,9 @@ import {
 } from 'lit-element';
 import { translate } from 'lit-translate';
 
+import '@material/mwc-checkbox';
+import '@material/mwc-formfield';
+import '@material/mwc-textfield';
 import { CheckListItem } from '@material/mwc-list/mwc-check-list-item';
 import { List } from '@material/mwc-list';
 import { ListBase } from '@material/mwc-list/mwc-list-base';
diff --git a/src/finder-list.ts b/src/finder-list.ts
index e7a600c7d..51963a923 100644
--- a/src/finder-list.ts
+++ b/src/finder-list.ts
@@ -10,10 +10,14 @@ import {
 import { until } from 'lit-html/directives/until';
 import { translate } from 'lit-translate';
 
+import '@material/mwc-icon';
+import '@material/mwc-list';
+import '@material/mwc-list/mwc-list-item';
 import { List } from '@material/mwc-list';
 import { SingleSelectedEvent } from '@material/mwc-list/mwc-list-foundation';
 import { ListItem } from '@material/mwc-list/mwc-list-item';
 
+import './filtered-list.js';
 import { depth } from './foundation.js';
 import { ifDefined } from 'lit-html/directives/if-defined';
 
diff --git a/src/menu/Help.ts b/src/menu/Help.ts
index ac998a902..f28ac67c9 100644
--- a/src/menu/Help.ts
+++ b/src/menu/Help.ts
@@ -1,11 +1,12 @@
 import { html, LitElement } from 'lit-element';
 import { unsafeHTML } from 'lit-html/directives/unsafe-html';
-
 import marked from 'marked';
 
+import '@material/mwc-icon';
+
+import '../finder-list.js';
 import { newWizardEvent, Wizard } from '../foundation.js';
 import { openSCDIcon } from '../icons.js';
-
 import { Directory } from '../finder-list.js';
 
 function aboutBox(version: string) {
diff --git a/src/menu/ImportIEDs.ts b/src/menu/ImportIEDs.ts
index 5d89dff6e..d96db4966 100644
--- a/src/menu/ImportIEDs.ts
+++ b/src/menu/ImportIEDs.ts
@@ -1,7 +1,11 @@
-import { List } from '@material/mwc-list';
-import { ListItemBase } from '@material/mwc-list/mwc-list-item-base';
 import { css, html, LitElement, query, TemplateResult } from 'lit-element';
 import { get } from 'lit-translate';
+
+import '@material/mwc-list/mwc-check-list-item';
+import { List } from '@material/mwc-list';
+import { ListItemBase } from '@material/mwc-list/mwc-list-item-base';
+
+import '../filtered-list.js';
 import {
   createElement,
   EditorAction,
diff --git a/src/menu/NewProject.ts b/src/menu/NewProject.ts
index 58ac14214..d738bb47b 100644
--- a/src/menu/NewProject.ts
+++ b/src/menu/NewProject.ts
@@ -1,8 +1,11 @@
 import { html, LitElement } from 'lit-element';
 import { get } from 'lit-translate';
 
+import '@material/mwc-list';
+import '@material/mwc-list/mwc-radio-list-item';
 import { ListItemBase } from '@material/mwc-list/mwc-list-item-base';
 
+import '../wizard-textfield.js';
 import {
   EditorAction,
   newLogEvent,
diff --git a/src/menu/UpdateDescriptionABB.ts b/src/menu/UpdateDescriptionABB.ts
index b775a5b94..06cb1ace5 100644
--- a/src/menu/UpdateDescriptionABB.ts
+++ b/src/menu/UpdateDescriptionABB.ts
@@ -1,6 +1,11 @@
 import { html, LitElement } from 'lit-element';
 import { get } from 'lit-translate';
 
+import '@material/mwc-list/mwc-check-list-item';
+import { List } from '@material/mwc-list';
+import { ListItemBase } from '@material/mwc-list/mwc-list-item-base';
+
+import '../filtered-list.js';
 import {
   cloneElement,
   identity,
@@ -14,9 +19,6 @@ import {
   WizardInput,
 } from '../foundation.js';
 
-import { List } from '@material/mwc-list';
-import { ListItemBase } from '@material/mwc-list/mwc-list-item-base';
-
 interface addDescItem {
   desc: string;
   tag: SCLTag;
diff --git a/src/open-scd.ts b/src/open-scd.ts
index e99355dfe..170cc002b 100644
--- a/src/open-scd.ts
+++ b/src/open-scd.ts
@@ -7,35 +7,7 @@ import {
   TemplateResult,
 } from 'lit-element';
 
-import '@material/mwc-button';
-import '@material/mwc-checkbox';
-import '@material/mwc-circular-progress-four-color';
-import '@material/mwc-dialog';
-import '@material/mwc-drawer';
-import '@material/mwc-fab';
-import '@material/mwc-formfield';
-import '@material/mwc-icon';
-import '@material/mwc-icon-button';
-import '@material/mwc-icon-button-toggle';
-import '@material/mwc-linear-progress';
-import '@material/mwc-list';
-import '@material/mwc-list/mwc-check-list-item';
-import '@material/mwc-list/mwc-list-item';
-import '@material/mwc-list/mwc-radio-list-item';
-import '@material/mwc-menu';
-import '@material/mwc-select';
-import '@material/mwc-snackbar';
-import '@material/mwc-switch';
-import '@material/mwc-tab';
-import '@material/mwc-tab-bar';
-import '@material/mwc-textfield';
-import '@material/mwc-top-app-bar-fixed';
-
-import './filtered-list.js';
-import './finder-list.js';
-import './wizard-dialog.js';
-import './wizard-textfield.js';
-import './wizard-select.js';
+import { ListItem } from '@material/mwc-list/mwc-list-item';
 
 import { newOpenDocEvent, newPendingStateEvent } from './foundation.js';
 import { getTheme } from './themes.js';
@@ -48,8 +20,6 @@ import { Setting } from './Setting.js';
 import { Waiting } from './Waiting.js';
 import { Wizarding } from './Wizarding.js';
 
-import { ListItem } from '@material/mwc-list/mwc-list-item';
-
 /** The `<open-scd>` custom element is the main entry point of the
  * Open Substation Configuration Designer. */
 @customElement('open-scd')
diff --git a/src/wizard-dialog.ts b/src/wizard-dialog.ts
index 3638b272d..f19c2b1ad 100644
--- a/src/wizard-dialog.ts
+++ b/src/wizard-dialog.ts
@@ -10,11 +10,13 @@ import {
 } from 'lit-element';
 import { get, translate } from 'lit-translate';
 
+import '@material/mwc-button';
+import '@material/mwc-dialog';
+import '@material/mwc-icon-button-toggle';
 import { Dialog } from '@material/mwc-dialog';
 import { List } from '@material/mwc-list';
 
 import 'ace-custom-element';
-import './wizard-textfield.js';
 import {
   newActionEvent,
   Wizard,
diff --git a/src/wizard-select.ts b/src/wizard-select.ts
index fd7e5db07..b97dc0ef1 100644
--- a/src/wizard-select.ts
+++ b/src/wizard-select.ts
@@ -6,8 +6,8 @@ import {
   query,
   TemplateResult,
 } from 'lit-element';
-import { get } from 'lit-translate';
 
+import '@material/mwc-switch';
 import { Switch } from '@material/mwc-switch';
 import { Select } from '@material/mwc-select';
 
diff --git a/src/wizard-textfield.ts b/src/wizard-textfield.ts
index b8d25e4b0..9ea5b776b 100644
--- a/src/wizard-textfield.ts
+++ b/src/wizard-textfield.ts
@@ -8,6 +8,10 @@ import {
 } from 'lit-element';
 import { translate, get } from 'lit-translate';
 
+import '@material/mwc-icon-button';
+import '@material/mwc-list/mwc-list-item';
+import '@material/mwc-menu';
+import '@material/mwc-switch';
 import { IconButton } from '@material/mwc-icon-button';
 import { Menu } from '@material/mwc-menu';
 import { SingleSelectedEvent } from '@material/mwc-list/mwc-list-foundation';
diff --git a/src/wizards.ts b/src/wizards.ts
index 86a8a851a..9f0bd9527 100644
--- a/src/wizards.ts
+++ b/src/wizards.ts
@@ -1,8 +1,13 @@
-import { ListItem } from '@material/mwc-list/mwc-list-item';
 import { html } from 'lit-element';
 import { repeat } from 'lit-html/directives/repeat';
 import { get, translate } from 'lit-translate';
 
+import '@material/mwc-icon';
+import '@material/mwc-list';
+import '@material/mwc-list/mwc-check-list-item';
+import '@material/mwc-list/mwc-list-item';
+import { ListItem } from '@material/mwc-list/mwc-list-item';
+
 import {
   EditorAction,
   identity,
diff --git a/src/wizards/abstractda.ts b/src/wizards/abstractda.ts
index f99d1f234..8337e24b7 100644
--- a/src/wizards/abstractda.ts
+++ b/src/wizards/abstractda.ts
@@ -1,17 +1,19 @@
 import { html, render, TemplateResult } from 'lit-html';
 import { translate } from 'lit-translate';
 
-import { createElement, EditorAction } from '../foundation.js';
-import { maxLength, patterns } from './foundation/limits.js';
-import { predefinedBasicTypeEnum, valKindEnum } from './foundation/enums.js';
-
-import { WizardSelect } from '../wizard-select.js';
-import { WizardTextField } from '../wizard-textfield.js';
-
+import '@material/mwc-list/mwc-list-item';
 import { ListItem } from '@material/mwc-list/mwc-list-item';
 import { SelectedEvent } from '@material/mwc-list/mwc-list-foundation';
 import { Select } from '@material/mwc-select';
 
+import '../wizard-select.js';
+import '../wizard-textfield.js';
+import { createElement, EditorAction } from '../foundation.js';
+import { WizardSelect } from '../wizard-select.js';
+import { WizardTextField } from '../wizard-textfield.js';
+import { maxLength, patterns } from './foundation/limits.js';
+import { predefinedBasicTypeEnum, valKindEnum } from './foundation/enums.js';
+
 function selectType(e: SelectedEvent, data: Element, Val: string | null): void {
   const typeSelected = (<Select>e.target).selected?.value;
   const selectedBType = (<WizardSelect>(
diff --git a/src/wizards/address.ts b/src/wizards/address.ts
index 424ee2625..addee466d 100644
--- a/src/wizards/address.ts
+++ b/src/wizards/address.ts
@@ -2,6 +2,10 @@ import { html, TemplateResult } from 'lit-html';
 import { ifDefined } from 'lit-html/directives/if-defined';
 import { translate } from 'lit-translate';
 
+import '@material/mwc-checkbox';
+import '@material/mwc-formfield';
+
+import '../wizard-textfield.js';
 import {
   Create,
   createElement,
diff --git a/src/wizards/bay.ts b/src/wizards/bay.ts
index 832281437..8416f6c23 100644
--- a/src/wizards/bay.ts
+++ b/src/wizards/bay.ts
@@ -1,6 +1,7 @@
 import { html, TemplateResult } from 'lit-html';
 import { get, translate } from 'lit-translate';
 
+import '../wizard-textfield.js';
 import {
   createElement,
   EditorAction,
diff --git a/src/wizards/bda.ts b/src/wizards/bda.ts
index abdc459e0..24f599b08 100644
--- a/src/wizards/bda.ts
+++ b/src/wizards/bda.ts
@@ -1,6 +1,8 @@
 import { html } from 'lit-html';
 import { get, translate } from 'lit-translate';
 
+import '@material/mwc-button';
+
 import {
   cloneElement,
   createElement,
@@ -13,7 +15,6 @@ import {
   WizardActor,
   WizardInput,
 } from '../foundation.js';
-
 import { getValAction, wizardContent } from './abstractda.js';
 
 export function updateBDaAction(element: Element): WizardActor {
diff --git a/src/wizards/clientln.ts b/src/wizards/clientln.ts
index a6889a0ad..ea95da88f 100644
--- a/src/wizards/clientln.ts
+++ b/src/wizards/clientln.ts
@@ -1,6 +1,12 @@
 import { html } from 'lit-element';
 import { get } from 'lit-translate';
 
+import '@material/mwc-list/mwc-check-list-item';
+import '@material/mwc-icon';
+import { List } from '@material/mwc-list';
+import { ListItemBase } from '@material/mwc-list/mwc-list-item-base';
+
+import '../filtered-list.js';
 import {
   createElement,
   identity,
@@ -11,12 +17,8 @@ import {
   WizardActor,
   WizardInput,
 } from '../foundation.js';
-
-import { List } from '@material/mwc-list';
-import { ListItemBase } from '@material/mwc-list/mwc-list-item-base';
-
-import { openCommunicationMappingWizard } from './commmap-wizards.js';
 import { clientIcon } from '../icons.js';
+import { openCommunicationMappingWizard } from './commmap-wizards.js';
 
 function getPath(identity: string | number): string {
   if (typeof identity !== 'string') return '';
diff --git a/src/wizards/commmap-wizards.ts b/src/wizards/commmap-wizards.ts
index 98d24dbdf..577c50659 100644
--- a/src/wizards/commmap-wizards.ts
+++ b/src/wizards/commmap-wizards.ts
@@ -1,7 +1,11 @@
 import { html } from 'lit-element';
 import { get } from 'lit-translate';
 
+import '@material/mwc-icon';
+import '@material/mwc-list/mwc-list-item';
 import { SingleSelectedEvent } from '@material/mwc-list/mwc-list-foundation';
+
+import '../filtered-list.js';
 import {
   findControlBlocks,
   identity,
diff --git a/src/wizards/conductingequipment.ts b/src/wizards/conductingequipment.ts
index 40c8820ab..9cb7291da 100644
--- a/src/wizards/conductingequipment.ts
+++ b/src/wizards/conductingequipment.ts
@@ -1,6 +1,10 @@
 import { html, TemplateResult } from 'lit-element';
 import { get, translate } from 'lit-translate';
 
+import '@material/mwc-list/mwc-list-item';
+import '@material/mwc-select';
+
+import '../wizard-textfield.js';
 import {
   createElement,
   EditorAction,
diff --git a/src/wizards/controlwithiedname.ts b/src/wizards/controlwithiedname.ts
index 2763edaaa..57d3feec0 100644
--- a/src/wizards/controlwithiedname.ts
+++ b/src/wizards/controlwithiedname.ts
@@ -1,5 +1,12 @@
 import { html } from 'lit-element';
 import { get } from 'lit-translate';
+
+import '@material/mwc-icon';
+import '@material/mwc-list';
+import '@material/mwc-list/mwc-check-list-item';
+import { List } from '@material/mwc-list';
+
+import '../filtered-list.js';
 import {
   createElement,
   EditorAction,
@@ -11,8 +18,6 @@ import {
   WizardInput,
 } from '../foundation.js';
 
-import { List } from '@material/mwc-list';
-
 import { inputIcon } from '../icons.js';
 import {
   getSourceReferences,
diff --git a/src/wizards/da.ts b/src/wizards/da.ts
index 3823057c0..56a641809 100644
--- a/src/wizards/da.ts
+++ b/src/wizards/da.ts
@@ -1,6 +1,10 @@
 import { html, TemplateResult } from 'lit-html';
 import { get, translate } from 'lit-translate';
 
+import '@material/mwc-button';
+import '@material/mwc-list/mwc-list-item';
+
+import '../wizard-select.js';
 import {
   cloneElement,
   createElement,
@@ -13,7 +17,6 @@ import {
   WizardActor,
   WizardInput,
 } from '../foundation.js';
-
 import { getValAction, wizardContent } from './abstractda.js';
 import { functionalConstraintEnum } from './foundation/enums.js';
 
diff --git a/src/wizards/dataset.ts b/src/wizards/dataset.ts
index c30cc8f14..7bf27bc6b 100644
--- a/src/wizards/dataset.ts
+++ b/src/wizards/dataset.ts
@@ -2,6 +2,11 @@ import { CheckListItem } from '@material/mwc-list/mwc-check-list-item';
 import { html } from 'lit-element';
 import { get, translate } from 'lit-translate';
 
+import '@material/mwc-button';
+import '@material/mwc-list/mwc-check-list-item';
+
+import '../wizard-textfield.js';
+import '../filtered-list.js';
 import {
   cloneElement,
   getValue,
diff --git a/src/wizards/fcda.ts b/src/wizards/fcda.ts
index e143a8f00..d8b418966 100644
--- a/src/wizards/fcda.ts
+++ b/src/wizards/fcda.ts
@@ -1,6 +1,7 @@
 import { html } from 'lit-element';
 import { get, translate } from 'lit-translate';
 
+import '../finder-list.js';
 import {
   createElement,
   identity,
@@ -11,7 +12,6 @@ import {
   WizardInput,
 } from '../foundation.js';
 import { getChildren } from './foundation/functions.js';
-
 import { Directory, FinderList } from '../finder-list.js';
 
 function newFCDA(parent: Element, path: string[]): Element | undefined {
diff --git a/src/wizards/gse.ts b/src/wizards/gse.ts
index 484dc9fb1..a39d5fcdf 100644
--- a/src/wizards/gse.ts
+++ b/src/wizards/gse.ts
@@ -1,6 +1,9 @@
 import { html } from 'lit-element';
 import { get } from 'lit-translate';
 
+import { Checkbox } from '@material/mwc-checkbox';
+
+import '../wizard-textfield.js';
 import {
   ComplexAction,
   createElement,
@@ -12,11 +15,8 @@ import {
   WizardActor,
   WizardInput,
 } from '../foundation.js';
-
 import { renderGseSmvAddress, updateAddress } from './address.js';
 
-import { Checkbox } from '@material/mwc-checkbox';
-
 export function getMTimeAction(
   type: 'MinTime' | 'MaxTime',
   oldTime: Element | null,
diff --git a/src/wizards/gsecontrol.ts b/src/wizards/gsecontrol.ts
index e0ef293ba..14f8923bf 100644
--- a/src/wizards/gsecontrol.ts
+++ b/src/wizards/gsecontrol.ts
@@ -1,10 +1,15 @@
 import { html, TemplateResult } from 'lit-element';
 import { get, translate } from 'lit-translate';
 
+import '@material/mwc-button';
+import '@material/mwc-list/mwc-list-item';
 import { List } from '@material/mwc-list';
 import { ListItem } from '@material/mwc-list/mwc-list-item';
 import { SingleSelectedEvent } from '@material/mwc-list/mwc-list-foundation';
 
+import '../filtered-list.js';
+import '../wizard-select.js';
+import '../wizard-textfield.js';
 import {
   cloneElement,
   Delete,
@@ -20,7 +25,6 @@ import {
   WizardInput,
 } from '../foundation.js';
 import { maxLength, patterns } from './foundation/limits.js';
-
 import { editDataSetWizard } from './dataset.js';
 import { editGseWizard } from './gse.js';
 
diff --git a/src/wizards/lnode.ts b/src/wizards/lnode.ts
index 974ca5ba7..ab2d497d8 100644
--- a/src/wizards/lnode.ts
+++ b/src/wizards/lnode.ts
@@ -1,6 +1,15 @@
 import { html, render, TemplateResult } from 'lit-html';
 import { get, translate } from 'lit-translate';
 
+import '@material/mwc-icon';
+import '@material/mwc-list/mwc-check-list-item';
+import '@material/mwc-list/mwc-list-item';
+import { List } from '@material/mwc-list';
+import { ListBase } from '@material/mwc-list/mwc-list-base';
+import { ListItem } from '@material/mwc-list/mwc-list-item';
+import { MultiSelectedEvent } from '@material/mwc-list/mwc-list-foundation';
+
+import '../filtered-list.js';
 import {
   createElement,
   EditorAction,
@@ -14,11 +23,6 @@ import {
   WizardInput,
 } from '../foundation.js';
 
-import { List } from '@material/mwc-list';
-import { ListBase } from '@material/mwc-list/mwc-list-base';
-import { ListItem } from '@material/mwc-list/mwc-list-item';
-import { MultiSelectedEvent } from '@material/mwc-list/mwc-list-foundation';
-
 /** Description of a `ListItem` representing an `IED` or `LN[0]` */
 interface ItemDescription {
   selected: boolean;
diff --git a/src/wizards/substation.ts b/src/wizards/substation.ts
index d34d089fc..2f43537f0 100644
--- a/src/wizards/substation.ts
+++ b/src/wizards/substation.ts
@@ -1,6 +1,10 @@
 import { html, TemplateResult } from 'lit-element';
 import { get, translate } from 'lit-translate';
 
+import '@material/mwc-checkbox';
+import '@material/mwc-formfield';
+
+import '../wizard-textfield.js';
 import {
   createElement,
   EditorAction,
@@ -11,7 +15,6 @@ import {
   WizardInput,
 } from '../foundation.js';
 import { updateNamingAction } from './foundation/actions.js';
-
 import { guessVoltageLevel } from '../editors/substation/guess-wizard.js';
 
 function render(
diff --git a/src/wizards/voltagelevel.ts b/src/wizards/voltagelevel.ts
index 063817c33..ba3739147 100644
--- a/src/wizards/voltagelevel.ts
+++ b/src/wizards/voltagelevel.ts
@@ -1,6 +1,7 @@
 import { html, TemplateResult } from 'lit-html';
 import { get, translate } from 'lit-translate';
 
+import '../wizard-textfield.js';
 import {
   cloneElement,
   createElement,
diff --git a/src/zeroline-pane.ts b/src/zeroline-pane.ts
index 75abf52de..5ebadce51 100644
--- a/src/zeroline-pane.ts
+++ b/src/zeroline-pane.ts
@@ -9,18 +9,20 @@ import {
 } from 'lit-element';
 import { translate } from 'lit-translate';
 
-import { isPublic, newWizardEvent } from './foundation.js';
-import { getAttachedIeds } from './zeroline/foundation.js';
+import '@material/mwc-icon-button';
+import '@material/mwc-icon-button-toggle';
+import { IconButton } from '@material/mwc-icon-button';
+import { IconButtonToggle } from '@material/mwc-icon-button-toggle';
 
 import './zeroline/substation-editor.js';
 import './zeroline/ied-editor.js';
 import { Settings } from './Setting.js';
-import { wizards } from './wizards/wizard-library.js';
 import { communicationMappingWizard } from './wizards/commmap-wizards.js';
-import { IconButton } from '@material/mwc-icon-button';
-import { IconButtonToggle } from '@material/mwc-icon-button-toggle';
-import { selectGseControlWizard } from './wizards/gsecontrol.js';
 import { gooseIcon } from './icons.js';
+import { isPublic, newWizardEvent } from './foundation.js';
+import { selectGseControlWizard } from './wizards/gsecontrol.js';
+import { wizards } from './wizards/wizard-library.js';
+import { getAttachedIeds } from './zeroline/foundation.js';
 
 function shouldShowIEDs(): boolean {
   return localStorage.getItem('showieds') === 'on';
diff --git a/src/zeroline/bay-editor.ts b/src/zeroline/bay-editor.ts
index 62b115383..a25d496f8 100644
--- a/src/zeroline/bay-editor.ts
+++ b/src/zeroline/bay-editor.ts
@@ -8,17 +8,19 @@ import {
 } from 'lit-element';
 import { translate } from 'lit-translate';
 
-import { startMove, styles, cloneSubstationElement } from './foundation.js';
+import '@material/mwc-icon-button';
+
+import '../editor-container.js';
+import './ied-editor.js';
+import './conducting-equipment-editor.js';
 import {
   getChildElementsByTagName,
   newActionEvent,
   newWizardEvent,
 } from '../foundation.js';
-
 import { wizards } from '../wizards/wizard-library.js';
-
 import { VoltageLevelEditor } from './voltage-level-editor.js';
-import './conducting-equipment-editor.js';
+import { startMove, styles, cloneSubstationElement } from './foundation.js';
 
 /** [[`SubstationEditor`]] subeditor for a `Bay` element. */
 @customElement('bay-editor')
diff --git a/src/zeroline/conducting-equipment-editor.ts b/src/zeroline/conducting-equipment-editor.ts
index 2f51d3100..b96ec116b 100644
--- a/src/zeroline/conducting-equipment-editor.ts
+++ b/src/zeroline/conducting-equipment-editor.ts
@@ -7,9 +7,9 @@ import {
   TemplateResult,
 } from 'lit-element';
 
-import { startMove } from './foundation.js';
-import { newActionEvent, newWizardEvent } from '../foundation.js';
+import '@material/mwc-fab';
 
+import { newActionEvent, newWizardEvent } from '../foundation.js';
 import {
   circuitBreakerIcon,
   currentTransformerIcon,
@@ -18,9 +18,9 @@ import {
   generalConductingEquipmentIcon,
   voltageTransformerIcon,
 } from '../icons.js';
-
-import { BayEditor } from './bay-editor.js';
 import { wizards } from '../wizards/wizard-library.js';
+import { startMove } from './foundation.js';
+import { BayEditor } from './bay-editor.js';
 
 function typeStr(condEq: Element): string {
   return condEq.getAttribute('type') === 'DIS' &&
diff --git a/src/zeroline/ied-editor.ts b/src/zeroline/ied-editor.ts
index e61b5548e..02ed1ef2b 100644
--- a/src/zeroline/ied-editor.ts
+++ b/src/zeroline/ied-editor.ts
@@ -7,12 +7,15 @@ import {
   query,
   TemplateResult,
 } from 'lit-element';
-import { newWizardEvent } from '../foundation.js';
-import { createClientLnWizard } from '../wizards/clientln.js';
 
+import '@material/mwc-fab';
+import '@material/mwc-icon';
 import { Fab } from '@material/mwc-fab';
-import { selectGseControlWizard } from '../wizards/gsecontrol.js';
+
+import { createClientLnWizard } from '../wizards/clientln.js';
 import { gooseIcon } from '../icons.js';
+import { newWizardEvent } from '../foundation.js';
+import { selectGseControlWizard } from '../wizards/gsecontrol.js';
 
 /** [[`SubstationEditor`]] subeditor for a `ConductingEquipment` element. */
 @customElement('ied-editor')
diff --git a/src/zeroline/substation-editor.ts b/src/zeroline/substation-editor.ts
index e31616bec..e8dd69ffc 100644
--- a/src/zeroline/substation-editor.ts
+++ b/src/zeroline/substation-editor.ts
@@ -8,7 +8,13 @@ import {
 } from 'lit-element';
 import { translate } from 'lit-translate';
 
+import '@material/mwc-icon-button';
+
+import '../editor-container.js';
+import './ied-editor.js';
+import './voltage-level-editor.js';
 import { newActionEvent, newWizardEvent } from '../foundation.js';
+import { wizards } from '../wizards/wizard-library.js';
 import {
   cloneSubstationElement,
   selectors,
@@ -16,11 +22,6 @@ import {
   styles,
 } from './foundation.js';
 
-import { wizards } from '../wizards/wizard-library.js';
-
-import './voltage-level-editor.js';
-import '../editor-container.js';
-
 /** [[`Substation`]] plugin subeditor for editing `Substation` sections. */
 @customElement('substation-editor')
 export class SubstationEditor extends LitElement {
diff --git a/src/zeroline/voltage-level-editor.ts b/src/zeroline/voltage-level-editor.ts
index 091bf73e5..a6e6c5814 100644
--- a/src/zeroline/voltage-level-editor.ts
+++ b/src/zeroline/voltage-level-editor.ts
@@ -8,6 +8,11 @@ import {
 } from 'lit-element';
 import { translate } from 'lit-translate';
 
+import '@material/mwc-icon-button';
+
+import './bay-editor.js';
+import './ied-editor.js';
+import '../editor-container.js';
 import {
   selectors,
   startMove,
@@ -15,12 +20,9 @@ import {
   styles,
 } from './foundation.js';
 import { newActionEvent, newWizardEvent } from '../foundation.js';
-
 import { SubstationEditor } from './substation-editor.js';
 import { wizards } from '../wizards/wizard-library.js';
 
-import './bay-editor.js';
-
 /** [[`Substation`]] subeditor for a `VoltageLevel` element. */
 @customElement('voltage-level-editor')
 export class VoltageLevelEditor extends LitElement {
diff --git a/test/integration/Editing.test.ts b/test/integration/Editing.test.ts
index 435bf5f4c..f55fac509 100644
--- a/test/integration/Editing.test.ts
+++ b/test/integration/Editing.test.ts
@@ -1,9 +1,9 @@
 import { expect, fixture, html } from '@open-wc/testing';
 
-import { newActionEvent } from '../../src/foundation.js';
+import '../mock-editor-logger.js';
 import { MockEditorLogger } from '../mock-editor-logger.js';
 
-import '../mock-editor-logger.js';
+import { newActionEvent } from '../../src/foundation.js';
 
 describe('Editing-Logging integration', () => {
   let elm: MockEditorLogger;
diff --git a/test/integration/editors/Substation.test.ts b/test/integration/editors/Substation.test.ts
index d0c297b34..6492edff4 100644
--- a/test/integration/editors/Substation.test.ts
+++ b/test/integration/editors/Substation.test.ts
@@ -1,9 +1,11 @@
 import { html, fixture, expect } from '@open-wc/testing';
 
 import '../../mock-wizard.js';
+import { MockWizard } from '../../mock-wizard.js';
+
 import { Editing } from '../../../src/Editing.js';
 import Substation from '../../../src/editors/Substation.js';
-import { Wizarding, WizardingElement } from '../../../src/Wizarding.js';
+import { Wizarding } from '../../../src/Wizarding.js';
 
 describe('Substation Plugin', () => {
   customElements.define('substation-plugin', Wizarding(Editing(Substation)));
@@ -36,13 +38,13 @@ describe('Substation Plugin', () => {
 
   describe('with a doc loaded missing a substation section', () => {
     let doc: XMLDocument;
-    let parent: WizardingElement;
+    let parent: MockWizard;
 
     beforeEach(async () => {
       doc = await fetch('/base/test/testfiles/missingSubstation.scd')
         .then(response => response.text())
         .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-      parent = <WizardingElement>(
+      parent = <MockWizard>(
         await fixture(
           html`<mock-wizard
             ><substation-plugin .doc=${doc}></substation-plugin
diff --git a/test/integration/editors/communication/Communication.test.ts b/test/integration/editors/communication/Communication.test.ts
index db6e03950..645833122 100644
--- a/test/integration/editors/communication/Communication.test.ts
+++ b/test/integration/editors/communication/Communication.test.ts
@@ -1,8 +1,11 @@
 import { html, fixture, expect } from '@open-wc/testing';
 
+import '../../../mock-wizard.js';
+import { MockWizard } from '../../../mock-wizard.js';
+
 import Communication from '../../../../src/editors/Communication.js';
 import { Editing } from '../../../../src/Editing.js';
-import { Wizarding, WizardingElement } from '../../../../src/Wizarding.js';
+import { Wizarding } from '../../../../src/Wizarding.js';
 
 describe('Communication Plugin', () => {
   customElements.define(
@@ -40,14 +43,14 @@ describe('Communication Plugin', () => {
 
   describe('with a doc loaded missing a communication section', () => {
     let doc: XMLDocument;
-    let parent: WizardingElement;
+    let parent: MockWizard;
     let fab: HTMLElement;
 
     beforeEach(async () => {
       doc = await fetch('/base/test/testfiles/missingCommunication.scd')
         .then(response => response.text())
         .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-      parent = <WizardingElement>(
+      parent = <MockWizard>(
         await fixture(
           html`<mock-wizard
             ><communication-plugin .doc=${doc}></communication-plugin
diff --git a/test/integration/editors/communication/connectedap-editor-wizarding-editing.test.ts b/test/integration/editors/communication/connectedap-editor-wizarding-editing.test.ts
index 3b83c73d3..e86f8c030 100644
--- a/test/integration/editors/communication/connectedap-editor-wizarding-editing.test.ts
+++ b/test/integration/editors/communication/connectedap-editor-wizarding-editing.test.ts
@@ -1,17 +1,16 @@
 import { fixture, html, expect } from '@open-wc/testing';
 
 import '../../../mock-wizard-editor.js';
-import '../../../../src/editors/communication/connectedap-editor.js';
+import { MockWizardEditor } from '../../../mock-wizard-editor.js';
 
-import { EditingElement } from '../../../../src/Editing.js';
-import { WizardingElement } from '../../../../src/Wizarding.js';
+import '../../../../src/editors/communication/connectedap-editor.js';
 import { ConnectedAPEditor } from '../../../../src/editors/communication/connectedap-editor.js';
 import { WizardTextField } from '../../../../src/wizard-textfield.js';
 
 describe('connectedap-editor wizarding editing integration', () => {
   describe('edit wizard', () => {
     let doc: XMLDocument;
-    let parent: WizardingElement & EditingElement;
+    let parent: MockWizardEditor;
     let element: ConnectedAPEditor | null;
     let secondaryAction: HTMLElement;
     let primaryAction: HTMLElement;
@@ -21,7 +20,7 @@ describe('connectedap-editor wizarding editing integration', () => {
       doc = await fetch('/base/test/testfiles/valid2007B4.scd')
         .then(response => response.text())
         .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-      parent = <WizardingElement & EditingElement>(
+      parent = <MockWizardEditor>(
         await fixture(
           html`<mock-wizard-editor
             ><connectedap-editor
@@ -79,7 +78,7 @@ describe('connectedap-editor wizarding editing integration', () => {
   });
   describe('remove action', () => {
     let doc: XMLDocument;
-    let parent: WizardingElement & EditingElement;
+    let parent: MockWizardEditor;
     let element: ConnectedAPEditor | null;
     let deleteButton: HTMLElement;
 
@@ -87,7 +86,7 @@ describe('connectedap-editor wizarding editing integration', () => {
       doc = await fetch('/base/test/testfiles/valid2007B4.scd')
         .then(response => response.text())
         .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-      parent = <WizardingElement & EditingElement>(
+      parent = <MockWizardEditor>(
         await fixture(
           html`<mock-wizard-editor
             ><connectedap-editor
diff --git a/test/integration/editors/communication/connectedap-editor-wizarding.test.ts b/test/integration/editors/communication/connectedap-editor-wizarding.test.ts
index a48ef2198..2f7faecaf 100644
--- a/test/integration/editors/communication/connectedap-editor-wizarding.test.ts
+++ b/test/integration/editors/communication/connectedap-editor-wizarding.test.ts
@@ -1,23 +1,22 @@
 import { fixture, html, expect } from '@open-wc/testing';
 import fc, { integer, ipV4, nat } from 'fast-check';
 
-import { regexString, regExp, ipV6, ipV6SubNet } from '../../../foundation.js';
-
 import '../../../mock-wizard.js';
-import { WizardingElement } from '../../../../src/Wizarding.js';
+import { MockWizard } from '../../../mock-wizard.js';
 
 import '../../../../src/editors/communication/connectedap-editor.js';
+import { regexString, regExp, ipV6, ipV6SubNet } from '../../../foundation.js';
 
 describe('conductingap-editor wizarding integration', () => {
   describe('for schema 2003 (Edition1) projects', () => {
     let doc: XMLDocument;
-    let parent: WizardingElement;
+    let parent: MockWizard;
 
     beforeEach(async () => {
       doc = await fetch('/base/test/testfiles/valid2003.scd')
         .then(response => response.text())
         .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-      parent = <WizardingElement>(
+      parent = <MockWizard>(
         await fixture(
           html`<mock-wizard
             ><connectedap-editor
@@ -227,13 +226,13 @@ describe('conductingap-editor wizarding integration', () => {
   });
   describe('for schema 2007B (Edition2) projects', () => {
     let doc: XMLDocument;
-    let parent: WizardingElement;
+    let parent: MockWizard;
 
     beforeEach(async () => {
       doc = await fetch('/base/test/testfiles/valid2007B.scd')
         .then(response => response.text())
         .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-      parent = <WizardingElement>(
+      parent = <MockWizard>(
         await fixture(
           html`<mock-wizard
             ><connectedap-editor
@@ -357,13 +356,13 @@ describe('conductingap-editor wizarding integration', () => {
   });
   describe('for schema 2007B4 (Edition2.1) projects', () => {
     let doc: XMLDocument;
-    let parent: WizardingElement;
+    let parent: MockWizard;
 
     beforeEach(async () => {
       doc = await fetch('/base/test/testfiles/valid2007B4.scd')
         .then(response => response.text())
         .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-      parent = <WizardingElement>(
+      parent = <MockWizard>(
         await fixture(
           html`<mock-wizard
             ><connectedap-editor
diff --git a/test/integration/editors/communication/subnetwork-editor-wizarding-editing.test.ts b/test/integration/editors/communication/subnetwork-editor-wizarding-editing.test.ts
index a71a1e912..58b3af978 100644
--- a/test/integration/editors/communication/subnetwork-editor-wizarding-editing.test.ts
+++ b/test/integration/editors/communication/subnetwork-editor-wizarding-editing.test.ts
@@ -1,17 +1,18 @@
 import { fixture, html, expect } from '@open-wc/testing';
 
 import '../../../mock-wizard-editor.js';
-import { EditingElement } from '../../../../src/Editing.js';
-import { SubNetworkEditor } from '../../../../src/editors/communication/subnetwork-editor.js';
-import { WizardingElement } from '../../../../src/Wizarding.js';
-import { WizardTextField } from '../../../../src/wizard-textfield.js';
+import { MockWizardEditor } from '../../../mock-wizard-editor.js';
 
 import { ListItemBase } from '@material/mwc-list/mwc-list-item-base';
 
+import '../../../../src/editors/communication/subnetwork-editor.js';
+import { SubNetworkEditor } from '../../../../src/editors/communication/subnetwork-editor.js';
+import { WizardTextField } from '../../../../src/wizard-textfield.js';
+
 describe('subnetwork-editor wizarding editing integration', () => {
   describe('edit wizard', () => {
     let doc: XMLDocument;
-    let parent: WizardingElement & EditingElement;
+    let parent: MockWizardEditor;
     let element: SubNetworkEditor | null;
     let nameField: WizardTextField;
     let descField: WizardTextField;
@@ -23,7 +24,7 @@ describe('subnetwork-editor wizarding editing integration', () => {
       doc = await fetch('/base/test/testfiles/valid2007B4.scd')
         .then(response => response.text())
         .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-      parent = <WizardingElement & EditingElement>(
+      parent = <MockWizardEditor>(
         await fixture(
           html`<mock-wizard-editor
             ><subnetwork-editor
@@ -145,7 +146,7 @@ describe('subnetwork-editor wizarding editing integration', () => {
   });
   describe('remove action', () => {
     let doc: XMLDocument;
-    let parent: WizardingElement & EditingElement;
+    let parent: MockWizardEditor;
     let element: SubNetworkEditor | null;
     let deleteButton: HTMLElement;
 
@@ -153,7 +154,7 @@ describe('subnetwork-editor wizarding editing integration', () => {
       doc = await fetch('/base/test/testfiles/valid2007B4.scd')
         .then(response => response.text())
         .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-      parent = <WizardingElement & EditingElement>(
+      parent = <MockWizardEditor>(
         await fixture(
           html`<mock-wizard-editor
             ><subnetwork-editor
@@ -178,7 +179,7 @@ describe('subnetwork-editor wizarding editing integration', () => {
   });
   describe('add ConnectedAP action', () => {
     let doc: XMLDocument;
-    let parent: WizardingElement & EditingElement;
+    let parent: MockWizardEditor;
     let element: SubNetworkEditor | null;
     let newConnectedAPItem: HTMLElement;
     let primaryAction: HTMLElement;
@@ -187,7 +188,7 @@ describe('subnetwork-editor wizarding editing integration', () => {
       doc = await fetch('/base/test/testfiles/valid2007B4.scd')
         .then(response => response.text())
         .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-      parent = <WizardingElement & EditingElement>(
+      parent = <MockWizardEditor>(
         await fixture(
           html`<mock-wizard-editor
             ><subnetwork-editor
diff --git a/test/integration/editors/communication/subnetwork-editor-wizarding.test.ts b/test/integration/editors/communication/subnetwork-editor-wizarding.test.ts
index 3a3d9501a..f9d2ab54e 100644
--- a/test/integration/editors/communication/subnetwork-editor-wizarding.test.ts
+++ b/test/integration/editors/communication/subnetwork-editor-wizarding.test.ts
@@ -1,23 +1,24 @@
 import { fixture, html, expect } from '@open-wc/testing';
 import fc from 'fast-check';
 
-import { regexString, regExp, inverseRegExp } from '../../../foundation.js';
-import { WizardingElement } from '../../../../src/Wizarding.js';
-
 import '../../../mock-wizard.js';
+import { MockWizard } from '../../../mock-wizard.js';
 
 import { ListItemBase } from '@material/mwc-list/mwc-list-item-base';
 
+import '../../../../src/editors/communication/subnetwork-editor.js';
+import { regexString, regExp, inverseRegExp } from '../../../foundation.js';
+
 describe('subnetwork-editor wizarding integration', () => {
   describe('edit/add Subnetwork wizard', () => {
     let doc: XMLDocument;
-    let parent: WizardingElement;
+    let parent: MockWizard;
 
     beforeEach(async () => {
       doc = await fetch('/base/test/testfiles/valid2007B4.scd')
         .then(response => response.text())
         .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-      parent = <WizardingElement>(
+      parent = <MockWizard>(
         await fixture(
           html`<mock-wizard
             ><subnetwork-editor
@@ -108,13 +109,13 @@ describe('subnetwork-editor wizarding integration', () => {
   });
   describe('add ConnectedAP wizard', () => {
     let doc: XMLDocument;
-    let parent: WizardingElement;
+    let parent: MockWizard;
 
     beforeEach(async () => {
       doc = await fetch('/base/test/testfiles/valid2007B4.scd')
         .then(response => response.text())
         .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-      parent = <WizardingElement>(
+      parent = <MockWizard>(
         await fixture(
           html`<mock-wizard
             ><subnetwork-editor
diff --git a/test/integration/editors/substation/guess-wizarding-editing.test.ts b/test/integration/editors/substation/guess-wizarding-editing.test.ts
index b893c0e88..0fcb8bc90 100644
--- a/test/integration/editors/substation/guess-wizarding-editing.test.ts
+++ b/test/integration/editors/substation/guess-wizarding-editing.test.ts
@@ -1,15 +1,11 @@
 import { expect, fixture, html } from '@open-wc/testing';
 
-import '../../../mock-wizard-editor.js';
 import '../../../mock-wizard.js';
-
-import '@material/mwc-list/mwc-check-list-item';
-import '@material/mwc-list/mwc-list';
-
-import { EditingElement } from '../../../../src/Editing.js';
 import { MockWizard } from '../../../mock-wizard.js';
+import '../../../mock-wizard-editor.js';
+import { MockWizardEditor } from '../../../mock-wizard-editor.js';
+
 import { guessVoltageLevel } from '../../../../src/editors/substation/guess-wizard.js';
-import { WizardingElement } from '../../../../src/Wizarding.js';
 
 describe('guess-wizard-integration', () => {
   let element: MockWizard;
@@ -72,14 +68,14 @@ describe('guess-wizard-integration', () => {
 });
 
 describe('guess-wizarding-editing-integration', () => {
-  let element: WizardingElement & EditingElement;
+  let element: MockWizardEditor;
   let validSCL: XMLDocument;
   beforeEach(async () => {
     validSCL = await fetch('/base/test/testfiles/valid2007B4.scd')
       .then(response => response.text())
       .then(str => new DOMParser().parseFromString(str, 'application/xml'));
     validSCL.querySelector('Substation')!.innerHTML = '';
-    element = <WizardingElement & EditingElement>(
+    element = <MockWizardEditor>(
       await fixture(html`<mock-wizard-editor></mock-wizard-editor>`)
     );
     element.workflow.push(guessVoltageLevel(validSCL));
diff --git a/test/integration/editors/substation/lnodewizard.test.ts b/test/integration/editors/substation/lnodewizard.test.ts
index 1c2308557..32a3430ec 100644
--- a/test/integration/editors/substation/lnodewizard.test.ts
+++ b/test/integration/editors/substation/lnodewizard.test.ts
@@ -1,15 +1,13 @@
 import { expect, fixture, html } from '@open-wc/testing';
 
-import '@material/mwc-list/mwc-check-list-item';
-import '@material/mwc-list/mwc-list';
+import '../../../mock-wizard-editor.js';
+import { MockWizardEditor } from '../../../mock-wizard-editor.js';
+
 import { List } from '@material/mwc-list';
 import { ListItemBase } from '@material/mwc-list/mwc-list-item-base';
 
 import { lNodeWizard } from '../../../../src/wizards/lnode.js';
 
-import '../../../mock-wizard.js';
-import { MockWizardEditor } from '../../../mock-wizard-editor.js';
-
 describe('lnodewizard', () => {
   let element: MockWizardEditor;
   let doc: Document;
diff --git a/test/integration/editors/templates/Templates.test.ts b/test/integration/editors/templates/Templates.test.ts
index ab4bb7c29..346df80f7 100644
--- a/test/integration/editors/templates/Templates.test.ts
+++ b/test/integration/editors/templates/Templates.test.ts
@@ -1,8 +1,11 @@
 import { html, fixture, expect } from '@open-wc/testing';
 
-import TemplatesPlugin from '../../../../src/editors/Templates.js';
+import '../../../mock-wizard-editor.js';
+import { MockWizardEditor } from '../../../mock-wizard-editor.js';
+
 import { Editing, EditingElement } from '../../../../src/Editing.js';
 import { Wizarding, WizardingElement } from '../../../../src/Wizarding.js';
+import TemplatesPlugin from '../../../../src/editors/Templates.js';
 
 describe('Templates Plugin', () => {
   customElements.define(
@@ -36,14 +39,14 @@ describe('Templates Plugin', () => {
 
   describe('with a doc loaded missing a datatypetemplates section', () => {
     let doc: XMLDocument;
-    let parent: WizardingElement & EditingElement;
+    let parent: MockWizardEditor;
 
     beforeEach(async () => {
       doc = await fetch('/base/test/testfiles/templates/missingdatatypes.scd')
         .then(response => response.text())
         .then(str => new DOMParser().parseFromString(str, 'application/xml'));
 
-      parent = <WizardingElement & EditingElement>(
+      parent = <MockWizardEditor>(
         await fixture(
           html`<mock-wizard-editor
             ><templates-plugin .doc=${doc}></templates-plugin
diff --git a/test/integration/editors/templates/datype-wizarding.test.ts b/test/integration/editors/templates/datype-wizarding.test.ts
index 3df8e331a..5f61a1d50 100644
--- a/test/integration/editors/templates/datype-wizarding.test.ts
+++ b/test/integration/editors/templates/datype-wizarding.test.ts
@@ -1,12 +1,14 @@
 import { html, fixture, expect } from '@open-wc/testing';
 
-import TemplatesPlugin from '../../../../src/editors/Templates.js';
+import '../../../mock-wizard-editor.js';
 import { MockWizardEditor } from '../../../mock-wizard-editor.js';
 
+import { ListItem } from '@material/mwc-list/mwc-list-item';
 import { Select } from '@material/mwc-select';
-import { WizardTextField } from '../../../../src/wizard-textfield.js';
+
 import { FilteredList } from '../../../../src/filtered-list.js';
-import { ListItem } from '@material/mwc-list/mwc-list-item';
+import { WizardTextField } from '../../../../src/wizard-textfield.js';
+import TemplatesPlugin from '../../../../src/editors/Templates.js';
 
 describe('DAType wizards', () => {
   if (customElements.get('templates-editor') === undefined)
diff --git a/test/integration/editors/templates/dotype-wizarding.test.ts b/test/integration/editors/templates/dotype-wizarding.test.ts
index f915d7fe8..aa57192ea 100644
--- a/test/integration/editors/templates/dotype-wizarding.test.ts
+++ b/test/integration/editors/templates/dotype-wizarding.test.ts
@@ -1,12 +1,14 @@
 import { html, fixture, expect } from '@open-wc/testing';
 
-import TemplatesPlugin from '../../../../src/editors/Templates.js';
+import '../../../mock-wizard-editor.js';
 import { MockWizardEditor } from '../../../mock-wizard-editor.js';
 
+import { ListItem } from '@material/mwc-list/mwc-list-item';
 import { Select } from '@material/mwc-select';
-import { WizardTextField } from '../../../../src/wizard-textfield.js';
+
 import { FilteredList } from '../../../../src/filtered-list.js';
-import { ListItem } from '@material/mwc-list/mwc-list-item';
+import TemplatesPlugin from '../../../../src/editors/Templates.js';
+import { WizardTextField } from '../../../../src/wizard-textfield.js';
 
 describe('DOType wizards', () => {
   if (customElements.get('templates-editor') === undefined)
diff --git a/test/integration/editors/templates/enumtype-wizarding.test.ts b/test/integration/editors/templates/enumtype-wizarding.test.ts
index 91209e5c9..0d8e6f74a 100644
--- a/test/integration/editors/templates/enumtype-wizarding.test.ts
+++ b/test/integration/editors/templates/enumtype-wizarding.test.ts
@@ -1,12 +1,14 @@
 import { html, fixture, expect } from '@open-wc/testing';
 
-import TemplatesPlugin from '../../../../src/editors/Templates.js';
+import '../../../mock-wizard-editor.js';
 import { MockWizardEditor } from '../../../mock-wizard-editor.js';
 
+import { ListItem } from '@material/mwc-list/mwc-list-item';
 import { Select } from '@material/mwc-select';
-import { WizardTextField } from '../../../../src/wizard-textfield.js';
+
 import { FilteredList } from '../../../../src/filtered-list.js';
-import { ListItem } from '@material/mwc-list/mwc-list-item';
+import TemplatesPlugin from '../../../../src/editors/Templates.js';
+import { WizardTextField } from '../../../../src/wizard-textfield.js';
 
 describe('EnumType wizards', () => {
   if (customElements.get('templates-editor') === undefined)
diff --git a/test/integration/editors/templates/lnodetype-wizard.test.ts b/test/integration/editors/templates/lnodetype-wizard.test.ts
index f9fc3bcdc..7e07527ca 100644
--- a/test/integration/editors/templates/lnodetype-wizard.test.ts
+++ b/test/integration/editors/templates/lnodetype-wizard.test.ts
@@ -1,14 +1,16 @@
 import { html, fixture, expect } from '@open-wc/testing';
 
-import TemplatesPlugin from '../../../../src/editors/Templates.js';
+import '../../../mock-wizard-editor.js';
 import { MockWizardEditor } from '../../../mock-wizard-editor.js';
 
-import { Select } from '@material/mwc-select';
-import { WizardTextField } from '../../../../src/wizard-textfield.js';
-import { FilteredList } from '../../../../src/filtered-list.js';
 import { ListItem } from '@material/mwc-list/mwc-list-item';
+import { Select } from '@material/mwc-select';
 import { Switch } from '@material/mwc-switch';
 
+import { FilteredList } from '../../../../src/filtered-list.js';
+import TemplatesPlugin from '../../../../src/editors/Templates.js';
+import { WizardTextField } from '../../../../src/wizard-textfield.js';
+
 describe('LNodeType wizards', () => {
   if (customElements.get('templates-editor') === undefined)
     customElements.define('templates-editor', TemplatesPlugin);
diff --git a/test/integration/editors/triggered/ImportIedsPlugin.test.ts b/test/integration/editors/triggered/ImportIedsPlugin.test.ts
index 998141b1b..f6c22baf5 100644
--- a/test/integration/editors/triggered/ImportIedsPlugin.test.ts
+++ b/test/integration/editors/triggered/ImportIedsPlugin.test.ts
@@ -1,11 +1,14 @@
 import { expect, fixture, html } from '@open-wc/testing';
 
-import ImportingIedPlugin from '../../../../src/menu/ImportIEDs.js';
+import '../../../mock-wizard-editor.js';
 import { MockWizardEditor } from '../../../mock-wizard-editor.js';
-import { OpenSCD } from '../../../../src/open-scd.js';
 
 import { CheckListItem } from '@material/mwc-list/mwc-check-list-item';
 
+import '../../../../src/open-scd.js';
+import ImportingIedPlugin from '../../../../src/menu/ImportIEDs.js';
+import { OpenSCD } from '../../../../src/open-scd.js';
+
 describe('ImportIedsPlugin', () => {
   customElements.define('import-ieds-plugin', ImportingIedPlugin);
 
diff --git a/test/integration/menu/NewProject.test.ts b/test/integration/menu/NewProject.test.ts
index 3d7df4c5c..b1e1d3147 100644
--- a/test/integration/menu/NewProject.test.ts
+++ b/test/integration/menu/NewProject.test.ts
@@ -1,5 +1,6 @@
 import { expect, fixture, html } from '@open-wc/testing';
 
+import '../../../src/open-scd.js';
 import NewProjectPlugin from '../../../src/menu/NewProject.js';
 import { OpenSCD } from '../../../src/open-scd.js';
 
@@ -12,9 +13,12 @@ describe('NewProject loader', () => {
     parent = await fixture(html`
       <open-scd><new-project-plugin></new-project-plugin></open-scd>
 
-      <link href="public/google/fonts/roboto-v27.css" rel="stylesheet">
-      <link href="public/google/fonts/roboto-mono-v13.css" rel="stylesheet">
-      <link href="public/google/icons/material-icons-outlined.css" rel="stylesheet">
+      <link href="public/google/fonts/roboto-v27.css" rel="stylesheet" />
+      <link href="public/google/fonts/roboto-mono-v13.css" rel="stylesheet" />
+      <link
+        href="public/google/icons/material-icons-outlined.css"
+        rel="stylesheet"
+      />
     `);
 
     element = <NewProjectPlugin>parent.querySelector('new-project-plugin')!;
diff --git a/test/integration/menu/UpdateDescritionABB.test.ts b/test/integration/menu/UpdateDescritionABB.test.ts
index cbd5c78d4..47319357c 100644
--- a/test/integration/menu/UpdateDescritionABB.test.ts
+++ b/test/integration/menu/UpdateDescritionABB.test.ts
@@ -1,9 +1,10 @@
 import { expect, fixture, html } from '@open-wc/testing';
 
 import '../../mock-wizard-editor.js';
-import UpdateDescriptionAbb from '../../../src/menu/UpdateDescriptionABB.js';
 import { MockWizardEditor } from '../../mock-wizard-editor.js';
 
+import UpdateDescriptionAbb from '../../../src/menu/UpdateDescriptionABB.js';
+
 describe('Update method for desc attributes in ABB IEDs', () => {
   if (customElements.get('update-description-abb') === undefined)
     customElements.define('update-description-abb', UpdateDescriptionAbb);
diff --git a/test/integration/open-scd.test.ts b/test/integration/open-scd.test.ts
index 3bd706f30..3c800f8ce 100644
--- a/test/integration/open-scd.test.ts
+++ b/test/integration/open-scd.test.ts
@@ -1,8 +1,8 @@
 import { html, fixture, expect } from '@open-wc/testing';
 
-import { OpenSCD } from '../../src/open-scd.js';
 import '../../src/open-scd.js';
 import { newEmptySCD } from '../../src/schemas.js';
+import { OpenSCD } from '../../src/open-scd.js';
 
 describe('open-scd', () => {
   let element: OpenSCD;
diff --git a/test/integration/validators/ValidateSchema.test.ts b/test/integration/validators/ValidateSchema.test.ts
index 9bbb21dff..d4a1e3415 100644
--- a/test/integration/validators/ValidateSchema.test.ts
+++ b/test/integration/validators/ValidateSchema.test.ts
@@ -1,12 +1,14 @@
 import { expect, fixture, html } from '@open-wc/testing';
 
-import { IssueDetail, LogEntry } from '../../../src/foundation.js';
-
+import '../../../src/open-scd.js';
 import { OpenSCD } from '../../../src/open-scd.js';
 import ValidateSchema from '../../../src/validators/ValidateSchema.js';
+import { IssueDetail, LogEntry } from '../../../src/foundation.js';
 
 describe('ValidateSchema plugin', () => {
-  customElements.define('validate-schema', ValidateSchema);
+  if (customElements.get('') === undefined)
+    customElements.define('validate-schema', ValidateSchema);
+
   let parent: OpenSCD;
   let element: ValidateSchema;
 
diff --git a/test/integration/validators/ValidateTemplates.test.ts b/test/integration/validators/ValidateTemplates.test.ts
index cf6b819e0..94729f0fa 100644
--- a/test/integration/validators/ValidateTemplates.test.ts
+++ b/test/integration/validators/ValidateTemplates.test.ts
@@ -1,10 +1,13 @@
 import { expect, fixture, html } from '@open-wc/testing';
 
+import '../../../src/open-scd.js';
 import { OpenSCD } from '../../../src/open-scd.js';
 import ValidateTemplates from '../../../src/validators/ValidateTemplates.js';
 
 describe('ValidateTemplates OpenSCD integration test ', () => {
-  customElements.define('validate-templates', ValidateTemplates);
+  if (customElements.get('validate-templates') === undefined)
+    customElements.define('validate-templates', ValidateTemplates);
+
   let parent: OpenSCD;
   let element: ValidateTemplates;
 
diff --git a/test/integration/wizards/bda-wizarding-editing.test.ts b/test/integration/wizards/bda-wizarding-editing.test.ts
index c9688c63e..3b7df9d25 100644
--- a/test/integration/wizards/bda-wizarding-editing.test.ts
+++ b/test/integration/wizards/bda-wizarding-editing.test.ts
@@ -1,13 +1,14 @@
 import { html, fixture, expect } from '@open-wc/testing';
 
-import TemplatesPlugin from '../../../src/editors/Templates.js';
+import '../../mock-wizard-editor.js';
 import { MockWizardEditor } from '../../mock-wizard-editor.js';
 
-import { Select } from '@material/mwc-select';
-import { WizardTextField } from '../../../src/wizard-textfield.js';
-import { FilteredList } from '../../../src/filtered-list.js';
 import { ListItem } from '@material/mwc-list/mwc-list-item';
+
+import { FilteredList } from '../../../src/filtered-list.js';
 import { WizardSelect } from '../../../src/wizard-select.js';
+import { WizardTextField } from '../../../src/wizard-textfield.js';
+import TemplatesPlugin from '../../../src/editors/Templates.js';
 
 describe('BDA wizarding editing integration', () => {
   if (customElements.get('templates-editor') === undefined)
diff --git a/test/integration/wizards/da-wizarding-editing.test.ts b/test/integration/wizards/da-wizarding-editing.test.ts
index c113507f4..bb0b2c12f 100644
--- a/test/integration/wizards/da-wizarding-editing.test.ts
+++ b/test/integration/wizards/da-wizarding-editing.test.ts
@@ -1,13 +1,13 @@
 import { html, fixture, expect } from '@open-wc/testing';
 
-import TemplatesPlugin from '../../../src/editors/Templates.js';
+import '../../mock-wizard-editor.js';
 import { MockWizardEditor } from '../../mock-wizard-editor.js';
 
-import { Select } from '@material/mwc-select';
-import { WizardTextField } from '../../../src/wizard-textfield.js';
 import { FilteredList } from '../../../src/filtered-list.js';
 import { ListItem } from '@material/mwc-list/mwc-list-item';
+import TemplatesPlugin from '../../../src/editors/Templates.js';
 import { WizardSelect } from '../../../src/wizard-select.js';
+import { WizardTextField } from '../../../src/wizard-textfield.js';
 
 describe('DA wizarding editing integration', () => {
   if (customElements.get('templates-editor') === undefined)
diff --git a/test/integration/wizards/dataset-wizarding-editing-integration.test.ts b/test/integration/wizards/dataset-wizarding-editing-integration.test.ts
index 4256d167c..c81eec6b1 100644
--- a/test/integration/wizards/dataset-wizarding-editing-integration.test.ts
+++ b/test/integration/wizards/dataset-wizarding-editing-integration.test.ts
@@ -1,8 +1,10 @@
 import { expect, fixture, html } from '@open-wc/testing';
 
+import '../../mock-wizard-editor.js';
+import { MockWizardEditor } from '../../mock-wizard-editor.js';
+
 import { WizardTextField } from '../../../src/wizard-textfield.js';
 import { editDataSetWizard } from '../../../src/wizards/dataset.js';
-import { MockWizardEditor } from '../../mock-wizard-editor.js';
 
 describe('dataset wizards', () => {
   let doc: XMLDocument;
diff --git a/test/integration/wizards/fcda-wizarding-editing-integration.test.ts b/test/integration/wizards/fcda-wizarding-editing-integration.test.ts
index 7383054d8..84863eb49 100644
--- a/test/integration/wizards/fcda-wizarding-editing-integration.test.ts
+++ b/test/integration/wizards/fcda-wizarding-editing-integration.test.ts
@@ -1,9 +1,10 @@
 import { expect, fixture, html } from '@open-wc/testing';
 
-import { FinderList } from '../../../src/finder-list.js';
+import '../../mock-wizard-editor.js';
 import { MockWizardEditor } from '../../mock-wizard-editor.js';
 
 import { createFCDAsWizard } from '../../../src/wizards/fcda.js';
+import { FinderList } from '../../../src/finder-list.js';
 
 describe('FCDA editing wizarding integration', () => {
   let doc: XMLDocument;
diff --git a/test/integration/wizards/gse-wizarding-editing-integration.test.ts b/test/integration/wizards/gse-wizarding-editing-integration.test.ts
index 0aeac1ab5..8d416b5a1 100644
--- a/test/integration/wizards/gse-wizarding-editing-integration.test.ts
+++ b/test/integration/wizards/gse-wizarding-editing-integration.test.ts
@@ -1,8 +1,11 @@
 import { expect, fixture, html } from '@open-wc/testing';
-import { WizardTextField } from '../../../src/wizard-textfield.js';
-import { editGseWizard } from '../../../src/wizards/gse.js';
+
+import '../../mock-wizard-editor.js';
 import { MockWizardEditor } from '../../mock-wizard-editor.js';
 
+import { editGseWizard } from '../../../src/wizards/gse.js';
+import { WizardTextField } from '../../../src/wizard-textfield.js';
+
 describe('gse wizarding editing integration', () => {
   let doc: XMLDocument;
   let element: MockWizardEditor;
diff --git a/test/integration/wizards/gsecontrolwizarding-editing.test.ts b/test/integration/wizards/gsecontrolwizarding-editing.test.ts
index e445dabc4..552396c45 100644
--- a/test/integration/wizards/gsecontrolwizarding-editing.test.ts
+++ b/test/integration/wizards/gsecontrolwizarding-editing.test.ts
@@ -1,14 +1,17 @@
+import { expect, fixture, html } from '@open-wc/testing';
+
+import '../../mock-wizard-editor.js';
+import { MockWizardEditor } from '../../mock-wizard-editor.js';
+
 import { Button } from '@material/mwc-button';
 import { ListItemBase } from '@material/mwc-list/mwc-list-item-base';
-import { expect, fixture, html } from '@open-wc/testing';
-import { FilteredList } from '../../../src/filtered-list.js';
 
-import { WizardTextField } from '../../../src/wizard-textfield.js';
 import {
   editGseControlWizard,
   selectGseControlWizard,
 } from '../../../src/wizards/gsecontrol.js';
-import { MockWizardEditor } from '../../mock-wizard-editor.js';
+import { FilteredList } from '../../../src/filtered-list.js';
+import { WizardTextField } from '../../../src/wizard-textfield.js';
 
 describe('gsecontrol wizarding editing integration', () => {
   let doc: XMLDocument;
diff --git a/test/integration/zeroline-pane.test.ts b/test/integration/zeroline-pane.test.ts
index 08b19bcfd..02234ff96 100644
--- a/test/integration/zeroline-pane.test.ts
+++ b/test/integration/zeroline-pane.test.ts
@@ -1,12 +1,13 @@
 import { expect, fixture, html } from '@open-wc/testing';
 
+import '../mock-wizard-editor.js';
 import { MockWizardEditor } from '../mock-wizard-editor.js';
 
+import { IconButton } from '@material/mwc-icon-button';
+
+import '../../src/zeroline-pane.js';
 import { FilteredList } from '../../src/filtered-list.js';
 import { ZerolinePane } from '../../src/zeroline-pane.js';
-
-import { IconButton } from '@material/mwc-icon-button';
-import { TextField } from '@material/mwc-textfield';
 import { WizardTextField } from '../../src/wizard-textfield.js';
 
 describe('zeroline-pane wizarding editing integration', () => {
diff --git a/test/integration/zeroline/bay-editor-wizarding-editing.test.ts b/test/integration/zeroline/bay-editor-wizarding-editing.test.ts
index aabc943a7..47035dd0b 100644
--- a/test/integration/zeroline/bay-editor-wizarding-editing.test.ts
+++ b/test/integration/zeroline/bay-editor-wizarding-editing.test.ts
@@ -1,17 +1,17 @@
 import { fixture, html, expect } from '@open-wc/testing';
 
 import '../../mock-wizard-editor.js';
+import { MockWizardEditor } from '../../mock-wizard-editor.js';
 
+import '../../../src/zeroline/bay-editor.js';
 import { BayEditor } from '../../../src/zeroline/bay-editor.js';
-import { EditingElement } from '../../../src/Editing.js';
 import { Select } from '@material/mwc-select';
-import { WizardingElement } from '../../../src/Wizarding.js';
 import { WizardTextField } from '../../../src/wizard-textfield.js';
 
 describe('bay-editor wizarding editing integration', () => {
   describe('edit wizard', () => {
     let doc: XMLDocument;
-    let parent: WizardingElement & EditingElement;
+    let parent: MockWizardEditor;
     let element: BayEditor | null;
 
     let nameField: WizardTextField;
@@ -23,7 +23,7 @@ describe('bay-editor wizarding editing integration', () => {
       doc = await fetch('/base/test/testfiles/valid2007B4.scd')
         .then(response => response.text())
         .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-      parent = <WizardingElement & EditingElement>(
+      parent = <MockWizardEditor>(
         await fixture(
           html`<mock-wizard-editor
             ><bay-editor .element=${doc.querySelector('Bay')}></bay-editor
@@ -92,7 +92,7 @@ describe('bay-editor wizarding editing integration', () => {
   });
   describe('open add conducting equipment wizard', () => {
     let doc: XMLDocument;
-    let parent: WizardingElement & EditingElement;
+    let parent: MockWizardEditor;
     let element: BayEditor | null;
 
     let nameField: WizardTextField;
@@ -103,7 +103,7 @@ describe('bay-editor wizarding editing integration', () => {
       doc = await fetch('/base/test/testfiles/valid2007B4.scd')
         .then(response => response.text())
         .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-      parent = <WizardingElement & EditingElement>(
+      parent = <MockWizardEditor>(
         await fixture(
           html`<mock-wizard-editor
             ><bay-editor .element=${doc.querySelector('Bay')}></bay-editor
@@ -160,14 +160,14 @@ describe('bay-editor wizarding editing integration', () => {
   });
   describe('open lnode wizard', () => {
     let doc: XMLDocument;
-    let parent: WizardingElement & EditingElement;
+    let parent: MockWizardEditor;
     let element: BayEditor | null;
 
     beforeEach(async () => {
       doc = await fetch('/base/test/testfiles/valid2007B4.scd')
         .then(response => response.text())
         .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-      parent = <WizardingElement & EditingElement>(
+      parent = <MockWizardEditor>(
         await fixture(
           html`<mock-wizard-editor
             ><bay-editor .element=${doc.querySelector('Bay')}></bay-editor
@@ -193,7 +193,7 @@ describe('bay-editor wizarding editing integration', () => {
   });
   describe('move action', () => {
     let doc: XMLDocument;
-    let parent: WizardingElement & EditingElement;
+    let parent: MockWizardEditor;
     let element: BayEditor | null;
     let element2: BayEditor | null;
 
@@ -201,7 +201,7 @@ describe('bay-editor wizarding editing integration', () => {
       doc = await fetch('/base/test/testfiles/valid2007B4.scd')
         .then(response => response.text())
         .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-      parent = <WizardingElement & EditingElement>(
+      parent = <MockWizardEditor>(
         await fixture(
           html`<mock-wizard-editor
             >${Array.from(doc?.querySelectorAll('Bay') ?? []).map(
@@ -229,14 +229,14 @@ describe('bay-editor wizarding editing integration', () => {
   });
   describe('remove action', () => {
     let doc: XMLDocument;
-    let parent: WizardingElement & EditingElement;
+    let parent: MockWizardEditor;
     let element: BayEditor | null;
 
     beforeEach(async () => {
       doc = await fetch('/base/test/testfiles/valid2007B4.scd')
         .then(response => response.text())
         .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-      parent = <WizardingElement & EditingElement>(
+      parent = <MockWizardEditor>(
         await fixture(
           html`<mock-wizard-editor
             ><bay-editor
@@ -258,7 +258,7 @@ describe('bay-editor wizarding editing integration', () => {
   });
   describe('clone action', () => {
     let doc: XMLDocument;
-    let parent: WizardingElement & EditingElement;
+    let parent: MockWizardEditor;
     let element: BayEditor | null;
     let copyContentButton: HTMLElement;
 
@@ -266,7 +266,7 @@ describe('bay-editor wizarding editing integration', () => {
       doc = await fetch('/base/test/testfiles/valid2007B4.scd')
         .then(response => response.text())
         .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-      parent = <WizardingElement & EditingElement>(
+      parent = <MockWizardEditor>(
         await fixture(
           html`<mock-wizard-editor
             ><bay-editor
diff --git a/test/integration/zeroline/bay-editor-wizarding.test.ts b/test/integration/zeroline/bay-editor-wizarding.test.ts
index cd8279f10..d41dc0609 100644
--- a/test/integration/zeroline/bay-editor-wizarding.test.ts
+++ b/test/integration/zeroline/bay-editor-wizarding.test.ts
@@ -1,20 +1,21 @@
 import { fixture, html, expect } from '@open-wc/testing';
 import fc from 'fast-check';
 
-import { regExp, regexString } from '../../foundation.js';
 import '../../mock-wizard.js';
+import { MockWizard } from '../../mock-wizard.js';
 
-import { WizardingElement } from '../../../src/Wizarding.js';
+import '../../../src/zeroline/bay-editor.js';
+import { regExp, regexString } from '../../foundation.js';
 
 describe('bay-editor wizarding integration', () => {
   let doc: XMLDocument;
-  let parent: WizardingElement;
+  let parent: MockWizard;
 
   beforeEach(async () => {
     doc = await fetch('/base/test/testfiles/valid2007B4.scd')
       .then(response => response.text())
       .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-    parent = <WizardingElement>(
+    parent = <MockWizard>(
       await fixture(
         html`<mock-wizard
           ><bay-editor .element=${doc.querySelector('Bay')}></bay-editor
diff --git a/test/integration/zeroline/conducting-equipment-editor-wizarding-editing.test.ts b/test/integration/zeroline/conducting-equipment-editor-wizarding-editing.test.ts
index 930181cfa..5c7aadf2e 100644
--- a/test/integration/zeroline/conducting-equipment-editor-wizarding-editing.test.ts
+++ b/test/integration/zeroline/conducting-equipment-editor-wizarding-editing.test.ts
@@ -1,15 +1,16 @@
 import { fixture, html, expect } from '@open-wc/testing';
 
 import '../../mock-wizard-editor.js';
-import { EditingElement } from '../../../src/Editing.js';
-import { WizardingElement } from '../../../src/Wizarding.js';
-import { WizardTextField } from '../../../src/wizard-textfield.js';
+import { MockWizardEditor } from '../../mock-wizard-editor.js';
+
+import '../../../src/zeroline/conducting-equipment-editor.js';
 import { ConductingEquipmentEditor } from '../../../src/zeroline/conducting-equipment-editor.js';
+import { WizardTextField } from '../../../src/wizard-textfield.js';
 
 describe('conducting-equipment-editor wizarding editing integration', () => {
   describe('edit wizard', () => {
     let doc: XMLDocument;
-    let parent: WizardingElement & EditingElement;
+    let parent: MockWizardEditor;
     let element: ConductingEquipmentEditor | null;
 
     let nameField: WizardTextField;
@@ -21,7 +22,7 @@ describe('conducting-equipment-editor wizarding editing integration', () => {
       doc = await fetch('/base/test/testfiles/valid2007B4.scd')
         .then(response => response.text())
         .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-      parent = <WizardingElement & EditingElement>(
+      parent = <MockWizardEditor>(
         await fixture(
           html`<mock-wizard-editor
             ><conducting-equipment-editor
@@ -95,14 +96,14 @@ describe('conducting-equipment-editor wizarding editing integration', () => {
   });
   describe('open lnode wizard', () => {
     let doc: XMLDocument;
-    let parent: WizardingElement & EditingElement;
+    let parent: MockWizardEditor;
     let element: ConductingEquipmentEditor | null;
 
     beforeEach(async () => {
       doc = await fetch('/base/test/testfiles/valid2007B4.scd')
         .then(response => response.text())
         .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-      parent = <WizardingElement & EditingElement>(
+      parent = <MockWizardEditor>(
         await fixture(
           html`<mock-wizard-editor
             ><conducting-equipment-editor
@@ -128,7 +129,7 @@ describe('conducting-equipment-editor wizarding editing integration', () => {
   });
   describe('move action', () => {
     let doc: XMLDocument;
-    let parent: WizardingElement & EditingElement;
+    let parent: MockWizardEditor;
     let element: ConductingEquipmentEditor | null;
     let element2: ConductingEquipmentEditor | null;
 
@@ -136,7 +137,7 @@ describe('conducting-equipment-editor wizarding editing integration', () => {
       doc = await fetch('/base/test/testfiles/valid2007B4.scd')
         .then(response => response.text())
         .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-      parent = <WizardingElement & EditingElement>(
+      parent = <MockWizardEditor>(
         await fixture(
           html`<mock-wizard-editor
             >${Array.from(
@@ -177,14 +178,14 @@ describe('conducting-equipment-editor wizarding editing integration', () => {
   });
   describe('remove action', () => {
     let doc: XMLDocument;
-    let parent: WizardingElement & EditingElement;
+    let parent: MockWizardEditor;
     let element: ConductingEquipmentEditor | null;
 
     beforeEach(async () => {
       doc = await fetch('/base/test/testfiles/valid2007B4.scd')
         .then(response => response.text())
         .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-      parent = <WizardingElement & EditingElement>(
+      parent = <MockWizardEditor>(
         await fixture(
           html`<mock-wizard-editor
             ><conducting-equipment-editor
diff --git a/test/integration/zeroline/conducting-equipment-editor-wizarding.test.ts b/test/integration/zeroline/conducting-equipment-editor-wizarding.test.ts
index 69b052be1..7dde002ce 100644
--- a/test/integration/zeroline/conducting-equipment-editor-wizarding.test.ts
+++ b/test/integration/zeroline/conducting-equipment-editor-wizarding.test.ts
@@ -1,20 +1,21 @@
 import { fixture, html, expect } from '@open-wc/testing';
 import fc from 'fast-check';
 
-import { regexString, regExp } from '../../foundation.js';
 import '../../mock-wizard.js';
+import { MockWizard } from '../../mock-wizard.js';
 
-import { WizardingElement } from '../../../src/Wizarding.js';
+import '../../../src/zeroline/conducting-equipment-editor.js';
+import { regexString, regExp } from '../../foundation.js';
 
 describe('conducting-equipment-editor wizarding integration', () => {
   let doc: XMLDocument;
-  let parent: WizardingElement;
+  let parent: MockWizard;
 
   beforeEach(async () => {
     doc = await fetch('/base/test/testfiles/valid2007B4.scd')
       .then(response => response.text())
       .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-    parent = <WizardingElement>(
+    parent = <MockWizard>(
       await fixture(
         html`<mock-wizard
           ><conducting-equipment-editor
diff --git a/test/integration/zeroline/substation-editor-wizarding-editing.test.ts b/test/integration/zeroline/substation-editor-wizarding-editing.test.ts
index 74e570a15..60d810c31 100644
--- a/test/integration/zeroline/substation-editor-wizarding-editing.test.ts
+++ b/test/integration/zeroline/substation-editor-wizarding-editing.test.ts
@@ -1,15 +1,16 @@
 import { fixture, html, expect } from '@open-wc/testing';
 
 import '../../mock-wizard-editor.js';
-import { EditingElement } from '../../../src/Editing.js';
+import { MockWizardEditor } from '../../mock-wizard-editor.js';
+
+import '../../../src/zeroline/substation-editor.js';
 import { SubstationEditor } from '../../../src/zeroline/substation-editor.js';
-import { WizardingElement } from '../../../src/Wizarding.js';
 import { WizardTextField } from '../../../src/wizard-textfield.js';
 
 describe('substation-editor wizarding editing integration', () => {
   describe('edit wizard', () => {
     let doc: XMLDocument;
-    let parent: WizardingElement & EditingElement;
+    let parent: MockWizardEditor;
     let element: SubstationEditor | null;
 
     let nameField: WizardTextField;
@@ -21,7 +22,7 @@ describe('substation-editor wizarding editing integration', () => {
       doc = await fetch('/base/test/testfiles/valid2007B4.scd')
         .then(response => response.text())
         .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-      parent = <WizardingElement & EditingElement>(
+      parent = <MockWizardEditor>(
         await fixture(
           html`<mock-wizard-editor
             ><substation-editor
@@ -85,7 +86,7 @@ describe('substation-editor wizarding editing integration', () => {
   });
   describe('open add voltage level wizard', () => {
     let doc: XMLDocument;
-    let parent: WizardingElement & EditingElement;
+    let parent: MockWizardEditor;
     let element: SubstationEditor | null;
 
     let nameField: WizardTextField;
@@ -95,7 +96,7 @@ describe('substation-editor wizarding editing integration', () => {
       doc = await fetch('/base/test/testfiles/valid2007B4.scd')
         .then(response => response.text())
         .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-      parent = <WizardingElement & EditingElement>(
+      parent = <MockWizardEditor>(
         await fixture(
           html`<mock-wizard-editor
             ><substation-editor
@@ -147,14 +148,14 @@ describe('substation-editor wizarding editing integration', () => {
   });
   describe('open lnode wizard', () => {
     let doc: XMLDocument;
-    let parent: WizardingElement & EditingElement;
+    let parent: MockWizardEditor;
     let element: SubstationEditor | null;
 
     beforeEach(async () => {
       doc = await fetch('/base/test/testfiles/valid2007B4.scd')
         .then(response => response.text())
         .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-      parent = <WizardingElement & EditingElement>(
+      parent = <MockWizardEditor>(
         await fixture(
           html`<mock-wizard-editor
             ><substation-editor
@@ -182,14 +183,14 @@ describe('substation-editor wizarding editing integration', () => {
   });
   describe('remove action', () => {
     let doc: XMLDocument;
-    let parent: WizardingElement & EditingElement;
+    let parent: MockWizardEditor;
     let element: SubstationEditor | null;
 
     beforeEach(async () => {
       doc = await fetch('/base/test/testfiles/valid2007B4.scd')
         .then(response => response.text())
         .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-      parent = <WizardingElement & EditingElement>(
+      parent = <MockWizardEditor>(
         await fixture(
           html`<mock-wizard-editor
             ><substation-editor
diff --git a/test/integration/zeroline/substation-editor-wizarding.test.ts b/test/integration/zeroline/substation-editor-wizarding.test.ts
index 2a0d2541e..2c43173ed 100644
--- a/test/integration/zeroline/substation-editor-wizarding.test.ts
+++ b/test/integration/zeroline/substation-editor-wizarding.test.ts
@@ -1,19 +1,21 @@
 import { fixture, html, expect } from '@open-wc/testing';
 import fc from 'fast-check';
-import { regExp, regexString } from '../../foundation.js';
 
 import '../../mock-wizard.js';
-import { WizardingElement } from '../../../src/Wizarding.js';
+import { MockWizard } from '../../mock-wizard.js';
+
+import '../../../src/zeroline/substation-editor.js';
+import { regExp, regexString } from '../../foundation.js';
 
 describe('substation-editor wizarding integration', () => {
   let doc: XMLDocument;
-  let parent: WizardingElement;
+  let parent: MockWizard;
 
   beforeEach(async () => {
     doc = await fetch('/base/test/testfiles/valid2007B4.scd')
       .then(response => response.text())
       .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-    parent = <WizardingElement>(
+    parent = <MockWizard>(
       await fixture(
         html`<mock-wizard
           ><substation-editor
diff --git a/test/integration/zeroline/voltage-level-editor-wizarding-editing.test.ts b/test/integration/zeroline/voltage-level-editor-wizarding-editing.test.ts
index c458be24d..fd9567ec8 100644
--- a/test/integration/zeroline/voltage-level-editor-wizarding-editing.test.ts
+++ b/test/integration/zeroline/voltage-level-editor-wizarding-editing.test.ts
@@ -1,16 +1,16 @@
 import { fixture, html, expect } from '@open-wc/testing';
 
 import '../../mock-wizard-editor.js';
+import { MockWizardEditor } from '../../mock-wizard-editor.js';
 
-import { EditingElement } from '../../../src/Editing.js';
+import '../../../src/zeroline/voltage-level-editor.js';
 import { VoltageLevelEditor } from '../../../src/zeroline/voltage-level-editor.js';
-import { WizardingElement } from '../../../src/Wizarding.js';
 import { WizardTextField } from '../../../src/wizard-textfield.js';
 
 describe('voltage-level-editor wizarding editing integration', () => {
   describe('edit wizard', () => {
     let doc: XMLDocument;
-    let parent: WizardingElement & EditingElement;
+    let parent: MockWizardEditor;
     let element: VoltageLevelEditor | null;
 
     let nameField: WizardTextField;
@@ -25,7 +25,7 @@ describe('voltage-level-editor wizarding editing integration', () => {
       doc = await fetch('/base/test/testfiles/valid2007B4.scd')
         .then(response => response.text())
         .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-      parent = <WizardingElement & EditingElement>(
+      parent = <MockWizardEditor>(
         await fixture(
           html`<mock-wizard-editor
             ><voltage-level-editor
@@ -172,7 +172,7 @@ describe('voltage-level-editor wizarding editing integration', () => {
   });
   describe('open add bay wizard', () => {
     let doc: XMLDocument;
-    let parent: WizardingElement & EditingElement;
+    let parent: MockWizardEditor;
     let element: VoltageLevelEditor | null;
 
     let nameField: WizardTextField;
@@ -182,7 +182,7 @@ describe('voltage-level-editor wizarding editing integration', () => {
       doc = await fetch('/base/test/testfiles/valid2007B4.scd')
         .then(response => response.text())
         .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-      parent = <WizardingElement & EditingElement>(
+      parent = <MockWizardEditor>(
         await fixture(
           html`<mock-wizard-editor
             ><voltage-level-editor
@@ -231,14 +231,14 @@ describe('voltage-level-editor wizarding editing integration', () => {
   });
   describe('open lnode wizard', () => {
     let doc: XMLDocument;
-    let parent: WizardingElement & EditingElement;
+    let parent: MockWizardEditor;
     let element: VoltageLevelEditor | null;
 
     beforeEach(async () => {
       doc = await fetch('/base/test/testfiles/valid2007B4.scd')
         .then(response => response.text())
         .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-      parent = <WizardingElement & EditingElement>(
+      parent = <MockWizardEditor>(
         await fixture(
           html`<mock-wizard-editor
             ><voltage-level-editor
@@ -266,7 +266,7 @@ describe('voltage-level-editor wizarding editing integration', () => {
   });
   describe('move action', () => {
     let doc: XMLDocument;
-    let parent: WizardingElement & EditingElement;
+    let parent: MockWizardEditor;
     let element: VoltageLevelEditor | null;
     let element2: VoltageLevelEditor | null;
 
@@ -274,7 +274,7 @@ describe('voltage-level-editor wizarding editing integration', () => {
       doc = await fetch('/base/test/testfiles/valid2007B4.scd')
         .then(response => response.text())
         .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-      parent = <WizardingElement & EditingElement>(
+      parent = <MockWizardEditor>(
         await fixture(
           html`<mock-wizard-editor
             >${Array.from(doc?.querySelectorAll('VoltageLevel') ?? []).map(
@@ -307,14 +307,14 @@ describe('voltage-level-editor wizarding editing integration', () => {
   });
   describe('remove action', () => {
     let doc: XMLDocument;
-    let parent: WizardingElement & EditingElement;
+    let parent: MockWizardEditor;
     let element: VoltageLevelEditor | null;
 
     beforeEach(async () => {
       doc = await fetch('/base/test/testfiles/valid2007B4.scd')
         .then(response => response.text())
         .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-      parent = <WizardingElement & EditingElement>(
+      parent = <MockWizardEditor>(
         await fixture(
           html`<mock-wizard-editor
             ><voltage-level-editor
@@ -336,7 +336,7 @@ describe('voltage-level-editor wizarding editing integration', () => {
   });
   describe('clone action', () => {
     let doc: XMLDocument;
-    let parent: WizardingElement & EditingElement;
+    let parent: MockWizardEditor;
     let element: VoltageLevelEditor | null;
     let copyContentButton: HTMLElement;
 
@@ -344,7 +344,7 @@ describe('voltage-level-editor wizarding editing integration', () => {
       doc = await fetch('/base/test/testfiles/valid2007B4.scd')
         .then(response => response.text())
         .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-      parent = <WizardingElement & EditingElement>(
+      parent = <MockWizardEditor>(
         await fixture(
           html`<mock-wizard-editor
             ><voltage-level-editor
diff --git a/test/integration/zeroline/voltage-level-editor-wizarding.test.ts b/test/integration/zeroline/voltage-level-editor-wizarding.test.ts
index 1e0857c74..e221eaae1 100644
--- a/test/integration/zeroline/voltage-level-editor-wizarding.test.ts
+++ b/test/integration/zeroline/voltage-level-editor-wizarding.test.ts
@@ -2,19 +2,20 @@ import { fixture, html, expect } from '@open-wc/testing';
 import fc from 'fast-check';
 
 import '../../mock-wizard.js';
-import { WizardingElement } from '../../../src/Wizarding.js';
+import { MockWizard } from '../../mock-wizard.js';
 
+import '../../../src/zeroline/voltage-level-editor.js';
 import { regexString, regExp, inverseRegExp } from '../../foundation.js';
 
 describe('voltage-level-editor wizarding integration', () => {
   let doc: XMLDocument;
-  let parent: WizardingElement;
+  let parent: MockWizard;
 
   beforeEach(async () => {
     doc = await fetch('/base/test/testfiles/valid2007B4.scd')
       .then(response => response.text())
       .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-    parent = <WizardingElement>(
+    parent = <MockWizard>(
       await fixture(
         html`<mock-wizard
           ><voltage-level-editor
diff --git a/test/unit/Editing.test.ts b/test/unit/Editing.test.ts
index 56c722a2b..f8b7f5a9e 100644
--- a/test/unit/Editing.test.ts
+++ b/test/unit/Editing.test.ts
@@ -1,12 +1,12 @@
 import { html, fixture, expect } from '@open-wc/testing';
 
-import { EditingElement } from '../../src/Editing.js';
-import { newActionEvent } from '../../src/foundation.js';
-
 import './mock-editor.js';
+import { MockEditor } from './mock-editor.js';
+
+import { newActionEvent } from '../../src/foundation.js';
 
 describe('EditingElement', () => {
-  let elm: EditingElement;
+  let elm: MockEditor;
   let parent: Element;
   let element: Element;
   let reference: Node | null;
@@ -15,7 +15,7 @@ describe('EditingElement', () => {
     const doc = await fetch('/base/test/testfiles/Editing.scd')
       .then(response => response.text())
       .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-    elm = <EditingElement>(
+    elm = <MockEditor>(
       await fixture(html`<mock-editor .doc=${doc}></mock-editor>`)
     );
 
diff --git a/test/unit/Logging.test.ts b/test/unit/Logging.test.ts
index 81137a409..4d3f3a569 100644
--- a/test/unit/Logging.test.ts
+++ b/test/unit/Logging.test.ts
@@ -1,6 +1,9 @@
 import { expect, fixture, html } from '@open-wc/testing';
 
-import { LoggingElement } from '../../src/Logging.js';
+import './mock-logger.js';
+import { MockAction } from './mock-actions.js';
+import { MockLogger } from './mock-logger.js';
+
 import {
   CommitEntry,
   newIssueEvent,
@@ -8,13 +11,10 @@ import {
   newOpenDocEvent,
 } from '../../src/foundation.js';
 
-import { MockAction } from './mock-actions.js';
-import './mock-logger.js';
-
 describe('LoggingElement', () => {
-  let element: LoggingElement;
+  let element: MockLogger;
   beforeEach(async () => {
-    element = <LoggingElement>await fixture(html`<mock-logger></mock-logger>`);
+    element = <MockLogger>await fixture(html`<mock-logger></mock-logger>`);
   });
 
   it('starts out with an empty history', () =>
diff --git a/test/unit/Plugging.test.ts b/test/unit/Plugging.test.ts
index 5e2c6a3ae..6d8d8faf9 100644
--- a/test/unit/Plugging.test.ts
+++ b/test/unit/Plugging.test.ts
@@ -1,12 +1,12 @@
 import { expect, fixture, html } from '@open-wc/testing';
 
-import { PluggingElement } from '../../src/Plugging.js';
-
 import './mock-plugger.js';
+import { MockPlugger } from './mock-plugger.js';
+
 import { TextField } from '@material/mwc-textfield';
 
 describe('PluggingElement', () => {
-  let element: PluggingElement;
+  let element: MockPlugger;
   let doc: XMLDocument;
 
   afterEach(() => localStorage.clear());
@@ -14,7 +14,7 @@ describe('PluggingElement', () => {
     doc = await fetch('/base/test/testfiles/valid2007B4.scd')
       .then(response => response.text())
       .then(str => new DOMParser().parseFromString(str, 'application/xml'));
-    element = <PluggingElement>(
+    element = <MockPlugger>(
       await fixture(
         html`<mock-plugger .doc=${doc} docName="testDoc"></mock-plugger>`
       )
diff --git a/test/unit/Setting.test.ts b/test/unit/Setting.test.ts
index ba5eb4fed..674715794 100644
--- a/test/unit/Setting.test.ts
+++ b/test/unit/Setting.test.ts
@@ -1,17 +1,19 @@
+import { registerTranslateConfig, use } from 'lit-translate';
+
 import { html, fixture, expect } from '@open-wc/testing';
 
-import { registerTranslateConfig, use } from 'lit-translate';
+import './mock-setter.js';
+import { MockSetter } from './mock-setter.js';
 
 import { Button } from '@material/mwc-button';
 
-import { SettingElement, defaults } from '../../src/Setting.js';
-import './mock-setter.js';
+import { defaults } from '../../src/Setting.js';
 
 describe('SettingElement', () => {
-  let element: SettingElement;
+  let element: MockSetter;
   beforeEach(async () => {
     localStorage.clear();
-    element = <SettingElement>await fixture(html`<mock-setter></mock-setter>`);
+    element = <MockSetter>await fixture(html`<mock-setter></mock-setter>`);
   });
 
   it('initially has default settings', () =>
diff --git a/test/unit/Waiting.test.ts b/test/unit/Waiting.test.ts
index ef865a1e7..ddc024058 100644
--- a/test/unit/Waiting.test.ts
+++ b/test/unit/Waiting.test.ts
@@ -1,14 +1,14 @@
 import { html, fixture, expect } from '@open-wc/testing';
 
-import { newPendingStateEvent } from '../../src/foundation.js';
-import { WaitingElement } from '../../src/Waiting.js';
-
 import './mock-waiter.js';
+import { MockWaiter } from './mock-waiter.js';
+
+import { newPendingStateEvent } from '../../src/foundation.js';
 
 describe('WaitingElement', () => {
-  let element: WaitingElement;
+  let element: MockWaiter;
   beforeEach(async () => {
-    element = <WaitingElement>await fixture(html`<mock-waiter></mock-waiter>`);
+    element = <MockWaiter>await fixture(html`<mock-waiter></mock-waiter>`);
   });
 
   it('does not wait for pending state initially', () =>
diff --git a/test/unit/Wizarding.test.ts b/test/unit/Wizarding.test.ts
index 76660b561..be6db14b3 100644
--- a/test/unit/Wizarding.test.ts
+++ b/test/unit/Wizarding.test.ts
@@ -1,10 +1,10 @@
 import { expect, fixture, html } from '@open-wc/testing';
 
+import '../mock-wizard.js';
+
 import { newWizardEvent } from '../../src/foundation.js';
 import { WizardingElement } from '../../src/Wizarding.js';
 
-import '../mock-wizard.js';
-
 describe('WizardingElement', () => {
   let element: WizardingElement;
   beforeEach(async () => {
diff --git a/test/unit/editor-container.test.ts b/test/unit/editor-container.test.ts
index 5d878c37b..d634f0ad5 100644
--- a/test/unit/editor-container.test.ts
+++ b/test/unit/editor-container.test.ts
@@ -2,8 +2,8 @@ import { expect, fixture, html } from '@open-wc/testing';
 import sinon, { SinonSpy } from 'sinon';
 
 import '../../src/editor-container.js';
+import '../../src/zeroline/bay-editor.js';
 import { EditorContainer } from '../../src/editor-container.js';
-import { BayEditor } from '../../src/zeroline/bay-editor.js';
 
 describe('editor-container', () => {
   let element: EditorContainer;
diff --git a/test/unit/editors/communication/ConnectedAPEditor.test.ts b/test/unit/editors/communication/ConnectedAPEditor.test.ts
index 25d4cc874..0dc18a457 100644
--- a/test/unit/editors/communication/ConnectedAPEditor.test.ts
+++ b/test/unit/editors/communication/ConnectedAPEditor.test.ts
@@ -1,5 +1,7 @@
 import { fixture, html, expect } from '@open-wc/testing';
 
+import '../../../../src/wizard-textfield.js';
+import { editConnectedApAction } from '../../../../src/editors/communication/connectedap-editor.js';
 import {
   WizardInput,
   isCreate,
@@ -8,8 +10,6 @@ import {
   ComplexAction,
 } from '../../../../src/foundation.js';
 
-import { editConnectedApAction } from '../../../../src/editors/communication/connectedap-editor.js';
-
 describe('ConnectedAPEditor', () => {
   describe('has a editorAction that', () => {
     describe('with existing Address element', () => {
diff --git a/test/unit/editors/communication/SubNetwork.test.ts b/test/unit/editors/communication/SubNetwork.test.ts
index 8b57bfca9..d4150677c 100644
--- a/test/unit/editors/communication/SubNetwork.test.ts
+++ b/test/unit/editors/communication/SubNetwork.test.ts
@@ -1,14 +1,16 @@
 import { fixture, html, expect } from '@open-wc/testing';
+
+import '../../../../src/wizard-textfield.js';
+import {
+  createSubNetworkAction,
+  updateSubNetworkAction,
+} from '../../../../src/editors/communication/subnetwork-editor.js';
 import {
   WizardInput,
   isCreate,
   isUpdate,
   isDelete,
 } from '../../../../src/foundation.js';
-import {
-  createSubNetworkAction,
-  updateSubNetworkAction,
-} from '../../../../src/editors/communication/subnetwork-editor.js';
 
 describe('SubNetworkEditor', () => {
   describe('with no nulled properties', () => {
diff --git a/test/unit/editors/subscriberinfo.test.ts b/test/unit/editors/subscriberinfo.test.ts
index 5e697d796..363f32202 100644
--- a/test/unit/editors/subscriberinfo.test.ts
+++ b/test/unit/editors/subscriberinfo.test.ts
@@ -1,8 +1,7 @@
 import { expect } from '@open-wc/testing';
-import { ExecutionStatus } from 'fast-check';
-import { Create, isCreate, SimpleAction } from '../../../src/foundation.js';
 
 import { createMissingIEDNameSubscriberInfo } from '../../../src/menu/SubscriberInfo.js';
+import { Create, isCreate, SimpleAction } from '../../../src/foundation.js';
 
 describe('SubscriberInfo', () => {
   describe('for Edition2 and higher files', () => {
diff --git a/test/unit/editors/substation/lnodewizard.test.ts b/test/unit/editors/substation/lnodewizard.test.ts
index bfde4d43e..34ad8a0f8 100644
--- a/test/unit/editors/substation/lnodewizard.test.ts
+++ b/test/unit/editors/substation/lnodewizard.test.ts
@@ -1,4 +1,5 @@
 import { expect } from '@open-wc/testing';
+
 import { getLNode } from '../../../../src/wizards/lnode.js';
 
 describe('lnodewizard', () => {
diff --git a/test/unit/editors/updatesubstation.test.ts b/test/unit/editors/updatesubstation.test.ts
index d52ac663a..aae1f1e94 100644
--- a/test/unit/editors/updatesubstation.test.ts
+++ b/test/unit/editors/updatesubstation.test.ts
@@ -1,6 +1,7 @@
 import { expect } from '@open-wc/testing';
-import { identity } from '../../../src/foundation.js';
+
 import { isValidReference } from '../../../src/menu/UpdateSubstation.js';
+import { identity } from '../../../src/foundation.js';
 
 describe('isValidReference', () => {
   let ours: XMLDocument;
diff --git a/test/unit/filtered-list.test.ts b/test/unit/filtered-list.test.ts
index 38e0b22ca..2c304dbb2 100644
--- a/test/unit/filtered-list.test.ts
+++ b/test/unit/filtered-list.test.ts
@@ -1,4 +1,8 @@
 import { expect, fixture, html } from '@open-wc/testing';
+
+import '@material/mwc-list/mwc-check-list-item';
+
+import '../../src/filtered-list.js';
 import { FilteredList } from '../../src/filtered-list.js';
 
 describe('filtered-list', () => {
diff --git a/test/unit/finder-list.test.ts b/test/unit/finder-list.test.ts
index 3ed0f9caf..e609e43d5 100644
--- a/test/unit/finder-list.test.ts
+++ b/test/unit/finder-list.test.ts
@@ -1,5 +1,7 @@
-import { ListItem } from '@material/mwc-list/mwc-list-item';
 import { expect, fixture, html } from '@open-wc/testing';
+
+import { ListItem } from '@material/mwc-list/mwc-list-item';
+
 import '../../src/finder-list.js';
 import { Directory, FinderList, Path } from '../../src/finder-list.js';
 import { depth } from '../../src/foundation.js';
diff --git a/test/unit/menu/UpdateDescritionABB.test.ts b/test/unit/menu/UpdateDescritionABB.test.ts
index 0fcc8c5d0..7bc737639 100644
--- a/test/unit/menu/UpdateDescritionABB.test.ts
+++ b/test/unit/menu/UpdateDescritionABB.test.ts
@@ -2,9 +2,10 @@ import { expect, fixture, html } from '@open-wc/testing';
 import sinon, { SinonSpy } from 'sinon';
 
 import '../../mock-wizard.js';
-import UpdateDescriptionAbb from '../../../src/menu/UpdateDescriptionABB.js';
 import { MockWizard } from '../../mock-wizard.js';
+
 import { ComplexAction, isSimple, isUpdate } from '../../../src/foundation.js';
+import UpdateDescriptionAbb from '../../../src/menu/UpdateDescriptionABB.js';
 
 describe('Update method for desc attributes in ABB IEDs', () => {
   if (customElements.get('update-description-abb') === undefined)
diff --git a/test/unit/validators/ValidateTemplates.test.ts b/test/unit/validators/ValidateTemplates.test.ts
index 7b144c580..1bc861be3 100644
--- a/test/unit/validators/ValidateTemplates.test.ts
+++ b/test/unit/validators/ValidateTemplates.test.ts
@@ -1,7 +1,9 @@
-import { expect, fixture, html } from '@open-wc/testing';
 import { registerTranslateConfig, use } from 'lit-translate';
+
+import { expect, fixture, html } from '@open-wc/testing';
 import sinon, { SinonSpy } from 'sinon';
 
+import '../../../src/open-scd.js';
 import { OpenSCD } from '../../../src/open-scd.js';
 
 import ValidateTemplates, {
@@ -9,6 +11,9 @@ import ValidateTemplates, {
 } from '../../../src/validators/ValidateTemplates.js';
 
 describe('ValidateTemplates', () => {
+  if (customElements.get('validate-templates') === undefined)
+    customElements.define('validate-templates', ValidateTemplates);
+
   let logEvent: SinonSpy;
   let issueEvent: SinonSpy;
 
diff --git a/test/unit/validators/templates/datype.test.ts b/test/unit/validators/templates/datype.test.ts
index f64f65542..017a8eb7a 100644
--- a/test/unit/validators/templates/datype.test.ts
+++ b/test/unit/validators/templates/datype.test.ts
@@ -1,4 +1,5 @@
 import { expect } from '@open-wc/testing';
+
 import { dATypeValidator } from '../../../../src/validators/templates/datype.js';
 
 describe('datype validator', () => {
diff --git a/test/unit/validators/templates/doorsdo.test.ts b/test/unit/validators/templates/doorsdo.test.ts
index 6ae2ba66a..0290c9fc8 100644
--- a/test/unit/validators/templates/doorsdo.test.ts
+++ b/test/unit/validators/templates/doorsdo.test.ts
@@ -1,4 +1,5 @@
 import { expect } from '@open-wc/testing';
+
 import { dOValidator } from '../../../../src/validators/templates/dosdo.js';
 
 describe('do or sdo validator', () => {
diff --git a/test/unit/validators/templates/dotype.test.ts b/test/unit/validators/templates/dotype.test.ts
index 6dcc18b1a..6981454f9 100644
--- a/test/unit/validators/templates/dotype.test.ts
+++ b/test/unit/validators/templates/dotype.test.ts
@@ -1,4 +1,5 @@
 import { expect } from '@open-wc/testing';
+
 import { dOTypeValidator } from '../../../../src/validators/templates/dotype.js';
 
 describe('dotype validator', () => {
diff --git a/test/unit/validators/templates/foundation.test.ts b/test/unit/validators/templates/foundation.test.ts
index f33eaf82b..36510b28a 100644
--- a/test/unit/validators/templates/foundation.test.ts
+++ b/test/unit/validators/templates/foundation.test.ts
@@ -1,4 +1,5 @@
 import { expect } from '@open-wc/testing';
+
 import {
   tagValidator,
   validateChildren,
diff --git a/test/unit/wizard-dialog.test.ts b/test/unit/wizard-dialog.test.ts
index 99508063a..59fc6a221 100644
--- a/test/unit/wizard-dialog.test.ts
+++ b/test/unit/wizard-dialog.test.ts
@@ -1,5 +1,7 @@
 import { html, fixture, expect } from '@open-wc/testing';
 
+import './mock-editor.js';
+
 import { Button } from '@material/mwc-button';
 
 import '../../src/wizard-textfield.js';
@@ -7,8 +9,6 @@ import '../../src/wizard-dialog.js';
 import { WizardDialog } from '../../src/wizard-dialog.js';
 import { EditorAction, WizardInput } from '../../src/foundation.js';
 
-import './mock-editor.js';
-
 describe('wizard-dialog', () => {
   let element: WizardDialog;
   beforeEach(async () => {
diff --git a/test/unit/wizard-select.test.ts b/test/unit/wizard-select.test.ts
index 242edcf09..f2b675f6e 100644
--- a/test/unit/wizard-select.test.ts
+++ b/test/unit/wizard-select.test.ts
@@ -1,5 +1,7 @@
 import { html, fixture, expect } from '@open-wc/testing';
 
+import '@material/mwc-list/mwc-list-item';
+
 import '../../src/wizard-select.js';
 import { WizardSelect } from '../../src/wizard-select.js';
 
diff --git a/test/unit/wizards/abstractda.test.ts b/test/unit/wizards/abstractda.test.ts
index 6f6316522..b13e39e2d 100644
--- a/test/unit/wizards/abstractda.test.ts
+++ b/test/unit/wizards/abstractda.test.ts
@@ -1,5 +1,11 @@
 import { expect, fixture, html } from '@open-wc/testing';
 import fc from 'fast-check';
+
+import '../../mock-wizard.js';
+import { MockWizard } from '../../mock-wizard.js';
+
+import { WizardSelect } from '../../../src/wizard-select.js';
+import { WizardTextField } from '../../../src/wizard-textfield.js';
 import {
   Create,
   isCreate,
@@ -7,14 +13,11 @@ import {
   isUpdate,
   Update,
 } from '../../../src/foundation.js';
-import { WizardSelect } from '../../../src/wizard-select.js';
-import { WizardTextField } from '../../../src/wizard-textfield.js';
 import {
   getValAction,
   wizardContent,
 } from '../../../src/wizards/abstractda.js';
 import { regExp, regexString } from '../../foundation.js';
-import { MockWizard } from '../../mock-wizard.js';
 
 describe('abstractda wizards', () => {
   describe('getValAction', () => {
diff --git a/test/unit/wizards/address.test.ts b/test/unit/wizards/address.test.ts
index 555513eda..475d5e28b 100644
--- a/test/unit/wizards/address.test.ts
+++ b/test/unit/wizards/address.test.ts
@@ -1,6 +1,10 @@
 import { expect, fixture, html } from '@open-wc/testing';
-import fc from 'fast-check';
-import { typePattern } from '../../../src/editors/communication/p-types.js';
+
+import '../../mock-wizard.js';
+import { MockWizard } from '../../mock-wizard.js';
+
+import { WizardSelect } from '../../../src/wizard-select.js';
+import { WizardTextField } from '../../../src/wizard-textfield.js';
 import {
   Create,
   Delete,
@@ -9,13 +13,10 @@ import {
   Wizard,
   WizardInput,
 } from '../../../src/foundation.js';
-import { WizardSelect } from '../../../src/wizard-select.js';
-import { WizardTextField } from '../../../src/wizard-textfield.js';
 import {
   renderGseSmvAddress,
   updateAddress,
 } from '../../../src/wizards/address.js';
-import { MockWizard } from '../../mock-wizard.js';
 
 describe('address', () => {
   let doc: XMLDocument;
diff --git a/test/unit/wizards/bda.test.ts b/test/unit/wizards/bda.test.ts
index fa8648ca6..31069d597 100644
--- a/test/unit/wizards/bda.test.ts
+++ b/test/unit/wizards/bda.test.ts
@@ -1,6 +1,10 @@
 import { expect, fixture, html } from '@open-wc/testing';
+
+import '../../mock-wizard.js';
 import { MockWizard } from '../../mock-wizard.js';
 
+import { WizardSelect } from '../../../src/wizard-select.js';
+import { WizardTextField } from '../../../src/wizard-textfield.js';
 import {
   Create,
   isCreate,
@@ -9,12 +13,7 @@ import {
   Wizard,
   WizardInput,
 } from '../../../src/foundation.js';
-
 import { wizardContent } from '../../../src/wizards/abstractda.js';
-
-import { WizardSelect } from '../../../src/wizard-select.js';
-import { WizardTextField } from '../../../src/wizard-textfield.js';
-
 import { createBDaAction, updateBDaAction } from '../../../src/wizards/bda.js';
 
 describe('bda wizards', () => {
diff --git a/test/unit/wizards/clientln.test.ts b/test/unit/wizards/clientln.test.ts
index 77a78bce6..8876a9d16 100644
--- a/test/unit/wizards/clientln.test.ts
+++ b/test/unit/wizards/clientln.test.ts
@@ -1,11 +1,15 @@
 import { expect, fixture, html } from '@open-wc/testing';
 
+import '../../mock-wizard-editor.js';
 import { MockWizardEditor } from '../../mock-wizard-editor.js';
-import { ZerolinePane } from '../../../src/zeroline-pane.js';
-import { IedEditor } from '../../../src/zeroline/ied-editor.js';
+
 import { List } from '@material/mwc-list';
 import { ListItem } from '@material/mwc-list/mwc-list-item';
 
+import '../../../src/zeroline-pane.js';
+import { IedEditor } from '../../../src/zeroline/ied-editor.js';
+import { ZerolinePane } from '../../../src/zeroline-pane.js';
+
 describe('clientln wizards', () => {
   let doc: Document;
   let parent: MockWizardEditor;
diff --git a/test/unit/wizards/commmap.test.ts b/test/unit/wizards/commmap.test.ts
index 1636c8e02..5466fdb45 100644
--- a/test/unit/wizards/commmap.test.ts
+++ b/test/unit/wizards/commmap.test.ts
@@ -1,10 +1,13 @@
 import { expect, fixture, html } from '@open-wc/testing';
+
+import '../../mock-wizard.js';
+import { MockWizard } from '../../mock-wizard.js';
+
+import '../../../src/zeroline-pane.js';
 import {
   getSinkReferences,
   getSourceReferences,
 } from '../../../src/wizards/commmap-wizards.js';
-
-import { MockWizard } from '../../mock-wizard.js';
 import { ZerolinePane } from '../../../src/zeroline-pane.js';
 
 describe('communication mapping wizard', () => {
diff --git a/test/unit/wizards/controlwithiedname.test.ts b/test/unit/wizards/controlwithiedname.test.ts
index 06da13a28..753fb6ba2 100644
--- a/test/unit/wizards/controlwithiedname.test.ts
+++ b/test/unit/wizards/controlwithiedname.test.ts
@@ -1,7 +1,10 @@
 import { expect, fixture, html } from '@open-wc/testing';
 
-import { List } from '@material/mwc-list';
+import '../../mock-wizard-editor.js';
 import { MockWizardEditor } from '../../mock-wizard-editor.js';
+
+import '../../../src/zeroline-pane.js';
+import { List } from '@material/mwc-list';
 import { ZerolinePane } from '../../../src/zeroline-pane.js';
 
 describe('selectExtRefWizard', () => {
diff --git a/test/unit/wizards/da.test.ts b/test/unit/wizards/da.test.ts
index d9d9efd7f..07f53a749 100644
--- a/test/unit/wizards/da.test.ts
+++ b/test/unit/wizards/da.test.ts
@@ -1,6 +1,11 @@
 import { expect, fixture, html } from '@open-wc/testing';
+
+import '../../mock-wizard.js';
 import { MockWizard } from '../../mock-wizard.js';
 
+import { wizardContent } from '../../../src/wizards/abstractda.js';
+import { WizardSelect } from '../../../src/wizard-select.js';
+import { WizardTextField } from '../../../src/wizard-textfield.js';
 import {
   Create,
   isCreate,
@@ -9,18 +14,11 @@ import {
   Wizard,
   WizardInput,
 } from '../../../src/foundation.js';
-
-import { wizardContent } from '../../../src/wizards/abstractda.js';
-
-import { WizardSelect } from '../../../src/wizard-select.js';
-import { WizardTextField } from '../../../src/wizard-textfield.js';
-
 import {
   createDaAction,
   renderDa,
   updateDaAction,
 } from '../../../src/wizards/da.js';
-import { createBDaAction } from '../../../src/wizards/bda.js';
 
 describe('da wizards', () => {
   describe('updateDaAction', () => {
diff --git a/test/unit/wizards/dataset.test.ts b/test/unit/wizards/dataset.test.ts
index 2e0817968..315023a26 100644
--- a/test/unit/wizards/dataset.test.ts
+++ b/test/unit/wizards/dataset.test.ts
@@ -1,6 +1,11 @@
 import { expect, fixture, html } from '@open-wc/testing';
 import sinon, { SinonSpy } from 'sinon';
 
+import '../../mock-wizard.js';
+import { MockWizard } from '../../mock-wizard.js';
+
+import { editDataSetWizard } from '../../../src/wizards/dataset.js';
+import { WizardTextField } from '../../../src/wizard-textfield.js';
 import {
   Delete,
   isDelete,
@@ -10,11 +15,6 @@ import {
   WizardInput,
 } from '../../../src/foundation.js';
 
-import { editDataSetWizard } from '../../../src/wizards/dataset.js';
-
-import { WizardTextField } from '../../../src/wizard-textfield.js';
-import { MockWizard } from '../../mock-wizard.js';
-
 describe('dataset wizards', () => {
   let doc: XMLDocument;
   let element: MockWizard;
diff --git a/test/unit/wizards/fcda.test.ts b/test/unit/wizards/fcda.test.ts
index 40c469e76..f46c85009 100644
--- a/test/unit/wizards/fcda.test.ts
+++ b/test/unit/wizards/fcda.test.ts
@@ -1,12 +1,12 @@
 import { expect, fixture, html } from '@open-wc/testing';
 import sinon, { SinonSpy } from 'sinon';
 
-import { isCreate } from '../../../src/foundation.js';
+import '../../mock-wizard.js';
+import { MockWizard } from '../../mock-wizard.js';
 
-import { FinderList } from '../../../src/finder-list.js';
 import { createFCDAsWizard } from '../../../src/wizards/fcda.js';
-
-import { MockWizard } from '../../mock-wizard.js';
+import { isCreate } from '../../../src/foundation.js';
+import { FinderList } from '../../../src/finder-list.js';
 
 describe('create wizard for FCDA element', () => {
   let doc: XMLDocument;
diff --git a/test/unit/wizards/gse.test.ts b/test/unit/wizards/gse.test.ts
index 165c00d9c..95bcfac82 100644
--- a/test/unit/wizards/gse.test.ts
+++ b/test/unit/wizards/gse.test.ts
@@ -1,4 +1,9 @@
 import { expect, fixture, html } from '@open-wc/testing';
+
+import '../../mock-wizard.js';
+import { MockWizard } from '../../mock-wizard.js';
+
+import { WizardTextField } from '../../../src/wizard-textfield.js';
 import {
   ComplexAction,
   Create,
@@ -11,13 +16,11 @@ import {
   Wizard,
   WizardInput,
 } from '../../../src/foundation.js';
-import { WizardTextField } from '../../../src/wizard-textfield.js';
 import {
   editGseWizard,
   getMTimeAction,
   updateGSEAction,
 } from '../../../src/wizards/gse.js';
-import { MockWizard } from '../../mock-wizard.js';
 
 describe('gse wizards', () => {
   let doc: XMLDocument;
diff --git a/test/unit/wizards/gsecontrol.test.ts b/test/unit/wizards/gsecontrol.test.ts
index f91ab311e..1debafc4e 100644
--- a/test/unit/wizards/gsecontrol.test.ts
+++ b/test/unit/wizards/gsecontrol.test.ts
@@ -1,5 +1,10 @@
 import { expect, fixture, html } from '@open-wc/testing';
 import fc from 'fast-check';
+
+import '../../mock-wizard.js';
+import { MockWizard } from '../../mock-wizard.js';
+
+import { WizardTextField } from '../../../src/wizard-textfield.js';
 import {
   isDelete,
   isUpdate,
@@ -7,7 +12,6 @@ import {
   Wizard,
   WizardInput,
 } from '../../../src/foundation.js';
-import { WizardTextField } from '../../../src/wizard-textfield.js';
 import {
   editGseControlWizard,
   removeGseControl,
@@ -16,7 +20,6 @@ import {
   updateGseControlAction,
 } from '../../../src/wizards/gsecontrol.js';
 import { regExp, regexString } from '../../foundation.js';
-import { MockWizard } from '../../mock-wizard.js';
 
 describe('gsecontrol wizards', () => {
   let doc: XMLDocument;
diff --git a/test/unit/zeroline-pane.test.ts b/test/unit/zeroline-pane.test.ts
index 53f67d621..28d779067 100644
--- a/test/unit/zeroline-pane.test.ts
+++ b/test/unit/zeroline-pane.test.ts
@@ -1,4 +1,6 @@
 import { expect, fixture, html } from '@open-wc/testing';
+
+import '../../src/zeroline-pane.js';
 import {
   attachedIeds,
   getAttachedIeds,
diff --git a/test/unit/zeroline/ConductingEquipmentEditor.test.ts b/test/unit/zeroline/ConductingEquipmentEditor.test.ts
index 7041218b3..943e6036d 100644
--- a/test/unit/zeroline/ConductingEquipmentEditor.test.ts
+++ b/test/unit/zeroline/ConductingEquipmentEditor.test.ts
@@ -1,5 +1,6 @@
 import { fixture, html, expect } from '@open-wc/testing';
 
+import '../../../src/wizard-textfield.js';
 import { WizardInput, isCreate, isUpdate } from '../../../src/foundation.js';
 import { createAction } from '../../../src/wizards/conductingequipment.js';
 import { updateNamingAction } from '../../../src/wizards/foundation/actions.js';
diff --git a/test/unit/zeroline/SubstationEditor.test.ts b/test/unit/zeroline/SubstationEditor.test.ts
index d71145f46..e24ac63b1 100644
--- a/test/unit/zeroline/SubstationEditor.test.ts
+++ b/test/unit/zeroline/SubstationEditor.test.ts
@@ -1,5 +1,6 @@
 import { fixture, html, expect } from '@open-wc/testing';
 
+import '../../../src/wizard-textfield.js';
 import { WizardInput, isCreate, isUpdate } from '../../../src/foundation.js';
 import { updateNamingAction } from '../../../src/wizards/foundation/actions.js';
 import { createAction } from '../../../src/wizards/substation.js';
diff --git a/test/unit/zeroline/VoltageLevelEditor.test.ts b/test/unit/zeroline/VoltageLevelEditor.test.ts
index 11263e15a..02701c5d2 100644
--- a/test/unit/zeroline/VoltageLevelEditor.test.ts
+++ b/test/unit/zeroline/VoltageLevelEditor.test.ts
@@ -1,11 +1,12 @@
 import { fixture, html, expect } from '@open-wc/testing';
+
+import '../../../src/wizard-textfield.js';
 import {
   WizardInput,
   isCreate,
   isUpdate,
   isDelete,
 } from '../../../src/foundation.js';
-
 import {
   createAction,
   updateAction,