diff --git a/client/dom/current-file.spec.js b/client/dom/current-file.spec.js
index 57702d3d..12dc49e5 100644
--- a/client/dom/current-file.spec.js
+++ b/client/dom/current-file.spec.js
@@ -1,8 +1,10 @@
 'use strict';
 
-const test = require('supertape');
+const {
+    test,
+    stub,
+} = require('supertape');
 const {create} = require('auto-globals');
-const stub = require('@cloudcmd/stub');
 const id = (a) => a;
 const wraptile = require('wraptile');
 const returns = wraptile(id);
diff --git a/client/dom/index.js b/client/dom/index.js
index 5785fd32..31300a29 100644
--- a/client/dom/index.js
+++ b/client/dom/index.js
@@ -304,7 +304,7 @@ module.exports.getCurrentData = async (currentFile) => {
     if (e)
         return [e, null];
     
-    const ONE_MEGABYTE = 1024 * 1024 * 1024;
+    const ONE_MEGABYTE = 1024 ** 2 * 1024;
     const {length} = data;
     
     if (hash && length < ONE_MEGABYTE)
diff --git a/client/dom/io/index.spec.js b/client/dom/io/index.spec.js
index 80c9bee2..92c621f7 100644
--- a/client/dom/io/index.spec.js
+++ b/client/dom/io/index.spec.js
@@ -1,7 +1,9 @@
 'use strict';
 
-const test = require('supertape');
-const stub = require('@cloudcmd/stub');
+const {
+    test,
+    stub,
+} = require('supertape');
 const mockRequire = require('mock-require');
 
 const {reRequire, stopAll} = mockRequire;
diff --git a/client/dom/operations/rename-current.spec.js b/client/dom/operations/rename-current.spec.js
index ae60adf5..bc294e15 100644
--- a/client/dom/operations/rename-current.spec.js
+++ b/client/dom/operations/rename-current.spec.js
@@ -1,7 +1,9 @@
 'use strict';
 
-const test = require('supertape');
-const stub = require('@cloudcmd/stub');
+const {
+    test,
+    stub,
+} = require('supertape');
 const mockRequire = require('mock-require');
 
 const {reRequire, stopAll} = mockRequire;
diff --git a/client/dom/storage.spec.js b/client/dom/storage.spec.js
index 84fdfe71..d3b15e33 100644
--- a/client/dom/storage.spec.js
+++ b/client/dom/storage.spec.js
@@ -1,7 +1,9 @@
 'use strict';
 
-const test = require('supertape');
-const stub = require('@cloudcmd/stub');
+const {
+    test,
+    stub,
+} = require('supertape');
 const storage = require('./storage');
 
 const {stringify} = JSON;
diff --git a/client/key/vim/index.spec.js b/client/key/vim/index.spec.js
index 886eb578..5fb45367 100644
--- a/client/key/vim/index.spec.js
+++ b/client/key/vim/index.spec.js
@@ -2,8 +2,10 @@
 
 const {join} = require('path');
 
-const test = require('supertape');
-const stub = require('@cloudcmd/stub');
+const {
+    test,
+    stub,
+} = require('supertape');
 const mockRequire = require('mock-require');
 const {reRequire, stopAll} = mockRequire;
 
diff --git a/client/key/vim/vim.spec.js b/client/key/vim/vim.spec.js
index f39552ee..056b3c76 100644
--- a/client/key/vim/vim.spec.js
+++ b/client/key/vim/vim.spec.js
@@ -1,7 +1,9 @@
 'use strict';
 
-const test = require('supertape');
-const stub = require('@cloudcmd/stub');
+const {
+    test,
+    stub,
+} = require('supertape');
 
 const vim = require('./vim');
 
diff --git a/client/modules/polyfill.spec.js b/client/modules/polyfill.spec.js
index 5c31b27f..462a3cb0 100644
--- a/client/modules/polyfill.spec.js
+++ b/client/modules/polyfill.spec.js
@@ -1,8 +1,10 @@
 'use strict';
 
-const test = require('supertape');
+const {
+    test,
+    stub,
+} = require('supertape');
 const mockRequire = require('mock-require');
-const stub = require('@cloudcmd/stub');
 
 const {stopAll} = mockRequire;
 
diff --git a/client/modules/user-menu/parse-user-menu.spec.js b/client/modules/user-menu/parse-user-menu.spec.js
index 3cdd72cd..d2fd9300 100644
--- a/client/modules/user-menu/parse-user-menu.spec.js
+++ b/client/modules/user-menu/parse-user-menu.spec.js
@@ -1,7 +1,9 @@
 'use strict';
 
-const test = require('supertape');
-const stub = require('@cloudcmd/stub');
+const {
+    test,
+    stub,
+} = require('supertape');
 const parse = require('./parse-user-menu');
 
 test('cloudcmd: user menu: parse', (t) => {
diff --git a/client/modules/user-menu/run.spec.js b/client/modules/user-menu/run.spec.js
index 98165ec6..a8444e86 100644
--- a/client/modules/user-menu/run.spec.js
+++ b/client/modules/user-menu/run.spec.js
@@ -1,7 +1,9 @@
 'use strict';
 
-const test = require('supertape');
-const stub = require('@cloudcmd/stub');
+const {
+    test,
+    stub,
+} = require('supertape');
 const {runSelected} = require('./run');
 
 test('cloudcmd: client: user menu: run', async (t) => {
diff --git a/common/base64.spec.js b/common/base64.spec.js
index 0c8f3ca7..2429a13c 100644
--- a/common/base64.spec.js
+++ b/common/base64.spec.js
@@ -1,7 +1,9 @@
 'use strict';
 
-const test = require('supertape');
-const stub = require('@cloudcmd/stub');
+const {
+    test,
+    stub,
+} = require('supertape');
 
 const {btoa, atob} = require('./base64');
 
diff --git a/server/cloudcmd.spec.js b/server/cloudcmd.spec.js
index 1deaef42..264fd799 100644
--- a/server/cloudcmd.spec.js
+++ b/server/cloudcmd.spec.js
@@ -2,8 +2,10 @@
 
 const path = require('path');
 
-const test = require('supertape');
-const stub = require('@cloudcmd/stub');
+const {
+    test,
+    stub,
+} = require('supertape');
 const {reRequire} = require('mock-require');
 
 const DIR = './';
diff --git a/server/config.spec.js b/server/config.spec.js
index dbd85277..23230842 100644
--- a/server/config.spec.js
+++ b/server/config.spec.js
@@ -1,7 +1,9 @@
 'use strict';
 
-const test = require('supertape');
-const stub = require('@cloudcmd/stub');
+const {
+    test,
+    stub,
+} = require('supertape');
 
 const root = '../';
 const configPath = './config';
diff --git a/server/exit.spec.js b/server/exit.spec.js
index 663bd44a..8fedf1ca 100644
--- a/server/exit.spec.js
+++ b/server/exit.spec.js
@@ -1,8 +1,10 @@
 'use strict';
 
-const test = require('supertape');
+const {
+    test,
+    stub,
+} = require('supertape');
 const exit = require('./exit');
-const stub = require('@cloudcmd/stub');
 
 test('cloudcmd: exit: process.exit', (t) => {
     const {exit: exitOriginal} = process;
diff --git a/server/rest/info.spec.js b/server/rest/info.spec.js
index a067cc68..4f407a45 100644
--- a/server/rest/info.spec.js
+++ b/server/rest/info.spec.js
@@ -1,8 +1,10 @@
 'use strict';
 
-const test = require('supertape');
+const {
+    test,
+    stub,
+} = require('supertape');
 const info = require('./info');
-const stub = require('@cloudcmd/stub');
 
 test('cloudcmd: rest: info', (t) => {
     const {memoryUsage} = process;
diff --git a/server/root.spec.js b/server/root.spec.js
index af640fbd..4ee1d61a 100644
--- a/server/root.spec.js
+++ b/server/root.spec.js
@@ -1,7 +1,9 @@
 'use strict';
 
-const test = require('supertape');
-const stub = require('@cloudcmd/stub');
+const {
+    test,
+    stub,
+} = require('supertape');
 const mockRequire = require('mock-require');
 const {reRequire, stopAll} = mockRequire;
 
diff --git a/server/terminal.spec.js b/server/terminal.spec.js
index d734b547..0f5e7e59 100644
--- a/server/terminal.spec.js
+++ b/server/terminal.spec.js
@@ -1,7 +1,9 @@
 'use strict';
 
-const test = require('supertape');
-const stub = require('@cloudcmd/stub');
+const {
+    test,
+    stub,
+} = require('supertape');
 
 const mockRequire = require('mock-require');
 
diff --git a/server/user-menu.spec.js b/server/user-menu.spec.js
index 623dcfa7..945b74ec 100644
--- a/server/user-menu.spec.js
+++ b/server/user-menu.spec.js
@@ -3,10 +3,12 @@
 const fs = require('fs');
 const {join} = require('path');
 
-const test = require('supertape');
+const {
+    test,
+    stub,
+} = require('supertape');
 const serveOnce = require('serve-once');
 const threadIt = require('thread-it');
-const stub = require('@cloudcmd/stub');
 const {reRequire} = require('mock-require');
 
 const userMenu = require('./user-menu');
diff --git a/server/validate.spec.js b/server/validate.spec.js
index 14868530..242cfbe6 100644
--- a/server/validate.spec.js
+++ b/server/validate.spec.js
@@ -2,8 +2,10 @@
 
 const fs = require('fs');
 
-const test = require('supertape');
-const stub = require('@cloudcmd/stub');
+const {
+    test,
+    stub,
+} = require('supertape');
 const tryCatch = require('try-catch');
 const mockRequire = require('mock-require');
 const {reRequire, stopAll} = mockRequire;
diff --git a/test/server/modulas.js b/test/server/modulas.js
index d8fc7e90..4af247ce 100644
--- a/test/server/modulas.js
+++ b/test/server/modulas.js
@@ -1,8 +1,10 @@
 'use strict';
 
 const {join} = require('path');
-const test = require('supertape');
-const stub = require('@cloudcmd/stub');
+const {
+    test,
+    stub,
+} = require('supertape');
 
 const cloudcmdPath = join(__dirname, '..', '..');
 const modulesPath = join(cloudcmdPath, 'json', 'modules.json');