diff --git a/composer.json b/composer.json
index 6c4b1c8..6cc84a0 100644
--- a/composer.json
+++ b/composer.json
@@ -13,13 +13,13 @@
     ],
     "require": {
         "php": ">=5.3.0",
-        "php-xapi/model": "^0.1.0",
+        "php-xapi/model": "^0.2.0@dev",
         "symfony/config": "~2.3",
         "symfony/validator": "^2.6.2|^3.0"
     },
     "require-dev": {
         "doctrine/annotations": "~1.0",
-        "php-xapi/test-fixtures": "^0.1.0",
+        "php-xapi/test-fixtures": "dev-model-v2",
         "symfony/property-access": "~2.3"
     },
     "conflict": {
@@ -37,7 +37,13 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "0.1.x-dev"
+            "dev-master": "0.2.x-dev"
         }
-    }
+    },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/xabbuh/test-fixtures"
+        }
+    ]
 }
diff --git a/metadata/InverseFunctionalIdentifier.xml b/metadata/InverseFunctionalIdentifier.xml
new file mode 100644
index 0000000..e26d24a
--- /dev/null
+++ b/metadata/InverseFunctionalIdentifier.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping
+        http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
+
+    <class name="Xabbuh\XApi\Model\InverseFunctionalIdentifier">
+    </class>
+</constraint-mapping>
diff --git a/tests/StatementValidatorTest.php b/tests/StatementValidatorTest.php
index 81a63e6..580d874 100644
--- a/tests/StatementValidatorTest.php
+++ b/tests/StatementValidatorTest.php
@@ -11,6 +11,7 @@
 
 namespace Xabbuh\XApi\Validator\Tests;
 
+use Xabbuh\XApi\DataFixtures\ActorFixtures;
 use Xabbuh\XApi\DataFixtures\StatementFixtures;
 use Xabbuh\XApi\Model\Activity;
 use Xabbuh\XApi\Model\Agent;
@@ -26,14 +27,14 @@ public function getObjectsToValidate()
     {
         $validStatement = new Statement(
             '12345678-1234-5678-8234-567812345678',
-            new Agent(),
+            ActorFixtures::getAgent(),
             new Verb('the-verb-id'),
             new Activity()
         );
 
         $statementWithNonUuidId = new Statement(
             'foo',
-            new Agent(),
+            ActorFixtures::getAgent(),
             new Verb('the-verb-id'),
             new Activity()
         );