diff --git a/.npmignore b/.npmignore
index 3243bfd4..cbc2ab26 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1,5 +1,6 @@
 .*
 *.spec.js
+*.fixture.js
 manifest.yml
 Dockerfile*
 docker-compose.yml
diff --git a/test/client/key/vim/find.js b/client/key/vim/find.spec.js
similarity index 80%
rename from test/client/key/vim/find.js
rename to client/key/vim/find.spec.js
index 5f4e516a..027e5829 100644
--- a/test/client/key/vim/find.js
+++ b/client/key/vim/find.spec.js
@@ -3,11 +3,11 @@
 const test = require('tape');
 const diff = require('sinon-called-with-diff');
 const sinon = diff(require('sinon'));
-const dir = '../../../../client/key/vim/';
+const dir = './';
 
 const {
     getDOM,
-} = require('./globals');
+} = require('./globals.fixture');
 
 global.DOM = global.DOM || getDOM();
 
@@ -28,7 +28,7 @@ test('cloudcmd: client: vim: find', (t) => {
     
     find('');
     
-    t.ok(setCurrentByName.calledWith(), 'should call setCurrentByName');
+    t.ok(setCurrentByName.calledWith(null), 'should call setCurrentByName');
     t.end();
 });
 
@@ -38,7 +38,7 @@ test('cloudcmd: client: vim: findNext', (t) => {
     
     findNext();
     
-    t.ok(setCurrentByName.calledWith(), 'should call setCurrentByName');
+    t.ok(setCurrentByName.calledWith(null), 'should call setCurrentByName');
     t.end();
 });
 
@@ -48,7 +48,7 @@ test('cloudcmd: client: vim: findPrevious', (t) => {
     
     findPrevious();
     
-    t.ok(setCurrentByName.calledWith(), 'should call setCurrentByName');
+    t.ok(setCurrentByName.calledWith(null), 'should call setCurrentByName');
     t.end();
 });
 
diff --git a/test/client/key/vim/globals.js b/client/key/vim/globals.fixture.js
similarity index 100%
rename from test/client/key/vim/globals.js
rename to client/key/vim/globals.fixture.js
diff --git a/test/client/key/vim/index.js b/client/key/vim/index.spec.js
similarity index 99%
rename from test/client/key/vim/index.js
rename to client/key/vim/index.spec.js
index 172fa303..fbaea6ee 100644
--- a/test/client/key/vim/index.js
+++ b/client/key/vim/index.spec.js
@@ -3,13 +3,13 @@
 const test = require('tape');
 const diff = require('sinon-called-with-diff');
 const sinon = diff(require('sinon'));
-const dir = '../../../../client/key/';
+const dir = '../';
 const KEY = require(dir + 'key');
 
 const {
     getDOM,
     getCloudCmd,
-} = require('./globals');
+} = require('./globals.fixture');
 
 global.DOM = global.DOM || getDOM();
 global.CloudCmd = global.CloudCmd || getCloudCmd();