diff --git a/RoboFile.php b/RoboFile.php
index 8d734d4c5..c4ca0fd93 100644
--- a/RoboFile.php
+++ b/RoboFile.php
@@ -10,23 +10,10 @@ class RoboFile extends \Robo\Tasks
     /**
      * Run the Robo unit tests.
      */
-    public function test($args = "", $options =
-        [
-            'coverage-html' => false,
-            'coverage' => false
-        ])
+    public function test($args = "")
     {
-        $taskCodecept = $this->taskCodecept()
+        return $this->taskCodecept()
             ->args($args);
-
-        if ($options['coverage']) {
-            $taskCodecept->coverageXml('../../build/logs/clover.xml');
-        }
-        if ($options['coverage-html']) {
-            $taskCodecept->coverageHtml('../../build/logs/coverage');
-        }
-
-        return $taskCodecept;
     }
 
     /**
@@ -294,18 +281,20 @@ public function pharInstall()
      */
     public function pharPublish()
     {
-        $current_branch = exec('git rev-parse --abbrev-ref HEAD');
-        $this->taskGitStack()
-            ->checkout('site')
-            ->merge('master')->run();
-        $this->pharBuild();
-        $this->_copy('CHANGELOG.md', 'docs/changelog.md');
+        $this->pharBuild()->run();
+
+        $this->_rename('robo.phar', 'robo-release.phar');
+        $this->taskGitStack()->checkout('gh-pages')->run();
+        $this->taskFilesystemStack()
+            ->remove('robo.phar')
+            ->rename('robo-release.phar', 'robo.phar')
+            ->run();
         $this->taskGitStack()
-            ->add('robo.phar -f')
+            ->add('robo.phar')
             ->commit('robo.phar published')
+            ->push('origin', 'gh-pages')
+            ->checkout('master')
             ->run();
-        $this->_exec('mkdocs gh-deploy');
-        $this->taskGitStack()->checkout($current_branch)->run();
     }
 
     /**
diff --git a/robo.phar b/robo.phar
index 94a49bd15..18e9d553e 100644
Binary files a/robo.phar and b/robo.phar differ
diff --git a/src/LoadAllTasks.php b/src/LoadAllTasks.php
index 823ac54df..ba23237fc 100644
--- a/src/LoadAllTasks.php
+++ b/src/LoadAllTasks.php
@@ -1,6 +1,8 @@
 <?php
 namespace Robo;
 
+use Robo\Collection\Collection;
+
 trait LoadAllTasks
 {
     use TaskAccessor;
@@ -43,6 +45,8 @@ trait LoadAllTasks
      * instead of:
      *
      * $this->getContainer()->get('collection');
+     *
+     * @return Collection
      */
     protected function collection()
     {