diff --git a/test/fileFactory.spec.js b/test/fileFactory.spec.js
index 5e357ee..350158e 100644
--- a/test/fileFactory.spec.js
+++ b/test/fileFactory.spec.js
@@ -26,14 +26,6 @@ describe('Test of the fileFactory factory', function() {
   beforeEach(() => server.clearUploadsDir());
 
   it('return a file object', () => assert.ok(fileFactory(mockFileOpts)));
-  it('return void if buffer is empty and useTempFiles is false.', () => {
-    assert.equal(fileFactory({
-      name: mockFileName,
-      buffer: Buffer.concat([])
-    }, {
-      useTempFiles: false
-    }), null);
-  });
 
   describe('Properties', function() {
     it('contains the name property', () => {
diff --git a/test/files/emptyfile.txt b/test/files/emptyfile.txt
new file mode 100644
index 0000000..e69de29
diff --git a/test/multipartUploads.spec.js b/test/multipartUploads.spec.js
index e2a0806..4cefd60 100644
--- a/test/multipartUploads.spec.js
+++ b/test/multipartUploads.spec.js
@@ -12,7 +12,7 @@ const uploadDir = server.uploadDir;
 const clearTempDir = server.clearTempDir;
 const clearUploadsDir = server.clearUploadsDir;
 
-const mockFiles = ['car.png', 'tree.png', 'basketball.png'];
+const mockFiles = ['car.png', 'tree.png', 'basketball.png', 'emptyfile.txt'];
 
 const mockUser = {
   firstName: 'Joe',
diff --git a/test/server.js b/test/server.js
index c384dfa..ae399e0 100644
--- a/test/server.js
+++ b/test/server.js
@@ -40,7 +40,7 @@ const setup = (fileUploadOptions) => {
     const testFile = req.files.testFile;
     const fileData = getUploadedFileData(testFile);
 
-    testFile.mv(fileData.uploadPath, function(err) {
+    testFile.mv(fileData.uploadPath, (err) => {
       if (err) {
         console.log('ERR', err); // eslint-disable-line
         return res.status(500).send(err);