diff --git a/test/specs/dom_components/model/Component.ts b/test/specs/dom_components/model/Component.ts
index 93235aaa3..bcbdb7879 100644
--- a/test/specs/dom_components/model/Component.ts
+++ b/test/specs/dom_components/model/Component.ts
@@ -21,7 +21,7 @@ describe('Component', () => {
   beforeEach(() => {
     em = new Editor({ avoidDefaults: true });
     dcomp = em.Components;
-    em.get('PageManager').onLoad();
+    em.Pages.onLoad();
     compOpts = {
       em,
       componentTypes: dcomp.componentTypes,
@@ -30,18 +30,18 @@ describe('Component', () => {
     obj = new Component({}, compOpts);
   });
 
+  afterEach(() => {
+    em.destroyAll();
+  });
+
   test('Has no children', () => {
     expect(obj.components().length).toEqual(0);
   });
 
   test('Clones correctly', () => {
-    var sAttr = obj.attributes;
-    var cloned = obj.clone();
-    var eAttr = cloned.attributes;
-    eAttr.components = {};
-    sAttr.components = {} as any;
-    eAttr.traits = {};
-    sAttr.traits = {} as any;
+    const sAttr = obj.attributes;
+    const cloned = obj.clone();
+    const eAttr = cloned.attributes;
     expect(sAttr.length).toEqual(eAttr.length);
   });
 
@@ -454,13 +454,19 @@ describe('Component', () => {
       },
     });
 
-    expect(() => new ExtendedComponent()).not.toThrowError();
+    expect(() => new ExtendedComponent({}, compOpts)).not.toThrowError();
   });
 });
 
 describe('Image Component', () => {
   beforeEach(() => {
-    obj = new ComponentImage();
+    em = new Editor({ avoidDefaults: true });
+    compOpts = { em };
+    obj = new ComponentImage({}, compOpts);
+  });
+
+  afterEach(() => {
+    em.destroyAll();
   });
 
   test('Has src property', () => {
@@ -472,7 +478,7 @@ describe('Image Component', () => {
   });
 
   test('ComponentImage toHTML', () => {
-    obj = new ComponentImage({ src: '' });
+    obj = new ComponentImage({ src: '' }, compOpts);
     expect(obj.toHTML()).toEqual('<img/>');
   });
 
@@ -506,9 +512,15 @@ describe('Image Component', () => {
 
 describe('Text Component', () => {
   beforeEach(() => {
+    em = new Editor({ avoidDefaults: true });
+    compOpts = { em };
     obj = new ComponentText({}, compOpts);
   });
 
+  afterEach(() => {
+    em.destroyAll();
+  });
+
   test('Has content property', () => {
     expect(obj.has('content')).toEqual(true);
   });
@@ -531,9 +543,15 @@ describe('Text Component', () => {
 
 describe('Text Node Component', () => {
   beforeEach(() => {
+    em = new Editor({ avoidDefaults: true });
+    compOpts = { em };
     obj = new ComponentTextNode({}, compOpts);
   });
 
+  afterEach(() => {
+    em.destroyAll();
+  });
+
   test('Has content property', () => {
     expect(obj.has('content')).toEqual(true);
   });
@@ -634,8 +652,8 @@ describe('Video Component', () => {
 describe('Components', () => {
   beforeEach(() => {
     em = new Editor({});
-    dcomp = em.get('DomComponents');
-    em.get('PageManager').onLoad();
+    dcomp = em.Components;
+    em.Pages.onLoad();
     compOpts = {
       em,
       componentTypes: dcomp.componentTypes,
@@ -662,8 +680,8 @@ describe('Components', () => {
 
   test('Avoid conflicting components with the same ID', () => {
     const em = new Editor({});
-    dcomp = em.get('DomComponents');
-    em.get('PageManager').onLoad();
+    dcomp = em.Components;
+    em.Pages.onLoad();
     const id = 'myid';
     const idB = 'myid2';
     const block = `
diff --git a/test/specs/dom_components/model/ComponentImage.ts b/test/specs/dom_components/model/ComponentImage.ts
index 41fb8ffa8..4819bf852 100644
--- a/test/specs/dom_components/model/ComponentImage.ts
+++ b/test/specs/dom_components/model/ComponentImage.ts
@@ -12,7 +12,7 @@ describe('ComponentImage', () => {
   beforeEach(() => {
     em = new Editor({ avoidDefaults: true });
     dcomp = em.Components;
-    em.get('PageManager').onLoad();
+    em.Pages.onLoad();
     compOpts = {
       em,
       componentTypes: dcomp.componentTypes,
diff --git a/test/specs/dom_components/model/ComponentTypes.ts b/test/specs/dom_components/model/ComponentTypes.ts
index 32c2432e8..63db8a034 100644
--- a/test/specs/dom_components/model/ComponentTypes.ts
+++ b/test/specs/dom_components/model/ComponentTypes.ts
@@ -25,7 +25,7 @@ describe('Component Types', () => {
   afterEach(() => {
     wrapper.components().reset();
     editor = new Editor({ allowScripts: true } as any);
-    editor.getModel().get('PageManager').onLoad();
+    editor.getModel().Pages.onLoad();
     wrapper = editor.getWrapper()!;
   });
 
diff --git a/test/specs/dom_components/view/ComponentImageView.ts b/test/specs/dom_components/view/ComponentImageView.ts
index a173147e8..189be3b28 100644
--- a/test/specs/dom_components/view/ComponentImageView.ts
+++ b/test/specs/dom_components/view/ComponentImageView.ts
@@ -1,15 +1,18 @@
 import ComponentImageView from '../../../../src/dom_components/view/ComponentImageView';
 import Component from '../../../../src/dom_components/model/ComponentImage';
+import Editor from '../../../../src/editor/model/Editor';
 
 describe('ComponentImageView', () => {
+  let em: Editor;
   let model: Component;
   let view: ComponentImageView;
 
   beforeEach(() => {
-    model = new Component();
+    em = new Editor();
+    model = new Component({}, { em });
     const cmpViewOpts = {
       model,
-      config: {},
+      config: { em },
     };
     view = new ComponentImageView(cmpViewOpts);
     document.body.innerHTML = '<div id="fixtures"></div>';
@@ -17,7 +20,7 @@ describe('ComponentImageView', () => {
   });
 
   afterEach(() => {
-    view.remove();
+    em.destroy();
   });
 
   test('Component empty', () => {
diff --git a/test/specs/dom_components/view/ComponentView.ts b/test/specs/dom_components/view/ComponentView.ts
index 5891c6a7d..c8e038d18 100644
--- a/test/specs/dom_components/view/ComponentView.ts
+++ b/test/specs/dom_components/view/ComponentView.ts
@@ -106,7 +106,7 @@ describe('ComponentView', () => {
   });
 
   test('Init with different tag', () => {
-    model = new Component({ tagName: 'span' });
+    model = new Component({ tagName: 'span' }, compOpts);
     view = new ComponentView({ ...compViewOpst, model });
     fixtures.innerHTML = '';
     fixtures.appendChild(view.render().el);