diff --git a/phpunit.xml b/phpunit.xml
index e772866051..90ebd4225f 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -6,7 +6,7 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="true"
+         stopOnFailure="false"
 >
     <extensions>
         <extension class="Appwrite\Tests\TestHook" />
diff --git a/tests/unit/Utopia/Database/Validator/CustomIdTest.php b/tests/unit/Utopia/Database/Validator/CustomIdTest.php
index 7989c4f555..e8c37a3f72 100644
--- a/tests/unit/Utopia/Database/Validator/CustomIdTest.php
+++ b/tests/unit/Utopia/Database/Validator/CustomIdTest.php
@@ -7,10 +7,7 @@ use PHPUnit\Framework\TestCase;
 
 class CustomIdTest extends TestCase
 {
-    /**
-     * @var Key
-     */
-    protected $object = null;
+    protected ?CustomId $object = null;
 
     public function setUp(): void
     {
diff --git a/tests/unit/Utopia/Database/Validator/ProjectIdTest.php b/tests/unit/Utopia/Database/Validator/ProjectIdTest.php
index feff6da726..1b4b5384db 100644
--- a/tests/unit/Utopia/Database/Validator/ProjectIdTest.php
+++ b/tests/unit/Utopia/Database/Validator/ProjectIdTest.php
@@ -7,10 +7,7 @@ use PHPUnit\Framework\TestCase;
 
 class ProjectIdTest extends TestCase
 {
-    /**
-     * @var Key
-     */
-    protected $object = null;
+    protected ?ProjectId $object = null;
 
     public function setUp(): void
     {
diff --git a/tests/unit/Utopia/Database/Validator/Queries/CollectionTest.php b/tests/unit/Utopia/Database/Validator/Queries/CollectionTest.php
index 3899ce0d80..cdeccef1bd 100644
--- a/tests/unit/Utopia/Database/Validator/Queries/CollectionTest.php
+++ b/tests/unit/Utopia/Database/Validator/Queries/CollectionTest.php
@@ -4,6 +4,8 @@ namespace Tests\Unit\Utopia\Database\Validator\Queries;
 
 use Appwrite\Utopia\Database\Validator\Queries\Base;
 use PHPUnit\Framework\TestCase;
+use Utopia\Database\Document;
+use Utopia\Database\Query;
 
 class CollectionTest extends TestCase
 {
@@ -25,17 +27,17 @@ class CollectionTest extends TestCase
     public function testValid(): void
     {
         $validator = new Base('users', ['name', 'search']);
-        $this->assertEquals(true, $validator->isValid(['cursorAfter("asdf")']), $validator->getDescription());
-        $this->assertEquals(true, $validator->isValid(['equal("name", "value")']), $validator->getDescription());
-        $this->assertEquals(true, $validator->isValid(['limit(10)']), $validator->getDescription());
-        $this->assertEquals(true, $validator->isValid(['offset(10)']), $validator->getDescription());
-        $this->assertEquals(true, $validator->isValid(['orderAsc("name")']), $validator->getDescription());
+        $this->assertEquals(true, $validator->isValid([Query::cursorAfter(new Document(['$id' => 'asdf']))]), $validator->getDescription());
+        $this->assertEquals(true, $validator->isValid([Query::equal('name', ['value'])]), $validator->getDescription());
+        $this->assertEquals(true, $validator->isValid([Query::limit(10)]), $validator->getDescription());
+        $this->assertEquals(true, $validator->isValid([Query::offset(10)]), $validator->getDescription());
+        $this->assertEquals(true, $validator->isValid([Query::orderAsc('name')]), $validator->getDescription());
     }
 
     public function testMissingIndex(): void
     {
         $validator = new Base('users', ['name']);
-        $this->assertEquals(false, $validator->isValid(['equal("dne", "value")']), $validator->getDescription());
-        $this->assertEquals(false, $validator->isValid(['orderAsc("dne")']), $validator->getDescription());
+        $this->assertEquals(false, $validator->isValid([Query::equal('dne', ['value'])]), $validator->getDescription());
+        $this->assertEquals(false, $validator->isValid([Query::orderAsc('dne')]), $validator->getDescription());
     }
 }
diff --git a/tests/unit/Utopia/Database/Validator/Queries/UsersTest.php b/tests/unit/Utopia/Database/Validator/Queries/UsersTest.php
index 122d83d885..327ae185cb 100644
--- a/tests/unit/Utopia/Database/Validator/Queries/UsersTest.php
+++ b/tests/unit/Utopia/Database/Validator/Queries/UsersTest.php
@@ -4,6 +4,7 @@ namespace Tests\Unit\Utopia\Database\Validator\Queries;
 
 use Appwrite\Utopia\Database\Validator\Queries\Users;
 use PHPUnit\Framework\TestCase;
+use Utopia\Database\Query;
 
 class UsersTest extends TestCase
 {
@@ -23,17 +24,17 @@ class UsersTest extends TestCase
          * Test for Success
          */
         $this->assertEquals(true, $validator->isValid([]), $validator->getDescription());
-        $this->assertEquals(true, $validator->isValid(['equal("name", "value")']), $validator->getDescription());
-        $this->assertEquals(true, $validator->isValid(['equal("email", "value")']), $validator->getDescription());
-        $this->assertEquals(true, $validator->isValid(['equal("phone", "value")']), $validator->getDescription());
-        $this->assertEquals(true, $validator->isValid(['greaterThan("passwordUpdate", "2020-10-15 06:38")']), $validator->getDescription());
-        $this->assertEquals(true, $validator->isValid(['greaterThan("registration", "2020-10-15 06:38")']), $validator->getDescription());
-        $this->assertEquals(true, $validator->isValid(['equal("emailVerification", true)']), $validator->getDescription());
-        $this->assertEquals(true, $validator->isValid(['equal("phoneVerification", true)']), $validator->getDescription());
+        $this->assertEquals(true, $validator->isValid([Query::equal('name', ['value'])]), $validator->getDescription());
+        $this->assertEquals(true, $validator->isValid([Query::equal('email', ['value'])]), $validator->getDescription());
+        $this->assertEquals(true, $validator->isValid([Query::equal('phone', ['value'])]), $validator->getDescription());
+        $this->assertEquals(true, $validator->isValid([Query::greaterThan('passwordUpdate', '2020-10-15 06:38')]), $validator->getDescription());
+        $this->assertEquals(true, $validator->isValid([Query::greaterThan('registration', '2020-10-15 06:38')]), $validator->getDescription());
+        $this->assertEquals(true, $validator->isValid([Query::equal('emailVerification', [true])]), $validator->getDescription());
+        $this->assertEquals(true, $validator->isValid([Query::equal('phoneVerification', [true])]), $validator->getDescription());
 
         /**
          * Test for Failure
          */
-        $this->assertEquals(false, $validator->isValid(['equal("password", "value")']), $validator->getDescription());
+        $this->assertEquals(false, $validator->isValid([Query::equal('password', ['value'])]), $validator->getDescription());
     }
 }