diff --git a/tests/Submitty/Twig/Extension/MarkdownEngine/GithubMarkdownEngineTest.php b/tests/Submitty/Twig/Extension/MarkdownEngine/GithubMarkdownEngineTest.php
deleted file mode 100644
index 91c59a7..0000000
--- a/tests/Submitty/Twig/Extension/MarkdownEngine/GithubMarkdownEngineTest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-namespace Submitty\Twig\Extension\MarkdownEngine;
-
-use Submitty\Twig\Extension\MarkdownExtensionTest;
-use Github\Client;
-
-require_once(__DIR__ . '/../MarkdownExtensionTest.php');
-
-/**
- * Class GitHubMarkdownEngineTest
- *
- * @author Lukas W <lukaswhl@gmail.com>
- */
-class GitHubMarkdownEngineTest extends MarkdownExtensionTest
-{
-    /**
-     * @dataProvider getParseMarkdownTests
-     */
-    public function testParseMarkdown($template, $expected, $context = array())
-    {
-        try {
-           $this->assertEquals($expected, $this->getTemplate($template)->render($context));
-        } catch (\Exception $e) {
-            $this->markTestSkipped($e->getMessage());
-        }
-    }
-
-    public function getParseMarkdownTests()
-    {
-        return array(
-            array('{{ "# Main Title"|markdown }}', '<h1>Main Title</h1>'),
-            array('{{ content|markdown }}', '<h1>Main Title</h1>', array('content' => '# Main Title')),
-            // Check if GFM is working
-            array('{{ "@aptoma"|markdown }}',
-                  '<p><a href="https://github.com/aptoma" class="user-mention">@aptoma</a></p>'),
-        );
-    }
-
-    protected function getEngine()
-    {
-        $client = new Client();
-
-        if ($client->rateLimit()->getResource('core')->getLimit() < 1) {
-            $this->markTestSkipped('The github API rate limit is reached, so this engine cannot be tested.');
-        }
-
-        return new GitHubMarkdownEngine();
-    }
-}
diff --git a/tests/Submitty/Twig/Extension/MarkdownEngine/ParsedownEngineTest.php b/tests/Submitty/Twig/Extension/MarkdownEngine/ParsedownEngineTest.php
deleted file mode 100644
index 78faff3..0000000
--- a/tests/Submitty/Twig/Extension/MarkdownEngine/ParsedownEngineTest.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-namespace Submitty\Twig\Extension\MarkdownEngine;
-
-use Submitty\Twig\Extension\MarkdownExtension;
-use Submitty\Twig\Extension\MarkdownExtensionTest;
-
-// Require parent class if not autoloaded
-if (!class_exists('\Aptoma\Twig\Extension\MarkdownExtensionTest')) {
-    require_once(__DIR__ . '/../MarkdownExtensionTest.php');
-}
-
-/**
- * Class ParsedownEngineTest
- *
- * @author Sébastien Lourseau <https://github.com/SebLours>
- */
-class ParsedownEngineTest extends MarkdownExtensionTest
-{
-    public function getParseMarkdownTests()
-    {
-        return array(
-            array('{{ "# Main Title"|markdown }}', '<h1>Main Title</h1>'),
-            array('{{ content|markdown }}', '<h1>Main Title</h1>', array('content' => '# Main Title')),
-            array('{% markdown %}{{ content }}{% endmarkdown %}', '<h1>Main Title</h1>', array('content' => '# Main Title'))
-        );
-    }
-
-    protected function getEngine()
-    {
-        return new ParsedownEngine();
-    }
-
-    public function testSafeMode()
-    {
-        $engine = $this->getEngine();
-        $loader = new \Twig\Loader\ArrayLoader(array('index' => '{{ "_Test_<em>Test</em>[xss](javascript:alert%281%29)"|markdown }}'));
-        $twig = new \Twig\Environment($loader, array('debug' => true, 'cache' => false));
-        $twig->addExtension(new MarkdownExtension($engine));
-
-        $this->assertEquals('<p><em>Test</em><em>Test</em><a href="javascript:alert%281%29">xss</a></p>', $twig->load('index')->render());
-
-        $engine->setSafeMode(true);
-        $this->assertEquals('<p><em>Test</em>&lt;em&gt;Test&lt;/em&gt;<a href="javascript%3Aalert%281%29">xss</a></p>', $twig->load('index')->render());
-        $engine->setSafeMode(false);
-    }
-
-    public function testMarkupEscape()
-    {
-        $engine = $this->getEngine();
-        $loader = new \Twig\Loader\ArrayLoader(array('index' => '{{ "_Test_<em>Test</em>[xss](javascript:alert%281%29)"|markdown }}'));
-        $twig = new \Twig\Environment($loader, array('debug' => true, 'cache' => false));
-        $twig->addExtension(new MarkdownExtension($engine));
-
-        $this->assertEquals('<p><em>Test</em><em>Test</em><a href="javascript:alert%281%29">xss</a></p>', $twig->load('index')->render());
-
-        $engine->setMarkupEscaped(true);
-        $this->assertEquals('<p><em>Test</em>&lt;em&gt;Test&lt;/em&gt;<a href="javascript:alert%281%29">xss</a></p>', $twig->load('index')->render());        
-        $engine->setMarkupEscaped(false);
-    }
-}
diff --git a/tests/Submitty/Twig/Extension/MarkdownEngine/PHPLeagueMarkdownEngineTest.php b/tests/Submitty/Twig/Extension/PHPLeagueMarkdownEngineTest.php
similarity index 68%
rename from tests/Submitty/Twig/Extension/MarkdownEngine/PHPLeagueMarkdownEngineTest.php
rename to tests/Submitty/Twig/Extension/PHPLeagueMarkdownEngineTest.php
index 351d639..c62cda5 100644
--- a/tests/Submitty/Twig/Extension/MarkdownEngine/PHPLeagueMarkdownEngineTest.php
+++ b/tests/Submitty/Twig/Extension/PHPLeagueMarkdownEngineTest.php
@@ -5,16 +5,16 @@
 use Submitty\Twig\Extension\MarkdownExtensionTest;
 
 // Require parent class if not autoloaded
-if (!class_exists('\Aptoma\Twig\Extension\MarkdownExtensionTest')) {
+if (!class_exists('\Submitty\Twig\Extension\MarkdownExtensionTest')) {
     require_once(__DIR__ . '/../MarkdownExtensionTest.php');
 }
 
 /**
- * Class PHPLeagueCommonMarkEngineTest
+ * Class PHPLeagueMarkdownEngineTest
  *
  * @author Casey McLaughlin <caseyamcl@gmail.com>
  */
-class PHPLeagueCommonMarkEngineTest extends MarkdownExtensionTest
+class PHPLeagueMarkdownEngineTest extends MarkdownExtensionTest
 {
     protected function getEngine()
     {
diff --git a/tests/Submitty/Twig/TokenParser/MarkdownTokenParserTest.php b/tests/Submitty/Twig/TokenParser/MarkdownTokenParserTest.php
index f438e53..51fece0 100644
--- a/tests/Submitty/Twig/TokenParser/MarkdownTokenParserTest.php
+++ b/tests/Submitty/Twig/TokenParser/MarkdownTokenParserTest.php
@@ -85,7 +85,7 @@ public function getTests()
 \$lines = explode("\\n", \$content);
 \$content = preg_replace('/^' . \$matches[0]. '/', "", \$lines);
 \$content = join("\\n", \$content);
-echo \$this->env->getExtension('Aptoma\Twig\Extension\MarkdownExtension')->parseMarkdown(\$content);
+echo \$this->env->getExtension('Submitty\Twig\Extension\MarkdownExtension')->parseMarkdown(\$content);
 EOF
             );
 
@@ -106,7 +106,7 @@ public function getTests()
 \$lines = explode("\\n", \$content);
 \$content = preg_replace('/^' . \$matches[0]. '/', "", \$lines);
 \$content = join("\\n", \$content);
-echo \$this->env->getExtension('Aptoma\Twig\Extension\MarkdownExtension')->parseMarkdown(\$content);
+echo \$this->env->getExtension('Submitty\Twig\Extension\MarkdownExtension')->parseMarkdown(\$content);
 EOF
         );