diff --git a/tests/CombustorTest.php b/tests/CombustorTest.php
index 71da949..53422b5 100644
--- a/tests/CombustorTest.php
+++ b/tests/CombustorTest.php
@@ -44,7 +44,7 @@ public function setUp()
 
     /**
      * Tests if the initial commands exists.
-     * 
+     *
      * @return void
      */
     public function testCommandsExist()
@@ -60,7 +60,7 @@ public function testCommandsExist()
 
     /**
      * Gets the application with the loaded classes.
-     * 
+     *
      * @return \Symfony\Component\Console\Application
      */
     protected function getApplication()
@@ -75,4 +75,4 @@ protected function getApplication()
 
         return $application;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Commands/CreateControllerCommandTest.php b/tests/Commands/CreateControllerCommandTest.php
index ddb1b6d..83e85df 100644
--- a/tests/Commands/CreateControllerCommandTest.php
+++ b/tests/Commands/CreateControllerCommandTest.php
@@ -42,7 +42,7 @@ public function setUp()
 
     /**
      * Tests if the expected Wildfire controller is created.
-     * 
+     *
      * @return void
      */
     public function testWildfireControllerIsCreated()
@@ -71,7 +71,7 @@ public function testWildfireControllerIsCreated()
 
     /**
      * Tests if the expected Doctrine controller is created.
-     * 
+     *
      * @return void
      */
     public function testDoctrineControllerIsCreated()
diff --git a/tests/Commands/CreateLayoutCommandTest.php b/tests/Commands/CreateLayoutCommandTest.php
index a480e90..e8daf8f 100644
--- a/tests/Commands/CreateLayoutCommandTest.php
+++ b/tests/Commands/CreateLayoutCommandTest.php
@@ -36,7 +36,7 @@ public function setUp()
 
     /**
      * Tests if the expected file exists after executing the command.
-     * 
+     *
      * @return void
      */
     public function testFilesExist()
@@ -57,7 +57,7 @@ public function testFilesExist()
 
     /**
      * Tests if the folder already exists.
-     * 
+     *
      * @return void
      */
     public function testFolderExists()
diff --git a/tests/Commands/CreateModelCommandTest.php b/tests/Commands/CreateModelCommandTest.php
index da95bf0..8428da0 100644
--- a/tests/Commands/CreateModelCommandTest.php
+++ b/tests/Commands/CreateModelCommandTest.php
@@ -42,7 +42,7 @@ public function setUp()
 
     /**
      * Tests if the expected Wildfire model is created.
-     * 
+     *
      * @return void
      */
     public function testWildfireModelIsCreated()
@@ -70,7 +70,7 @@ public function testWildfireModelIsCreated()
 
     /**
      * Tests if the expected Doctrine model is created.
-     * 
+     *
      * @return void
      */
     public function testDoctrineModelIsCreated()
@@ -98,7 +98,7 @@ public function testDoctrineModelIsCreated()
 
     /**
      * Tests if command prompts an error if there is no library installed.
-     * 
+     *
      * @return void
      */
     public function testNoLibraryInstalled()
diff --git a/tests/Commands/CreateScaffoldCommandTest.php b/tests/Commands/CreateScaffoldCommandTest.php
index 78570f4..d80510a 100644
--- a/tests/Commands/CreateScaffoldCommandTest.php
+++ b/tests/Commands/CreateScaffoldCommandTest.php
@@ -44,7 +44,7 @@ public function setUp()
 
     /**
      * Tests if the initial commands exists.
-     * 
+     *
      * @return void
      */
     public function testCommandsExist()
@@ -96,7 +96,7 @@ public function testCommandsExist()
 
     /**
      * Gets the application with the loaded classes.
-     * 
+     *
      * @return \Symfony\Component\Console\Application
      */
     protected function getApplication()
diff --git a/tests/Commands/CreateViewCommandTest.php b/tests/Commands/CreateViewCommandTest.php
index aa1e01d..cf46c18 100644
--- a/tests/Commands/CreateViewCommandTest.php
+++ b/tests/Commands/CreateViewCommandTest.php
@@ -42,7 +42,7 @@ public function setUp()
 
     /**
      * Tests if the expected views are created.
-     * 
+     *
      * @return void
      */
     public function testViewsAreCreated()
@@ -72,7 +72,7 @@ public function testViewsAreCreated()
 
     /**
      * Tests if the command prompts an error if the folder already exists.
-     * 
+     *
      * @return void
      */
     public function testFolderAlreadyExists()
diff --git a/tests/Commands/InstallDoctrineCommandTest.php b/tests/Commands/InstallDoctrineCommandTest.php
index a58ee65..d6e140f 100644
--- a/tests/Commands/InstallDoctrineCommandTest.php
+++ b/tests/Commands/InstallDoctrineCommandTest.php
@@ -37,7 +37,7 @@ public function setUp()
 
     /**
      * Tests if the expected file exists after executing the command.
-     * 
+     *
      * @return void
      */
     public function testFileExists()
diff --git a/tests/Commands/InstallWildfireCommandTest.php b/tests/Commands/InstallWildfireCommandTest.php
index b0ea587..42ab187 100644
--- a/tests/Commands/InstallWildfireCommandTest.php
+++ b/tests/Commands/InstallWildfireCommandTest.php
@@ -38,7 +38,7 @@ public function setUp()
 
     /**
      * Tests if the expected file exists after executing the command.
-     * 
+     *
      * @return void
      */
     public function testFileExists()
diff --git a/tests/Commands/RemoveDoctrineCommandTest.php b/tests/Commands/RemoveDoctrineCommandTest.php
index 1d0e519..3987d63 100644
--- a/tests/Commands/RemoveDoctrineCommandTest.php
+++ b/tests/Commands/RemoveDoctrineCommandTest.php
@@ -46,7 +46,7 @@ public function setUp()
 
     /**
      * Tests if the expected file exists after executing the command.
-     * 
+     *
      * @return void
      */
     public function testFileExists()
@@ -59,7 +59,7 @@ public function testFileExists()
 
         $file = $this->appPath . '/libraries/Doctrine.php';
 
-        $this->assertTrue( ! file_exists($file));
+        $this->assertTrue(! file_exists($file));
 
         CodeIgniterHelper::setDefaults($this->appPath);
     }
diff --git a/tests/Commands/RemoveWildfireCommandTest.php b/tests/Commands/RemoveWildfireCommandTest.php
index b74713b..2b3d348 100644
--- a/tests/Commands/RemoveWildfireCommandTest.php
+++ b/tests/Commands/RemoveWildfireCommandTest.php
@@ -46,7 +46,7 @@ public function setUp()
 
     /**
      * Tests if the expected file exists after executing the command.
-     * 
+     *
      * @return void
      */
     public function testFileExists()
@@ -59,7 +59,7 @@ public function testFileExists()
 
         $file = $this->appPath . '/libraries/Wildfire.php';
 
-        $this->assertTrue( ! file_exists($file));
+        $this->assertTrue(! file_exists($file));
 
         CodeIgniterHelper::setDefaults($this->appPath);
     }
diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php
index 4c1dbed..4c4c06e 100644
--- a/tests/ConfigTest.php
+++ b/tests/ConfigTest.php
@@ -30,7 +30,7 @@ public function setUp()
 
     /**
      * Tests Config::get.
-     * 
+     *
      * @return void
      */
     public function testGet()
@@ -48,7 +48,7 @@ public function testGet()
 
     /**
      * Tests Config::set.
-     * 
+     *
      * @return void
      */
     public function testSet()
@@ -75,4 +75,4 @@ public function testSet()
 
         CodeIgniterHelper::setDefaults($this->appPath);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Fixture/CodeIgniterHelper.php b/tests/Fixture/CodeIgniterHelper.php
index 5b9a390..9c571ad 100644
--- a/tests/Fixture/CodeIgniterHelper.php
+++ b/tests/Fixture/CodeIgniterHelper.php
@@ -7,7 +7,7 @@
 
 /**
  * CodeIgniter Helper
- * 
+ *
  * @package Combustor
  * @author  Rougin Royce Gutib <rougingutib@gmail.com>
  */
@@ -15,7 +15,7 @@ class CodeIgniterHelper
 {
     /**
      * Sets default configurations.
-     * 
+     *
      * @param  string $appPath
      * @return void
      */
@@ -73,7 +73,7 @@ public static function setDefaults($appPath)
 
     /**
      * Deletes files in the specified directory.
-     * 
+     *
      * @param  string  $directory
      * @param  boolean $delete
      * @return void
diff --git a/tests/Fixture/CommandBuilder.php b/tests/Fixture/CommandBuilder.php
index 0b76810..cc7531f 100644
--- a/tests/Fixture/CommandBuilder.php
+++ b/tests/Fixture/CommandBuilder.php
@@ -12,7 +12,7 @@
 
 /**
  * Command Builder
- * 
+ *
  * @package Combustor
  * @author  Rougin Royce Gutib <rougingutib@gmail.com>
  */
@@ -20,7 +20,7 @@ class CommandBuilder
 {
     /**
      * Injects a command with its dependencies.
-     * 
+     *
      * @param  string $command
      * @param  string $app
      * @param  string $templates
diff --git a/tests/TestApp/application/config/autoload.php b/tests/TestApp/application/config/autoload.php
index 7cdc901..355dd75 100644
--- a/tests/TestApp/application/config/autoload.php
+++ b/tests/TestApp/application/config/autoload.php
@@ -1,5 +1,5 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 
 /*
 | -------------------------------------------------------------------
diff --git a/tests/TestApp/application/config/config.php b/tests/TestApp/application/config/config.php
index 105938b..e72c449 100644
--- a/tests/TestApp/application/config/config.php
+++ b/tests/TestApp/application/config/config.php
@@ -1,5 +1,5 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 
 /*
 |--------------------------------------------------------------------------
@@ -52,7 +52,7 @@
 |
 | WARNING: If you set this to 'PATH_INFO', URIs will always be URL-decoded!
 */
-$config['uri_protocol']	= 'REQUEST_URI';
+$config['uri_protocol']    = 'REQUEST_URI';
 
 /*
 |--------------------------------------------------------------------------
@@ -76,7 +76,7 @@
 | than english.
 |
 */
-$config['language']	= 'english';
+$config['language']    = 'english';
 
 /*
 |--------------------------------------------------------------------------
@@ -100,7 +100,7 @@
 | setting this variable to TRUE (boolean).  See the user guide for details.
 |
 */
-$config['enable_hooks'] = FALSE;
+$config['enable_hooks'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -136,7 +136,7 @@
 | Note: This will NOT disable or override the CodeIgniter-specific
 |	autoloading (application/config/autoload.php)
 */
-$config['composer_autoload'] = FALSE;
+$config['composer_autoload'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -185,8 +185,8 @@
 | use segment based URLs.
 |
 */
-$config['allow_get_array'] = TRUE;
-$config['enable_query_strings'] = FALSE;
+$config['allow_get_array'] = true;
+$config['enable_query_strings'] = false;
 $config['controller_trigger'] = 'c';
 $config['function_trigger'] = 'm';
 $config['directory_trigger'] = 'd';
@@ -301,7 +301,7 @@
 |	             of query parameters.
 |
 */
-$config['cache_query_string'] = FALSE;
+$config['cache_query_string'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -370,10 +370,10 @@
 $config['sess_driver'] = 'files';
 $config['sess_cookie_name'] = 'ci_session';
 $config['sess_expiration'] = 7200;
-$config['sess_save_path'] = NULL;
-$config['sess_match_ip'] = FALSE;
+$config['sess_save_path'] = null;
+$config['sess_match_ip'] = false;
 $config['sess_time_to_update'] = 300;
-$config['sess_regenerate_destroy'] = FALSE;
+$config['sess_regenerate_destroy'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -390,11 +390,11 @@
 |       'cookie_httponly') will also affect sessions.
 |
 */
-$config['cookie_prefix']	= '';
-$config['cookie_domain']	= '';
-$config['cookie_path']		= '/';
-$config['cookie_secure']	= FALSE;
-$config['cookie_httponly'] 	= FALSE;
+$config['cookie_prefix']    = '';
+$config['cookie_domain']    = '';
+$config['cookie_path']        = '/';
+$config['cookie_secure']    = false;
+$config['cookie_httponly']    = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -408,7 +408,7 @@
 | (usually \n) and Windows (\r\n).
 |
 */
-$config['standardize_newlines'] = FALSE;
+$config['standardize_newlines'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -422,7 +422,7 @@
 |          for backwards compatibility purposes!
 |
 */
-$config['global_xss_filtering'] = FALSE;
+$config['global_xss_filtering'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -438,11 +438,11 @@
 | 'csrf_regenerate' = Regenerate token on every submission
 | 'csrf_exclude_uris' = Array of URIs which ignore CSRF checks
 */
-$config['csrf_protection'] = FALSE;
+$config['csrf_protection'] = false;
 $config['csrf_token_name'] = 'csrf_test_name';
 $config['csrf_cookie_name'] = 'csrf_cookie_name';
 $config['csrf_expire'] = 7200;
-$config['csrf_regenerate'] = TRUE;
+$config['csrf_regenerate'] = true;
 $config['csrf_exclude_uris'] = array();
 
 /*
@@ -465,7 +465,7 @@
 | by the output class.  Do not 'echo' any values with compression enabled.
 |
 */
-$config['compress_output'] = FALSE;
+$config['compress_output'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -492,7 +492,7 @@
 | Note: You need to have eval() enabled for this to work.
 |
 */
-$config['rewrite_short_tags'] = FALSE;
+$config['rewrite_short_tags'] = false;
 
 /*
 |--------------------------------------------------------------------------
diff --git a/tests/TestApp/application/config/constants.php b/tests/TestApp/application/config/constants.php
index 01096c7..a6ceb26 100644
--- a/tests/TestApp/application/config/constants.php
+++ b/tests/TestApp/application/config/constants.php
@@ -1,5 +1,5 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 
 /*
 |--------------------------------------------------------------------------
@@ -47,7 +47,7 @@
 | of this setting
 |
 */
-define('SHOW_DEBUG_BACKTRACE', TRUE);
+define('SHOW_DEBUG_BACKTRACE', true);
 
 /*
 |--------------------------------------------------------------------------
diff --git a/tests/TestApp/application/config/database.php b/tests/TestApp/application/config/database.php
index fdb42e3..cc2e6b9 100644
--- a/tests/TestApp/application/config/database.php
+++ b/tests/TestApp/application/config/database.php
@@ -1,5 +1,5 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 
 /*
 | -------------------------------------------------------------------
@@ -71,26 +71,26 @@
 | the query builder class.
 */
 $active_group = 'default';
-$query_builder = TRUE;
+$query_builder = true;
 
 $db['default'] = array(
-	'dsn'	=> '',
-	'hostname' => 'sqlite:' . APPPATH . 'databases/test.db',
-	'username' => '',
-	'password' => '',
-	'database' => '',
-	'dbdriver' => 'pdo',
-	'dbprefix' => '',
-	'pconnect' => FALSE,
-	'db_debug' => (ENVIRONMENT !== 'production'),
-	'cache_on' => FALSE,
-	'cachedir' => '',
-	'char_set' => 'utf8',
-	'dbcollat' => 'utf8_general_ci',
-	'swap_pre' => '',
-	'encrypt' => FALSE,
-	'compress' => FALSE,
-	'stricton' => FALSE,
-	'failover' => array(),
-	'save_queries' => TRUE
+    'dsn'    => '',
+    'hostname' => 'sqlite:' . APPPATH . 'databases/test.db',
+    'username' => '',
+    'password' => '',
+    'database' => '',
+    'dbdriver' => 'pdo',
+    'dbprefix' => '',
+    'pconnect' => false,
+    'db_debug' => (ENVIRONMENT !== 'production'),
+    'cache_on' => false,
+    'cachedir' => '',
+    'char_set' => 'utf8',
+    'dbcollat' => 'utf8_general_ci',
+    'swap_pre' => '',
+    'encrypt' => false,
+    'compress' => false,
+    'stricton' => false,
+    'failover' => array(),
+    'save_queries' => true
 );
diff --git a/tests/TestApp/application/config/default/autoload.php b/tests/TestApp/application/config/default/autoload.php
index 7cdc901..355dd75 100644
--- a/tests/TestApp/application/config/default/autoload.php
+++ b/tests/TestApp/application/config/default/autoload.php
@@ -1,5 +1,5 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 
 /*
 | -------------------------------------------------------------------
diff --git a/tests/TestApp/application/config/default/config.php b/tests/TestApp/application/config/default/config.php
index 105938b..e72c449 100644
--- a/tests/TestApp/application/config/default/config.php
+++ b/tests/TestApp/application/config/default/config.php
@@ -1,5 +1,5 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 
 /*
 |--------------------------------------------------------------------------
@@ -52,7 +52,7 @@
 |
 | WARNING: If you set this to 'PATH_INFO', URIs will always be URL-decoded!
 */
-$config['uri_protocol']	= 'REQUEST_URI';
+$config['uri_protocol']    = 'REQUEST_URI';
 
 /*
 |--------------------------------------------------------------------------
@@ -76,7 +76,7 @@
 | than english.
 |
 */
-$config['language']	= 'english';
+$config['language']    = 'english';
 
 /*
 |--------------------------------------------------------------------------
@@ -100,7 +100,7 @@
 | setting this variable to TRUE (boolean).  See the user guide for details.
 |
 */
-$config['enable_hooks'] = FALSE;
+$config['enable_hooks'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -136,7 +136,7 @@
 | Note: This will NOT disable or override the CodeIgniter-specific
 |	autoloading (application/config/autoload.php)
 */
-$config['composer_autoload'] = FALSE;
+$config['composer_autoload'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -185,8 +185,8 @@
 | use segment based URLs.
 |
 */
-$config['allow_get_array'] = TRUE;
-$config['enable_query_strings'] = FALSE;
+$config['allow_get_array'] = true;
+$config['enable_query_strings'] = false;
 $config['controller_trigger'] = 'c';
 $config['function_trigger'] = 'm';
 $config['directory_trigger'] = 'd';
@@ -301,7 +301,7 @@
 |	             of query parameters.
 |
 */
-$config['cache_query_string'] = FALSE;
+$config['cache_query_string'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -370,10 +370,10 @@
 $config['sess_driver'] = 'files';
 $config['sess_cookie_name'] = 'ci_session';
 $config['sess_expiration'] = 7200;
-$config['sess_save_path'] = NULL;
-$config['sess_match_ip'] = FALSE;
+$config['sess_save_path'] = null;
+$config['sess_match_ip'] = false;
 $config['sess_time_to_update'] = 300;
-$config['sess_regenerate_destroy'] = FALSE;
+$config['sess_regenerate_destroy'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -390,11 +390,11 @@
 |       'cookie_httponly') will also affect sessions.
 |
 */
-$config['cookie_prefix']	= '';
-$config['cookie_domain']	= '';
-$config['cookie_path']		= '/';
-$config['cookie_secure']	= FALSE;
-$config['cookie_httponly'] 	= FALSE;
+$config['cookie_prefix']    = '';
+$config['cookie_domain']    = '';
+$config['cookie_path']        = '/';
+$config['cookie_secure']    = false;
+$config['cookie_httponly']    = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -408,7 +408,7 @@
 | (usually \n) and Windows (\r\n).
 |
 */
-$config['standardize_newlines'] = FALSE;
+$config['standardize_newlines'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -422,7 +422,7 @@
 |          for backwards compatibility purposes!
 |
 */
-$config['global_xss_filtering'] = FALSE;
+$config['global_xss_filtering'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -438,11 +438,11 @@
 | 'csrf_regenerate' = Regenerate token on every submission
 | 'csrf_exclude_uris' = Array of URIs which ignore CSRF checks
 */
-$config['csrf_protection'] = FALSE;
+$config['csrf_protection'] = false;
 $config['csrf_token_name'] = 'csrf_test_name';
 $config['csrf_cookie_name'] = 'csrf_cookie_name';
 $config['csrf_expire'] = 7200;
-$config['csrf_regenerate'] = TRUE;
+$config['csrf_regenerate'] = true;
 $config['csrf_exclude_uris'] = array();
 
 /*
@@ -465,7 +465,7 @@
 | by the output class.  Do not 'echo' any values with compression enabled.
 |
 */
-$config['compress_output'] = FALSE;
+$config['compress_output'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -492,7 +492,7 @@
 | Note: You need to have eval() enabled for this to work.
 |
 */
-$config['rewrite_short_tags'] = FALSE;
+$config['rewrite_short_tags'] = false;
 
 /*
 |--------------------------------------------------------------------------
diff --git a/tests/TestApp/application/config/routes.php b/tests/TestApp/application/config/routes.php
index a98c6d1..c9530ed 100644
--- a/tests/TestApp/application/config/routes.php
+++ b/tests/TestApp/application/config/routes.php
@@ -1,5 +1,5 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 
 /*
 | -------------------------------------------------------------------------
@@ -51,4 +51,4 @@
 */
 $route['default_controller'] = 'welcome';
 $route['404_override'] = '';
-$route['translate_uri_dashes'] = FALSE;
+$route['translate_uri_dashes'] = false;
diff --git a/tests/TestApp/application/views/errors/cli/error_404.php b/tests/TestApp/application/views/errors/cli/error_404.php
index 6984b61..6d25be7 100644
--- a/tests/TestApp/application/views/errors/cli/error_404.php
+++ b/tests/TestApp/application/views/errors/cli/error_404.php
@@ -1,8 +1,8 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 
 echo "\nERROR: ",
-	$heading,
-	"\n\n",
-	$message,
-	"\n\n";
\ No newline at end of file
+    $heading,
+    "\n\n",
+    $message,
+    "\n\n";
diff --git a/tests/TestApp/application/views/errors/cli/error_db.php b/tests/TestApp/application/views/errors/cli/error_db.php
index 2ff43ff..8c5b7c9 100644
--- a/tests/TestApp/application/views/errors/cli/error_db.php
+++ b/tests/TestApp/application/views/errors/cli/error_db.php
@@ -1,8 +1,8 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 
 echo "\nDatabase error: ",
-	$heading,
-	"\n\n",
-	$message,
-	"\n\n";
\ No newline at end of file
+    $heading,
+    "\n\n",
+    $message,
+    "\n\n";
diff --git a/tests/TestApp/application/views/errors/cli/error_exception.php b/tests/TestApp/application/views/errors/cli/error_exception.php
index efa6a66..821ebff 100644
--- a/tests/TestApp/application/views/errors/cli/error_exception.php
+++ b/tests/TestApp/application/views/errors/cli/error_exception.php
@@ -1,4 +1,4 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed'); ?>
+<?php defined('BASEPATH') or exit('No direct script access allowed'); ?>
 
 An uncaught Exception was encountered
 
@@ -7,15 +7,15 @@
 Filename:    <?php echo $exception->getFile(), "\n"; ?>
 Line Number: <?php echo $exception->getLine(); ?>
 
-<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
+<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === true): ?>
 
 Backtrace:
 <?php	foreach ($exception->getTrace() as $error): ?>
-<?php		if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
+<?php	    if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
 	File: <?php echo $error['file'], "\n"; ?>
 	Line: <?php echo $error['line'], "\n"; ?>
 	Function: <?php echo $error['function'], "\n\n"; ?>
-<?php		endif ?>
+<?php	    endif ?>
 <?php	endforeach ?>
 
 <?php endif ?>
diff --git a/tests/TestApp/application/views/errors/cli/error_general.php b/tests/TestApp/application/views/errors/cli/error_general.php
index 6984b61..6d25be7 100644
--- a/tests/TestApp/application/views/errors/cli/error_general.php
+++ b/tests/TestApp/application/views/errors/cli/error_general.php
@@ -1,8 +1,8 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 
 echo "\nERROR: ",
-	$heading,
-	"\n\n",
-	$message,
-	"\n\n";
\ No newline at end of file
+    $heading,
+    "\n\n",
+    $message,
+    "\n\n";
diff --git a/tests/TestApp/application/views/errors/cli/error_php.php b/tests/TestApp/application/views/errors/cli/error_php.php
index 8a24b64..d7ce4dd 100644
--- a/tests/TestApp/application/views/errors/cli/error_php.php
+++ b/tests/TestApp/application/views/errors/cli/error_php.php
@@ -1,4 +1,4 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed'); ?>
+<?php defined('BASEPATH') or exit('No direct script access allowed'); ?>
 
 A PHP Error was encountered
 
@@ -7,15 +7,15 @@
 Filename:    <?php echo $filepath, "\n"; ?>
 Line Number: <?php echo $line; ?>
 
-<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
+<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === true): ?>
 
 Backtrace:
 <?php	foreach (debug_backtrace() as $error): ?>
-<?php		if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
+<?php	    if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
 	File: <?php echo $error['file'], "\n"; ?>
 	Line: <?php echo $error['line'], "\n"; ?>
 	Function: <?php echo $error['function'], "\n\n"; ?>
-<?php		endif ?>
+<?php	    endif ?>
 <?php	endforeach ?>
 
 <?php endif ?>
diff --git a/tests/TestApp/application/views/errors/html/error_404.php b/tests/TestApp/application/views/errors/html/error_404.php
index 756ea9d..20e1dfd 100644
--- a/tests/TestApp/application/views/errors/html/error_404.php
+++ b/tests/TestApp/application/views/errors/html/error_404.php
@@ -1,5 +1,5 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 ?><!DOCTYPE html>
 <html lang="en">
 <head>
diff --git a/tests/TestApp/application/views/errors/html/error_db.php b/tests/TestApp/application/views/errors/html/error_db.php
index f5a43f6..e410c98 100644
--- a/tests/TestApp/application/views/errors/html/error_db.php
+++ b/tests/TestApp/application/views/errors/html/error_db.php
@@ -1,5 +1,5 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 ?><!DOCTYPE html>
 <html lang="en">
 <head>
diff --git a/tests/TestApp/application/views/errors/html/error_exception.php b/tests/TestApp/application/views/errors/html/error_exception.php
index 8784886..2e2417b 100644
--- a/tests/TestApp/application/views/errors/html/error_exception.php
+++ b/tests/TestApp/application/views/errors/html/error_exception.php
@@ -1,5 +1,5 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 ?>
 
 <div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
@@ -11,7 +11,7 @@
 <p>Filename: <?php echo $exception->getFile(); ?></p>
 <p>Line Number: <?php echo $exception->getLine(); ?></p>
 
-<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
+<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === true): ?>
 
 	<p>Backtrace:</p>
 	<?php foreach ($exception->getTrace() as $error): ?>
diff --git a/tests/TestApp/application/views/errors/html/error_general.php b/tests/TestApp/application/views/errors/html/error_general.php
index fc3b2eb..f4f4f69 100644
--- a/tests/TestApp/application/views/errors/html/error_general.php
+++ b/tests/TestApp/application/views/errors/html/error_general.php
@@ -1,5 +1,5 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 ?><!DOCTYPE html>
 <html lang="en">
 <head>
diff --git a/tests/TestApp/application/views/errors/html/error_php.php b/tests/TestApp/application/views/errors/html/error_php.php
index b146f9c..337fde1 100644
--- a/tests/TestApp/application/views/errors/html/error_php.php
+++ b/tests/TestApp/application/views/errors/html/error_php.php
@@ -1,5 +1,5 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 ?>
 
 <div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
@@ -11,7 +11,7 @@
 <p>Filename: <?php echo $filepath; ?></p>
 <p>Line Number: <?php echo $line; ?></p>
 
-<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
+<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === true): ?>
 
 	<p>Backtrace:</p>
 	<?php foreach (debug_backtrace() as $error): ?>
diff --git a/tests/ToolsTest.php b/tests/ToolsTest.php
index b183c14..10da995 100644
--- a/tests/ToolsTest.php
+++ b/tests/ToolsTest.php
@@ -11,7 +11,7 @@ class ToolsTest extends PHPUnit_Framework_TestCase
 {
     /**
      * Tests Tools::strip_table_schema.
-     * 
+     *
      * @return void
      */
     public function testStripTableSchema()
diff --git a/tests/ValidatorTest.php b/tests/ValidatorTest.php
index f527714..b4ecf16 100644
--- a/tests/ValidatorTest.php
+++ b/tests/ValidatorTest.php
@@ -42,7 +42,7 @@ public function setUp()
 
     /**
      * Tests if command prompts an error if there is no library installed.
-     * 
+     *
      * @return void
      */
     public function testNoLibraryInstalled()
@@ -65,7 +65,7 @@ public function testNoLibraryInstalled()
 
     /**
      * Tests if command prompts an error if user does not select a library.
-     * 
+     *
      * @return void
      */
     public function testNoLibrarySelected()
@@ -101,7 +101,7 @@ public function testNoLibrarySelected()
 
     /**
      * Tests if the generated file already exists.
-     * 
+     *
      * @return void
      */
     public function testFileExists()
@@ -137,7 +137,7 @@ public function testFileExists()
 
     /**
      * Tests if the command prompts an error if camel is used in Wildfire.
-     * 
+     *
      * @return void
      */
     public function testWildfireCamelCasing()