diff --git a/.gitignore b/.gitignore
index 718b3b8..3f5925a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,4 @@
 vendor/
 tests/_output
 composer.lock
-tests/_support/*
\ No newline at end of file
+tests/_support/_generated/*
diff --git a/codeception.yml b/codeception.yml
index bfbb7f9..85fe11e 100644
--- a/codeception.yml
+++ b/codeception.yml
@@ -1,23 +1,24 @@
+namespace: Tests\Fei\Entities
+
 actor: Tester
+
 paths:
     tests: tests
     log: tests/_output
     data: tests/_data
     support: tests/_support
     envs: tests/_envs
+
 settings:
     colors: true
     memory_limit: 1024M
+
 extensions:
     enabled:
         - Codeception\Extension\RunFailed
-modules:
-    config:
-        Db:
-            dsn: ''
-            user: ''
-            password: ''
-            dump: tests/_data/dump.sql
+
+bootstrap: bootstrap.php
+
 coverage:
     enabled: true
     remote: false
diff --git a/composer.json b/composer.json
index ec20433..f51bba6 100644
--- a/composer.json
+++ b/composer.json
@@ -12,8 +12,7 @@
   ],
   "require": {
     "php" : "^7.0",
-    "zendframework/zend-filter": "^2.7",
-    "objective-php/gateway": "^1.0.0"
+    "zendframework/zend-filter": "^2.7"
   },
   "require-dev": {
     "zendframework/zend-eventmanager": "^3.2",
@@ -21,11 +20,20 @@
     "zendframework/zend-hydrator": "^2.2",
     "league/fractal": "^0.13.0",
     "squizlabs/php_codesniffer": "3.*",
-    "codeception/codeception": "^2.4"
+    "codeception/codeception": "^4.1"
   },
   "autoload": {
+    "files": [
+      "objective-php-polyfill.php"
+    ],
     "psr-4": {
       "Fei\\Entities\\": "src/"
     }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "Tests\\Fei\\Entities\\": "tests/_support",
+      "Tests\\Fei\\Entities\\Hydrator\\": "tests/unit/Hydrator"
+    }
   }
 }
diff --git a/objective-php-polyfill.php b/objective-php-polyfill.php
new file mode 100644
index 0000000..4b05ee2
--- /dev/null
+++ b/objective-php-polyfill.php
@@ -0,0 +1,9 @@
+<?php
+
+if (!interface_exists('ObjectivePHP\Gateway\Entity\EntityInterface')) {
+    class_alias('Fei\Entities\ObjectivePHP\Gateway\Entity\EntityInterface', 'ObjectivePHP\Gateway\Entity\EntityInterface');
+}
+
+if (!interface_exists('ObjectivePHP\Gateway\Hydrator\DenormalizedDataExtractorInterface')) {
+    class_alias('Fei\Entities\ObjectivePHP\Gateway\Hydrator\DenormalizedDataExtractorInterface', 'ObjectivePHP\Gateway\Hydrator\DenormalizedDataExtractorInterface');
+}
diff --git a/src/ObjectivePHP/Gateway/Entity/EntityInterface.php b/src/ObjectivePHP/Gateway/Entity/EntityInterface.php
new file mode 100644
index 0000000..e08c2a6
--- /dev/null
+++ b/src/ObjectivePHP/Gateway/Entity/EntityInterface.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Fei\Entities\ObjectivePHP\Gateway\Entity;
+
+interface EntityInterface extends \ArrayAccess
+{
+    const DEFAULT_ENTITY_COLLECTION = 'NONE';
+
+    public function getEntityCollection() : string;
+
+    public function getEntityIdentifier() : string;
+
+    public function isNew() : bool;
+
+    public function getEntityFields() : array;
+}
diff --git a/src/ObjectivePHP/Gateway/Hydrator/DenormalizedDataExtractorInterface.php b/src/ObjectivePHP/Gateway/Hydrator/DenormalizedDataExtractorInterface.php
new file mode 100644
index 0000000..186ac71
--- /dev/null
+++ b/src/ObjectivePHP/Gateway/Hydrator/DenormalizedDataExtractorInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Fei\Entities\ObjectivePHP\Gateway\Hydrator;
+
+interface DenormalizedDataExtractorInterface
+{
+    public function extractDenormalized($entity);
+
+    public function denormalizeData(array $data): array;
+}
diff --git a/tests/_bootstrap.php b/tests/_bootstrap.php
deleted file mode 100644
index 243f9c8..0000000
--- a/tests/_bootstrap.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-// This is global bootstrap for autoloading
diff --git a/tests/_data/dump.sql b/tests/_data/dump.sql
deleted file mode 100644
index 4bc742c..0000000
--- a/tests/_data/dump.sql
+++ /dev/null
@@ -1 +0,0 @@
-/* Replace this file with actual dump of your database */
\ No newline at end of file
diff --git a/tests/_support/AcceptanceTester.php b/tests/_support/AcceptanceTester.php
deleted file mode 100644
index 4c7dcbb..0000000
--- a/tests/_support/AcceptanceTester.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-
-/**
- * Inherited Methods
- * @method void wantToTest($text)
- * @method void wantTo($text)
- * @method void execute($callable)
- * @method void expectTo($prediction)
- * @method void expect($prediction)
- * @method void amGoingTo($argumentation)
- * @method void am($role)
- * @method void lookForwardTo($achieveValue)
- * @method void comment($description)
- * @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL)
- *
- * @SuppressWarnings(PHPMD)
-*/
-class AcceptanceTester extends \Codeception\Actor
-{
-    use _generated\AcceptanceTesterActions;
-
-   /**
-    * Define custom actions here
-    */
-}
diff --git a/tests/_support/FunctionalTester.php b/tests/_support/FunctionalTester.php
deleted file mode 100644
index 7e888f8..0000000
--- a/tests/_support/FunctionalTester.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-
-/**
- * Inherited Methods
- * @method void wantToTest($text)
- * @method void wantTo($text)
- * @method void execute($callable)
- * @method void expectTo($prediction)
- * @method void expect($prediction)
- * @method void amGoingTo($argumentation)
- * @method void am($role)
- * @method void lookForwardTo($achieveValue)
- * @method void comment($description)
- * @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL)
- *
- * @SuppressWarnings(PHPMD)
-*/
-class FunctionalTester extends \Codeception\Actor
-{
-    use _generated\FunctionalTesterActions;
-
-   /**
-    * Define custom actions here
-    */
-}
diff --git a/tests/_support/Helper/Acceptance.php b/tests/_support/Helper/Acceptance.php
deleted file mode 100644
index 65b9421..0000000
--- a/tests/_support/Helper/Acceptance.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-namespace Helper;
-
-// here you can define custom actions
-// all public methods declared in helper class will be available in $I
-
-class Acceptance extends \Codeception\Module
-{
-
-}
diff --git a/tests/_support/Helper/Functional.php b/tests/_support/Helper/Functional.php
deleted file mode 100644
index 4183cb0..0000000
--- a/tests/_support/Helper/Functional.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-namespace Helper;
-
-// here you can define custom actions
-// all public methods declared in helper class will be available in $I
-
-class Functional extends \Codeception\Module
-{
-
-}
diff --git a/tests/_support/Helper/Unit.php b/tests/_support/Helper/Unit.php
index 6064d37..490cc8f 100644
--- a/tests/_support/Helper/Unit.php
+++ b/tests/_support/Helper/Unit.php
@@ -1,5 +1,5 @@
 <?php
-namespace Helper;
+namespace Tests\Fei\Entities\Helper;
 
 // here you can define custom actions
 // all public methods declared in helper class will be available in $I
diff --git a/tests/_support/UnitTester.php b/tests/_support/UnitTester.php
index 2835357..18ce347 100644
--- a/tests/_support/UnitTester.php
+++ b/tests/_support/UnitTester.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace Tests\Fei\Entities;
 
 /**
  * Inherited Methods
diff --git a/tests/_support/_generated/AcceptanceTesterActions.php b/tests/_support/_generated/AcceptanceTesterActions.php
deleted file mode 100644
index aca26e2..0000000
--- a/tests/_support/_generated/AcceptanceTesterActions.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php  //[STAMP] d40add6b2290b56899d0f55ca9fddf65
-namespace _generated;
-
-// This class was automatically generated by build task
-// You should not change it manually as it will be overwritten on next build
-// @codingStandardsIgnoreFile
-
-use Helper\Acceptance;
-
-trait AcceptanceTesterActions
-{
-    /**
-     * @return \Codeception\Scenario
-     */
-    abstract protected function getScenario();
-
-    
-}
diff --git a/tests/_support/_generated/FunctionalTesterActions.php b/tests/_support/_generated/FunctionalTesterActions.php
deleted file mode 100644
index af8e017..0000000
--- a/tests/_support/_generated/FunctionalTesterActions.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php  //[STAMP] 6fa568fa67e0e6ac2f5300b47e46b2e6
-namespace _generated;
-
-// This class was automatically generated by build task
-// You should not change it manually as it will be overwritten on next build
-// @codingStandardsIgnoreFile
-
-use Helper\Functional;
-
-trait FunctionalTesterActions
-{
-    /**
-     * @return \Codeception\Scenario
-     */
-    abstract protected function getScenario();
-
-    
-}
diff --git a/tests/_support/_generated/UnitTesterActions.php b/tests/_support/_generated/UnitTesterActions.php
deleted file mode 100644
index 72e4c74..0000000
--- a/tests/_support/_generated/UnitTesterActions.php
+++ /dev/null
@@ -1,545 +0,0 @@
-<?php  //[STAMP] 788bde54eb7faecd0afce18fa1b0e52f
-namespace _generated;
-
-// This class was automatically generated by build task
-// You should not change it manually as it will be overwritten on next build
-// @codingStandardsIgnoreFile
-
-trait UnitTesterActions
-{
-    /**
-     * @return \Codeception\Scenario
-     */
-    abstract protected function getScenario();
-
-    
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that two variables are equal. If you're comparing floating-point values,
-     * you can specify the optional "delta" parameter which dictates how great of a precision
-     * error are you willing to tolerate in order to consider the two values equal.
-     *
-     * Regular example:
-     * ```php
-     * <?php
-     * $I->assertEquals($element->getChildrenCount(), 5);
-     * ```
-     *
-     * Floating-point example:
-     * ```php
-     * <?php
-     * $I->assertEquals($calculator->add(0.1, 0.2), 0.3, 'Calculator should add the two numbers correctly.', 0.01);
-     * ```
-     *
-     * @param        $expected
-     * @param        $actual
-     * @param string $message
-     * @param float  $delta
-     * @see \Codeception\Module\Asserts::assertEquals()
-     */
-    public function assertEquals($expected, $actual, $message = null, $delta = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertEquals', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that two variables are not equal. If you're comparing floating-point values,
-     * you can specify the optional "delta" parameter which dictates how great of a precision
-     * error are you willing to tolerate in order to consider the two values not equal.
-     *
-     * Regular example:
-     * ```php
-     * <?php
-     * $I->assertNotEquals($element->getChildrenCount(), 0);
-     * ```
-     *
-     * Floating-point example:
-     * ```php
-     * <?php
-     * $I->assertNotEquals($calculator->add(0.1, 0.2), 0.4, 'Calculator should add the two numbers correctly.', 0.01);
-     * ```
-     *
-     * @param        $expected
-     * @param        $actual
-     * @param string $message
-     * @param float  $delta
-     * @see \Codeception\Module\Asserts::assertNotEquals()
-     */
-    public function assertNotEquals($expected, $actual, $message = null, $delta = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotEquals', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that two variables are same
-     *
-     * @param        $expected
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertSame()
-     */
-    public function assertSame($expected, $actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertSame', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that two variables are not same
-     *
-     * @param        $expected
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertNotSame()
-     */
-    public function assertNotSame($expected, $actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotSame', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that actual is greater than expected
-     *
-     * @param        $expected
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertGreaterThan()
-     */
-    public function assertGreaterThan($expected, $actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertGreaterThan', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that actual is greater or equal than expected
-     *
-     * @param        $expected
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertGreaterThanOrEqual()
-     */
-    public function assertGreaterThanOrEqual($expected, $actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertGreaterThanOrEqual', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that actual is less than expected
-     *
-     * @param        $expected
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertLessThan()
-     */
-    public function assertLessThan($expected, $actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertLessThan', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that actual is less or equal than expected
-     *
-     * @param        $expected
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertLessThanOrEqual()
-     */
-    public function assertLessThanOrEqual($expected, $actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertLessThanOrEqual', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that haystack contains needle
-     *
-     * @param        $needle
-     * @param        $haystack
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertContains()
-     */
-    public function assertContains($needle, $haystack, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertContains', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that haystack doesn't contain needle.
-     *
-     * @param        $needle
-     * @param        $haystack
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertNotContains()
-     */
-    public function assertNotContains($needle, $haystack, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotContains', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that string match with pattern
-     *
-     * @param string $pattern
-     * @param string $string
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertRegExp()
-     */
-    public function assertRegExp($pattern, $string, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertRegExp', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that string not match with pattern
-     *
-     * @param string $pattern
-     * @param string $string
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertNotRegExp()
-     */
-    public function assertNotRegExp($pattern, $string, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotRegExp', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that a string starts with the given prefix.
-     *
-     * @param string $prefix
-     * @param string $string
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertStringStartsWith()
-     */
-    public function assertStringStartsWith($prefix, $string, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringStartsWith', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that a string doesn't start with the given prefix.
-     *
-     * @param string $prefix
-     * @param string $string
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertStringStartsNotWith()
-     */
-    public function assertStringStartsNotWith($prefix, $string, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringStartsNotWith', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that variable is empty.
-     *
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertEmpty()
-     */
-    public function assertEmpty($actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertEmpty', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that variable is not empty.
-     *
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertNotEmpty()
-     */
-    public function assertNotEmpty($actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotEmpty', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that variable is NULL
-     *
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertNull()
-     */
-    public function assertNull($actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNull', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that variable is not NULL
-     *
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertNotNull()
-     */
-    public function assertNotNull($actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotNull', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that condition is positive.
-     *
-     * @param        $condition
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertTrue()
-     */
-    public function assertTrue($condition, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertTrue', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that condition is negative.
-     *
-     * @param        $condition
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertFalse()
-     */
-    public function assertFalse($condition, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFalse', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks if file exists
-     *
-     * @param string $filename
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertFileExists()
-     */
-    public function assertFileExists($filename, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileExists', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks if file doesn't exist
-     *
-     * @param string $filename
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertFileNotExists()
-     */
-    public function assertFileNotExists($filename, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileNotExists', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * @param $expected
-     * @param $actual
-     * @param $description
-     * @see \Codeception\Module\Asserts::assertGreaterOrEquals()
-     */
-    public function assertGreaterOrEquals($expected, $actual, $description = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertGreaterOrEquals', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * @param $expected
-     * @param $actual
-     * @param $description
-     * @see \Codeception\Module\Asserts::assertLessOrEquals()
-     */
-    public function assertLessOrEquals($expected, $actual, $description = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertLessOrEquals', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * @param $actual
-     * @param $description
-     * @see \Codeception\Module\Asserts::assertIsEmpty()
-     */
-    public function assertIsEmpty($actual, $description = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsEmpty', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * @param $key
-     * @param $actual
-     * @param $description
-     * @see \Codeception\Module\Asserts::assertArrayHasKey()
-     */
-    public function assertArrayHasKey($key, $actual, $description = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertArrayHasKey', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * @param $key
-     * @param $actual
-     * @param $description
-     * @see \Codeception\Module\Asserts::assertArrayNotHasKey()
-     */
-    public function assertArrayNotHasKey($key, $actual, $description = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertArrayNotHasKey', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that array contains subset.
-     *
-     * @param array  $subset
-     * @param array  $array
-     * @param bool   $strict
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertArraySubset()
-     */
-    public function assertArraySubset($subset, $array, $strict = null, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertArraySubset', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * @param $expectedCount
-     * @param $actual
-     * @param $description
-     * @see \Codeception\Module\Asserts::assertCount()
-     */
-    public function assertCount($expectedCount, $actual, $description = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertCount', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * @param $class
-     * @param $actual
-     * @param $description
-     * @see \Codeception\Module\Asserts::assertInstanceOf()
-     */
-    public function assertInstanceOf($class, $actual, $description = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertInstanceOf', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * @param $class
-     * @param $actual
-     * @param $description
-     * @see \Codeception\Module\Asserts::assertNotInstanceOf()
-     */
-    public function assertNotInstanceOf($class, $actual, $description = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotInstanceOf', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * @param $type
-     * @param $actual
-     * @param $description
-     * @see \Codeception\Module\Asserts::assertInternalType()
-     */
-    public function assertInternalType($type, $actual, $description = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertInternalType', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Fails the test with message.
-     *
-     * @param $message
-     * @see \Codeception\Module\Asserts::fail()
-     */
-    public function fail($message) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('fail', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Handles and checks exception called inside callback function.
-     * Either exception class name or exception instance should be provided.
-     *
-     * ```php
-     * <?php
-     * $I->expectException(MyException::class, function() {
-     *     $this->doSomethingBad();
-     * });
-     *
-     * $I->expectException(new MyException(), function() {
-     *     $this->doSomethingBad();
-     * });
-     * ```
-     * If you want to check message or exception code, you can pass them with exception instance:
-     * ```php
-     * <?php
-     * // will check that exception MyException is thrown with "Don't do bad things" message
-     * $I->expectException(new MyException("Don't do bad things"), function() {
-     *     $this->doSomethingBad();
-     * });
-     * ```
-     *
-     * @param $exception string or \Exception
-     * @param $callback
-     * @see \Codeception\Module\Asserts::expectException()
-     */
-    public function expectException($exception, $callback) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('expectException', func_get_args()));
-    }
-}
diff --git a/tests/acceptance.suite.yml b/tests/acceptance.suite.yml
deleted file mode 100644
index 6927551..0000000
--- a/tests/acceptance.suite.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-# Codeception Test Suite Configuration
-#
-# Suite for acceptance tests.
-# Perform tests in browser using the WebDriver or PhpBrowser.
-# If you need both WebDriver and PHPBrowser tests - create a separate suite.
-
-class_name: AcceptanceTester
-modules:
-    enabled:
-        - \Helper\Acceptance
diff --git a/tests/acceptance/_bootstrap.php b/tests/acceptance/_bootstrap.php
deleted file mode 100644
index 8a88555..0000000
--- a/tests/acceptance/_bootstrap.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-// Here you can initialize variables that will be available to your tests
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
new file mode 100644
index 0000000..6c8c4f5
--- /dev/null
+++ b/tests/bootstrap.php
@@ -0,0 +1,3 @@
+<?php
+
+require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/tests/functional.suite.yml b/tests/functional.suite.yml
deleted file mode 100644
index 075765b..0000000
--- a/tests/functional.suite.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-# Codeception Test Suite Configuration
-#
-# Suite for functional (integration) tests
-# Emulate web requests and make application process them
-# Include one of framework modules (Symfony2, Yii2, Laravel5) to use it
-
-class_name: FunctionalTester
-modules:
-    enabled:
-        # add framework module here
-        - \Helper\Functional
\ No newline at end of file
diff --git a/tests/functional/_bootstrap.php b/tests/functional/_bootstrap.php
deleted file mode 100644
index 8a88555..0000000
--- a/tests/functional/_bootstrap.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-// Here you can initialize variables that will be available to your tests
diff --git a/tests/unit.suite.yml b/tests/unit.suite.yml
index 02dc9b1..7f165e5 100644
--- a/tests/unit.suite.yml
+++ b/tests/unit.suite.yml
@@ -1,9 +1,5 @@
-# Codeception Test Suite Configuration
-#
-# Suite for unit (internal) tests.
+actor: UnitTester
 
-class_name: UnitTester
 modules:
     enabled:
-        - Asserts
-        - \Helper\Unit
\ No newline at end of file
+        - \Tests\Fei\Entities\Helper\Unit
diff --git a/tests/unit/Hydrator/ContextAwareEntityHydratorTest.php b/tests/unit/Hydrator/ContextAwareEntityHydratorTest.php
index 5e4dca3..bd4a36b 100644
--- a/tests/unit/Hydrator/ContextAwareEntityHydratorTest.php
+++ b/tests/unit/Hydrator/ContextAwareEntityHydratorTest.php
@@ -1,14 +1,7 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: gauthier
- * Date: 09/08/2017
- * Time: 10:11
- */
 
 namespace Tests\Fei\Entities\Hydrator;
 
-
 use Codeception\Test\Unit;
 use Fei\Entities\ContextAwareEntityInterface;
 use Fei\Entities\ContextAwareTrait;
@@ -23,36 +16,37 @@ class ContextAwareEntityHydratorTest extends Unit
 {
     public function testHydration()
     {
-        
+
         $hydrator = new ContextAwareEntityHydrator();
-        
+
         $entity = new SomeEntity();
-        
+
         $hydrator->hydrate(['foo' => 'foo value', 'bar' => 'bar value', 'context' => ['x' => 'y']], $entity);
-        
+
         $this->assertEquals('foo value', $entity->getFoo());
         $this->assertEquals('bar value', $entity->getBar());
         $this->assertEquals('y', $entity->getContext('x'));
-        
     }
-    
+
+    /**
+     * @return SomeEntity
+     */
     public function testHydrationUsingDenormalizedContext()
     {
-        
+
         $hydrator = new ContextAwareEntityHydrator();
-        
+
         $entity = new SomeEntity();
-        
+
         $hydrator->hydrate(['foo' => 'foo value', 'bar' => 'bar value', 'context_x' => 'y'], $entity);
-        
+
         $this->assertEquals('foo value', $entity->getFoo());
         $this->assertEquals('bar value', $entity->getBar());
         $this->assertEquals('y', $entity->getContext('x'));
-        
+
         return $entity;
-        
     }
-    
+
     /**
      * @depends testHydrationUsingDenormalizedContext
      */
@@ -61,7 +55,7 @@ public function testExtraction(SomeEntity $entity)
         $hydrator = new ContextAwareEntityHydrator();
         $this->assertEquals(['foo' => 'foo value', 'bar' => 'bar value', 'context' => ['x' => 'y']], $hydrator->extract($entity));
     }
-    
+
     /**
      * @depends testHydrationUsingDenormalizedContext
      */
@@ -72,16 +66,15 @@ public function testExtractionWithDenormalizedContext(SomeEntity $entity)
     }
 }
 
-
 class SomeEntity implements ContextAwareEntityInterface
 {
-    
+
     use ContextAwareTrait;
-    
+
     protected $foo;
-    
+
     protected $bar;
-    
+
     /**
      * @return mixed
      */
@@ -89,7 +82,7 @@ public function getFoo()
     {
         return $this->foo;
     }
-    
+
     /**
      * @param mixed $foo
      *
@@ -98,10 +91,10 @@ public function getFoo()
     public function setFoo($foo)
     {
         $this->foo = $foo;
-    
+
         return $this;
     }
-    
+
     /**
      * @return mixed
      */
@@ -109,7 +102,7 @@ public function getBar()
     {
         return $this->bar;
     }
-    
+
     /**
      * @param mixed $bar
      *
@@ -118,8 +111,7 @@ public function getBar()
     public function setBar($bar)
     {
         $this->bar = $bar;
-    
+
         return $this;
     }
-    
 }