diff --git a/packages/form-js-editor/test/helper/index.js b/packages/form-js-editor/test/helper/index.js
index b42263074..4b1320a05 100644
--- a/packages/form-js-editor/test/helper/index.js
+++ b/packages/form-js-editor/test/helper/index.js
@@ -12,7 +12,7 @@ import { act } from 'preact/test-utils';
 
 import TestContainer from 'mocha-test-container-support';
 
-import FormEditor from '../../src/FormEditor';
+import { FormEditor } from '../../src/FormEditor';
 
 let OPTIONS, FORM_EDITOR;
 
diff --git a/packages/form-js-editor/test/helper/mocks/index.js b/packages/form-js-editor/test/helper/mocks/index.js
index 741db224d..742fdf703 100644
--- a/packages/form-js-editor/test/helper/mocks/index.js
+++ b/packages/form-js-editor/test/helper/mocks/index.js
@@ -2,7 +2,7 @@
 import { Injector } from 'didi';
 import { isUndefined } from 'min-dash';
 
-import EditorFormFields from '../../../src/render/EditorFormFields';
+import { EditorFormFields } from '../../../src/render/EditorFormFields';
 
 const EDITOR_CONFIG = {
   propertiesPanel: {
diff --git a/packages/form-js-editor/test/spec/features/editor-actions/FormEditorActions.spec.js b/packages/form-js-editor/test/spec/features/editor-actions/FormEditorActions.spec.js
index afc936992..1b7fcc6ac 100644
--- a/packages/form-js-editor/test/spec/features/editor-actions/FormEditorActions.spec.js
+++ b/packages/form-js-editor/test/spec/features/editor-actions/FormEditorActions.spec.js
@@ -4,9 +4,9 @@ import {
   inject
 } from 'test/TestHelper';
 
-import formEditorActionsModule from 'src/features/editor-actions';
-import modelingModule from 'src/features/modeling';
-import selectionModule from 'src/features/selection';
+import { EditorActionsModule } from 'src/features/editor-actions';
+import { ModelingModule } from 'src/features/modeling';
+import { SelectionModule } from 'src/features/selection';
 
 import schema from '../../form.json';
 
@@ -17,9 +17,9 @@ describe('features/editor-actions', function() {
 
   beforeEach(bootstrapFormEditor(schema, {
     modules: [
-      formEditorActionsModule,
-      modelingModule,
-      selectionModule
+      EditorActionsModule,
+      ModelingModule,
+      SelectionModule
     ]
   }));
 
diff --git a/packages/form-js-editor/test/spec/features/keyboard/FormEditorKeyboardBindings.spec.js b/packages/form-js-editor/test/spec/features/keyboard/FormEditorKeyboardBindings.spec.js
index 81c762870..15be6c75c 100644
--- a/packages/form-js-editor/test/spec/features/keyboard/FormEditorKeyboardBindings.spec.js
+++ b/packages/form-js-editor/test/spec/features/keyboard/FormEditorKeyboardBindings.spec.js
@@ -4,9 +4,9 @@ import {
   inject
 } from 'test/TestHelper';
 
-import formEditorActionsModule from 'src/features/editor-actions';
-import keyboardModule from 'src/features/keyboard';
-import modelingModule from 'src/features/modeling';
+import { EditorActionsModule } from 'src/features/editor-actions';
+import { FormEditorKeyboardModule } from 'src/features/keyboard';
+import { ModelingModule } from 'src/features/modeling';
 
 import { createKeyEvent } from 'diagram-js/test/util/KeyEvents';
 
@@ -22,9 +22,9 @@ describe('features/editor-actions', function() {
 
   beforeEach(bootstrapFormEditor(schema, {
     modules: [
-      modelingModule,
-      formEditorActionsModule,
-      keyboardModule
+      ModelingModule,
+      EditorActionsModule,
+      FormEditorKeyboardModule
     ]
   }));
 
diff --git a/packages/form-js-editor/test/spec/features/modeling/FormLayoutUpdater.spec.js b/packages/form-js-editor/test/spec/features/modeling/FormLayoutUpdater.spec.js
index 82a58a49a..48a9d8615 100644
--- a/packages/form-js-editor/test/spec/features/modeling/FormLayoutUpdater.spec.js
+++ b/packages/form-js-editor/test/spec/features/modeling/FormLayoutUpdater.spec.js
@@ -3,7 +3,7 @@ import {
   inject
 } from '../../../TestHelper';
 
-import modelingModule from 'src/features/modeling';
+import { ModelingModule } from 'src/features/modeling';
 
 import schema from '../../form.json';
 
@@ -12,7 +12,7 @@ describe('features/modeling - FormLayoutUpdater', function() {
 
   beforeEach(bootstrapFormEditor(schema, {
     additionalModules: [
-      modelingModule
+      ModelingModule
     ]
   }));
 
diff --git a/packages/form-js-editor/test/spec/features/modeling/Modeling.spec.js b/packages/form-js-editor/test/spec/features/modeling/Modeling.spec.js
index 1bb26673b..9375b6edc 100644
--- a/packages/form-js-editor/test/spec/features/modeling/Modeling.spec.js
+++ b/packages/form-js-editor/test/spec/features/modeling/Modeling.spec.js
@@ -6,7 +6,7 @@ import {
   inject
 } from '../../../TestHelper';
 
-import modelingModule from 'src/features/modeling';
+import { ModelingModule } from 'src/features/modeling';
 
 import schema from '../../form.json';
 
@@ -17,7 +17,7 @@ describe('features/modeling', function() {
 
   beforeEach(bootstrapFormEditor(schema, {
     modules: [
-      modelingModule
+      ModelingModule
     ]
   }));
 
diff --git a/packages/form-js-editor/test/spec/features/modeling/behavior/ColumnsSourceBehavior.spec.js b/packages/form-js-editor/test/spec/features/modeling/behavior/ColumnsSourceBehavior.spec.js
index bc7f43a6b..4ce8ba324 100644
--- a/packages/form-js-editor/test/spec/features/modeling/behavior/ColumnsSourceBehavior.spec.js
+++ b/packages/form-js-editor/test/spec/features/modeling/behavior/ColumnsSourceBehavior.spec.js
@@ -3,7 +3,7 @@ import {
   inject
 } from '../../../../TestHelper';
 
-import modelingModule from 'src/features/modeling';
+import { ModelingModule } from 'src/features/modeling';
 
 import schema from '../../../form-table.json';
 
@@ -11,7 +11,7 @@ describe('features/modeling - ColumnsSourceBehavior', function() {
 
   beforeEach(bootstrapFormEditor(schema, {
     additionalModules: [
-      modelingModule
+      ModelingModule
     ]
   }));
 
diff --git a/packages/form-js-editor/test/spec/features/modeling/behavior/IdBehavior.spec.js b/packages/form-js-editor/test/spec/features/modeling/behavior/IdBehavior.spec.js
index e586f6b6e..1066e3d97 100644
--- a/packages/form-js-editor/test/spec/features/modeling/behavior/IdBehavior.spec.js
+++ b/packages/form-js-editor/test/spec/features/modeling/behavior/IdBehavior.spec.js
@@ -3,7 +3,7 @@ import {
   inject
 } from '../../../../TestHelper';
 
-import modelingModule from 'src/features/modeling';
+import { ModelingModule } from 'src/features/modeling';
 
 import schema from '../../../form.json';
 
@@ -12,7 +12,7 @@ describe('features/modeling - IdBehavior', function() {
 
   beforeEach(bootstrapFormEditor(schema, {
     modules: [
-      modelingModule
+      ModelingModule
     ]
   }));
 
diff --git a/packages/form-js-editor/test/spec/features/modeling/behavior/KeyBehavior.spec.js b/packages/form-js-editor/test/spec/features/modeling/behavior/KeyBehavior.spec.js
index 0be73e854..65209af3f 100644
--- a/packages/form-js-editor/test/spec/features/modeling/behavior/KeyBehavior.spec.js
+++ b/packages/form-js-editor/test/spec/features/modeling/behavior/KeyBehavior.spec.js
@@ -3,7 +3,7 @@ import {
   inject
 } from '../../../../TestHelper';
 
-import modelingModule from 'src/features/modeling';
+import { ModelingModule } from 'src/features/modeling';
 
 import schema from '../../../form.json';
 
@@ -12,7 +12,7 @@ describe('features/modeling - KeyBehavior', function() {
 
   beforeEach(bootstrapFormEditor(schema, {
     additionalModules: [
-      modelingModule
+      ModelingModule
     ]
   }));
 
diff --git a/packages/form-js-editor/test/spec/features/modeling/behavior/OptionsSourceBehavior.spec.js b/packages/form-js-editor/test/spec/features/modeling/behavior/OptionsSourceBehavior.spec.js
index 2fafae197..342b542ad 100644
--- a/packages/form-js-editor/test/spec/features/modeling/behavior/OptionsSourceBehavior.spec.js
+++ b/packages/form-js-editor/test/spec/features/modeling/behavior/OptionsSourceBehavior.spec.js
@@ -3,7 +3,7 @@ import {
   inject
 } from '../../../../TestHelper';
 
-import modelingModule from 'src/features/modeling';
+import { ModelingModule } from 'src/features/modeling';
 
 import schema from '../../../defaultValues.json';
 
@@ -11,7 +11,7 @@ describe('features/modeling - OptionsSourceBehavior', function() {
 
   beforeEach(bootstrapFormEditor(schema, {
     additionalModules: [
-      modelingModule
+      ModelingModule
     ]
   }));
 
diff --git a/packages/form-js-editor/test/spec/features/modeling/behavior/PathBehavior.spec.js b/packages/form-js-editor/test/spec/features/modeling/behavior/PathBehavior.spec.js
index 78852bebe..65de469d1 100644
--- a/packages/form-js-editor/test/spec/features/modeling/behavior/PathBehavior.spec.js
+++ b/packages/form-js-editor/test/spec/features/modeling/behavior/PathBehavior.spec.js
@@ -3,7 +3,7 @@ import {
   inject
 } from '../../../../TestHelper';
 
-import modelingModule from 'src/features/modeling';
+import { ModelingModule } from 'src/features/modeling';
 
 import schema from '../../../form.json';
 
@@ -12,7 +12,7 @@ describe('features/modeling - PathBehavior', function() {
 
   beforeEach(bootstrapFormEditor(schema, {
     additionalModules: [
-      modelingModule
+      ModelingModule
     ]
   }));
 
diff --git a/packages/form-js-editor/test/spec/features/modeling/behavior/ValidateBehavior.spec.js b/packages/form-js-editor/test/spec/features/modeling/behavior/ValidateBehavior.spec.js
index 88d20bf05..13722b717 100644
--- a/packages/form-js-editor/test/spec/features/modeling/behavior/ValidateBehavior.spec.js
+++ b/packages/form-js-editor/test/spec/features/modeling/behavior/ValidateBehavior.spec.js
@@ -3,7 +3,7 @@ import {
   inject
 } from '../../../../TestHelper';
 
-import modelingModule from 'src/features/modeling';
+import { ModelingModule } from 'src/features/modeling';
 
 import schema from '../../../form.json';
 
@@ -12,7 +12,7 @@ describe('features/modeling - ValidateBehavior', function() {
 
   beforeEach(bootstrapFormEditor(schema, {
     additionalModules: [
-      modelingModule
+      ModelingModule
     ]
   }));
 
diff --git a/packages/form-js-editor/test/spec/features/palette/Palette.spec.js b/packages/form-js-editor/test/spec/features/palette/Palette.spec.js
index 8421ee6d2..8a58e467b 100644
--- a/packages/form-js-editor/test/spec/features/palette/Palette.spec.js
+++ b/packages/form-js-editor/test/spec/features/palette/Palette.spec.js
@@ -2,7 +2,8 @@ import { render, fireEvent } from '@testing-library/preact/pure';
 
 import { FormFields } from '@bpmn-io/form-js-viewer';
 
-import Palette, {
+import {
+  Palette,
   collectPaletteEntries,
   PALETTE_GROUPS
 } from '../../../../src/features/palette/components/Palette';
diff --git a/packages/form-js-editor/test/spec/features/palette/PaletteModule.spec.js b/packages/form-js-editor/test/spec/features/palette/PaletteModule.spec.js
index e629bc081..9b8e95045 100644
--- a/packages/form-js-editor/test/spec/features/palette/PaletteModule.spec.js
+++ b/packages/form-js-editor/test/spec/features/palette/PaletteModule.spec.js
@@ -14,7 +14,7 @@ import {
   createFormEditor
 } from '../../../../src';
 
-import paletteModule from '../../../../src/features/palette';
+import { PaletteModule } from '../../../../src/features/palette';
 
 import schema from '../../form.json';
 
@@ -47,7 +47,7 @@ describe('features/palette', function() {
   async function createEditor(schema, options = {}) {
     const {
       additionalModules = [
-        paletteModule
+        PaletteModule
       ]
     } = options;
 
diff --git a/packages/form-js-editor/test/spec/features/properties-panel/PropertiesPanel.spec.js b/packages/form-js-editor/test/spec/features/properties-panel/PropertiesPanel.spec.js
index 3997f09f3..ef15330ab 100644
--- a/packages/form-js-editor/test/spec/features/properties-panel/PropertiesPanel.spec.js
+++ b/packages/form-js-editor/test/spec/features/properties-panel/PropertiesPanel.spec.js
@@ -8,12 +8,11 @@ import {
 
 import { query as domQuery } from 'min-dom';
 
-import PropertiesPanel from '../../../../src/features/properties-panel/PropertiesPanel';
 import { OPTIONS_SOURCES, OPTIONS_SOURCES_DEFAULTS } from '@bpmn-io/form-js-viewer';
 import { removeKey } from '../../../../src/features/properties-panel/groups/CustomPropertiesGroup';
 
-import PropertiesProvider from '../../../../src/features/properties-panel/PropertiesProvider';
-
+import { PropertiesProvider } from '../../../../src/features/properties-panel/PropertiesProvider';
+import { PropertiesPanel } from '../../../../src/features/properties-panel/PropertiesPanel';
 import { FormFields } from '@bpmn-io/form-js-viewer';
 
 import {
diff --git a/packages/form-js-editor/test/spec/features/properties-panel/PropertiesPanelModule.spec.js b/packages/form-js-editor/test/spec/features/properties-panel/PropertiesPanelModule.spec.js
index 27bc7a0a1..ab4e7b2e4 100644
--- a/packages/form-js-editor/test/spec/features/properties-panel/PropertiesPanelModule.spec.js
+++ b/packages/form-js-editor/test/spec/features/properties-panel/PropertiesPanelModule.spec.js
@@ -14,7 +14,7 @@ import {
   createFormEditor
 } from '../../../../src';
 
-import propertiesPanelModule from '../../../../src/features/properties-panel';
+import { PropertiesPanelModule } from '../../../../src/features/properties-panel';
 
 import schema from '../../form.json';
 
@@ -47,7 +47,7 @@ describe('features/propertiesPanel', function() {
   async function createEditor(schema, options = {}) {
     const {
       additionalModules = [
-        propertiesPanelModule,
+        PropertiesPanelModule,
         ...options.additionalModules || []
       ]
     } = options;
diff --git a/packages/form-js-editor/test/spec/features/render-injection/RenderInjector.spec.js b/packages/form-js-editor/test/spec/features/render-injection/RenderInjector.spec.js
index df248a3e9..f4983f6af 100644
--- a/packages/form-js-editor/test/spec/features/render-injection/RenderInjector.spec.js
+++ b/packages/form-js-editor/test/spec/features/render-injection/RenderInjector.spec.js
@@ -12,7 +12,7 @@ import {
   createFormEditor
 } from '../../../../src';
 
-import renderInjectionModule from '../../../../src/features/render-injection';
+import { RenderInjectionModule } from '../../../../src/features/render-injection';
 
 import schema from '../../form.json';
 
@@ -42,7 +42,7 @@ describe('features/render-injection', function() {
   async function createEditor(schema, options = {}) {
     const {
       additionalModules = [
-        renderInjectionModule,
+        RenderInjectionModule,
         ExtensionModule
       ]
     } = options;
diff --git a/packages/form-js-editor/test/spec/features/selection/Selection.spec.js b/packages/form-js-editor/test/spec/features/selection/Selection.spec.js
index f029cd308..2607de115 100644
--- a/packages/form-js-editor/test/spec/features/selection/Selection.spec.js
+++ b/packages/form-js-editor/test/spec/features/selection/Selection.spec.js
@@ -3,7 +3,7 @@ import {
   inject
 } from '../../../TestHelper';
 
-import selectionModule from 'src/features/selection';
+import { SelectionModule } from 'src/features/selection';
 
 const { spy } = sinon;
 
@@ -29,7 +29,7 @@ describe('features/selection', function() {
 
   beforeEach(bootstrapFormEditor(schema, {
     modules: [
-      selectionModule
+      SelectionModule
     ]
   }));
 
diff --git a/packages/form-js-editor/test/spec/features/selection/SelectionBehavior.spec.js b/packages/form-js-editor/test/spec/features/selection/SelectionBehavior.spec.js
index c74be4e20..0c98c397d 100644
--- a/packages/form-js-editor/test/spec/features/selection/SelectionBehavior.spec.js
+++ b/packages/form-js-editor/test/spec/features/selection/SelectionBehavior.spec.js
@@ -3,8 +3,8 @@ import {
   inject
 } from '../../../TestHelper';
 
-import selectionModule from 'src/features/selection';
-import modelingModule from 'src/features/modeling';
+import { SelectionModule } from 'src/features/selection';
+import { ModelingModule } from 'src/features/modeling';
 
 
 describe('features/selection', function() {
@@ -28,8 +28,8 @@ describe('features/selection', function() {
 
   beforeEach(bootstrapFormEditor(schema, {
     modules: [
-      modelingModule,
-      selectionModule
+      ModelingModule,
+      SelectionModule
     ]
   }));
 
diff --git a/packages/form-js-editor/test/spec/render/components/form-fields/EditorText.spec.js b/packages/form-js-editor/test/spec/render/components/form-fields/EditorText.spec.js
index 80c41fa04..ac7d15529 100644
--- a/packages/form-js-editor/test/spec/render/components/form-fields/EditorText.spec.js
+++ b/packages/form-js-editor/test/spec/render/components/form-fields/EditorText.spec.js
@@ -1,6 +1,6 @@
 import { render } from '@testing-library/preact/pure';
 
-import EditorText from '../../../../../src/render/components/editor-form-fields/EditorText';
+import { EditorText } from '../../../../../src/render/components/editor-form-fields/EditorText';
 
 import { expectNoViolations, createFormContainer } from '../../../../TestHelper';