diff --git a/packages/mindplot/src/components/util/Shape.js b/packages/mindplot/src/components/util/Shape.js
index 2eb15a23..9712c1cf 100644
--- a/packages/mindplot/src/components/util/Shape.js
+++ b/packages/mindplot/src/components/util/Shape.js
@@ -18,7 +18,7 @@
 import * as web2d from '@wisemapping/web2d';
 import { $assert, $defined } from '@wisemapping/core-js';
 import { TopicShape } from '../model/INodeModel';
-import TopicConfig from '../TopicConfig';
+import { CONNECTOR_WIDTH } from '../TopicConfig';
 
 const Shape = {
   isAtRight(sourcePoint, targetPoint) {
@@ -124,7 +124,7 @@ const Shape = {
     }
 
     // Move a little the position...
-    const offset = TopicConfig.CONNECTOR_WIDTH / 2;
+    const offset = CONNECTOR_WIDTH / 2;
     if (!isAtRight) {
       result.x += offset;
     } else {
diff --git a/packages/mindplot/test/unit/BalancedTestSuite.test.js b/packages/mindplot/test/unit/BalancedTestSuite.test.js
index 710a7393..0bde9b05 100644
--- a/packages/mindplot/test/unit/BalancedTestSuite.test.js
+++ b/packages/mindplot/test/unit/BalancedTestSuite.test.js
@@ -1,4 +1,3 @@
-import '../../../../libraries/mootools-core-1.4.5';
 import TestSuite from './TestSuite';
 import LayoutManager from '../../src/components/layout/LayoutManager';
 
diff --git a/packages/mindplot/test/unit/DesignerTestSuite.test.js b/packages/mindplot/test/unit/DesignerTestSuite.test.js
index 3f590066..d9e47f55 100644
--- a/packages/mindplot/test/unit/DesignerTestSuite.test.js
+++ b/packages/mindplot/test/unit/DesignerTestSuite.test.js
@@ -1,5 +1,4 @@
 import $ from 'jquery';
-import '../../../../libraries/mootools-core-1.4.5';
 import { Designer, LocalStorageManager } from '../../src';
 
 // FIXME: The tests Map could not be loaded.
diff --git a/packages/mindplot/test/unit/EventsTestSuite.test.js b/packages/mindplot/test/unit/EventsTestSuite.test.js
index 12436b23..2ca20372 100644
--- a/packages/mindplot/test/unit/EventsTestSuite.test.js
+++ b/packages/mindplot/test/unit/EventsTestSuite.test.js
@@ -1,18 +1,16 @@
-import '../../../../libraries/mootools-core-1.4.5';
 import Events from '../../src/components/Events';
 
 describe('Events class suite', () => {
-  const TestClass = new Class({
-    Extends: Events,
+  class TestClass extends Events {
 
     getEvents() {
       return this.$events;
-    },
+    }
 
     removeEvents() {
       this.$events = {};
-    },
-  });
+    }
+  }
 
   const expectedChangeFn1 = () => 'change1';
   const expectedChangeFn2 = () => 'change2';
diff --git a/packages/mindplot/test/unit/FreeTestSuite.test.js b/packages/mindplot/test/unit/FreeTestSuite.test.js
index 1145fb06..6b843626 100644
--- a/packages/mindplot/test/unit/FreeTestSuite.test.js
+++ b/packages/mindplot/test/unit/FreeTestSuite.test.js
@@ -1,4 +1,3 @@
-import '../../../../libraries/mootools-core-1.4.5';
 import TestSuite from './TestSuite';
 import LayoutManager from '../../src/components/layout/LayoutManager';
 
diff --git a/packages/mindplot/test/unit/SymmetricTestSuite.test.js b/packages/mindplot/test/unit/SymmetricTestSuite.test.js
index aa026025..a136f583 100644
--- a/packages/mindplot/test/unit/SymmetricTestSuite.test.js
+++ b/packages/mindplot/test/unit/SymmetricTestSuite.test.js
@@ -1,4 +1,3 @@
-import '../../../../libraries/mootools-core-1.4.5';
 import TestSuite from './TestSuite';
 import LayoutManager from '../../src/components/layout/LayoutManager';