From 20821bc11f033cb9a804f5f1f236f0502b2385af Mon Sep 17 00:00:00 2001
From: Alexey Rogachev <arogachev90@gmail.com>
Date: Thu, 26 Sep 2024 19:04:03 +0500
Subject: [PATCH] WIP

---
 composer.json                                 |  2 +-
 tests/Base/{TestCase.php => DataTrait.php}    | 20 ++++++++++++++++++-
 tests/Base/FilterHandler/AllHandlerTest.php   | 13 ------------
 tests/Base/FilterHandler/AnyHandlerTest.php   | 13 ------------
 .../Base/FilterHandler/BetweenHandlerTest.php | 13 ------------
 .../Base/FilterHandler/EqualsHandlerTest.php  | 13 ------------
 .../FilterHandler/EqualsNullHandlerTest.php   | 13 ------------
 .../FilterHandler/GreaterThanHandlerTest.php  | 13 ------------
 .../GreaterThanOrEqualHandlerTest.php         | 13 ------------
 .../FilterHandler/LessThanHandlerTest.php     | 13 ------------
 .../LessThanOrEqualHandlerTest.php            | 13 ------------
 tests/Base/FilterHandler/LikeHandlerTest.php  | 13 ------------
 tests/Base/FilterHandler/NotHandlerTest.php   | 13 ------------
 tests/Base/QueryDataReaderTest.php            |  3 +++
 .../BaseReaderWithAllTestCase.php             | 12 +++++++++++
 .../BaseReaderWithAnyTestCase.php             | 12 +++++++++++
 .../BaseReaderWithBetweenTestCase.php         | 12 +++++++++++
 .../BaseReaderWithEqualsNullTestCase.php      | 12 +++++++++++
 .../BaseReaderWithEqualsTestCase.php          | 12 +++++++++++
 ...seReaderWithGreaterThanOrEqualTestCase.php | 12 +++++++++++
 .../BaseReaderWithGreaterThanTestCase.php     | 12 +++++++++++
 .../BaseReaderWithInTestCase.php              | 12 +++++++++++
 .../BaseReaderWithLessThanOrEqualTestCase.php | 12 +++++++++++
 .../BaseReaderWithLessThanTestCase.php        | 12 +++++++++++
 .../BaseReaderWithLikeTestCase.php            | 12 +++++++++++
 .../BaseReaderWithNotTestCase.php             | 12 +++++++++++
 tests/Base/ReaderTrait.php                    |  9 ---------
 tests/Mssql/FilterHandler/AllHandlerTest.php  | 12 -----------
 tests/Mssql/FilterHandler/AnyHandlerTest.php  | 12 -----------
 .../FilterHandler/BetweenHandlerTest.php      | 12 -----------
 .../Mssql/FilterHandler/EqualsHandlerTest.php | 12 -----------
 .../FilterHandler/EqualsNullHandlerTest.php   | 12 -----------
 .../FilterHandler/GreaterThanHandlerTest.php  | 12 -----------
 .../GreaterThanOrEqualHandlerTest.php         | 12 -----------
 .../FilterHandler/LessThanHandlerTest.php     | 12 -----------
 .../LessThanOrEqualHandlerTest.php            | 12 -----------
 tests/Mssql/FilterHandler/LikeHandlerTest.php | 12 -----------
 tests/Mssql/FilterHandler/NotHandlerTest.php  | 12 -----------
 .../ReaderWithHandler/ReaderWithAllTest.php   | 13 ++++++++++++
 .../ReaderWithHandler/ReaderWithAnyTest.php   | 13 ++++++++++++
 .../ReaderWithBetweenTest.php                 | 13 ++++++++++++
 .../ReaderWithEqualsNullTest.php              | 13 ++++++++++++
 .../ReaderWithEqualsTest.php                  | 13 ++++++++++++
 .../ReaderWithGreaterThanOrEqualTest.php      | 13 ++++++++++++
 .../ReaderWithGreaterThanTest.php             | 13 ++++++++++++
 .../ReaderWithHandler/ReaderWithInTest.php    | 13 ++++++++++++
 .../ReaderWithLessThanOrEqualTest.php         | 13 ++++++++++++
 .../ReaderWithLessThanTest.php                | 13 ++++++++++++
 .../ReaderWithHandler/ReaderWithLikeTest.php  | 13 ++++++++++++
 .../ReaderWithHandler/ReaderWithNotTest.php   | 13 ++++++++++++
 tests/Mysql/FilterHandler/AllHandlerTest.php  | 12 -----------
 tests/Mysql/FilterHandler/AnyHandlerTest.php  | 12 -----------
 .../FilterHandler/BetweenHandlerTest.php      | 12 -----------
 .../Mysql/FilterHandler/EqualsHandlerTest.php | 12 -----------
 .../FilterHandler/EqualsNullHandlerTest.php   | 12 -----------
 .../FilterHandler/GreaterThanHandlerTest.php  | 12 -----------
 .../GreaterThanOrEqualHandlerTest.php         | 12 -----------
 .../FilterHandler/LessThanHandlerTest.php     | 12 -----------
 .../LessThanOrEqualHandlerTest.php            | 12 -----------
 tests/Mysql/FilterHandler/LikeHandlerTest.php | 12 -----------
 tests/Mysql/FilterHandler/NotHandlerTest.php  | 12 -----------
 .../ReaderWithFilter/ReaderWithAllTest.php    | 13 ++++++++++++
 .../ReaderWithFilter/ReaderWithAnyTest.php    | 13 ++++++++++++
 .../ReaderWithBetweenTest.php                 | 13 ++++++++++++
 .../ReaderWithEqualsNullTest.php              | 13 ++++++++++++
 .../ReaderWithFilter/ReaderWithEqualsTest.php | 13 ++++++++++++
 .../ReaderWithGreaterThanOrEqualTest.php      | 13 ++++++++++++
 .../ReaderWithGreaterThanTest.php             | 13 ++++++++++++
 .../ReaderWithFilter/ReaderWithInTest.php     | 13 ++++++++++++
 .../ReaderWithLessThanOrEqualTest.php         | 13 ++++++++++++
 .../ReaderWithLessThanTest.php                | 13 ++++++++++++
 .../ReaderWithFilter/ReaderWithLikeTest.php   | 13 ++++++++++++
 .../ReaderWithFilter/ReaderWithNotTest.php    | 13 ++++++++++++
 tests/Oracle/FilterHandler/AllHandlerTest.php | 12 -----------
 tests/Oracle/FilterHandler/AnyHandlerTest.php | 12 -----------
 .../FilterHandler/BetweenHandlerTest.php      | 12 -----------
 .../FilterHandler/EqualsHandlerTest.php       | 12 -----------
 .../FilterHandler/EqualsNullHandlerTest.php   | 12 -----------
 .../FilterHandler/GreaterThanHandlerTest.php  | 12 -----------
 .../GreaterThanOrEqualHandlerTest.php         | 12 -----------
 .../FilterHandler/LessThanHandlerTest.php     | 12 -----------
 .../LessThanOrEqualHandlerTest.php            | 12 -----------
 .../Oracle/FilterHandler/LikeHandlerTest.php  | 12 -----------
 tests/Oracle/FilterHandler/NotHandlerTest.php | 12 -----------
 .../ReaderWithHandler/ReaderWithAllTest.php   | 13 ++++++++++++
 .../ReaderWithHandler/ReaderWithAnyTest.php   | 13 ++++++++++++
 .../ReaderWithBetweenTest.php                 | 13 ++++++++++++
 .../ReaderWithEqualsNullTest.php              | 13 ++++++++++++
 .../ReaderWithEqualsTest.php                  | 13 ++++++++++++
 .../ReaderWithGreaterThanOrEqualTest.php      | 13 ++++++++++++
 .../ReaderWithGreaterThanTest.php             | 13 ++++++++++++
 .../ReaderWithHandler/ReaderWithInTest.php    | 13 ++++++++++++
 .../ReaderWithLessThanOrEqualTest.php         | 13 ++++++++++++
 .../ReaderWithLessThanTest.php                | 13 ++++++++++++
 .../ReaderWithHandler/ReaderWithLikeTest.php  | 13 ++++++++++++
 .../ReaderWithHandler/ReaderWithNotTest.php   | 13 ++++++++++++
 tests/Pgsql/FilterHandler/AllHandlerTest.php  | 12 -----------
 tests/Pgsql/FilterHandler/AnyHandlerTest.php  | 12 -----------
 .../FilterHandler/BetweenHandlerTest.php      | 12 -----------
 .../Pgsql/FilterHandler/EqualsHandlerTest.php | 12 -----------
 .../FilterHandler/EqualsNullHandlerTest.php   | 12 -----------
 .../FilterHandler/GreaterThanHandlerTest.php  | 12 -----------
 .../GreaterThanOrEqualHandlerTest.php         | 12 -----------
 .../FilterHandler/LessThanHandlerTest.php     | 12 -----------
 .../LessThanOrEqualHandlerTest.php            | 12 -----------
 tests/Pgsql/FilterHandler/LikeHandlerTest.php | 12 -----------
 tests/Pgsql/FilterHandler/NotHandlerTest.php  | 12 -----------
 .../ReaderWithFilter/ReaderWithAllTest.php    | 13 ++++++++++++
 .../ReaderWithFilter/ReaderWithAnyTest.php    | 13 ++++++++++++
 .../ReaderWithBetweenTest.php                 | 13 ++++++++++++
 .../ReaderWithEqualsNullTest.php              | 13 ++++++++++++
 .../ReaderWithFilter/ReaderWithEqualsTest.php | 13 ++++++++++++
 .../ReaderWithGreaterThanOrEqualTest.php      | 13 ++++++++++++
 .../ReaderWithGreaterThanTest.php             | 13 ++++++++++++
 .../ReaderWithFilter/ReaderWithInTest.php     | 13 ++++++++++++
 .../ReaderWithLessThanOrEqualTest.php         | 13 ++++++++++++
 .../ReaderWithLessThanTest.php                | 13 ++++++++++++
 .../ReaderWithFilter/ReaderWithLikeTest.php   | 13 ++++++++++++
 .../ReaderWithFilter/ReaderWithNotTest.php    | 13 ++++++++++++
 tests/Sqlite/FilterHandler/AllHandlerTest.php | 12 -----------
 tests/Sqlite/FilterHandler/AnyHandlerTest.php | 12 -----------
 .../FilterHandler/BetweenHandlerTest.php      | 12 -----------
 .../FilterHandler/EqualsHandlerTest.php       | 12 -----------
 .../FilterHandler/EqualsNullHandlerTest.php   | 12 -----------
 .../FilterHandler/GreaterThanHandlerTest.php  | 12 -----------
 .../GreaterThanOrEqualHandlerTest.php         | 12 -----------
 .../FilterHandler/LessThanHandlerTest.php     | 12 -----------
 .../LessThanOrEqualHandlerTest.php            | 12 -----------
 .../Sqlite/FilterHandler/LikeHandlerTest.php  | 12 -----------
 tests/Sqlite/FilterHandler/NotHandlerTest.php | 12 -----------
 .../ReaderWithFilter/ReaderWithAllTest.php    | 13 ++++++++++++
 .../ReaderWithFilter/ReaderWithAnyTest.php    | 13 ++++++++++++
 .../ReaderWithBetweenTest.php                 | 13 ++++++++++++
 .../ReaderWithEqualsNullTest.php              | 13 ++++++++++++
 .../ReaderWithFilter/ReaderWithEqualsTest.php | 13 ++++++++++++
 .../ReaderWithGreaterThanOrEqualTest.php      | 13 ++++++++++++
 .../ReaderWithGreaterThanTest.php             | 13 ++++++++++++
 .../ReaderWithFilter/ReaderWithInTestCase.php | 13 ++++++++++++
 .../ReaderWithLessThanOrEqualTest.php         | 13 ++++++++++++
 .../ReaderWithLessThanTest.php                | 13 ++++++++++++
 .../ReaderWithFilter/ReaderWithLikeTest.php   | 13 ++++++++++++
 .../ReaderWithFilter/ReaderWithNotTest.php    | 13 ++++++++++++
 142 files changed, 947 insertions(+), 814 deletions(-)
 rename tests/Base/{TestCase.php => DataTrait.php} (77%)
 delete mode 100644 tests/Base/FilterHandler/AllHandlerTest.php
 delete mode 100644 tests/Base/FilterHandler/AnyHandlerTest.php
 delete mode 100644 tests/Base/FilterHandler/BetweenHandlerTest.php
 delete mode 100644 tests/Base/FilterHandler/EqualsHandlerTest.php
 delete mode 100644 tests/Base/FilterHandler/EqualsNullHandlerTest.php
 delete mode 100644 tests/Base/FilterHandler/GreaterThanHandlerTest.php
 delete mode 100644 tests/Base/FilterHandler/GreaterThanOrEqualHandlerTest.php
 delete mode 100644 tests/Base/FilterHandler/LessThanHandlerTest.php
 delete mode 100644 tests/Base/FilterHandler/LessThanOrEqualHandlerTest.php
 delete mode 100644 tests/Base/FilterHandler/LikeHandlerTest.php
 delete mode 100644 tests/Base/FilterHandler/NotHandlerTest.php
 create mode 100644 tests/Base/Reader/ReaderWithFilter/BaseReaderWithAllTestCase.php
 create mode 100644 tests/Base/Reader/ReaderWithFilter/BaseReaderWithAnyTestCase.php
 create mode 100644 tests/Base/Reader/ReaderWithFilter/BaseReaderWithBetweenTestCase.php
 create mode 100644 tests/Base/Reader/ReaderWithFilter/BaseReaderWithEqualsNullTestCase.php
 create mode 100644 tests/Base/Reader/ReaderWithFilter/BaseReaderWithEqualsTestCase.php
 create mode 100644 tests/Base/Reader/ReaderWithFilter/BaseReaderWithGreaterThanOrEqualTestCase.php
 create mode 100644 tests/Base/Reader/ReaderWithFilter/BaseReaderWithGreaterThanTestCase.php
 create mode 100644 tests/Base/Reader/ReaderWithFilter/BaseReaderWithInTestCase.php
 create mode 100644 tests/Base/Reader/ReaderWithFilter/BaseReaderWithLessThanOrEqualTestCase.php
 create mode 100644 tests/Base/Reader/ReaderWithFilter/BaseReaderWithLessThanTestCase.php
 create mode 100644 tests/Base/Reader/ReaderWithFilter/BaseReaderWithLikeTestCase.php
 create mode 100644 tests/Base/Reader/ReaderWithFilter/BaseReaderWithNotTestCase.php
 delete mode 100644 tests/Base/ReaderTrait.php
 delete mode 100644 tests/Mssql/FilterHandler/AllHandlerTest.php
 delete mode 100644 tests/Mssql/FilterHandler/AnyHandlerTest.php
 delete mode 100644 tests/Mssql/FilterHandler/BetweenHandlerTest.php
 delete mode 100644 tests/Mssql/FilterHandler/EqualsHandlerTest.php
 delete mode 100644 tests/Mssql/FilterHandler/EqualsNullHandlerTest.php
 delete mode 100644 tests/Mssql/FilterHandler/GreaterThanHandlerTest.php
 delete mode 100644 tests/Mssql/FilterHandler/GreaterThanOrEqualHandlerTest.php
 delete mode 100644 tests/Mssql/FilterHandler/LessThanHandlerTest.php
 delete mode 100644 tests/Mssql/FilterHandler/LessThanOrEqualHandlerTest.php
 delete mode 100644 tests/Mssql/FilterHandler/LikeHandlerTest.php
 delete mode 100644 tests/Mssql/FilterHandler/NotHandlerTest.php
 create mode 100644 tests/Mssql/ReaderWithHandler/ReaderWithAllTest.php
 create mode 100644 tests/Mssql/ReaderWithHandler/ReaderWithAnyTest.php
 create mode 100644 tests/Mssql/ReaderWithHandler/ReaderWithBetweenTest.php
 create mode 100644 tests/Mssql/ReaderWithHandler/ReaderWithEqualsNullTest.php
 create mode 100644 tests/Mssql/ReaderWithHandler/ReaderWithEqualsTest.php
 create mode 100644 tests/Mssql/ReaderWithHandler/ReaderWithGreaterThanOrEqualTest.php
 create mode 100644 tests/Mssql/ReaderWithHandler/ReaderWithGreaterThanTest.php
 create mode 100644 tests/Mssql/ReaderWithHandler/ReaderWithInTest.php
 create mode 100644 tests/Mssql/ReaderWithHandler/ReaderWithLessThanOrEqualTest.php
 create mode 100644 tests/Mssql/ReaderWithHandler/ReaderWithLessThanTest.php
 create mode 100644 tests/Mssql/ReaderWithHandler/ReaderWithLikeTest.php
 create mode 100644 tests/Mssql/ReaderWithHandler/ReaderWithNotTest.php
 delete mode 100644 tests/Mysql/FilterHandler/AllHandlerTest.php
 delete mode 100644 tests/Mysql/FilterHandler/AnyHandlerTest.php
 delete mode 100644 tests/Mysql/FilterHandler/BetweenHandlerTest.php
 delete mode 100644 tests/Mysql/FilterHandler/EqualsHandlerTest.php
 delete mode 100644 tests/Mysql/FilterHandler/EqualsNullHandlerTest.php
 delete mode 100644 tests/Mysql/FilterHandler/GreaterThanHandlerTest.php
 delete mode 100644 tests/Mysql/FilterHandler/GreaterThanOrEqualHandlerTest.php
 delete mode 100644 tests/Mysql/FilterHandler/LessThanHandlerTest.php
 delete mode 100644 tests/Mysql/FilterHandler/LessThanOrEqualHandlerTest.php
 delete mode 100644 tests/Mysql/FilterHandler/LikeHandlerTest.php
 delete mode 100644 tests/Mysql/FilterHandler/NotHandlerTest.php
 create mode 100644 tests/Mysql/ReaderWithFilter/ReaderWithAllTest.php
 create mode 100644 tests/Mysql/ReaderWithFilter/ReaderWithAnyTest.php
 create mode 100644 tests/Mysql/ReaderWithFilter/ReaderWithBetweenTest.php
 create mode 100644 tests/Mysql/ReaderWithFilter/ReaderWithEqualsNullTest.php
 create mode 100644 tests/Mysql/ReaderWithFilter/ReaderWithEqualsTest.php
 create mode 100644 tests/Mysql/ReaderWithFilter/ReaderWithGreaterThanOrEqualTest.php
 create mode 100644 tests/Mysql/ReaderWithFilter/ReaderWithGreaterThanTest.php
 create mode 100644 tests/Mysql/ReaderWithFilter/ReaderWithInTest.php
 create mode 100644 tests/Mysql/ReaderWithFilter/ReaderWithLessThanOrEqualTest.php
 create mode 100644 tests/Mysql/ReaderWithFilter/ReaderWithLessThanTest.php
 create mode 100644 tests/Mysql/ReaderWithFilter/ReaderWithLikeTest.php
 create mode 100644 tests/Mysql/ReaderWithFilter/ReaderWithNotTest.php
 delete mode 100644 tests/Oracle/FilterHandler/AllHandlerTest.php
 delete mode 100644 tests/Oracle/FilterHandler/AnyHandlerTest.php
 delete mode 100644 tests/Oracle/FilterHandler/BetweenHandlerTest.php
 delete mode 100644 tests/Oracle/FilterHandler/EqualsHandlerTest.php
 delete mode 100644 tests/Oracle/FilterHandler/EqualsNullHandlerTest.php
 delete mode 100644 tests/Oracle/FilterHandler/GreaterThanHandlerTest.php
 delete mode 100644 tests/Oracle/FilterHandler/GreaterThanOrEqualHandlerTest.php
 delete mode 100644 tests/Oracle/FilterHandler/LessThanHandlerTest.php
 delete mode 100644 tests/Oracle/FilterHandler/LessThanOrEqualHandlerTest.php
 delete mode 100644 tests/Oracle/FilterHandler/LikeHandlerTest.php
 delete mode 100644 tests/Oracle/FilterHandler/NotHandlerTest.php
 create mode 100644 tests/Oracle/ReaderWithHandler/ReaderWithAllTest.php
 create mode 100644 tests/Oracle/ReaderWithHandler/ReaderWithAnyTest.php
 create mode 100644 tests/Oracle/ReaderWithHandler/ReaderWithBetweenTest.php
 create mode 100644 tests/Oracle/ReaderWithHandler/ReaderWithEqualsNullTest.php
 create mode 100644 tests/Oracle/ReaderWithHandler/ReaderWithEqualsTest.php
 create mode 100644 tests/Oracle/ReaderWithHandler/ReaderWithGreaterThanOrEqualTest.php
 create mode 100644 tests/Oracle/ReaderWithHandler/ReaderWithGreaterThanTest.php
 create mode 100644 tests/Oracle/ReaderWithHandler/ReaderWithInTest.php
 create mode 100644 tests/Oracle/ReaderWithHandler/ReaderWithLessThanOrEqualTest.php
 create mode 100644 tests/Oracle/ReaderWithHandler/ReaderWithLessThanTest.php
 create mode 100644 tests/Oracle/ReaderWithHandler/ReaderWithLikeTest.php
 create mode 100644 tests/Oracle/ReaderWithHandler/ReaderWithNotTest.php
 delete mode 100644 tests/Pgsql/FilterHandler/AllHandlerTest.php
 delete mode 100644 tests/Pgsql/FilterHandler/AnyHandlerTest.php
 delete mode 100644 tests/Pgsql/FilterHandler/BetweenHandlerTest.php
 delete mode 100644 tests/Pgsql/FilterHandler/EqualsHandlerTest.php
 delete mode 100644 tests/Pgsql/FilterHandler/EqualsNullHandlerTest.php
 delete mode 100644 tests/Pgsql/FilterHandler/GreaterThanHandlerTest.php
 delete mode 100644 tests/Pgsql/FilterHandler/GreaterThanOrEqualHandlerTest.php
 delete mode 100644 tests/Pgsql/FilterHandler/LessThanHandlerTest.php
 delete mode 100644 tests/Pgsql/FilterHandler/LessThanOrEqualHandlerTest.php
 delete mode 100644 tests/Pgsql/FilterHandler/LikeHandlerTest.php
 delete mode 100644 tests/Pgsql/FilterHandler/NotHandlerTest.php
 create mode 100644 tests/Pgsql/ReaderWithFilter/ReaderWithAllTest.php
 create mode 100644 tests/Pgsql/ReaderWithFilter/ReaderWithAnyTest.php
 create mode 100644 tests/Pgsql/ReaderWithFilter/ReaderWithBetweenTest.php
 create mode 100644 tests/Pgsql/ReaderWithFilter/ReaderWithEqualsNullTest.php
 create mode 100644 tests/Pgsql/ReaderWithFilter/ReaderWithEqualsTest.php
 create mode 100644 tests/Pgsql/ReaderWithFilter/ReaderWithGreaterThanOrEqualTest.php
 create mode 100644 tests/Pgsql/ReaderWithFilter/ReaderWithGreaterThanTest.php
 create mode 100644 tests/Pgsql/ReaderWithFilter/ReaderWithInTest.php
 create mode 100644 tests/Pgsql/ReaderWithFilter/ReaderWithLessThanOrEqualTest.php
 create mode 100644 tests/Pgsql/ReaderWithFilter/ReaderWithLessThanTest.php
 create mode 100644 tests/Pgsql/ReaderWithFilter/ReaderWithLikeTest.php
 create mode 100644 tests/Pgsql/ReaderWithFilter/ReaderWithNotTest.php
 delete mode 100644 tests/Sqlite/FilterHandler/AllHandlerTest.php
 delete mode 100644 tests/Sqlite/FilterHandler/AnyHandlerTest.php
 delete mode 100644 tests/Sqlite/FilterHandler/BetweenHandlerTest.php
 delete mode 100644 tests/Sqlite/FilterHandler/EqualsHandlerTest.php
 delete mode 100644 tests/Sqlite/FilterHandler/EqualsNullHandlerTest.php
 delete mode 100644 tests/Sqlite/FilterHandler/GreaterThanHandlerTest.php
 delete mode 100644 tests/Sqlite/FilterHandler/GreaterThanOrEqualHandlerTest.php
 delete mode 100644 tests/Sqlite/FilterHandler/LessThanHandlerTest.php
 delete mode 100644 tests/Sqlite/FilterHandler/LessThanOrEqualHandlerTest.php
 delete mode 100644 tests/Sqlite/FilterHandler/LikeHandlerTest.php
 delete mode 100644 tests/Sqlite/FilterHandler/NotHandlerTest.php
 create mode 100644 tests/Sqlite/ReaderWithFilter/ReaderWithAllTest.php
 create mode 100644 tests/Sqlite/ReaderWithFilter/ReaderWithAnyTest.php
 create mode 100644 tests/Sqlite/ReaderWithFilter/ReaderWithBetweenTest.php
 create mode 100644 tests/Sqlite/ReaderWithFilter/ReaderWithEqualsNullTest.php
 create mode 100644 tests/Sqlite/ReaderWithFilter/ReaderWithEqualsTest.php
 create mode 100644 tests/Sqlite/ReaderWithFilter/ReaderWithGreaterThanOrEqualTest.php
 create mode 100644 tests/Sqlite/ReaderWithFilter/ReaderWithGreaterThanTest.php
 create mode 100644 tests/Sqlite/ReaderWithFilter/ReaderWithInTestCase.php
 create mode 100644 tests/Sqlite/ReaderWithFilter/ReaderWithLessThanOrEqualTest.php
 create mode 100644 tests/Sqlite/ReaderWithFilter/ReaderWithLessThanTest.php
 create mode 100644 tests/Sqlite/ReaderWithFilter/ReaderWithLikeTest.php
 create mode 100644 tests/Sqlite/ReaderWithFilter/ReaderWithNotTest.php

diff --git a/composer.json b/composer.json
index 1f564f4..94926f7 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,7 @@
     "prefer-stable": true,
     "require": {
         "php": "^8.1",
-        "yiisoft/data": "dev-tests-reogranization",
+        "yiisoft/data": "dev-master",
         "yiisoft/db": "^1.3"
     },
     "require-dev": {
diff --git a/tests/Base/TestCase.php b/tests/Base/DataTrait.php
similarity index 77%
rename from tests/Base/TestCase.php
rename to tests/Base/DataTrait.php
index 075fd54..ee10162 100644
--- a/tests/Base/TestCase.php
+++ b/tests/Base/DataTrait.php
@@ -10,7 +10,7 @@
 use Yiisoft\Db\Driver\Pdo\PdoConnectionInterface;
 use Yiisoft\Db\Query\Query;
 
-abstract class TestCase extends \PHPUnit\Framework\TestCase
+trait DataTrait
 {
     use FixtureTrait;
 
@@ -45,6 +45,24 @@ protected function getReader(): DataReaderInterface
         return new QueryDataReader((new Query($db))->from('user'));
     }
 
+    protected function assertFixtures(array $expectedFixtureIndexes, array $actualFixtures): void
+    {
+        $processedActualFixtures = [];
+        foreach ($actualFixtures as $fixture) {
+            if (is_object($fixture)) {
+                $fixture = json_decode(json_encode($fixture), associative: true);
+            }
+
+            unset($fixture['id']);
+            $fixture['number'] = (int) $fixture['number'];
+            $fixture['balance'] = (float) $fixture['balance'];
+
+            $processedActualFixtures[$fixture['number'] - 1] = $fixture;
+        }
+
+        parent::assertFixtures($expectedFixtureIndexes, $processedActualFixtures);
+    }
+
     protected function populateDatabase(): void
     {
         /** @var PdoConnectionInterface $db */
diff --git a/tests/Base/FilterHandler/AllHandlerTest.php b/tests/Base/FilterHandler/AllHandlerTest.php
deleted file mode 100644
index 375dd94..0000000
--- a/tests/Base/FilterHandler/AllHandlerTest.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Base\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Base\TestCase;
-use Yiisoft\Data\Tests\Common\Reader\FilterHandler\AllHandlerWithReaderTestTrait;
-
-abstract class AllHandlerTest extends TestCase
-{
-    use AllHandlerWithReaderTestTrait;
-}
diff --git a/tests/Base/FilterHandler/AnyHandlerTest.php b/tests/Base/FilterHandler/AnyHandlerTest.php
deleted file mode 100644
index cb4e2c4..0000000
--- a/tests/Base/FilterHandler/AnyHandlerTest.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Base\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Base\TestCase;
-use Yiisoft\Data\Tests\Common\Reader\FilterHandler\AnyHandlerWithReaderTestTrait;
-
-abstract class AnyHandlerTest extends TestCase
-{
-    use AnyHandlerWithReaderTestTrait;
-}
diff --git a/tests/Base/FilterHandler/BetweenHandlerTest.php b/tests/Base/FilterHandler/BetweenHandlerTest.php
deleted file mode 100644
index 17dd365..0000000
--- a/tests/Base/FilterHandler/BetweenHandlerTest.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Base\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Base\TestCase;
-use Yiisoft\Data\Tests\Common\Reader\FilterHandler\BetweenHandlerWithReaderTestTrait;
-
-abstract class BetweenHandlerTest extends TestCase
-{
-    use BetweenHandlerWithReaderTestTrait;
-}
diff --git a/tests/Base/FilterHandler/EqualsHandlerTest.php b/tests/Base/FilterHandler/EqualsHandlerTest.php
deleted file mode 100644
index fc0adaa..0000000
--- a/tests/Base/FilterHandler/EqualsHandlerTest.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Base\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Base\TestCase;
-use Yiisoft\Data\Tests\Common\Reader\FilterHandler\EqualsHandlerWithReaderTestTrait;
-
-abstract class EqualsHandlerTest extends TestCase
-{
-    use EqualsHandlerWithReaderTestTrait;
-}
diff --git a/tests/Base/FilterHandler/EqualsNullHandlerTest.php b/tests/Base/FilterHandler/EqualsNullHandlerTest.php
deleted file mode 100644
index 07e44c4..0000000
--- a/tests/Base/FilterHandler/EqualsNullHandlerTest.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Base\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Base\TestCase;
-use Yiisoft\Data\Tests\Common\Reader\FilterHandler\EqualsNullHandlerWithReaderTestTrait;
-
-abstract class EqualsNullHandlerTest extends TestCase
-{
-    use EqualsNullHandlerWithReaderTestTrait;
-}
diff --git a/tests/Base/FilterHandler/GreaterThanHandlerTest.php b/tests/Base/FilterHandler/GreaterThanHandlerTest.php
deleted file mode 100644
index e8cd713..0000000
--- a/tests/Base/FilterHandler/GreaterThanHandlerTest.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Base\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Base\TestCase;
-use Yiisoft\Data\Tests\Common\Reader\FilterHandler\GreaterThanHandlerWithReaderTestTrait;
-
-abstract class GreaterThanHandlerTest extends TestCase
-{
-    use GreaterThanHandlerWithReaderTestTrait;
-}
diff --git a/tests/Base/FilterHandler/GreaterThanOrEqualHandlerTest.php b/tests/Base/FilterHandler/GreaterThanOrEqualHandlerTest.php
deleted file mode 100644
index 8806b84..0000000
--- a/tests/Base/FilterHandler/GreaterThanOrEqualHandlerTest.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Base\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Base\TestCase;
-use Yiisoft\Data\Tests\Common\Reader\FilterHandler\GreaterThanOrEqualHandlerWithReaderTestTrait;
-
-abstract class GreaterThanOrEqualHandlerTest extends TestCase
-{
-    use GreaterThanOrEqualHandlerWithReaderTestTrait;
-}
diff --git a/tests/Base/FilterHandler/LessThanHandlerTest.php b/tests/Base/FilterHandler/LessThanHandlerTest.php
deleted file mode 100644
index 8f9b788..0000000
--- a/tests/Base/FilterHandler/LessThanHandlerTest.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Base\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Base\TestCase;
-use Yiisoft\Data\Tests\Common\Reader\FilterHandler\LessThanHandlerWithReaderTestTrait;
-
-abstract class LessThanHandlerTest extends TestCase
-{
-    use LessThanHandlerWithReaderTestTrait;
-}
diff --git a/tests/Base/FilterHandler/LessThanOrEqualHandlerTest.php b/tests/Base/FilterHandler/LessThanOrEqualHandlerTest.php
deleted file mode 100644
index 6a1c446..0000000
--- a/tests/Base/FilterHandler/LessThanOrEqualHandlerTest.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Base\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Base\TestCase;
-use Yiisoft\Data\Tests\Common\Reader\FilterHandler\LessThanOrEqualHandlerWithReaderTestTrait;
-
-abstract class LessThanOrEqualHandlerTest extends TestCase
-{
-    use LessThanOrEqualHandlerWithReaderTestTrait;
-}
diff --git a/tests/Base/FilterHandler/LikeHandlerTest.php b/tests/Base/FilterHandler/LikeHandlerTest.php
deleted file mode 100644
index 2d2cd9d..0000000
--- a/tests/Base/FilterHandler/LikeHandlerTest.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Base\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Base\TestCase;
-use Yiisoft\Data\Tests\Common\Reader\FilterHandler\LikeHandlerWithReaderTestTrait;
-
-abstract class LikeHandlerTest extends TestCase
-{
-    use LikeHandlerWithReaderTestTrait;
-}
diff --git a/tests/Base/FilterHandler/NotHandlerTest.php b/tests/Base/FilterHandler/NotHandlerTest.php
deleted file mode 100644
index d95e04c..0000000
--- a/tests/Base/FilterHandler/NotHandlerTest.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Base\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Base\TestCase;
-use Yiisoft\Data\Tests\Common\Reader\FilterHandler\NotHandlerWithReaderTestTrait;
-
-abstract class NotHandlerTest extends TestCase
-{
-    use NotHandlerWithReaderTestTrait;
-}
diff --git a/tests/Base/QueryDataReaderTest.php b/tests/Base/QueryDataReaderTest.php
index b0d909a..db866ac 100644
--- a/tests/Base/QueryDataReaderTest.php
+++ b/tests/Base/QueryDataReaderTest.php
@@ -6,6 +6,7 @@
 
 use DateTime;
 use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
 use Yiisoft\Data\Db\QueryDataReader;
 use Yiisoft\Data\Db\Tests\Support\CustomerDataReader;
 use Yiisoft\Data\Db\Tests\Support\CustomerDTO;
@@ -28,6 +29,8 @@
 
 abstract class QueryDataReaderTest extends TestCase
 {
+    use DataTrait;
+
     public function testDataReader(): void
     {
         $db = $this->getConnection();
diff --git a/tests/Base/Reader/ReaderWithFilter/BaseReaderWithAllTestCase.php b/tests/Base/Reader/ReaderWithFilter/BaseReaderWithAllTestCase.php
new file mode 100644
index 0000000..7aa5200
--- /dev/null
+++ b/tests/Base/Reader/ReaderWithFilter/BaseReaderWithAllTestCase.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\DataTrait;
+
+abstract class BaseReaderWithAllTestCase extends \Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter\BaseReaderWithAllTestCase
+{
+    use DataTrait;
+}
diff --git a/tests/Base/Reader/ReaderWithFilter/BaseReaderWithAnyTestCase.php b/tests/Base/Reader/ReaderWithFilter/BaseReaderWithAnyTestCase.php
new file mode 100644
index 0000000..332cc20
--- /dev/null
+++ b/tests/Base/Reader/ReaderWithFilter/BaseReaderWithAnyTestCase.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\DataTrait;
+
+abstract class BaseReaderWithAnyTestCase extends \Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter\BaseReaderWithAnyTestCase
+{
+    use DataTrait;
+}
diff --git a/tests/Base/Reader/ReaderWithFilter/BaseReaderWithBetweenTestCase.php b/tests/Base/Reader/ReaderWithFilter/BaseReaderWithBetweenTestCase.php
new file mode 100644
index 0000000..1c70cd2
--- /dev/null
+++ b/tests/Base/Reader/ReaderWithFilter/BaseReaderWithBetweenTestCase.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\DataTrait;
+
+abstract class BaseReaderWithBetweenTestCase extends \Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter\BaseReaderWithBetweenTestCase
+{
+    use DataTrait;
+}
diff --git a/tests/Base/Reader/ReaderWithFilter/BaseReaderWithEqualsNullTestCase.php b/tests/Base/Reader/ReaderWithFilter/BaseReaderWithEqualsNullTestCase.php
new file mode 100644
index 0000000..557fbda
--- /dev/null
+++ b/tests/Base/Reader/ReaderWithFilter/BaseReaderWithEqualsNullTestCase.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\DataTrait;
+
+abstract class BaseReaderWithEqualsNullTestCase extends \Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter\BaseReaderWithEqualsNullTestCase
+{
+    use DataTrait;
+}
diff --git a/tests/Base/Reader/ReaderWithFilter/BaseReaderWithEqualsTestCase.php b/tests/Base/Reader/ReaderWithFilter/BaseReaderWithEqualsTestCase.php
new file mode 100644
index 0000000..7cf883e
--- /dev/null
+++ b/tests/Base/Reader/ReaderWithFilter/BaseReaderWithEqualsTestCase.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\DataTrait;
+
+abstract class BaseReaderWithEqualsTestCase extends \Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter\BaseReaderWithEqualsTestCase
+{
+    use DataTrait;
+}
diff --git a/tests/Base/Reader/ReaderWithFilter/BaseReaderWithGreaterThanOrEqualTestCase.php b/tests/Base/Reader/ReaderWithFilter/BaseReaderWithGreaterThanOrEqualTestCase.php
new file mode 100644
index 0000000..7b7f5ae
--- /dev/null
+++ b/tests/Base/Reader/ReaderWithFilter/BaseReaderWithGreaterThanOrEqualTestCase.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\DataTrait;
+
+abstract class BaseReaderWithGreaterThanOrEqualTestCase extends \Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter\BaseReaderWithGreaterThanOrEqualTestCase
+{
+    use DataTrait;
+}
diff --git a/tests/Base/Reader/ReaderWithFilter/BaseReaderWithGreaterThanTestCase.php b/tests/Base/Reader/ReaderWithFilter/BaseReaderWithGreaterThanTestCase.php
new file mode 100644
index 0000000..62ee6b1
--- /dev/null
+++ b/tests/Base/Reader/ReaderWithFilter/BaseReaderWithGreaterThanTestCase.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\DataTrait;
+
+abstract class BaseReaderWithGreaterThanTestCase extends \Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter\BaseReaderWithGreaterThanTestCase
+{
+    use DataTrait;
+}
diff --git a/tests/Base/Reader/ReaderWithFilter/BaseReaderWithInTestCase.php b/tests/Base/Reader/ReaderWithFilter/BaseReaderWithInTestCase.php
new file mode 100644
index 0000000..f7fc77b
--- /dev/null
+++ b/tests/Base/Reader/ReaderWithFilter/BaseReaderWithInTestCase.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\DataTrait;
+
+abstract class BaseReaderWithInTestCase extends \Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter\BaseReaderWithInTestCase
+{
+    use DataTrait;
+}
diff --git a/tests/Base/Reader/ReaderWithFilter/BaseReaderWithLessThanOrEqualTestCase.php b/tests/Base/Reader/ReaderWithFilter/BaseReaderWithLessThanOrEqualTestCase.php
new file mode 100644
index 0000000..969b878
--- /dev/null
+++ b/tests/Base/Reader/ReaderWithFilter/BaseReaderWithLessThanOrEqualTestCase.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\DataTrait;
+
+abstract class BaseReaderWithLessThanOrEqualTestCase extends \Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter\BaseReaderWithLessThanOrEqualTestCase
+{
+    use DataTrait;
+}
diff --git a/tests/Base/Reader/ReaderWithFilter/BaseReaderWithLessThanTestCase.php b/tests/Base/Reader/ReaderWithFilter/BaseReaderWithLessThanTestCase.php
new file mode 100644
index 0000000..cc47226
--- /dev/null
+++ b/tests/Base/Reader/ReaderWithFilter/BaseReaderWithLessThanTestCase.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\DataTrait;
+
+abstract class BaseReaderWithLessThanTestCase extends \Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter\BaseReaderWithLessThanTestCase
+{
+    use DataTrait;
+}
diff --git a/tests/Base/Reader/ReaderWithFilter/BaseReaderWithLikeTestCase.php b/tests/Base/Reader/ReaderWithFilter/BaseReaderWithLikeTestCase.php
new file mode 100644
index 0000000..b7ef093
--- /dev/null
+++ b/tests/Base/Reader/ReaderWithFilter/BaseReaderWithLikeTestCase.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\DataTrait;
+
+abstract class BaseReaderWithLikeTestCase extends \Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter\BaseReaderWithLikeTestCase
+{
+    use DataTrait;
+}
diff --git a/tests/Base/Reader/ReaderWithFilter/BaseReaderWithNotTestCase.php b/tests/Base/Reader/ReaderWithFilter/BaseReaderWithNotTestCase.php
new file mode 100644
index 0000000..4f68ec9
--- /dev/null
+++ b/tests/Base/Reader/ReaderWithFilter/BaseReaderWithNotTestCase.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\DataTrait;
+
+abstract class BaseReaderWithNotTestCase extends \Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter\BaseReaderWithNotTestCase
+{
+    use DataTrait;
+}
diff --git a/tests/Base/ReaderTrait.php b/tests/Base/ReaderTrait.php
deleted file mode 100644
index 9ef1e9e..0000000
--- a/tests/Base/ReaderTrait.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Base;
-
-trait ReaderTrait
-{
-}
diff --git a/tests/Mssql/FilterHandler/AllHandlerTest.php b/tests/Mssql/FilterHandler/AllHandlerTest.php
deleted file mode 100644
index b9b6d3b..0000000
--- a/tests/Mssql/FilterHandler/AllHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Mssql\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Mssql\DatabaseTrait;
-
-class AllHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\AllHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Mssql/FilterHandler/AnyHandlerTest.php b/tests/Mssql/FilterHandler/AnyHandlerTest.php
deleted file mode 100644
index 2df8814..0000000
--- a/tests/Mssql/FilterHandler/AnyHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Mssql\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Mssql\DatabaseTrait;
-
-class AnyHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\AnyHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Mssql/FilterHandler/BetweenHandlerTest.php b/tests/Mssql/FilterHandler/BetweenHandlerTest.php
deleted file mode 100644
index bbe9e96..0000000
--- a/tests/Mssql/FilterHandler/BetweenHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Mssql\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Mssql\DatabaseTrait;
-
-class BetweenHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\BetweenHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Mssql/FilterHandler/EqualsHandlerTest.php b/tests/Mssql/FilterHandler/EqualsHandlerTest.php
deleted file mode 100644
index cfd0584..0000000
--- a/tests/Mssql/FilterHandler/EqualsHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Mssql\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Mssql\DatabaseTrait;
-
-class EqualsHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\EqualsHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Mssql/FilterHandler/EqualsNullHandlerTest.php b/tests/Mssql/FilterHandler/EqualsNullHandlerTest.php
deleted file mode 100644
index ac98720..0000000
--- a/tests/Mssql/FilterHandler/EqualsNullHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Mssql\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Mssql\DatabaseTrait;
-
-class EqualsNullHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\EqualsNullHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Mssql/FilterHandler/GreaterThanHandlerTest.php b/tests/Mssql/FilterHandler/GreaterThanHandlerTest.php
deleted file mode 100644
index cb29f4d..0000000
--- a/tests/Mssql/FilterHandler/GreaterThanHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Mssql\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Mssql\DatabaseTrait;
-
-class GreaterThanHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\GreaterThanHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Mssql/FilterHandler/GreaterThanOrEqualHandlerTest.php b/tests/Mssql/FilterHandler/GreaterThanOrEqualHandlerTest.php
deleted file mode 100644
index e57fffd..0000000
--- a/tests/Mssql/FilterHandler/GreaterThanOrEqualHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Mssql\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Mssql\DatabaseTrait;
-
-class GreaterThanOrEqualHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\GreaterThanOrEqualHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Mssql/FilterHandler/LessThanHandlerTest.php b/tests/Mssql/FilterHandler/LessThanHandlerTest.php
deleted file mode 100644
index f65948f..0000000
--- a/tests/Mssql/FilterHandler/LessThanHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Mssql\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Mssql\DatabaseTrait;
-
-class LessThanHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\LessThanHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Mssql/FilterHandler/LessThanOrEqualHandlerTest.php b/tests/Mssql/FilterHandler/LessThanOrEqualHandlerTest.php
deleted file mode 100644
index 96da27d..0000000
--- a/tests/Mssql/FilterHandler/LessThanOrEqualHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Mssql\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Mssql\DatabaseTrait;
-
-class LessThanOrEqualHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\LessThanOrEqualHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Mssql/FilterHandler/LikeHandlerTest.php b/tests/Mssql/FilterHandler/LikeHandlerTest.php
deleted file mode 100644
index 78da05c..0000000
--- a/tests/Mssql/FilterHandler/LikeHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Mssql\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Mssql\DatabaseTrait;
-
-class LikeHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\LikeHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Mssql/FilterHandler/NotHandlerTest.php b/tests/Mssql/FilterHandler/NotHandlerTest.php
deleted file mode 100644
index ee8363f..0000000
--- a/tests/Mssql/FilterHandler/NotHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Mssql\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Mssql\DatabaseTrait;
-
-class NotHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\NotHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Mssql/ReaderWithHandler/ReaderWithAllTest.php b/tests/Mssql/ReaderWithHandler/ReaderWithAllTest.php
new file mode 100644
index 0000000..0b83314
--- /dev/null
+++ b/tests/Mssql/ReaderWithHandler/ReaderWithAllTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Mssql\ReaderWithHandler;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithAllTestCase;
+use Yiisoft\Data\Db\Tests\Mssql\DatabaseTrait;
+
+final class ReaderWithAllTest extends BaseReaderWithAllTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Mssql/ReaderWithHandler/ReaderWithAnyTest.php b/tests/Mssql/ReaderWithHandler/ReaderWithAnyTest.php
new file mode 100644
index 0000000..cfa8c4c
--- /dev/null
+++ b/tests/Mssql/ReaderWithHandler/ReaderWithAnyTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Mssql\ReaderWithHandler;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithAnyTestCase;
+use Yiisoft\Data\Db\Tests\Mssql\DatabaseTrait;
+
+final class ReaderWithAnyTest extends BaseReaderWithAnyTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Mssql/ReaderWithHandler/ReaderWithBetweenTest.php b/tests/Mssql/ReaderWithHandler/ReaderWithBetweenTest.php
new file mode 100644
index 0000000..3df89ed
--- /dev/null
+++ b/tests/Mssql/ReaderWithHandler/ReaderWithBetweenTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Mssql\ReaderWithHandler;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithBetweenTestCase;
+use Yiisoft\Data\Db\Tests\Mssql\DatabaseTrait;
+
+final class ReaderWithBetweenTest extends BaseReaderWithBetweenTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Mssql/ReaderWithHandler/ReaderWithEqualsNullTest.php b/tests/Mssql/ReaderWithHandler/ReaderWithEqualsNullTest.php
new file mode 100644
index 0000000..eb6f840
--- /dev/null
+++ b/tests/Mssql/ReaderWithHandler/ReaderWithEqualsNullTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Mssql\ReaderWithHandler;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithEqualsNullTestCase;
+use Yiisoft\Data\Db\Tests\Mssql\DatabaseTrait;
+
+final class ReaderWithEqualsNullTest extends BaseReaderWithEqualsNullTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Mssql/ReaderWithHandler/ReaderWithEqualsTest.php b/tests/Mssql/ReaderWithHandler/ReaderWithEqualsTest.php
new file mode 100644
index 0000000..afed945
--- /dev/null
+++ b/tests/Mssql/ReaderWithHandler/ReaderWithEqualsTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Mssql\ReaderWithHandler;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithEqualsTestCase;
+use Yiisoft\Data\Db\Tests\Mssql\DatabaseTrait;
+
+final class ReaderWithEqualsTest extends BaseReaderWithEqualsTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Mssql/ReaderWithHandler/ReaderWithGreaterThanOrEqualTest.php b/tests/Mssql/ReaderWithHandler/ReaderWithGreaterThanOrEqualTest.php
new file mode 100644
index 0000000..7711f57
--- /dev/null
+++ b/tests/Mssql/ReaderWithHandler/ReaderWithGreaterThanOrEqualTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Mssql\ReaderWithHandler;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithGreaterThanOrEqualTestCase;
+use Yiisoft\Data\Db\Tests\Mssql\DatabaseTrait;
+
+final class ReaderWithGreaterThanOrEqualTest extends BaseReaderWithGreaterThanOrEqualTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Mssql/ReaderWithHandler/ReaderWithGreaterThanTest.php b/tests/Mssql/ReaderWithHandler/ReaderWithGreaterThanTest.php
new file mode 100644
index 0000000..e809169
--- /dev/null
+++ b/tests/Mssql/ReaderWithHandler/ReaderWithGreaterThanTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Mssql\ReaderWithHandler;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithGreaterThanTestCase;
+use Yiisoft\Data\Db\Tests\Mssql\DatabaseTrait;
+
+final class ReaderWithGreaterThanTest extends BaseReaderWithGreaterThanTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Mssql/ReaderWithHandler/ReaderWithInTest.php b/tests/Mssql/ReaderWithHandler/ReaderWithInTest.php
new file mode 100644
index 0000000..69c54c9
--- /dev/null
+++ b/tests/Mssql/ReaderWithHandler/ReaderWithInTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Mssql\ReaderWithHandler;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithInTestCase;
+use Yiisoft\Data\Db\Tests\Mssql\DatabaseTrait;
+
+final class ReaderWithInTest extends BaseReaderWithInTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Mssql/ReaderWithHandler/ReaderWithLessThanOrEqualTest.php b/tests/Mssql/ReaderWithHandler/ReaderWithLessThanOrEqualTest.php
new file mode 100644
index 0000000..d485013
--- /dev/null
+++ b/tests/Mssql/ReaderWithHandler/ReaderWithLessThanOrEqualTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Mssql\ReaderWithHandler;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithLessThanOrEqualTestCase;
+use Yiisoft\Data\Db\Tests\Mssql\DatabaseTrait;
+
+final class ReaderWithLessThanOrEqualTest extends BaseReaderWithLessThanOrEqualTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Mssql/ReaderWithHandler/ReaderWithLessThanTest.php b/tests/Mssql/ReaderWithHandler/ReaderWithLessThanTest.php
new file mode 100644
index 0000000..37f5200
--- /dev/null
+++ b/tests/Mssql/ReaderWithHandler/ReaderWithLessThanTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Mssql\ReaderWithHandler;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithLessThanTestCase;
+use Yiisoft\Data\Db\Tests\Mssql\DatabaseTrait;
+
+final class ReaderWithLessThanTest extends BaseReaderWithLessThanTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Mssql/ReaderWithHandler/ReaderWithLikeTest.php b/tests/Mssql/ReaderWithHandler/ReaderWithLikeTest.php
new file mode 100644
index 0000000..0e494b5
--- /dev/null
+++ b/tests/Mssql/ReaderWithHandler/ReaderWithLikeTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Mssql\ReaderWithHandler;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithLikeTestCase;
+use Yiisoft\Data\Db\Tests\Mssql\DatabaseTrait;
+
+final class ReaderWithLikeTest extends BaseReaderWithLikeTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Mssql/ReaderWithHandler/ReaderWithNotTest.php b/tests/Mssql/ReaderWithHandler/ReaderWithNotTest.php
new file mode 100644
index 0000000..aeb4410
--- /dev/null
+++ b/tests/Mssql/ReaderWithHandler/ReaderWithNotTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Mssql\ReaderWithHandler;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithNotTestCase;
+use Yiisoft\Data\Db\Tests\Mssql\DatabaseTrait;
+
+final class ReaderWithNotTest extends BaseReaderWithNotTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Mysql/FilterHandler/AllHandlerTest.php b/tests/Mysql/FilterHandler/AllHandlerTest.php
deleted file mode 100644
index 7bc6789..0000000
--- a/tests/Mysql/FilterHandler/AllHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Mysql\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Mysql\DatabaseTrait;
-
-class AllHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\AllHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Mysql/FilterHandler/AnyHandlerTest.php b/tests/Mysql/FilterHandler/AnyHandlerTest.php
deleted file mode 100644
index 06f51a3..0000000
--- a/tests/Mysql/FilterHandler/AnyHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Mysql\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Mysql\DatabaseTrait;
-
-class AnyHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\AnyHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Mysql/FilterHandler/BetweenHandlerTest.php b/tests/Mysql/FilterHandler/BetweenHandlerTest.php
deleted file mode 100644
index 27df66c..0000000
--- a/tests/Mysql/FilterHandler/BetweenHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Mysql\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Mysql\DatabaseTrait;
-
-class BetweenHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\BetweenHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Mysql/FilterHandler/EqualsHandlerTest.php b/tests/Mysql/FilterHandler/EqualsHandlerTest.php
deleted file mode 100644
index eae6fe2..0000000
--- a/tests/Mysql/FilterHandler/EqualsHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Mysql\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Mysql\DatabaseTrait;
-
-class EqualsHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\EqualsHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Mysql/FilterHandler/EqualsNullHandlerTest.php b/tests/Mysql/FilterHandler/EqualsNullHandlerTest.php
deleted file mode 100644
index 997cdd9..0000000
--- a/tests/Mysql/FilterHandler/EqualsNullHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Mysql\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Mysql\DatabaseTrait;
-
-class EqualsNullHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\EqualsNullHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Mysql/FilterHandler/GreaterThanHandlerTest.php b/tests/Mysql/FilterHandler/GreaterThanHandlerTest.php
deleted file mode 100644
index aab1712..0000000
--- a/tests/Mysql/FilterHandler/GreaterThanHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Mysql\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Mysql\DatabaseTrait;
-
-class GreaterThanHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\GreaterThanHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Mysql/FilterHandler/GreaterThanOrEqualHandlerTest.php b/tests/Mysql/FilterHandler/GreaterThanOrEqualHandlerTest.php
deleted file mode 100644
index 00e2637..0000000
--- a/tests/Mysql/FilterHandler/GreaterThanOrEqualHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Mysql\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Mysql\DatabaseTrait;
-
-class GreaterThanOrEqualHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\GreaterThanOrEqualHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Mysql/FilterHandler/LessThanHandlerTest.php b/tests/Mysql/FilterHandler/LessThanHandlerTest.php
deleted file mode 100644
index 30eb6fc..0000000
--- a/tests/Mysql/FilterHandler/LessThanHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Mysql\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Mysql\DatabaseTrait;
-
-class LessThanHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\LessThanHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Mysql/FilterHandler/LessThanOrEqualHandlerTest.php b/tests/Mysql/FilterHandler/LessThanOrEqualHandlerTest.php
deleted file mode 100644
index a658a9c..0000000
--- a/tests/Mysql/FilterHandler/LessThanOrEqualHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Mysql\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Mysql\DatabaseTrait;
-
-class LessThanOrEqualHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\LessThanOrEqualHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Mysql/FilterHandler/LikeHandlerTest.php b/tests/Mysql/FilterHandler/LikeHandlerTest.php
deleted file mode 100644
index 96640c9..0000000
--- a/tests/Mysql/FilterHandler/LikeHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Mysql\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Mysql\DatabaseTrait;
-
-class LikeHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\LikeHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Mysql/FilterHandler/NotHandlerTest.php b/tests/Mysql/FilterHandler/NotHandlerTest.php
deleted file mode 100644
index c584d5a..0000000
--- a/tests/Mysql/FilterHandler/NotHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Mysql\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Mysql\DatabaseTrait;
-
-class NotHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\NotHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Mysql/ReaderWithFilter/ReaderWithAllTest.php b/tests/Mysql/ReaderWithFilter/ReaderWithAllTest.php
new file mode 100644
index 0000000..ed02a6f
--- /dev/null
+++ b/tests/Mysql/ReaderWithFilter/ReaderWithAllTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Mysql\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithAllTestCase;
+use Yiisoft\Data\Db\Tests\Mysql\DatabaseTrait;
+
+final class ReaderWithAllTest extends BaseReaderWithAllTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Mysql/ReaderWithFilter/ReaderWithAnyTest.php b/tests/Mysql/ReaderWithFilter/ReaderWithAnyTest.php
new file mode 100644
index 0000000..628134d
--- /dev/null
+++ b/tests/Mysql/ReaderWithFilter/ReaderWithAnyTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Mysql\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithAnyTestCase;
+use Yiisoft\Data\Db\Tests\Mysql\DatabaseTrait;
+
+final class ReaderWithAnyTest extends BaseReaderWithAnyTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Mysql/ReaderWithFilter/ReaderWithBetweenTest.php b/tests/Mysql/ReaderWithFilter/ReaderWithBetweenTest.php
new file mode 100644
index 0000000..771f21e
--- /dev/null
+++ b/tests/Mysql/ReaderWithFilter/ReaderWithBetweenTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Mysql\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithBetweenTestCase;
+use Yiisoft\Data\Db\Tests\Mysql\DatabaseTrait;
+
+final class ReaderWithBetweenTest extends BaseReaderWithBetweenTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Mysql/ReaderWithFilter/ReaderWithEqualsNullTest.php b/tests/Mysql/ReaderWithFilter/ReaderWithEqualsNullTest.php
new file mode 100644
index 0000000..059e43f
--- /dev/null
+++ b/tests/Mysql/ReaderWithFilter/ReaderWithEqualsNullTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Mysql\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithEqualsNullTestCase;
+use Yiisoft\Data\Db\Tests\Mysql\DatabaseTrait;
+
+final class ReaderWithEqualsNullTest extends BaseReaderWithEqualsNullTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Mysql/ReaderWithFilter/ReaderWithEqualsTest.php b/tests/Mysql/ReaderWithFilter/ReaderWithEqualsTest.php
new file mode 100644
index 0000000..99aaa70
--- /dev/null
+++ b/tests/Mysql/ReaderWithFilter/ReaderWithEqualsTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Mysql\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithEqualsTestCase;
+use Yiisoft\Data\Db\Tests\Mysql\DatabaseTrait;
+
+final class ReaderWithEqualsTest extends BaseReaderWithEqualsTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Mysql/ReaderWithFilter/ReaderWithGreaterThanOrEqualTest.php b/tests/Mysql/ReaderWithFilter/ReaderWithGreaterThanOrEqualTest.php
new file mode 100644
index 0000000..959d90d
--- /dev/null
+++ b/tests/Mysql/ReaderWithFilter/ReaderWithGreaterThanOrEqualTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Mysql\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithGreaterThanOrEqualTestCase;
+use Yiisoft\Data\Db\Tests\Mysql\DatabaseTrait;
+
+final class ReaderWithGreaterThanOrEqualTest extends BaseReaderWithGreaterThanOrEqualTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Mysql/ReaderWithFilter/ReaderWithGreaterThanTest.php b/tests/Mysql/ReaderWithFilter/ReaderWithGreaterThanTest.php
new file mode 100644
index 0000000..c305843
--- /dev/null
+++ b/tests/Mysql/ReaderWithFilter/ReaderWithGreaterThanTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Mysql\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithGreaterThanTestCase;
+use Yiisoft\Data\Db\Tests\Mysql\DatabaseTrait;
+
+final class ReaderWithGreaterThanTest extends BaseReaderWithGreaterThanTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Mysql/ReaderWithFilter/ReaderWithInTest.php b/tests/Mysql/ReaderWithFilter/ReaderWithInTest.php
new file mode 100644
index 0000000..c4e4251
--- /dev/null
+++ b/tests/Mysql/ReaderWithFilter/ReaderWithInTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Mysql\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithInTestCase;
+use Yiisoft\Data\Db\Tests\Mysql\DatabaseTrait;
+
+final class ReaderWithInTest extends BaseReaderWithInTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Mysql/ReaderWithFilter/ReaderWithLessThanOrEqualTest.php b/tests/Mysql/ReaderWithFilter/ReaderWithLessThanOrEqualTest.php
new file mode 100644
index 0000000..b8ba41c
--- /dev/null
+++ b/tests/Mysql/ReaderWithFilter/ReaderWithLessThanOrEqualTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Mysql\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithLessThanOrEqualTestCase;
+use Yiisoft\Data\Db\Tests\Mysql\DatabaseTrait;
+
+final class ReaderWithLessThanOrEqualTest extends BaseReaderWithLessThanOrEqualTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Mysql/ReaderWithFilter/ReaderWithLessThanTest.php b/tests/Mysql/ReaderWithFilter/ReaderWithLessThanTest.php
new file mode 100644
index 0000000..2e8c43b
--- /dev/null
+++ b/tests/Mysql/ReaderWithFilter/ReaderWithLessThanTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Mysql\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithLessThanTestCase;
+use Yiisoft\Data\Db\Tests\Mysql\DatabaseTrait;
+
+final class ReaderWithLessThanTest extends BaseReaderWithLessThanTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Mysql/ReaderWithFilter/ReaderWithLikeTest.php b/tests/Mysql/ReaderWithFilter/ReaderWithLikeTest.php
new file mode 100644
index 0000000..49e719a
--- /dev/null
+++ b/tests/Mysql/ReaderWithFilter/ReaderWithLikeTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Mysql\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithLikeTestCase;
+use Yiisoft\Data\Db\Tests\Mysql\DatabaseTrait;
+
+final class ReaderWithLikeTest extends BaseReaderWithLikeTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Mysql/ReaderWithFilter/ReaderWithNotTest.php b/tests/Mysql/ReaderWithFilter/ReaderWithNotTest.php
new file mode 100644
index 0000000..3570f5d
--- /dev/null
+++ b/tests/Mysql/ReaderWithFilter/ReaderWithNotTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Mysql\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithNotTestCase;
+use Yiisoft\Data\Db\Tests\Mysql\DatabaseTrait;
+
+final class ReaderWithNotTest extends BaseReaderWithNotTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Oracle/FilterHandler/AllHandlerTest.php b/tests/Oracle/FilterHandler/AllHandlerTest.php
deleted file mode 100644
index cd21abb..0000000
--- a/tests/Oracle/FilterHandler/AllHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Oracle\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Oracle\DatabaseTrait;
-
-class AllHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\AllHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Oracle/FilterHandler/AnyHandlerTest.php b/tests/Oracle/FilterHandler/AnyHandlerTest.php
deleted file mode 100644
index 133ed81..0000000
--- a/tests/Oracle/FilterHandler/AnyHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Oracle\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Oracle\DatabaseTrait;
-
-class AnyHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\AnyHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Oracle/FilterHandler/BetweenHandlerTest.php b/tests/Oracle/FilterHandler/BetweenHandlerTest.php
deleted file mode 100644
index 77ce585..0000000
--- a/tests/Oracle/FilterHandler/BetweenHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Oracle\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Oracle\DatabaseTrait;
-
-class BetweenHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\BetweenHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Oracle/FilterHandler/EqualsHandlerTest.php b/tests/Oracle/FilterHandler/EqualsHandlerTest.php
deleted file mode 100644
index 50ac9d8..0000000
--- a/tests/Oracle/FilterHandler/EqualsHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Oracle\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Oracle\DatabaseTrait;
-
-class EqualsHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\EqualsHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Oracle/FilterHandler/EqualsNullHandlerTest.php b/tests/Oracle/FilterHandler/EqualsNullHandlerTest.php
deleted file mode 100644
index b796583..0000000
--- a/tests/Oracle/FilterHandler/EqualsNullHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Oracle\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Oracle\DatabaseTrait;
-
-class EqualsNullHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\EqualsNullHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Oracle/FilterHandler/GreaterThanHandlerTest.php b/tests/Oracle/FilterHandler/GreaterThanHandlerTest.php
deleted file mode 100644
index f93826e..0000000
--- a/tests/Oracle/FilterHandler/GreaterThanHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Oracle\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Oracle\DatabaseTrait;
-
-class GreaterThanHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\GreaterThanHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Oracle/FilterHandler/GreaterThanOrEqualHandlerTest.php b/tests/Oracle/FilterHandler/GreaterThanOrEqualHandlerTest.php
deleted file mode 100644
index f58b201..0000000
--- a/tests/Oracle/FilterHandler/GreaterThanOrEqualHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Oracle\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Oracle\DatabaseTrait;
-
-class GreaterThanOrEqualHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\GreaterThanOrEqualHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Oracle/FilterHandler/LessThanHandlerTest.php b/tests/Oracle/FilterHandler/LessThanHandlerTest.php
deleted file mode 100644
index a912c3b..0000000
--- a/tests/Oracle/FilterHandler/LessThanHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Oracle\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Oracle\DatabaseTrait;
-
-class LessThanHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\LessThanHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Oracle/FilterHandler/LessThanOrEqualHandlerTest.php b/tests/Oracle/FilterHandler/LessThanOrEqualHandlerTest.php
deleted file mode 100644
index 69b5fff..0000000
--- a/tests/Oracle/FilterHandler/LessThanOrEqualHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Oracle\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Oracle\DatabaseTrait;
-
-class LessThanOrEqualHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\LessThanOrEqualHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Oracle/FilterHandler/LikeHandlerTest.php b/tests/Oracle/FilterHandler/LikeHandlerTest.php
deleted file mode 100644
index 75d5dc7..0000000
--- a/tests/Oracle/FilterHandler/LikeHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Oracle\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Oracle\DatabaseTrait;
-
-class LikeHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\LikeHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Oracle/FilterHandler/NotHandlerTest.php b/tests/Oracle/FilterHandler/NotHandlerTest.php
deleted file mode 100644
index 3644254..0000000
--- a/tests/Oracle/FilterHandler/NotHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Oracle\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Oracle\DatabaseTrait;
-
-class NotHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\NotHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Oracle/ReaderWithHandler/ReaderWithAllTest.php b/tests/Oracle/ReaderWithHandler/ReaderWithAllTest.php
new file mode 100644
index 0000000..dd63068
--- /dev/null
+++ b/tests/Oracle/ReaderWithHandler/ReaderWithAllTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Oracle\ReaderWithHandler;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithAllTestCase;
+use Yiisoft\Data\Db\Tests\Oracle\DatabaseTrait;
+
+final class ReaderWithAllTest extends BaseReaderWithAllTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Oracle/ReaderWithHandler/ReaderWithAnyTest.php b/tests/Oracle/ReaderWithHandler/ReaderWithAnyTest.php
new file mode 100644
index 0000000..ac377fe
--- /dev/null
+++ b/tests/Oracle/ReaderWithHandler/ReaderWithAnyTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Oracle\ReaderWithHandler;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithAnyTestCase;
+use Yiisoft\Data\Db\Tests\Oracle\DatabaseTrait;
+
+final class ReaderWithAnyTest extends BaseReaderWithAnyTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Oracle/ReaderWithHandler/ReaderWithBetweenTest.php b/tests/Oracle/ReaderWithHandler/ReaderWithBetweenTest.php
new file mode 100644
index 0000000..2ea007e
--- /dev/null
+++ b/tests/Oracle/ReaderWithHandler/ReaderWithBetweenTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Oracle\ReaderWithHandler;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithBetweenTestCase;
+use Yiisoft\Data\Db\Tests\Oracle\DatabaseTrait;
+
+final class ReaderWithBetweenTest extends BaseReaderWithBetweenTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Oracle/ReaderWithHandler/ReaderWithEqualsNullTest.php b/tests/Oracle/ReaderWithHandler/ReaderWithEqualsNullTest.php
new file mode 100644
index 0000000..830d7cb
--- /dev/null
+++ b/tests/Oracle/ReaderWithHandler/ReaderWithEqualsNullTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Oracle\ReaderWithHandler;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithEqualsNullTestCase;
+use Yiisoft\Data\Db\Tests\Oracle\DatabaseTrait;
+
+final class ReaderWithEqualsNullTest extends BaseReaderWithEqualsNullTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Oracle/ReaderWithHandler/ReaderWithEqualsTest.php b/tests/Oracle/ReaderWithHandler/ReaderWithEqualsTest.php
new file mode 100644
index 0000000..9d8253c
--- /dev/null
+++ b/tests/Oracle/ReaderWithHandler/ReaderWithEqualsTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Oracle\ReaderWithHandler;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithEqualsTestCase;
+use Yiisoft\Data\Db\Tests\Oracle\DatabaseTrait;
+
+final class ReaderWithEqualsTest extends BaseReaderWithEqualsTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Oracle/ReaderWithHandler/ReaderWithGreaterThanOrEqualTest.php b/tests/Oracle/ReaderWithHandler/ReaderWithGreaterThanOrEqualTest.php
new file mode 100644
index 0000000..ebc16b5
--- /dev/null
+++ b/tests/Oracle/ReaderWithHandler/ReaderWithGreaterThanOrEqualTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Oracle\ReaderWithHandler;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithGreaterThanOrEqualTestCase;
+use Yiisoft\Data\Db\Tests\Oracle\DatabaseTrait;
+
+final class ReaderWithGreaterThanOrEqualTest extends BaseReaderWithGreaterThanOrEqualTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Oracle/ReaderWithHandler/ReaderWithGreaterThanTest.php b/tests/Oracle/ReaderWithHandler/ReaderWithGreaterThanTest.php
new file mode 100644
index 0000000..03c925d
--- /dev/null
+++ b/tests/Oracle/ReaderWithHandler/ReaderWithGreaterThanTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Oracle\ReaderWithHandler;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithGreaterThanTestCase;
+use Yiisoft\Data\Db\Tests\Oracle\DatabaseTrait;
+
+final class ReaderWithGreaterThanTest extends BaseReaderWithGreaterThanTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Oracle/ReaderWithHandler/ReaderWithInTest.php b/tests/Oracle/ReaderWithHandler/ReaderWithInTest.php
new file mode 100644
index 0000000..755ef60
--- /dev/null
+++ b/tests/Oracle/ReaderWithHandler/ReaderWithInTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Oracle\ReaderWithHandler;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithInTestCase;
+use Yiisoft\Data\Db\Tests\Oracle\DatabaseTrait;
+
+final class ReaderWithInTest extends BaseReaderWithInTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Oracle/ReaderWithHandler/ReaderWithLessThanOrEqualTest.php b/tests/Oracle/ReaderWithHandler/ReaderWithLessThanOrEqualTest.php
new file mode 100644
index 0000000..9f0d321
--- /dev/null
+++ b/tests/Oracle/ReaderWithHandler/ReaderWithLessThanOrEqualTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Oracle\ReaderWithHandler;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithLessThanOrEqualTestCase;
+use Yiisoft\Data\Db\Tests\Oracle\DatabaseTrait;
+
+final class ReaderWithLessThanOrEqualTest extends BaseReaderWithLessThanOrEqualTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Oracle/ReaderWithHandler/ReaderWithLessThanTest.php b/tests/Oracle/ReaderWithHandler/ReaderWithLessThanTest.php
new file mode 100644
index 0000000..056927e
--- /dev/null
+++ b/tests/Oracle/ReaderWithHandler/ReaderWithLessThanTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Oracle\ReaderWithHandler;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithLessThanTestCase;
+use Yiisoft\Data\Db\Tests\Oracle\DatabaseTrait;
+
+final class ReaderWithLessThanTest extends BaseReaderWithLessThanTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Oracle/ReaderWithHandler/ReaderWithLikeTest.php b/tests/Oracle/ReaderWithHandler/ReaderWithLikeTest.php
new file mode 100644
index 0000000..e6254ed
--- /dev/null
+++ b/tests/Oracle/ReaderWithHandler/ReaderWithLikeTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Oracle\ReaderWithHandler;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithLikeTestCase;
+use Yiisoft\Data\Db\Tests\Oracle\DatabaseTrait;
+
+final class ReaderWithLikeTest extends BaseReaderWithLikeTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Oracle/ReaderWithHandler/ReaderWithNotTest.php b/tests/Oracle/ReaderWithHandler/ReaderWithNotTest.php
new file mode 100644
index 0000000..fbf64bb
--- /dev/null
+++ b/tests/Oracle/ReaderWithHandler/ReaderWithNotTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Oracle\ReaderWithHandler;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithNotTestCase;
+use Yiisoft\Data\Db\Tests\Oracle\DatabaseTrait;
+
+final class ReaderWithNotTest extends BaseReaderWithNotTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Pgsql/FilterHandler/AllHandlerTest.php b/tests/Pgsql/FilterHandler/AllHandlerTest.php
deleted file mode 100644
index de11d52..0000000
--- a/tests/Pgsql/FilterHandler/AllHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Pgsql\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Pgsql\DatabaseTrait;
-
-class AllHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\AllHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Pgsql/FilterHandler/AnyHandlerTest.php b/tests/Pgsql/FilterHandler/AnyHandlerTest.php
deleted file mode 100644
index d0776c7..0000000
--- a/tests/Pgsql/FilterHandler/AnyHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Pgsql\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Pgsql\DatabaseTrait;
-
-class AnyHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\AnyHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Pgsql/FilterHandler/BetweenHandlerTest.php b/tests/Pgsql/FilterHandler/BetweenHandlerTest.php
deleted file mode 100644
index 13ab3bc..0000000
--- a/tests/Pgsql/FilterHandler/BetweenHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Pgsql\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Pgsql\DatabaseTrait;
-
-class BetweenHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\BetweenHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Pgsql/FilterHandler/EqualsHandlerTest.php b/tests/Pgsql/FilterHandler/EqualsHandlerTest.php
deleted file mode 100644
index dc7bac3..0000000
--- a/tests/Pgsql/FilterHandler/EqualsHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Pgsql\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Pgsql\DatabaseTrait;
-
-class EqualsHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\EqualsHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Pgsql/FilterHandler/EqualsNullHandlerTest.php b/tests/Pgsql/FilterHandler/EqualsNullHandlerTest.php
deleted file mode 100644
index 6a7de47..0000000
--- a/tests/Pgsql/FilterHandler/EqualsNullHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Pgsql\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Pgsql\DatabaseTrait;
-
-class EqualsNullHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\EqualsNullHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Pgsql/FilterHandler/GreaterThanHandlerTest.php b/tests/Pgsql/FilterHandler/GreaterThanHandlerTest.php
deleted file mode 100644
index 9397b6d..0000000
--- a/tests/Pgsql/FilterHandler/GreaterThanHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Pgsql\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Pgsql\DatabaseTrait;
-
-class GreaterThanHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\GreaterThanHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Pgsql/FilterHandler/GreaterThanOrEqualHandlerTest.php b/tests/Pgsql/FilterHandler/GreaterThanOrEqualHandlerTest.php
deleted file mode 100644
index 89a8efa..0000000
--- a/tests/Pgsql/FilterHandler/GreaterThanOrEqualHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Pgsql\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Pgsql\DatabaseTrait;
-
-class GreaterThanOrEqualHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\GreaterThanOrEqualHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Pgsql/FilterHandler/LessThanHandlerTest.php b/tests/Pgsql/FilterHandler/LessThanHandlerTest.php
deleted file mode 100644
index 0a84c42..0000000
--- a/tests/Pgsql/FilterHandler/LessThanHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Pgsql\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Pgsql\DatabaseTrait;
-
-class LessThanHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\LessThanHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Pgsql/FilterHandler/LessThanOrEqualHandlerTest.php b/tests/Pgsql/FilterHandler/LessThanOrEqualHandlerTest.php
deleted file mode 100644
index ed4df48..0000000
--- a/tests/Pgsql/FilterHandler/LessThanOrEqualHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Pgsql\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Pgsql\DatabaseTrait;
-
-class LessThanOrEqualHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\LessThanOrEqualHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Pgsql/FilterHandler/LikeHandlerTest.php b/tests/Pgsql/FilterHandler/LikeHandlerTest.php
deleted file mode 100644
index d907016..0000000
--- a/tests/Pgsql/FilterHandler/LikeHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Pgsql\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Pgsql\DatabaseTrait;
-
-class LikeHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\LikeHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Pgsql/FilterHandler/NotHandlerTest.php b/tests/Pgsql/FilterHandler/NotHandlerTest.php
deleted file mode 100644
index 2e7fdc6..0000000
--- a/tests/Pgsql/FilterHandler/NotHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Pgsql\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Pgsql\DatabaseTrait;
-
-class NotHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\NotHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Pgsql/ReaderWithFilter/ReaderWithAllTest.php b/tests/Pgsql/ReaderWithFilter/ReaderWithAllTest.php
new file mode 100644
index 0000000..46176d7
--- /dev/null
+++ b/tests/Pgsql/ReaderWithFilter/ReaderWithAllTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Pgsql\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithAllTestCase;
+use Yiisoft\Data\Db\Tests\Pgsql\DatabaseTrait;
+
+final class ReaderWithAllTest extends BaseReaderWithAllTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Pgsql/ReaderWithFilter/ReaderWithAnyTest.php b/tests/Pgsql/ReaderWithFilter/ReaderWithAnyTest.php
new file mode 100644
index 0000000..5849321
--- /dev/null
+++ b/tests/Pgsql/ReaderWithFilter/ReaderWithAnyTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Pgsql\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithAnyTestCase;
+use Yiisoft\Data\Db\Tests\Pgsql\DatabaseTrait;
+
+final class ReaderWithAnyTest extends BaseReaderWithAnyTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Pgsql/ReaderWithFilter/ReaderWithBetweenTest.php b/tests/Pgsql/ReaderWithFilter/ReaderWithBetweenTest.php
new file mode 100644
index 0000000..0b1d1dd
--- /dev/null
+++ b/tests/Pgsql/ReaderWithFilter/ReaderWithBetweenTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Pgsql\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithBetweenTestCase;
+use Yiisoft\Data\Db\Tests\Pgsql\DatabaseTrait;
+
+final class ReaderWithBetweenTest extends BaseReaderWithBetweenTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Pgsql/ReaderWithFilter/ReaderWithEqualsNullTest.php b/tests/Pgsql/ReaderWithFilter/ReaderWithEqualsNullTest.php
new file mode 100644
index 0000000..ad0e749
--- /dev/null
+++ b/tests/Pgsql/ReaderWithFilter/ReaderWithEqualsNullTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Pgsql\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithEqualsNullTestCase;
+use Yiisoft\Data\Db\Tests\Pgsql\DatabaseTrait;
+
+final class ReaderWithEqualsNullTest extends BaseReaderWithEqualsNullTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Pgsql/ReaderWithFilter/ReaderWithEqualsTest.php b/tests/Pgsql/ReaderWithFilter/ReaderWithEqualsTest.php
new file mode 100644
index 0000000..00e4b35
--- /dev/null
+++ b/tests/Pgsql/ReaderWithFilter/ReaderWithEqualsTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Pgsql\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithEqualsTestCase;
+use Yiisoft\Data\Db\Tests\Pgsql\DatabaseTrait;
+
+final class ReaderWithEqualsTest extends BaseReaderWithEqualsTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Pgsql/ReaderWithFilter/ReaderWithGreaterThanOrEqualTest.php b/tests/Pgsql/ReaderWithFilter/ReaderWithGreaterThanOrEqualTest.php
new file mode 100644
index 0000000..66fc12e
--- /dev/null
+++ b/tests/Pgsql/ReaderWithFilter/ReaderWithGreaterThanOrEqualTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Pgsql\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithGreaterThanOrEqualTestCase;
+use Yiisoft\Data\Db\Tests\Pgsql\DatabaseTrait;
+
+final class ReaderWithGreaterThanOrEqualTest extends BaseReaderWithGreaterThanOrEqualTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Pgsql/ReaderWithFilter/ReaderWithGreaterThanTest.php b/tests/Pgsql/ReaderWithFilter/ReaderWithGreaterThanTest.php
new file mode 100644
index 0000000..da55e2c
--- /dev/null
+++ b/tests/Pgsql/ReaderWithFilter/ReaderWithGreaterThanTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Pgsql\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithGreaterThanTestCase;
+use Yiisoft\Data\Db\Tests\Pgsql\DatabaseTrait;
+
+final class ReaderWithGreaterThanTest extends BaseReaderWithGreaterThanTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Pgsql/ReaderWithFilter/ReaderWithInTest.php b/tests/Pgsql/ReaderWithFilter/ReaderWithInTest.php
new file mode 100644
index 0000000..b7d5b8e
--- /dev/null
+++ b/tests/Pgsql/ReaderWithFilter/ReaderWithInTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Pgsql\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithInTestCase;
+use Yiisoft\Data\Db\Tests\Pgsql\DatabaseTrait;
+
+final class ReaderWithInTest extends BaseReaderWithInTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Pgsql/ReaderWithFilter/ReaderWithLessThanOrEqualTest.php b/tests/Pgsql/ReaderWithFilter/ReaderWithLessThanOrEqualTest.php
new file mode 100644
index 0000000..1ea1fe7
--- /dev/null
+++ b/tests/Pgsql/ReaderWithFilter/ReaderWithLessThanOrEqualTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Pgsql\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithLessThanOrEqualTestCase;
+use Yiisoft\Data\Db\Tests\Pgsql\DatabaseTrait;
+
+final class ReaderWithLessThanOrEqualTest extends BaseReaderWithLessThanOrEqualTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Pgsql/ReaderWithFilter/ReaderWithLessThanTest.php b/tests/Pgsql/ReaderWithFilter/ReaderWithLessThanTest.php
new file mode 100644
index 0000000..332605e
--- /dev/null
+++ b/tests/Pgsql/ReaderWithFilter/ReaderWithLessThanTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Pgsql\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithLessThanTestCase;
+use Yiisoft\Data\Db\Tests\Pgsql\DatabaseTrait;
+
+final class ReaderWithLessThanTest extends BaseReaderWithLessThanTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Pgsql/ReaderWithFilter/ReaderWithLikeTest.php b/tests/Pgsql/ReaderWithFilter/ReaderWithLikeTest.php
new file mode 100644
index 0000000..9f249dd
--- /dev/null
+++ b/tests/Pgsql/ReaderWithFilter/ReaderWithLikeTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Pgsql\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithLikeTestCase;
+use Yiisoft\Data\Db\Tests\Pgsql\DatabaseTrait;
+
+final class ReaderWithLikeTest extends BaseReaderWithLikeTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Pgsql/ReaderWithFilter/ReaderWithNotTest.php b/tests/Pgsql/ReaderWithFilter/ReaderWithNotTest.php
new file mode 100644
index 0000000..0e12b82
--- /dev/null
+++ b/tests/Pgsql/ReaderWithFilter/ReaderWithNotTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Pgsql\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithNotTestCase;
+use Yiisoft\Data\Db\Tests\Pgsql\DatabaseTrait;
+
+final class ReaderWithNotTest extends BaseReaderWithNotTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Sqlite/FilterHandler/AllHandlerTest.php b/tests/Sqlite/FilterHandler/AllHandlerTest.php
deleted file mode 100644
index 120bc6f..0000000
--- a/tests/Sqlite/FilterHandler/AllHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Data\Db\Tests\Sqlite\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Sqlite\DatabaseTrait;
-
-class AllHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\AllHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Sqlite/FilterHandler/AnyHandlerTest.php b/tests/Sqlite/FilterHandler/AnyHandlerTest.php
deleted file mode 100644
index 7f5f00e..0000000
--- a/tests/Sqlite/FilterHandler/AnyHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Sqlite\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Sqlite\DatabaseTrait;
-
-class AnyHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\AnyHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Sqlite/FilterHandler/BetweenHandlerTest.php b/tests/Sqlite/FilterHandler/BetweenHandlerTest.php
deleted file mode 100644
index c172db9..0000000
--- a/tests/Sqlite/FilterHandler/BetweenHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Sqlite\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Sqlite\DatabaseTrait;
-
-class BetweenHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\BetweenHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Sqlite/FilterHandler/EqualsHandlerTest.php b/tests/Sqlite/FilterHandler/EqualsHandlerTest.php
deleted file mode 100644
index 195cb15..0000000
--- a/tests/Sqlite/FilterHandler/EqualsHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Sqlite\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Sqlite\DatabaseTrait;
-
-class EqualsHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\EqualsHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Sqlite/FilterHandler/EqualsNullHandlerTest.php b/tests/Sqlite/FilterHandler/EqualsNullHandlerTest.php
deleted file mode 100644
index aa3a1d6..0000000
--- a/tests/Sqlite/FilterHandler/EqualsNullHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Sqlite\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Sqlite\DatabaseTrait;
-
-class EqualsNullHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\EqualsNullHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Sqlite/FilterHandler/GreaterThanHandlerTest.php b/tests/Sqlite/FilterHandler/GreaterThanHandlerTest.php
deleted file mode 100644
index 3d5838d..0000000
--- a/tests/Sqlite/FilterHandler/GreaterThanHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Sqlite\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Sqlite\DatabaseTrait;
-
-class GreaterThanHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\GreaterThanHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Sqlite/FilterHandler/GreaterThanOrEqualHandlerTest.php b/tests/Sqlite/FilterHandler/GreaterThanOrEqualHandlerTest.php
deleted file mode 100644
index 933e6a2..0000000
--- a/tests/Sqlite/FilterHandler/GreaterThanOrEqualHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Sqlite\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Sqlite\DatabaseTrait;
-
-class GreaterThanOrEqualHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\GreaterThanOrEqualHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Sqlite/FilterHandler/LessThanHandlerTest.php b/tests/Sqlite/FilterHandler/LessThanHandlerTest.php
deleted file mode 100644
index b64510c..0000000
--- a/tests/Sqlite/FilterHandler/LessThanHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Sqlite\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Sqlite\DatabaseTrait;
-
-class LessThanHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\LessThanHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Sqlite/FilterHandler/LessThanOrEqualHandlerTest.php b/tests/Sqlite/FilterHandler/LessThanOrEqualHandlerTest.php
deleted file mode 100644
index e680d9e..0000000
--- a/tests/Sqlite/FilterHandler/LessThanOrEqualHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Sqlite\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Sqlite\DatabaseTrait;
-
-class LessThanOrEqualHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\LessThanOrEqualHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Sqlite/FilterHandler/LikeHandlerTest.php b/tests/Sqlite/FilterHandler/LikeHandlerTest.php
deleted file mode 100644
index 7d87b08..0000000
--- a/tests/Sqlite/FilterHandler/LikeHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Sqlite\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Sqlite\DatabaseTrait;
-
-class LikeHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\LikeHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Sqlite/FilterHandler/NotHandlerTest.php b/tests/Sqlite/FilterHandler/NotHandlerTest.php
deleted file mode 100644
index 5010afc..0000000
--- a/tests/Sqlite/FilterHandler/NotHandlerTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Sqlite\FilterHandler;
-
-use Yiisoft\Data\Db\Tests\Sqlite\DatabaseTrait;
-
-class NotHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\NotHandlerTest
-{
-    use DatabaseTrait;
-}
diff --git a/tests/Sqlite/ReaderWithFilter/ReaderWithAllTest.php b/tests/Sqlite/ReaderWithFilter/ReaderWithAllTest.php
new file mode 100644
index 0000000..c091599
--- /dev/null
+++ b/tests/Sqlite/ReaderWithFilter/ReaderWithAllTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Sqlite\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithAllTestCase;
+use Yiisoft\Data\Db\Tests\Sqlite\DatabaseTrait;
+
+final class ReaderWithAllTest extends BaseReaderWithAllTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Sqlite/ReaderWithFilter/ReaderWithAnyTest.php b/tests/Sqlite/ReaderWithFilter/ReaderWithAnyTest.php
new file mode 100644
index 0000000..4c52b74
--- /dev/null
+++ b/tests/Sqlite/ReaderWithFilter/ReaderWithAnyTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Sqlite\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithAnyTestCase;
+use Yiisoft\Data\Db\Tests\Sqlite\DatabaseTrait;
+
+final class ReaderWithAnyTest extends BaseReaderWithAnyTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Sqlite/ReaderWithFilter/ReaderWithBetweenTest.php b/tests/Sqlite/ReaderWithFilter/ReaderWithBetweenTest.php
new file mode 100644
index 0000000..be084cb
--- /dev/null
+++ b/tests/Sqlite/ReaderWithFilter/ReaderWithBetweenTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Sqlite\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithBetweenTestCase;
+use Yiisoft\Data\Db\Tests\Sqlite\DatabaseTrait;
+
+final class ReaderWithBetweenTest extends BaseReaderWithBetweenTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Sqlite/ReaderWithFilter/ReaderWithEqualsNullTest.php b/tests/Sqlite/ReaderWithFilter/ReaderWithEqualsNullTest.php
new file mode 100644
index 0000000..f1ba058
--- /dev/null
+++ b/tests/Sqlite/ReaderWithFilter/ReaderWithEqualsNullTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Sqlite\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithEqualsNullTestCase;
+use Yiisoft\Data\Db\Tests\Sqlite\DatabaseTrait;
+
+final class ReaderWithEqualsNullTest extends BaseReaderWithEqualsNullTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Sqlite/ReaderWithFilter/ReaderWithEqualsTest.php b/tests/Sqlite/ReaderWithFilter/ReaderWithEqualsTest.php
new file mode 100644
index 0000000..8bcb24a
--- /dev/null
+++ b/tests/Sqlite/ReaderWithFilter/ReaderWithEqualsTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Sqlite\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithEqualsTestCase;
+use Yiisoft\Data\Db\Tests\Sqlite\DatabaseTrait;
+
+final class ReaderWithEqualsTest extends BaseReaderWithEqualsTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Sqlite/ReaderWithFilter/ReaderWithGreaterThanOrEqualTest.php b/tests/Sqlite/ReaderWithFilter/ReaderWithGreaterThanOrEqualTest.php
new file mode 100644
index 0000000..845e601
--- /dev/null
+++ b/tests/Sqlite/ReaderWithFilter/ReaderWithGreaterThanOrEqualTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Sqlite\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithGreaterThanOrEqualTestCase;
+use Yiisoft\Data\Db\Tests\Sqlite\DatabaseTrait;
+
+final class ReaderWithGreaterThanOrEqualTest extends BaseReaderWithGreaterThanOrEqualTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Sqlite/ReaderWithFilter/ReaderWithGreaterThanTest.php b/tests/Sqlite/ReaderWithFilter/ReaderWithGreaterThanTest.php
new file mode 100644
index 0000000..516c640
--- /dev/null
+++ b/tests/Sqlite/ReaderWithFilter/ReaderWithGreaterThanTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Sqlite\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithGreaterThanTestCase;
+use Yiisoft\Data\Db\Tests\Sqlite\DatabaseTrait;
+
+final class ReaderWithGreaterThanTest extends BaseReaderWithGreaterThanTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Sqlite/ReaderWithFilter/ReaderWithInTestCase.php b/tests/Sqlite/ReaderWithFilter/ReaderWithInTestCase.php
new file mode 100644
index 0000000..b9a3dc1
--- /dev/null
+++ b/tests/Sqlite/ReaderWithFilter/ReaderWithInTestCase.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Sqlite\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithInTestCase;
+use Yiisoft\Data\Db\Tests\Sqlite\DatabaseTrait;
+
+final class ReaderWithInTestCase extends BaseReaderWithInTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Sqlite/ReaderWithFilter/ReaderWithLessThanOrEqualTest.php b/tests/Sqlite/ReaderWithFilter/ReaderWithLessThanOrEqualTest.php
new file mode 100644
index 0000000..21278bc
--- /dev/null
+++ b/tests/Sqlite/ReaderWithFilter/ReaderWithLessThanOrEqualTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Sqlite\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithLessThanOrEqualTestCase;
+use Yiisoft\Data\Db\Tests\Sqlite\DatabaseTrait;
+
+final class ReaderWithLessThanOrEqualTest extends BaseReaderWithLessThanOrEqualTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Sqlite/ReaderWithFilter/ReaderWithLessThanTest.php b/tests/Sqlite/ReaderWithFilter/ReaderWithLessThanTest.php
new file mode 100644
index 0000000..23bb5dd
--- /dev/null
+++ b/tests/Sqlite/ReaderWithFilter/ReaderWithLessThanTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Sqlite\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithLessThanTestCase;
+use Yiisoft\Data\Db\Tests\Sqlite\DatabaseTrait;
+
+final class ReaderWithLessThanTest extends BaseReaderWithLessThanTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Sqlite/ReaderWithFilter/ReaderWithLikeTest.php b/tests/Sqlite/ReaderWithFilter/ReaderWithLikeTest.php
new file mode 100644
index 0000000..22bfbc5
--- /dev/null
+++ b/tests/Sqlite/ReaderWithFilter/ReaderWithLikeTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Sqlite\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithLikeTestCase;
+use Yiisoft\Data\Db\Tests\Sqlite\DatabaseTrait;
+
+final class ReaderWithLikeTest extends BaseReaderWithLikeTestCase
+{
+    use DatabaseTrait;
+}
diff --git a/tests/Sqlite/ReaderWithFilter/ReaderWithNotTest.php b/tests/Sqlite/ReaderWithFilter/ReaderWithNotTest.php
new file mode 100644
index 0000000..7adfbe3
--- /dev/null
+++ b/tests/Sqlite/ReaderWithFilter/ReaderWithNotTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Sqlite\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter\BaseReaderWithNotTestCase;
+use Yiisoft\Data\Db\Tests\Sqlite\DatabaseTrait;
+
+final class ReaderWithNotTest extends BaseReaderWithNotTestCase
+{
+    use DatabaseTrait;
+}