diff --git a/spec/PUGX/Poser/PoserSpec.php b/spec/PUGX/Poser/PoserSpec.php
index cd00d9f..a91bb3f 100644
--- a/spec/PUGX/Poser/PoserSpec.php
+++ b/spec/PUGX/Poser/PoserSpec.php
@@ -40,9 +40,7 @@ function it_should_be_able_to_generate_an_svg_image_from_URI()
     public function getMatchers()
     {
         return array(
-            'beAValidSVGImageContaining' => function($object, $subject, $status)
-             {
-
+            'beAValidSVGImageContaining' => function($object, $subject, $status) {
                     $regex = '/^<svg.*width="((.|\n)*)'.$subject.'((.|\n)*)'.$status.'((.|\n)*)<\/svg>$/';
                     $matches = array();
 
diff --git a/spec/PUGX/Poser/Render/SvgFlatRenderSpec.php b/spec/PUGX/Poser/Render/SvgFlatRenderSpec.php
index 181c4bb..2b37382 100644
--- a/spec/PUGX/Poser/Render/SvgFlatRenderSpec.php
+++ b/spec/PUGX/Poser/Render/SvgFlatRenderSpec.php
@@ -2,11 +2,9 @@
 
 namespace spec\PUGX\Poser\Render;
 
-use PhpSpec\Exception\Exception;
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
 use PUGX\Poser\Badge;
-use PUGX\Poser\Calculator\GDTextSizeCalculator;
 use PUGX\Poser\Calculator\TextSizeCalculatorInterface;
 
 class SvgFlatRenderSpec extends ObjectBehavior
@@ -66,4 +64,4 @@ function it_should_render_a_license_mit_exactly_like_this_svg()
     }
 
 
-} 
\ No newline at end of file
+} 
diff --git a/spec/PUGX/Poser/Render/SvgFlatSquareRenderSpec.php b/spec/PUGX/Poser/Render/SvgFlatSquareRenderSpec.php
index d16b007..c4bf07f 100644
--- a/spec/PUGX/Poser/Render/SvgFlatSquareRenderSpec.php
+++ b/spec/PUGX/Poser/Render/SvgFlatSquareRenderSpec.php
@@ -2,11 +2,9 @@
 
 namespace spec\PUGX\Poser\Render;
 
-use PhpSpec\Exception\Exception;
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
 use PUGX\Poser\Badge;
-use PUGX\Poser\Calculator\GDTextSizeCalculator;
 use PUGX\Poser\Calculator\TextSizeCalculatorInterface;
 
 class SvgFlatSquareRenderSpec extends ObjectBehavior
@@ -14,7 +12,8 @@ class SvgFlatSquareRenderSpec extends ObjectBehavior
     function let(TextSizeCalculatorInterface $calculator)
     {
         $calculator->calculateWidth(Argument::any())->willReturn(20);
-        $this->beConstructedWith($calculator);
+        $realCalculator = $calculator->getWrappedObject();
+        $this->beConstructedWith($realCalculator);
     }
 
     function it_should_render_a_svg()
@@ -64,6 +63,4 @@ function it_should_render_a_license_mit_exactly_like_this_svg()
         $badge = Badge::fromURI('license-MIT-blue.svg');
         $this->render($badge)->__toString()->shouldBeLike($template);
     }
-
-
 }
diff --git a/spec/PUGX/Poser/Render/SvgRenderSpec.php b/spec/PUGX/Poser/Render/SvgRenderSpec.php
index d813024..6029883 100644
--- a/spec/PUGX/Poser/Render/SvgRenderSpec.php
+++ b/spec/PUGX/Poser/Render/SvgRenderSpec.php
@@ -2,7 +2,6 @@
 
 namespace spec\PUGX\Poser\Render;
 
-use PhpSpec\Exception\Exception;
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
 use PUGX\Poser\Badge;
@@ -34,4 +33,4 @@ public function getMatchers()
             }
         );
     }
-} 
\ No newline at end of file
+}