 
   they 'should validate a created file', (ssh, next) ->
     # Test with invalid creates option
-    mecano.extract
+    mecano
       ssh: ssh
+    .extract
       source: "#{__dirname}/../resources/a_dir.tgz"
       destination: scratch
       creates: "#{scratch}/oh_no"
-    , (err, extracted) ->
+    .then (err, extracted) ->
       err.message.should.eql "Failed to create 'oh_no'"
       # Test with valid creates option
-      mecano.extract
-        ssh: ssh
-        source: "#{__dirname}/../resources/a_dir.tgz"
-        destination: scratch
-        creates: "#{scratch}/a_dir"
-      , (err, extracted) ->
-        return next err if err
-        extracted.should.be.true()
-        next()
+    .extract
+      source: "#{__dirname}/../resources/a_dir.tgz"
+      destination: scratch
+      creates: "#{scratch}/a_dir"
+    , (err, extracted) ->
+      extracted.should.be.true()
+    .then next
 
   they 'should # option # not_if_exists', (ssh, next) ->
     # Test with invalid creates option
-    mecano.extract
+    mecano
       ssh: ssh
+    .extract
       source: "#{__dirname}/../resources/a_dir.tgz"
       destination: scratch
       not_if_exists: __dirname

    .then next

  they 'should see extension .tar.bz2', (ssh, next) ->
    # Test a non existing extracted dir
    mecano.extract
      ssh: ssh
      source: "#{__dirname}/../resources/a_dir.tar.bz2"
      destination: scratch
    , (err, extracted) ->

    .then next

  they 'should see extension .tar.xz', (ssh, next) ->
    mecano
      ssh: ssh
    .extract
      source: "#{__dirname}/../resources/a_dir.tar.xz"
      destination: scratch
    , (err, extracted) ->
