diff --git a/packages/stream_chat/lib/src/core/api/channel_api.dart b/packages/stream_chat/lib/src/core/api/channel_api.dart
index 7660c125..68f6c4f8 100644
--- a/packages/stream_chat/lib/src/core/api/channel_api.dart
+++ b/packages/stream_chat/lib/src/core/api/channel_api.dart
@@ -76,7 +76,7 @@ class ChannelApi {
 
           // pagination
           ...paginationParams.toJson()
-        })
+        }),
       },
     );
     return QueryChannelsResponse.fromJson(response.data);
diff --git a/packages/stream_chat/test/src/core/api/channel_api_test.dart b/packages/stream_chat/test/src/core/api/channel_api_test.dart
index 2152cee0..ab530ff1 100644
--- a/packages/stream_chat/test/src/core/api/channel_api_test.dart
+++ b/packages/stream_chat/test/src/core/api/channel_api_test.dart
@@ -1,3 +1,5 @@
+import 'dart:convert';
+
 import 'package:dio/dio.dart';
 import 'package:mocktail/mocktail.dart';
 import 'package:stream_chat/src/core/api/channel_api.dart';
@@ -76,11 +78,24 @@ void main() {
     const path = '$channelPath/query';
 
     final channelState = _generateChannelState(channelId, channelType);
-    when(() => client.post(path, data: any(named: 'data')))
-        .thenAnswer((_) async => successResponse(
-              path,
-              data: channelState.toJson(),
-            ));
+
+    final data = {
+      'state': true,
+      'watch': false,
+      'presence': false,
+      'data': channelData,
+      'messages': messagePagination,
+      'members': membersPagination,
+      'watchers': watchersPagination,
+    };
+
+    when(() => client.post(
+          path,
+          data: data,
+        )).thenAnswer((_) async => successResponse(
+          path,
+          data: channelState.toJson(),
+        ));
 
     final res = await channelApi.queryChannel(
       channelType,
@@ -115,13 +130,34 @@ void main() {
     const path = '/channels';
 
     final channelState = _generateChannelState(channelId, channelType);
-    when(() => client.get(path, queryParameters: any(named: 'queryParameters')))
-        .thenAnswer((_) async => successResponse(
-              path,
-              data: {
-                'channels': [channelState.toJson()]
-              },
-            ));
+
+    final payload = jsonEncode({
+      // default options
+      'state': true,
+      'watch': true,
+      'presence': false,
+
+      // passed options
+      'sort': sort,
+      'filter_conditions': filter,
+      'member_limit': memberLimit,
+      'message_limit': messageLimit,
+
+      // pagination
+      ...const PaginationParams().toJson()
+    });
+
+    when(() => client.get(
+          path,
+          queryParameters: {
+            'payload': payload,
+          },
+        )).thenAnswer((_) async => successResponse(
+          path,
+          data: {
+            'channels': [channelState.toJson()]
+          },
+        ));
 
     final res = await channelApi.queryChannels(
       filter: filter,
@@ -166,11 +202,18 @@ void main() {
       extraData: data,
     );
 
-    when(() => client.post(path, data: any(named: 'data')))
-        .thenAnswer((_) async => successResponse(path, data: {
-              'channel': channelModel.toJson(),
-              'message': message.toJson(),
-            }));
+    when(() => client.post(
+          path,
+          data: any(
+            named: 'data',
+            that: wrapMatcher((Map v) =>
+                containsPair('data', data).matches(v, {}) &&
+                contains('message').matches(v, {})),
+          ),
+        )).thenAnswer((_) async => successResponse(path, data: {
+          'channel': channelModel.toJson(),
+          'message': message.toJson(),
+        }));
 
     final res = await channelApi.updateChannel(
       channelId,
@@ -235,11 +278,16 @@ void main() {
 
     final path = _getChannelUrl(channelId, channelType);
 
-    when(() => client.post(path, data: any(named: 'data')))
-        .thenAnswer((_) async => successResponse(path, data: {
-              'channel': channelModel.toJson(),
-              'message': message.toJson(),
-            }));
+    when(() => client.post(
+          path,
+          data: {
+            'accept_invite': true,
+            'message': message,
+          },
+        )).thenAnswer((_) async => successResponse(path, data: {
+          'channel': channelModel.toJson(),
+          'message': message.toJson(),
+        }));
 
     final res = await channelApi.acceptChannelInvite(
       channelId,
@@ -264,11 +312,16 @@ void main() {
 
     final path = _getChannelUrl(channelId, channelType);
 
-    when(() => client.post(path, data: any(named: 'data')))
-        .thenAnswer((_) async => successResponse(path, data: {
-              'channel': channelModel.toJson(),
-              'message': message.toJson(),
-            }));
+    when(() => client.post(
+          path,
+          data: {
+            'reject_invite': true,
+            'message': message,
+          },
+        )).thenAnswer((_) async => successResponse(path, data: {
+          'channel': channelModel.toJson(),
+          'message': message.toJson(),
+        }));
 
     final res = await channelApi.rejectChannelInvite(
       channelId,
@@ -293,11 +346,16 @@ void main() {
 
     final path = _getChannelUrl(channelId, channelType);
 
-    when(() => client.post(path, data: any(named: 'data')))
-        .thenAnswer((_) async => successResponse(path, data: {
-              'channel': channelModel.toJson(),
-              'message': message.toJson(),
-            }));
+    when(() => client.post(
+          path,
+          data: {
+            'invites': memberIds,
+            'message': message,
+          },
+        )).thenAnswer((_) async => successResponse(path, data: {
+          'channel': channelModel.toJson(),
+          'message': message.toJson(),
+        }));
 
     final res = await channelApi.inviteChannelMembers(
       channelId,
@@ -323,11 +381,16 @@ void main() {
 
     final path = _getChannelUrl(channelId, channelType);
 
-    when(() => client.post(path, data: any(named: 'data')))
-        .thenAnswer((_) async => successResponse(path, data: {
-              'channel': channelModel.toJson(),
-              'message': message.toJson(),
-            }));
+    when(() => client.post(
+          path,
+          data: {
+            'add_members': memberIds,
+            'message': message,
+          },
+        )).thenAnswer((_) async => successResponse(path, data: {
+          'channel': channelModel.toJson(),
+          'message': message.toJson(),
+        }));
 
     final res = await channelApi.addMembers(
       channelId,
@@ -353,11 +416,16 @@ void main() {
 
     final path = _getChannelUrl(channelId, channelType);
 
-    when(() => client.post(path, data: any(named: 'data')))
-        .thenAnswer((_) async => successResponse(path, data: {
-              'channel': channelModel.toJson(),
-              'message': message.toJson(),
-            }));
+    when(() => client.post(
+          path,
+          data: {
+            'remove_members': memberIds,
+            'message': message,
+          },
+        )).thenAnswer((_) async => successResponse(path, data: {
+          'channel': channelModel.toJson(),
+          'message': message.toJson(),
+        }));
 
     final res = await channelApi.removeMembers(
       channelId,
@@ -381,7 +449,7 @@ void main() {
 
     final path = '${_getChannelUrl(channelId, channelType)}/event';
 
-    when(() => client.post(path, data: any(named: 'data'))).thenAnswer(
+    when(() => client.post(path, data: {'event': event})).thenAnswer(
         (_) async => successResponse(path, data: <String, dynamic>{}));
 
     final res = await channelApi.sendEvent(channelId, channelType, event);
@@ -432,8 +500,14 @@ void main() {
 
     final path = '${_getChannelUrl(channelId, channelType)}/hide';
 
-    when(() => client.post(path, data: any(named: 'data'))).thenAnswer(
-        (_) async => successResponse(path, data: <String, dynamic>{}));
+    when(
+      () => client.post(
+        path,
+        data: {
+          'clear_history': false,
+        },
+      ),
+    ).thenAnswer((_) async => successResponse(path, data: <String, dynamic>{}));
 
     final res = await channelApi.hideChannel(channelId, channelType);
 
@@ -443,6 +517,33 @@ void main() {
     verifyNoMoreInteractions(client);
   });
 
+  test('hideChannel with clear_history: true', () async {
+    const channelId = 'test-channel-id';
+    const channelType = 'test-channel-type';
+
+    final path = '${_getChannelUrl(channelId, channelType)}/hide';
+
+    when(
+      () => client.post(
+        path,
+        data: {
+          'clear_history': true,
+        },
+      ),
+    ).thenAnswer((_) async => successResponse(path, data: <String, dynamic>{}));
+
+    final res = await channelApi.hideChannel(
+      channelId,
+      channelType,
+      clearHistory: true,
+    );
+
+    expect(res, isNotNull);
+
+    verify(() => client.post(path, data: any(named: 'data'))).called(1);
+    verifyNoMoreInteractions(client);
+  });
+
   test('showChannel', () async {
     const channelId = 'test-channel-id';
     const channelType = 'test-channel-type';
@@ -467,8 +568,14 @@ void main() {
 
     final path = '${_getChannelUrl(channelId, channelType)}/read';
 
-    when(() => client.post(path, data: any(named: 'data'))).thenAnswer(
-        (_) async => successResponse(path, data: <String, dynamic>{}));
+    when(() => client.post(
+              path,
+              data: {
+                'message_id': messageId,
+              },
+            ))
+        .thenAnswer(
+            (_) async => successResponse(path, data: <String, dynamic>{}));
 
     final res = await channelApi.markRead(
       channelId,
diff --git a/packages/stream_chat/test/src/core/api/general_api_test.dart b/packages/stream_chat/test/src/core/api/general_api_test.dart
index bf7a3018..afb3f6aa 100644
--- a/packages/stream_chat/test/src/core/api/general_api_test.dart
+++ b/packages/stream_chat/test/src/core/api/general_api_test.dart
@@ -35,10 +35,17 @@ void main() {
     final events =
         List.generate(3, (index) => Event(type: 'test-event-type-$index'));
 
-    when(() => client.post(path, data: any(named: 'data')))
-        .thenAnswer((_) async => successResponse(path, data: {
-              'events': [...events.map((it) => it.toJson())]
-            }));
+    final data = {
+      'channel_cids': cids,
+      'last_sync_at': lastSyncAt.toUtc().toIso8601String(),
+    };
+
+    when(() => client.post(
+          path,
+          data: data,
+        )).thenAnswer((_) async => successResponse(path, data: {
+          'events': [...events.map((it) => it.toJson())]
+        }));
 
     final res = await generalApi.sync(cids, lastSyncAt);
 
@@ -87,8 +94,20 @@ void main() {
 
       const path = '/search';
 
+      final payload = jsonEncode({
+        'filter_conditions': filter,
+        'sort': sort,
+        'query': query,
+        ...pagination.toJson(),
+      });
+
       when(
-        () => client.get(path, queryParameters: any(named: 'queryParameters')),
+        () => client.get(
+          path,
+          queryParameters: {
+            'payload': payload,
+          },
+        ),
       ).thenAnswer((_) async => successResponse(path, data: {'results': []}));
 
       final res = await generalApi.searchMessages(
@@ -115,8 +134,20 @@ void main() {
 
       const path = '/search';
 
+      final payload = jsonEncode({
+        'filter_conditions': filter,
+        'sort': sort,
+        'message_filter_conditions': messageFilter,
+        ...pagination.toJson(),
+      });
+
       when(
-        () => client.get(path, queryParameters: any(named: 'queryParameters')),
+        () => client.get(
+          path,
+          queryParameters: {
+            'payload': payload,
+          },
+        ),
       ).thenAnswer((_) async => successResponse(path, data: {'results': []}));
 
       final res = await generalApi.searchMessages(