diff --git a/.travis.yml b/.travis.yml
index e1fec86..919b434 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,9 @@
 language: php
 
 php:
-    - 7.1
-    - 7.2
-    - 7.3
+    - '7.1'
+    - '7.2'
+    - '7.3'
 
 env:
     - SYMFONY_VERSION=3.4.*
@@ -21,11 +21,10 @@ install:
     - composer require symfony/http-kernel:${SYMFONY_VERSION} --no-update --no-scripts --prefer-dist
     - composer require symfony/proxy-manager-bridge:${SYMFONY_VERSION} --no-update --no-scripts --prefer-dist
     - composer require --dev symfony/framework-bundle:${SYMFONY_VERSION} --no-update --no-scripts --prefer-dist
+    - composer require --dev symfony/yaml:${SYMFONY_VERSION} --no-update --no-scripts --prefer-dist
     - composer update --prefer-dist
 
 script:
-    - composer validate --strict
-
-    - vendor/bin/phpstan analyse -c phpstan.neon -l max src -vvv
+    - composer check
 
     - vendor/bin/behat -f progress --strict -vvv --no-interaction
diff --git a/composer.json b/composer.json
index 3309390..f78a0ad 100644
--- a/composer.json
+++ b/composer.json
@@ -40,6 +40,19 @@
     "config": {
         "sort-packages": true
     },
+    "scripts": {
+        "check": [
+            "composer validate --ansi --strict",
+            "@analyse"
+        ],
+        "fix": [
+            "vendor/bin/ecs check --ansi --no-progress-bar src tests --fix"
+        ],
+        "analyse": [
+            "vendor/bin/ecs check --ansi --no-progress-bar src tests",
+            "vendor/bin/phpstan analyse --ansi --no-progress -c phpstan.neon -l max src"
+        ]
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "2.1-dev"
diff --git a/docs/02_usage.md b/docs/02_usage.md
index a886d1e..49ab5e6 100644
--- a/docs/02_usage.md
+++ b/docs/02_usage.md
@@ -93,7 +93,7 @@ If you're not, you need to register your context as a public service and define
 # app/config/config_test.yml (Symfony 3)
 
 services:
-    App\Tests\DemoContext:
+    App\Tests\Behat\DemoContext:
         public: true
         arguments:
             - "@kernel"
@@ -139,7 +139,7 @@ If you're not, you need to register your context as a public service and define
 # app/config/config_test.yml (Symfony 3)
 
 services:
-    App\Tests\DemoContext:
+    App\Tests\Behat\DemoContext:
         public: true
         arguments:
             - "%kernel.environment%"
diff --git a/docs/05_configuration_reference.md b/docs/05_configuration_reference.md
index 993cf17..602f580 100644
--- a/docs/05_configuration_reference.md
+++ b/docs/05_configuration_reference.md
@@ -12,7 +12,7 @@ default:
             bootstrap: ~
             kernel:
                 class: ~
-                file: ~
+                path: ~
                 environment: ~
                 debug: ~
 ```
@@ -30,7 +30,7 @@ default:
     If you do not pass any, it would look for either `App\Kernel` (Symfony 4) or `AppKernel` (Symfony 3).
     If none are found, an exception would be thrown and you would be required to specify it explicitly.
     
- * **`kernel.file`**:
+ * **`kernel.path`**:
  
     It is a path to the file containing the application kernel class. You might want to set it if your kernel is not
     autoloaded by Composer's autoloaded.