diff --git a/libs/remix-analyzer/test/analysis/staticAnalysisIntegration-test-0.4.24.ts b/libs/remix-analyzer/test/analysis/staticAnalysisIntegration-test-0.4.24.ts
index 92e42891f8..cf04ee1ebf 100644
--- a/libs/remix-analyzer/test/analysis/staticAnalysisIntegration-test-0.4.24.ts
+++ b/libs/remix-analyzer/test/analysis/staticAnalysisIntegration-test-0.4.24.ts
@@ -1,4 +1,4 @@
-import * as test from "tape"
+import { default as test } from "tape"
 import { helpers } from '@remix-project/remix-lib'
 import { readFileSync } from 'fs'
 import { join } from 'path'
diff --git a/libs/remix-analyzer/test/analysis/staticAnalysisIntegration-test-0.5.0.ts b/libs/remix-analyzer/test/analysis/staticAnalysisIntegration-test-0.5.0.ts
index 2e4e2c8351..08609b24e5 100644
--- a/libs/remix-analyzer/test/analysis/staticAnalysisIntegration-test-0.5.0.ts
+++ b/libs/remix-analyzer/test/analysis/staticAnalysisIntegration-test-0.5.0.ts
@@ -1,4 +1,4 @@
-import * as test from "tape"
+import { default as test } from "tape"
 import { helpers } from '@remix-project/remix-lib'
 import { readFileSync } from 'fs'
 import { join } from 'path'
diff --git a/libs/remix-analyzer/tsconfig.json b/libs/remix-analyzer/tsconfig.json
index e91fb5220b..eda4e41ad3 100644
--- a/libs/remix-analyzer/tsconfig.json
+++ b/libs/remix-analyzer/tsconfig.json
@@ -2,6 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "types": ["node"],
+    "esModuleInterop": true
   },
   "include": ["**/*.ts"]
 }
diff --git a/libs/remix-astwalker/tsconfig.json b/libs/remix-astwalker/tsconfig.json
index 849b038002..12516f33dd 100644
--- a/libs/remix-astwalker/tsconfig.json
+++ b/libs/remix-astwalker/tsconfig.json
@@ -3,7 +3,7 @@
   "compilerOptions": {
     "types": ["node"],
     "module": "commonjs",
-    "esModuleInterop": true, 
+    "esModuleInterop": true 
   },
   "include": ["**/*.ts"]
 }
diff --git a/tsconfig.json b/tsconfig.json
index 1922d8a459..468fd49364 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -9,7 +9,7 @@
     "experimentalDecorators": true,
     "importHelpers": true,
     "target": "es2015",
-    "module": "esnext",
+    "module": "commonjs",
     "typeRoots": ["node_modules/@types"],
     "lib": ["es2017", "dom"],
     "skipLibCheck": true,
@@ -17,7 +17,7 @@
     "baseUrl": ".",
     "paths": {
       "@remix-project/remix-analyzer": ["libs/remix-analyzer/index.ts"],
-      "@remix-project/remix-astwalker": ["dist/libs/remix-astwalker/src/index.ts"],
+      "@remix-project/remix-astwalker": ["libs/remix-astwalker/src/index.ts"],
       "@remix-project/remix-debug": ["libs/remix-debug/index.js"],
       "@remix-project/remix-lib": ["libs/remix-lib/index.js"],
       "@remix-project/remix-simulator": ["libs/remix-simulator/index.js"],