diff --git a/src/Dispatcher/Dispatcher.php b/src/Dispatcher/Dispatcher.php
index 45fe3f3c..bdcc2675 100644
--- a/src/Dispatcher/Dispatcher.php
+++ b/src/Dispatcher/Dispatcher.php
@@ -290,4 +290,4 @@ public function cleanBuffer() {
 	// ob_clean();
 }
 
-}#
\ No newline at end of file
+}#
diff --git a/src/Response/NotFoundException.php b/src/Response/NotFoundException.php
index 41de0a58..248ab6d3 100644
--- a/src/Response/NotFoundException.php
+++ b/src/Response/NotFoundException.php
@@ -11,8 +11,7 @@
 class NotFoundException extends \Gt\Core\Exception\GtException {
 
 public function __construct() {
-	http_response_code(404);
 	call_user_func_array([$this, "parent::" . __FUNCTION__], func_get_args());
 }
 
-}#
\ No newline at end of file
+}#
diff --git a/test/Acceptance/ClientSideAsset/test/Acceptance/behat.yml b/test/Acceptance/ClientSideAsset/test/Acceptance/behat.yml
index 5b226eb3..7438532c 100644
--- a/test/Acceptance/ClientSideAsset/test/Acceptance/behat.yml
+++ b/test/Acceptance/ClientSideAsset/test/Acceptance/behat.yml
@@ -1,22 +1,22 @@
 default:
-  paths:
-    features: Features
-    bootstrap: %behat.paths.base%/Behat
   extensions:
-    Behat\MinkExtension\Extension:
+    Behat\MinkExtension:
       base_url: http://localhost:8089
       goutte:
         guzzle_parameters:
           ssl.certificate_authority: false
           curl.options:
             CURLOPT_PORT: 8089
-    SensioLabs\Behat\PageObjectExtension\Extension: ~
-  context:
-    parameters:
-      screenshot_dir: %behat.paths.base%/Report
-  filters:
-    tags: ~@disabled
-  formatter:
-    name:                   pretty
-    parameters:
-      output_path:          null,%behat.paths.base%/Report/index.html
\ No newline at end of file
+
+paths:
+  features: Features
+  bootstrap: %behat.paths.base%/Behat
+context:
+  parameters:
+    screenshot_dir: %behat.paths.base%/Report
+filters:
+  tags: ~@disabled
+formatter:
+  name:                   pretty
+  parameters:
+    output_path:          null,%behat.paths.base%/Report/index.html
\ No newline at end of file
diff --git a/test/Acceptance/HTTPHeaders/test/Acceptance/behat.yml b/test/Acceptance/HTTPHeaders/test/Acceptance/behat.yml
index 5b226eb3..7438532c 100644
--- a/test/Acceptance/HTTPHeaders/test/Acceptance/behat.yml
+++ b/test/Acceptance/HTTPHeaders/test/Acceptance/behat.yml
@@ -1,22 +1,22 @@
 default:
-  paths:
-    features: Features
-    bootstrap: %behat.paths.base%/Behat
   extensions:
-    Behat\MinkExtension\Extension:
+    Behat\MinkExtension:
       base_url: http://localhost:8089
       goutte:
         guzzle_parameters:
           ssl.certificate_authority: false
           curl.options:
             CURLOPT_PORT: 8089
-    SensioLabs\Behat\PageObjectExtension\Extension: ~
-  context:
-    parameters:
-      screenshot_dir: %behat.paths.base%/Report
-  filters:
-    tags: ~@disabled
-  formatter:
-    name:                   pretty
-    parameters:
-      output_path:          null,%behat.paths.base%/Report/index.html
\ No newline at end of file
+
+paths:
+  features: Features
+  bootstrap: %behat.paths.base%/Behat
+context:
+  parameters:
+    screenshot_dir: %behat.paths.base%/Report
+filters:
+  tags: ~@disabled
+formatter:
+  name:                   pretty
+  parameters:
+    output_path:          null,%behat.paths.base%/Report/index.html
\ No newline at end of file
diff --git a/test/Acceptance/HeaderFooter/test/Acceptance/behat.yml b/test/Acceptance/HeaderFooter/test/Acceptance/behat.yml
index 5b226eb3..7438532c 100644
--- a/test/Acceptance/HeaderFooter/test/Acceptance/behat.yml
+++ b/test/Acceptance/HeaderFooter/test/Acceptance/behat.yml
@@ -1,22 +1,22 @@
 default:
-  paths:
-    features: Features
-    bootstrap: %behat.paths.base%/Behat
   extensions:
-    Behat\MinkExtension\Extension:
+    Behat\MinkExtension:
       base_url: http://localhost:8089
       goutte:
         guzzle_parameters:
           ssl.certificate_authority: false
           curl.options:
             CURLOPT_PORT: 8089
-    SensioLabs\Behat\PageObjectExtension\Extension: ~
-  context:
-    parameters:
-      screenshot_dir: %behat.paths.base%/Report
-  filters:
-    tags: ~@disabled
-  formatter:
-    name:                   pretty
-    parameters:
-      output_path:          null,%behat.paths.base%/Report/index.html
\ No newline at end of file
+
+paths:
+  features: Features
+  bootstrap: %behat.paths.base%/Behat
+context:
+  parameters:
+    screenshot_dir: %behat.paths.base%/Report
+filters:
+  tags: ~@disabled
+formatter:
+  name:                   pretty
+  parameters:
+    output_path:          null,%behat.paths.base%/Report/index.html
\ No newline at end of file
diff --git a/test/Acceptance/MultiPage/test/Acceptance/behat.yml b/test/Acceptance/MultiPage/test/Acceptance/behat.yml
index 5b226eb3..7438532c 100644
--- a/test/Acceptance/MultiPage/test/Acceptance/behat.yml
+++ b/test/Acceptance/MultiPage/test/Acceptance/behat.yml
@@ -1,22 +1,22 @@
 default:
-  paths:
-    features: Features
-    bootstrap: %behat.paths.base%/Behat
   extensions:
-    Behat\MinkExtension\Extension:
+    Behat\MinkExtension:
       base_url: http://localhost:8089
       goutte:
         guzzle_parameters:
           ssl.certificate_authority: false
           curl.options:
             CURLOPT_PORT: 8089
-    SensioLabs\Behat\PageObjectExtension\Extension: ~
-  context:
-    parameters:
-      screenshot_dir: %behat.paths.base%/Report
-  filters:
-    tags: ~@disabled
-  formatter:
-    name:                   pretty
-    parameters:
-      output_path:          null,%behat.paths.base%/Report/index.html
\ No newline at end of file
+
+paths:
+  features: Features
+  bootstrap: %behat.paths.base%/Behat
+context:
+  parameters:
+    screenshot_dir: %behat.paths.base%/Report
+filters:
+  tags: ~@disabled
+formatter:
+  name:                   pretty
+  parameters:
+    output_path:          null,%behat.paths.base%/Report/index.html
\ No newline at end of file
diff --git a/test/Acceptance/PageLogic/test/Acceptance/behat.yml b/test/Acceptance/PageLogic/test/Acceptance/behat.yml
index 5b226eb3..7438532c 100644
--- a/test/Acceptance/PageLogic/test/Acceptance/behat.yml
+++ b/test/Acceptance/PageLogic/test/Acceptance/behat.yml
@@ -1,22 +1,22 @@
 default:
-  paths:
-    features: Features
-    bootstrap: %behat.paths.base%/Behat
   extensions:
-    Behat\MinkExtension\Extension:
+    Behat\MinkExtension:
       base_url: http://localhost:8089
       goutte:
         guzzle_parameters:
           ssl.certificate_authority: false
           curl.options:
             CURLOPT_PORT: 8089
-    SensioLabs\Behat\PageObjectExtension\Extension: ~
-  context:
-    parameters:
-      screenshot_dir: %behat.paths.base%/Report
-  filters:
-    tags: ~@disabled
-  formatter:
-    name:                   pretty
-    parameters:
-      output_path:          null,%behat.paths.base%/Report/index.html
\ No newline at end of file
+
+paths:
+  features: Features
+  bootstrap: %behat.paths.base%/Behat
+context:
+  parameters:
+    screenshot_dir: %behat.paths.base%/Report
+filters:
+  tags: ~@disabled
+formatter:
+  name:                   pretty
+  parameters:
+    output_path:          null,%behat.paths.base%/Report/index.html
\ No newline at end of file
diff --git a/test/Acceptance/SinglePage/test/Acceptance/behat.yml b/test/Acceptance/SinglePage/test/Acceptance/behat.yml
index 5b226eb3..5bb13cd0 100644
--- a/test/Acceptance/SinglePage/test/Acceptance/behat.yml
+++ b/test/Acceptance/SinglePage/test/Acceptance/behat.yml
@@ -3,14 +3,13 @@ default:
     features: Features
     bootstrap: %behat.paths.base%/Behat
   extensions:
-    Behat\MinkExtension\Extension:
+    Behat\MinkExtension:
       base_url: http://localhost:8089
       goutte:
         guzzle_parameters:
           ssl.certificate_authority: false
           curl.options:
             CURLOPT_PORT: 8089
-    SensioLabs\Behat\PageObjectExtension\Extension: ~
   context:
     parameters:
       screenshot_dir: %behat.paths.base%/Report