diff --git a/App/Config/codeception.php b/App/Config/codeception.php
deleted file mode 100644
index 772ec04..0000000
--- a/App/Config/codeception.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-return array(
-
-    /*
-    |--------------------------------------------------------------------------
-    | Codeception Configurations
-    |--------------------------------------------------------------------------
-    |
-    | This is where you add your Codeception configurations.
-    |
-    | Webception allows you to have access test suites for multiple applications.
-    |
-    | Place them in the order you want and they'll appear in the drop-down list
-    | in the front-end. The first site in the list will become the default
-    | site that's loaded on session load.
-    |
-    | Just add the site name and full path to the 'codeception.yml' below and you're set.
-    |
-    */
-
-    'sites' => array(
-
-        'Webception'         => dirname(__FILE__) .'/../../codeception.yml',
-
-    ),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Codeception Executable
-    |--------------------------------------------------------------------------
-    |
-    | Codeception is installed as a dependancy of Webception via Composer.
-    |
-    | You might need to set 'sudo chmod a+x vendor/bin/codecept' to allow Apache
-    | to execute the Codeception executable.
-    |
-    */
-
-    'executable' => dirname(__FILE__) .'/../../vendor/bin/codecept',
-
-    /*
-    |--------------------------------------------------------------------------
-    | You get to decide which type of tests get included.
-    |--------------------------------------------------------------------------
-    */
-
-    'tests' => array(
-        'acceptance' => TRUE,
-        'functional' => TRUE,
-        'unit'       => TRUE,
-    ),
-
-    /*
-    |--------------------------------------------------------------------------
-    | When we scan for the tests, we need to ignore the following files.
-    |--------------------------------------------------------------------------
-    */
-
-    'ignore' => array(
-        'WebGuy.php',
-        'TestGuy.php',
-        'CodeGuy.php',
-        '_bootstrap.php',
-        '.DS_Store',
-    ),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Setting the location as the current file helps with offering information
-    | about where this configuration file sits on the server.
-    |--------------------------------------------------------------------------
-    */
-
-    'location'   => __FILE__,
-);
diff --git a/App/Config/codeception.php b/App/Config/codeception.php
new file mode 120000
index 0000000..9d03c8a
--- /dev/null
+++ b/App/Config/codeception.php
@@ -0,0 +1 @@
+../../../codeception.php
\ No newline at end of file
diff --git a/App/Lib/Codeception.php b/App/Lib/Codeception.php
index 76971be..d11f0e1 100644
--- a/App/Lib/Codeception.php
+++ b/App/Lib/Codeception.php
@@ -130,8 +130,15 @@ public function loadTests()
             if (! $active)
                 break;
 
+            $testdir = "{$this->config['paths']['tests']}/{$type}/";
+
+            if (!is_dir($testdir)) {
+                // If no directory exists for the test type, continue
+                continue;
+            }
+
             $files = new \RecursiveIteratorIterator(
-                new \RecursiveDirectoryIterator("{$this->config['paths']['tests']}/{$type}/", \FilesystemIterator::SKIP_DOTS),
+                new \RecursiveDirectoryIterator($testdir, \FilesystemIterator::SKIP_DOTS),
                 \RecursiveIteratorIterator::SELF_FIRST
             );
 
diff --git a/App/Templates/_cache/.gitignore b/App/Templates/_cache/.gitignore
old mode 100644
new mode 100755
diff --git a/App/Templates/layout/master.html b/App/Templates/layout/master.html
index 1399d5b..47b2122 100755
--- a/App/Templates/layout/master.html
+++ b/App/Templates/layout/master.html
@@ -20,7 +20,7 @@
                             {% if codeception.site.hasChoices() %}
                                 <ul class="dropdown">
                                 {% for hash, site in codeception.site.getSites() %}
-                                    <li><a href="/?hash={{ hash }}">{{ site.name }}</a></li>
+                                    <li><a href="?hash={{ hash }}">{{ site.name }}</a></li>
                                 {% endfor %}
                                 </ul>
                             {% endif %}