diff --git a/codeception.yml b/codeception.yml
index 2710f4376..bfcceb6ce 100644
--- a/codeception.yml
+++ b/codeception.yml
@@ -3,7 +3,7 @@ actor: Tester
 include:
   - tests/PyzTest/Yves/*
   - tests/PyzTest/Zed/*
-#  - vendor/spryker/spryker/Bundles/*
+  - vendor/spryker/spryker/Bundles/*
 
 paths:
     tests: tests
diff --git a/tests/PyzTest/Shared/Testify/_support/Helper/Environment.php b/tests/PyzTest/Shared/Testify/_support/Helper/Environment.php
index d2290586e..f478acfe9 100644
--- a/tests/PyzTest/Shared/Testify/_support/Helper/Environment.php
+++ b/tests/PyzTest/Shared/Testify/_support/Helper/Environment.php
@@ -21,6 +21,7 @@ public function _initialize()
 
         defined('APPLICATION_ENV') || define('APPLICATION_ENV', 'devtest');
         defined('APPLICATION_STORE') || define('APPLICATION_STORE', (isset($_SERVER['APPLICATION_STORE'])) ? $_SERVER['APPLICATION_STORE'] : 'DE');
+        defined('APPLICATION') || define('APPLICATION', '');
 
         defined('APPLICATION_ROOT_DIR') || define('APPLICATION_ROOT_DIR', $rootDir);
         defined('APPLICATION_SOURCE_DIR') || define('APPLICATION_SOURCE_DIR', APPLICATION_ROOT_DIR . '/src');
diff --git a/tests/PyzTest/Yves/Checkout/Controller/CheckoutControllerTest.php b/tests/PyzTest/Yves/Checkout/Controller/CheckoutControllerTest.php
index 5f1fbd590..6ceb33787 100644
--- a/tests/PyzTest/Yves/Checkout/Controller/CheckoutControllerTest.php
+++ b/tests/PyzTest/Yves/Checkout/Controller/CheckoutControllerTest.php
@@ -88,7 +88,6 @@ class CheckoutControllerTest extends Unit
      */
     protected function setUp()
     {
-        $this->markTestSkipped('Move this to function controller tests');
         $this->skipIfCi();
         $this->controller = new CheckoutController();
 
@@ -111,6 +110,7 @@ protected function skipIfCi()
      */
     public function testIndexAction()
     {
+        $this->markTestSkipped('Move this to function controller tests');
         $checkoutController = new CheckoutController();
 
         $this->setQuoteForCustomer();
@@ -128,6 +128,7 @@ public function testIndexAction()
      */
     public function testCustomerActionShouldRenderRegisterAndLoginForms()
     {
+        $this->markTestSkipped('Move this to function controller tests');
         $request = Request::createFromGlobals();
         $request->attributes->set('_route', CheckoutControllerProvider::CHECKOUT_CUSTOMER);
 
@@ -143,6 +144,7 @@ public function testCustomerActionShouldRenderRegisterAndLoginForms()
      */
     public function testCustomerAction()
     {
+        $this->markTestSkipped('Move this to function controller tests');
         $this->setQuoteForCustomer();
 
         $customerData = $this->getFormData(self::CUSTOMER_URL, self::CUSTOMER_ACTION, self::CUSTOMER_ROUTE, self::GUEST_FORM);
@@ -170,6 +172,7 @@ public function testCustomerAction()
      */
     public function testAddressActionShouldRenderAddressForms()
     {
+        $this->markTestSkipped('Move this to function controller tests');
         $this->setQuoteForAddress();
 
         $request = Request::createFromGlobals();
@@ -186,6 +189,7 @@ public function testAddressActionShouldRenderAddressForms()
      */
     public function testAddressAction()
     {
+        $this->markTestSkipped('Move this to function controller tests');
         $this->setQuoteForAddress();
 
         $addressesData = $this->getFormData(self::ADDRESS_URL, self::ADDRESS_ACTION, self::ADDRESS_ROUTE, self::ADDRESS_FORM);
@@ -219,6 +223,7 @@ public function testAddressAction()
      */
     public function testShipmentActionShouldRenderShipmentForms()
     {
+        $this->markTestSkipped('Move this to function controller tests');
         $this->setQuoteForShipment();
 
         $request = Request::createFromGlobals();
@@ -235,6 +240,7 @@ public function testShipmentActionShouldRenderShipmentForms()
      */
     public function testShipmentAction()
     {
+        $this->markTestSkipped('Move this to function controller tests');
         $this->setQuoteForShipment();
 
         $shipmentData = $this->getFormData(self::SHIPMENT_URL, self::SHIPMENT_ACTION, self::SHIPMENT_ROUTE, self::SHIPMENT_FORM);
@@ -257,6 +263,7 @@ public function testShipmentAction()
      */
     public function testPaymentActionShouldRenderPaymentForms()
     {
+        $this->markTestSkipped('Move this to function controller tests');
         $this->allowMoreThenOneRequestToZed();
 
         $this->setQuoteForPayment();
@@ -277,6 +284,7 @@ public function testPaymentActionShouldRenderPaymentForms()
      */
     public function testPaymentAction()
     {
+        $this->markTestSkipped('Move this to function controller tests');
         $this->allowMoreThenOneRequestToZed();
 
         $this->setQuoteForPayment();
@@ -323,6 +331,7 @@ public function testSummaryActionShouldRenderSummaryPage()
      */
     public function testSummaryAction()
     {
+        $this->markTestSkipped('Move this to function controller tests');
         $this->allowMoreThenOneRequestToZed();
 
         $this->setQuoteForSummary();
@@ -346,6 +355,7 @@ public function testSummaryAction()
      */
     public function testPlaceOrder()
     {
+        $this->markTestSkipped('Move this to function controller tests');
         $this->markTestIncomplete('Request data missing');
         $this->setQuoteForSummary();
 
diff --git a/tests/PyzTest/Zed/CmsGui/Acceptance/CmsGuiPageListCest.php b/tests/PyzTest/Zed/CmsGui/Acceptance/CmsGuiPageListCest.php
index 6e35e516b..95fbf464e 100644
--- a/tests/PyzTest/Zed/CmsGui/Acceptance/CmsGuiPageListCest.php
+++ b/tests/PyzTest/Zed/CmsGui/Acceptance/CmsGuiPageListCest.php
@@ -4,16 +4,17 @@
  * Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file.
  */
 
-namespace PyzTest\Zed\CmsGui;
+namespace PyzTest\Zed\CmsGui\Acceptance;
 
-use Acceptance\CmsGui\PageObject\CmsListPage;
-use Acceptance\CmsGui\Tester\CmsPageListTester;
+use PyzTest\Zed\CmsGui\CmsGuiAcceptanceTester;
+use PyzTest\Zed\CmsGui\PageObject\CmsListPage;
 
 /**
  * Auto-generated group annotations
  * @group PyzTest
  * @group Zed
  * @group CmsGui
+ * @group Acceptance
  * @group CmsGuiPageListCest
  * Add your own group annotations below this line
  */
@@ -21,11 +22,11 @@ class CmsGuiPageListCest
 {
 
     /**
-     * @param \Acceptance\CmsGui\Tester\CmsPageListTester $i
+     * @param \PyzTest\Zed\CmsGui\CmsGuiAcceptanceTester $i
      *
      * @return void
      */
-    public function testICanOpenCmsPageList(CmsPageListTester $i)
+    public function testICanOpenCmsPageList(CmsGuiAcceptanceTester $i)
     {
         $i->amLoggedInUser();
         $i->amOnPage(CmsListPage::URL);
diff --git a/tests/PyzTest/Zed/CmsGui/codeception.yml b/tests/PyzTest/Zed/CmsGui/codeception.yml
index e6f692118..331cccdd1 100644
--- a/tests/PyzTest/Zed/CmsGui/codeception.yml
+++ b/tests/PyzTest/Zed/CmsGui/codeception.yml
@@ -18,6 +18,7 @@ suites:
         modules:
             enabled:
               - \PyzTest\Shared\Testify\Helper\Environment
+              - \SprykerTest\Shared\Application\Helper\ZedHelper
               - \Config\Module\ConfigInit
               - \SprykerTest\Shared\Testify\Helper\LocatorHelper:
                   projectNamespaces: ['Pyz']
diff --git a/tests/PyzTest/Zed/Product/codeception.yml b/tests/PyzTest/Zed/Product/codeception.yml
index 259d0c1f3..53877c49d 100644
--- a/tests/PyzTest/Zed/Product/codeception.yml
+++ b/tests/PyzTest/Zed/Product/codeception.yml
@@ -13,12 +13,12 @@ coverage:
 
 suites:
     Business:
-        path: .
+        path: Business
         class_name: ProductBusinessTester
         modules:
             enabled:
                 - Asserts
-                - \SprykerTest\Shared\Testify\Helper\Environment
+                - \PyzTest\Shared\Testify\Helper\Environment
                 - \SprykerTest\Shared\Testify\Helper\LocatorHelper:
                     projectNamespaces: ['Pyz']