diff --git a/composer.json b/composer.json
index db60c7c..d3acb55 100644
--- a/composer.json
+++ b/composer.json
@@ -3,24 +3,17 @@
     "name": "pre/immutable-classes",
     "license": "MIT",
     "require": {
-        "pre/plugin": "^0.7.3"
+        "pre/plugin": "^0.10.0"
     },
     "autoload": {
         "psr-4": {
-            "Pre\\ImmutableClasses\\": "src"
+            "Pre\\ImmutableClasses\\": "source"
         }
     },
     "require-dev": {
         "phpunit/phpunit": "^5.0|^6.0"
     },
-    "autoload-dev": {
-        "psr-4": {
-            "Pre\\ImmutableClasses\\": "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/ImmutableClassesTrait.php b/source/ImmutableClassesTrait.php
similarity index 100%
rename from src/ImmutableClassesTrait.php
rename to source/ImmutableClassesTrait.php
diff --git a/src/macros.yay b/source/macros.yay
similarity index 96%
rename from src/macros.yay
rename to source/macros.yay
index df002f7..3e02d15 100644
--- a/src/macros.yay
+++ b/source/macros.yay
@@ -12,7 +12,7 @@ macro {
     }
 }
 
-macro {
+macro ·unsafe {
     function __call(···parameters) {
         immutability;
         ···body
diff --git a/tests/MacroTest.php b/tests/MacroTest.php
index 7d0dd65..6e52754 100644
--- a/tests/MacroTest.php
+++ b/tests/MacroTest.php
@@ -1,13 +1,43 @@
 <?php
 
-namespace Pre\ImmutableClasses;
+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/fallbacks.spec",
+            __DIR__ . "/specs/immutability.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 e45a934..0000000
--- a/tests/bootstrap.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace
-{
-    require __DIR__ . "/../vendor/autoload.php";
-
-    putenv("PRE_BASE_DIR=" . __DIR__ . "/../");
-
-    Pre\Plugin\addMacroPath(__DIR__ . "/../src/macros.yay");
-}
-
-namespace Yay
-{
-    function md5($value)
-    {
-        return $value;
-    }
-}
diff --git a/tests/specs/fallbacks.spec b/tests/specs/fallbacks.spec
index 05c8db3..60faf50 100644
--- a/tests/specs/fallbacks.spec
+++ b/tests/specs/fallbacks.spec
@@ -1,9 +1,3 @@
---DESCRIPTION--
-
-Test immutability fallbacks
-
---GIVEN--
-
 immutable class MyImmutableClass
 {
     public function __call($method, $parameters)
@@ -14,7 +8,7 @@ immutable class MyImmutableClass
     }
 }
 
---EXPECT--
+~~~
 
 class MyImmutableClass
 {
@@ -22,8 +16,8 @@ class MyImmutableClass
 
     public function __call($method, $parameters)
     {
-        if ($result·1 = $this->handleCallImmutableClassSetters($method, $parameters)) {
-            return $result·1;
+        if ($result = $this->handleCallImmutableClassSetters($method, $parameters)) {
+            return $result;
         }
 
         print "fallback";
diff --git a/tests/specs/immutability.spec b/tests/specs/immutability.spec
index f37894e..53b3ef7 100644
--- a/tests/specs/immutability.spec
+++ b/tests/specs/immutability.spec
@@ -1,15 +1,9 @@
---DESCRIPTION--
-
-Test immutability
-
---GIVEN--
-
 immutable class MyImmutableClass
 {
-    // nothign to see here
+    // nothing to see here
 }
 
---EXPECT--
+~~~
 
 class MyImmutableClass
 {