diff --git a/client/dom/index.spec.js b/client/dom/index.spec.js
index 0a0948b6..1c413fc8 100644
--- a/client/dom/index.spec.js
+++ b/client/dom/index.spec.js
@@ -1,6 +1,6 @@
 'use strict';
 
-require('css-modules-require-hook');
+require('css-modules-require-hook/preset');
 
 const {test, stub} = require('supertape');
 const mockRequire = require('mock-require');
diff --git a/client/dom/storage.spec.js b/client/dom/storage.spec.js
index ff41af26..abd7258a 100644
--- a/client/dom/storage.spec.js
+++ b/client/dom/storage.spec.js
@@ -103,6 +103,6 @@ test('cloudcmd: client: storage: clear', async (t) => {
     await storage.clear();
     global.localStorage = localStorage;
     
-    t.ok(clear.calledWith(), 'should call clear');
+    t.calledWithNoArgs(clear, 'should call clear');
     t.end();
 });
diff --git a/client/key/index.js b/client/key/index.js
index e7078e16..d7d455af 100644
--- a/client/key/index.js
+++ b/client/key/index.js
@@ -2,16 +2,15 @@
 
 /* global CloudCmd, DOM */
 const clipboard = require('@cloudcmd/clipboard');
+const fullstore = require('fullstore');
 
 const Buffer = require('../dom/buffer');
-
 const Events = require('../dom/events');
 const KEY = require('./key');
 
 const vim = require('./vim');
 const setCurrentByChar = require('./set-current-by-char');
 const {createBinder} = require('./binder');
-const fullstore = require('fullstore');
 
 const Info = DOM.CurrentInfo;
 const Chars = fullstore();
@@ -28,7 +27,6 @@ const isUndefined = (a) => typeof a === 'undefined';
 Chars([]);
 
 const {assign} = Object;
-
 const binder = createBinder();
 
 module.exports = assign(binder, KEY);
diff --git a/client/key/index.spec.js b/client/key/index.spec.js
index b5a2a2c2..8ab7a960 100644
--- a/client/key/index.spec.js
+++ b/client/key/index.spec.js
@@ -1,15 +1,16 @@
 'use strict';
 
+require('css-modules-require-hook/preset');
+
 const autoGlobals = require('auto-globals');
-const stub = require('@cloudcmd/stub');
 const mockRequire = require('mock-require');
+const supertape = require('supertape');
+
 const {ESC} = require('./key');
-
 const {getDOM, getCloudCmd} = require('./vim/globals.fixture');
-
+const test = autoGlobals(supertape);
 const {reRequire, stopAll} = mockRequire;
-
-const test = autoGlobals(require('supertape'));
+const {stub} = supertape;
 
 global.DOM = getDOM();
 global.CloudCmd = getCloudCmd();
@@ -20,6 +21,7 @@ test('cloudcmd: client: key: enable vim', async (t) => {
     const {config} = CloudCmd;
     
     CloudCmd.config = stub().returns(true);
+    CloudCmd._config = stub();
     mockRequire('./vim', vim);
     const {_listener, setBind} = reRequire('.');
     
@@ -41,9 +43,6 @@ test('cloudcmd: client: key: enable vim', async (t) => {
 
 test('cloudcmd: client: key: disable vim', async (t) => {
     const _config = stub();
-    
-    const {_listener, setBind} = reRequire('.');
-    
     const event = {
         keyCode: ESC,
         key: 'Escape',
@@ -53,11 +52,13 @@ test('cloudcmd: client: key: disable vim', async (t) => {
     const {CloudCmd} = global;
     const {config} = CloudCmd;
     
-    CloudCmd.config = _config;
+    global.CloudCmd.config = _config;
+    global.CloudCmd._config = _config;
+    
+    const {_listener, setBind} = reRequire('.');
     
     setBind();
     await _listener(event);
-    await _listener(event);
     
     CloudCmd.config = config;
     
diff --git a/client/key/vim/index.js b/client/key/vim/index.js
index e79adb33..598578a1 100644
--- a/client/key/vim/index.js
+++ b/client/key/vim/index.js
@@ -5,124 +5,151 @@
 const vim = require('./vim');
 const finder = require('./find');
 
-const Info = DOM.CurrentInfo;
 const {Dialog} = DOM;
 
-module.exports = async (key, event) => {
-    const operations = getOperations(event);
+const DEPS = {
+    ...DOM,
+    ...CloudCmd,
+};
+
+module.exports = async (key, event, deps = DEPS) => {
+    const operations = getOperations(event, deps);
     await vim(key, operations);
 };
 
-const getOperations = (event) => ({
-    escape: DOM.unselectFiles,
-    
-    remove: () => {
-        CloudCmd.Operation.show('delete');
-    },
-    
-    makeDirectory: () => {
-        event.stopImmediatePropagation();
-        event.preventDefault();
-        DOM.promptNewDir();
-    },
-    
-    makeFile: () => {
-        event.stopImmediatePropagation();
-        event.preventDefault();
-        DOM.promptNewFile();
-    },
-    
-    terminal: () => {
-        CloudCmd.Terminal.show();
-    },
-    
-    edit: () => {
-        CloudCmd.EditFileVim.show();
-    },
-    
-    copy: () => {
-        DOM.Buffer.copy();
-        DOM.unselectFiles();
-    },
-    
-    select: () => {
-        const current = Info.element;
-        DOM.toggleSelectedFile(current);
-    },
-    
-    paste: DOM.Buffer.paste,
-    
-    moveNext: ({count, isVisual, isDelete}) => {
-        setCurrent('next', {
-            count,
-            isVisual,
-            isDelete,
-        });
-    },
-    
-    movePrevious: ({count, isVisual, isDelete}) => {
-        setCurrent('previous', {
-            count,
-            isVisual,
-            isDelete,
-        });
-    },
-    
-    find: async () => {
-        event.preventDefault();
-        const [, value] = await Dialog.prompt('Find', '');
-        
-        if (!value)
-            return;
-        
-        const names = Info.files.map(DOM.getCurrentName);
-        const [result] = finder.find(value, names);
-        
-        DOM.setCurrentByName(result);
-    },
-    
-    findNext: () => {
-        const name = finder.findNext();
-        DOM.setCurrentByName(name);
-    },
-    
-    findPrevious: () => {
-        const name = finder.findPrevious();
-        DOM.setCurrentByName(name);
-    },
-});
+const getOperations = (event, deps) => {
+    const {
+        Info = DOM.CurrentInfo,
+        Operation,
+        unselectFiles,
+        setCurrentFile,
+        setCurrentByName,
+        getCurrentName,
+        toggleSelectedFile,
+        Buffer = {},
+    } = deps;
 
-module.exports.selectFile = selectFile;
+    return {
+        escape: unselectFiles,
+
+        remove: () => {
+            Operation.show('delete');
+        },
+
+        makeDirectory: () => {
+            event.stopImmediatePropagation();
+            event.preventDefault();
+            DOM.promptNewDir();
+        },
+
+        makeFile: () => {
+            event.stopImmediatePropagation();
+            event.preventDefault();
+            DOM.promptNewFile();
+        },
+
+        terminal: () => {
+            CloudCmd.Terminal.show();
+        },
+
+        edit: () => {
+            CloudCmd.EditFileVim.show();
+        },
+
+        copy: () => {
+            Buffer.copy();
+            unselectFiles();
+        },
+
+        select: () => {
+            const current = Info.element;
+            toggleSelectedFile(current);
+        },
+
+        paste: Buffer.paste,
+
+        moveNext: ({count, isVisual, isDelete}) => {
+            setCurrent('next', {
+                count,
+                isVisual,
+                isDelete,
+            }, {
+                Info,
+                setCurrentFile,
+                unselectFiles,
+                Operation,
+            });
+        },
+
+        movePrevious: ({count, isVisual, isDelete}) => {
+            setCurrent('previous', {
+                count,
+                isVisual,
+                isDelete,
+            }, {
+                Info,
+                setCurrentFile,
+                unselectFiles,
+                Operation,
+            });
+        },
+
+        find: async () => {
+            event.preventDefault();
+            const [, value] = await Dialog.prompt('Find', '');
+
+            if (!value)
+                return;
+
+            const names = Info.files.map(getCurrentName);
+            const [result] = finder.find(value, names);
+
+            setCurrentByName(result);
+        },
+
+        findNext: () => {
+            const name = finder.findNext();
+            setCurrentByName(name);
+        },
+
+        findPrevious: () => {
+            const name = finder.findPrevious();
+            setCurrentByName(name);
+        },
+    };
+};
+
+module.exports.selectFile = selectFileNotParent;
+
+function selectFileNotParent(current, {getCurrentName, selectFile} = DOM) {
+    const name = getCurrentName(current);
 
-function selectFile(current) {
-    const name = DOM.getCurrentName(current);
-    
     if (name === '..')
         return;
-    
-    DOM.selectFile(current);
+
+    selectFile(current);
 }
 
-function setCurrent(sibling, {count, isVisual, isDelete}) {
+function setCurrent(sibling, {count, isVisual, isDelete}, {Info, setCurrentFile, unselectFiles, Operation}) {
     let current = Info.element;
-    const select = isVisual ? selectFile : DOM.unselectFile;
-    
+    const select = isVisual ? selectFileNotParent : unselectFiles;
+
     select(current);
-    
+
     const position = `${sibling}Sibling`;
-    
+
     for (let i = 0; i < count; i++) {
         const next = current[position];
-        
+
         if (!next)
             break;
-        
+
         current = next;
         select(current);
     }
-    
-    DOM.setCurrentFile(current);
-    
+
+    setCurrentFile(current);
+
     if (isDelete)
-        CloudCmd.Operation.show('delete');
+        Operation.show('delete');
 }
diff --git a/client/key/vim/index.spec.js b/client/key/vim/index.spec.js
index 1e9c2632..db385959 100644
--- a/client/key/vim/index.spec.js
+++ b/client/key/vim/index.spec.js
@@ -1,9 +1,7 @@
 'use strict';
 
 const {join} = require('path');
-
 const {test, stub} = require('supertape');
-
 const mockRequire = require('mock-require');
 
 const dir = '../';
@@ -18,27 +16,31 @@ global.CloudCmd = getCloudCmd();
 const vim = require(pathVim);
 
 const {assign} = Object;
-const {DOM, CloudCmd} = global;
-
+const {DOM} = global;
 const {Buffer} = DOM;
 const pathFind = join(dir, 'vim', 'find');
 const {reRequire, stopAll} = mockRequire;
 
 test('cloudcmd: client: key: set next file: no', (t) => {
     const element = {};
-    
     const setCurrentFile = stub();
+    const unselectFiles = stub();
     
-    global.DOM.CurrentInfo.element = element;
-    global.DOM.setCurrentFile = setCurrentFile;
+    const Info = {
+        element,
+    };
     
-    vim('j', {});
+    vim('j', {}, {
+        Info,
+        setCurrentFile,
+        unselectFiles,
+    });
     
     t.calledWith(setCurrentFile, [element], 'should set next file');
     t.end();
 });
 
-test('cloudcmd: client: key: set next file current: j', (t) => {
+test('cloudcmd: client: key: set next file current: j', async (t) => {
     const nextSibling = 'hello';
     const element = {
         nextSibling,
@@ -46,10 +48,15 @@ test('cloudcmd: client: key: set next file current: j', (t) => {
     
     const setCurrentFile = stub();
     
-    global.DOM.CurrentInfo.element = element;
-    global.DOM.setCurrentFile = setCurrentFile;
+    const Info = {
+        element,
+    };
     
-    vim('j', {});
+    await vim('j', {}, {
+        Info,
+        setCurrentFile,
+        unselectFiles: stub(),
+    });
     
     t.calledWith(setCurrentFile, [nextSibling], 'should set next file');
     t.end();
@@ -63,12 +70,19 @@ test('cloudcmd: client: key: set next file current: mjj', (t) => {
     
     const setCurrentFile = stub();
     
-    global.DOM.CurrentInfo.element = element;
-    global.DOM.setCurrentFile = setCurrentFile;
+    const Info = {
+        element,
+    };
     
-    vim('m', {});
-    vim('j', {});
-    vim('j', {});
+    const deps = {
+        Info,
+        setCurrentFile,
+        unselectFiles: stub(),
+    };
+    
+    vim('m', {}, deps);
+    vim('j', {}, deps);
+    vim('j', {}, deps);
     
     t.calledWith(setCurrentFile, [nextSibling], 'should set next file');
     t.end();
@@ -82,11 +96,18 @@ test('cloudcmd: client: key: set next file current: g', (t) => {
     
     const setCurrentFile = stub();
     
-    global.DOM.CurrentInfo.element = element;
-    global.DOM.setCurrentFile = setCurrentFile;
+    const Info = {
+        element,
+    };
     
-    vim('g', {});
-    vim('j', {});
+    const deps = {
+        Info,
+        setCurrentFile,
+        unselectFiles: stub(),
+    };
+    
+    vim('g', {}, deps);
+    vim('j', {}, deps);
     
     t.calledWith(setCurrentFile, [nextSibling], 'should ignore g');
     t.end();
@@ -94,23 +115,23 @@ test('cloudcmd: client: key: set next file current: g', (t) => {
 
 test('cloudcmd: client: key: set +2 file current', (t) => {
     const last = {};
-    const nextSibling = {
-        nextSibling: last,
-    };
-    
-    const element = {
-        nextSibling,
-    };
-    
     const setCurrentFile = stub();
+    const element = {};
     
-    global.DOM.CurrentInfo.element = element;
-    global.DOM.setCurrentFile = setCurrentFile;
+    const Info = {
+        element,
+    };
+    
+    const deps = {
+        setCurrentFile,
+        Info,
+        unselectFiles: stub(),
+    };
     
     const event = {};
     
-    vim('2', event);
-    vim('j', event);
+    vim('2', event, deps);
+    vim('j', event, deps);
     
     t.calledWith(setCurrentFile, [last], 'should set next file');
     t.end();
@@ -128,17 +149,30 @@ test('cloudcmd: client: key: select +2 files from current before delete', (t) =>
     
     const setCurrentFile = stub();
     
-    global.DOM.CurrentInfo.element = element;
-    global.DOM.setCurrentFile = setCurrentFile;
-    global.DOM.selectFile = stub();
-    global.DOM.getCurrentName = () => false;
-    global.CloudCmd.Operation.show = stub();
+    const Info = {
+        element,
+    };
+    
+    const Operation = {
+        show: stub(),
+    };
+    
+    const selectFile = stub();
+    const getCurrentName = stub().returns('x');
     
     const event = {};
     
-    vim('d', event);
-    vim('2', event);
-    vim('j', event);
+    const deps = {
+        Info,
+        setCurrentFile,
+        selectFile,
+        getCurrentName,
+        Operation,
+    };
+    
+    vim('d', event, deps);
+    vim('2', event, deps);
+    vim('j', event, deps);
     
     t.calledWith(setCurrentFile, [last], 'should set next file');
     t.end();
@@ -157,17 +191,24 @@ test('cloudcmd: client: key: delete +2 files from current', (t) => {
     const setCurrentFile = stub();
     const show = stub();
     
-    global.DOM.CurrentInfo.element = element;
-    global.DOM.setCurrentFile = setCurrentFile;
-    global.DOM.selectFile = stub();
-    global.DOM.getCurrentName = () => false;
-    global.CloudCmd.Operation.show = show;
+    const deps = {
+        Info: {
+            element,
+        },
+        Operation: {
+            show,
+        },
+        setCurrentFile,
+        selectFile: stub(),
+        getCurrentName: stub().returns('x'),
+        unselectFiles: stub(),
+    };
     
     const event = {};
     
-    vim('d', event);
-    vim('2', event);
-    vim('j', event);
+    vim('d', event, deps);
+    vim('2', event, deps);
+    vim('j', event, deps);
     
     t.calledWith(show, ['delete'], 'should call delete');
     t.end();
@@ -180,11 +221,19 @@ test('cloudcmd: client: key: set previous file current', (t) => {
     };
     
     const setCurrentFile = stub();
+    const unselectFiles = stub();
     
-    global.DOM.CurrentInfo.element = element;
-    global.DOM.setCurrentFile = setCurrentFile;
+    const Info = {
+        element,
+    };
     
-    vim('k', {});
+    const deps = {
+        Info,
+        setCurrentFile,
+        unselectFiles,
+    };
+    
+    vim('k', {}, deps);
     
     t.calledWith(setCurrentFile, [previousSibling], 'should set previous file');
     t.end();
@@ -193,35 +242,63 @@ test('cloudcmd: client: key: set previous file current', (t) => {
 test('cloudcmd: client: key: copy: no', (t) => {
     const copy = stub();
     
-    Buffer.copy = copy;
+    vim('y', {}, {
+        unselectFiles: stub(),
+        Buffer: {
+            copy,
+        },
+    });
     
-    vim('y', {});
-    
-    t.notOk(copy.called, 'should not copy files');
+    t.notCalled(copy, 'should not copy files');
     t.end();
 });
 
 test('cloudcmd: client: key: copy', (t) => {
     const copy = stub();
+    const Info = {
+        element: {},
+    };
     
-    Buffer.copy = copy;
+    const toggleSelectedFile = stub();
+    const unselectFiles = stub();
     
-    vim('v', {});
-    vim('y', {});
+    const deps = {
+        Info,
+        unselectFiles,
+        toggleSelectedFile,
+        Buffer: {
+            copy,
+        },
+    };
     
-    t.ok(copy.calledWith(), 'should copy files');
+    vim('v', {}, deps);
+    vim('y', {}, deps);
+    
+    t.calledWithNoArgs(copy, 'should copy files');
     t.end();
 });
 
 test('cloudcmd: client: key: copy: unselectFiles', (t) => {
     const unselectFiles = stub();
+    const Info = {
+        element: {},
+    };
     
-    DOM.unselectFiles = unselectFiles;
+    const toggleSelectedFile = stub();
     
-    vim('v', {});
-    vim('y', {});
+    const deps = {
+        Info,
+        unselectFiles,
+        toggleSelectedFile,
+        Buffer: {
+            copy: stub(),
+        },
+    };
     
-    t.ok(unselectFiles.calledWith(), 'should unselect files');
+    vim('v', {}, deps);
+    vim('y', {}, deps);
+    
+    t.calledWithNoArgs(unselectFiles, 'should unselect files');
     t.end();
 });
 
@@ -230,40 +307,43 @@ test('cloudcmd: client: key: paste', (t) => {
     
     Buffer.paste = paste;
     
-    vim('p', {});
+    vim('p', {}, {
+        Buffer,
+    });
     
-    t.ok(paste.calledWith(), 'should paste files');
+    t.calledWithNoArgs(paste, 'should paste files');
     t.end();
 });
 
 test('cloudcmd: client: key: selectFile: ..', (t) => {
-    const getCurrentName = stub();
-    
-    DOM.selectFile = stub();
-    DOM.getCurrentName = () => '..';
-    
+    const getCurrentName = stub().returns('..');
+    const selectFile = stub();
     const current = {};
-    vim.selectFile(current);
     
-    t.notOk(getCurrentName.called, 'should not call selectFile');
+    vim.selectFile(current, {
+        selectFile,
+        getCurrentName,
+    });
+    
+    t.notCalled(selectFile, 'should not call selectFile');
     t.end();
 });
 
 test('cloudcmd: client: key: selectFile', (t) => {
     const selectFile = stub();
-    
-    DOM.selectFile = selectFile;
-    DOM.getCurrentName = (a) => a.name;
-    
+    const getCurrentName = stub().returns('x');
     const current = {};
     
-    vim.selectFile(current);
+    vim.selectFile(current, {
+        selectFile,
+        getCurrentName,
+    });
     
     t.calledWith(selectFile, [current], 'should call selectFile');
     t.end();
 });
 
-test('cloudcmd: client: key: set last file current: shift + g', (t) => {
+test('cloudcmd: client: key: set last file current: shift + g', async (t) => {
     const last = 'last';
     const nextSibling = {
         nextSibling: last,
@@ -275,10 +355,13 @@ test('cloudcmd: client: key: set last file current: shift + g', (t) => {
     
     const setCurrentFile = stub();
     
-    global.DOM.CurrentInfo.element = element;
-    global.DOM.setCurrentFile = setCurrentFile;
-    
-    vim('G', {});
+    await vim('G', {}, {
+        Info: {
+            element,
+        },
+        setCurrentFile,
+        unselectFiles: stub(),
+    });
     
     t.calledWith(setCurrentFile, [last], 'should set last file');
     t.end();
@@ -296,10 +379,13 @@ test('cloudcmd: client: key: set last file current: $', (t) => {
     
     const setCurrentFile = stub();
     
-    global.DOM.CurrentInfo.element = element;
-    global.DOM.setCurrentFile = setCurrentFile;
-    
-    vim('$', {});
+    vim('$', {}, {
+        Info: {
+            element,
+        },
+        setCurrentFile,
+        unselectFiles: stub(),
+    });
     
     t.calledWith(setCurrentFile, [last], 'should set last file');
     t.end();
@@ -315,19 +401,30 @@ test('cloudcmd: client: key: set first file current: gg', (t) => {
         previousSibling,
     };
     
+    const Operation = {
+        show: stub(),
+    };
+    
+    const unselectFiles = stub();
     const setCurrentFile = stub();
     
-    global.DOM.CurrentInfo.element = element;
-    global.DOM.setCurrentFile = setCurrentFile;
+    const deps = {
+        Operation,
+        unselectFiles,
+        setCurrentFile,
+        Info: {
+            element,
+        },
+    };
     
-    vim('g', {});
-    vim('g', {});
+    vim('g', {}, deps);
+    vim('g', {}, deps);
     
     t.calledWith(setCurrentFile, [first], 'should set first file');
     t.end();
 });
 
-test('cloudcmd: client: key: set first file current: ^', (t) => {
+test('cloudcmd: client: key: set first file current: ^', async (t) => {
     const first = 'first';
     const previousSibling = {
         previousSibling: first,
@@ -337,12 +434,23 @@ test('cloudcmd: client: key: set first file current: ^', (t) => {
         previousSibling,
     };
     
+    const Operation = {
+        show: stub(),
+    };
+    
+    const unselectFiles = stub();
     const setCurrentFile = stub();
     
-    global.DOM.CurrentInfo.element = element;
-    global.DOM.setCurrentFile = setCurrentFile;
+    const deps = {
+        setCurrentFile,
+        Info: {
+            element,
+        },
+        unselectFiles,
+        Operation,
+    };
     
-    vim('^', {});
+    await vim('^', {}, deps);
     
     t.calledWith(setCurrentFile, [first], 'should set first file');
     t.end();
@@ -350,13 +458,15 @@ test('cloudcmd: client: key: set first file current: ^', (t) => {
 
 test('cloudcmd: client: key: visual', (t) => {
     const element = {};
-    
     const toggleSelectedFile = stub();
+    const Info = {
+        element,
+    };
     
-    global.DOM.CurrentInfo.element = element;
-    global.DOM.toggleSelectedFile = toggleSelectedFile;
-    
-    vim('v', {});
+    vim('v', {}, {
+        Info,
+        toggleSelectedFile,
+    });
     
     t.calledWith(toggleSelectedFile, [element], 'should toggle selection');
     t.end();
@@ -364,32 +474,44 @@ test('cloudcmd: client: key: visual', (t) => {
 
 test('cloudcmd: client: key: ESC', (t) => {
     const element = {};
-    
     const unselectFiles = stub();
+    const Info = {
+        element,
+    };
     
-    global.DOM.CurrentInfo.element = element;
-    global.DOM.unselectFiles = unselectFiles;
+    vim('Escape', null, {
+        Info,
+        unselectFiles,
+    });
     
-    vim('Escape');
-    
-    t.ok(unselectFiles.calledWith(), 'should toggle selection');
+    t.calledWithNoArgs(unselectFiles, 'should toggle selection');
     t.end();
 });
 
-test('cloudcmd: client: key: Enter', (t) => {
+test('cloudcmd: client: key: Enter', async (t) => {
     const nextSibling = 'hello';
     const element = {
         nextSibling,
     };
     
+    const unselectFiles = stub();
     const setCurrentFile = stub();
     
-    DOM.CurrentInfo.element = element;
-    DOM.setCurrentFile = setCurrentFile;
+    const Info = {
+        element,
+    };
     
-    vim('Enter');
+    await vim('Enter', null, {
+        Info,
+        setCurrentFile,
+        unselectFiles,
+    });
     
-    vim('j');
+    await vim('j', null, {
+        Info,
+        setCurrentFile,
+        unselectFiles,
+    });
     
     t.calledWith(setCurrentFile, [nextSibling], 'should set next file');
     t.end();
@@ -449,7 +571,7 @@ test('cloudcmd: client: key: n', (t) => {
     
     stopAll();
     
-    t.ok(findNext.calledWith(), 'should call findNext');
+    t.calledWithNoArgs(findNext, 'should call findNext');
     t.end();
 });
 
@@ -467,12 +589,13 @@ test('cloudcmd: client: key: N', (t) => {
     
     stopAll();
     
-    t.ok(findPrevious.calledWith(), 'should call findPrevious');
+    t.calledWithNoArgs(findPrevious, 'should call findPrevious');
     t.end();
 });
 
-test('cloudcmd: client: key: make directory', (t) => {
+test('cloudcmd: client: key: make directory', async (t) => {
     const vim = reRequire(pathVim);
+    const {DOM} = global;
     
     assign(DOM, {
         promptNewDir: stub(),
@@ -483,8 +606,8 @@ test('cloudcmd: client: key: make directory', (t) => {
         preventDefault: stub(),
     };
     
-    vim('m', event);
-    vim('d', event);
+    await vim('m', event);
+    await vim('d', event);
     
     t.calledWithNoArgs(DOM.promptNewDir);
     t.end();
@@ -492,6 +615,7 @@ test('cloudcmd: client: key: make directory', (t) => {
 
 test('cloudcmd: client: key: make file', (t) => {
     const vim = reRequire(pathVim);
+    const {DOM} = global;
     
     assign(DOM, {
         promptNewFile: stub(),
@@ -510,6 +634,8 @@ test('cloudcmd: client: key: make file', (t) => {
 });
 
 test('cloudcmd: client: vim: terminal', (t) => {
+    const {CloudCmd} = global;
+    
     assign(CloudCmd, {
         Terminal: {
             show: stub(),
@@ -525,7 +651,12 @@ test('cloudcmd: client: vim: terminal', (t) => {
     t.end();
 });
 
-test('cloudcmd: client: vim: edit', (t) => {
+test('cloudcmd: client: vim: edit', async (t) => {
+    global.DOM = getDOM();
+    global.CloudCmd = getCloudCmd();
+    
+    const {CloudCmd} = global;
+    
     assign(CloudCmd, {
         EditFileVim: {
             show: stub(),
@@ -534,7 +665,7 @@ test('cloudcmd: client: vim: edit', (t) => {
     
     const event = {};
     
-    vim('e', event);
+    await vim('e', event);
     
     t.calledWithNoArgs(CloudCmd.EditFileVim.show);
     t.end();
diff --git a/client/sw/register.spec.js b/client/sw/register.spec.js
index 966ed981..c4368c94 100644
--- a/client/sw/register.spec.js
+++ b/client/sw/register.spec.js
@@ -50,7 +50,7 @@ test('sw: register: registerSW: no https', async (t, {location, navigator}) => {
     
     await registerSW();
     
-    t.notOk(register.called, 'should not call register');
+    t.notCalled(register, 'should not call register');
     t.end();
 });
 
@@ -66,7 +66,7 @@ test('sw: register: registerSW: http', async (t, {location, navigator}) => {
     
     await registerSW();
     
-    t.notOk(register.called, 'should not call register');
+    t.notCalled(register, 'should not call register');
     t.end();
 });
 
diff --git a/server/config.spec.js b/server/config.spec.js
index ab62df58..6732a174 100644
--- a/server/config.spec.js
+++ b/server/config.spec.js
@@ -105,6 +105,6 @@ test('config: middle: no', (t) => {
     
     middle(req, res, next);
     
-    t.ok(next.calledWith(), 'should call next');
+    t.calledWithNoArgs(next, 'should call next');
     t.end();
 });
diff --git a/server/rest/info.spec.js b/server/rest/info.spec.js
index 358a5309..0d778ac7 100644
--- a/server/rest/info.spec.js
+++ b/server/rest/info.spec.js
@@ -16,6 +16,6 @@ test('cloudcmd: rest: info', (t) => {
     
     process.memoryUsage = memoryUsage;
     
-    t.ok(_memoryUsage.calledWith(), 'should call memoryUsage');
+    t.calledWithNoArgs(_memoryUsage, 'should call memoryUsage');
     t.end();
 });
diff --git a/server/user-menu.js b/server/user-menu.js
index 4f2b810e..badd3b22 100644
--- a/server/user-menu.js
+++ b/server/user-menu.js
@@ -99,8 +99,11 @@ function sendDefaultMenu(res) {
 
 async function transpile(source) {
     return await tryToCatch(putout, source, {
+        rules: {
+            'nodejs/convert-esm-to-commonjs': 'on',
+        },
         plugins: [
-            'convert-esm-to-commonjs',
+            'nodejs',
             'strict-mode',
             'cloudcmd',
         ],
diff --git a/server/validate.spec.js b/server/validate.spec.js
index 0632822f..64ebb922 100644
--- a/server/validate.spec.js
+++ b/server/validate.spec.js
@@ -44,7 +44,7 @@ test('validate: root: /', (t) => {
     const fn = stub();
     validate.root('/', fn);
     
-    t.notOk(fn.called, 'should not call fn');
+    t.notCalled(fn, 'should not call fn');
     t.end();
 });
 
@@ -116,7 +116,7 @@ test('validate: columns', (t) => {
     
     stopAll();
     
-    t.notOk(fn.called, 'should not call exit');
+    t.notCalled(fn, 'should not call exit');
     t.end();
 });
 
diff --git a/static/user-menu.spec.js b/static/user-menu.spec.js
index 84816d8e..b10b5b15 100644
--- a/static/user-menu.spec.js
+++ b/static/user-menu.spec.js
@@ -191,7 +191,7 @@ test('cloudcmd: static: user menu: refresh', async (t) => {
         CloudCmd,
     });
     
-    t.ok(refresh.calledWith(), 'should call CloudCmd.refresh');
+    t.calledWithNoArgs(refresh, 'should call CloudCmd.refresh');
     t.end();
 });
 
@@ -241,7 +241,7 @@ test('cloudcmd: static: user menu: no EditFile.show', async (t) => {
         CloudCmd,
     });
     
-    t.notOk(EditFile.show.called, 'should not call EditFile.show');
+    t.notCalled(EditFile.show, 'should not call EditFile.show');
     t.end();
 });