diff --git a/tests/Console/Utils/ParamsValidatorTest.phpt b/tests/Cases/Console/Utils/ParamsValidatorTest.phpt
similarity index 94%
rename from tests/Console/Utils/ParamsValidatorTest.phpt
rename to tests/Cases/Console/Utils/ParamsValidatorTest.phpt
index bdc41c8..4b6344f 100644
--- a/tests/Console/Utils/ParamsValidatorTest.phpt
+++ b/tests/Cases/Console/Utils/ParamsValidatorTest.phpt
@@ -2,15 +2,15 @@
 
 declare(strict_types=1);
 
-namespace Contributte\Anabelle\Tests\Console\Utils;
+namespace Contributte\Anabelle\Tests\Cases\Console\Utils;
 
-require_once __DIR__ . '/../../bootstrap.php';
-
-use Tester\Assert;
-use Tester\TestCase;
 use Contributte\Anabelle\Console\Utils\Exception\ParamsValidatorException;
 use Contributte\Anabelle\Console\Utils\ParamsValidator;
 use Contributte\Anabelle\Http\AuthCredentials;
+use Tester\Assert;
+use Tester\TestCase;
+
+require_once __DIR__ . '/../../../bootstrap.php';
 
 class ParamsValidatorTest extends TestCase
 {
diff --git a/tests/Markdown/Macro/Index/IndexSectionTest.phpt b/tests/Cases/Markdown/Macro/Index/IndexSectionTest.phpt
similarity index 87%
rename from tests/Markdown/Macro/Index/IndexSectionTest.phpt
rename to tests/Cases/Markdown/Macro/Index/IndexSectionTest.phpt
index 9015835..9085d23 100644
--- a/tests/Markdown/Macro/Index/IndexSectionTest.phpt
+++ b/tests/Cases/Markdown/Macro/Index/IndexSectionTest.phpt
@@ -2,15 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Contributte\Anabelle\Tests\Markdown\Macro\Index;
+namespace Contributte\Anabelle\Tests\Cases\Markdown\Macro\Index;
 
-require_once __DIR__ . '/../../../bootstrap.php';
-
-use Tester\Assert;
-use Tester\TestCase;
 use Contributte\Anabelle\Markdown\Macro\Index\Exception\PartDidNotMatchException;
 use Contributte\Anabelle\Markdown\Macro\Index\IndexSection;
-use Contributte\Anabelle\Markdown\Macro\MacroIndex;
+use Tester\Assert;
+use Tester\TestCase;
+
+require_once __DIR__ . '/../../../../bootstrap.php';
 
 /**
  * @testCase
diff --git a/tests/Markdown/Macro/Index/IndexSubTitleTest.phpt b/tests/Cases/Markdown/Macro/Index/IndexSubTitleTest.phpt
similarity index 84%
rename from tests/Markdown/Macro/Index/IndexSubTitleTest.phpt
rename to tests/Cases/Markdown/Macro/Index/IndexSubTitleTest.phpt
index 0c54320..16f0d4a 100644
--- a/tests/Markdown/Macro/Index/IndexSubTitleTest.phpt
+++ b/tests/Cases/Markdown/Macro/Index/IndexSubTitleTest.phpt
@@ -2,15 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Contributte\Anabelle\Tests\Markdown\Macro\Index;
+namespace Contributte\Anabelle\Tests\Cases\Markdown\Macro\Index;
 
-require_once __DIR__ . '/../../../bootstrap.php';
-
-use Tester\Assert;
-use Tester\TestCase;
 use Contributte\Anabelle\Markdown\Macro\Index\Exception\PartDidNotMatchException;
 use Contributte\Anabelle\Markdown\Macro\Index\IndexSubTitle;
-use Contributte\Anabelle\Markdown\Macro\MacroIndex;
+use Tester\Assert;
+use Tester\TestCase;
+
+require_once __DIR__ . '/../../../../bootstrap.php';
 
 /**
  * @testCase
diff --git a/tests/Markdown/Macro/Index/IndexTitleTest.phpt b/tests/Cases/Markdown/Macro/Index/IndexTitleTest.phpt
similarity index 82%
rename from tests/Markdown/Macro/Index/IndexTitleTest.phpt
rename to tests/Cases/Markdown/Macro/Index/IndexTitleTest.phpt
index dc8a032..6aeeaf6 100644
--- a/tests/Markdown/Macro/Index/IndexTitleTest.phpt
+++ b/tests/Cases/Markdown/Macro/Index/IndexTitleTest.phpt
@@ -2,15 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Contributte\Anabelle\Tests\Markdown\Macro\Index;
+namespace Contributte\Anabelle\Tests\Cases\Markdown\Macro\Index;
 
-require_once __DIR__ . '/../../../bootstrap.php';
-
-use Tester\Assert;
-use Tester\TestCase;
 use Contributte\Anabelle\Markdown\Macro\Index\Exception\PartDidNotMatchException;
 use Contributte\Anabelle\Markdown\Macro\Index\IndexTitle;
-use Contributte\Anabelle\Markdown\Macro\MacroIndex;
+use Tester\Assert;
+use Tester\TestCase;
+
+require_once __DIR__ . '/../../../../bootstrap.php';
 
 /**
  * @testCase
diff --git a/tests/Markdown/Macro/MacroIncludeTest.phpt b/tests/Cases/Markdown/Macro/MacroIncludeTest.phpt
similarity index 79%
rename from tests/Markdown/Macro/MacroIncludeTest.phpt
rename to tests/Cases/Markdown/Macro/MacroIncludeTest.phpt
index 7f207e6..8f79415 100644
--- a/tests/Markdown/Macro/MacroIncludeTest.phpt
+++ b/tests/Cases/Markdown/Macro/MacroIncludeTest.phpt
@@ -1,14 +1,14 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
-namespace Contributte\Anabelle\Tests\Markdown\Macro;
-
-require_once __DIR__ . '/../../bootstrap.php';
+namespace Contributte\Anabelle\Tests\Cases\Markdown\Macro;
 
+use Contributte\Anabelle\Markdown\Macro\MacroInclude;
 use Tester\Assert;
 use Tester\TestCase;
-use Contributte\Anabelle\Markdown\Macro\MacroInclude;
+
+require_once __DIR__ . '/../../../bootstrap.php';
 
 /**
  * @testCase
diff --git a/tests/Markdown/Macro/MacroIndexTest.phpt b/tests/Cases/Markdown/Macro/MacroIndexTest.phpt
similarity index 88%
rename from tests/Markdown/Macro/MacroIndexTest.phpt
rename to tests/Cases/Markdown/Macro/MacroIndexTest.phpt
index 4c39225..fa3421b 100644
--- a/tests/Markdown/Macro/MacroIndexTest.phpt
+++ b/tests/Cases/Markdown/Macro/MacroIndexTest.phpt
@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-namespace Contributte\Anabelle\Tests\Markdown\Macro;
-
-require_once __DIR__ . '/../../bootstrap.php';
+namespace Contributte\Anabelle\Tests\Cases\Markdown\Macro;
 
+use Contributte\Anabelle\Markdown\Macro\MacroIndex;
 use Tester\Assert;
 use Tester\TestCase;
-use Contributte\Anabelle\Markdown\Macro\MacroIndex;
+
+require_once __DIR__ . '/../../../bootstrap.php';
 
 /**
  * @testCase
diff --git a/tests/Markdown/Macro/MacroInlineFileLinkTest.phpt b/tests/Cases/Markdown/Macro/MacroInlineFileLinkTest.phpt
similarity index 87%
rename from tests/Markdown/Macro/MacroInlineFileLinkTest.phpt
rename to tests/Cases/Markdown/Macro/MacroInlineFileLinkTest.phpt
index 3ed62c3..438cc2a 100644
--- a/tests/Markdown/Macro/MacroInlineFileLinkTest.phpt
+++ b/tests/Cases/Markdown/Macro/MacroInlineFileLinkTest.phpt
@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Contributte\Anabelle\Tests\Markdown\Macro;
+namespace Contributte\Anabelle\Tests\Cases\Markdown\Macro;
 
-require_once __DIR__ . '/../../bootstrap.php';
-
-use Tester\Assert;
-use Tester\TestCase;
 use Contributte\Anabelle\Markdown\DocuScope;
 use Contributte\Anabelle\Markdown\Macro\MacroInlineFileLink;
+use Tester\Assert;
+use Tester\TestCase;
+
+require_once __DIR__ . '/../../../bootstrap.php';
 
 /**
  * @testCase
diff --git a/tests/Markdown/Macro/MacroSectionTest.phpt b/tests/Cases/Markdown/Macro/MacroSectionTest.phpt
similarity index 92%
rename from tests/Markdown/Macro/MacroSectionTest.phpt
rename to tests/Cases/Markdown/Macro/MacroSectionTest.phpt
index 08f3d09..7b40a55 100644
--- a/tests/Markdown/Macro/MacroSectionTest.phpt
+++ b/tests/Cases/Markdown/Macro/MacroSectionTest.phpt
@@ -2,18 +2,18 @@
 
 declare(strict_types=1);
 
-namespace Contributte\Anabelle\Tests\Markdown\Macro;
+namespace Contributte\Anabelle\Tests\Cases\Markdown\Macro;
 
-require_once __DIR__ . '/../../bootstrap.php';
-
-use Mockery;
-use Symfony\Component\Console\Output\OutputInterface;
-use Tester\Assert;
-use Tester\TestCase;
 use Contributte\Anabelle\Console\Utils\Logger;
 use Contributte\Anabelle\Http\AuthCredentials;
 use Contributte\Anabelle\Markdown\DocuScope;
 use Contributte\Anabelle\Markdown\Macro\MacroSection;
+use Mockery;
+use Symfony\Component\Console\Output\OutputInterface;
+use Tester\Assert;
+use Tester\TestCase;
+
+require_once __DIR__ . '/../../../bootstrap.php';
 
 /**
  * @testCase
diff --git a/tests/Markdown/Macro/files/_files/testhash.json b/tests/Cases/Markdown/Macro/files/_files/testhash.json
similarity index 100%
rename from tests/Markdown/Macro/files/_files/testhash.json
rename to tests/Cases/Markdown/Macro/files/_files/testhash.json
diff --git a/tests/Markdown/Macro/files/expected_MacroIncludeTest.md b/tests/Cases/Markdown/Macro/files/expected_MacroIncludeTest.md
similarity index 100%
rename from tests/Markdown/Macro/files/expected_MacroIncludeTest.md
rename to tests/Cases/Markdown/Macro/files/expected_MacroIncludeTest.md
diff --git a/tests/Markdown/Macro/files/expected_MacroInlineFileLinkTest.md b/tests/Cases/Markdown/Macro/files/expected_MacroInlineFileLinkTest.md
similarity index 100%
rename from tests/Markdown/Macro/files/expected_MacroInlineFileLinkTest.md
rename to tests/Cases/Markdown/Macro/files/expected_MacroInlineFileLinkTest.md
diff --git a/tests/Markdown/Macro/files/input_MacroIncludeTest.md b/tests/Cases/Markdown/Macro/files/input_MacroIncludeTest.md
similarity index 100%
rename from tests/Markdown/Macro/files/input_MacroIncludeTest.md
rename to tests/Cases/Markdown/Macro/files/input_MacroIncludeTest.md
diff --git a/tests/Markdown/Macro/files/input_MacroInlineFileLinkTest.md b/tests/Cases/Markdown/Macro/files/input_MacroInlineFileLinkTest.md
similarity index 100%
rename from tests/Markdown/Macro/files/input_MacroInlineFileLinkTest.md
rename to tests/Cases/Markdown/Macro/files/input_MacroInlineFileLinkTest.md
diff --git a/tests/Markdown/Macro/files/inserted.json b/tests/Cases/Markdown/Macro/files/inserted.json
similarity index 100%
rename from tests/Markdown/Macro/files/inserted.json
rename to tests/Cases/Markdown/Macro/files/inserted.json
diff --git a/tests/Markdown/Macro/files/inserted.md b/tests/Cases/Markdown/Macro/files/inserted.md
similarity index 100%
rename from tests/Markdown/Macro/files/inserted.md
rename to tests/Cases/Markdown/Macro/files/inserted.md
diff --git a/tests/testDir/about.md b/tests/Fixtures/testDir/about.md
similarity index 100%
rename from tests/testDir/about.md
rename to tests/Fixtures/testDir/about.md
diff --git a/tests/testDir/foo.md b/tests/Fixtures/testDir/foo.md
similarity index 100%
rename from tests/testDir/foo.md
rename to tests/Fixtures/testDir/foo.md
diff --git a/tests/testDir/home.md b/tests/Fixtures/testDir/home.md
similarity index 100%
rename from tests/testDir/home.md
rename to tests/Fixtures/testDir/home.md
diff --git a/tests/testDir/index.md b/tests/Fixtures/testDir/index.md
similarity index 100%
rename from tests/testDir/index.md
rename to tests/Fixtures/testDir/index.md
diff --git a/tests/testDir/methods/user.login.md b/tests/Fixtures/testDir/methods/user.login.md
similarity index 100%
rename from tests/testDir/methods/user.login.md
rename to tests/Fixtures/testDir/methods/user.login.md
diff --git a/tests/testDir/methods/user.logout.md b/tests/Fixtures/testDir/methods/user.logout.md
similarity index 100%
rename from tests/testDir/methods/user.logout.md
rename to tests/Fixtures/testDir/methods/user.logout.md
diff --git a/tests/testDir/styles.css b/tests/Fixtures/testDir/styles.css
similarity index 100%
rename from tests/testDir/styles.css
rename to tests/Fixtures/testDir/styles.css
diff --git a/tests/testOutputDir/about.html b/tests/Fixtures/testOutputDir/about.html
similarity index 100%
rename from tests/testOutputDir/about.html
rename to tests/Fixtures/testOutputDir/about.html
diff --git a/tests/testOutputDir/foo.html b/tests/Fixtures/testOutputDir/foo.html
similarity index 100%
rename from tests/testOutputDir/foo.html
rename to tests/Fixtures/testOutputDir/foo.html
diff --git a/tests/testOutputDir/home.html b/tests/Fixtures/testOutputDir/home.html
similarity index 100%
rename from tests/testOutputDir/home.html
rename to tests/Fixtures/testOutputDir/home.html
diff --git a/tests/testOutputDir/methods/user.login.html b/tests/Fixtures/testOutputDir/methods/user.login.html
similarity index 100%
rename from tests/testOutputDir/methods/user.login.html
rename to tests/Fixtures/testOutputDir/methods/user.login.html
diff --git a/tests/testOutputDir/methods/user.logout.html b/tests/Fixtures/testOutputDir/methods/user.logout.html
similarity index 100%
rename from tests/testOutputDir/methods/user.logout.html
rename to tests/Fixtures/testOutputDir/methods/user.logout.html
diff --git a/tests/Markdown/Macro/output/MacroIndexTest.[method=testSections].actual b/tests/Markdown/Macro/output/MacroIndexTest.[method=testSections].actual
deleted file mode 100644
index 8a8a0be..0000000
--- a/tests/Markdown/Macro/output/MacroIndexTest.[method=testSections].actual
+++ /dev/null
@@ -1,6 +0,0 @@
-# Test title
-
-@ home:home.md
-@ about:about.md
-@@ method1:method1.md
-@@ method1:method1.md
diff --git a/tests/Markdown/Macro/output/MacroIndexTest.[method=testSections].expected b/tests/Markdown/Macro/output/MacroIndexTest.[method=testSections].expected
deleted file mode 100644
index 6893f96..0000000
--- a/tests/Markdown/Macro/output/MacroIndexTest.[method=testSections].expected
+++ /dev/null
@@ -1,7 +0,0 @@
-# Test title
-
-@ home:home.md
-@ about:about.md
-#@ SubSitle
-@@ method1:method1.md
-@@ method1:method1.md
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index b9463ad..7c230bf 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,15 +1,12 @@
-<?php
+<?php declare(strict_types = 1);
 
-declare(strict_types=1);
+use Contributte\Tester\Environment;
 
-namespace Api\Tests;
+if (@!include __DIR__ . '/../vendor/autoload.php') {
+	echo 'Install Nette Tester using `composer update --dev`';
+	exit(1);
+}
 
-use Tester\Environment;
+Environment::setup(__DIR__);
 
-require __DIR__ . '/../vendor/autoload.php';
-
-define('TEST_DOCU_DIR', __DIR__ . '/testDir');
-
-Environment::setup();
-
-date_default_timezone_set('Europe/Prague');
+define('TEST_DOCU_DIR', __DIR__ . '/Fixtures/testDir');