diff --git a/jest.config.js b/jest.config.js
index d412928..d9c9ff4 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -25,8 +25,8 @@ module.exports = {
   "modulePaths": [
     "<rootDir>"
   ],
-  // "testRegex": "(/packages/([^\/]{1,})/__tests__/.*)\\.test.ts$",
-  "testRegex": "(/packages/util/__tests__/.*)\\.test.ts$",
+  "testRegex": "(/packages/([^\/]{1,})/__tests__/.*)\\.test.ts$",
+  // "testRegex": "(/packages/idraw/__tests__/.*)\\.test.ts$",
   "setupFiles": [
     "jest-canvas-mock"
   ]
diff --git a/packages/board/__tests__/index.test.ts b/packages/board/__tests__/index.test.ts
index 9a8bb4c..dc487f9 100644
--- a/packages/board/__tests__/index.test.ts
+++ b/packages/board/__tests__/index.test.ts
@@ -1,4 +1,4 @@
-import Board from './../src';
+import { Board } from './../src';
 import { getData } from './data';
 
 
diff --git a/packages/board/__tests__/other-api.test.ts b/packages/board/__tests__/other-api.test.ts
index 940ebda..f7e424d 100644
--- a/packages/board/__tests__/other-api.test.ts
+++ b/packages/board/__tests__/other-api.test.ts
@@ -1,4 +1,4 @@
-import Board from '../src';
+import { Board } from '../src';
 import { getData } from './data';
 
 describe('@idraw/board', () => {
diff --git a/packages/board/__tests__/point.test.ts b/packages/board/__tests__/point.test.ts
index ae8cc61..1d3c577 100644
--- a/packages/board/__tests__/point.test.ts
+++ b/packages/board/__tests__/point.test.ts
@@ -1,4 +1,4 @@
-import Board from '../src';
+import { Board } from '../src';
 
 describe('@idraw/board', () => {
 
diff --git a/packages/board/__tests__/scale.test.ts b/packages/board/__tests__/scale.test.ts
index 0a2644d..6da850e 100644
--- a/packages/board/__tests__/scale.test.ts
+++ b/packages/board/__tests__/scale.test.ts
@@ -1,4 +1,4 @@
-import Board from '../src';
+import { Board } from '../src';
 import { getData } from './data';
 
 describe('@idraw/board', () => {
diff --git a/packages/board/__tests__/scroll.test.ts b/packages/board/__tests__/scroll.test.ts
index 28b2ee8..5fb0e94 100644
--- a/packages/board/__tests__/scroll.test.ts
+++ b/packages/board/__tests__/scroll.test.ts
@@ -1,4 +1,4 @@
-import Board from '../src';
+import { Board } from '../src';
 import { getData } from './data';
 
 describe('@idraw/board', () => {
diff --git a/packages/board/__tests__/wheel.test.ts b/packages/board/__tests__/wheel.test.ts
index d5e49e9..042b43c 100644
--- a/packages/board/__tests__/wheel.test.ts
+++ b/packages/board/__tests__/wheel.test.ts
@@ -1,4 +1,4 @@
-import Board from '../src';
+import { Board } from '../src';
 import { getData } from './data';
 
 describe('@idraw/board', () => {
diff --git a/packages/core/__tests__/index.test.ts b/packages/core/__tests__/index.test.ts
index 39a0a88..e147a65 100644
--- a/packages/core/__tests__/index.test.ts
+++ b/packages/core/__tests__/index.test.ts
@@ -1,7 +1,7 @@
 import { requestAnimationFrameMock } from './../../../__tests__/polyfill/requestanimateframe';
 import './../../../__tests__/polyfill/image';
 
-import Core from './../src';
+import { Core } from './../src/';
 import { getData } from './data';
 
 
diff --git a/packages/core/__tests__/lib/core-check.test.ts b/packages/core/__tests__/lib/core-check.test.ts
index 898258e..9f089d9 100644
--- a/packages/core/__tests__/lib/core-check.test.ts
+++ b/packages/core/__tests__/lib/core-check.test.ts
@@ -1,4 +1,4 @@
-import Core from './../../src';
+import { Core } from './../../src';
 
 describe("@idraw/core static check", () => {
 
diff --git a/packages/core/__tests__/lib/core-element.test.ts b/packages/core/__tests__/lib/core-element.test.ts
index 3a65af7..b835ccb 100644
--- a/packages/core/__tests__/lib/core-element.test.ts
+++ b/packages/core/__tests__/lib/core-element.test.ts
@@ -1,5 +1,5 @@
 // import { TypeData } from '@idraw/types';
-import Core from '../../src';
+import  { Core } from '../../src';
 import { getData } from '../data';
 
 describe("@idraw/core: Element API", () => {
diff --git a/packages/core/__tests__/lib/core-is.test.ts b/packages/core/__tests__/lib/core-is.test.ts
index 5310b19..a0231bd 100644
--- a/packages/core/__tests__/lib/core-is.test.ts
+++ b/packages/core/__tests__/lib/core-is.test.ts
@@ -1,4 +1,4 @@
-import Core from './../../src';
+import  { Core } from './../../src';
 
 describe("@idraw/core:static is", () => {
 
diff --git a/packages/core/__tests__/lib/element.test.ts b/packages/core/__tests__/lib/element.test.ts
index eb72db0..ba787e1 100644
--- a/packages/core/__tests__/lib/element.test.ts
+++ b/packages/core/__tests__/lib/element.test.ts
@@ -1,5 +1,5 @@
 import { TypeData } from '@idraw/types';
-import Core from './../../src';
+import  { Core } from './../../src';
 import { getData } from './../data';
 import { Element } from './../../src/lib/element';
 
diff --git a/packages/core/__tests__/lib/point.test.ts b/packages/core/__tests__/lib/point.test.ts
index fa1273c..24826c5 100644
--- a/packages/core/__tests__/lib/point.test.ts
+++ b/packages/core/__tests__/lib/point.test.ts
@@ -1,4 +1,4 @@
-import IDraw from '../../src';
+import  { Core } from '../../src';
 
 describe('@idraw/core', () => {
 
@@ -19,7 +19,7 @@ describe('@idraw/core', () => {
     scrollTop: 100,
   };
   const mount = document.querySelector('#mount') as HTMLDivElement;
-  const idraw = new IDraw(mount, opts);
+  const idraw = new Core(mount, opts);
 
   idraw.scale(transform.scale);
   idraw.scrollLeft(transform.scrollLeft);
diff --git a/packages/core/__tests__/move.test.ts b/packages/core/__tests__/move.test.ts
index 516e469..a79d42f 100644
--- a/packages/core/__tests__/move.test.ts
+++ b/packages/core/__tests__/move.test.ts
@@ -1,7 +1,7 @@
 import { requestAnimationFrameMock } from '../../../__tests__/polyfill/requestanimateframe';
 import '../../../__tests__/polyfill/image';
 
-import IDraw from '../src';
+import { Core } from '../src';
 import { getData } from './data';
 
 // function delay(time: number): Promise<void> {
@@ -30,7 +30,7 @@ describe("@idraw/core", () => {
       devicePixelRatio: 4
     }
     const mount = document.querySelector('#mount') as HTMLDivElement;
-    const idraw = new IDraw(mount, opts);
+    const idraw = new Core(mount, opts);
     const data = getData();
     idraw.setData(data);
     idraw.moveUpElement('image-003'); 
@@ -60,7 +60,7 @@ describe("@idraw/core", () => {
       devicePixelRatio: 4
     }
     const mount = document.querySelector('#mount') as HTMLDivElement;
-    const idraw = new IDraw(mount, opts);
+    const idraw = new Core(mount, opts);
     const data = getData();
     idraw.setData(data);
     idraw.moveDownElement('image-003');