From 708c5cdc5968c98670421755fc1ee66443edc276 Mon Sep 17 00:00:00 2001
From: Kamil Kokot <kamil@kokot.me>
Date: Tue, 15 Jan 2019 18:11:41 +0100
Subject: [PATCH] Use FriendsOfBehat\SymfonyExtension v2

---
 behat.yml.dist                                |  48 +++-
 composer.json                                 |  11 +-
 config/bundles.php                            |   1 +
 config/services_test.yaml                     |   2 +
 config/services_test_cached.yaml              |   2 +
 .../application/script/test-behat-with-cli    |   4 +-
 .../script/test-behat-with-javascript         |   4 +-
 .../script/test-behat-without-javascript      |   4 +-
 .../Behat/Context/Setup/ProductContext.php    |  10 +-
 .../Behat/Context/Setup/TaxonomyContext.php   |  10 +-
 .../Behat/Page/Admin/Crud/CreatePage.php      |   4 +-
 .../Behat/Page/Admin/Crud/IndexPage.php       |   4 +-
 .../Behat/Page/Admin/Crud/UpdatePage.php      |   4 +-
 src/Sylius/Behat/Page/Admin/DashboardPage.php |   4 +-
 .../Behat/Page/Admin/Order/ShowPage.php       |   4 +-
 .../Behat/Page/Admin/Product/IndexPage.php    |   4 +-
 .../External/PaypalExpressCheckoutPage.php    |   4 +-
 .../Page/Shop/Account/Order/IndexPage.php     |   4 +-
 .../Page/Shop/Account/Order/ShowPage.php      |   4 +-
 .../Behat/Page/Shop/Checkout/AddressPage.php  |   4 +-
 .../Behat/Page/Shop/Checkout/CompletePage.php |   4 +-
 .../Behat/Resources/config/profiles.yml       |   6 -
 .../Resources/config/profiles/cached.yml      |  10 -
 .../Resources/config/profiles/default.yml     |  59 ----
 .../Behat/Resources/config/services.xml       |  24 +-
 .../config/services/contexts/api.xml          |  10 +-
 .../config/services/contexts/cli.xml          |   6 +-
 .../config/services/contexts/domain.xml       |  46 ++-
 .../config/services/contexts/hook.xml         |  11 +-
 .../config/services/contexts/setup.xml        | 265 ++++++++----------
 .../config/services/contexts/transform.xml    | 104 +++----
 .../Resources/config/services/contexts/ui.xml |  76 +----
 .../Resources/config/services/elements.xml    |   4 +-
 .../Behat/Resources/config/services/pages.xml |   8 +-
 .../config/services/pages/shop/checkout.xml   |   2 +-
 .../api/product/managing_product_variants.yml |   4 +-
 .../suites/api/taxon/managing_taxons.yml      |   3 +-
 .../Resources/config/suites/cli/installer.yml |   3 +-
 .../suites/cli/showing_available_plugins.yml  |   3 +-
 .../suites/domain/cart/shopping_cart.yml      |   3 +-
 .../suites/domain/order/managing_orders.yml   |   3 +-
 .../product/managing_product_variants.yml     |   3 +-
 .../domain/product/managing_products.yml      |   3 +-
 .../promotion/managing_promotion_coupons.yml  |   3 +-
 .../domain/promotion/managing_promotions.yml  |   3 +-
 .../shipping/managing_shipping_methods.yml    |   3 +-
 .../config/suites/ui/account/address_book.yml |   3 +-
 .../config/suites/ui/account/customer.yml     |   3 +-
 .../suites/ui/account/email_verification.yml  |   3 +-
 .../config/suites/ui/account/login.yml        |   3 +-
 .../config/suites/ui/account/registration.yml |   3 +-
 .../ui/addressing/managing_countries.yml      |   3 +-
 .../suites/ui/addressing/managing_zones.yml   |   3 +-
 .../config/suites/ui/admin/dashboard.yml      |   3 +-
 .../ui/admin/impersonating_customers.yml      |   3 +-
 .../config/suites/ui/admin/locale.yml         |   3 +-
 .../config/suites/ui/admin/login.yml          |   3 +-
 .../config/suites/ui/cart/shopping_cart.yml   |   3 +-
 .../suites/ui/channel/managing_channels.yml   |   3 +-
 ...cts_accessibility_in_multiple_channels.yml |   3 +-
 .../config/suites/ui/channel/theming.yml      |   3 +-
 .../config/suites/ui/checkout/checkout.yml    |   3 +-
 .../suites/ui/checkout/paying_for_order.yml   |   3 +-
 .../suites/ui/contact/requesting_contact.yml  |   3 +-
 .../config/suites/ui/currency/currencies.yml  |   3 +-
 .../ui/currency/managing_currencies.yml       |   3 +-
 .../ui/currency/managing_exchange_rates.yml   |   3 +-
 .../suites/ui/homepage/viewing_products.yml   |   3 +-
 .../suites/ui/inventory/cart_inventory.yml    |   3 +-
 .../ui/inventory/checkout_inventory.yml       |   3 +-
 .../ui/inventory/managing_inventory.yml       |   3 +-
 .../config/suites/ui/locale/locales.yml       |   3 +-
 .../suites/ui/locale/managing_locales.yml     |   3 +-
 .../suites/ui/order/managing_orders.yml       |   3 +-
 .../suites/ui/order/modifying_address.yml     |   3 +-
 .../config/suites/ui/order/order_history.yml  |   3 +-
 .../ui/payment/managing_payment_methods.yml   |   3 +-
 .../ui/product/adding_product_review.yml      |   3 +-
 .../managing_product_association_types.yml    |   3 +-
 .../product/managing_product_attributes.yml   |   3 +-
 .../ui/product/managing_product_options.yml   |   3 +-
 .../ui/product/managing_product_reviews.yml   |   3 +-
 .../ui/product/managing_product_variants.yml  |   3 +-
 .../suites/ui/product/managing_products.yml   |   3 +-
 .../ui/product/viewing_product_reviews.yml    |   3 +-
 .../suites/ui/product/viewing_products.yml    |   3 +-
 .../promotion/applying_promotion_coupon.yml   |   3 +-
 .../ui/promotion/applying_promotion_rules.yml |   3 +-
 .../promotion/managing_promotion_coupons.yml  |   3 +-
 .../ui/promotion/managing_promotions.yml      |   3 +-
 .../ui/promotion/receiving_discount.yml       |   3 +-
 .../ui/shipping/applying_shipping_fee.yml     |   3 +-
 .../shipping/managing_shipping_categories.yml |   3 +-
 .../ui/shipping/managing_shipping_methods.yml |   3 +-
 .../suites/ui/taxation/applying_taxes.yml     |   3 +-
 .../ui/taxation/managing_tax_categories.yml   |   3 +-
 .../suites/ui/taxation/managing_tax_rates.yml |   3 +-
 .../suites/ui/taxonomy/managing_taxons.yml    |   3 +-
 .../suites/ui/user/customer_statistics.yml    |   3 +-
 .../ui/user/managing_administrators.yml       |   3 +-
 .../ui/user/managing_customer_groups.yml      |   3 +-
 .../suites/ui/user/managing_customers.yml     |   3 +-
 .../config/suites/ui/user/managing_users.yml  |   3 +-
 .../Behat/Service/Setter/CookieSetter.php     |  10 +-
 symfony.lock                                  |   3 -
 105 files changed, 458 insertions(+), 531 deletions(-)
 create mode 100644 config/services_test.yaml
 create mode 100644 config/services_test_cached.yaml
 delete mode 100644 src/Sylius/Behat/Resources/config/profiles.yml
 delete mode 100644 src/Sylius/Behat/Resources/config/profiles/cached.yml
 delete mode 100644 src/Sylius/Behat/Resources/config/profiles/default.yml

diff --git a/behat.yml.dist b/behat.yml.dist
index e7f8319b53b..09935d8715f 100644
--- a/behat.yml.dist
+++ b/behat.yml.dist
@@ -4,5 +4,51 @@
 # This file is referenced in Sylius-Standard v1.0.0 - v1.3.x
 
 imports:
-    - src/Sylius/Behat/Resources/config/profiles.yml
     - src/Sylius/Behat/Resources/config/suites.yml
+
+default:
+    formatters:
+        pretty:
+            verbose: true
+            paths: false
+            snippets: false
+
+    extensions:
+        Lakion\Behat\MinkDebugExtension:
+            directory: etc/build
+            clean_start: false
+            screenshot: true
+
+        Behat\MinkExtension:
+            files_path: "%paths.base%/src/Sylius/Behat/Resources/fixtures/"
+            base_url: "http://localhost:8080/"
+            default_session: symfony
+            javascript_session: chrome
+            sessions:
+                symfony:
+                    symfony: ~
+                chrome:
+                    selenium2:
+                        browser: chrome
+                        capabilities:
+                            browserName: chrome
+                            browser: chrome
+                            version: ""
+                            marionette: null # https://github.com/Behat/MinkExtension/pull/311
+                            chrome:
+                                switches:
+                                    - "start-fullscreen"
+                                    - "start-maximized"
+                                    - "no-sandbox"
+                firefox:
+                    selenium2:
+                        browser: firefox
+            show_auto: false
+
+        FriendsOfBehat\SymfonyExtension: ~
+
+        FriendsOfBehat\VariadicExtension: ~
+
+    gherkin:
+        filters:
+            tags: "~@todo && ~@cli" # CLI is excluded as it registers an error handler that mutes fatal errors
diff --git a/composer.json b/composer.json
index 005f3661a40..224cb4bb6e9 100644
--- a/composer.json
+++ b/composer.json
@@ -98,11 +98,8 @@
         "behat/mink-browserkit-driver": "^1.3",
         "behat/mink-extension": "^2.2",
         "behat/mink-selenium2-driver": "^1.3",
-        "friends-of-behat/context-service-extension": "^1.2",
-        "friends-of-behat/cross-container-extension": "^1.1",
-        "friends-of-behat/page-object-extension": "^0.2",
-        "friends-of-behat/service-container-extension": "^1.0",
-        "friends-of-behat/symfony-extension": "^1.2.1",
+        "friends-of-behat/page-object-extension": "^0.3",
+        "friends-of-behat/symfony-extension": "^2.0.0-rc.2",
         "friends-of-behat/variadic-extension": "^1.1",
         "hwi/oauth-bundle": "^0.6",
         "lchrusciel/api-test-case": "^3.1.0",
@@ -180,10 +177,10 @@
     },
     "conflict": {
         "symfony/browser-kit": "4.1.8",
-        "symfony/dependency-injection": "4.1.8",
+        "symfony/dependency-injection": "4.1.8 || 4.2.2",
         "symfony/dom-crawler": "4.1.8",
         "symfony/routing": "4.1.8",
-        "symfony/symfony": "3.4.7 || 4.0.7 || 4.1.8",
+        "symfony/symfony": "3.4.7 || 4.0.7 || 4.1.8 || 4.2.2",
         "twig/twig": "2.6.1"
     },
     "suggest": {
diff --git a/config/bundles.php b/config/bundles.php
index bd719d17cd9..4e3a26edf85 100644
--- a/config/bundles.php
+++ b/config/bundles.php
@@ -68,4 +68,5 @@
     Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true],
     Fidry\AliceDataFixtures\Bridge\Symfony\FidryAliceDataFixturesBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true],
     Nelmio\Alice\Bridge\Symfony\NelmioAliceBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true],
+    FriendsOfBehat\SymfonyExtension\Bundle\FriendsOfBehatSymfonyExtensionBundle::class => ['test' => true, 'test_cached' => true],
 ];
diff --git a/config/services_test.yaml b/config/services_test.yaml
new file mode 100644
index 00000000000..2c98f24176b
--- /dev/null
+++ b/config/services_test.yaml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: "../src/Sylius/Behat/Resources/config/services.xml" }
diff --git a/config/services_test_cached.yaml b/config/services_test_cached.yaml
new file mode 100644
index 00000000000..0de380ea04a
--- /dev/null
+++ b/config/services_test_cached.yaml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: "services_test.yaml" }
diff --git a/etc/travis/suites/application/script/test-behat-with-cli b/etc/travis/suites/application/script/test-behat-with-cli
index 9849a6f7bfd..cf6952c753f 100755
--- a/etc/travis/suites/application/script/test-behat-with-cli
+++ b/etc/travis/suites/application/script/test-behat-with-cli
@@ -6,9 +6,9 @@ run_behat() {
     local code=0
 
     print_header "Testing (Behat - CLI commands, regular scenarios; @cli && ~@todo)" "Sylius"
-    run_command "vendor/bin/behat --strict --no-interaction -vvv -f progress -p cached --tags=\"@cli && ~@todo\"" || code=$?
+    run_command "vendor/bin/behat --strict --no-interaction -vvv -f progress --tags=\"@cli && ~@todo\"" || code=$?
     if [[ ${code} = 1 ]]; then
-        run_command "vendor/bin/behat --strict --no-interaction -vvv -f progress -p cached --tags=\"@cli && ~@todo\" --rerun" ; code=$?
+        run_command "vendor/bin/behat --strict --no-interaction -vvv -f progress --tags=\"@cli && ~@todo\" --rerun" ; code=$?
     fi
 
     return ${code}
diff --git a/etc/travis/suites/application/script/test-behat-with-javascript b/etc/travis/suites/application/script/test-behat-with-javascript
index c5d95c04b1a..c30069b9a6a 100755
--- a/etc/travis/suites/application/script/test-behat-with-javascript
+++ b/etc/travis/suites/application/script/test-behat-with-javascript
@@ -35,9 +35,9 @@ run_behat() {
     local code=0
 
     print_header "Testing (Behat - brand new, javascript scenarios; @javascript && ~@todo && ~@cli)" "Sylius"
-    run_command "vendor/bin/behat --strict --no-interaction -vvv -f progress -p cached --tags=\"@javascript && ~@todo && ~@cli\"" || code=$?
+    run_command "vendor/bin/behat --strict --no-interaction -vvv -f progress --tags=\"@javascript && ~@todo && ~@cli\"" || code=$?
     if [[ ${code} = 1 ]]; then
-        run_command "vendor/bin/behat --strict --no-interaction -vvv -f progress -p cached --tags=\"@javascript && ~@todo && ~@cli\" --rerun" ; code=$?
+        run_command "vendor/bin/behat --strict --no-interaction -vvv -f progress --tags=\"@javascript && ~@todo && ~@cli\" --rerun" ; code=$?
     fi
 
     return ${code}
diff --git a/etc/travis/suites/application/script/test-behat-without-javascript b/etc/travis/suites/application/script/test-behat-without-javascript
index d3ea4a2a012..d7f2dccb1cf 100755
--- a/etc/travis/suites/application/script/test-behat-without-javascript
+++ b/etc/travis/suites/application/script/test-behat-without-javascript
@@ -6,9 +6,9 @@ run_behat() {
     local code=0
 
     print_header "Testing (Behat - brand new, regular scenarios; ~@javascript && ~@todo && ~@cli)" "Sylius"
-    run_command "vendor/bin/behat --strict --no-interaction -vvv -f progress -p cached --tags=\"~@javascript && ~@todo && ~@cli\"" || code=$?
+    run_command "vendor/bin/behat --strict --no-interaction -vvv -f progress --tags=\"~@javascript && ~@todo && ~@cli\"" || code=$?
     if [[ ${code} = 1 ]]; then
-        run_command "vendor/bin/behat --strict --no-interaction -vvv -f progress -p cached --tags=\"~@javascript && ~@todo && ~@cli\" --rerun" ; code=$?
+        run_command "vendor/bin/behat --strict --no-interaction -vvv -f progress --tags=\"~@javascript && ~@todo && ~@cli\" --rerun" ; code=$?
     fi
 
     return ${code}
diff --git a/src/Sylius/Behat/Context/Setup/ProductContext.php b/src/Sylius/Behat/Context/Setup/ProductContext.php
index 647e11b9787..edb65173cc7 100644
--- a/src/Sylius/Behat/Context/Setup/ProductContext.php
+++ b/src/Sylius/Behat/Context/Setup/ProductContext.php
@@ -106,8 +106,16 @@ public function __construct(
         ProductVariantResolverInterface $defaultVariantResolver,
         ImageUploaderInterface $imageUploader,
         SlugGeneratorInterface $slugGenerator,
-        array $minkParameters
+        $minkParameters
     ) {
+        if (!is_array($minkParameters) && !$minkParameters instanceof \ArrayAccess) {
+            throw new \InvalidArgumentException(sprintf(
+                '"$minkParameters" passed to "%s" has to be an array or implement "%s".',
+                self::class,
+                \ArrayAccess::class
+            ));
+        }
+
         $this->sharedStorage = $sharedStorage;
         $this->productRepository = $productRepository;
         $this->productFactory = $productFactory;
diff --git a/src/Sylius/Behat/Context/Setup/TaxonomyContext.php b/src/Sylius/Behat/Context/Setup/TaxonomyContext.php
index c2ff99bd96d..f46f4210411 100644
--- a/src/Sylius/Behat/Context/Setup/TaxonomyContext.php
+++ b/src/Sylius/Behat/Context/Setup/TaxonomyContext.php
@@ -60,8 +60,16 @@ public function __construct(
         ObjectManager $objectManager,
         ImageUploaderInterface $imageUploader,
         TaxonSlugGeneratorInterface $taxonSlugGenerator,
-        array $minkParameters
+        $minkParameters
     ) {
+        if (!is_array($minkParameters) && !$minkParameters instanceof \ArrayAccess) {
+            throw new \InvalidArgumentException(sprintf(
+                '"$minkParameters" passed to "%s" has to be an array or implement "%s".',
+                self::class,
+                \ArrayAccess::class
+            ));
+        }
+
         $this->taxonRepository = $taxonRepository;
         $this->taxonFactory = $taxonFactory;
         $this->taxonTranslationFactory = $taxonTranslationFactory;
diff --git a/src/Sylius/Behat/Page/Admin/Crud/CreatePage.php b/src/Sylius/Behat/Page/Admin/Crud/CreatePage.php
index 63a02ad9c9b..9bca7cad98f 100644
--- a/src/Sylius/Behat/Page/Admin/Crud/CreatePage.php
+++ b/src/Sylius/Behat/Page/Admin/Crud/CreatePage.php
@@ -23,9 +23,9 @@ class CreatePage extends SymfonyPage implements CreatePageInterface
     /** @var string */
     private $routeName;
 
-    public function __construct(Session $session, array $parameters, RouterInterface $router, string $routeName)
+    public function __construct(Session $session, $minkParameters, RouterInterface $router, string $routeName)
     {
-        parent::__construct($session, $parameters, $router);
+        parent::__construct($session, $minkParameters, $router);
 
         $this->routeName = $routeName;
     }
diff --git a/src/Sylius/Behat/Page/Admin/Crud/IndexPage.php b/src/Sylius/Behat/Page/Admin/Crud/IndexPage.php
index 2184859f5f7..f5b2553e1d6 100644
--- a/src/Sylius/Behat/Page/Admin/Crud/IndexPage.php
+++ b/src/Sylius/Behat/Page/Admin/Crud/IndexPage.php
@@ -31,12 +31,12 @@ class IndexPage extends SymfonyPage implements IndexPageInterface
 
     public function __construct(
         Session $session,
-        array $parameters,
+        $minkParameters,
         RouterInterface $router,
         TableAccessorInterface $tableAccessor,
         string $routeName
     ) {
-        parent::__construct($session, $parameters, $router);
+        parent::__construct($session, $minkParameters, $router);
 
         $this->tableAccessor = $tableAccessor;
         $this->routeName = $routeName;
diff --git a/src/Sylius/Behat/Page/Admin/Crud/UpdatePage.php b/src/Sylius/Behat/Page/Admin/Crud/UpdatePage.php
index 8d924d388a4..0ef40e09cc9 100644
--- a/src/Sylius/Behat/Page/Admin/Crud/UpdatePage.php
+++ b/src/Sylius/Behat/Page/Admin/Crud/UpdatePage.php
@@ -24,9 +24,9 @@ class UpdatePage extends SymfonyPage implements UpdatePageInterface
     /** @var string */
     private $routeName;
 
-    public function __construct(Session $session, array $parameters, RouterInterface $router, string $routeName)
+    public function __construct(Session $session, $minkParameters, RouterInterface $router, string $routeName)
     {
-        parent::__construct($session, $parameters, $router);
+        parent::__construct($session, $minkParameters, $router);
 
         $this->routeName = $routeName;
     }
diff --git a/src/Sylius/Behat/Page/Admin/DashboardPage.php b/src/Sylius/Behat/Page/Admin/DashboardPage.php
index 57093b7c145..2e2dbcf3863 100644
--- a/src/Sylius/Behat/Page/Admin/DashboardPage.php
+++ b/src/Sylius/Behat/Page/Admin/DashboardPage.php
@@ -25,11 +25,11 @@ class DashboardPage extends SymfonyPage implements DashboardPageInterface
 
     public function __construct(
         Session $session,
-        array $parameters,
+        $minkParameters,
         RouterInterface $router,
         TableAccessorInterface $tableAccessor
     ) {
-        parent::__construct($session, $parameters, $router);
+        parent::__construct($session, $minkParameters, $router);
 
         $this->tableAccessor = $tableAccessor;
     }
diff --git a/src/Sylius/Behat/Page/Admin/Order/ShowPage.php b/src/Sylius/Behat/Page/Admin/Order/ShowPage.php
index 50844b6f2e3..bb4ca90a8dd 100644
--- a/src/Sylius/Behat/Page/Admin/Order/ShowPage.php
+++ b/src/Sylius/Behat/Page/Admin/Order/ShowPage.php
@@ -28,11 +28,11 @@ class ShowPage extends SymfonyPage implements ShowPageInterface
 
     public function __construct(
         Session $session,
-        array $parameters,
+        $minkParameters,
         RouterInterface $router,
         TableAccessorInterface $tableAccessor
     ) {
-        parent::__construct($session, $parameters, $router);
+        parent::__construct($session, $minkParameters, $router);
 
         $this->tableAccessor = $tableAccessor;
     }
diff --git a/src/Sylius/Behat/Page/Admin/Product/IndexPage.php b/src/Sylius/Behat/Page/Admin/Product/IndexPage.php
index 1b99d4c80b9..44606144445 100644
--- a/src/Sylius/Behat/Page/Admin/Product/IndexPage.php
+++ b/src/Sylius/Behat/Page/Admin/Product/IndexPage.php
@@ -26,13 +26,13 @@ final class IndexPage extends CrudIndexPage implements IndexPageInterface
 
     public function __construct(
         Session $session,
-        array $parameters,
+        $minkParameters,
         RouterInterface $router,
         TableAccessorInterface $tableAccessor,
         string $routeName,
         ImageExistenceCheckerInterface $imageExistenceChecker
     ) {
-        parent::__construct($session, $parameters, $router, $tableAccessor, $routeName);
+        parent::__construct($session, $minkParameters, $router, $tableAccessor, $routeName);
 
         $this->imageExistenceChecker = $imageExistenceChecker;
     }
diff --git a/src/Sylius/Behat/Page/External/PaypalExpressCheckoutPage.php b/src/Sylius/Behat/Page/External/PaypalExpressCheckoutPage.php
index 5ab8729e43d..f55ff90c56c 100644
--- a/src/Sylius/Behat/Page/External/PaypalExpressCheckoutPage.php
+++ b/src/Sylius/Behat/Page/External/PaypalExpressCheckoutPage.php
@@ -24,9 +24,9 @@ class PaypalExpressCheckoutPage extends Page implements PaypalExpressCheckoutPag
     /** @var RepositoryInterface */
     private $securityTokenRepository;
 
-    public function __construct(Session $session, array $parameters, RepositoryInterface $securityTokenRepository)
+    public function __construct(Session $session, $minkParameters, RepositoryInterface $securityTokenRepository)
     {
-        parent::__construct($session, $parameters);
+        parent::__construct($session, $minkParameters);
 
         $this->securityTokenRepository = $securityTokenRepository;
     }
diff --git a/src/Sylius/Behat/Page/Shop/Account/Order/IndexPage.php b/src/Sylius/Behat/Page/Shop/Account/Order/IndexPage.php
index 1d9907aa1c2..775d280b5ca 100644
--- a/src/Sylius/Behat/Page/Shop/Account/Order/IndexPage.php
+++ b/src/Sylius/Behat/Page/Shop/Account/Order/IndexPage.php
@@ -26,11 +26,11 @@ class IndexPage extends SymfonyPage implements IndexPageInterface
 
     public function __construct(
         Session $session,
-        array $parameters,
+        $minkParameters,
         RouterInterface $router,
         TableAccessorInterface $tableAccessor
     ) {
-        parent::__construct($session, $parameters, $router);
+        parent::__construct($session, $minkParameters, $router);
 
         $this->tableAccessor = $tableAccessor;
     }
diff --git a/src/Sylius/Behat/Page/Shop/Account/Order/ShowPage.php b/src/Sylius/Behat/Page/Shop/Account/Order/ShowPage.php
index 350bbeb1795..08a333dd7a0 100644
--- a/src/Sylius/Behat/Page/Shop/Account/Order/ShowPage.php
+++ b/src/Sylius/Behat/Page/Shop/Account/Order/ShowPage.php
@@ -25,11 +25,11 @@ class ShowPage extends SymfonyPage implements ShowPageInterface
 
     public function __construct(
         Session $session,
-        array $parameters,
+        $minkParameters,
         RouterInterface $router,
         TableAccessorInterface $tableAccessor
     ) {
-        parent::__construct($session, $parameters, $router);
+        parent::__construct($session, $minkParameters, $router);
 
         $this->tableAccessor = $tableAccessor;
     }
diff --git a/src/Sylius/Behat/Page/Shop/Checkout/AddressPage.php b/src/Sylius/Behat/Page/Shop/Checkout/AddressPage.php
index 5690f81f24f..20b5fa5e87d 100644
--- a/src/Sylius/Behat/Page/Shop/Checkout/AddressPage.php
+++ b/src/Sylius/Behat/Page/Shop/Checkout/AddressPage.php
@@ -33,11 +33,11 @@ class AddressPage extends SymfonyPage implements AddressPageInterface
 
     public function __construct(
         Session $session,
-        array $parameters,
+        $minkParameters,
         RouterInterface $router,
         AddressFactoryInterface $addressFactory
     ) {
-        parent::__construct($session, $parameters, $router);
+        parent::__construct($session, $minkParameters, $router);
 
         $this->addressFactory = $addressFactory;
     }
diff --git a/src/Sylius/Behat/Page/Shop/Checkout/CompletePage.php b/src/Sylius/Behat/Page/Shop/Checkout/CompletePage.php
index 2c0212cb244..51e4299f515 100644
--- a/src/Sylius/Behat/Page/Shop/Checkout/CompletePage.php
+++ b/src/Sylius/Behat/Page/Shop/Checkout/CompletePage.php
@@ -31,11 +31,11 @@ class CompletePage extends SymfonyPage implements CompletePageInterface
 
     public function __construct(
         Session $session,
-        array $parameters,
+        $minkParameters,
         RouterInterface $router,
         TableAccessorInterface $tableAccessor
     ) {
-        parent::__construct($session, $parameters, $router);
+        parent::__construct($session, $minkParameters, $router);
 
         $this->tableAccessor = $tableAccessor;
     }
diff --git a/src/Sylius/Behat/Resources/config/profiles.yml b/src/Sylius/Behat/Resources/config/profiles.yml
deleted file mode 100644
index 59f128fd06b..00000000000
--- a/src/Sylius/Behat/Resources/config/profiles.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-imports:
-    - profiles/default.yml
-    - profiles/cached.yml
diff --git a/src/Sylius/Behat/Resources/config/profiles/cached.yml b/src/Sylius/Behat/Resources/config/profiles/cached.yml
deleted file mode 100644
index 25390db08f0..00000000000
--- a/src/Sylius/Behat/Resources/config/profiles/cached.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-cached:
-    extensions:
-        FriendsOfBehat\SymfonyExtension:
-            kernel:
-                bootstrap: config/bootstrap.php
-                debug: false
-                env: test_cached
diff --git a/src/Sylius/Behat/Resources/config/profiles/default.yml b/src/Sylius/Behat/Resources/config/profiles/default.yml
deleted file mode 100644
index 08a59040dbc..00000000000
--- a/src/Sylius/Behat/Resources/config/profiles/default.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-default:
-    formatters:
-        pretty:
-            verbose: true
-            paths: false
-            snippets: false
-
-    extensions:
-        Lakion\Behat\MinkDebugExtension:
-            directory: etc/build
-            clean_start: false
-            screenshot: true
-
-        Behat\MinkExtension:
-            files_path: "%paths.base%/src/Sylius/Behat/Resources/fixtures/"
-            base_url: "http://localhost:8080/"
-            default_session: symfony
-            javascript_session: chrome
-            sessions:
-                symfony:
-                    symfony: ~
-                chrome:
-                    selenium2:
-                        browser: chrome
-                        capabilities:
-                            browserName: chrome
-                            browser: chrome
-                            version: ""
-                            marionette: null # https://github.com/Behat/MinkExtension/pull/311
-                            chrome:
-                                switches:
-                                    - "start-fullscreen"
-                                    - "start-maximized"
-                                    - "no-sandbox"
-                firefox:
-                    selenium2:
-                        browser: firefox
-            show_auto: false
-
-        FriendsOfBehat\SymfonyExtension:
-            kernel:
-                bootstrap: config/bootstrap.php
-                class: App\Kernel
-                env: test
-
-        FriendsOfBehat\ContextServiceExtension:
-            imports:
-                - "src/Sylius/Behat/Resources/config/services.xml"
-
-        FriendsOfBehat\CrossContainerExtension: ~
-
-        FriendsOfBehat\VariadicExtension: ~
-
-    gherkin:
-        filters:
-            tags: "~@todo && ~@cli" # CLI is excluded as it registers an error handler that mutes fatal errors
diff --git a/src/Sylius/Behat/Resources/config/services.xml b/src/Sylius/Behat/Resources/config/services.xml
index b6f916fe02e..40f4ae12fc8 100644
--- a/src/Sylius/Behat/Resources/config/services.xml
+++ b/src/Sylius/Behat/Resources/config/services.xml
@@ -21,13 +21,9 @@
     <services>
         <defaults public="true" />
 
-        <service id="mink.default_session" class="Behat\Mink\Session" lazy="true" public="false">
-            <factory service="__behat__.mink" method="getSession" />
-        </service>
-
         <service id="sylius.behat.cookie_setter" class="Sylius\Behat\Service\Setter\CookieSetter" public="false">
-            <argument type="service" id="mink.default_session" />
-            <argument>%__behat__.mink.parameters%</argument>
+            <argument type="service" id="behat.mink.default_session" />
+            <argument type="service" id="behat.mink.parameters" />
         </service>
 
         <service id="sylius.behat.channel_context_setter" class="Sylius\Behat\Service\Setter\ChannelContextSetter" public="false">
@@ -35,13 +31,13 @@
         </service>
 
         <service id="sylius.behat.admin_security" class="Sylius\Behat\Service\SecurityService" public="false">
-            <argument type="service" id="__symfony__.session" />
+            <argument type="service" id="session" />
             <argument type="service" id="sylius.behat.cookie_setter" />
             <argument type="string">admin</argument>
         </service>
 
         <service id="sylius.behat.shop_security" class="Sylius\Behat\Service\SecurityService" public="false">
-            <argument type="service" id="__symfony__.session" />
+            <argument type="service" id="session" />
             <argument type="service" id="sylius.behat.cookie_setter" />
             <argument type="string">shop</argument>
         </service>
@@ -53,8 +49,8 @@
         <service id="sylius.behat.table_accessor" class="Sylius\Behat\Service\Accessor\TableAccessor" public="false" />
 
         <service id="sylius.behat.checker.image_existence" class="Sylius\Behat\Service\Checker\ImageExistenceChecker">
-            <argument type="service" id="__symfony__.sylius.liip.filter_service" />
-            <argument type="string">%__symfony__.sylius_core.public_dir%</argument>
+            <argument type="service" id="sylius.liip.filter_service" />
+            <argument type="string">%sylius_core.public_dir%</argument>
         </service>
 
         <service id="sylius.behat.paypal_api_mocker" class="Sylius\Behat\Service\Mocker\PaypalApiMocker" public="false">
@@ -62,19 +58,19 @@
             <argument type="service" id="sylius.behat.response_loader" />
         </service>
         <service id="sylius.behat.mocker" class="Sylius\Behat\Service\Mocker\Mocker" public="false">
-            <argument type="service" id="__symfony__.service_container" />
+            <argument type="service" id="service_container" />
         </service>
         <service id="sylius.behat.response_loader" class="Sylius\Behat\Service\ResponseLoader" public="false" />
 
         <service id="sylius.behat.notification_accessor" class="Sylius\Behat\Service\Accessor\NotificationAccessor" public="false">
-            <argument type="service" id="mink.default_session" />
+            <argument type="service" id="behat.mink.default_session" />
         </service>
         <service id="sylius.behat.notification_checker" class="Sylius\Behat\Service\NotificationChecker" public="false">
             <argument type="service" id="sylius.behat.notification_accessor" />
         </service>
         <service id="sylius.behat.current_page_resolver" class="Sylius\Behat\Service\Resolver\CurrentPageResolver" public="false">
-            <argument type="service" id="mink.default_session" />
-            <argument type="service" id="__symfony__.router" />
+            <argument type="service" id="behat.mink.default_session" />
+            <argument type="service" id="router" />
         </service>
 
         <service id="sylius.behat.shared_storage" class="Sylius\Behat\Service\SharedStorage" public="false"/>
diff --git a/src/Sylius/Behat/Resources/config/services/contexts/api.xml b/src/Sylius/Behat/Resources/config/services/contexts/api.xml
index e3ef06f15bf..ae87ca2a889 100644
--- a/src/Sylius/Behat/Resources/config/services/contexts/api.xml
+++ b/src/Sylius/Behat/Resources/config/services/contexts/api.xml
@@ -16,14 +16,12 @@
         <defaults public="true" />
 
         <service id="sylius.behat.context.api.admin.managing_taxons" class="Sylius\Behat\Context\Api\Admin\ManagingTaxonsContext">
-            <argument type="service" id="__symfony__.test.client" />
-            <argument type="service" id="__symfony__.session" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="test.client" />
+            <argument type="service" id="session" />
         </service>
         <service id="sylius.behat.context.api.admin.managing_product_variants" class="Sylius\Behat\Context\Api\Admin\ManagingProductVariantsContext">
-            <argument type="service" id="__symfony__.test.client" />
-            <argument type="service" id="__symfony__.session" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="test.client" />
+            <argument type="service" id="session" />
         </service>
     </services>
 </container>
diff --git a/src/Sylius/Behat/Resources/config/services/contexts/cli.xml b/src/Sylius/Behat/Resources/config/services/contexts/cli.xml
index 41c00c91c0f..4c4177535d3 100644
--- a/src/Sylius/Behat/Resources/config/services/contexts/cli.xml
+++ b/src/Sylius/Behat/Resources/config/services/contexts/cli.xml
@@ -16,13 +16,11 @@
         <defaults public="true" />
 
         <service id="Sylius\Behat\Context\Cli\ShowingAvailablePluginsContext">
-            <argument type="service" id="__symfony__.kernel" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="kernel" />
         </service>
 
         <service id="sylius.behat.context.cli.installer" class="Sylius\Behat\Context\Cli\InstallerContext">
-            <argument type="service" id="__symfony__.kernel" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="kernel" />
         </service>
     </services>
 </container>
diff --git a/src/Sylius/Behat/Resources/config/services/contexts/domain.xml b/src/Sylius/Behat/Resources/config/services/contexts/domain.xml
index a1456d4d069..770c13e160d 100644
--- a/src/Sylius/Behat/Resources/config/services/contexts/domain.xml
+++ b/src/Sylius/Behat/Resources/config/services/contexts/domain.xml
@@ -16,65 +16,55 @@
         <defaults public="true" />
 
         <service id="sylius.behat.context.domain.notification" class="Sylius\Behat\Context\Domain\NotificationContext">
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.domain.managing_orders" class="Sylius\Behat\Context\Domain\ManagingOrdersContext">
             <argument type="service" id="sylius.behat.shared_storage" />
-            <argument type="service" id="__symfony__.sylius.repository.order"/>
-            <argument type="service" id="__symfony__.sylius.repository.order_item"/>
-            <argument type="service" id="__symfony__.sylius.repository.address"/>
-            <argument type="service" id="__symfony__.sylius.repository.adjustment"/>
-            <argument type="service" id="__symfony__.sylius.manager.order"/>
-            <argument type="service" id="__symfony__.sylius.product_variant_resolver.default"/>
-            <argument type="service" id="__symfony__.sylius.unpaid_orders_state_updater" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.order"/>
+            <argument type="service" id="sylius.repository.order_item"/>
+            <argument type="service" id="sylius.repository.address"/>
+            <argument type="service" id="sylius.repository.adjustment"/>
+            <argument type="service" id="sylius.manager.order"/>
+            <argument type="service" id="sylius.product_variant_resolver.default"/>
+            <argument type="service" id="sylius.unpaid_orders_state_updater" />
         </service>
 
         <service id="sylius.behat.context.domain.managing_payments" class="Sylius\Behat\Context\Domain\ManagingPaymentsContext">
-            <argument type="service" id="__symfony__.sylius.repository.payment"/>
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.payment"/>
         </service>
 
         <service id="sylius.behat.context.domain.managing_products" class="Sylius\Behat\Context\Domain\ManagingProductsContext">
             <argument type="service" id="sylius.behat.shared_storage" />
-            <argument type="service" id="__symfony__.sylius.repository.product" />
-            <argument type="service" id="__symfony__.sylius.repository.product_variant" />
-            <argument type="service" id="__symfony__.sylius.repository.product_review" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.product" />
+            <argument type="service" id="sylius.repository.product_variant" />
+            <argument type="service" id="sylius.repository.product_review" />
         </service>
 
         <service id="sylius.behat.context.domain.managing_promotions" class="Sylius\Behat\Context\Domain\ManagingPromotionsContext">
             <argument type="service" id="sylius.behat.shared_storage" />
-            <argument type="service" id="__symfony__.sylius.repository.promotion" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.promotion" />
         </service>
 
         <service id="sylius.behat.context.domain.managing_promotion_coupons" class="Sylius\Behat\Context\Domain\ManagingPromotionCouponsContext">
             <argument type="service" id="sylius.behat.shared_storage" />
-            <argument type="service" id="__symfony__.sylius.repository.promotion_coupon" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.promotion_coupon" />
         </service>
 
         <service id="sylius.behat.context.domain.security" class="Sylius\Behat\Context\Domain\SecurityContext">
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.domain.managing_shipments" class="Sylius\Behat\Context\Domain\ManagingShipmentsContext">
-            <argument type="service" id="__symfony__.sylius.repository.shipment"/>
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.shipment"/>
         </service>
 
         <service id="sylius.behat.context.domain.cart" class="Sylius\Behat\Context\Domain\CartContext">
-            <argument type="service" id="__symfony__.sylius.manager.order" />
-            <argument type="service" id="__symfony__.sylius.expired_carts_remover" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.manager.order" />
+            <argument type="service" id="sylius.expired_carts_remover" />
         </service>
 
         <service id="sylius.behat.context.domain.managing_shipping_methods" class="Sylius\Behat\Context\Domain\ManagingShippingMethodsContext">
-            <argument type="service" id="__symfony__.sylius.repository.shipping_method" />
-            <argument type="service" id="__symfony__.sylius.manager.shipping_method" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.shipping_method" />
+            <argument type="service" id="sylius.manager.shipping_method" />
         </service>
     </services>
 </container>
diff --git a/src/Sylius/Behat/Resources/config/services/contexts/hook.xml b/src/Sylius/Behat/Resources/config/services/contexts/hook.xml
index 9e59dbd85ab..5e957a9032a 100644
--- a/src/Sylius/Behat/Resources/config/services/contexts/hook.xml
+++ b/src/Sylius/Behat/Resources/config/services/contexts/hook.xml
@@ -16,19 +16,16 @@
         <defaults public="true" />
 
         <service id="sylius.behat.context.hook.doctrine_orm" class="Sylius\Behat\Context\Hook\DoctrineORMContext">
-            <argument type="service" id="__symfony_shared__.doctrine.orm.entity_manager" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="doctrine.orm.entity_manager" />
         </service>
 
         <service id="sylius.behat.context.hook.test_theme" class="Sylius\Behat\Context\Hook\TestThemeContext">
-            <argument type="service" id="__symfony_shared__.sylius.theme.test_theme_configuration_manager" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.theme.test_theme_configuration_manager" />
         </service>
 
         <service id="sylius.behat.context.hook.email_spool" class="Sylius\Behat\Context\Hook\EmailSpoolContext">
-            <argument type="service" id="__symfony__.sylius.behat.email_checker"/>
-            <argument type="service" id="__symfony__.filesystem" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.behat.email_checker"/>
+            <argument type="service" id="filesystem" />
         </service>
     </services>
 </container>
diff --git a/src/Sylius/Behat/Resources/config/services/contexts/setup.xml b/src/Sylius/Behat/Resources/config/services/contexts/setup.xml
index 5c1c8c38c53..faf6d556990 100644
--- a/src/Sylius/Behat/Resources/config/services/contexts/setup.xml
+++ b/src/Sylius/Behat/Resources/config/services/contexts/setup.xml
@@ -16,261 +16,234 @@
         <defaults public="true" />
 
         <service id="sylius.behat.context.setup.address" class="Sylius\Behat\Context\Setup\AddressContext">
-            <argument type="service" id="__symfony__.sylius.repository.address" />
-            <argument type="service" id="__symfony__.sylius.manager.customer" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.address" />
+            <argument type="service" id="sylius.manager.customer" />
         </service>
 
         <service id="sylius.behat.context.setup.admin_user" class="Sylius\Behat\Context\Setup\AdminUserContext">
             <argument type="service" id="sylius.behat.shared_storage" />
-            <argument type="service" id="__symfony__.sylius.fixture.example_factory.admin_user" />
-            <argument type="service" id="__symfony__.sylius.repository.admin_user" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.fixture.example_factory.admin_user" />
+            <argument type="service" id="sylius.repository.admin_user" />
         </service>
 
         <service id="sylius.behat.context.setup.channel" class="Sylius\Behat\Context\Setup\ChannelContext">
             <argument type="service" id="sylius.behat.shared_storage" />
-            <argument type="service" id="__symfony__.sylius.behat.factory.default_united_states_channel" />
-            <argument type="service" id="__symfony__.sylius.behat.factory.default_channel" />
-            <argument type="service" id="__symfony__.sylius.repository.channel" />
-            <argument type="service" id="__symfony__.sylius.manager.channel" />
-            <argument>%__behat__.mink.parameters%</argument>
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.behat.factory.default_united_states_channel" />
+            <argument type="service" id="sylius.behat.factory.default_channel" />
+            <argument type="service" id="sylius.repository.channel" />
+            <argument type="service" id="sylius.manager.channel" />
+            <argument type="service" id="behat.mink.parameters" />
         </service>
 
         <service id="sylius.behat.context.setup.currency" class="Sylius\Behat\Context\Setup\CurrencyContext">
             <argument type="service" id="sylius.behat.shared_storage" />
-            <argument type="service" id="__symfony__.sylius.repository.currency" />
-            <argument type="service" id="__symfony__.sylius.factory.currency" />
-            <argument type="service" id="__symfony__.sylius.manager.channel" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.currency" />
+            <argument type="service" id="sylius.factory.currency" />
+            <argument type="service" id="sylius.manager.channel" />
         </service>
 
         <service id="sylius.behat.context.setup.customer" class="Sylius\Behat\Context\Setup\CustomerContext">
             <argument type="service" id="sylius.behat.shared_storage" />
-            <argument type="service" id="__symfony__.sylius.repository.customer" />
-            <argument type="service" id="__symfony__.sylius.manager.customer" />
-            <argument type="service" id="__symfony__.sylius.factory.customer" />
-            <argument type="service" id="__symfony__.sylius.factory.shop_user" />
-            <argument type="service" id="__symfony__.sylius.factory.address" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.customer" />
+            <argument type="service" id="sylius.manager.customer" />
+            <argument type="service" id="sylius.factory.customer" />
+            <argument type="service" id="sylius.factory.shop_user" />
+            <argument type="service" id="sylius.factory.address" />
         </service>
 
         <service id="sylius.behat.context.setup.customer_group" class="Sylius\Behat\Context\Setup\CustomerGroupContext">
             <argument type="service" id="sylius.behat.shared_storage" />
-            <argument type="service" id="__symfony__.sylius.repository.customer_group" />
-            <argument type="service" id="__symfony__.sylius.factory.customer_group" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.customer_group" />
+            <argument type="service" id="sylius.factory.customer_group" />
         </service>
 
         <service id="sylius.behat.context.setup.exchange_rate" class="Sylius\Behat\Context\Setup\ExchangeRateContext">
             <argument type="service" id="sylius.behat.shared_storage" />
-            <argument type="service" id="__symfony__.sylius.factory.exchange_rate" />
-            <argument type="service" id="__symfony__.sylius.repository.exchange_rate" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.factory.exchange_rate" />
+            <argument type="service" id="sylius.repository.exchange_rate" />
         </service>
 
         <service id="sylius.behat.context.setup.geographical" class="Sylius\Behat\Context\Setup\GeographicalContext">
             <argument type="service" id="sylius.behat.shared_storage" />
-            <argument type="service" id="__symfony__.sylius.factory.country" />
-            <argument type="service" id="__symfony__.sylius.factory.province" />
-            <argument type="service" id="__symfony__.sylius.repository.country" />
-            <argument type="service" id="__symfony__.sylius.converter.country_name" />
-            <argument type="service" id="__symfony__.sylius.manager.province" />
-            <argument type="service" id="__symfony__.sylius.repository.province" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.factory.country" />
+            <argument type="service" id="sylius.factory.province" />
+            <argument type="service" id="sylius.repository.country" />
+            <argument type="service" id="sylius.converter.country_name" />
+            <argument type="service" id="sylius.manager.province" />
+            <argument type="service" id="sylius.repository.province" />
         </service>
 
         <service id="sylius.behat.context.setup.locale" class="Sylius\Behat\Context\Setup\LocaleContext">
             <argument type="service" id="sylius.behat.shared_storage" />
-            <argument type="service" id="__symfony__.sylius.locale_converter" />
-            <argument type="service" id="__symfony__.sylius.factory.locale" />
-            <argument type="service" id="__symfony__.sylius.repository.locale" />
-            <argument type="service" id="__symfony__.sylius.manager.locale" />
-            <argument type="service" id="__symfony__.sylius.manager.channel" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.locale_converter" />
+            <argument type="service" id="sylius.factory.locale" />
+            <argument type="service" id="sylius.repository.locale" />
+            <argument type="service" id="sylius.manager.locale" />
+            <argument type="service" id="sylius.manager.channel" />
         </service>
 
         <service id="sylius.behat.context.setup.order" class="Sylius\Behat\Context\Setup\OrderContext">
             <argument type="service" id="sylius.behat.shared_storage" />
-            <argument type="service" id="__symfony__.sylius.repository.order" />
-            <argument type="service" id="__symfony__.sylius.factory.order" />
-            <argument type="service" id="__symfony__.sylius.factory.order_item" />
-            <argument type="service" id="__symfony__.sylius.order_item_quantity_modifier" />
-            <argument type="service" id="__symfony__.sylius.factory.customer" />
-            <argument type="service" id="__symfony__.sylius.repository.customer" />
-            <argument type="service" id="__symfony__.doctrine.orm.entity_manager" />
-            <argument type="service" id="__symfony__.sm.factory" />
-            <argument type="service" id="__symfony__.sylius.product_variant_resolver.default" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.order" />
+            <argument type="service" id="sylius.factory.order" />
+            <argument type="service" id="sylius.factory.order_item" />
+            <argument type="service" id="sylius.order_item_quantity_modifier" />
+            <argument type="service" id="sylius.factory.customer" />
+            <argument type="service" id="sylius.repository.customer" />
+            <argument type="service" id="doctrine.orm.entity_manager" />
+            <argument type="service" id="sm.factory" />
+            <argument type="service" id="sylius.product_variant_resolver.default" />
         </service>
 
         <service id="sylius.behat.context.setup.payment" class="Sylius\Behat\Context\Setup\PaymentContext">
             <argument type="service" id="sylius.behat.shared_storage" />
-            <argument type="service" id="__symfony__.sylius.repository.payment_method" />
-            <argument type="service" id="__symfony__.sylius.fixture.example_factory.payment_method" />
-            <argument type="service" id="__symfony__.sylius.factory.payment_method_translation" />
-            <argument type="service" id="__symfony__.sylius.manager.payment_method" />
+            <argument type="service" id="sylius.repository.payment_method" />
+            <argument type="service" id="sylius.fixture.example_factory.payment_method" />
+            <argument type="service" id="sylius.factory.payment_method_translation" />
+            <argument type="service" id="sylius.manager.payment_method" />
             <argument type="collection">
                 <argument key="offline">Offline</argument>
                 <argument key="paypal_express_checkout">Paypal Express Checkout</argument>
                 <argument key="stripe_checkout">Stripe Checkout</argument>
             </argument>
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.setup.product" class="Sylius\Behat\Context\Setup\ProductContext">
             <argument type="service" id="sylius.behat.shared_storage" />
-            <argument type="service" id="__symfony__.sylius.repository.product" />
-            <argument type="service" id="__symfony__.sylius.factory.product" />
-            <argument type="service" id="__symfony__.sylius.factory.product_translation" />
-            <argument type="service" id="__symfony__.sylius.factory.product_variant" />
-            <argument type="service" id="__symfony__.sylius.factory.product_variant_translation" />
-            <argument type="service" id="__symfony__.sylius.factory.channel_pricing" />
-            <argument type="service" id="__symfony__.sylius.factory.product_option" />
-            <argument type="service" id="__symfony__.sylius.factory.product_option_value" />
-            <argument type="service" id="__symfony__.sylius.factory.product_image" />
-            <argument type="service" id="__symfony__.doctrine.orm.entity_manager" />
-            <argument type="service" id="__symfony__.sylius.generator.product_variant" />
-            <argument type="service" id="__symfony__.sylius.product_variant_resolver.default" />
-            <argument type="service" id="__symfony__.sylius.image_uploader" />
-            <argument type="service" id="__symfony__.sylius.generator.slug" />
-            <argument>%__behat__.mink.parameters%</argument>
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.product" />
+            <argument type="service" id="sylius.factory.product" />
+            <argument type="service" id="sylius.factory.product_translation" />
+            <argument type="service" id="sylius.factory.product_variant" />
+            <argument type="service" id="sylius.factory.product_variant_translation" />
+            <argument type="service" id="sylius.factory.channel_pricing" />
+            <argument type="service" id="sylius.factory.product_option" />
+            <argument type="service" id="sylius.factory.product_option_value" />
+            <argument type="service" id="sylius.factory.product_image" />
+            <argument type="service" id="doctrine.orm.entity_manager" />
+            <argument type="service" id="sylius.generator.product_variant" />
+            <argument type="service" id="sylius.product_variant_resolver.default" />
+            <argument type="service" id="sylius.image_uploader" />
+            <argument type="service" id="sylius.generator.slug" />
+            <argument type="service" id="behat.mink.parameters" />
         </service>
 
         <service id="sylius.behat.context.setup.product_association" class="Sylius\Behat\Context\Setup\ProductAssociationContext">
             <argument type="service" id="sylius.behat.shared_storage" />
-            <argument type="service" id="__symfony__.sylius.factory.product_association_type" />
-            <argument type="service" id="__symfony__.sylius.factory.product_association_type_translation" />
-            <argument type="service" id="__symfony__.sylius.factory.product_association" />
-            <argument type="service" id="__symfony__.sylius.repository.product_association_type" />
-            <argument type="service" id="__symfony__.sylius.repository.product_association" />
-            <argument type="service" id="__symfony__.doctrine.orm.entity_manager" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.factory.product_association_type" />
+            <argument type="service" id="sylius.factory.product_association_type_translation" />
+            <argument type="service" id="sylius.factory.product_association" />
+            <argument type="service" id="sylius.repository.product_association_type" />
+            <argument type="service" id="sylius.repository.product_association" />
+            <argument type="service" id="doctrine.orm.entity_manager" />
         </service>
 
         <service id="sylius.behat.context.setup.product_attribute" class="Sylius\Behat\Context\Setup\ProductAttributeContext">
             <argument type="service" id="sylius.behat.shared_storage" />
-            <argument type="service" id="__symfony__.sylius.repository.product_attribute" />
-            <argument type="service" id="__symfony__.sylius.factory.product_attribute" />
-            <argument type="service" id="__symfony__.sylius.factory.product_attribute_value" />
-            <argument type="service" id="__symfony__.doctrine.orm.entity_manager" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.product_attribute" />
+            <argument type="service" id="sylius.factory.product_attribute" />
+            <argument type="service" id="sylius.factory.product_attribute_value" />
+            <argument type="service" id="doctrine.orm.entity_manager" />
         </service>
 
         <service id="sylius.behat.context.setup.product_option" class="Sylius\Behat\Context\Setup\ProductOptionContext">
             <argument type="service" id="sylius.behat.shared_storage" />
-            <argument type="service" id="__symfony__.sylius.repository.product_option" />
-            <argument type="service" id="__symfony__.sylius.factory.product_option" />
-            <argument type="service" id="__symfony__.sylius.factory.product_option_value" />
-            <argument type="service" id="__symfony__.doctrine.orm.entity_manager" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.product_option" />
+            <argument type="service" id="sylius.factory.product_option" />
+            <argument type="service" id="sylius.factory.product_option_value" />
+            <argument type="service" id="doctrine.orm.entity_manager" />
         </service>
 
         <service id="sylius.behat.context.setup.product_review" class="Sylius\Behat\Context\Setup\ProductReviewContext">
             <argument type="service" id="sylius.behat.shared_storage" />
-            <argument type="service" id="__symfony__.sylius.factory.product_review" />
-            <argument type="service" id="__symfony__.sylius.repository.product_review" />
-            <argument type="service" id="__symfony__.sm.factory" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.factory.product_review" />
+            <argument type="service" id="sylius.repository.product_review" />
+            <argument type="service" id="sm.factory" />
         </service>
 
         <service id="sylius.behat.context.setup.product_taxon" class="Sylius\Behat\Context\Setup\ProductTaxonContext">
-            <argument type="service" id="__symfony__.sylius.factory.product_taxon" />
-            <argument type="service" id="__symfony__.doctrine.orm.entity_manager" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.factory.product_taxon" />
+            <argument type="service" id="doctrine.orm.entity_manager" />
         </service>
 
         <service id="sylius.behat.context.setup.promotion" class="Sylius\Behat\Context\Setup\PromotionContext">
             <argument type="service" id="sylius.behat.shared_storage" />
-            <argument type="service" id="__symfony__.sylius.factory.promotion_action" />
-            <argument type="service" id="__symfony__.sylius.factory.promotion_coupon" />
-            <argument type="service" id="__symfony__.sylius.factory.promotion_rule" />
-            <argument type="service" id="__symfony__.sylius.test.factory.promotion" />
-            <argument type="service" id="__symfony__.sylius.repository.promotion" />
-            <argument type="service" id="__symfony__.doctrine.orm.entity_manager" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.factory.promotion_action" />
+            <argument type="service" id="sylius.factory.promotion_coupon" />
+            <argument type="service" id="sylius.factory.promotion_rule" />
+            <argument type="service" id="sylius.test.factory.promotion" />
+            <argument type="service" id="sylius.repository.promotion" />
+            <argument type="service" id="doctrine.orm.entity_manager" />
         </service>
 
         <service id="sylius.behat.context.setup.admin_security" class="Sylius\Behat\Context\Setup\AdminSecurityContext">
             <argument type="service" id="sylius.behat.shared_storage" />
             <argument type="service" id="sylius.behat.admin_security" />
-            <argument type="service" id="__symfony__.sylius.fixture.example_factory.admin_user" />
-            <argument type="service" id="__symfony__.sylius.repository.admin_user" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.fixture.example_factory.admin_user" />
+            <argument type="service" id="sylius.repository.admin_user" />
         </service>
 
         <service id="sylius.behat.context.setup.shop_security" class="Sylius\Behat\Context\Setup\ShopSecurityContext">
             <argument type="service" id="sylius.behat.shared_storage" />
             <argument type="service" id="sylius.behat.shop_security" />
-            <argument type="service" id="__symfony__.sylius.fixture.example_factory.shop_user" />
-            <argument type="service" id="__symfony__.sylius.repository.shop_user" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.fixture.example_factory.shop_user" />
+            <argument type="service" id="sylius.repository.shop_user" />
         </service>
 
         <service id="sylius.behat.context.setup.shipping" class="Sylius\Behat\Context\Setup\ShippingContext">
             <argument type="service" id="sylius.behat.shared_storage" />
-            <argument type="service" id="__symfony__.sylius.repository.shipping_method" />
-            <argument type="service" id="__symfony__.sylius.repository.zone" />
-            <argument type="service" id="__symfony__.sylius.fixture.example_factory.shipping_method" />
-            <argument type="service" id="__symfony__.sylius.factory.shipping_method_translation" />
-            <argument type="service" id="__symfony__.sylius.manager.shipping_method" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.shipping_method" />
+            <argument type="service" id="sylius.repository.zone" />
+            <argument type="service" id="sylius.fixture.example_factory.shipping_method" />
+            <argument type="service" id="sylius.factory.shipping_method_translation" />
+            <argument type="service" id="sylius.manager.shipping_method" />
         </service>
 
         <service id="sylius.behat.context.setup.shipping_category" class="Sylius\Behat\Context\Setup\ShippingCategoryContext">
             <argument type="service" id="sylius.behat.shared_storage" />
-            <argument type="service" id="__symfony__.sylius.factory.shipping_category" />
-            <argument type="service" id="__symfony__.sylius.repository.shipping_category" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.factory.shipping_category" />
+            <argument type="service" id="sylius.repository.shipping_category" />
         </service>
 
         <service id="sylius.behat.context.setup.taxation" class="Sylius\Behat\Context\Setup\TaxationContext">
             <argument type="service" id="sylius.behat.shared_storage" />
-            <argument type="service" id="__symfony__.sylius.factory.tax_rate" />
-            <argument type="service" id="__symfony__.sylius.factory.tax_category" />
-            <argument type="service" id="__symfony__.sylius.repository.tax_rate" />
-            <argument type="service" id="__symfony__.sylius.repository.tax_category" />
-            <argument type="service" id="__symfony__.doctrine.orm.entity_manager" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.factory.tax_rate" />
+            <argument type="service" id="sylius.factory.tax_category" />
+            <argument type="service" id="sylius.repository.tax_rate" />
+            <argument type="service" id="sylius.repository.tax_category" />
+            <argument type="service" id="doctrine.orm.entity_manager" />
         </service>
 
         <service id="sylius.behat.context.setup.taxonomy" class="Sylius\Behat\Context\Setup\TaxonomyContext">
-            <argument type="service" id="__symfony__.sylius.repository.taxon" />
-            <argument type="service" id="__symfony__.sylius.factory.taxon" />
-            <argument type="service" id="__symfony__.sylius.factory.taxon_translation" />
-            <argument type="service" id="__symfony__.sylius.factory.taxon_image" />
-            <argument type="service" id="__symfony__.doctrine.orm.entity_manager" />
-            <argument type="service" id="__symfony__.sylius.image_uploader" />
-            <argument type="service" id="__symfony__.sylius.generator.taxon_slug" />
-            <argument>%__behat__.mink.parameters%</argument>
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.taxon" />
+            <argument type="service" id="sylius.factory.taxon" />
+            <argument type="service" id="sylius.factory.taxon_translation" />
+            <argument type="service" id="sylius.factory.taxon_image" />
+            <argument type="service" id="doctrine.orm.entity_manager" />
+            <argument type="service" id="sylius.image_uploader" />
+            <argument type="service" id="sylius.generator.taxon_slug" />
+            <argument type="service" id="behat.mink.parameters" />
         </service>
 
         <service id="sylius.behat.context.setup.theme" class="Sylius\Behat\Context\Setup\ThemeContext">
             <argument type="service" id="sylius.behat.shared_storage" />
-            <argument type="service" id="__symfony__.sylius.repository.theme" />
-            <argument type="service" id="__symfony__.sylius.manager.channel" />
-            <argument type="service" id="__symfony__.sylius.theme.test_theme_configuration_manager" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.theme" />
+            <argument type="service" id="sylius.manager.channel" />
+            <argument type="service" id="sylius.theme.test_theme_configuration_manager" />
         </service>
 
         <service id="sylius.behat.context.setup.user" class="Sylius\Behat\Context\Setup\UserContext">
             <argument type="service" id="sylius.behat.shared_storage" />
-            <argument type="service" id="__symfony__.sylius.repository.shop_user" />
-            <argument type="service" id="__symfony__.sylius.fixture.example_factory.shop_user" />
-            <argument type="service" id="__symfony__.sylius.manager.shop_user" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.shop_user" />
+            <argument type="service" id="sylius.fixture.example_factory.shop_user" />
+            <argument type="service" id="sylius.manager.shop_user" />
         </service>
 
         <service id="sylius.behat.context.setup.zone" class="Sylius\Behat\Context\Setup\ZoneContext">
             <argument type="service" id="sylius.behat.shared_storage" />
-            <argument type="service" id="__symfony__.sylius.repository.zone" />
-            <argument type="service" id="__symfony__.doctrine.orm.entity_manager" />
-            <argument type="service" id="__symfony__.sylius.factory.zone" />
-            <argument type="service" id="__symfony__.sylius.factory.zone_member" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.zone" />
+            <argument type="service" id="doctrine.orm.entity_manager" />
+            <argument type="service" id="sylius.factory.zone" />
+            <argument type="service" id="sylius.factory.zone_member" />
         </service>
     </services>
 </container>
diff --git a/src/Sylius/Behat/Resources/config/services/contexts/transform.xml b/src/Sylius/Behat/Resources/config/services/contexts/transform.xml
index ccf744d9342..d971da53208 100644
--- a/src/Sylius/Behat/Resources/config/services/contexts/transform.xml
+++ b/src/Sylius/Behat/Resources/config/services/contexts/transform.xml
@@ -16,164 +16,134 @@
         <defaults public="true" />
 
         <service id="sylius.behat.context.transform.address" class="Sylius\Behat\Context\Transform\AddressContext">
-            <argument type="service" id="__symfony__.sylius.factory.address" />
-            <argument type="service" id="__symfony__.sylius.converter.country_name" />
-            <argument type="service" id="__symfony__.sylius.repository.address" />
-            <argument type="service" id="__symfony__.sylius.fixture.example_factory.address" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.factory.address" />
+            <argument type="service" id="sylius.converter.country_name" />
+            <argument type="service" id="sylius.repository.address" />
+            <argument type="service" id="sylius.fixture.example_factory.address" />
         </service>
 
         <service id="sylius.behat.context.transform.channel" class="Sylius\Behat\Context\Transform\ChannelContext">
-            <argument type="service" id="__symfony__.sylius.repository.channel" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.channel" />
         </service>
 
         <service id="sylius.behat.context.transform.country" class="Sylius\Behat\Context\Transform\CountryContext">
-            <argument type="service" id="__symfony__.sylius.converter.country_name" />
-            <argument type="service" id="__symfony__.sylius.repository.country" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.converter.country_name" />
+            <argument type="service" id="sylius.repository.country" />
         </service>
 
         <service id="sylius.behat.context.transform.coupon" class="Sylius\Behat\Context\Transform\CouponContext">
-            <argument type="service" id="__symfony__.sylius.repository.promotion_coupon" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.promotion_coupon" />
         </service>
 
         <service id="sylius.behat.context.transform.currency" class="Sylius\Behat\Context\Transform\CurrencyContext">
-            <argument type="service" id="__symfony__.sylius.currency_name_converter" />
-            <argument type="service" id="__symfony__.sylius.repository.currency" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.currency_name_converter" />
+            <argument type="service" id="sylius.repository.currency" />
         </service>
 
         <service id="sylius.behat.context.transform.customer" class="Sylius\Behat\Context\Transform\CustomerContext">
-            <argument type="service" id="__symfony__.sylius.repository.customer" />
-            <argument type="service" id="__symfony__.sylius.factory.customer" />
+            <argument type="service" id="sylius.repository.customer" />
+            <argument type="service" id="sylius.factory.customer" />
             <argument type="service" id="sylius.behat.shared_storage" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.transform.customer_group" class="Sylius\Behat\Context\Transform\CustomerGroupContext">
-            <argument type="service" id="__symfony__.sylius.repository.customer_group" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.customer_group" />
         </service>
 
         <service id="sylius.behat.context.transform.date_time" class="Sylius\Behat\Context\Transform\DateTimeContext">
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.transform.lexical" class="Sylius\Behat\Context\Transform\LexicalContext">
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.transform.locale" class="Sylius\Behat\Context\Transform\LocaleContext">
-            <argument type="service" id="__symfony__.sylius.locale_converter" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.locale_converter" />
         </service>
 
         <service id="sylius.behat.context.transform.order" class="Sylius\Behat\Context\Transform\OrderContext">
-            <argument type="service" id="__symfony__.sylius.repository.customer" />
-            <argument type="service" id="__symfony__.sylius.repository.order" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.customer" />
+            <argument type="service" id="sylius.repository.order" />
         </service>
 
         <service id="sylius.behat.context.transform.payment" class="Sylius\Behat\Context\Transform\PaymentMethodContext">
-            <argument type="service" id="__symfony__.sylius.repository.payment_method" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.payment_method" />
         </service>
 
         <service id="sylius.behat.context.transform.product" class="Sylius\Behat\Context\Transform\ProductContext">
-            <argument type="service" id="__symfony__.sylius.repository.product" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.product" />
         </service>
 
         <service id="sylius.behat.context.transform.product_association_type" class="Sylius\Behat\Context\Transform\ProductAssociationTypeContext">
-            <argument type="service" id="__symfony__.sylius.repository.product_association_type" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.product_association_type" />
         </service>
 
         <service id="sylius.behat.context.transform.product_option" class="Sylius\Behat\Context\Transform\ProductOptionContext">
-            <argument type="service" id="__symfony__.sylius.repository.product_option" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.product_option" />
         </service>
 
         <service id="sylius.behat.context.transform.product_review" class="Sylius\Behat\Context\Transform\ProductReviewContext">
-            <argument type="service" id="__symfony__.sylius.repository.product_review" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.product_review" />
         </service>
 
         <service id="sylius.behat.context.transform.product_variant" class="Sylius\Behat\Context\Transform\ProductVariantContext">
-            <argument type="service" id="__symfony__.sylius.repository.product" />
-            <argument type="service" id="__symfony__.sylius.repository.product_variant" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.product" />
+            <argument type="service" id="sylius.repository.product_variant" />
         </service>
 
         <service id="sylius.behat.context.transform.promotion" class="Sylius\Behat\Context\Transform\PromotionContext">
-            <argument type="service" id="__symfony__.sylius.repository.promotion" />
-            <argument type="service" id="__symfony__.sylius.repository.promotion_coupon" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.promotion" />
+            <argument type="service" id="sylius.repository.promotion_coupon" />
         </service>
 
         <service id="sylius.behat.context.transform.province" class="Sylius\Behat\Context\Transform\ProvinceContext">
-            <argument type="service" id="__symfony__.sylius.repository.province" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.province" />
         </service>
 
         <service id="sylius.behat.context.transform.shared_storage" class="Sylius\Behat\Context\Transform\SharedStorageContext">
             <argument type="service" id="sylius.behat.shared_storage" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.transform.shipping_category" class="Sylius\Behat\Context\Transform\ShippingCategoryContext">
-            <argument type="service" id="__symfony__.sylius.repository.shipping_category" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.shipping_category" />
         </service>
 
         <service id="sylius.behat.context.transform.shipping_method" class="Sylius\Behat\Context\Transform\ShippingMethodContext">
-            <argument type="service" id="__symfony__.sylius.repository.shipping_method" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.shipping_method" />
         </service>
 
         <service id="sylius.behat.context.transform.tax_category" class="Sylius\Behat\Context\Transform\TaxCategoryContext">
-            <argument type="service" id="__symfony__.sylius.repository.tax_category" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.tax_category" />
         </service>
 
         <service id="sylius.behat.context.transform.tax_rate" class="Sylius\Behat\Context\Transform\TaxRateContext">
-            <argument type="service" id="__symfony__.sylius.repository.tax_rate" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.tax_rate" />
         </service>
 
         <service id="sylius.behat.context.transform.taxon" class="Sylius\Behat\Context\Transform\TaxonContext">
-            <argument type="service" id="__symfony__.sylius.repository.taxon" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.taxon" />
         </service>
 
         <service id="sylius.behat.context.transform.theme" class="Sylius\Behat\Context\Transform\ThemeContext">
-            <argument type="service" id="__symfony__.sylius.repository.theme" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.theme" />
         </service>
 
         <service id="sylius.behat.context.transform.user" class="Sylius\Behat\Context\Transform\UserContext">
             <argument type="service" id="sylius.behat.shared_storage" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.transform.admin" class="Sylius\Behat\Context\Transform\AdminUserContext">
             <argument type="service" id="sylius.behat.shared_storage" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.transform.zone" class="Sylius\Behat\Context\Transform\ZoneContext">
-            <argument type="service" id="__symfony__.sylius.repository.zone" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.repository.zone" />
         </service>
 
         <service id="sylius.behat.context.transform.zone_member" class="Sylius\Behat\Context\Transform\ZoneMemberContext">
-            <argument type="service" id="__symfony__.sylius.converter.country_name" />
-            <argument type="service" id="__symfony__.sylius.repository.province" />
-            <argument type="service" id="__symfony__.sylius.repository.zone" />
-            <argument type="service" id="__symfony__.sylius.repository.zone_member" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.converter.country_name" />
+            <argument type="service" id="sylius.repository.province" />
+            <argument type="service" id="sylius.repository.zone" />
+            <argument type="service" id="sylius.repository.zone_member" />
         </service>
     </services>
 </container>
diff --git a/src/Sylius/Behat/Resources/config/services/contexts/ui.xml b/src/Sylius/Behat/Resources/config/services/contexts/ui.xml
index f9ea779a8a4..ec670f3615b 100644
--- a/src/Sylius/Behat/Resources/config/services/contexts/ui.xml
+++ b/src/Sylius/Behat/Resources/config/services/contexts/ui.xml
@@ -17,19 +17,16 @@
 
         <service id="sylius.behat.context.ui.admin.dashboard" class="Sylius\Behat\Context\Ui\Admin\DashboardContext">
             <argument type="service" id="sylius.behat.page.admin.dashboard" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.admin.locale" class="Sylius\Behat\Context\Ui\Admin\LocaleContext">
             <argument type="service" id="sylius.behat.page.admin.dashboard" />
-            <argument type="service" id="__symfony__.translator" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="translator" />
         </service>
 
         <service id="sylius.behat.context.ui.admin.login" class="Sylius\Behat\Context\Ui\Admin\LoginContext">
             <argument type="service" id="sylius.behat.page.admin.dashboard" />
             <argument type="service" id="sylius.behat.page.admin.login" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.admin.managing_administrators" class="Sylius\Behat\Context\Ui\Admin\ManagingAdministratorsContext">
@@ -37,7 +34,6 @@
             <argument type="service" id="sylius.behat.page.admin.administrator.index" />
             <argument type="service" id="sylius.behat.page.admin.administrator.update" />
             <argument type="service" id="sylius.behat.notification_checker" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.admin.managing_channels" class="Sylius\Behat\Context\Ui\Admin\ManagingChannelsContext">
@@ -46,12 +42,10 @@
             <argument type="service" id="sylius.behat.page.admin.channel.update" />
             <argument type="service" id="sylius.behat.current_page_resolver" />
             <argument type="service" id="sylius.behat.notification_checker" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.admin.managing_channels_billing_data" class="Sylius\Behat\Context\Ui\Admin\ManagingChannelsBillingDataContext">
             <argument type="service" id="sylius.behat.element.admin.channel.shop_billing_data" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.admin.managing_countries" class="Sylius\Behat\Context\Ui\Admin\ManagingCountriesContext">
@@ -59,14 +53,12 @@
             <argument type="service" id="sylius.behat.page.admin.country.create" />
             <argument type="service" id="sylius.behat.page.admin.country.update" />
             <argument type="service" id="sylius.behat.current_page_resolver" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.admin.managing_currencies" class="Sylius\Behat\Context\Ui\Admin\ManagingCurrenciesContext">
             <argument type="service" id="sylius.behat.page.admin.currency.index" />
             <argument type="service" id="sylius.behat.page.admin.currency.create" />
             <argument type="service" id="sylius.behat.page.admin.currency.update" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.admin.managing_customers" class="Sylius\Behat\Context\Ui\Admin\ManagingCustomersContext">
@@ -76,32 +68,27 @@
             <argument type="service" id="sylius.behat.page.admin.customer.show" />
             <argument type="service" id="sylius.behat.page.admin.customer.order_index" />
             <argument type="service" id="sylius.behat.current_page_resolver" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.admin.managing_customer_groups" class="Sylius\Behat\Context\Ui\Admin\ManagingCustomerGroupsContext">
             <argument type="service" id="sylius.behat.page.admin.customer_group.create" />
             <argument type="service" id="sylius.behat.page.admin.customer_group.index" />
             <argument type="service" id="sylius.behat.page.admin.customer_group.update" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.admin.managing_exchange_rates" class="Sylius\Behat\Context\Ui\Admin\ManagingExchangeRatesContext">
             <argument type="service" id="sylius.behat.page.admin.exchange_rate.create" />
             <argument type="service" id="sylius.behat.page.admin.exchange_rate.index" />
             <argument type="service" id="sylius.behat.page.admin.exchange_rate.update" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.admin.managing_inventory" class="Sylius\Behat\Context\Ui\Admin\ManagingInventoryContext">
             <argument type="service" id="sylius.behat.page.admin.inventory.index" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.admin.managing_locales" class="Sylius\Behat\Context\Ui\Admin\ManagingLocalesContext">
             <argument type="service" id="sylius.behat.page.admin.locale.create" />
             <argument type="service" id="sylius.behat.page.admin.locale.index" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.admin.managing_orders" class="Sylius\Behat\Context\Ui\Admin\ManagingOrdersContext">
@@ -112,7 +99,6 @@
             <argument type="service" id="sylius.behat.page.admin.order.history" />
             <argument type="service" id="sylius.behat.notification_checker" />
             <argument type="service" id="sylius.behat.shared_security" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.admin.managing_payment_methods" class="Sylius\Behat\Context\Ui\Admin\ManagingPaymentMethodsContext">
@@ -126,7 +112,6 @@
                 <argument key="paypal_express_checkout">Paypal Express Checkout</argument>
                 <argument key="stripe_checkout">Stripe Checkout</argument>
             </argument>
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.admin.managing_products" class="Sylius\Behat\Context\Ui\Admin\ManagingProductsContext">
@@ -140,8 +125,7 @@
             <argument type="service" id="sylius.behat.page.admin.product.index_per_taxon" />
             <argument type="service" id="sylius.behat.current_page_resolver" />
             <argument type="service" id="sylius.behat.notification_checker" />
-            <argument type="service" id="__symfony__.liip_imagine.cache.manager" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="liip_imagine.cache.manager" />
         </service>
 
         <service id="sylius.behat.context.ui.admin.managing_product_association_types" class="Sylius\Behat\Context\Ui\Admin\ManagingProductAssociationTypesContext">
@@ -149,7 +133,6 @@
             <argument type="service" id="sylius.behat.page.admin.product_association_type.index" />
             <argument type="service" id="sylius.behat.page.admin.product_association_type.update" />
             <argument type="service" id="sylius.behat.current_page_resolver" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.admin.managing_product_attributes" class="Sylius\Behat\Context\Ui\Admin\ManagingProductAttributesContext">
@@ -158,7 +141,6 @@
             <argument type="service" id="sylius.behat.page.admin.product_attribute.update" />
             <argument type="service" id="sylius.behat.current_page_resolver" />
             <argument type="service" id="sylius.behat.shared_security" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.admin.managing_product_options" class="Sylius\Behat\Context\Ui\Admin\ManagingProductOptionsContext">
@@ -166,14 +148,12 @@
             <argument type="service" id="sylius.behat.page.admin.product_option.create" />
             <argument type="service" id="sylius.behat.page.admin.product_option.update" />
             <argument type="service" id="sylius.behat.current_page_resolver" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.admin.managing_product_reviews" class="Sylius\Behat\Context\Ui\Admin\ManagingProductReviewsContext">
             <argument type="service" id="sylius.behat.page.admin.product_review.index" />
             <argument type="service" id="sylius.behat.page.admin.product_review.update" />
             <argument type="service" id="sylius.behat.notification_checker" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.admin.managing_product_variants" class="Sylius\Behat\Context\Ui\Admin\ManagingProductVariantsContext">
@@ -184,13 +164,11 @@
             <argument type="service" id="sylius.behat.page.admin.product_variant.generate" />
             <argument type="service" id="sylius.behat.current_page_resolver" />
             <argument type="service" id="sylius.behat.notification_checker" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.admin.browsing_product_variants" class="Sylius\Behat\Context\Ui\Admin\BrowsingProductVariantsContext">
             <argument type="service" id="sylius.behat.page.admin.product_variant.index" />
-            <argument type="service" id="__symfony__.sylius.product_variant_resolver.default" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.product_variant_resolver.default" />
         </service>
 
         <service id="sylius.behat.context.ui.admin.managing_promotions" class="Sylius\Behat\Context\Ui\Admin\ManagingPromotionsContext">
@@ -200,7 +178,6 @@
             <argument type="service" id="sylius.behat.page.admin.promotion.update" />
             <argument type="service" id="sylius.behat.current_page_resolver" />
             <argument type="service" id="sylius.behat.notification_checker" />
-            <tag name="fob.context_service" />
         </service>
         <service id="sylius.behat.context.ui.admin.managing_promotion_coupons" class="Sylius\Behat\Context\Ui\Admin\ManagingPromotionCouponsContext">
             <argument type="service" id="sylius.behat.page.admin.promotion_coupon.create" />
@@ -209,7 +186,6 @@
             <argument type="service" id="sylius.behat.page.admin.promotion_coupon.update" />
             <argument type="service" id="sylius.behat.current_page_resolver" />
             <argument type="service" id="sylius.behat.notification_checker" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.admin.managing_shipping_methods" class="Sylius\Behat\Context\Ui\Admin\ManagingShippingMethodsContext">
@@ -218,14 +194,12 @@
             <argument type="service" id="sylius.behat.page.admin.shipping_method.update" />
             <argument type="service" id="sylius.behat.current_page_resolver" />
             <argument type="service" id="sylius.behat.notification_checker" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.admin.managing_shipping_categories" class="Sylius\Behat\Context\Ui\Admin\ManagingShippingCategoriesContext">
             <argument type="service" id="sylius.behat.page.admin.shipping_category.index" />
             <argument type="service" id="sylius.behat.page.admin.shipping_category.create" />
             <argument type="service" id="sylius.behat.page.admin.shipping_category.update" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.admin.managing_tax_categories" class="Sylius\Behat\Context\Ui\Admin\ManagingTaxCategoriesContext">
@@ -233,12 +207,10 @@
             <argument type="service" id="sylius.behat.page.admin.tax_category.create" />
             <argument type="service" id="sylius.behat.page.admin.tax_category.update" />
             <argument type="service" id="sylius.behat.current_page_resolver" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.admin.managing_translatable_entities" class="Sylius\Behat\Context\Ui\Admin\ManagingTranslatableEntitiesContext">
             <argument type="service" id="sylius.behat.page.admin.taxon.create" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.admin.managing_taxons" class="Sylius\Behat\Context\Ui\Admin\ManagingTaxonsContext">
@@ -247,7 +219,6 @@
             <argument type="service" id="sylius.behat.page.admin.taxon.create_for_parent" />
             <argument type="service" id="sylius.behat.page.admin.taxon.update" />
             <argument type="service" id="sylius.behat.current_page_resolver" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.admin.managing_tax_rate" class="Sylius\Behat\Context\Ui\Admin\ManagingTaxRateContext">
@@ -255,7 +226,6 @@
             <argument type="service" id="sylius.behat.page.admin.tax_rate.create" />
             <argument type="service" id="sylius.behat.page.admin.tax_rate.update" />
             <argument type="service" id="sylius.behat.current_page_resolver" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.admin.managing_zones" class="Sylius\Behat\Context\Ui\Admin\ManagingZonesContext">
@@ -264,29 +234,25 @@
             <argument type="service" id="sylius.behat.page.admin.zone.update" />
             <argument type="service" id="sylius.behat.current_page_resolver" />
             <argument type="service" id="sylius.behat.notification_checker" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.admin.notification" class="Sylius\Behat\Context\Ui\Admin\NotificationContext">
             <argument type="service" id="sylius.behat.notification_checker" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.admin.impersonating_customers" class="Sylius\Behat\Context\Ui\Admin\ImpersonatingCustomersContext">
             <argument type="service" id="sylius.behat.page.admin.customer.show" />
             <argument type="service" id="sylius.behat.page.admin.dashboard" />
             <argument type="service" id="sylius.behat.page.shop.home" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.channel" class="Sylius\Behat\Context\Ui\ChannelContext">
             <argument type="service" id="sylius.behat.shared_storage" />
             <argument type="service" id="sylius.behat.channel_context_setter" />
-            <argument type="service" id="__symfony__.sylius.repository.channel"/>
+            <argument type="service" id="sylius.repository.channel"/>
             <argument type="service" id="sylius.behat.page.admin.channel.create" />
             <argument type="service" id="sylius.behat.page.shop.home" />
             <argument type="service" id="sylius.behat.page.test_plugin.main" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.shop.checkout" class="Sylius\Behat\Context\Ui\Shop\CheckoutContext">
@@ -300,46 +266,39 @@
             <argument type="service" id="sylius.behat.context.ui.shop.checkout.addressing" />
             <argument type="service" id="sylius.behat.context.ui.shop.checkout.shipping" />
             <argument type="service" id="sylius.behat.context.ui.shop.checkout.payment" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.shop.checkout.thank_you" class="Sylius\Behat\Context\Ui\Shop\Checkout\CheckoutThankYouContext">
             <argument type="service" id="sylius.behat.page.shop.order.thank_you" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.shop.checkout.order_details" class="Sylius\Behat\Context\Ui\Shop\Checkout\CheckoutOrderDetailsContext">
             <argument type="service" id="sylius.behat.page.shop.order.show" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.shop.checkout.addressing" class="Sylius\Behat\Context\Ui\Shop\Checkout\CheckoutAddressingContext">
             <argument type="service" id="sylius.behat.shared_storage" />
             <argument type="service" id="sylius.behat.page.shop.checkout.address" />
-            <argument type="service" id="__symfony__.sylius.factory.address" />
-            <argument type="service" id="__symfony__.sylius.address_comparator" />
+            <argument type="service" id="sylius.factory.address" />
+            <argument type="service" id="sylius.address_comparator" />
             <argument type="service" id="sylius.behat.page.shop.checkout.select_shipping" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.shop.checkout.shipping" class="Sylius\Behat\Context\Ui\Shop\Checkout\CheckoutShippingContext">
             <argument type="service" id="sylius.behat.page.shop.checkout.select_shipping" />
             <argument type="service" id="sylius.behat.page.shop.checkout.select_payment" />
             <argument type="service" id="sylius.behat.page.shop.checkout.complete" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.shop.checkout.payment" class="Sylius\Behat\Context\Ui\Shop\Checkout\CheckoutPaymentContext">
             <argument type="service" id="sylius.behat.page.shop.checkout.select_payment" />
             <argument type="service" id="sylius.behat.page.shop.checkout.complete" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.shop.checkout.complete" class="Sylius\Behat\Context\Ui\Shop\Checkout\CheckoutCompleteContext">
             <argument type="service" id="sylius.behat.shared_storage" />
             <argument type="service" id="sylius.behat.page.shop.checkout.complete" />
             <argument type="service" id="sylius.behat.notification_checker" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.shop.checkout.registration_after_checkout" class="Sylius\Behat\Context\Ui\Shop\Checkout\RegistrationAfterCheckoutContext">
@@ -351,13 +310,11 @@
             <argument type="service" id="sylius.behat.page.shop.account.verify" />
             <argument type="service" id="sylius.behat.element.shop.account.register" />
             <argument type="service" id="sylius.behat.notification_checker" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.customer" class="Sylius\Behat\Context\Ui\CustomerContext">
             <argument type="service" id="sylius.behat.shared_storage" />
             <argument type="service" id="sylius.behat.page.admin.customer.show" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.paypal" class="Sylius\Behat\Context\Ui\PaypalContext">
@@ -365,7 +322,6 @@
             <argument type="service" id="sylius.behat.page.shop.order.show" />
             <argument type="service" id="sylius.behat.page.shop.checkout.complete" />
             <argument type="service" id="sylius.behat.paypal_api_mocker" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.theme" class="Sylius\Behat\Context\Ui\ThemeContext">
@@ -373,15 +329,13 @@
             <argument type="service" id="sylius.behat.page.admin.channel.index" />
             <argument type="service" id="sylius.behat.page.admin.channel.update" />
             <argument type="service" id="sylius.behat.page.shop.home" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.user" class="Sylius\Behat\Context\Ui\UserContext">
             <argument type="service" id="sylius.behat.shared_storage" />
-            <argument type="service" id="__symfony__.sylius.repository.shop_user" />
+            <argument type="service" id="sylius.repository.shop_user" />
             <argument type="service" id="sylius.behat.page.admin.customer.show" />
             <argument type="service" id="sylius.behat.page.shop.home" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.shop.account" class="Sylius\Behat\Context\Ui\Shop\AccountContext">
@@ -392,18 +346,16 @@
             <argument type="service" id="sylius.behat.page.shop.account.order.show" />
             <argument type="service" id="sylius.behat.page.shop.account.login" />
             <argument type="service" id="sylius.behat.notification_checker" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.shop.address_book" class="Sylius\Behat\Context\Ui\Shop\AddressBookContext">
             <argument type="service" id="sylius.behat.shared_storage" />
-            <argument type="service" id="__symfony__.sylius.repository.address" />
+            <argument type="service" id="sylius.repository.address" />
             <argument type="service" id="sylius.behat.page.shop.account.address_book.index" />
             <argument type="service" id="sylius.behat.page.shop.account.address_book.create" />
             <argument type="service" id="sylius.behat.page.shop.account.address_book.update" />
             <argument type="service" id="sylius.behat.current_page_resolver" />
             <argument type="service" id="sylius.behat.notification_checker" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.shop.cart" class="Sylius\Behat\Context\Ui\Shop\CartContext">
@@ -411,28 +363,23 @@
             <argument type="service" id="sylius.behat.page.shop.cart_summary" />
             <argument type="service" id="sylius.behat.page.shop.product.show" />
             <argument type="service" id="sylius.behat.notification_checker" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.shop.contact" class="Sylius\Behat\Context\Ui\Shop\ContactContext">
             <argument type="service" id="sylius.behat.page.shop.contact" />
             <argument type="service" id="sylius.behat.notification_checker" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.shop.currency" class="Sylius\Behat\Context\Ui\Shop\CurrencyContext">
             <argument type="service" id="sylius.behat.page.shop.home" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.shop.homepage" class="Sylius\Behat\Context\Ui\Shop\HomepageContext">
             <argument type="service" id="sylius.behat.page.shop.home" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.shop.locale" class="Sylius\Behat\Context\Ui\Shop\LocaleContext">
             <argument type="service" id="sylius.behat.page.shop.home" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.shop.login" class="Sylius\Behat\Context\Ui\Shop\LoginContext">
@@ -444,7 +391,6 @@
             <argument type="service" id="sylius.behat.element.shop.account.register" />
             <argument type="service" id="sylius.behat.notification_checker" />
             <argument type="service" id="sylius.behat.current_page_resolver" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.shop.product" class="Sylius\Behat\Context\Ui\Shop\ProductContext">
@@ -452,13 +398,11 @@
             <argument type="service" id="sylius.behat.page.shop.product.index" />
             <argument type="service" id="sylius.behat.page.shop.product_reviews.index" />
             <argument type="service" id="sylius.behat.page.error" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.shop.product_review" class="Sylius\Behat\Context\Ui\Shop\ProductReviewContext">
             <argument type="service" id="sylius.behat.page.shop.product_reviews.create" />
             <argument type="service" id="sylius.behat.notification_checker" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.shop.registration" class="Sylius\Behat\Context\Ui\Shop\RegistrationContext">
@@ -472,13 +416,11 @@
             <argument type="service" id="sylius.behat.element.shop.account.register" />
             <argument type="service" id="sylius.behat.notification_checker" />
             <argument type="service" id="sylius.behat.current_page_resolver" />
-            <tag name="fob.context_service" />
         </service>
 
         <service id="sylius.behat.context.ui.email" class="Sylius\Behat\Context\Ui\EmailContext">
             <argument type="service" id="sylius.behat.shared_storage" />
-            <argument type="service" id="__symfony__.sylius.behat.email_checker" />
-            <tag name="fob.context_service" />
+            <argument type="service" id="sylius.behat.email_checker" />
         </service>
     </services>
 </container>
diff --git a/src/Sylius/Behat/Resources/config/services/elements.xml b/src/Sylius/Behat/Resources/config/services/elements.xml
index 9acb9ed3ddf..faad6f08c0f 100644
--- a/src/Sylius/Behat/Resources/config/services/elements.xml
+++ b/src/Sylius/Behat/Resources/config/services/elements.xml
@@ -21,8 +21,8 @@
     </imports>
     <services>
         <service id="sylius.behat.element" class="FriendsOfBehat\PageObjectExtension\Element\Element" abstract="true" public="false">
-            <argument type="service" id="mink.default_session" />
-            <argument>%__behat__.mink.parameters%</argument>
+            <argument type="service" id="behat.mink.default_session" />
+            <argument type="service" id="behat.mink.parameters" />
         </service>
     </services>
 </container>
diff --git a/src/Sylius/Behat/Resources/config/services/pages.xml b/src/Sylius/Behat/Resources/config/services/pages.xml
index 30f33729576..1040ec6d9bc 100644
--- a/src/Sylius/Behat/Resources/config/services/pages.xml
+++ b/src/Sylius/Behat/Resources/config/services/pages.xml
@@ -26,17 +26,17 @@
         <defaults public="true" />
 
         <service id="sylius.behat.page" class="FriendsOfBehat\PageObjectExtension\Page\Page" abstract="true" public="false">
-            <argument type="service" id="mink.default_session" />
-            <argument>%__behat__.mink.parameters%</argument>
+            <argument type="service" id="behat.mink.default_session" />
+            <argument type="service" id="behat.mink.parameters" />
         </service>
         <service id="sylius.behat.symfony_page" class="FriendsOfBehat\PageObjectExtension\Page\SymfonyPage" parent="sylius.behat.page" abstract="true" public="false">
-            <argument type="service" id="__symfony_shared__.router" />
+            <argument type="service" id="router" />
         </service>
 
         <service id="sylius.behat.page.error" class="%sylius.behat.page.error.class%" parent="sylius.behat.page" public="false" />
 
         <service id="sylius.behat.page.external.paypal_checkout_express" class="Sylius\Behat\Page\External\PaypalExpressCheckoutPage" parent="sylius.behat.page" public="false" >
-            <argument type="service" id="__symfony__.sylius.repository.payment_security_token" />
+            <argument type="service" id="sylius.repository.payment_security_token" />
         </service>
     </services>
 </container>
diff --git a/src/Sylius/Behat/Resources/config/services/pages/shop/checkout.xml b/src/Sylius/Behat/Resources/config/services/pages/shop/checkout.xml
index 5c6f93ed346..355320f2ce0 100644
--- a/src/Sylius/Behat/Resources/config/services/pages/shop/checkout.xml
+++ b/src/Sylius/Behat/Resources/config/services/pages/shop/checkout.xml
@@ -23,7 +23,7 @@
         <defaults public="true" />
 
         <service id="sylius.behat.page.shop.checkout.address" class="%sylius.behat.page.shop.checkout.address.class%" parent="sylius.behat.symfony_page" public="false" >
-            <argument type="service" id="__symfony__.sylius.factory.address" />
+            <argument type="service" id="sylius.factory.address" />
         </service>
         <service id="sylius.behat.page.shop.checkout.select_payment" class="%sylius.behat.page.shop.checkout.select_payment.class%" parent="sylius.behat.symfony_page" public="false" />
         <service id="sylius.behat.page.shop.checkout.select_shipping" class="%sylius.behat.page.shop.checkout.select_shipping.class%" parent="sylius.behat.symfony_page" public="false" />
diff --git a/src/Sylius/Behat/Resources/config/suites/api/product/managing_product_variants.yml b/src/Sylius/Behat/Resources/config/suites/api/product/managing_product_variants.yml
index 00b584f8f75..11b8113ff33 100644
--- a/src/Sylius/Behat/Resources/config/suites/api/product/managing_product_variants.yml
+++ b/src/Sylius/Behat/Resources/config/suites/api/product/managing_product_variants.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         api_managing_product_variants:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.product
@@ -15,5 +15,7 @@ default:
                 - sylius.behat.context.setup.admin_security
 
                 - sylius.behat.context.api.admin.managing_product_variants
+
+
             filters:
                 tags: "@managing_product_variants && @api"
diff --git a/src/Sylius/Behat/Resources/config/suites/api/taxon/managing_taxons.yml b/src/Sylius/Behat/Resources/config/suites/api/taxon/managing_taxons.yml
index b2171b715ae..05efaf48419 100644
--- a/src/Sylius/Behat/Resources/config/suites/api/taxon/managing_taxons.yml
+++ b/src/Sylius/Behat/Resources/config/suites/api/taxon/managing_taxons.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         api_managing_taxons:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.locale
@@ -17,5 +17,6 @@ default:
                 - sylius.behat.context.setup.taxonomy
 
                 - sylius.behat.context.api.admin.managing_taxons
+
             filters:
                 tags: "@managing_taxons && @api"
diff --git a/src/Sylius/Behat/Resources/config/suites/cli/installer.yml b/src/Sylius/Behat/Resources/config/suites/cli/installer.yml
index 89ab3a44989..98db0794c7a 100644
--- a/src/Sylius/Behat/Resources/config/suites/cli/installer.yml
+++ b/src/Sylius/Behat/Resources/config/suites/cli/installer.yml
@@ -4,10 +4,11 @@
 default:
     suites:
         cli_installer:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.cli.installer
 
+
             filters:
                 tags: "@installer && @cli"
diff --git a/src/Sylius/Behat/Resources/config/suites/cli/showing_available_plugins.yml b/src/Sylius/Behat/Resources/config/suites/cli/showing_available_plugins.yml
index 4e7a9419d7b..4dd0032c4e0 100644
--- a/src/Sylius/Behat/Resources/config/suites/cli/showing_available_plugins.yml
+++ b/src/Sylius/Behat/Resources/config/suites/cli/showing_available_plugins.yml
@@ -4,8 +4,9 @@
 default:
     suites:
         cli_showing_available_plugins:
-            contexts_services:
+            contexts:
                 - Sylius\Behat\Context\Cli\ShowingAvailablePluginsContext
 
+
             filters:
                 tags: "@showing_available_plugins && @cli"
diff --git a/src/Sylius/Behat/Resources/config/suites/domain/cart/shopping_cart.yml b/src/Sylius/Behat/Resources/config/suites/domain/cart/shopping_cart.yml
index fe1a0d55ae7..6fbcad2c7b9 100644
--- a/src/Sylius/Behat/Resources/config/suites/domain/cart/shopping_cart.yml
+++ b/src/Sylius/Behat/Resources/config/suites/domain/cart/shopping_cart.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         domain_shopping_cart:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.channel
@@ -16,5 +16,6 @@ default:
                 - sylius.behat.context.setup.order
 
                 - sylius.behat.context.domain.cart
+
             filters:
                 tags: "@shopping_cart && @domain"
diff --git a/src/Sylius/Behat/Resources/config/suites/domain/order/managing_orders.yml b/src/Sylius/Behat/Resources/config/suites/domain/order/managing_orders.yml
index e943d8b2c0e..65992d605a5 100644
--- a/src/Sylius/Behat/Resources/config/suites/domain/order/managing_orders.yml
+++ b/src/Sylius/Behat/Resources/config/suites/domain/order/managing_orders.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         domain_managing_orders:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.address
@@ -29,5 +29,6 @@ default:
                 - sylius.behat.context.domain.managing_payments
                 - sylius.behat.context.domain.managing_shipments
 
+
             filters:
                 tags: "@managing_orders && @domain"
diff --git a/src/Sylius/Behat/Resources/config/suites/domain/product/managing_product_variants.yml b/src/Sylius/Behat/Resources/config/suites/domain/product/managing_product_variants.yml
index 48905af83bc..a81be423905 100644
--- a/src/Sylius/Behat/Resources/config/suites/domain/product/managing_product_variants.yml
+++ b/src/Sylius/Behat/Resources/config/suites/domain/product/managing_product_variants.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         domain_managing_product_variants:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.address
@@ -31,5 +31,6 @@ default:
                 - sylius.behat.context.domain.notification
                 - sylius.behat.context.domain.security
 
+
             filters:
                 tags: "@managing_product_variants && @domain"
diff --git a/src/Sylius/Behat/Resources/config/suites/domain/product/managing_products.yml b/src/Sylius/Behat/Resources/config/suites/domain/product/managing_products.yml
index f2911b36db1..067956e2600 100644
--- a/src/Sylius/Behat/Resources/config/suites/domain/product/managing_products.yml
+++ b/src/Sylius/Behat/Resources/config/suites/domain/product/managing_products.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         domain_managing_products:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.address
@@ -30,5 +30,6 @@ default:
                 - sylius.behat.context.domain.notification
                 - sylius.behat.context.domain.security
 
+
             filters:
                 tags: "@managing_products && @domain"
diff --git a/src/Sylius/Behat/Resources/config/suites/domain/promotion/managing_promotion_coupons.yml b/src/Sylius/Behat/Resources/config/suites/domain/promotion/managing_promotion_coupons.yml
index fd42d338d36..d8df3df4335 100644
--- a/src/Sylius/Behat/Resources/config/suites/domain/promotion/managing_promotion_coupons.yml
+++ b/src/Sylius/Behat/Resources/config/suites/domain/promotion/managing_promotion_coupons.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         domain_managing_promotion_coupons:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.lexical
@@ -28,5 +28,6 @@ default:
                 - sylius.behat.context.domain.notification
                 - sylius.behat.context.domain.security
 
+
             filters:
                 tags: "@managing_promotion_coupons && @domain"
diff --git a/src/Sylius/Behat/Resources/config/suites/domain/promotion/managing_promotions.yml b/src/Sylius/Behat/Resources/config/suites/domain/promotion/managing_promotions.yml
index 0a0d3351836..d67c447bfee 100644
--- a/src/Sylius/Behat/Resources/config/suites/domain/promotion/managing_promotions.yml
+++ b/src/Sylius/Behat/Resources/config/suites/domain/promotion/managing_promotions.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         domain_managing_promotions:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.lexical
@@ -28,5 +28,6 @@ default:
                 - sylius.behat.context.domain.notification
                 - sylius.behat.context.domain.security
 
+
             filters:
                 tags: "@managing_promotions && @domain"
diff --git a/src/Sylius/Behat/Resources/config/suites/domain/shipping/managing_shipping_methods.yml b/src/Sylius/Behat/Resources/config/suites/domain/shipping/managing_shipping_methods.yml
index 090d2065e0c..a4724cf1782 100644
--- a/src/Sylius/Behat/Resources/config/suites/domain/shipping/managing_shipping_methods.yml
+++ b/src/Sylius/Behat/Resources/config/suites/domain/shipping/managing_shipping_methods.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         domain_managing_shipping_methods:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.shipping_method
@@ -15,5 +15,6 @@ default:
                 - sylius.behat.context.domain.managing_shipping_methods
                 - sylius.behat.context.domain.security
 
+
             filters:
                 tags: "@managing_shipping_methods && @domain"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/account/address_book.yml b/src/Sylius/Behat/Resources/config/suites/ui/account/address_book.yml
index eb123da34ce..4638fed2536 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/account/address_book.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/account/address_book.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_address_book:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.address
@@ -29,5 +29,6 @@ default:
                 - sylius.behat.context.ui.shop.checkout
                 - sylius.behat.context.ui.shop.checkout.addressing
                 - sylius.behat.context.ui.shop.checkout.complete
+
             filters:
                 tags: "@address_book && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/account/customer.yml b/src/Sylius/Behat/Resources/config/suites/ui/account/customer.yml
index 5e31845176b..482c5df103c 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/account/customer.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/account/customer.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_customer_account:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
                 - sylius.behat.context.hook.email_spool
 
@@ -42,5 +42,6 @@ default:
                 - sylius.behat.context.ui.shop.checkout.payment
                 - sylius.behat.context.ui.shop.checkout.complete
                 - sylius.behat.context.ui.shop.currency
+
             filters:
                 tags: "@customer_account && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/account/email_verification.yml b/src/Sylius/Behat/Resources/config/suites/ui/account/email_verification.yml
index 70e1e7f217a..444d73c5f7a 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/account/email_verification.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/account/email_verification.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_email_verification:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
                 - sylius.behat.context.hook.email_spool
 
@@ -18,5 +18,6 @@ default:
 
                 - sylius.behat.context.ui.email
                 - sylius.behat.context.ui.shop.registration
+
             filters:
                 tags: "@email_verification && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/account/login.yml b/src/Sylius/Behat/Resources/config/suites/ui/account/login.yml
index 70ffc1f273e..d1b9262c945 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/account/login.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/account/login.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_customer_login:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
                 - sylius.behat.context.hook.email_spool
 
@@ -15,5 +15,6 @@ default:
 
                 - sylius.behat.context.ui.email
                 - sylius.behat.context.ui.shop.login
+
             filters:
                 tags: "@customer_login && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/account/registration.yml b/src/Sylius/Behat/Resources/config/suites/ui/account/registration.yml
index 0f9961fc67e..2d6eae5d507 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/account/registration.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/account/registration.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_customer_registration:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
                 - sylius.behat.context.hook.email_spool
 
@@ -19,5 +19,6 @@ default:
 
                 - sylius.behat.context.ui.email
                 - sylius.behat.context.ui.shop.registration
+
             filters:
                 tags: "@customer_registration && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/addressing/managing_countries.yml b/src/Sylius/Behat/Resources/config/suites/ui/addressing/managing_countries.yml
index 11e7389abce..8babf92fb95 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/addressing/managing_countries.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/addressing/managing_countries.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_managing_countries:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.country
@@ -15,5 +15,6 @@ default:
 
                 - sylius.behat.context.ui.admin.managing_countries
                 - sylius.behat.context.ui.admin.notification
+
             filters:
                 tags: "@managing_countries && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/addressing/managing_zones.yml b/src/Sylius/Behat/Resources/config/suites/ui/addressing/managing_zones.yml
index b65763db93e..34ff49daeb9 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/addressing/managing_zones.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/addressing/managing_zones.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_managing_zones:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.country
@@ -21,5 +21,6 @@ default:
 
                 - sylius.behat.context.ui.admin.managing_zones
                 - sylius.behat.context.ui.admin.notification
+
             filters:
                 tags: "@managing_zones && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/admin/dashboard.yml b/src/Sylius/Behat/Resources/config/suites/ui/admin/dashboard.yml
index 3d710f4ed24..79dc216c95d 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/admin/dashboard.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/admin/dashboard.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_dashboard:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.setup.channel
@@ -27,5 +27,6 @@ default:
 
                 - sylius.behat.context.ui.admin.dashboard
                 - sylius.behat.context.ui.admin.notification
+
             filters:
                 tags: "@admin_dashboard && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/admin/impersonating_customers.yml b/src/Sylius/Behat/Resources/config/suites/ui/admin/impersonating_customers.yml
index 90420fa1c08..8b7785834c4 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/admin/impersonating_customers.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/admin/impersonating_customers.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_impersonating_customers:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.address
@@ -28,5 +28,6 @@ default:
                 - sylius.behat.context.ui.shop.checkout
                 - sylius.behat.context.ui.shop.checkout.complete
                 - sylius.behat.context.ui.shop.login
+
             filters:
                 tags: "@impersonating_customers && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/admin/locale.yml b/src/Sylius/Behat/Resources/config/suites/ui/admin/locale.yml
index 2a2fd965426..92be59233cd 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/admin/locale.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/admin/locale.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_admin_locale:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.locale
@@ -23,5 +23,6 @@ default:
                 - sylius.behat.context.ui.admin.managing_administrators
                 - sylius.behat.context.ui.shop.locale
                 - sylius.behat.context.ui.channel
+
             filters:
                 tags: "@admin_locale && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/admin/login.yml b/src/Sylius/Behat/Resources/config/suites/ui/admin/login.yml
index a66edbbd585..aef3ba5c5a4 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/admin/login.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/admin/login.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_administrator_login:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.user
@@ -16,5 +16,6 @@ default:
 
                 - sylius.behat.context.ui.admin.dashboard
                 - sylius.behat.context.ui.admin.login
+
             filters:
                 tags: "@administrator_login && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/cart/shopping_cart.yml b/src/Sylius/Behat/Resources/config/suites/ui/cart/shopping_cart.yml
index 8c1449fbf45..7fee980a3ef 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/cart/shopping_cart.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/cart/shopping_cart.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_shopping_cart:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.channel
@@ -34,5 +34,6 @@ default:
                 - sylius.behat.context.ui.shop.product
                 - sylius.behat.context.ui.shop.registration
                 - sylius.behat.context.ui.user
+
             filters:
                 tags: "@shopping_cart && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/channel/managing_channels.yml b/src/Sylius/Behat/Resources/config/suites/ui/channel/managing_channels.yml
index 77c981a0482..72f255b4047 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/channel/managing_channels.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/channel/managing_channels.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_managing_channels:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.address
@@ -27,5 +27,6 @@ default:
                 - sylius.behat.context.ui.admin.managing_channels
                 - sylius.behat.context.ui.admin.managing_channels_billing_data
                 - sylius.behat.context.ui.admin.notification
+
             filters:
                 tags: "@managing_channels && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/channel/products_accessibility_in_multiple_channels.yml b/src/Sylius/Behat/Resources/config/suites/ui/channel/products_accessibility_in_multiple_channels.yml
index aae8f01d675..2fa6f67a248 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/channel/products_accessibility_in_multiple_channels.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/channel/products_accessibility_in_multiple_channels.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_products_accessibility_in_multiple_channels:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.shared_storage
@@ -18,5 +18,6 @@ default:
                 - sylius.behat.context.ui.channel
                 - sylius.behat.context.ui.shop.product
 
+
             filters:
                 tags: "@products_accessibility_in_multiple_channels && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/channel/theming.yml b/src/Sylius/Behat/Resources/config/suites/ui/channel/theming.yml
index 2a876e6caf2..26e08d3eb6c 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/channel/theming.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/channel/theming.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_theming:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
                 - sylius.behat.context.hook.test_theme
 
@@ -19,5 +19,6 @@ default:
                 - sylius.behat.context.ui.channel
                 - sylius.behat.context.ui.theme
 
+
             filters:
                 tags: "@theming && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/checkout/checkout.yml b/src/Sylius/Behat/Resources/config/suites/ui/checkout/checkout.yml
index dc174343624..55239d09e25 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/checkout/checkout.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/checkout/checkout.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_checkout:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
                 - sylius.behat.context.hook.email_spool
 
@@ -60,5 +60,6 @@ default:
                 - sylius.behat.context.ui.shop.currency
                 - sylius.behat.context.ui.shop.homepage
                 - sylius.behat.context.ui.shop.locale
+
             filters:
                 tags: "@checkout && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/checkout/paying_for_order.yml b/src/Sylius/Behat/Resources/config/suites/ui/checkout/paying_for_order.yml
index 684acb52329..a46b5b50c9a 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/checkout/paying_for_order.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/checkout/paying_for_order.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_paying_for_order:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.address
@@ -42,5 +42,6 @@ default:
                 - sylius.behat.context.ui.shop.checkout.shipping
                 - sylius.behat.context.ui.shop.checkout.thank_you
 
+
             filters:
                 tags: "@paying_for_order && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/contact/requesting_contact.yml b/src/Sylius/Behat/Resources/config/suites/ui/contact/requesting_contact.yml
index a83c54a6c10..1622ddc50dc 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/contact/requesting_contact.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/contact/requesting_contact.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_customer_requesting_contact:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
                 - sylius.behat.context.hook.email_spool
 
@@ -16,5 +16,6 @@ default:
 
                 - sylius.behat.context.ui.email
                 - sylius.behat.context.ui.shop.contact
+
             filters:
                 tags: "@requesting_contact && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/currency/currencies.yml b/src/Sylius/Behat/Resources/config/suites/ui/currency/currencies.yml
index 5794684b0ef..81d594d06e7 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/currency/currencies.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/currency/currencies.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_currencies:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.channel
@@ -17,5 +17,6 @@ default:
 
                 - sylius.behat.context.ui.channel
                 - sylius.behat.context.ui.shop.currency
+
             filters:
                 tags: "@currencies && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/currency/managing_currencies.yml b/src/Sylius/Behat/Resources/config/suites/ui/currency/managing_currencies.yml
index 5f50c9f4804..033ea3c7913 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/currency/managing_currencies.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/currency/managing_currencies.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_managing_currencies:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.currency
@@ -17,5 +17,6 @@ default:
 
                 - sylius.behat.context.ui.admin.managing_currencies
                 - sylius.behat.context.ui.admin.notification
+
             filters:
                 tags: "@managing_currencies && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/currency/managing_exchange_rates.yml b/src/Sylius/Behat/Resources/config/suites/ui/currency/managing_exchange_rates.yml
index 24d6f724f09..8dfce34f14f 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/currency/managing_exchange_rates.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/currency/managing_exchange_rates.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_managing_exchange_rates:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.shared_storage
@@ -17,5 +17,6 @@ default:
 
                 - sylius.behat.context.ui.admin.managing_exchange_rates
                 - sylius.behat.context.ui.admin.notification
+
             filters:
                 tags: "@managing_exchange_rates && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/homepage/viewing_products.yml b/src/Sylius/Behat/Resources/config/suites/ui/homepage/viewing_products.yml
index 0ebf7082093..1977c9f4fad 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/homepage/viewing_products.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/homepage/viewing_products.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_homepage:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.lexical
@@ -16,5 +16,6 @@ default:
                 - sylius.behat.context.setup.shop_security
 
                 - sylius.behat.context.ui.shop.homepage
+
             filters:
                 tags: "@homepage && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/inventory/cart_inventory.yml b/src/Sylius/Behat/Resources/config/suites/ui/inventory/cart_inventory.yml
index f28c0ddacf1..ca103b7d609 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/inventory/cart_inventory.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/inventory/cart_inventory.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_cart_inventory:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.setup.channel
@@ -17,5 +17,6 @@ default:
                 - sylius.behat.context.ui.shop.cart
                 - sylius.behat.context.ui.shop.product
 
+
             filters:
                 tags: "@cart_inventory && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/inventory/checkout_inventory.yml b/src/Sylius/Behat/Resources/config/suites/ui/inventory/checkout_inventory.yml
index 11bda658d8e..6c6a2c0469a 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/inventory/checkout_inventory.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/inventory/checkout_inventory.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_checkout_inventory:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.setup.user
@@ -31,5 +31,6 @@ default:
                 - sylius.behat.context.ui.shop.checkout
                 - sylius.behat.context.ui.shop.checkout.complete
                 - sylius.behat.context.ui.shop.checkout.thank_you
+
             filters:
                 tags: "@checkout_inventory && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/inventory/managing_inventory.yml b/src/Sylius/Behat/Resources/config/suites/ui/inventory/managing_inventory.yml
index a6e623a6623..8055e84ad31 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/inventory/managing_inventory.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/inventory/managing_inventory.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_managing_inventory:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.setup.admin_security
@@ -32,5 +32,6 @@ default:
                 - sylius.behat.context.ui.admin.managing_product_variants
                 - sylius.behat.context.ui.admin.notification
 
+
             filters:
                 tags: "@managing_inventory && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/locale/locales.yml b/src/Sylius/Behat/Resources/config/suites/ui/locale/locales.yml
index 6c390e31f71..d1deff46e0a 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/locale/locales.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/locale/locales.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_locales:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.channel
@@ -19,5 +19,6 @@ default:
                 - sylius.behat.context.ui.channel
                 - sylius.behat.context.ui.shop.locale
                 - sylius.behat.context.ui.shop.product
+
             filters:
                 tags: "@locales && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/locale/managing_locales.yml b/src/Sylius/Behat/Resources/config/suites/ui/locale/managing_locales.yml
index 63dd49658ba..f8dac35777c 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/locale/managing_locales.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/locale/managing_locales.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_managing_locales:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.locale
@@ -19,5 +19,6 @@ default:
                 - sylius.behat.context.ui.admin.notification
                 - sylius.behat.context.ui.shop.locale
 
+
             filters:
                 tags: "@managing_locales && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/order/managing_orders.yml b/src/Sylius/Behat/Resources/config/suites/ui/order/managing_orders.yml
index 60f0ebca742..4051ecf84c8 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/order/managing_orders.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/order/managing_orders.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_managing_orders:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
                 - sylius.behat.context.hook.email_spool
 
@@ -53,5 +53,6 @@ default:
                 - sylius.behat.context.ui.shop.checkout.addressing
                 - sylius.behat.context.ui.shop.checkout.complete
                 - sylius.behat.context.ui.shop.currency
+
             filters:
                 tags: "@managing_orders && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/order/modifying_address.yml b/src/Sylius/Behat/Resources/config/suites/ui/order/modifying_address.yml
index 74c986f90dd..b68d5870439 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/order/modifying_address.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/order/modifying_address.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_modifying_address:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.setup.channel
@@ -45,5 +45,6 @@ default:
                 - sylius.behat.context.ui.admin.managing_orders
                 - sylius.behat.context.ui.admin.notification
                 - sylius.behat.context.ui.shop.currency
+
             filters:
                 tags: "@modifying_address && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/order/order_history.yml b/src/Sylius/Behat/Resources/config/suites/ui/order/order_history.yml
index e1ea342f776..8423db6a2c1 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/order/order_history.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/order/order_history.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_order_history:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.setup.admin_security
@@ -28,5 +28,6 @@ default:
                 - sylius.behat.context.transform.shared_storage
 
                 - sylius.behat.context.ui.admin.managing_orders
+
             filters:
                 tags: "@order_history && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/payment/managing_payment_methods.yml b/src/Sylius/Behat/Resources/config/suites/ui/payment/managing_payment_methods.yml
index 4c06dace379..c4f9521ef94 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/payment/managing_payment_methods.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/payment/managing_payment_methods.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_managing_payment_methods:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.setup.channel
@@ -29,5 +29,6 @@ default:
                 - sylius.behat.context.ui.admin.managing_payment_methods
                 - sylius.behat.context.ui.admin.notification
                 - sylius.behat.context.ui.shop.locale
+
             filters:
                 tags: "@managing_payment_methods && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/product/adding_product_review.yml b/src/Sylius/Behat/Resources/config/suites/ui/product/adding_product_review.yml
index 5517fa0b688..1ce1635c887 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/product/adding_product_review.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/product/adding_product_review.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_adding_product_review:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.channel
@@ -20,5 +20,6 @@ default:
                 - sylius.behat.context.setup.shop_security
 
                 - sylius.behat.context.ui.shop.product_review
+
             filters:
                 tags: "@adding_product_review && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/product/managing_product_association_types.yml b/src/Sylius/Behat/Resources/config/suites/ui/product/managing_product_association_types.yml
index 64581048f98..8e2596ad647 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/product/managing_product_association_types.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/product/managing_product_association_types.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_managing_product_association_types:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.locale
@@ -17,5 +17,6 @@ default:
 
                 - sylius.behat.context.ui.admin.managing_product_association_types
                 - sylius.behat.context.ui.admin.notification
+
             filters:
                 tags: "@managing_product_association_types && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/product/managing_product_attributes.yml b/src/Sylius/Behat/Resources/config/suites/ui/product/managing_product_attributes.yml
index 87496bdd080..207118b50eb 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/product/managing_product_attributes.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/product/managing_product_attributes.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_managing_product_attributes:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.lexical
@@ -17,5 +17,6 @@ default:
 
                 - sylius.behat.context.ui.admin.managing_product_attributes
                 - sylius.behat.context.ui.admin.notification
+
             filters:
                 tags: "@managing_product_attributes && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/product/managing_product_options.yml b/src/Sylius/Behat/Resources/config/suites/ui/product/managing_product_options.yml
index 609b6871665..02a187f7967 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/product/managing_product_options.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/product/managing_product_options.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_managing_product_options:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.lexical
@@ -18,5 +18,6 @@ default:
 
                 - sylius.behat.context.ui.admin.managing_product_options
                 - sylius.behat.context.ui.admin.notification
+
             filters:
                 tags: "@managing_product_options && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/product/managing_product_reviews.yml b/src/Sylius/Behat/Resources/config/suites/ui/product/managing_product_reviews.yml
index 156ae58fd64..a60b7a514e3 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/product/managing_product_reviews.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/product/managing_product_reviews.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_managing_product_reviews:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.lexical
@@ -22,5 +22,6 @@ default:
                 - sylius.behat.context.ui.admin.managing_product_reviews
                 - sylius.behat.context.ui.admin.notification
                 - sylius.behat.context.ui.shop.product
+
             filters:
                 tags: "@managing_product_reviews && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/product/managing_product_variants.yml b/src/Sylius/Behat/Resources/config/suites/ui/product/managing_product_variants.yml
index 8a70b6448fe..f006c49cc87 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/product/managing_product_variants.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/product/managing_product_variants.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_managing_product_variants:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.channel
@@ -35,5 +35,6 @@ default:
                 - sylius.behat.context.ui.admin.browsing_product_variants
                 - sylius.behat.context.ui.admin.managing_product_variants
                 - sylius.behat.context.ui.admin.notification
+
             filters:
                 tags: "@managing_product_variants && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/product/managing_products.yml b/src/Sylius/Behat/Resources/config/suites/ui/product/managing_products.yml
index c3c3a7d69aa..512aca234f0 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/product/managing_products.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/product/managing_products.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_managing_products:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.address
@@ -46,5 +46,6 @@ default:
                 - sylius.behat.context.ui.admin.managing_products
                 - sylius.behat.context.ui.admin.notification
                 - sylius.behat.context.ui.shop.locale
+
             filters:
                 tags: "@managing_products && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/product/viewing_product_reviews.yml b/src/Sylius/Behat/Resources/config/suites/ui/product/viewing_product_reviews.yml
index 6a2a6c6d736..3ff64a9513b 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/product/viewing_product_reviews.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/product/viewing_product_reviews.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_viewing_product_reviews:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.customer
@@ -19,5 +19,6 @@ default:
                 - sylius.behat.context.setup.shop_security
 
                 - sylius.behat.context.ui.shop.product
+
             filters:
                 tags: "@viewing_product_reviews && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/product/viewing_products.yml b/src/Sylius/Behat/Resources/config/suites/ui/product/viewing_products.yml
index 3c4d296053f..f4457f4041f 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/product/viewing_products.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/product/viewing_products.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_viewing_products:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.channel
@@ -34,5 +34,6 @@ default:
                 - sylius.behat.context.ui.channel
                 - sylius.behat.context.ui.shop.locale
                 - sylius.behat.context.ui.shop.product
+
             filters:
                 tags: "@viewing_products && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/promotion/applying_promotion_coupon.yml b/src/Sylius/Behat/Resources/config/suites/ui/promotion/applying_promotion_coupon.yml
index 2ed53481cc7..c25ce0cf132 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/promotion/applying_promotion_coupon.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/promotion/applying_promotion_coupon.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_applying_promotion_coupon:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.address
@@ -27,5 +27,6 @@ default:
                 - sylius.behat.context.setup.taxonomy
 
                 - sylius.behat.context.ui.shop.cart
+
             filters:
                 tags: "@applying_promotion_coupon && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/promotion/applying_promotion_rules.yml b/src/Sylius/Behat/Resources/config/suites/ui/promotion/applying_promotion_rules.yml
index 0a8573390b5..0afd83b3886 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/promotion/applying_promotion_rules.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/promotion/applying_promotion_rules.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_applying_promotion_rules:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.address
@@ -33,5 +33,6 @@ default:
                 - sylius.behat.context.ui.shop.cart
                 - sylius.behat.context.ui.shop.checkout
                 - sylius.behat.context.ui.shop.checkout.addressing
+
             filters:
                 tags: "@applying_promotion_rules && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/promotion/managing_promotion_coupons.yml b/src/Sylius/Behat/Resources/config/suites/ui/promotion/managing_promotion_coupons.yml
index 231ccf64a2e..8e79aa32263 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/promotion/managing_promotion_coupons.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/promotion/managing_promotion_coupons.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_managing_promotion_coupons:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.address
@@ -27,5 +27,6 @@ default:
 
                 - sylius.behat.context.ui.admin.managing_promotion_coupons
                 - sylius.behat.context.ui.admin.notification
+
             filters:
                 tags: "@managing_promotion_coupons && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/promotion/managing_promotions.yml b/src/Sylius/Behat/Resources/config/suites/ui/promotion/managing_promotions.yml
index b20716df6e4..5b47052ea81 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/promotion/managing_promotions.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/promotion/managing_promotions.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_managing_promotions:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.address
@@ -32,5 +32,6 @@ default:
 
                 - sylius.behat.context.ui.admin.managing_promotions
                 - sylius.behat.context.ui.admin.notification
+
             filters:
                 tags: "@managing_promotions && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/promotion/receiving_discount.yml b/src/Sylius/Behat/Resources/config/suites/ui/promotion/receiving_discount.yml
index 81373aa7d1b..5f29afbb8d7 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/promotion/receiving_discount.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/promotion/receiving_discount.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_receiving_discount:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.channel
@@ -26,5 +26,6 @@ default:
                 - sylius.behat.context.ui.shop.cart
                 - sylius.behat.context.ui.shop.checkout
                 - sylius.behat.context.ui.shop.currency
+
             filters:
                 tags: "@receiving_discount && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/shipping/applying_shipping_fee.yml b/src/Sylius/Behat/Resources/config/suites/ui/shipping/applying_shipping_fee.yml
index 6aafb9efa4e..7dd549a262e 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/shipping/applying_shipping_fee.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/shipping/applying_shipping_fee.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_applying_shipping_fee:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.channel
@@ -30,5 +30,6 @@ default:
                 - sylius.behat.context.ui.shop.cart
                 - sylius.behat.context.ui.shop.checkout
                 - sylius.behat.context.ui.shop.checkout.payment
+
             filters:
                 tags: "@applying_shipping_fee && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/shipping/managing_shipping_categories.yml b/src/Sylius/Behat/Resources/config/suites/ui/shipping/managing_shipping_categories.yml
index 899cea61a18..dfe13620974 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/shipping/managing_shipping_categories.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/shipping/managing_shipping_categories.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_managing_shipping_categories:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.setup.admin_security
@@ -16,5 +16,6 @@ default:
 
                 - sylius.behat.context.ui.admin.managing_shipping_categories
                 - sylius.behat.context.ui.admin.notification
+
             filters:
                 tags: "@managing_shipping_categories && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/shipping/managing_shipping_methods.yml b/src/Sylius/Behat/Resources/config/suites/ui/shipping/managing_shipping_methods.yml
index 68cfd641c5d..1a52854ad2a 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/shipping/managing_shipping_methods.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/shipping/managing_shipping_methods.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_managing_shipping_methods:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.address
@@ -31,5 +31,6 @@ default:
                 - sylius.behat.context.ui.admin.managing_shipping_methods
                 - sylius.behat.context.ui.admin.notification
                 - sylius.behat.context.ui.shop.locale
+
             filters:
                 tags: "@managing_shipping_methods && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/taxation/applying_taxes.yml b/src/Sylius/Behat/Resources/config/suites/ui/taxation/applying_taxes.yml
index 7e7bc7878c9..83e7af8b3ca 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/taxation/applying_taxes.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/taxation/applying_taxes.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_applying_taxes:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.address
@@ -33,5 +33,6 @@ default:
                 - sylius.behat.context.ui.shop.checkout
                 - sylius.behat.context.ui.shop.checkout.addressing
                 - sylius.behat.context.ui.user
+
             filters:
                 tags: "@applying_taxes && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/taxation/managing_tax_categories.yml b/src/Sylius/Behat/Resources/config/suites/ui/taxation/managing_tax_categories.yml
index d8a729a7525..3ae607141ea 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/taxation/managing_tax_categories.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/taxation/managing_tax_categories.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_managing_tax_categories:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.shared_storage
@@ -15,5 +15,6 @@ default:
 
                 - sylius.behat.context.ui.admin.managing_tax_categories
                 - sylius.behat.context.ui.admin.notification
+
             filters:
                 tags: "@managing_tax_categories && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/taxation/managing_tax_rates.yml b/src/Sylius/Behat/Resources/config/suites/ui/taxation/managing_tax_rates.yml
index 0fccd8c30f5..db24194d4c8 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/taxation/managing_tax_rates.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/taxation/managing_tax_rates.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_managing_tax_rates:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.shared_storage
@@ -19,5 +19,6 @@ default:
 
                 - sylius.behat.context.ui.admin.managing_tax_rate
                 - sylius.behat.context.ui.admin.notification
+
             filters:
                 tags: "@managing_tax_rates && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/taxonomy/managing_taxons.yml b/src/Sylius/Behat/Resources/config/suites/ui/taxonomy/managing_taxons.yml
index 0c21d11e27c..a1c09ba8695 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/taxonomy/managing_taxons.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/taxonomy/managing_taxons.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_managing_taxons:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.locale
@@ -17,5 +17,6 @@ default:
 
                 - sylius.behat.context.ui.admin.managing_taxons
                 - sylius.behat.context.ui.admin.notification
+
             filters:
                 tags: "@managing_taxons && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/user/customer_statistics.yml b/src/Sylius/Behat/Resources/config/suites/ui/user/customer_statistics.yml
index e6eba591657..59926028e3e 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/user/customer_statistics.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/user/customer_statistics.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_customer_statistics:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.channel
@@ -21,5 +21,6 @@ default:
                 - sylius.behat.context.setup.user
 
                 - sylius.behat.context.ui.admin.managing_customers
+
             filters:
                 tags: "@customer_statistics && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/user/managing_administrators.yml b/src/Sylius/Behat/Resources/config/suites/ui/user/managing_administrators.yml
index 461457135cf..6f696ceee9e 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/user/managing_administrators.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/user/managing_administrators.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_managing_administrators:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.shared_storage
@@ -20,5 +20,6 @@ default:
                 - sylius.behat.context.ui.admin.managing_administrators
                 - sylius.behat.context.ui.admin.notification
                 - sylius.behat.context.ui.admin.login
+
             filters:
                 tags: "@managing_administrators && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/user/managing_customer_groups.yml b/src/Sylius/Behat/Resources/config/suites/ui/user/managing_customer_groups.yml
index d6d20f723a1..c2a4bedc523 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/user/managing_customer_groups.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/user/managing_customer_groups.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_managing_customer_groups:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.customer_group
@@ -15,5 +15,6 @@ default:
 
                 - sylius.behat.context.ui.admin.managing_customer_groups
                 - sylius.behat.context.ui.admin.notification
+
             filters:
                 tags: "@managing_customer_groups && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/user/managing_customers.yml b/src/Sylius/Behat/Resources/config/suites/ui/user/managing_customers.yml
index 0d1e18da7b7..dfd1de1901c 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/user/managing_customers.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/user/managing_customers.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_managing_customers:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.address
@@ -31,5 +31,6 @@ default:
                 - sylius.behat.context.ui.admin.managing_customers
                 - sylius.behat.context.ui.admin.notification
                 - sylius.behat.context.ui.shop.login
+
             filters:
                 tags: "@managing_customers && @ui"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/user/managing_users.yml b/src/Sylius/Behat/Resources/config/suites/ui/user/managing_users.yml
index 23b75f69b3c..d34ff987b2e 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/user/managing_users.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/user/managing_users.yml
@@ -4,7 +4,7 @@
 default:
     suites:
         ui_managing_users:
-            contexts_services:
+            contexts:
                 - sylius.behat.context.hook.doctrine_orm
 
                 - sylius.behat.context.transform.customer
@@ -19,5 +19,6 @@ default:
                 - sylius.behat.context.ui.customer
                 - sylius.behat.context.ui.shop.login
                 - sylius.behat.context.ui.user
+
             filters:
                 tags: "@managing_users && @ui"
diff --git a/src/Sylius/Behat/Service/Setter/CookieSetter.php b/src/Sylius/Behat/Service/Setter/CookieSetter.php
index cf8e6b0b216..7eef8215aca 100644
--- a/src/Sylius/Behat/Service/Setter/CookieSetter.php
+++ b/src/Sylius/Behat/Service/Setter/CookieSetter.php
@@ -26,8 +26,16 @@ final class CookieSetter implements CookieSetterInterface
     /** @var array */
     private $minkParameters;
 
-    public function __construct(Session $minkSession, array $minkParameters)
+    public function __construct(Session $minkSession, $minkParameters)
     {
+        if (!is_array($minkParameters) && !$minkParameters instanceof \ArrayAccess) {
+            throw new \InvalidArgumentException(sprintf(
+                '"$minkParameters" passed to "%s" has to be an array or implement "%s".',
+                self::class,
+                \ArrayAccess::class
+            ));
+        }
+
         $this->minkSession = $minkSession;
         $this->minkParameters = $minkParameters;
     }
diff --git a/symfony.lock b/symfony.lock
index e85ea2b10b0..c5e9cdf7aa0 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -131,9 +131,6 @@
     "friends-of-behat/page-object-extension": {
         "version": "0.1"
     },
-    "friends-of-behat/service-container-extension": {
-        "version": "v1.0.1"
-    },
     "friends-of-behat/symfony-extension": {
         "version": "v1.2.2"
     },