diff --git a/composer.json b/composer.json
index e799d31..51b157c 100644
--- a/composer.json
+++ b/composer.json
@@ -3,24 +3,15 @@
     "name": "pre/six",
     "license": "MIT",
     "require": {
-        "pre/plugin": "^0.7.3"
+        "pre/plugin": "^0.10.0"
     },
     "autoload": {
-        "files": [
-            "src/expanders.php"
-        ]
+        "files": ["source/expanders.php"]
     },
     "require-dev": {
         "phpunit/phpunit": "^5.0|^6.0"
     },
-    "autoload-dev": {
-        "psr-4": {
-            "Pre\\Six\\": "tests"
-        }
-    },
     "extra": {
-        "macros": [
-            "src/macros.yay"
-        ]
+        "macros": ["source/macros.yay"]
     }
 }
diff --git a/phpunit.xml b/phpunit.xml
index 829414b..5543800 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -2,7 +2,7 @@
 <phpunit
     backupGlobals="false"
     backupStaticAttributes="false"
-    bootstrap="tests/bootstrap.php"
+    bootstrap="vendor/autoload.php"
     colors="true"
     convertErrorsToExceptions="true"
     convertNoticesToExceptions="true"
diff --git a/src/expanders.php b/source/expanders.php
similarity index 100%
rename from src/expanders.php
rename to source/expanders.php
diff --git a/src/macros.yay b/source/macros.yay
similarity index 100%
rename from src/macros.yay
rename to source/macros.yay
diff --git a/tests/MacroTest.php b/tests/MacroTest.php
index 04268d1..c27214a 100644
--- a/tests/MacroTest.php
+++ b/tests/MacroTest.php
@@ -1,13 +1,42 @@
 <?php
 
-namespace Pre\Six;
+use PHPUnit\Framework\TestCase;
 
-use Pre\Plugin\Testing\Runner;
-
-class MacroTest extends Runner
+class MacroTest extends TestCase
 {
-    protected function path(): string
+    /**
+     * @test
+     * @dataProvider specs
+     */
+    public function can_transform_code($from, $expected)
+    {
+        Pre\Plugin\addMacro(__DIR__ . "/../source/macros.yay");
+
+        $actual = Pre\plugin\format(Pre\Plugin\parse($this->format($from)));
+        $this->assertEquals($this->format($expected), $actual);
+    }
+
+    private function format($code)
     {
-        return __DIR__ . "/specs";
+        return "<?php\n\n" . trim($code) . "\n";
+    }
+
+    public static function specs()
+    {
+        $specs = [];
+
+        $files = [
+            __DIR__ . "/specs/six.spec",
+        ];
+
+        foreach ($files as $file) {
+            $contents = file_get_contents($file);
+            
+            foreach (explode("---", $contents) as $spec) {
+                array_push($specs, explode("~~~", $spec));
+            }
+        }
+
+        return $specs;
     }
 }
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
deleted file mode 100644
index cd4b3ad..0000000
--- a/tests/bootstrap.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-require __DIR__ . "/../vendor/autoload.php";
-
-putenv("PRE_BASE_DIR=" . __DIR__ . "/../");
-
-Pre\Plugin\addMacroPath(__DIR__ . "/../src/macros.yay");
diff --git a/tests/specs/six.spec b/tests/specs/six.spec
index 072d50a..61803cb 100644
--- a/tests/specs/six.spec
+++ b/tests/specs/six.spec
@@ -1,9 +1,3 @@
---DESCRIPTION--
-
-Test six macros
-
---GIVEN--
-
 ¼ + ¾ + ⅓ + ⅔ + ½
 
 $this→foo()
@@ -24,7 +18,7 @@ $this→foo()
 
 💩 InvalidArgumentException
 
---EXPECT--
+~~~
 
 (1/4) + (3/4) + (1/3) + (2/3) + (1/2)