diff --git a/.travis.yml b/.travis.yml
index c479970..ba683c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,8 @@
 language: php
 
 php:
+  - "5.3"
+  - "5.4"
   - "5.5"
 
 install:
diff --git a/classes/Controller.php b/classes/Controller.php
index dab6ce6..e47ef40 100644
--- a/classes/Controller.php
+++ b/classes/Controller.php
@@ -23,7 +23,7 @@
  * module asks for it, and loads the viewer that the module requested. Default
  * values are present to make things easier on the user.
  *
- * @usage <code>new Controller($config);</code>
+ * @usage <code>new Controller();</code>
  */
 class Controller extends Object
 {
@@ -83,7 +83,7 @@ class Controller extends Object
 		$module_filename = SITE_MODULE_PATH . $request . '.php';
 		$module_exists   = file_exists($module_filename);
 
-		// Instantiates the requested module or a generic object
+		// Attempts to instantiate the requested module
 		if ($module_exists)
 		{
 			// @todo Is this redundant because of our autoloader?
@@ -93,12 +93,10 @@ class Controller extends Object
 			{
 				$module = new $module_class;
 			}
-			else
-			{
-				$module = new Module();
-			}
 		}
-		else
+
+		// No module instantiated, load up a generic Module
+		if (!isset($module))
 		{
 			$module = new Module();
 		}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 7e264ba..9946a5b 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -7,10 +7,19 @@ require_once '.composer/autoload.php';
 $root = org\bovigo\vfs\vfsStream::setup('site');
 define('SITE_PATH', org\bovigo\vfs\vfsStream::url('site/'));
 
+require_once 'classes/Convert.php';
+require_once 'classes/Date.php';
+require_once 'classes/Time.php';
+require_once 'classes/String.php';
+
 require_once 'classes/Object.php';
 require_once 'classes/Config.php';
 require_once 'classes/Display.php';
 require_once 'classes/File.php';
+
+require_once 'classes/API/Common.php';
+require_once 'classes/API/Gravatar.php';
+
 require_once 'pickles.php';
 
 ?>
diff --git a/tests/classes/ConvertTest.php b/tests/classes/ConvertTest.php
index 0eebf49..56d65b1 100644
--- a/tests/classes/ConvertTest.php
+++ b/tests/classes/ConvertTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'classes/Convert.php';
-
 class ConvertTest extends PHPUnit_Framework_TestCase
 {
 	/**
diff --git a/tests/classes/DateTest.php b/tests/classes/DateTest.php
index 5ca7457..ea70861 100644
--- a/tests/classes/DateTest.php
+++ b/tests/classes/DateTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'classes/Date.php';
-require_once 'classes/Time.php';
-
 class DateTest extends PHPUnit_Framework_TestCase
 {
 	/**
diff --git a/tests/classes/StringTest.php b/tests/classes/StringTest.php
index 0da1473..10ee034 100644
--- a/tests/classes/StringTest.php
+++ b/tests/classes/StringTest.php
@@ -1,10 +1,5 @@
 <?php
 
-require_once 'classes/String.php';
-require_once 'classes/Object.php';
-require_once 'classes/API/Common.php';
-require_once 'classes/API/Gravatar.php';
-
 class StringTest extends PHPUnit_Framework_TestCase
 {
 	/**