diff --git a/lib/moan.js b/lib/moan.js
index <HASH>..<HASH> 100644
--- a/lib/moan.js
+++ b/lib/moan.js
@@ -598,10 +598,10 @@ class Moan extends EventEmitter {
 
     task
       .on('completed', (value) => {
-        this.emit('completed', value, task.name)
+        this.emit('completed', task.name, value)
       })
       .on('failed', (error) => {
-        this.emit('failed', error, task.name)
+        this.emit('failed', task.name, error)
       })
 
     return this
diff --git a/test/moan.spec.js b/test/moan.spec.js
index <HASH>..<HASH> 100644
--- a/test/moan.spec.js
+++ b/test/moan.spec.js
@@ -541,7 +541,14 @@ describe('Moan', () => {
   })
 
   describe('#task', () => {
-    // TODO: Complete unit tests
+    it('should create and register a task with the name', () => {
+      let dependencies = [ 'fu', 'baz' ]
+      function runnable() {}
+
+      expect(moan.task('foo', dependencies, runnable)).to.be(moan)
+
+      expect(moan.tasks).to.eql([ 'foo' ])
+    })
   })
 
   describe('#tasks', () => {
added tests to cover moan#task