diff --git a/.travis.yml b/.travis.yml
index 05e0d40..0dee3e5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,6 +33,9 @@ matrix:
     - php: 7.2
       env:
         - DEPS=latest
+    - php: nightly
+      env:
+        - DEPS=latest
 
 before_install:
   - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
diff --git a/src/ConfigProvider.php b/src/ConfigProvider.php
index d59fc0a..d8950e3 100644
--- a/src/ConfigProvider.php
+++ b/src/ConfigProvider.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @see       https://github.com/zendframework/zend-expressive-authentication-oauth2 for the canonical source repository
- * @copyright Copyright (c) 2017 Zend Technologies USA Inc. (https://www.zend.com)
+ * @copyright Copyright (c) 2017-2018 Zend Technologies USA Inc. (https://www.zend.com)
  * @license   https://github.com/zendframework/zend-expressive-authentication-oauth2/blob/master/LICENSE.md
  *     New BSD License
  */
@@ -31,6 +31,9 @@
 use Zend\Expressive\Authentication\OAuth2\Grant\RefreshTokenGrantFactory;
 use Zend\Expressive\Authentication\OAuth2\Repository\Pdo;
 
+/**
+ * @codeCoverageIgnore
+ */
 class ConfigProvider
 {
     /**
diff --git a/src/ConfigTrait.php b/src/ConfigTrait.php
index 0f1c358..163e9bf 100644
--- a/src/ConfigTrait.php
+++ b/src/ConfigTrait.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @see       https://github.com/zendframework/zend-expressive-authentication-oauth2 for the canonical source repository
- * @copyright Copyright (c) 2017 Zend Technologies USA Inc. (https://www.zend.com)
+ * @copyright Copyright (c) 2017-2018 Zend Technologies USA Inc. (https://www.zend.com)
  * @license   https://github.com/zendframework/zend-expressive-authentication-oauth2/blob/master/LICENSE.md
  *     New BSD License
  */
@@ -90,9 +90,14 @@ protected function getGrantsConfig(ContainerInterface $container) : array
     {
         $config = $container->get('config')['authentication'] ?? [];
 
-        if (empty($config['grants']) || ! is_array($config['grants'])) {
+        if (empty($config['grants'])) {
             throw new InvalidConfigException(
-                'The grant value is missing in config authentication'
+                'The grants value is missing in config authentication and must be an array'
+            );
+        }
+        if (! is_array($config['grants'])) {
+            throw new InvalidConfigException(
+                'The grants must be an array value'
             );
         }
 
diff --git a/src/Entity/TimestampableTrait.php b/src/Entity/TimestampableTrait.php
index 4f710ba..1ae2ccb 100644
--- a/src/Entity/TimestampableTrait.php
+++ b/src/Entity/TimestampableTrait.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @see       https://github.com/zendframework/zend-expressive-authentication-oauth2 for the canonical source repository
- * @copyright Copyright (c) 2017 Zend Technologies USA Inc. (https://www.zend.com)
+ * @copyright Copyright (c) 2017-2018 Zend Technologies USA Inc. (https://www.zend.com)
  * @license   https://github.com/zendframework/zend-expressive-authentication-oauth2/blob/master/LICENSE.md
  *     New BSD License
  */
@@ -10,7 +10,8 @@
 
 namespace Zend\Expressive\Authentication\OAuth2\Entity;
 
-use DateTime;
+use DateTimeImmutable;
+use DateTimeInterface;
 use DateTimeZone;
 
 use function method_exists;
@@ -27,22 +28,22 @@ trait TimestampableTrait
      */
     protected $updatedAt;
 
-    public function getCreatedAt() : DateTime
+    public function getCreatedAt() : DateTimeInterface
     {
         return $this->createdAt;
     }
 
-    public function setCreatedAt(DateTime $createdAt) : void
+    public function setCreatedAt(DateTimeInterface $createdAt) : void
     {
         $this->createdAt = $createdAt;
     }
 
-    public function getUpdatedAt() : DateTime
+    public function getUpdatedAt() : DateTimeInterface
     {
         return $this->updatedAt;
     }
 
-    public function setUpdatedAt(DateTime $updatedAt) : void
+    public function setUpdatedAt(DateTimeInterface $updatedAt) : void
     {
         $this->updatedAt = $updatedAt;
     }
@@ -54,9 +55,10 @@ public function setUpdatedAt(DateTime $updatedAt) : void
     public function timestampOnCreate() : void
     {
         if (! $this->createdAt) {
-            $this->createdAt = new DateTime();
             if (method_exists($this, 'getTimezone')) {
-                $this->createdAt->setTimezone(new DateTimeZone($this->getTimezone()->getValue()));
+                $this->createdAt = new DateTimeImmutable('now', new DateTimeZone($this->getTimezone()->getValue()));
+            } else {
+                $this->createdAt = new DateTimeImmutable();
             }
         }
     }
diff --git a/test/ConfigTraitTest.php b/test/ConfigTraitTest.php
new file mode 100644
index 0000000..f1e9659
--- /dev/null
+++ b/test/ConfigTraitTest.php
@@ -0,0 +1,162 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-expressive-authentication-oauth2 for the canonical source repository
+ * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (https://www.zend.com)
+ * @license   https://github.com/zendframework/zend-expressive-authentication-oauth2/blob/master/LICENSE.md
+ *     New BSD License
+ */
+
+declare(strict_types=1);
+
+namespace ZendTest\Expressive\Authentication\OAuth2;
+
+use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
+use Zend\Expressive\Authentication\OAuth2\ConfigTrait;
+
+class ConfigTraitTest extends TestCase
+{
+    public function setUp()
+    {
+        $this->trait = $trait = new class {
+            use ConfigTrait;
+
+            public function proxy(string $name, ContainerInterface $container)
+            {
+                return $this->$name($container);
+            }
+        };
+        $this->config = [
+            'authentication' => [
+                'private_key' => 'xxx',
+                'encryption_key' => 'xxx',
+                'access_token_expire' => '3600',
+                'refresh_token_expire' => '3600',
+                'auth_code_expire' => '120',
+                'grants' => ['xxx']
+            ]
+        ];
+        $this->container = $this->prophesize(ContainerInterface::class);
+        $this->container
+            ->get('config')
+            ->willReturn($this->config);
+    }
+
+    /**
+     * @expectedException Zend\Expressive\Authentication\OAuth2\Exception\InvalidConfigException
+     */
+    public function testGetPrivateKeyWhenNoConfigPresentWillResultInAnException()
+    {
+        $this->container
+            ->get('config')
+            ->willReturn([]);
+        $this->trait->proxy('getPrivateKey', $this->container->reveal());
+    }
+
+    public function testGetPrivateKey()
+    {
+        $result = $this->trait->proxy('getPrivateKey', $this->container->reveal());
+        $this->assertEquals($this->config['authentication']['private_key'], $result);
+    }
+
+    /**
+     * @expectedException Zend\Expressive\Authentication\OAuth2\Exception\InvalidConfigException
+     */
+    public function testGetEncryptionKeyNoConfig()
+    {
+        $this->container
+            ->get('config')
+            ->willReturn([]);
+        $this->trait->proxy('getEncryptionKey', $this->container->reveal());
+    }
+
+    public function testGetEncryptionKey()
+    {
+        $result = $this->trait->proxy('getEncryptionKey', $this->container->reveal());
+        $this->assertEquals($this->config['authentication']['encryption_key'], $result);
+    }
+
+    /**
+     * @expectedException Zend\Expressive\Authentication\OAuth2\Exception\InvalidConfigException
+     */
+    public function testGetAccessTokenExpireNoConfig()
+    {
+        $this->container
+            ->get('config')
+            ->willReturn([]);
+        $this->trait->proxy('getAccessTokenExpire', $this->container->reveal());
+    }
+
+    public function testGetAccessTokenExpire()
+    {
+        $result = $this->trait->proxy('getAccessTokenExpire', $this->container->reveal());
+        $this->assertEquals($this->config['authentication']['access_token_expire'], $result);
+    }
+
+    /**
+     * @expectedException Zend\Expressive\Authentication\OAuth2\Exception\InvalidConfigException
+     */
+    public function testGetRefreshTokenExpireNoConfig()
+    {
+        $this->container
+            ->get('config')
+            ->willReturn([]);
+        $this->trait->proxy('getRefreshTokenExpire', $this->container->reveal());
+    }
+
+    public function testGetRefreshTokenExpire()
+    {
+        $result = $this->trait->proxy('getRefreshTokenExpire', $this->container->reveal());
+        $this->assertEquals($this->config['authentication']['refresh_token_expire'], $result);
+    }
+
+    /**
+     * @expectedException Zend\Expressive\Authentication\OAuth2\Exception\InvalidConfigException
+     */
+    public function testGetAuthCodeExpireNoConfig()
+    {
+        $this->container
+            ->get('config')
+            ->willReturn([]);
+        $this->trait->proxy('getAuthCodeExpire', $this->container->reveal());
+    }
+
+    public function testGetAuthCodeExpire()
+    {
+        $result = $this->trait->proxy('getAuthCodeExpire', $this->container->reveal());
+        $this->assertEquals($this->config['authentication']['auth_code_expire'], $result);
+    }
+
+    /**
+     * @expectedException Zend\Expressive\Authentication\OAuth2\Exception\InvalidConfigException
+     */
+    public function testGetGrantsConfigNoConfig()
+    {
+        $this->container
+            ->get('config')
+            ->willReturn([]);
+        $this->trait->proxy('getGrantsConfig', $this->container->reveal());
+    }
+
+    /**
+     * @expectedException Zend\Expressive\Authentication\OAuth2\Exception\InvalidConfigException
+     */
+    public function testGetGrantsConfigNoArrayValue()
+    {
+        $this->container
+            ->get('config')
+            ->willReturn([
+                'authentication' => [
+                    'grants' => 'xxx',
+                ],
+            ]);
+
+        $this->trait->proxy('getGrantsConfig', $this->container->reveal());
+    }
+
+    public function testGetGrantsConfig()
+    {
+        $result = $this->trait->proxy('getGrantsConfig', $this->container->reveal());
+        $this->assertEquals($this->config['authentication']['grants'], $result);
+    }
+}
diff --git a/test/Entity/AccessTokenEntityTest.php b/test/Entity/AccessTokenEntityTest.php
new file mode 100644
index 0000000..4fad34b
--- /dev/null
+++ b/test/Entity/AccessTokenEntityTest.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-expressive-authentication-oauth2 for the canonical source repository
+ * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (https://www.zend.com)
+ * @license   https://github.com/zendframework/zend-expressive-authentication-oauth2/blob/master/LICENSE.md
+ *     New BSD License
+ */
+
+declare(strict_types=1);
+
+namespace ZendTest\Expressive\Authentication\OAuth2\Entity;
+
+use League\OAuth2\Server\Entities\AccessTokenEntityInterface;
+use PHPUnit\Framework\TestCase;
+use Zend\Expressive\Authentication\OAuth2\Entity\AccessTokenEntity;
+
+class AccessTokenEntityTest extends TestCase
+{
+    public function testImplementsInstanceAccessTokenEntityInterface()
+    {
+        $entity = new AccessTokenEntity();
+        $this->assertInstanceOf(AccessTokenEntityInterface::class, $entity);
+    }
+}
diff --git a/test/Entity/AuthCodeEntityTest.php b/test/Entity/AuthCodeEntityTest.php
new file mode 100644
index 0000000..f7aa8e6
--- /dev/null
+++ b/test/Entity/AuthCodeEntityTest.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-expressive-authentication-oauth2 for the canonical source repository
+ * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (https://www.zend.com)
+ * @license   https://github.com/zendframework/zend-expressive-authentication-oauth2/blob/master/LICENSE.md
+ *     New BSD License
+ */
+
+declare(strict_types=1);
+
+namespace ZendTest\Expressive\Authentication\OAuth2\Entity;
+
+use League\OAuth2\Server\Entities\AuthCodeEntityInterface;
+use PHPUnit\Framework\TestCase;
+use Zend\Expressive\Authentication\OAuth2\Entity\AuthCodeEntity;
+
+class AuthCodeEntityTest extends TestCase
+{
+    public function testImplementsInstanceAuthCodeEntityInterface()
+    {
+        $entity = new AuthCodeEntity();
+        $this->assertInstanceOf(AuthCodeEntityInterface::class, $entity);
+    }
+}
diff --git a/test/Entity/ClientEntityTest.php b/test/Entity/ClientEntityTest.php
new file mode 100644
index 0000000..7283c30
--- /dev/null
+++ b/test/Entity/ClientEntityTest.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-expressive-authentication-oauth2 for the canonical source repository
+ * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (https://www.zend.com)
+ * @license   https://github.com/zendframework/zend-expressive-authentication-oauth2/blob/master/LICENSE.md
+ *     New BSD License
+ */
+
+declare(strict_types=1);
+
+namespace ZendTest\Expressive\Authentication\OAuth2\Entity;
+
+use League\OAuth2\Server\Entities\ClientEntityInterface;
+use PHPUnit\Framework\TestCase;
+use Zend\Expressive\Authentication\OAuth2\Entity\ClientEntity;
+
+class ClientEntityTest extends TestCase
+{
+    public function setUp()
+    {
+        $this->entity = new ClientEntity('foo', 'bar', 'http://localhost');
+    }
+
+    public function testImplementsAuthCodeEntityInterface()
+    {
+        $this->assertInstanceOf(ClientEntityInterface::class, $this->entity);
+    }
+
+    public function testConstructorSetsIdentifier()
+    {
+        $this->assertSame('foo', $this->entity->getIdentifier());
+    }
+
+    public function testConstructorSetsName()
+    {
+        $this->assertSame('bar', $this->entity->getName());
+    }
+
+    public function testConstructorSetsRedirectUri()
+    {
+        $this->assertSame(['http://localhost'], $this->entity->getRedirectUri());
+    }
+
+    public function testSecret()
+    {
+        $this->entity->setSecret('secret');
+        $this->assertEquals('secret', $this->entity->getSecret());
+    }
+
+    public function testPersonalAccessClient()
+    {
+        $this->entity->setPersonalAccessClient(true);
+        $this->assertTrue($this->entity->hasPersonalAccessClient());
+
+        $this->entity->setPersonalAccessClient(false);
+        $this->assertFalse($this->entity->hasPersonalAccessClient());
+    }
+
+    public function testPasswordClient()
+    {
+        $this->entity->setPasswordClient(true);
+        $this->assertTrue($this->entity->hasPasswordClient());
+
+        $this->entity->setPasswordClient(false);
+        $this->assertFalse($this->entity->hasPasswordClient());
+    }
+}
diff --git a/test/Entity/RefreshTokenEntityTest.php b/test/Entity/RefreshTokenEntityTest.php
new file mode 100644
index 0000000..964fb21
--- /dev/null
+++ b/test/Entity/RefreshTokenEntityTest.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-expressive-authentication-oauth2 for the canonical source repository
+ * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (https://www.zend.com)
+ * @license   https://github.com/zendframework/zend-expressive-authentication-oauth2/blob/master/LICENSE.md
+ *     New BSD License
+ */
+
+declare(strict_types=1);
+
+namespace ZendTest\Expressive\Authentication\OAuth2\Entity;
+
+use League\OAuth2\Server\Entities\RefreshTokenEntityInterface;
+use PHPUnit\Framework\TestCase;
+use Zend\Expressive\Authentication\OAuth2\Entity\RefreshTokenEntity;
+
+class RefreshTokenEntityTest extends TestCase
+{
+    public function testImplementsRefreshTokenEntityInterface()
+    {
+        $entity = new RefreshTokenEntity();
+        $this->assertInstanceOf(RefreshTokenEntityInterface::class, $entity);
+    }
+}
diff --git a/test/Entity/RevokableTraitTest.php b/test/Entity/RevokableTraitTest.php
new file mode 100644
index 0000000..bc043f2
--- /dev/null
+++ b/test/Entity/RevokableTraitTest.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-expressive-authentication-oauth2 for the canonical source repository
+ * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (https://www.zend.com)
+ * @license   https://github.com/zendframework/zend-expressive-authentication-oauth2/blob/master/LICENSE.md
+ *     New BSD License
+ */
+
+declare(strict_types=1);
+
+namespace ZendTest\Expressive\Authentication\OAuth2\Entity;
+
+use PHPUnit\Framework\TestCase;
+use Zend\Expressive\Authentication\OAuth2\Entity\RevokableTrait;
+
+class RevokableTraitTest extends TestCase
+{
+    public function setUp()
+    {
+        $this->trait = $this->getMockForTrait(RevokableTrait::class);
+    }
+
+    public function testSetRevokedToTrue()
+    {
+        $this->trait->setRevoked(true);
+        $this->assertTrue($this->trait->isRevoked());
+    }
+
+    public function testSetRevokedToFalse()
+    {
+        $this->trait->setRevoked(false);
+        $this->assertFalse($this->trait->isRevoked());
+    }
+}
diff --git a/test/Entity/ScopeEntityTest.php b/test/Entity/ScopeEntityTest.php
new file mode 100644
index 0000000..6088db8
--- /dev/null
+++ b/test/Entity/ScopeEntityTest.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-expressive-authentication-oauth2 for the canonical source repository
+ * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (https://www.zend.com)
+ * @license   https://github.com/zendframework/zend-expressive-authentication-oauth2/blob/master/LICENSE.md
+ *     New BSD License
+ */
+
+declare(strict_types=1);
+
+namespace ZendTest\Expressive\Authentication\OAuth2\Entity;
+
+use League\OAuth2\Server\Entities\ScopeEntityInterface;
+use PHPUnit\Framework\TestCase;
+use Zend\Expressive\Authentication\OAuth2\Entity\ScopeEntity;
+
+class ScopeEntityTest extends TestCase
+{
+    public function setUp()
+    {
+        $this->entity = new ScopeEntity();
+    }
+
+    public function testImplementsScopeEntityInterface()
+    {
+        $this->assertInstanceOf(ScopeEntityInterface::class, $this->entity);
+    }
+
+    public function testEntityIsJsonSerializable()
+    {
+        $this->entity->setIdentifier('foo');
+        $this->assertEquals('"foo"', json_encode($this->entity));
+    }
+}
diff --git a/test/Entity/TimestampableTraitTest.php b/test/Entity/TimestampableTraitTest.php
new file mode 100644
index 0000000..56cd7fe
--- /dev/null
+++ b/test/Entity/TimestampableTraitTest.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-expressive-authentication-oauth2 for the canonical source repository
+ * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (https://www.zend.com)
+ * @license   https://github.com/zendframework/zend-expressive-authentication-oauth2/blob/master/LICENSE.md
+ *     New BSD License
+ */
+
+declare(strict_types=1);
+
+namespace ZendTest\Expressive\Authentication\OAuth2\Entity;
+
+use DateTimeImmutable;
+use PHPUnit\Framework\TestCase;
+use Zend\Expressive\Authentication\OAuth2\Entity\TimestampableTrait;
+
+class TimestampableTraitTest extends TestCase
+{
+    public function setUp()
+    {
+        $this->trait = $this->getMockForTrait(TimestampableTrait::class);
+    }
+
+    public function testCreatedAt()
+    {
+        $now = new DateTimeImmutable();
+        $this->trait->setCreatedAt($now);
+        $this->assertEquals($now, $this->trait->getCreatedAt());
+    }
+
+    public function testUpdatedAt()
+    {
+        $now = new DateTimeImmutable();
+        $this->trait->setUpdatedAt($now);
+        $this->assertEquals($now, $this->trait->getUpdatedAt());
+    }
+
+    public function testTimestampOnCreate()
+    {
+        $this->trait->timestampOnCreate();
+        $this->assertNotEmpty($this->trait->getCreatedAt());
+    }
+}
diff --git a/test/Entity/UserEntityTest.php b/test/Entity/UserEntityTest.php
new file mode 100644
index 0000000..3420496
--- /dev/null
+++ b/test/Entity/UserEntityTest.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-expressive-authentication-oauth2 for the canonical source repository
+ * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (https://www.zend.com)
+ * @license   https://github.com/zendframework/zend-expressive-authentication-oauth2/blob/master/LICENSE.md
+ *     New BSD License
+ */
+
+declare(strict_types=1);
+
+namespace ZendTest\Expressive\Authentication\OAuth2\Entity;
+
+use League\OAuth2\Server\Entities\UserEntityInterface;
+use PHPUnit\Framework\TestCase;
+use Zend\Expressive\Authentication\OAuth2\Entity\UserEntity;
+
+class UserEntityTest extends TestCase
+{
+    public function setUp()
+    {
+        $this->entity = new UserEntity('foo');
+    }
+
+    /**
+     * @expectedException ArgumentCountError
+     */
+    public function testConstructorWithoutParamWillResultInAnException()
+    {
+        $entity = new UserEntity();
+    }
+
+    public function testImplementsUserEntityInterface()
+    {
+        $this->assertInstanceOf(UserEntityInterface::class, $this->entity);
+    }
+
+    public function testGetIdentifier()
+    {
+        $this->assertEquals('foo', $this->entity->getIdentifier());
+    }
+}
diff --git a/test/Repository/Pdo/AbstractRepositoryTest.php b/test/Repository/Pdo/AbstractRepositoryTest.php
index 6d93b25..455be99 100644
--- a/test/Repository/Pdo/AbstractRepositoryTest.php
+++ b/test/Repository/Pdo/AbstractRepositoryTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @see       https://github.com/zendframework/zend-expressive-authentication-oauth2 for the canonical source repository
- * @copyright Copyright (c) 2017 Zend Technologies USA Inc. (https://www.zend.com)
+ * @copyright Copyright (c) 2017-2018 Zend Technologies USA Inc. (https://www.zend.com)
  * @license   https://github.com/zendframework/zend-expressive-authentication-oauth2/blob/master/LICENSE.md
  *     New BSD License
  */
@@ -27,7 +27,7 @@ public function testConstructor()
         $this->assertInstanceOf(AbstractRepository::class, $abstract);
     }
 
-    public function testScopesToString()
+    public function testScopesToStringWithEmptyArray()
     {
         $proxy = new class($this->pdo->reveal()) extends AbstractRepository {
             public function scopesToString(array $scopes): string
diff --git a/test/Repository/Pdo/AccessTokenRepositoryFactoryTest.php b/test/Repository/Pdo/AccessTokenRepositoryFactoryTest.php
new file mode 100644
index 0000000..fad93cf
--- /dev/null
+++ b/test/Repository/Pdo/AccessTokenRepositoryFactoryTest.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-expressive-authentication-oauth2 for the canonical source repository
+ * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (https://www.zend.com)
+ * @license   https://github.com/zendframework/zend-expressive-authentication-oauth2/blob/master/LICENSE.md
+ *     New BSD License
+ */
+
+declare(strict_types=1);
+
+namespace ZendTest\Expressive\Authentication\OAuth2\Repository\Pdo;
+
+use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
+use Zend\Expressive\Authentication\OAuth2\Repository\Pdo\PdoService;
+use Zend\Expressive\Authentication\OAuth2\Repository\Pdo\AccessTokenRepository;
+use Zend\Expressive\Authentication\OAuth2\Repository\Pdo\AccessTokenRepositoryFactory;
+
+class AccessTokenRepositoryFactoryTest extends TestCase
+{
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setUp()
+    {
+        $this->container = $this->prophesize(ContainerInterface::class);
+        $this->pdo = $this->prophesize(PdoService::class);
+    }
+
+    public function testFactory()
+    {
+        $this->container
+            ->get(PdoService::class)
+            ->willReturn($this->pdo->reveal());
+
+        $factory = (new AccessTokenRepositoryFactory)($this->container->reveal());
+        $this->assertInstanceOf(AccessTokenRepository::class, $factory);
+    }
+}
diff --git a/test/Repository/Pdo/AccessTokenRepositoryTest.php b/test/Repository/Pdo/AccessTokenRepositoryTest.php
index 9e97186..b4fa4b9 100644
--- a/test/Repository/Pdo/AccessTokenRepositoryTest.php
+++ b/test/Repository/Pdo/AccessTokenRepositoryTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @see       https://github.com/zendframework/zend-expressive-authentication-oauth2 for the canonical source repository
- * @copyright Copyright (c) 2017 Zend Technologies USA Inc. (https://www.zend.com)
+ * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (https://www.zend.com)
  * @license   https://github.com/zendframework/zend-expressive-authentication-oauth2/blob/master/LICENSE.md
  *     New BSD License
  */
@@ -14,10 +14,12 @@
 use League\OAuth2\Server\Entities\AccessTokenEntityInterface;
 use League\OAuth2\Server\Entities\ClientEntityInterface;
 use League\OAuth2\Server\Entities\ScopeEntityInterface;
+use League\OAuth2\Server\Entities\Traits\AccessTokenTrait;
 use League\OAuth2\Server\Exception\UniqueTokenIdentifierConstraintViolationException;
 use PDOStatement;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Zend\Expressive\Authentication\OAuth2\Entity\AccessTokenEntity;
 use Zend\Expressive\Authentication\OAuth2\Repository\Pdo\AccessTokenRepository;
 use Zend\Expressive\Authentication\OAuth2\Repository\Pdo\PdoService;
 
@@ -144,4 +146,26 @@ public function testRevokeAccessToken()
 
         $this->repo->revokeAccessToken('token_id');
     }
+
+    public function testGetNewToken()
+    {
+        $client = $this->prophesize(ClientEntityInterface::class)->reveal();
+        $accessToken = $this->repo->getNewToken($client, []);
+        $this->assertInstanceOf(AccessTokenEntity::class, $accessToken);
+        $this->assertEquals($client, $accessToken->getClient());
+        $this->assertEquals([], $accessToken->getScopes());
+    }
+
+    public function testGetNewTokenWithScopeAndIndentifier()
+    {
+        $client = $this->prophesize(ClientEntityInterface::class)->reveal();
+        $scopes = [ $this->prophesize(ScopeEntityInterface::class)->reveal() ];
+        $userIdentifier = 'foo';
+
+        $accessToken = $this->repo->getNewToken($client, $scopes, $userIdentifier);
+        $this->assertInstanceOf(AccessTokenEntity::class, $accessToken);
+        $this->assertEquals($client, $accessToken->getClient());
+        $this->assertEquals($scopes, $accessToken->getScopes());
+        $this->assertEquals($userIdentifier, $accessToken->getUserIdentifier());
+    }
 }
diff --git a/test/Repository/Pdo/AuthCodeRepositoryFactoryTest.php b/test/Repository/Pdo/AuthCodeRepositoryFactoryTest.php
new file mode 100644
index 0000000..9dd51f9
--- /dev/null
+++ b/test/Repository/Pdo/AuthCodeRepositoryFactoryTest.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-expressive-authentication-oauth2 for the canonical source repository
+ * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (https://www.zend.com)
+ * @license   https://github.com/zendframework/zend-expressive-authentication-oauth2/blob/master/LICENSE.md
+ *     New BSD License
+ */
+
+declare(strict_types=1);
+
+namespace ZendTest\Expressive\Authentication\OAuth2\Repository\Pdo;
+
+use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
+use Zend\Expressive\Authentication\OAuth2\Repository\Pdo\PdoService;
+use Zend\Expressive\Authentication\OAuth2\Repository\Pdo\AuthCodeRepository;
+use Zend\Expressive\Authentication\OAuth2\Repository\Pdo\AuthCodeRepositoryFactory;
+
+class AuthCodeRepositoryFactoryTest extends TestCase
+{
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setUp()
+    {
+        $this->container = $this->prophesize(ContainerInterface::class);
+        $this->pdo = $this->prophesize(PdoService::class);
+    }
+
+    public function testFactory()
+    {
+        $this->container
+            ->get(PdoService::class)
+            ->willReturn($this->pdo->reveal());
+
+        $factory = (new AuthCodeRepositoryFactory)($this->container->reveal());
+        $this->assertInstanceOf(AuthCodeRepository::class, $factory);
+    }
+}
diff --git a/test/Repository/Pdo/AuthCodeRepositoryTest.php b/test/Repository/Pdo/AuthCodeRepositoryTest.php
index d960fb0..6a78144 100644
--- a/test/Repository/Pdo/AuthCodeRepositoryTest.php
+++ b/test/Repository/Pdo/AuthCodeRepositoryTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @see       https://github.com/zendframework/zend-expressive-authentication-oauth2 for the canonical source repository
- * @copyright Copyright (c) 2017 Zend Technologies USA Inc. (https://www.zend.com)
+ * @copyright Copyright (c) 2017-2018 Zend Technologies USA Inc. (https://www.zend.com)
  * @license   https://github.com/zendframework/zend-expressive-authentication-oauth2/blob/master/LICENSE.md
  *     New BSD License
  */
@@ -31,7 +31,7 @@ public function setUp()
         $this->repo = new AuthCodeRepository($this->pdo->reveal());
     }
 
-    public function testPeristNewAuthCodeRaisesExceptionWhenStatementExecutionFails()
+    public function testPersistNewAuthCodeRaisesExceptionWhenStatementExecutionFails()
     {
         $client = $this->prophesize(ClientEntityInterface::class);
         $client->getIdentifier()->willReturn('client_id');
@@ -81,4 +81,38 @@ public function testIsAuthCodeRevokedReturnsFalseForStatementExecutionFailure()
 
         $this->assertFalse($this->repo->isAuthCodeRevoked('code_identifier'));
     }
+
+    public function testIsAuthCodeRevokedReturnsTrue()
+    {
+        $statement = $this->prophesize(PDOStatement::class);
+        $statement->bindParam(':codeId', 'code_identifier')->shouldBeCalled();
+        $statement->execute()->willReturn(true);
+        $statement->fetch()->willReturn(['revoked' => true]);
+
+        $this->pdo
+            ->prepare(Argument::containingString('SELECT revoked FROM oauth_auth_codes'))
+            ->will([$statement, 'reveal']);
+
+        $this->assertTrue($this->repo->isAuthCodeRevoked('code_identifier'));
+    }
+
+    public function testNewAuthCode()
+    {
+        $result = $this->repo->getNewAuthCode();
+        $this->assertInstanceOf(AuthCodeEntity::class, $result);
+    }
+
+    public function testRevokeAuthCode()
+    {
+        $statement = $this->prophesize(PDOStatement::class);
+        $statement->bindParam(':codeId', 'code_identifier')->shouldBeCalled();
+        $statement->bindValue(':revoked', 1)->shouldBeCalled();
+        $statement->execute()->willReturn(true);
+
+        $this->pdo
+            ->prepare(Argument::containingString('UPDATE oauth_auth_codes SET revoked=:revoked WHERE id = :codeId'))
+            ->will([$statement, 'reveal']);
+
+        $this->repo->revokeAuthCode('code_identifier');
+    }
 }
diff --git a/test/Repository/Pdo/ClientRepositoryFactoryTest.php b/test/Repository/Pdo/ClientRepositoryFactoryTest.php
new file mode 100644
index 0000000..60874c4
--- /dev/null
+++ b/test/Repository/Pdo/ClientRepositoryFactoryTest.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-expressive-authentication-oauth2 for the canonical source repository
+ * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (https://www.zend.com)
+ * @license   https://github.com/zendframework/zend-expressive-authentication-oauth2/blob/master/LICENSE.md
+ *     New BSD License
+ */
+
+declare(strict_types=1);
+
+namespace ZendTest\Expressive\Authentication\OAuth2\Repository\Pdo;
+
+use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
+use Zend\Expressive\Authentication\OAuth2\Repository\Pdo\PdoService;
+use Zend\Expressive\Authentication\OAuth2\Repository\Pdo\ClientRepository;
+use Zend\Expressive\Authentication\OAuth2\Repository\Pdo\ClientRepositoryFactory;
+
+class ClientRepositoryFactoryTest extends TestCase
+{
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setUp()
+    {
+        $this->container = $this->prophesize(ContainerInterface::class);
+        $this->pdo = $this->prophesize(PdoService::class);
+    }
+
+    public function testFactory()
+    {
+        $this->container
+            ->get(PdoService::class)
+            ->willReturn($this->pdo->reveal());
+
+        $factory = (new ClientRepositoryFactory)($this->container->reveal());
+        $this->assertInstanceOf(ClientRepository::class, $factory);
+    }
+}
diff --git a/test/Repository/Pdo/RefreshTokenRepositoryFactoryTest.php b/test/Repository/Pdo/RefreshTokenRepositoryFactoryTest.php
new file mode 100644
index 0000000..30ab113
--- /dev/null
+++ b/test/Repository/Pdo/RefreshTokenRepositoryFactoryTest.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-expressive-authentication-oauth2 for the canonical source repository
+ * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (https://www.zend.com)
+ * @license   https://github.com/zendframework/zend-expressive-authentication-oauth2/blob/master/LICENSE.md
+ *     New BSD License
+ */
+
+declare(strict_types=1);
+
+namespace ZendTest\Expressive\Authentication\OAuth2\Repository\Pdo;
+
+use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
+use Zend\Expressive\Authentication\OAuth2\Repository\Pdo\PdoService;
+use Zend\Expressive\Authentication\OAuth2\Repository\Pdo\RefreshTokenRepository;
+use Zend\Expressive\Authentication\OAuth2\Repository\Pdo\RefreshTokenRepositoryFactory;
+
+class RefreshTokenRepositoryFactoryTest extends TestCase
+{
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setUp()
+    {
+        $this->container = $this->prophesize(ContainerInterface::class);
+        $this->pdo = $this->prophesize(PdoService::class);
+    }
+
+    public function testFactory()
+    {
+        $this->container
+            ->get(PdoService::class)
+            ->willReturn($this->pdo->reveal());
+
+        $factory = (new RefreshTokenRepositoryFactory)($this->container->reveal());
+        $this->assertInstanceOf(RefreshTokenRepository::class, $factory);
+    }
+}
diff --git a/test/Repository/Pdo/RefreshTokenRepositoryTest.php b/test/Repository/Pdo/RefreshTokenRepositoryTest.php
index f00ccf6..a92f179 100644
--- a/test/Repository/Pdo/RefreshTokenRepositoryTest.php
+++ b/test/Repository/Pdo/RefreshTokenRepositoryTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @see       https://github.com/zendframework/zend-expressive-authentication-oauth2 for the canonical source repository
- * @copyright Copyright (c) 2017 Zend Technologies USA Inc. (https://www.zend.com)
+ * @copyright Copyright (c) 2017-2018 Zend Technologies USA Inc. (https://www.zend.com)
  * @license   https://github.com/zendframework/zend-expressive-authentication-oauth2/blob/master/LICENSE.md
  *     New BSD License
  */
@@ -17,6 +17,7 @@
 use PDOStatement;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Zend\Expressive\Authentication\OAuth2\Entity\RefreshTokenEntity;
 use Zend\Expressive\Authentication\OAuth2\Repository\Pdo\PdoService;
 use Zend\Expressive\Authentication\OAuth2\Repository\Pdo\RefreshTokenRepository;
 
@@ -73,4 +74,41 @@ public function testIsRefreshTokenRevokedReturnsFalseWhenStatementFailsExecution
 
         $this->assertFalse($this->repo->isRefreshTokenRevoked('token_id'));
     }
+
+    public function testIsRefreshTokenRevokedReturnsTrue()
+    {
+        $statement = $this->prophesize(PDOStatement::class);
+        $statement->bindParam(':tokenId', 'token_id')->shouldBeCalled();
+        $statement->execute()->willReturn(true)->shouldBeCalled();
+        $statement->fetch()->willReturn(['revoked' => true]);
+
+        $this->pdo
+            ->prepare(Argument::containingString('SELECT revoked FROM oauth_refresh_tokens'))
+            ->will([$statement, 'reveal']);
+
+        $this->assertTrue($this->repo->isRefreshTokenRevoked('token_id'));
+    }
+
+    public function testGetNewRefreshToken()
+    {
+        $result = $this->repo->getNewRefreshToken();
+        $this->assertInstanceOf(RefreshTokenEntity::class, $result);
+    }
+
+    public function testRevokeRefreshToken()
+    {
+        $statement = $this->prophesize(PDOStatement::class);
+        $statement->bindParam(':tokenId', 'token_id')->shouldBeCalled();
+        $statement->bindValue(':revoked', 1)->shouldBeCalled();
+        $statement->execute()->willReturn(true)->shouldBeCalled();
+        $statement->fetch()->shouldNotBeCalled();
+
+        $this->pdo
+            ->prepare(Argument::containingString(
+                'UPDATE oauth_refresh_tokens SET revoked=:revoked WHERE id = :tokenId'
+            ))
+            ->will([$statement, 'reveal']);
+
+        $this->repo->revokeRefreshToken('token_id');
+    }
 }
diff --git a/test/Repository/Pdo/ScopeRepositoryFactoryTest.php b/test/Repository/Pdo/ScopeRepositoryFactoryTest.php
new file mode 100644
index 0000000..3fa5c2f
--- /dev/null
+++ b/test/Repository/Pdo/ScopeRepositoryFactoryTest.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-expressive-authentication-oauth2 for the canonical source repository
+ * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (https://www.zend.com)
+ * @license   https://github.com/zendframework/zend-expressive-authentication-oauth2/blob/master/LICENSE.md
+ *     New BSD License
+ */
+
+declare(strict_types=1);
+
+namespace ZendTest\Expressive\Authentication\OAuth2\Repository\Pdo;
+
+use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
+use Zend\Expressive\Authentication\OAuth2\Repository\Pdo\PdoService;
+use Zend\Expressive\Authentication\OAuth2\Repository\Pdo\ScopeRepository;
+use Zend\Expressive\Authentication\OAuth2\Repository\Pdo\ScopeRepositoryFactory;
+
+class ScopeRepositoryFactoryTest extends TestCase
+{
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setUp()
+    {
+        $this->container = $this->prophesize(ContainerInterface::class);
+        $this->pdo = $this->prophesize(PdoService::class);
+    }
+
+    public function testFactory()
+    {
+        $this->container
+            ->get(PdoService::class)
+            ->willReturn($this->pdo->reveal());
+
+        $factory = (new ScopeRepositoryFactory)($this->container->reveal());
+        $this->assertInstanceOf(ScopeRepository::class, $factory);
+    }
+}
diff --git a/test/Repository/Pdo/ScopeRepositoryTest.php b/test/Repository/Pdo/ScopeRepositoryTest.php
index fce2cc1..a218416 100644
--- a/test/Repository/Pdo/ScopeRepositoryTest.php
+++ b/test/Repository/Pdo/ScopeRepositoryTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @see       https://github.com/zendframework/zend-expressive-authentication-oauth2 for the canonical source repository
- * @copyright Copyright (c) 2017 Zend Technologies USA Inc. (https://www.zend.com)
+ * @copyright Copyright (c) 2017-2018 Zend Technologies USA Inc. (https://www.zend.com)
  * @license   https://github.com/zendframework/zend-expressive-authentication-oauth2/blob/master/LICENSE.md
  *     New BSD License
  */
@@ -10,9 +10,11 @@
 
 namespace ZendTest\Expressive\Authentication\OAuth2\Repository\Pdo;
 
+use League\OAuth2\Server\Entities\ClientEntityInterface;
 use PDOStatement;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Zend\Expressive\Authentication\OAuth2\Entity\ScopeEntity;
 use Zend\Expressive\Authentication\OAuth2\Repository\Pdo\PdoService;
 use Zend\Expressive\Authentication\OAuth2\Repository\Pdo\ScopeRepository;
 
@@ -51,4 +53,29 @@ public function testGetScopeEntityByIdentifierReturnsNullWhenReturnedRowDoesNotH
 
         $this->assertNull($this->repo->getScopeEntityByIdentifier('id'));
     }
+
+    public function testGetScopeEntityByIndentifierReturnsScopes()
+    {
+        $statement = $this->prophesize(PDOStatement::class);
+        $statement->bindParam(':identifier', 'id')->shouldBeCalled();
+        $statement->execute()->shouldBeCalled();
+        $statement->fetch()->willReturn([
+            'id' => 'foo'
+        ])->shouldBeCalled();
+
+        $this->pdo
+            ->prepare(Argument::containingString('SELECT id FROM oauth_scopes'))
+            ->will([$statement, 'reveal']);
+
+        $scope = $this->repo->getScopeEntityByIdentifier('id');
+        $this->assertInstanceOf(ScopeEntity::class, $scope);
+        $this->assertEquals('foo', $scope->getIdentifier());
+    }
+
+    public function testFinalizeScopesWithEmptyScopes()
+    {
+        $clientEntity = $this->prophesize(ClientEntityInterface::class);
+        $scopes = $this->repo->finalizeScopes([], 'foo', $clientEntity->reveal());
+        $this->assertEquals([], $scopes);
+    }
 }
diff --git a/test/Repository/Pdo/UserRepositoryTest.php b/test/Repository/Pdo/UserRepositoryTest.php
index 6cd1e4e..4c25a47 100644
--- a/test/Repository/Pdo/UserRepositoryTest.php
+++ b/test/Repository/Pdo/UserRepositoryTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @see       https://github.com/zendframework/zend-expressive-authentication-oauth2 for the canonical source repository
- * @copyright Copyright (c) 2017 Zend Technologies USA Inc. (https://www.zend.com)
+ * @copyright Copyright (c) 2017-2018 Zend Technologies USA Inc. (https://www.zend.com)
  * @license   https://github.com/zendframework/zend-expressive-authentication-oauth2/blob/master/LICENSE.md
  *     New BSD License
  */
@@ -14,6 +14,7 @@
 use PDOStatement;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Zend\Expressive\Authentication\OAuth2\Entity\UserEntity;
 use Zend\Expressive\Authentication\OAuth2\Repository\Pdo\PdoService;
 use Zend\Expressive\Authentication\OAuth2\Repository\Pdo\UserRepository;
 
@@ -98,4 +99,29 @@ public function testGetUserEntityByCredentialsReturnsNullIfUserIsNotFound()
             )
         );
     }
+
+    public function testGetUserEntityByCredentialsReturnsEntity()
+    {
+        $statement = $this->prophesize(PDOStatement::class);
+        $statement->bindParam(':username', 'username')->shouldBeCalled();
+        $statement->execute()->willReturn(true);
+        $statement->fetch()->willReturn([
+            'password' => password_hash('password', PASSWORD_DEFAULT)
+        ]);
+
+        $this->pdo
+            ->prepare(Argument::containingString('SELECT password FROM oauth_users WHERE username = :username'))
+            ->will([$statement, 'reveal']);
+
+        $client = $this->prophesize(ClientEntityInterface::class);
+
+        $entity = $this->repo->getUserEntityByUserCredentials(
+            'username',
+            'password',
+            'auth',
+            $client->reveal()
+        );
+        $this->assertInstanceOf(UserEntity::class, $entity);
+        $this->assertEquals('username', $entity->getIdentifier());
+    }
 }
diff --git a/test/RepositoryTraitTest.php b/test/RepositoryTraitTest.php
new file mode 100644
index 0000000..5470cb8
--- /dev/null
+++ b/test/RepositoryTraitTest.php
@@ -0,0 +1,181 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-expressive-authentication-oauth2 for the canonical source repository
+ * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (https://www.zend.com)
+ * @license   https://github.com/zendframework/zend-expressive-authentication-oauth2/blob/master/LICENSE.md
+ *     New BSD License
+ */
+
+declare(strict_types=1);
+
+namespace ZendTest\Expressive\Authentication\OAuth2;
+
+use League\OAuth2\Server\Repositories\AccessTokenRepositoryInterface;
+use League\OAuth2\Server\Repositories\AuthCodeRepositoryInterface;
+use League\OAuth2\Server\Repositories\ClientRepositoryInterface;
+use League\OAuth2\Server\Repositories\RefreshTokenRepositoryInterface;
+use League\OAuth2\Server\Repositories\ScopeRepositoryInterface;
+use League\OAuth2\Server\Repositories\UserRepositoryInterface;
+use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
+use Zend\Expressive\Authentication\OAuth2\RepositoryTrait;
+
+class RepositoryTraitTest extends TestCase
+{
+    public function setUp()
+    {
+        $this->trait = $trait = new class {
+            use RepositoryTrait;
+
+            public function proxy(string $name, ContainerInterface $container)
+            {
+                return $this->$name($container);
+            }
+        };
+        $this->container = $this->prophesize(ContainerInterface::class);
+    }
+
+    /**
+     * @expectedException Zend\Expressive\Authentication\OAuth2\Exception\InvalidConfigException
+     */
+    public function testGetUserRepositoryWithoutService()
+    {
+        $this->container
+            ->has(UserRepositoryInterface::class)
+            ->willReturn(false);
+        $this->trait->proxy('getUserRepository', $this->container->reveal());
+    }
+
+    public function testGetUserRepository()
+    {
+        $this->container
+            ->has(UserRepositoryInterface::class)
+            ->willReturn(true);
+        $this->container
+            ->get(UserRepositoryInterface::class)
+            ->willReturn($this->prophesize(UserRepositoryInterface::class)->reveal());
+
+        $result = $this->trait->proxy('getUserRepository', $this->container->reveal());
+        $this->assertInstanceOf(UserRepositoryInterface::class, $result);
+    }
+
+    /**
+     * @expectedException Zend\Expressive\Authentication\OAuth2\Exception\InvalidConfigException
+     */
+    public function testGetScopeRepositoryWithoutService()
+    {
+        $this->container
+            ->has(ScopeRepositoryInterface::class)
+            ->willReturn(false);
+        $this->trait->proxy('getScopeRepository', $this->container->reveal());
+    }
+
+    public function testGetScopeRepository()
+    {
+        $this->container
+            ->has(ScopeRepositoryInterface::class)
+            ->willReturn(true);
+        $this->container
+            ->get(ScopeRepositoryInterface::class)
+            ->willReturn($this->prophesize(ScopeRepositoryInterface::class)->reveal());
+
+        $result = $this->trait->proxy('getScopeRepository', $this->container->reveal());
+        $this->assertInstanceOf(ScopeRepositoryInterface::class, $result);
+    }
+
+    /**
+     * @expectedException Zend\Expressive\Authentication\OAuth2\Exception\InvalidConfigException
+     */
+    public function testGetAccessTokenRepositoryWithoutService()
+    {
+        $this->container
+            ->has(AccessTokenRepositoryInterface::class)
+            ->willReturn(false);
+        $this->trait->proxy('getAccessTokenRepository', $this->container->reveal());
+    }
+
+    public function testGetAccessTokenRepository()
+    {
+        $this->container
+            ->has(AccessTokenRepositoryInterface::class)
+            ->willReturn(true);
+        $this->container
+            ->get(AccessTokenRepositoryInterface::class)
+            ->willReturn($this->prophesize(AccessTokenRepositoryInterface::class)->reveal());
+
+        $result = $this->trait->proxy('getAccessTokenRepository', $this->container->reveal());
+        $this->assertInstanceOf(AccessTokenRepositoryInterface::class, $result);
+    }
+
+    /**
+     * @expectedException Zend\Expressive\Authentication\OAuth2\Exception\InvalidConfigException
+     */
+    public function testGetClientRepositoryWithoutService()
+    {
+        $this->container
+            ->has(ClientRepositoryInterface::class)
+            ->willReturn(false);
+        $this->trait->proxy('getClientRepository', $this->container->reveal());
+    }
+
+    public function testGetClientRepository()
+    {
+        $this->container
+            ->has(ClientRepositoryInterface::class)
+            ->willReturn(true);
+        $this->container
+            ->get(ClientRepositoryInterface::class)
+            ->willReturn($this->prophesize(ClientRepositoryInterface::class)->reveal());
+
+        $result = $this->trait->proxy('getClientRepository', $this->container->reveal());
+        $this->assertInstanceOf(ClientRepositoryInterface::class, $result);
+    }
+
+    /**
+     * @expectedException Zend\Expressive\Authentication\OAuth2\Exception\InvalidConfigException
+     */
+    public function testGetRefreshTokenRepositoryWithoutService()
+    {
+        $this->container
+            ->has(RefreshTokenRepositoryInterface::class)
+            ->willReturn(false);
+        $this->trait->proxy('getRefreshTokenRepository', $this->container->reveal());
+    }
+
+    public function testGetRefreshTokenRepository()
+    {
+        $this->container
+            ->has(RefreshTokenRepositoryInterface::class)
+            ->willReturn(true);
+        $this->container
+            ->get(RefreshTokenRepositoryInterface::class)
+            ->willReturn($this->prophesize(RefreshTokenRepositoryInterface::class)->reveal());
+
+        $result = $this->trait->proxy('getRefreshTokenRepository', $this->container->reveal());
+        $this->assertInstanceOf(RefreshTokenRepositoryInterface::class, $result);
+    }
+
+    /**
+     * @expectedException Zend\Expressive\Authentication\OAuth2\Exception\InvalidConfigException
+     */
+    public function testGetAuthCodeRepositoryWithoutService()
+    {
+        $this->container
+            ->has(AuthCodeRepositoryInterface::class)
+            ->willReturn(false);
+        $this->trait->proxy('getAuthCodeRepository', $this->container->reveal());
+    }
+
+    public function testGetAuthCodeRepository()
+    {
+        $this->container
+            ->has(AuthCodeRepositoryInterface::class)
+            ->willReturn(true);
+        $this->container
+            ->get(AuthCodeRepositoryInterface::class)
+            ->willReturn($this->prophesize(AuthCodeRepositoryInterface::class)->reveal());
+
+        $result = $this->trait->proxy('getAuthCodeRepository', $this->container->reveal());
+        $this->assertInstanceOf(AuthCodeRepositoryInterface::class, $result);
+    }
+}