diff --git a/tests/Fixtures/Entity/Address.php b/tests/Fixtures/Entity/Address.php
new file mode 100644
index 0000000000000000000000000000000000000000..33c4e1304e013393c08027e5e6d3f4b13dd11f61
--- /dev/null
+++ b/tests/Fixtures/Entity/Address.php
@@ -0,0 +1,149 @@
+<?php declare(strict_types=1);
+/**
+ * Copyright (C) 2019 IRSTEA
+ * All rights reserved.
+ *
+ * @copyright 2019 IRSTEA
+ * @author guillaume.perreal
+ */
+
+
+namespace Irstea\NgModelGeneratorBundle\Tests\Fixtures\Entity;
+
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * Class Address
+ *
+ * @ORM\Embeddable()
+ */
+final class Address
+{
+    /**
+     * @var string
+     */
+    private $street;
+
+    /**
+     * @var string
+     */
+    private $postalCode;
+
+    /**
+     * @var string
+     */
+    private $city;
+
+    /**
+     * @var string
+     */
+    private $country;
+
+    /**
+     * Address constructor.
+     * @param string $street
+     * @param string $postalCode
+     * @param string $city
+     * @param string $country
+     */
+    public function __construct(string $street, string $postalCode, string $city, string $country)
+    {
+        $this->street = $street;
+        $this->postalCode = $postalCode;
+        $this->city = $city;
+        $this->country = $country;
+    }
+
+    /**
+     * Get street.
+     *
+     * @return string
+     */
+    public function getStreet(): string
+    {
+        return $this->street;
+    }
+
+    /**
+     * Set street.
+     *
+     * @param string $street
+     */
+    public function setStreet(string $street): void
+    {
+        $this->street = $street;
+    }
+
+    /**
+     * Get postalCode.
+     *
+     * @return string
+     */
+    public function getPostalCode(): string
+    {
+        return $this->postalCode;
+    }
+
+    /**
+     * Set postalCode.
+     *
+     * @param string $postalCode
+     */
+    public function setPostalCode(string $postalCode): void
+    {
+        $this->postalCode = $postalCode;
+    }
+
+    /**
+     * Get city.
+     *
+     * @return string
+     */
+    public function getCity(): string
+    {
+        return $this->city;
+    }
+
+    /**
+     * Set city.
+     *
+     * @param string $city
+     */
+    public function setCity(string $city): void
+    {
+        $this->city = $city;
+    }
+
+    /**
+     * Get country.
+     *
+     * @return string
+     */
+    public function getCountry(): string
+    {
+        return $this->country;
+    }
+
+    /**
+     * Set country.
+     *
+     * @param string $country
+     */
+    public function setCountry(string $country): void
+    {
+        $this->country = $country;
+    }
+
+    /**
+     * @param Address $other
+     * @return bool
+     */
+    public function isEqualTo(Address $other): bool
+    {
+        return $other->street === $this->street
+            && $other->postalCode === $this->postalCode
+            && $other->city === $this->city
+            && $other->country === $this->city;
+    }
+}
diff --git a/tests/Fixtures/Entity/GeolocalizedTrait.php b/tests/Fixtures/Entity/GeolocalizedTrait.php
new file mode 100644
index 0000000000000000000000000000000000000000..2284d392f33f2a10326de45087b3f7d90416100f
--- /dev/null
+++ b/tests/Fixtures/Entity/GeolocalizedTrait.php
@@ -0,0 +1,46 @@
+<?php declare(strict_types=1);
+/**
+ * Copyright (C) 2019 IRSTEA
+ * All rights reserved.
+ *
+ * @copyright 2019 IRSTEA
+ * @author guillaume.perreal
+ */
+
+
+namespace Irstea\NgModelGeneratorBundle\Tests\Fixtures\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+
+/**
+ * Trait GeolocalizedTrait
+ */
+trait GeolocalizedTrait
+{
+    /**
+     * @var Address|null
+     * @ORM\Embedded(class=Address::class)
+     */
+    private $address;
+
+    /**
+     * Get address.
+     *
+     * @return Address|null
+     */
+    public function getAddress(): ?Address
+    {
+        return $this->address;
+    }
+
+    /**
+     * Get address.
+     *
+     * @return Address|null
+     */
+    public function setAddress(?Address $address): void
+    {
+        $this->address = $address;
+    }
+}
diff --git a/tests/Fixtures/Entity/Person.php b/tests/Fixtures/Entity/Person.php
index 55b876e7899806e0c9e12ba59c3712fd4c675ba6..d2c0a170bb4a8ff76b2892699d890383e0e03c8c 100644
--- a/tests/Fixtures/Entity/Person.php
+++ b/tests/Fixtures/Entity/Person.php
@@ -27,6 +27,7 @@ final class Person
 {
     use EntityTrait;
     use TimestampedTrait;
+    use GeolocalizedTrait;
 
     /**
      * @var string
@@ -81,7 +82,7 @@ final class Person
      * @param Structure|null $affectation
      * @throws \Exception
      */
-    public function __construct(string $firstName, string $lastName, string $email = null, string $phoneNumber = null, Structure $affectation = null)
+    public function __construct(string $firstName, string $lastName, string $email = null, string $phoneNumber = null, Structure $affectation = null, Address $address = null)
     {
         $this->createId();
         $this->created();
@@ -94,6 +95,7 @@ final class Person
         $this->managedProjects = new ArrayCollection();
         $this->participeTo = new ArrayCollection();
         $this->affectation = $affectation;
+        $this->address = $address;
     }
 
     /**
diff --git a/tests/Fixtures/Entity/Structure.php b/tests/Fixtures/Entity/Structure.php
index c3653511d22359820073035a7e749b9166b691de..39b9b3647175773388c2e55654e43385bf3428a6 100644
--- a/tests/Fixtures/Entity/Structure.php
+++ b/tests/Fixtures/Entity/Structure.php
@@ -26,6 +26,7 @@ class Structure
 {
     use EntityTrait;
     use TimestampedTrait;
+    use GeolocalizedTrait;
 
     /**
      * @ORM\Column()
@@ -49,14 +50,17 @@ class Structure
      * Structure constructor.
      * @param string $name
      * @param Structure|null $parent
+     * @param Address|null $address
+     * @throws \Exception
      */
-    public function __construct(string $name, self $parent = null)
+    public function __construct(string $name, self $parent = null, Address $address = null)
     {
         $this->createId();
         $this->created();
 
         $this->name = $name;
         $this->parent = $parent;
+        $this->address = $address;
         $this->children = New ArrayCollection();
     }