diff --git a/tests/codesniffer/FHComplete/tests/files/FHComplete/throws_pass.php b/tests/codesniffer/FHComplete/tests/files/FHComplete/throws_pass.php
index 854344b5b..b2c1d2a04 100644
--- a/tests/codesniffer/FHComplete/tests/files/FHComplete/throws_pass.php
+++ b/tests/codesniffer/FHComplete/tests/files/FHComplete/throws_pass.php
@@ -8,29 +8,29 @@ use Other\Error as OtherError;
 class Throws
 {
 
-    /**
-     * Test throws
-     *
-     * @throws Exception An expection happened.
-     * @throws FHComplete\Boom A boom went off.
-     * @throws FHComplete\Error\Boom Oh, shucks, another boom.
-     * @throws Other\Crap Oh boy.
-     * @throws Other\Error\Issue A missing tissue for your PSR-2 issues.
-     * @return void
-     */
-    public function test()
-    {
-        switch ($a) {
-            case 1:
-                throw new Boom();
-            case 2:
-                throw new Error\Boom();
-            case 3:
-                throw new OtherError\Issue();
-            case 4:
-                throw new Crap();
-            default:
-                throw new \Exception();
-        }
-    }
+	/**
+	 * Test throws
+	 *
+	 * @throws Exception An expection happened.
+	 * @throws FHComplete\Boom A boom went off.
+	 * @throws FHComplete\Error\Boom Oh, shucks, another boom.
+	 * @throws Other\Crap Oh boy.
+	 * @throws Other\Error\Issue A missing tissue for your PSR-2 issues.
+	 * @return void
+	 */
+	public function test()
+	{
+		switch ($a) {
+			case 1:
+				throw new Boom();
+			case 2:
+				throw new Error\Boom();
+			case 3:
+				throw new OtherError\Issue();
+			case 4:
+				throw new Crap();
+			default:
+				throw new \Exception();
+		}
+	}
 }
diff --git a/tests/codesniffer/FHComplete/tests/files/control_structure_brackets_pass.php b/tests/codesniffer/FHComplete/tests/files/control_structure_brackets_pass.php
index 75c37ee8e..2584c3507 100644
--- a/tests/codesniffer/FHComplete/tests/files/control_structure_brackets_pass.php
+++ b/tests/codesniffer/FHComplete/tests/files/control_structure_brackets_pass.php
@@ -1,19 +1,25 @@
 <?php
 
-for ($i = 0; $i < 10; $i++) {
+for ($i = 0; $i < 10; $i++)
+{
     echo 'hello';
 }
 
-if ($i < 10) {
+if ($i < 10)
+{
     echo 'hello2';
-} elseif ($i > 100) {
+}
+elseif ($i > 100)
+{
     echo 'i > 100';
 }
 
-while (false) {
+while (false)
+{
     echo 'false';
 }
 
-do {
+do
+{
     echo 'dowhile test';
 } while (false);
diff --git a/tests/codesniffer/FHComplete/tests/files/control_structure_dowhile.php b/tests/codesniffer/FHComplete/tests/files/control_structure_dowhile.php
index 54b2190d4..b423a48e0 100644
--- a/tests/codesniffer/FHComplete/tests/files/control_structure_dowhile.php
+++ b/tests/codesniffer/FHComplete/tests/files/control_structure_dowhile.php
@@ -1,6 +1,7 @@
 <?php
 
 do
+{
         echo 'dowhile test';
+}
 while (false);
-
diff --git a/tests/codesniffer/FHComplete/tests/files/control_structure_elseif.php b/tests/codesniffer/FHComplete/tests/files/control_structure_elseif.php
index a949c9b60..2cff04006 100644
--- a/tests/codesniffer/FHComplete/tests/files/control_structure_elseif.php
+++ b/tests/codesniffer/FHComplete/tests/files/control_structure_elseif.php
@@ -1,6 +1,9 @@
 <?php
-if (isset($a)) {
+if (isset($a))
+{
 	echo 'a isset';
-} else if (isset($b)) {
+}
+elseif (isset($b))
+{
 	echo 'b isset';
 }
diff --git a/tests/codesniffer/FHComplete/tests/files/control_structure_indentation.php b/tests/codesniffer/FHComplete/tests/files/control_structure_indentation.php
index 277062630..6c6f6084d 100644
--- a/tests/codesniffer/FHComplete/tests/files/control_structure_indentation.php
+++ b/tests/codesniffer/FHComplete/tests/files/control_structure_indentation.php
@@ -1,4 +1,5 @@
 <?php
-if ($value) {
+if ($value)
+{
 	$thing = 'test';
-	}
+}
diff --git a/tests/codesniffer/FHComplete/tests/files/control_structure_nospace.php b/tests/codesniffer/FHComplete/tests/files/control_structure_nospace.php
index a8d505ba0..5988c0b4e 100644
--- a/tests/codesniffer/FHComplete/tests/files/control_structure_nospace.php
+++ b/tests/codesniffer/FHComplete/tests/files/control_structure_nospace.php
@@ -1,4 +1,5 @@
 <?php
-if(isset($test)) {
+if(isset($test))
+{
 	echo 'hello';
 }
diff --git a/tests/codesniffer/FHComplete/tests/files/docblock_align_fail.php b/tests/codesniffer/FHComplete/tests/files/docblock_align_fail.php
index 6ac4401ad..6134c4124 100644
--- a/tests/codesniffer/FHComplete/tests/files/docblock_align_fail.php
+++ b/tests/codesniffer/FHComplete/tests/files/docblock_align_fail.php
@@ -11,22 +11,23 @@ namespace App\Person\Patient;
  */
 class Foo extends Bar
 {
-    /**
-     * What are your thoughts?
-     *
-     * @var array $brain
-     */
-    public $brain = array();
+	/**
+	 * What are your thoughts?
+	 *
+	 * @var array $brain
+	 */
+	public $brain = array();
 
 /**
  * Tell me your thoughts.
  *
  * @return void
  */
-    public function dumpThoughts()
-    {
-        foreach ($thoughts as $thought) {
-            echo $thought;
-        }
-    }
+	public function dumpThoughts()
+	{
+		foreach ($thoughts as $thought)
+		{
+			echo $thought;
+		}
+	}
 }
diff --git a/tests/codesniffer/FHComplete/tests/files/docblock_align_flat_pass.php b/tests/codesniffer/FHComplete/tests/files/docblock_align_flat_pass.php
index 6e9520f5b..6cea31090 100644
--- a/tests/codesniffer/FHComplete/tests/files/docblock_align_flat_pass.php
+++ b/tests/codesniffer/FHComplete/tests/files/docblock_align_flat_pass.php
@@ -17,7 +17,8 @@ $anotherThing = 'what';
  * What happens with If's?
  *
  */
-if ($anotherThing !== 'notfun') {
+if ($anotherThing !== 'notfun')
+{
     $anotherThing = 'Oh no.';
 }
 
diff --git a/tests/codesniffer/FHComplete/tests/files/docblock_align_pass.php b/tests/codesniffer/FHComplete/tests/files/docblock_align_pass.php
index cf4f18e65..0fc7d2f34 100644
--- a/tests/codesniffer/FHComplete/tests/files/docblock_align_pass.php
+++ b/tests/codesniffer/FHComplete/tests/files/docblock_align_pass.php
@@ -8,22 +8,23 @@ namespace FHC;
  */
 class Foo extends Bar
 {
-    /**
-     * What are your thoughts?
-     *
-     * @var array $brain
-     */
-    public $brain = array();
+	/**
+	 * What are your thoughts?
+	 *
+	 * @var array $brain
+	 */
+	public $brain = array();
 
-    /**
-     * Tell me your thoughts.
-     *
-     * @return void
-     */
-    public function dumpThoughts()
-    {
-        foreach ($thoughts as $thought) {
-            echo $thought;
-        }
-    }
+	/**
+	 * Tell me your thoughts.
+	 *
+	 * @return void
+	 */
+	public function dumpThoughts()
+	{
+		foreach ($thoughts as $thought)
+		{
+			echo $thought;
+		}
+	}
 }
diff --git a/tests/codesniffer/FHComplete/tests/files/for_function_comment_pass.php b/tests/codesniffer/FHComplete/tests/files/for_function_comment_pass.php
index fe52e1840..4a86461b9 100644
--- a/tests/codesniffer/FHComplete/tests/files/for_function_comment_pass.php
+++ b/tests/codesniffer/FHComplete/tests/files/for_function_comment_pass.php
@@ -3,13 +3,13 @@ namespace Beakman;
 
 class Foo
 {
-    /**
-     * [doThing description]
-     *
-     * @param string $foo Foo foo foo.
-     * @return void
-     */
-    public function doThing($foo)
-    {
-    }
+	/**
+	 * [doThing description]
+	 *
+	 * @param string $foo Foo foo foo.
+	 * @return void
+	 */
+	public function doThing($foo)
+	{
+	}
 }
diff --git a/tests/codesniffer/FHComplete/tests/files/function_comment_opening_line_fail.php b/tests/codesniffer/FHComplete/tests/files/function_comment_opening_line_fail.php
deleted file mode 100644
index e1762da9b..000000000
--- a/tests/codesniffer/FHComplete/tests/files/function_comment_opening_line_fail.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-class Foo {
-    /** 
-     * There is a (disallowed) trailing space after the opening ** in this doc block.
-     *
-     * @return void
-     */
-    public function bar()
-    {
-    }
-
-}
diff --git a/tests/codesniffer/FHComplete/tests/files/function_comment_type_fail.php b/tests/codesniffer/FHComplete/tests/files/function_comment_type_fail.php
deleted file mode 100644
index 3b05f22f1..000000000
--- a/tests/codesniffer/FHComplete/tests/files/function_comment_type_fail.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-class Foo {
-    /**
-     * Some sentence.
-     *
-     * @param integer $param Some Param.
-     * @param boolean $otherParam Some Other Param.
-     * @return string Something.
-     */
-    public function bar($param, $otherParam)
-    {
-    }
-}
diff --git a/tests/codesniffer/FHComplete/tests/files/function_comment_type_pass.php b/tests/codesniffer/FHComplete/tests/files/function_comment_type_pass.php
deleted file mode 100644
index e9425150c..000000000
--- a/tests/codesniffer/FHComplete/tests/files/function_comment_type_pass.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-namespace Beakman;
-
-class Foo
-{
-    /**
-     * Some sentence.
-     *
-     * @param int $param Some Param.
-     * @param bool $otherParam Some Other Param.
-     * @return void
-     */
-    public function bar($param, $otherParam)
-    {
-    }
-
-    /**
-     * Description
-     *
-     * @return mixed
-     */
-    public function baz()
-    {
-        if ($something) {
-            return;
-        }
-        return 'foo';
-    }
-
-    /**
-     * Description
-     *
-     * @return void|string
-     */
-    public function foo()
-    {
-        if ($something) {
-            return;
-        }
-        return 'foo';
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function inherited($param)
-    {
-    }
-}
diff --git a/tests/codesniffer/FHComplete/tests/files/mixing_indent.php b/tests/codesniffer/FHComplete/tests/files/mixing_indent.php
deleted file mode 100644
index 0400dd514..000000000
--- a/tests/codesniffer/FHComplete/tests/files/mixing_indent.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-if ($indented) {
-	$var = array(
-		 'space' => 'after 2 tabs'
-	 );
-}
diff --git a/tests/codesniffer/FHComplete/tests/files/multiple_use.php b/tests/codesniffer/FHComplete/tests/files/multiple_use.php
deleted file mode 100644
index b239a6419..000000000
--- a/tests/codesniffer/FHComplete/tests/files/multiple_use.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-use FHC\Test,
-    FHC\Fail;
-
-class Foo {
-}
diff --git a/tests/codesniffer/FHComplete/tests/files/multiple_use_pass.php b/tests/codesniffer/FHComplete/tests/files/multiple_use_pass.php
deleted file mode 100644
index ec3609e17..000000000
--- a/tests/codesniffer/FHComplete/tests/files/multiple_use_pass.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-namespace Beakman;
-
-use FHC\Test as Test;
-use Testing\Ok;
-
-class Foo
-{
-}
diff --git a/tests/codesniffer/FHComplete/tests/files/operator_spacing_pass.php b/tests/codesniffer/FHComplete/tests/files/operator_spacing_pass.php
index 7138745e1..014d02a5f 100644
--- a/tests/codesniffer/FHComplete/tests/files/operator_spacing_pass.php
+++ b/tests/codesniffer/FHComplete/tests/files/operator_spacing_pass.php
@@ -1,11 +1,12 @@
 <?php
 $foo = -1;
 
-switch($foo) {
-    case -1:
-        break;
-    case 'negative':
-        return -1;
+switch($foo)
+{
+	case -1:
+		break;
+	case 'negative':
+		return -1;
 }
 $bar = isset($foo) ? -2 : 0;
 $foo = isset($bar) ? 0 : -2;
diff --git a/tests/codesniffer/FHComplete/tests/files/space_tab.php b/tests/codesniffer/FHComplete/tests/files/space_tab.php
index 132eca1a5..b6f683a58 100644
--- a/tests/codesniffer/FHComplete/tests/files/space_tab.php
+++ b/tests/codesniffer/FHComplete/tests/files/space_tab.php
@@ -1,2 +1,2 @@
 <?php
-$var 	= 'space and tab';
\ No newline at end of file
+$var 	= 'space and tab';
diff --git a/tests/codesniffer/FHComplete/tests/files/traits_no_order.php b/tests/codesniffer/FHComplete/tests/files/traits_no_order.php
index 4f351d54f..75fef1a2b 100644
--- a/tests/codesniffer/FHComplete/tests/files/traits_no_order.php
+++ b/tests/codesniffer/FHComplete/tests/files/traits_no_order.php
@@ -3,9 +3,8 @@
 use One;
 use Two;
 
-class Foo {
-
-    use LogTrait;
-    use FirstTrait;
-
+class Foo
+{
+	use LogTrait;
+	use FirstTrait;
 }
diff --git a/tests/codesniffer/FHComplete/tests/files/traits_pass.php b/tests/codesniffer/FHComplete/tests/files/traits_pass.php
index 68a26aaf7..727577bcc 100644
--- a/tests/codesniffer/FHComplete/tests/files/traits_pass.php
+++ b/tests/codesniffer/FHComplete/tests/files/traits_pass.php
@@ -7,9 +7,10 @@ use FHC\More;
 class Foo
 {
 
-    use BarTrait;
-    use FirstTrait {
-        foo as bar;
-        config as protected _config;
-    }
+	use BarTrait;
+	use FirstTrait
+	{
+		foo as bar;
+		config as protected _config;
+	}
 }
diff --git a/tests/codesniffer/FHComplete/tests/files/type_casting_fail.php b/tests/codesniffer/FHComplete/tests/files/type_casting_fail.php
deleted file mode 100644
index 70d4caf62..000000000
--- a/tests/codesniffer/FHComplete/tests/files/type_casting_fail.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$isActive = (boolean)$value;
-$count = (integer)$someNumber;
diff --git a/tests/codesniffer/FHComplete/tests/files/type_casting_pass.php b/tests/codesniffer/FHComplete/tests/files/type_casting_pass.php
deleted file mode 100644
index a2c389247..000000000
--- a/tests/codesniffer/FHComplete/tests/files/type_casting_pass.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$isActive = (bool)$value;
-$count = (int)$someNumber;
diff --git a/tests/codesniffer/FHComplete/tests/files/use_class_and_closure_pass.php b/tests/codesniffer/FHComplete/tests/files/use_class_and_closure_pass.php
deleted file mode 100644
index 6e48e1953..000000000
--- a/tests/codesniffer/FHComplete/tests/files/use_class_and_closure_pass.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-namespace Beakman;
-
-class TraitUser
-{
-
-    use FunctionsTrait;
-
-    /**
-     * [doThing description]
-     *
-     * @param callable $callback The description.
-     * @return void
-     */
-    public function doThing(callable $callback)
-    {
-        $visitor = function ($expression) use (&$visitor, $callback) {
-            echo 'It works';
-        };
-        $visitor($this);
-    }
-}
diff --git a/tests/codesniffer/FHComplete/tests/files/use_closure_pass.php b/tests/codesniffer/FHComplete/tests/files/use_closure_pass.php
deleted file mode 100644
index 998da7177..000000000
--- a/tests/codesniffer/FHComplete/tests/files/use_closure_pass.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$foo = 'bar';
-$bar = 'foo';
-
-$zum = function () use ($foo, $bar) {
-    return $foo;
-};
diff --git a/tests/codesniffer/FHComplete/tests/files/use_no_order.php b/tests/codesniffer/FHComplete/tests/files/use_no_order.php
deleted file mode 100644
index 04f6ec758..000000000
--- a/tests/codesniffer/FHComplete/tests/files/use_no_order.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-use FHC\Routing\Router;
-use FHC\Error;
-use FHC\Utility\Hash;
-
-class Foo {
-}
diff --git a/tests/codesniffer/FHComplete/tests/files/use_ok_pass.php b/tests/codesniffer/FHComplete/tests/files/use_ok_pass.php
deleted file mode 100644
index 9eb8f0c34..000000000
--- a/tests/codesniffer/FHComplete/tests/files/use_ok_pass.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-namespace BryanCrowe;
-
-use FHC\Routing\RouteCollection;
-use FHC\Routing\Router;
-use FHC\Routing\Route\Route;
-
-class Foo
-{
-}
diff --git a/tests/codesniffer/FHComplete/tests/files/use_with_commas.php b/tests/codesniffer/FHComplete/tests/files/use_with_commas.php
deleted file mode 100644
index 41863f392..000000000
--- a/tests/codesniffer/FHComplete/tests/files/use_with_commas.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-use FHC\Routing\Router, FHC\Error;
-
-class Foo
-{
-}
diff --git a/tests/codesniffer/FHComplete/tests/files/variable_name_pass.php b/tests/codesniffer/FHComplete/tests/files/variable_name_pass.php
deleted file mode 100644
index 895dbaab0..000000000
--- a/tests/codesniffer/FHComplete/tests/files/variable_name_pass.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-namespace Beakman;
-
-class VariablenamePass
-{
-    public $passing;
-
-    public $passingPublic = 'defined';
-
-    protected $underScoredStart = 'OK';
-
-    protected $underScored;
-
-    private $doubleUnderscore = 'applications';
-
-    public static $publicStatic = true;
-
-    protected static $protectedStatic = true;
-
-    private static $privateStatic = true;
-
-    /**
-     * [setVariables description]
-     *
-     * @return void
-     */
-    public function setVariables()
-    {
-        $this->passingPublic = 'changed';
-        $this->underscored = 'has value now';
-        $this->doubleUnderscore = 'not recommended';
-    }
-
-    /**
-     * [setStatics description]
-     *
-     * @return void
-     */
-    public static function setStatics()
-    {
-        self::$publicStatic = true;
-        self::$protectedStatic = true;
-        self::$privateStatic = true;
-    }
-}
diff --git a/tests/codesniffer/FHComplete/tests/files/whitespace_comma.php b/tests/codesniffer/FHComplete/tests/files/whitespace_comma.php
deleted file mode 100644
index 78e43d5f0..000000000
--- a/tests/codesniffer/FHComplete/tests/files/whitespace_comma.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-    echo implode('', array_map('chr', array_map('hexdec',array_filter(explode($delimiter, $string)))));
diff --git a/tests/codesniffer/FHComplete/tests/files/whitespace_comma_before.php b/tests/codesniffer/FHComplete/tests/files/whitespace_comma_before.php
deleted file mode 100644
index 4f527d715..000000000
--- a/tests/codesniffer/FHComplete/tests/files/whitespace_comma_before.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-    echo implode('', array_map('chr', array_map('hexdec' , array_filter(explode($delimiter, $string)))));
diff --git a/tests/codesniffer/FHComplete/tests/files/whitespace_comma_pass.php b/tests/codesniffer/FHComplete/tests/files/whitespace_comma_pass.php
deleted file mode 100644
index a6c5ac9b7..000000000
--- a/tests/codesniffer/FHComplete/tests/files/whitespace_comma_pass.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-    echo implode('', array_map('chr', array_map('hexdec', array_filter(explode($delimiter, $string)))));