diff --git a/frontend/src/fileReceiver.js b/frontend/src/fileReceiver.js
index 6eb7c3fc..7f57f777 100644
--- a/frontend/src/fileReceiver.js
+++ b/frontend/src/fileReceiver.js
@@ -78,12 +78,8 @@ class FileReceiver extends EventEmitter {
             resolve(decrypted);
           })
         }),
-        new Promise((resolve, reject) => {
-          resolve(fdata.filename);
-        }),
-        new Promise((resolve, reject) => {
-          resolve(hexToArray(fdata.aad));
-        })
+        fdata.filename,
+        hexToArray(fdata.aad)
       ]);
     }).then(([decrypted, fname, proposedHash]) => {
       this.emit('hashing', true);
@@ -96,12 +92,8 @@ class FileReceiver extends EventEmitter {
         } else {
           this.emit('safe', true);
           return Promise.all([
-            new Promise((resolve, reject) => {
-              resolve(decrypted);
-            }),
-            new Promise((resolve, reject) => {
-              resolve(fname);
-            })
+            decrypted,
+            fname
           ]);
         }
       })
diff --git a/test/frontend/frontend.test.js b/test/frontend/frontend.test.js
index 1e286008..aa385973 100644
--- a/test/frontend/frontend.test.js
+++ b/test/frontend/frontend.test.js
@@ -40,6 +40,7 @@ describe('File Sender', function() {
   })
 
   it('Should get a loading event emission', function() {
+      assert.fail();
       const file = new FakeFile('hello_world.txt', ['This is some data.'])
       const fs = new FileSender(file);
       let testLoading = true;