diff --git a/packages/stream_chat_flutter_core/test/channel_list_core_test.dart b/packages/stream_chat_flutter_core/test/channel_list_core_test.dart
index 8407be67..88711647 100644
--- a/packages/stream_chat_flutter_core/test/channel_list_core_test.dart
+++ b/packages/stream_chat_flutter_core/test/channel_list_core_test.dart
@@ -476,7 +476,7 @@ void main() {
       _stateSetter?.call(() => limit = 6);
 
       final updatedChannels = _generateChannels(mockClient, count: limit);
-      final updatedPagination = pagination.copyWith(limit: limit);
+      final updatedPagination = PaginationParams(limit: limit);
       when(() => mockClient.queryChannels(
             filter: any(named: 'filter'),
             sort: any(named: 'sort'),
diff --git a/packages/stream_chat_flutter_core/test/message_search_list_core_test.dart b/packages/stream_chat_flutter_core/test/message_search_list_core_test.dart
index 475c6c23..d699faa0 100644
--- a/packages/stream_chat_flutter_core/test/message_search_list_core_test.dart
+++ b/packages/stream_chat_flutter_core/test/message_search_list_core_test.dart
@@ -518,7 +518,7 @@ void main() {
       _stateSetter?.call(() => limit = 6);
 
       final updatedMessageResponseList = _generateMessages(count: limit);
-      final updatedPagination = pagination.copyWith(limit: limit);
+      final updatedPagination = PaginationParams(limit: limit);
       when(() => mockClient.search(
             testFilter,
             query: any(named: 'query'),
diff --git a/packages/stream_chat_flutter_core/test/stream_channel_test.dart b/packages/stream_chat_flutter_core/test/stream_channel_test.dart
index 08763f9d..de536cb5 100644
--- a/packages/stream_chat_flutter_core/test/stream_channel_test.dart
+++ b/packages/stream_chat_flutter_core/test/stream_channel_test.dart
@@ -189,9 +189,7 @@ void main() {
             membersPagination: any(named: 'membersPagination'),
             watchersPagination: any(named: 'watchersPagination'),
             preferOffline: any(named: 'preferOffline'),
-          )).called(
-        2, // Fetching After messages + Fetching Before messages,
-      );
+          )).called(1);
     },
   );
 
@@ -214,14 +212,10 @@ void main() {
             child: const Offstage(key: childKey),
           );
 
-      final beforePagination = PaginationParams(
-        lessThan: initialMessageId,
-        limit: 20,
-      );
-
-      final afterPagination = PaginationParams(
-        greaterThanOrEqual: initialMessageId,
-        limit: 20,
+      final paginationParams = PaginationParams(
+        idAround: initialMessageId,
+        after: 20,
+        before: 20,
       );
 
       when(() => mockChannel.initialized).thenAnswer((_) async => true);
@@ -232,17 +226,7 @@ void main() {
             state: any(named: 'state'),
             watch: any(named: 'watch'),
             presence: any(named: 'presence'),
-            messagesPagination: beforePagination,
-            membersPagination: any(named: 'membersPagination'),
-            watchersPagination: any(named: 'watchersPagination'),
-            preferOffline: any(named: 'preferOffline'),
-          )).thenAnswer((_) async => ChannelState(messages: messages));
-
-      when(() => mockChannel.query(
-            state: any(named: 'state'),
-            watch: any(named: 'watch'),
-            presence: any(named: 'presence'),
-            messagesPagination: afterPagination,
+            messagesPagination: paginationParams,
             membersPagination: any(named: 'membersPagination'),
             watchersPagination: any(named: 'watchersPagination'),
             preferOffline: any(named: 'preferOffline'),
@@ -267,17 +251,7 @@ void main() {
             state: any(named: 'state'),
             watch: any(named: 'watch'),
             presence: any(named: 'presence'),
-            messagesPagination: beforePagination,
-            membersPagination: any(named: 'membersPagination'),
-            watchersPagination: any(named: 'watchersPagination'),
-            preferOffline: any(named: 'preferOffline'),
-          )).called(1);
-
-      verify(() => mockChannel.query(
-            state: any(named: 'state'),
-            watch: any(named: 'watch'),
-            presence: any(named: 'presence'),
-            messagesPagination: afterPagination,
+            messagesPagination: paginationParams,
             membersPagination: any(named: 'membersPagination'),
             watchersPagination: any(named: 'watchersPagination'),
             preferOffline: any(named: 'preferOffline'),
@@ -285,29 +259,15 @@ void main() {
 
       _stateSetter?.call(() => initialMessageId = 'testInitialMessageId2');
 
-      final updatedBeforePagination = beforePagination.copyWith(
-        lessThan: initialMessageId,
-      );
-
-      final updatedAfterPagination = afterPagination.copyWith(
-        greaterThanOrEqual: initialMessageId,
+      final updatedPaginationParams = paginationParams.copyWith(
+        idAround: initialMessageId,
       );
 
       when(() => mockChannel.query(
             state: any(named: 'state'),
             watch: any(named: 'watch'),
             presence: any(named: 'presence'),
-            messagesPagination: updatedBeforePagination,
-            membersPagination: any(named: 'membersPagination'),
-            watchersPagination: any(named: 'watchersPagination'),
-            preferOffline: any(named: 'preferOffline'),
-          )).thenAnswer((_) async => ChannelState(messages: messages));
-
-      when(() => mockChannel.query(
-            state: any(named: 'state'),
-            watch: any(named: 'watch'),
-            presence: any(named: 'presence'),
-            messagesPagination: updatedAfterPagination,
+            messagesPagination: updatedPaginationParams,
             membersPagination: any(named: 'membersPagination'),
             watchersPagination: any(named: 'watchersPagination'),
             preferOffline: any(named: 'preferOffline'),
@@ -319,17 +279,7 @@ void main() {
             state: any(named: 'state'),
             watch: any(named: 'watch'),
             presence: any(named: 'presence'),
-            messagesPagination: updatedBeforePagination,
-            membersPagination: any(named: 'membersPagination'),
-            watchersPagination: any(named: 'watchersPagination'),
-            preferOffline: any(named: 'preferOffline'),
-          )).called(1);
-
-      verify(() => mockChannel.query(
-            state: any(named: 'state'),
-            watch: any(named: 'watch'),
-            presence: any(named: 'presence'),
-            messagesPagination: updatedAfterPagination,
+            messagesPagination: updatedPaginationParams,
             membersPagination: any(named: 'membersPagination'),
             watchersPagination: any(named: 'watchersPagination'),
             preferOffline: any(named: 'preferOffline'),
diff --git a/packages/stream_chat_flutter_core/test/user_list_core_test.dart b/packages/stream_chat_flutter_core/test/user_list_core_test.dart
index c916ce17..27f4cbe8 100644
--- a/packages/stream_chat_flutter_core/test/user_list_core_test.dart
+++ b/packages/stream_chat_flutter_core/test/user_list_core_test.dart
@@ -496,7 +496,7 @@ void main() {
       _stateSetter?.call(() => limit = 6);
 
       final updatedUsers = _generateUsers(count: limit);
-      final updatedPagination = pagination.copyWith(limit: limit);
+      final updatedPagination = PaginationParams(limit: limit);
       when(() => mockClient.queryUsers(
                 filter: any(named: 'filter'),
                 sort: any(named: 'sort'),