diff --git a/src/Auth/Auth.php b/src/Auth/Auth.php
index 8cc137430a..f12841b239 100644
--- a/src/Auth/Auth.php
+++ b/src/Auth/Auth.php
@@ -189,7 +189,7 @@ class Auth
      * @param int    $type
      * @param string $secret
      *
-     * @return bool|int
+     * @return bool|string
      */
     public static function tokenVerify(array $tokens, int $type, string $secret)
     {
diff --git a/tests/unit/Auth/AuthTest.php b/tests/unit/Auth/AuthTest.php
new file mode 100644
index 0000000000..d4eaacce51
--- /dev/null
+++ b/tests/unit/Auth/AuthTest.php
@@ -0,0 +1,121 @@
+<?php
+
+namespace Appwrite\Tests;
+
+use Auth\Auth;
+use Database\Document;
+use PHPUnit\Framework\TestCase;
+
+class AuthTest extends TestCase
+{
+    public function setUp()
+    {
+    }
+
+    public function tearDown()
+    {
+    }
+
+    public function testCookieName()
+    {
+        $name = 'cookie-name';
+
+        $this->assertEquals(Auth::setCookieName($name), $name);
+        $this->assertEquals(Auth::$cookieName, $name);
+    }
+
+    public function testEncodeDecodeSession()
+    {
+        $id = 'id';
+        $secret = 'secret';
+        $session = 'eyJpZCI6ImlkIiwic2VjcmV0Ijoic2VjcmV0In0=';
+
+        $this->assertEquals(Auth::encodeSession($id, $secret), $session);
+        $this->assertEquals(Auth::decodeSession($session), ['id' => $id, 'secret' => $secret]);
+    }
+    
+    public function testHash()
+    {
+        $secret = 'secret';
+        $this->assertEquals(Auth::hash($secret), '2bb80d537b1da3e38bd30361aa855686bde0eacd7162fef6a25fe97bf527a25b');
+    }
+    
+    public function testPassword()
+    {
+        $secret = 'secret';
+        $static = '$2y$08$PDbMtV18J1KOBI9tIYabBuyUwBrtXPGhLxCy9pWP6xkldVOKLrLKy';
+        $dynamic = Auth::passwordHash($secret);
+        
+        $this->assertEquals(Auth::passwordVerify($secret, $dynamic), true);
+        $this->assertEquals(Auth::passwordVerify($secret, $static), true);
+    }
+    
+    public function testPasswordGenerator()
+    {
+        $this->assertEquals(\mb_strlen(Auth::passwordGenerator()), 40);
+        $this->assertEquals(\mb_strlen(Auth::passwordGenerator(5)), 10);
+    }
+    
+    public function testTokenGenerator()
+    {
+        $this->assertEquals(\mb_strlen(Auth::tokenGenerator()), 256);
+        $this->assertEquals(\mb_strlen(Auth::tokenGenerator(5)), 10);
+    }
+    
+    public function testTokenVerify()
+    {
+        $secret = 'secret1';
+        $hash = Auth::hash($secret);
+        $tokens1 = [
+            new Document([
+                '$uid' => 'token1',
+                'type' => Auth::TOKEN_TYPE_LOGIN,
+                'expire' => time() + 60 * 60 * 24,
+                'secret' => $hash,
+            ]),
+            new Document([
+                '$uid' => 'token2',
+                'type' => Auth::TOKEN_TYPE_LOGIN,
+                'expire' => time() - 60 * 60 * 24,
+                'secret' => 'secret2',
+            ]),
+        ];
+
+        $tokens2 = [
+            new Document([ // Correct secret and type time, wrong expire time
+                '$uid' => 'token1',
+                'type' => Auth::TOKEN_TYPE_LOGIN,
+                'expire' => time() - 60 * 60 * 24,
+                'secret' => $hash,
+            ]),
+            new Document([
+                '$uid' => 'token2',
+                'type' => Auth::TOKEN_TYPE_LOGIN,
+                'expire' => time() - 60 * 60 * 24,
+                'secret' => 'secret2',
+            ]),
+        ];
+
+        $tokens3 = [ // Correct secret and expire time, wrong type
+            new Document([
+                '$uid' => 'token1',
+                'type' => Auth::TOKEN_TYPE_RECOVERY,
+                'expire' => time() + 60 * 60 * 24,
+                'secret' => $hash,
+            ]),
+            new Document([
+                '$uid' => 'token2',
+                'type' => Auth::TOKEN_TYPE_LOGIN,
+                'expire' => time() - 60 * 60 * 24,
+                'secret' => 'secret2',
+            ]),
+        ];
+
+        $this->assertEquals(Auth::tokenVerify($tokens1, Auth::TOKEN_TYPE_LOGIN, $secret), 'token1');
+        $this->assertEquals(Auth::tokenVerify($tokens1, Auth::TOKEN_TYPE_LOGIN, 'false-secret'), false);
+        $this->assertEquals(Auth::tokenVerify($tokens2, Auth::TOKEN_TYPE_LOGIN, $secret), false);
+        $this->assertEquals(Auth::tokenVerify($tokens2, Auth::TOKEN_TYPE_LOGIN, 'false-secret'), false);
+        $this->assertEquals(Auth::tokenVerify($tokens3, Auth::TOKEN_TYPE_LOGIN, $secret), false);
+        $this->assertEquals(Auth::tokenVerify($tokens3, Auth::TOKEN_TYPE_LOGIN, 'false-secret'), false);
+    }
+}
\ No newline at end of file
diff --git a/tests/unit/Auth/Validator/PasswordTest.php b/tests/unit/Auth/Validator/PasswordTest.php
new file mode 100644
index 0000000000..805d693b7e
--- /dev/null
+++ b/tests/unit/Auth/Validator/PasswordTest.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Appwrite\Tests;
+
+use Auth\Validator\Password;
+use PHPUnit\Framework\TestCase;
+
+class PasswordTestTest extends TestCase
+{
+    /**
+     * @var Password
+     */
+    protected $object = null;
+
+    public function setUp()
+    {
+        $this->object = new Password();
+    }
+
+    public function tearDown()
+    {
+    }
+
+    public function testValues()
+    {
+        $this->assertEquals($this->object->isValid('1'), false);
+        $this->assertEquals($this->object->isValid('12'), false);
+        $this->assertEquals($this->object->isValid('123'), false);
+        $this->assertEquals($this->object->isValid('1234'), false);
+        $this->assertEquals($this->object->isValid('12345'), false);
+        $this->assertEquals($this->object->isValid('123456'), true);
+        $this->assertEquals($this->object->isValid('1234567'), true);
+        $this->assertEquals($this->object->isValid('WUnOZcn0piQMN8Mh31xw4KQPF0gcNGVA'), true);
+        $this->assertEquals($this->object->isValid('WUnOZcn0piQMN8Mh31xw4KQPF0gcNGVAx'), false);
+    }
+}
\ No newline at end of file