diff --git a/src/FormatTalksBundle/TwigExtension/FormatTalksExtension.php b/src/FormatTalksBundle/TwigExtension/FormatTalksExtension.php
index a3176928..7390baee 100644
--- a/src/FormatTalksBundle/TwigExtension/FormatTalksExtension.php
+++ b/src/FormatTalksBundle/TwigExtension/FormatTalksExtension.php
@@ -17,6 +17,7 @@ class FormatTalksExtension extends Twig_Extension
     public function __construct()
     {
         $this->today = (new \DateTime())
+          ->modify('today')
           ->setTimezone(new \DateTimeZone('Europe/London'))
           ->format('Y-m-d');
     }
diff --git a/tests/FormatTalksBundle/TwigExtension/FormatTalksTest.php b/tests/FormatTalksBundle/TwigExtension/FormatTalksTest.php
index 300c2c9f..be65a325 100644
--- a/tests/FormatTalksBundle/TwigExtension/FormatTalksTest.php
+++ b/tests/FormatTalksBundle/TwigExtension/FormatTalksTest.php
@@ -56,11 +56,11 @@ class FormatTalksTest extends TestCase
             ],
         ];
 
-        $results = $this->extension->format($talks, $event_data)->all();
+        $results = $this->extension->format($talks, $event_data);
 
         $this->assertCount(3, $results);
 
-        tap($results[0], function ($result) {
+        tap($results->first(), function ($result) {
             $this->assertArrayHasKey('event', $result);
             $this->assertArrayHasKey('talk', $result);
 
@@ -76,7 +76,7 @@ class FormatTalksTest extends TestCase
             $this->assertEquals('Talk A', $result['talk']['title']);
         });
 
-        tap($results[1], function ($result) {
+        tap($results->get(1), function ($result) {
             $this->assertArrayHasKey('event', $result);
             $this->assertArrayHasKey('talk', $result);