diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index 2add715d..33ff0a38 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -10,6 +10,8 @@ on:
 jobs:
   format:
     runs-on: ubuntu-latest
+    container:
+        image:  dart:stable
 
     steps:
       - name: Checkout repository
@@ -17,14 +19,6 @@ jobs:
         with:
           persist-credentials: true
           ref: ${{ github.event.pull_request.head.ref }}
-      
-      - name: Install Flutter
-        uses: subosito/flutter-action@v2
-        with:
-          channel: stable
-
-      - name: Install dependencies
-        run: flutter pub get
 
       - name: Format Dart code
         run: dart format .
@@ -35,5 +29,5 @@ jobs:
       - name: Add & Commit
         uses: EndBug/add-and-commit@v9.1.4
         with:
-            add: '["lib", "test"]'
+            add: lib
     
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ff4a445..f7044156 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## 19.1.0
+
+* Add `orderRandom` query support
+
 ## 19.0.0
 
 * Rename `CreditCard` enum value `unionChinaPay` to `unionPay`
diff --git a/README.md b/README.md
index 64344868..8ad58e57 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ Add this to your package's `pubspec.yaml` file:
 
 ```yml
 dependencies:
-  appwrite: ^19.0.0
+  appwrite: ^19.1.0
 ```
 
 You can install packages from the command line:
diff --git a/lib/query.dart b/lib/query.dart
index 5a4184e1..77caee35 100644
--- a/lib/query.dart
+++ b/lib/query.dart
@@ -130,16 +130,16 @@ class Query {
       Query._('updatedBetween', null, [start, end]).toString();
 
   static String or(List<String> queries) => Query._(
-        'or',
-        null,
-        queries.map((query) => jsonDecode(query)).toList(),
-      ).toString();
+    'or',
+    null,
+    queries.map((query) => jsonDecode(query)).toList(),
+  ).toString();
 
   static String and(List<String> queries) => Query._(
-        'and',
-        null,
-        queries.map((query) => jsonDecode(query)).toList(),
-      ).toString();
+    'and',
+    null,
+    queries.map((query) => jsonDecode(query)).toList(),
+  ).toString();
 
   /// Specify which attributes should be returned by the API call.
   static String select(List<String> attributes) =>
@@ -153,6 +153,9 @@ class Query {
   static String orderDesc(String attribute) =>
       Query._('orderDesc', attribute).toString();
 
+  /// Sort results randomly.
+  static String orderRandom() => Query._('orderRandom').toString();
+
   /// Return results before [id].
   ///
   /// Refer to the [Cursor Based Pagination](https://appwrite.io/docs/pagination#cursor-pagination)
@@ -179,35 +182,43 @@ class Query {
 
   /// Filter resources where [attribute] is at a specific distance from the given coordinates.
   static String distanceEqual(
-          String attribute, List<dynamic> values, num distance,
-          [bool meters = true]) =>
-      Query._('distanceEqual', attribute, [
-        [values, distance, meters]
-      ]).toString();
+    String attribute,
+    List<dynamic> values,
+    num distance, [
+    bool meters = true,
+  ]) => Query._('distanceEqual', attribute, [
+    [values, distance, meters],
+  ]).toString();
 
   /// Filter resources where [attribute] is not at a specific distance from the given coordinates.
   static String distanceNotEqual(
-          String attribute, List<dynamic> values, num distance,
-          [bool meters = true]) =>
-      Query._('distanceNotEqual', attribute, [
-        [values, distance, meters]
-      ]).toString();
+    String attribute,
+    List<dynamic> values,
+    num distance, [
+    bool meters = true,
+  ]) => Query._('distanceNotEqual', attribute, [
+    [values, distance, meters],
+  ]).toString();
 
   /// Filter resources where [attribute] is at a distance greater than the specified value from the given coordinates.
   static String distanceGreaterThan(
-          String attribute, List<dynamic> values, num distance,
-          [bool meters = true]) =>
-      Query._('distanceGreaterThan', attribute, [
-        [values, distance, meters]
-      ]).toString();
+    String attribute,
+    List<dynamic> values,
+    num distance, [
+    bool meters = true,
+  ]) => Query._('distanceGreaterThan', attribute, [
+    [values, distance, meters],
+  ]).toString();
 
   /// Filter resources where [attribute] is at a distance less than the specified value from the given coordinates.
   static String distanceLessThan(
-          String attribute, List<dynamic> values, num distance,
-          [bool meters = true]) =>
-      Query._('distanceLessThan', attribute, [
-        [values, distance, meters]
-      ]).toString();
+    String attribute,
+    List<dynamic> values,
+    num distance, [
+    bool meters = true,
+  ]) => Query._('distanceLessThan', attribute, [
+    [values, distance, meters],
+  ]).toString();
 
   /// Filter resources where [attribute] intersects with the given geometry.
   static String intersects(String attribute, List<dynamic> values) =>
diff --git a/lib/services/account.dart b/lib/services/account.dart
index 01646e94..00287c89 100644
--- a/lib/services/account.dart
+++ b/lib/services/account.dart
@@ -890,7 +890,9 @@ class Account extends Service {
   /// Use this endpoint to create a session from token. Provide the **userId**
   /// and **secret** parameters from the successful response of authentication
   /// flows initiated by token creation. For example, magic URL and phone login.
-  @Deprecated('This API has been deprecated.')
+  @Deprecated(
+    'This API has been deprecated since 1.6.0. Please use `Account.createSession` instead.',
+  )
   Future<models.Session> updateMagicURLSession({
     required String userId,
     required String secret,
@@ -942,6 +944,7 @@ class Account extends Service {
       'success': success,
       'failure': failure,
       'scopes': scopes,
+
       'project': client.config['project'],
     };
 
@@ -974,7 +977,9 @@ class Account extends Service {
   /// Use this endpoint to create a session from token. Provide the **userId**
   /// and **secret** parameters from the successful response of authentication
   /// flows initiated by token creation. For example, magic URL and phone login.
-  @Deprecated('This API has been deprecated.')
+  @Deprecated(
+    'This API has been deprecated since 1.6.0. Please use `Account.createSession` instead.',
+  )
   Future<models.Session> updatePhoneSession({
     required String userId,
     required String secret,
@@ -1298,6 +1303,7 @@ class Account extends Service {
       'success': success,
       'failure': failure,
       'scopes': scopes,
+
       'project': client.config['project'],
     };
 
diff --git a/lib/services/avatars.dart b/lib/services/avatars.dart
index c91cdb24..a02b2db2 100644
--- a/lib/services/avatars.dart
+++ b/lib/services/avatars.dart
@@ -31,6 +31,7 @@ class Avatars extends Service {
       'width': width,
       'height': height,
       'quality': quality,
+
       'project': client.config['project'],
     };
 
@@ -67,6 +68,7 @@ class Avatars extends Service {
       'width': width,
       'height': height,
       'quality': quality,
+
       'project': client.config['project'],
     };
 
@@ -88,6 +90,7 @@ class Avatars extends Service {
 
     final Map<String, dynamic> params = {
       'url': url,
+
       'project': client.config['project'],
     };
 
@@ -125,6 +128,7 @@ class Avatars extends Service {
       'width': width,
       'height': height,
       'quality': quality,
+
       'project': client.config['project'],
     };
 
@@ -159,6 +163,7 @@ class Avatars extends Service {
       'url': url,
       'width': width,
       'height': height,
+
       'project': client.config['project'],
     };
 
@@ -200,6 +205,7 @@ class Avatars extends Service {
       'width': width,
       'height': height,
       'background': background,
+
       'project': client.config['project'],
     };
 
@@ -228,6 +234,7 @@ class Avatars extends Service {
       'size': size,
       'margin': margin,
       'download': download,
+
       'project': client.config['project'],
     };
 
diff --git a/lib/services/databases.dart b/lib/services/databases.dart
index 899b39db..8e165559 100644
--- a/lib/services/databases.dart
+++ b/lib/services/databases.dart
@@ -9,24 +9,28 @@ class Databases extends Service {
   /// Get a list of all the user's documents in a given collection. You can use
   /// the query params to filter your results.
   @Deprecated(
-      'This API has been deprecated since 1.8.0. Please use `TablesDB.listRows` instead.')
-  Future<models.DocumentList> listDocuments(
-      {required String databaseId,
-      required String collectionId,
-      List<String>? queries}) async {
+    'This API has been deprecated since 1.8.0. Please use `TablesDB.listRows` instead.',
+  )
+  Future<models.DocumentList> listDocuments({
+    required String databaseId,
+    required String collectionId,
+    List<String>? queries,
+  }) async {
     final String apiPath =
         '/databases/{databaseId}/collections/{collectionId}/documents'
             .replaceAll('{databaseId}', databaseId)
             .replaceAll('{collectionId}', collectionId);
 
-    final Map<String, dynamic> apiParams = {
-      'queries': queries,
-    };
+    final Map<String, dynamic> apiParams = {'queries': queries};
 
     final Map<String, String> apiHeaders = {};
 
-    final res = await client.call(HttpMethod.get,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.get,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.DocumentList.fromMap(res.data);
   }
@@ -36,13 +40,15 @@ class Databases extends Service {
   /// integration](https://appwrite.io/docs/server/databases#databasesCreateCollection)
   /// API or directly from your database console.
   @Deprecated(
-      'This API has been deprecated since 1.8.0. Please use `TablesDB.createRow` instead.')
-  Future<models.Document> createDocument(
-      {required String databaseId,
-      required String collectionId,
-      required String documentId,
-      required Map data,
-      List<String>? permissions}) async {
+    'This API has been deprecated since 1.8.0. Please use `TablesDB.createRow` instead.',
+  )
+  Future<models.Document> createDocument({
+    required String databaseId,
+    required String collectionId,
+    required String documentId,
+    required Map data,
+    List<String>? permissions,
+  }) async {
     final String apiPath =
         '/databases/{databaseId}/collections/{collectionId}/documents'
             .replaceAll('{databaseId}', databaseId)
@@ -54,12 +60,14 @@ class Databases extends Service {
       'permissions': permissions,
     };
 
-    final Map<String, String> apiHeaders = {
-      'content-type': 'application/json',
-    };
+    final Map<String, String> apiHeaders = {'content-type': 'application/json'};
 
-    final res = await client.call(HttpMethod.post,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.post,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.Document.fromMap(res.data);
   }
@@ -67,26 +75,30 @@ class Databases extends Service {
   /// Get a document by its unique ID. This endpoint response returns a JSON
   /// object with the document data.
   @Deprecated(
-      'This API has been deprecated since 1.8.0. Please use `TablesDB.getRow` instead.')
-  Future<models.Document> getDocument(
-      {required String databaseId,
-      required String collectionId,
-      required String documentId,
-      List<String>? queries}) async {
+    'This API has been deprecated since 1.8.0. Please use `TablesDB.getRow` instead.',
+  )
+  Future<models.Document> getDocument({
+    required String databaseId,
+    required String collectionId,
+    required String documentId,
+    List<String>? queries,
+  }) async {
     final String apiPath =
         '/databases/{databaseId}/collections/{collectionId}/documents/{documentId}'
             .replaceAll('{databaseId}', databaseId)
             .replaceAll('{collectionId}', collectionId)
             .replaceAll('{documentId}', documentId);
 
-    final Map<String, dynamic> apiParams = {
-      'queries': queries,
-    };
+    final Map<String, dynamic> apiParams = {'queries': queries};
 
     final Map<String, String> apiHeaders = {};
 
-    final res = await client.call(HttpMethod.get,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.get,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.Document.fromMap(res.data);
   }
@@ -96,13 +108,15 @@ class Databases extends Service {
   /// integration](https://appwrite.io/docs/server/databases#databasesCreateCollection)
   /// API or directly from your database console.
   @Deprecated(
-      'This API has been deprecated since 1.8.0. Please use `TablesDB.upsertRow` instead.')
-  Future<models.Document> upsertDocument(
-      {required String databaseId,
-      required String collectionId,
-      required String documentId,
-      required Map data,
-      List<String>? permissions}) async {
+    'This API has been deprecated since 1.8.0. Please use `TablesDB.upsertRow` instead.',
+  )
+  Future<models.Document> upsertDocument({
+    required String databaseId,
+    required String collectionId,
+    required String documentId,
+    required Map data,
+    List<String>? permissions,
+  }) async {
     final String apiPath =
         '/databases/{databaseId}/collections/{collectionId}/documents/{documentId}'
             .replaceAll('{databaseId}', databaseId)
@@ -114,12 +128,14 @@ class Databases extends Service {
       'permissions': permissions,
     };
 
-    final Map<String, String> apiHeaders = {
-      'content-type': 'application/json',
-    };
+    final Map<String, String> apiHeaders = {'content-type': 'application/json'};
 
-    final res = await client.call(HttpMethod.put,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.put,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.Document.fromMap(res.data);
   }
@@ -127,13 +143,15 @@ class Databases extends Service {
   /// Update a document by its unique ID. Using the patch method you can pass
   /// only specific fields that will get updated.
   @Deprecated(
-      'This API has been deprecated since 1.8.0. Please use `TablesDB.updateRow` instead.')
-  Future<models.Document> updateDocument(
-      {required String databaseId,
-      required String collectionId,
-      required String documentId,
-      Map? data,
-      List<String>? permissions}) async {
+    'This API has been deprecated since 1.8.0. Please use `TablesDB.updateRow` instead.',
+  )
+  Future<models.Document> updateDocument({
+    required String databaseId,
+    required String collectionId,
+    required String documentId,
+    Map? data,
+    List<String>? permissions,
+  }) async {
     final String apiPath =
         '/databases/{databaseId}/collections/{collectionId}/documents/{documentId}'
             .replaceAll('{databaseId}', databaseId)
@@ -145,23 +163,27 @@ class Databases extends Service {
       'permissions': permissions,
     };
 
-    final Map<String, String> apiHeaders = {
-      'content-type': 'application/json',
-    };
+    final Map<String, String> apiHeaders = {'content-type': 'application/json'};
 
-    final res = await client.call(HttpMethod.patch,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.patch,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.Document.fromMap(res.data);
   }
 
   /// Delete a document by its unique ID.
   @Deprecated(
-      'This API has been deprecated since 1.8.0. Please use `TablesDB.deleteRow` instead.')
-  Future deleteDocument(
-      {required String databaseId,
-      required String collectionId,
-      required String documentId}) async {
+    'This API has been deprecated since 1.8.0. Please use `TablesDB.deleteRow` instead.',
+  )
+  Future deleteDocument({
+    required String databaseId,
+    required String collectionId,
+    required String documentId,
+  }) async {
     final String apiPath =
         '/databases/{databaseId}/collections/{collectionId}/documents/{documentId}'
             .replaceAll('{databaseId}', databaseId)
@@ -170,26 +192,30 @@ class Databases extends Service {
 
     final Map<String, dynamic> apiParams = {};
 
-    final Map<String, String> apiHeaders = {
-      'content-type': 'application/json',
-    };
+    final Map<String, String> apiHeaders = {'content-type': 'application/json'};
 
-    final res = await client.call(HttpMethod.delete,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.delete,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return res.data;
   }
 
   /// Decrement a specific attribute of a document by a given value.
   @Deprecated(
-      'This API has been deprecated since 1.8.0. Please use `TablesDB.decrementRowColumn` instead.')
-  Future<models.Document> decrementDocumentAttribute(
-      {required String databaseId,
-      required String collectionId,
-      required String documentId,
-      required String attribute,
-      double? value,
-      double? min}) async {
+    'This API has been deprecated since 1.8.0. Please use `TablesDB.decrementRowColumn` instead.',
+  )
+  Future<models.Document> decrementDocumentAttribute({
+    required String databaseId,
+    required String collectionId,
+    required String documentId,
+    required String attribute,
+    double? value,
+    double? min,
+  }) async {
     final String apiPath =
         '/databases/{databaseId}/collections/{collectionId}/documents/{documentId}/{attribute}/decrement'
             .replaceAll('{databaseId}', databaseId)
@@ -197,31 +223,32 @@ class Databases extends Service {
             .replaceAll('{documentId}', documentId)
             .replaceAll('{attribute}', attribute);
 
-    final Map<String, dynamic> apiParams = {
-      'value': value,
-      'min': min,
-    };
+    final Map<String, dynamic> apiParams = {'value': value, 'min': min};
 
-    final Map<String, String> apiHeaders = {
-      'content-type': 'application/json',
-    };
+    final Map<String, String> apiHeaders = {'content-type': 'application/json'};
 
-    final res = await client.call(HttpMethod.patch,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.patch,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.Document.fromMap(res.data);
   }
 
   /// Increment a specific attribute of a document by a given value.
   @Deprecated(
-      'This API has been deprecated since 1.8.0. Please use `TablesDB.incrementRowColumn` instead.')
-  Future<models.Document> incrementDocumentAttribute(
-      {required String databaseId,
-      required String collectionId,
-      required String documentId,
-      required String attribute,
-      double? value,
-      double? max}) async {
+    'This API has been deprecated since 1.8.0. Please use `TablesDB.incrementRowColumn` instead.',
+  )
+  Future<models.Document> incrementDocumentAttribute({
+    required String databaseId,
+    required String collectionId,
+    required String documentId,
+    required String attribute,
+    double? value,
+    double? max,
+  }) async {
     final String apiPath =
         '/databases/{databaseId}/collections/{collectionId}/documents/{documentId}/{attribute}/increment'
             .replaceAll('{databaseId}', databaseId)
@@ -229,17 +256,16 @@ class Databases extends Service {
             .replaceAll('{documentId}', documentId)
             .replaceAll('{attribute}', attribute);
 
-    final Map<String, dynamic> apiParams = {
-      'value': value,
-      'max': max,
-    };
+    final Map<String, dynamic> apiParams = {'value': value, 'max': max};
 
-    final Map<String, String> apiHeaders = {
-      'content-type': 'application/json',
-    };
+    final Map<String, String> apiHeaders = {'content-type': 'application/json'};
 
-    final res = await client.call(HttpMethod.patch,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.patch,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.Document.fromMap(res.data);
   }
diff --git a/lib/services/functions.dart b/lib/services/functions.dart
index 8b8f9c1e..d8924273 100644
--- a/lib/services/functions.dart
+++ b/lib/services/functions.dart
@@ -8,19 +8,25 @@ class Functions extends Service {
 
   /// Get a list of all the current user function execution logs. You can use the
   /// query params to filter your results.
-  Future<models.ExecutionList> listExecutions(
-      {required String functionId, List<String>? queries}) async {
-    final String apiPath = '/functions/{functionId}/executions'
-        .replaceAll('{functionId}', functionId);
+  Future<models.ExecutionList> listExecutions({
+    required String functionId,
+    List<String>? queries,
+  }) async {
+    final String apiPath = '/functions/{functionId}/executions'.replaceAll(
+      '{functionId}',
+      functionId,
+    );
 
-    final Map<String, dynamic> apiParams = {
-      'queries': queries,
-    };
+    final Map<String, dynamic> apiParams = {'queries': queries};
 
     final Map<String, String> apiHeaders = {};
 
-    final res = await client.call(HttpMethod.get,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.get,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.ExecutionList.fromMap(res.data);
   }
@@ -29,16 +35,19 @@ class Functions extends Service {
   /// current execution status. You can ping the `Get Execution` endpoint to get
   /// updates on the current execution status. Once this endpoint is called, your
   /// function execution process will start asynchronously.
-  Future<models.Execution> createExecution(
-      {required String functionId,
-      String? body,
-      bool? xasync,
-      String? path,
-      enums.ExecutionMethod? method,
-      Map? headers,
-      String? scheduledAt}) async {
-    final String apiPath = '/functions/{functionId}/executions'
-        .replaceAll('{functionId}', functionId);
+  Future<models.Execution> createExecution({
+    required String functionId,
+    String? body,
+    bool? xasync,
+    String? path,
+    enums.ExecutionMethod? method,
+    Map? headers,
+    String? scheduledAt,
+  }) async {
+    final String apiPath = '/functions/{functionId}/executions'.replaceAll(
+      '{functionId}',
+      functionId,
+    );
 
     final Map<String, dynamic> apiParams = {
       'body': body,
@@ -49,19 +58,23 @@ class Functions extends Service {
       'scheduledAt': scheduledAt,
     };
 
-    final Map<String, String> apiHeaders = {
-      'content-type': 'application/json',
-    };
+    final Map<String, String> apiHeaders = {'content-type': 'application/json'};
 
-    final res = await client.call(HttpMethod.post,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.post,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.Execution.fromMap(res.data);
   }
 
   /// Get a function execution log by its unique ID.
-  Future<models.Execution> getExecution(
-      {required String functionId, required String executionId}) async {
+  Future<models.Execution> getExecution({
+    required String functionId,
+    required String executionId,
+  }) async {
     final String apiPath = '/functions/{functionId}/executions/{executionId}'
         .replaceAll('{functionId}', functionId)
         .replaceAll('{executionId}', executionId);
@@ -70,8 +83,12 @@ class Functions extends Service {
 
     final Map<String, String> apiHeaders = {};
 
-    final res = await client.call(HttpMethod.get,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.get,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.Execution.fromMap(res.data);
   }
diff --git a/lib/services/graphql.dart b/lib/services/graphql.dart
index ff4e17d4..32ea107f 100644
--- a/lib/services/graphql.dart
+++ b/lib/services/graphql.dart
@@ -10,17 +10,19 @@ class Graphql extends Service {
   Future query({required Map query}) async {
     const String apiPath = '/graphql';
 
-    final Map<String, dynamic> apiParams = {
-      'query': query,
-    };
+    final Map<String, dynamic> apiParams = {'query': query};
 
     final Map<String, String> apiHeaders = {
       'x-sdk-graphql': 'true',
       'content-type': 'application/json',
     };
 
-    final res = await client.call(HttpMethod.post,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.post,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return res.data;
   }
@@ -29,17 +31,19 @@ class Graphql extends Service {
   Future mutation({required Map query}) async {
     const String apiPath = '/graphql/mutation';
 
-    final Map<String, dynamic> apiParams = {
-      'query': query,
-    };
+    final Map<String, dynamic> apiParams = {'query': query};
 
     final Map<String, String> apiHeaders = {
       'x-sdk-graphql': 'true',
       'content-type': 'application/json',
     };
 
-    final res = await client.call(HttpMethod.post,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.post,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return res.data;
   }
diff --git a/lib/services/locale.dart b/lib/services/locale.dart
index dd9a5fef..fbd04e4a 100644
--- a/lib/services/locale.dart
+++ b/lib/services/locale.dart
@@ -19,8 +19,12 @@ class Locale extends Service {
 
     final Map<String, String> apiHeaders = {};
 
-    final res = await client.call(HttpMethod.get,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.get,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.Locale.fromMap(res.data);
   }
@@ -34,8 +38,12 @@ class Locale extends Service {
 
     final Map<String, String> apiHeaders = {};
 
-    final res = await client.call(HttpMethod.get,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.get,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.LocaleCodeList.fromMap(res.data);
   }
@@ -49,8 +57,12 @@ class Locale extends Service {
 
     final Map<String, String> apiHeaders = {};
 
-    final res = await client.call(HttpMethod.get,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.get,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.ContinentList.fromMap(res.data);
   }
@@ -64,8 +76,12 @@ class Locale extends Service {
 
     final Map<String, String> apiHeaders = {};
 
-    final res = await client.call(HttpMethod.get,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.get,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.CountryList.fromMap(res.data);
   }
@@ -79,8 +95,12 @@ class Locale extends Service {
 
     final Map<String, String> apiHeaders = {};
 
-    final res = await client.call(HttpMethod.get,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.get,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.CountryList.fromMap(res.data);
   }
@@ -94,8 +114,12 @@ class Locale extends Service {
 
     final Map<String, String> apiHeaders = {};
 
-    final res = await client.call(HttpMethod.get,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.get,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.PhoneList.fromMap(res.data);
   }
@@ -110,8 +134,12 @@ class Locale extends Service {
 
     final Map<String, String> apiHeaders = {};
 
-    final res = await client.call(HttpMethod.get,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.get,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.CurrencyList.fromMap(res.data);
   }
@@ -125,8 +153,12 @@ class Locale extends Service {
 
     final Map<String, String> apiHeaders = {};
 
-    final res = await client.call(HttpMethod.get,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.get,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.LanguageList.fromMap(res.data);
   }
diff --git a/lib/services/messaging.dart b/lib/services/messaging.dart
index 87760d50..236037fa 100644
--- a/lib/services/messaging.dart
+++ b/lib/services/messaging.dart
@@ -7,31 +7,38 @@ class Messaging extends Service {
   Messaging(super.client);
 
   /// Create a new subscriber.
-  Future<models.Subscriber> createSubscriber(
-      {required String topicId,
-      required String subscriberId,
-      required String targetId}) async {
-    final String apiPath = '/messaging/topics/{topicId}/subscribers'
-        .replaceAll('{topicId}', topicId);
+  Future<models.Subscriber> createSubscriber({
+    required String topicId,
+    required String subscriberId,
+    required String targetId,
+  }) async {
+    final String apiPath = '/messaging/topics/{topicId}/subscribers'.replaceAll(
+      '{topicId}',
+      topicId,
+    );
 
     final Map<String, dynamic> apiParams = {
       'subscriberId': subscriberId,
       'targetId': targetId,
     };
 
-    final Map<String, String> apiHeaders = {
-      'content-type': 'application/json',
-    };
+    final Map<String, String> apiHeaders = {'content-type': 'application/json'};
 
-    final res = await client.call(HttpMethod.post,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.post,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.Subscriber.fromMap(res.data);
   }
 
   /// Delete a subscriber by its unique ID.
-  Future deleteSubscriber(
-      {required String topicId, required String subscriberId}) async {
+  Future deleteSubscriber({
+    required String topicId,
+    required String subscriberId,
+  }) async {
     final String apiPath =
         '/messaging/topics/{topicId}/subscribers/{subscriberId}'
             .replaceAll('{topicId}', topicId)
@@ -39,12 +46,14 @@ class Messaging extends Service {
 
     final Map<String, dynamic> apiParams = {};
 
-    final Map<String, String> apiHeaders = {
-      'content-type': 'application/json',
-    };
+    final Map<String, String> apiHeaders = {'content-type': 'application/json'};
 
-    final res = await client.call(HttpMethod.delete,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.delete,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return res.data;
   }
diff --git a/lib/services/storage.dart b/lib/services/storage.dart
index e45227da..258776f2 100644
--- a/lib/services/storage.dart
+++ b/lib/services/storage.dart
@@ -177,6 +177,7 @@ class Storage extends Service {
 
     final Map<String, dynamic> params = {
       'token': token,
+
       'project': client.config['project'],
     };
 
@@ -227,6 +228,7 @@ class Storage extends Service {
       'background': background,
       'output': output?.value,
       'token': token,
+
       'project': client.config['project'],
     };
 
@@ -253,6 +255,7 @@ class Storage extends Service {
 
     final Map<String, dynamic> params = {
       'token': token,
+
       'project': client.config['project'],
     };
 
diff --git a/lib/services/tables_db.dart b/lib/services/tables_db.dart
index 48c632e2..2c6f1c09 100644
--- a/lib/services/tables_db.dart
+++ b/lib/services/tables_db.dart
@@ -6,22 +6,25 @@ class TablesDB extends Service {
 
   /// Get a list of all the user's rows in a given table. You can use the query
   /// params to filter your results.
-  Future<models.RowList> listRows(
-      {required String databaseId,
-      required String tableId,
-      List<String>? queries}) async {
+  Future<models.RowList> listRows({
+    required String databaseId,
+    required String tableId,
+    List<String>? queries,
+  }) async {
     final String apiPath = '/tablesdb/{databaseId}/tables/{tableId}/rows'
         .replaceAll('{databaseId}', databaseId)
         .replaceAll('{tableId}', tableId);
 
-    final Map<String, dynamic> apiParams = {
-      'queries': queries,
-    };
+    final Map<String, dynamic> apiParams = {'queries': queries};
 
     final Map<String, String> apiHeaders = {};
 
-    final res = await client.call(HttpMethod.get,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.get,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.RowList.fromMap(res.data);
   }
@@ -30,12 +33,13 @@ class TablesDB extends Service {
   /// resource using either a [server
   /// integration](https://appwrite.io/docs/server/tablesdb#tablesDBCreateTable)
   /// API or directly from your database console.
-  Future<models.Row> createRow(
-      {required String databaseId,
-      required String tableId,
-      required String rowId,
-      required Map data,
-      List<String>? permissions}) async {
+  Future<models.Row> createRow({
+    required String databaseId,
+    required String tableId,
+    required String rowId,
+    required Map data,
+    List<String>? permissions,
+  }) async {
     final String apiPath = '/tablesdb/{databaseId}/tables/{tableId}/rows'
         .replaceAll('{databaseId}', databaseId)
         .replaceAll('{tableId}', tableId);
@@ -46,37 +50,42 @@ class TablesDB extends Service {
       'permissions': permissions,
     };
 
-    final Map<String, String> apiHeaders = {
-      'content-type': 'application/json',
-    };
+    final Map<String, String> apiHeaders = {'content-type': 'application/json'};
 
-    final res = await client.call(HttpMethod.post,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.post,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.Row.fromMap(res.data);
   }
 
   /// Get a row by its unique ID. This endpoint response returns a JSON object
   /// with the row data.
-  Future<models.Row> getRow(
-      {required String databaseId,
-      required String tableId,
-      required String rowId,
-      List<String>? queries}) async {
+  Future<models.Row> getRow({
+    required String databaseId,
+    required String tableId,
+    required String rowId,
+    List<String>? queries,
+  }) async {
     final String apiPath =
         '/tablesdb/{databaseId}/tables/{tableId}/rows/{rowId}'
             .replaceAll('{databaseId}', databaseId)
             .replaceAll('{tableId}', tableId)
             .replaceAll('{rowId}', rowId);
 
-    final Map<String, dynamic> apiParams = {
-      'queries': queries,
-    };
+    final Map<String, dynamic> apiParams = {'queries': queries};
 
     final Map<String, String> apiHeaders = {};
 
-    final res = await client.call(HttpMethod.get,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.get,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.Row.fromMap(res.data);
   }
@@ -85,12 +94,13 @@ class TablesDB extends Service {
   /// table resource using either a [server
   /// integration](https://appwrite.io/docs/server/tablesdb#tablesDBCreateTable)
   /// API or directly from your database console.
-  Future<models.Row> upsertRow(
-      {required String databaseId,
-      required String tableId,
-      required String rowId,
-      Map? data,
-      List<String>? permissions}) async {
+  Future<models.Row> upsertRow({
+    required String databaseId,
+    required String tableId,
+    required String rowId,
+    Map? data,
+    List<String>? permissions,
+  }) async {
     final String apiPath =
         '/tablesdb/{databaseId}/tables/{tableId}/rows/{rowId}'
             .replaceAll('{databaseId}', databaseId)
@@ -102,24 +112,27 @@ class TablesDB extends Service {
       'permissions': permissions,
     };
 
-    final Map<String, String> apiHeaders = {
-      'content-type': 'application/json',
-    };
+    final Map<String, String> apiHeaders = {'content-type': 'application/json'};
 
-    final res = await client.call(HttpMethod.put,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.put,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.Row.fromMap(res.data);
   }
 
   /// Update a row by its unique ID. Using the patch method you can pass only
   /// specific fields that will get updated.
-  Future<models.Row> updateRow(
-      {required String databaseId,
-      required String tableId,
-      required String rowId,
-      Map? data,
-      List<String>? permissions}) async {
+  Future<models.Row> updateRow({
+    required String databaseId,
+    required String tableId,
+    required String rowId,
+    Map? data,
+    List<String>? permissions,
+  }) async {
     final String apiPath =
         '/tablesdb/{databaseId}/tables/{tableId}/rows/{rowId}'
             .replaceAll('{databaseId}', databaseId)
@@ -131,21 +144,24 @@ class TablesDB extends Service {
       'permissions': permissions,
     };
 
-    final Map<String, String> apiHeaders = {
-      'content-type': 'application/json',
-    };
+    final Map<String, String> apiHeaders = {'content-type': 'application/json'};
 
-    final res = await client.call(HttpMethod.patch,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.patch,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.Row.fromMap(res.data);
   }
 
   /// Delete a row by its unique ID.
-  Future deleteRow(
-      {required String databaseId,
-      required String tableId,
-      required String rowId}) async {
+  Future deleteRow({
+    required String databaseId,
+    required String tableId,
+    required String rowId,
+  }) async {
     final String apiPath =
         '/tablesdb/{databaseId}/tables/{tableId}/rows/{rowId}'
             .replaceAll('{databaseId}', databaseId)
@@ -154,24 +170,27 @@ class TablesDB extends Service {
 
     final Map<String, dynamic> apiParams = {};
 
-    final Map<String, String> apiHeaders = {
-      'content-type': 'application/json',
-    };
+    final Map<String, String> apiHeaders = {'content-type': 'application/json'};
 
-    final res = await client.call(HttpMethod.delete,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.delete,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return res.data;
   }
 
   /// Decrement a specific column of a row by a given value.
-  Future<models.Row> decrementRowColumn(
-      {required String databaseId,
-      required String tableId,
-      required String rowId,
-      required String column,
-      double? value,
-      double? min}) async {
+  Future<models.Row> decrementRowColumn({
+    required String databaseId,
+    required String tableId,
+    required String rowId,
+    required String column,
+    double? value,
+    double? min,
+  }) async {
     final String apiPath =
         '/tablesdb/{databaseId}/tables/{tableId}/rows/{rowId}/{column}/decrement'
             .replaceAll('{databaseId}', databaseId)
@@ -179,29 +198,29 @@ class TablesDB extends Service {
             .replaceAll('{rowId}', rowId)
             .replaceAll('{column}', column);
 
-    final Map<String, dynamic> apiParams = {
-      'value': value,
-      'min': min,
-    };
+    final Map<String, dynamic> apiParams = {'value': value, 'min': min};
 
-    final Map<String, String> apiHeaders = {
-      'content-type': 'application/json',
-    };
+    final Map<String, String> apiHeaders = {'content-type': 'application/json'};
 
-    final res = await client.call(HttpMethod.patch,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.patch,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.Row.fromMap(res.data);
   }
 
   /// Increment a specific column of a row by a given value.
-  Future<models.Row> incrementRowColumn(
-      {required String databaseId,
-      required String tableId,
-      required String rowId,
-      required String column,
-      double? value,
-      double? max}) async {
+  Future<models.Row> incrementRowColumn({
+    required String databaseId,
+    required String tableId,
+    required String rowId,
+    required String column,
+    double? value,
+    double? max,
+  }) async {
     final String apiPath =
         '/tablesdb/{databaseId}/tables/{tableId}/rows/{rowId}/{column}/increment'
             .replaceAll('{databaseId}', databaseId)
@@ -209,17 +228,16 @@ class TablesDB extends Service {
             .replaceAll('{rowId}', rowId)
             .replaceAll('{column}', column);
 
-    final Map<String, dynamic> apiParams = {
-      'value': value,
-      'max': max,
-    };
+    final Map<String, dynamic> apiParams = {'value': value, 'max': max};
 
-    final Map<String, String> apiHeaders = {
-      'content-type': 'application/json',
-    };
+    final Map<String, String> apiHeaders = {'content-type': 'application/json'};
 
-    final res = await client.call(HttpMethod.patch,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.patch,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.Row.fromMap(res.data);
   }
diff --git a/lib/services/teams.dart b/lib/services/teams.dart
index 4da8936a..24089628 100644
--- a/lib/services/teams.dart
+++ b/lib/services/teams.dart
@@ -18,8 +18,12 @@ class Teams extends Service {
 
     final Map<String, String> apiHeaders = {};
 
-    final res = await client.call(HttpMethod.get,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.get,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.TeamList.fromMap(res.data);
   }
@@ -27,10 +31,11 @@ class Teams extends Service {
   /// Create a new team. The user who creates the team will automatically be
   /// assigned as the owner of the team. Only the users with the owner role can
   /// invite new members, add new owners and delete or update the team.
-  Future<models.Team> create(
-      {required String teamId,
-      required String name,
-      List<String>? roles}) async {
+  Future<models.Team> create({
+    required String teamId,
+    required String name,
+    List<String>? roles,
+  }) async {
     const String apiPath = '/teams';
 
     final Map<String, dynamic> apiParams = {
@@ -39,12 +44,14 @@ class Teams extends Service {
       'roles': roles,
     };
 
-    final Map<String, String> apiHeaders = {
-      'content-type': 'application/json',
-    };
+    final Map<String, String> apiHeaders = {'content-type': 'application/json'};
 
-    final res = await client.call(HttpMethod.post,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.post,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.Team.fromMap(res.data);
   }
@@ -57,27 +64,33 @@ class Teams extends Service {
 
     final Map<String, String> apiHeaders = {};
 
-    final res = await client.call(HttpMethod.get,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.get,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.Team.fromMap(res.data);
   }
 
   /// Update the team's name by its unique ID.
-  Future<models.Team> updateName(
-      {required String teamId, required String name}) async {
+  Future<models.Team> updateName({
+    required String teamId,
+    required String name,
+  }) async {
     final String apiPath = '/teams/{teamId}'.replaceAll('{teamId}', teamId);
 
-    final Map<String, dynamic> apiParams = {
-      'name': name,
-    };
+    final Map<String, dynamic> apiParams = {'name': name};
 
-    final Map<String, String> apiHeaders = {
-      'content-type': 'application/json',
-    };
+    final Map<String, String> apiHeaders = {'content-type': 'application/json'};
 
-    final res = await client.call(HttpMethod.put,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.put,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.Team.fromMap(res.data);
   }
@@ -89,12 +102,14 @@ class Teams extends Service {
 
     final Map<String, dynamic> apiParams = {};
 
-    final Map<String, String> apiHeaders = {
-      'content-type': 'application/json',
-    };
+    final Map<String, String> apiHeaders = {'content-type': 'application/json'};
 
-    final res = await client.call(HttpMethod.delete,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.delete,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return res.data;
   }
@@ -102,10 +117,15 @@ class Teams extends Service {
   /// Use this endpoint to list a team's members using the team's ID. All team
   /// members have read access to this endpoint. Hide sensitive attributes from
   /// the response by toggling membership privacy in the Console.
-  Future<models.MembershipList> listMemberships(
-      {required String teamId, List<String>? queries, String? search}) async {
-    final String apiPath =
-        '/teams/{teamId}/memberships'.replaceAll('{teamId}', teamId);
+  Future<models.MembershipList> listMemberships({
+    required String teamId,
+    List<String>? queries,
+    String? search,
+  }) async {
+    final String apiPath = '/teams/{teamId}/memberships'.replaceAll(
+      '{teamId}',
+      teamId,
+    );
 
     final Map<String, dynamic> apiParams = {
       'queries': queries,
@@ -114,8 +134,12 @@ class Teams extends Service {
 
     final Map<String, String> apiHeaders = {};
 
-    final res = await client.call(HttpMethod.get,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.get,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.MembershipList.fromMap(res.data);
   }
@@ -141,16 +165,19 @@ class Teams extends Service {
   /// Appwrite will accept the only redirect URLs under the domains you have
   /// added as a platform on the Appwrite Console.
   ///
-  Future<models.Membership> createMembership(
-      {required String teamId,
-      required List<String> roles,
-      String? email,
-      String? userId,
-      String? phone,
-      String? url,
-      String? name}) async {
-    final String apiPath =
-        '/teams/{teamId}/memberships'.replaceAll('{teamId}', teamId);
+  Future<models.Membership> createMembership({
+    required String teamId,
+    required List<String> roles,
+    String? email,
+    String? userId,
+    String? phone,
+    String? url,
+    String? name,
+  }) async {
+    final String apiPath = '/teams/{teamId}/memberships'.replaceAll(
+      '{teamId}',
+      teamId,
+    );
 
     final Map<String, dynamic> apiParams = {
       'email': email,
@@ -161,12 +188,14 @@ class Teams extends Service {
       'name': name,
     };
 
-    final Map<String, String> apiHeaders = {
-      'content-type': 'application/json',
-    };
+    final Map<String, String> apiHeaders = {'content-type': 'application/json'};
 
-    final res = await client.call(HttpMethod.post,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.post,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.Membership.fromMap(res.data);
   }
@@ -174,8 +203,10 @@ class Teams extends Service {
   /// Get a team member by the membership unique id. All team members have read
   /// access for this resource. Hide sensitive attributes from the response by
   /// toggling membership privacy in the Console.
-  Future<models.Membership> getMembership(
-      {required String teamId, required String membershipId}) async {
+  Future<models.Membership> getMembership({
+    required String teamId,
+    required String membershipId,
+  }) async {
     final String apiPath = '/teams/{teamId}/memberships/{membershipId}'
         .replaceAll('{teamId}', teamId)
         .replaceAll('{membershipId}', membershipId);
@@ -184,8 +215,12 @@ class Teams extends Service {
 
     final Map<String, String> apiHeaders = {};
 
-    final res = await client.call(HttpMethod.get,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.get,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.Membership.fromMap(res.data);
   }
@@ -194,24 +229,25 @@ class Teams extends Service {
   /// have access to this endpoint. Learn more about [roles and
   /// permissions](https://appwrite.io/docs/permissions).
   ///
-  Future<models.Membership> updateMembership(
-      {required String teamId,
-      required String membershipId,
-      required List<String> roles}) async {
+  Future<models.Membership> updateMembership({
+    required String teamId,
+    required String membershipId,
+    required List<String> roles,
+  }) async {
     final String apiPath = '/teams/{teamId}/memberships/{membershipId}'
         .replaceAll('{teamId}', teamId)
         .replaceAll('{membershipId}', membershipId);
 
-    final Map<String, dynamic> apiParams = {
-      'roles': roles,
-    };
+    final Map<String, dynamic> apiParams = {'roles': roles};
 
-    final Map<String, String> apiHeaders = {
-      'content-type': 'application/json',
-    };
+    final Map<String, String> apiHeaders = {'content-type': 'application/json'};
 
-    final res = await client.call(HttpMethod.patch,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.patch,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.Membership.fromMap(res.data);
   }
@@ -219,20 +255,24 @@ class Teams extends Service {
   /// This endpoint allows a user to leave a team or for a team owner to delete
   /// the membership of any other team member. You can also use this endpoint to
   /// delete a user membership even if it is not accepted.
-  Future deleteMembership(
-      {required String teamId, required String membershipId}) async {
+  Future deleteMembership({
+    required String teamId,
+    required String membershipId,
+  }) async {
     final String apiPath = '/teams/{teamId}/memberships/{membershipId}'
         .replaceAll('{teamId}', teamId)
         .replaceAll('{membershipId}', membershipId);
 
     final Map<String, dynamic> apiParams = {};
 
-    final Map<String, String> apiHeaders = {
-      'content-type': 'application/json',
-    };
+    final Map<String, String> apiHeaders = {'content-type': 'application/json'};
 
-    final res = await client.call(HttpMethod.delete,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.delete,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return res.data;
   }
@@ -244,26 +284,26 @@ class Teams extends Service {
   /// If the request is successful, a session for the user is automatically
   /// created.
   ///
-  Future<models.Membership> updateMembershipStatus(
-      {required String teamId,
-      required String membershipId,
-      required String userId,
-      required String secret}) async {
+  Future<models.Membership> updateMembershipStatus({
+    required String teamId,
+    required String membershipId,
+    required String userId,
+    required String secret,
+  }) async {
     final String apiPath = '/teams/{teamId}/memberships/{membershipId}/status'
         .replaceAll('{teamId}', teamId)
         .replaceAll('{membershipId}', membershipId);
 
-    final Map<String, dynamic> apiParams = {
-      'userId': userId,
-      'secret': secret,
-    };
+    final Map<String, dynamic> apiParams = {'userId': userId, 'secret': secret};
 
-    final Map<String, String> apiHeaders = {
-      'content-type': 'application/json',
-    };
+    final Map<String, String> apiHeaders = {'content-type': 'application/json'};
 
-    final res = await client.call(HttpMethod.patch,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.patch,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.Membership.fromMap(res.data);
   }
@@ -272,15 +312,21 @@ class Teams extends Service {
   /// need to be shared by all team members, prefer storing them in [user
   /// preferences](https://appwrite.io/docs/references/cloud/client-web/account#getPrefs).
   Future<models.Preferences> getPrefs({required String teamId}) async {
-    final String apiPath =
-        '/teams/{teamId}/prefs'.replaceAll('{teamId}', teamId);
+    final String apiPath = '/teams/{teamId}/prefs'.replaceAll(
+      '{teamId}',
+      teamId,
+    );
 
     final Map<String, dynamic> apiParams = {};
 
     final Map<String, String> apiHeaders = {};
 
-    final res = await client.call(HttpMethod.get,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+    final res = await client.call(
+      HttpMethod.get,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.Preferences.fromMap(res.data);
   }
@@ -288,21 +334,25 @@ class Teams extends Service {
   /// Update the team's preferences by its unique ID. The object you pass is
   /// stored as is and replaces any previous value. The maximum allowed prefs
   /// size is 64kB and throws an error if exceeded.
-  Future<models.Preferences> updatePrefs(
-      {required String teamId, required Map prefs}) async {
-    final String apiPath =
-        '/teams/{teamId}/prefs'.replaceAll('{teamId}', teamId);
-
-    final Map<String, dynamic> apiParams = {
-      'prefs': prefs,
-    };
-
-    final Map<String, String> apiHeaders = {
-      'content-type': 'application/json',
-    };
-
-    final res = await client.call(HttpMethod.put,
-        path: apiPath, params: apiParams, headers: apiHeaders);
+  Future<models.Preferences> updatePrefs({
+    required String teamId,
+    required Map prefs,
+  }) async {
+    final String apiPath = '/teams/{teamId}/prefs'.replaceAll(
+      '{teamId}',
+      teamId,
+    );
+
+    final Map<String, dynamic> apiParams = {'prefs': prefs};
+
+    final Map<String, String> apiHeaders = {'content-type': 'application/json'};
+
+    final res = await client.call(
+      HttpMethod.put,
+      path: apiPath,
+      params: apiParams,
+      headers: apiHeaders,
+    );
 
     return models.Preferences.fromMap(res.data);
   }
diff --git a/lib/src/client.dart b/lib/src/client.dart
index 9880d458..05fff190 100644
--- a/lib/src/client.dart
+++ b/lib/src/client.dart
@@ -27,8 +27,7 @@ abstract class Client {
   factory Client({
     String endPoint = 'https://cloud.appwrite.io/v1',
     bool selfSigned = false,
-  }) =>
-      createClient(endPoint: endPoint, selfSigned: selfSigned);
+  }) => createClient(endPoint: endPoint, selfSigned: selfSigned);
 
   /// Handle OAuth2 session creation.
   Future webAuth(Uri url, {String? callbackUrlScheme});
diff --git a/lib/src/client_browser.dart b/lib/src/client_browser.dart
index c1595bf3..fbd51895 100644
--- a/lib/src/client_browser.dart
+++ b/lib/src/client_browser.dart
@@ -40,7 +40,7 @@ class ClientBrowser extends ClientBase with ClientMixin {
       'x-sdk-name': 'Flutter',
       'x-sdk-platform': 'client',
       'x-sdk-language': 'flutter',
-      'x-sdk-version': '19.0.0',
+      'x-sdk-version': '19.1.0',
       'X-Appwrite-Response-Format': '1.8.0',
     };
 
diff --git a/lib/src/client_io.dart b/lib/src/client_io.dart
index d3e33109..ec8b49a3 100644
--- a/lib/src/client_io.dart
+++ b/lib/src/client_io.dart
@@ -58,7 +58,7 @@ class ClientIO extends ClientBase with ClientMixin {
       'x-sdk-name': 'Flutter',
       'x-sdk-platform': 'client',
       'x-sdk-language': 'flutter',
-      'x-sdk-version': '19.0.0',
+      'x-sdk-version': '19.1.0',
       'X-Appwrite-Response-Format': '1.8.0',
     };
 
diff --git a/lib/src/client_mixin.dart b/lib/src/client_mixin.dart
index 0c6b3593..06c9ebe3 100644
--- a/lib/src/client_mixin.dart
+++ b/lib/src/client_mixin.dart
@@ -123,10 +123,11 @@ mixin ClientMixin {
       return http.Response(
         '',
         streamedResponse.statusCode,
-        headers: streamedResponse.headers.map((k, v) =>
-            k.toLowerCase() == 'content-type'
-                ? MapEntry(k, 'text/plain')
-                : MapEntry(k, v)),
+        headers: streamedResponse.headers.map(
+          (k, v) => k.toLowerCase() == 'content-type'
+              ? MapEntry(k, 'text/plain')
+              : MapEntry(k, v),
+        ),
         request: streamedResponse.request,
         isRedirect: streamedResponse.isRedirect,
         persistentConnection: streamedResponse.persistentConnection,
diff --git a/lib/src/cookie_manager.dart b/lib/src/cookie_manager.dart
index 6b1e67cd..0fbc0dd1 100644
--- a/lib/src/cookie_manager.dart
+++ b/lib/src/cookie_manager.dart
@@ -11,20 +11,19 @@ class CookieManager extends Interceptor {
   CookieManager(this.cookieJar);
 
   @override
-  FutureOr<http.BaseRequest> onRequest(
-    http.BaseRequest request,
-  ) async {
+  FutureOr<http.BaseRequest> onRequest(http.BaseRequest request) async {
     await cookieJar
         .loadForRequest(Uri(scheme: request.url.scheme, host: request.url.host))
         .then((cookies) {
-      var cookie = getCookies(cookies);
-      if (cookie.isNotEmpty) {
-        request.headers.addAll({HttpHeaders.cookieHeader: cookie});
-      }
-      return request;
-    }).catchError((e, stackTrace) {
-      return request;
-    });
+          var cookie = getCookies(cookies);
+          if (cookie.isNotEmpty) {
+            request.headers.addAll({HttpHeaders.cookieHeader: cookie});
+          }
+          return request;
+        })
+        .catchError((e, stackTrace) {
+          return request;
+        });
     return request;
   }
 
@@ -43,8 +42,9 @@ class CookieManager extends Interceptor {
     var cookies = cookie.split(exp);
     await cookieJar.saveFromResponse(
       Uri(
-          scheme: response.request!.url.scheme,
-          host: response.request!.url.host),
+        scheme: response.request!.url.scheme,
+        host: response.request!.url.host,
+      ),
       cookies.map((str) => Cookie.fromSetCookieValue(str)).toList(),
     );
   }
diff --git a/lib/src/enums.dart b/lib/src/enums.dart
index 595afdc2..0f250ea3 100644
--- a/lib/src/enums.dart
+++ b/lib/src/enums.dart
@@ -17,5 +17,5 @@ enum ResponseType {
   plain,
 
   /// Get original bytes, the type of response will be `List<int>`
-  bytes
+  bytes,
 }
diff --git a/lib/src/models/algo_bcrypt.dart b/lib/src/models/algo_bcrypt.dart
index 2ba0c398..4e901476 100644
--- a/lib/src/models/algo_bcrypt.dart
+++ b/lib/src/models/algo_bcrypt.dart
@@ -5,19 +5,13 @@ class AlgoBcrypt implements Model {
   /// Algo type.
   final String type;
 
-  AlgoBcrypt({
-    required this.type,
-  });
+  AlgoBcrypt({required this.type});
 
   factory AlgoBcrypt.fromMap(Map<String, dynamic> map) {
-    return AlgoBcrypt(
-      type: map['type'].toString(),
-    );
+    return AlgoBcrypt(type: map['type'].toString());
   }
 
   Map<String, dynamic> toMap() {
-    return {
-      "type": type,
-    };
+    return {"type": type};
   }
 }
diff --git a/lib/src/models/algo_md5.dart b/lib/src/models/algo_md5.dart
index 8bdfca6f..35c7b767 100644
--- a/lib/src/models/algo_md5.dart
+++ b/lib/src/models/algo_md5.dart
@@ -5,19 +5,13 @@ class AlgoMd5 implements Model {
   /// Algo type.
   final String type;
 
-  AlgoMd5({
-    required this.type,
-  });
+  AlgoMd5({required this.type});
 
   factory AlgoMd5.fromMap(Map<String, dynamic> map) {
-    return AlgoMd5(
-      type: map['type'].toString(),
-    );
+    return AlgoMd5(type: map['type'].toString());
   }
 
   Map<String, dynamic> toMap() {
-    return {
-      "type": type,
-    };
+    return {"type": type};
   }
 }
diff --git a/lib/src/models/algo_phpass.dart b/lib/src/models/algo_phpass.dart
index 4f5f9179..7d27adba 100644
--- a/lib/src/models/algo_phpass.dart
+++ b/lib/src/models/algo_phpass.dart
@@ -5,19 +5,13 @@ class AlgoPhpass implements Model {
   /// Algo type.
   final String type;
 
-  AlgoPhpass({
-    required this.type,
-  });
+  AlgoPhpass({required this.type});
 
   factory AlgoPhpass.fromMap(Map<String, dynamic> map) {
-    return AlgoPhpass(
-      type: map['type'].toString(),
-    );
+    return AlgoPhpass(type: map['type'].toString());
   }
 
   Map<String, dynamic> toMap() {
-    return {
-      "type": type,
-    };
+    return {"type": type};
   }
 }
diff --git a/lib/src/models/algo_sha.dart b/lib/src/models/algo_sha.dart
index 47068be0..bae6618f 100644
--- a/lib/src/models/algo_sha.dart
+++ b/lib/src/models/algo_sha.dart
@@ -5,19 +5,13 @@ class AlgoSha implements Model {
   /// Algo type.
   final String type;
 
-  AlgoSha({
-    required this.type,
-  });
+  AlgoSha({required this.type});
 
   factory AlgoSha.fromMap(Map<String, dynamic> map) {
-    return AlgoSha(
-      type: map['type'].toString(),
-    );
+    return AlgoSha(type: map['type'].toString());
   }
 
   Map<String, dynamic> toMap() {
-    return {
-      "type": type,
-    };
+    return {"type": type};
   }
 }
diff --git a/lib/src/models/continent.dart b/lib/src/models/continent.dart
index 990b1064..7318b7ad 100644
--- a/lib/src/models/continent.dart
+++ b/lib/src/models/continent.dart
@@ -8,10 +8,7 @@ class Continent implements Model {
   /// Continent two letter code.
   final String code;
 
-  Continent({
-    required this.name,
-    required this.code,
-  });
+  Continent({required this.name, required this.code});
 
   factory Continent.fromMap(Map<String, dynamic> map) {
     return Continent(
@@ -21,9 +18,6 @@ class Continent implements Model {
   }
 
   Map<String, dynamic> toMap() {
-    return {
-      "name": name,
-      "code": code,
-    };
+    return {"name": name, "code": code};
   }
 }
diff --git a/lib/src/models/continent_list.dart b/lib/src/models/continent_list.dart
index 97b7d84c..ec2c0755 100644
--- a/lib/src/models/continent_list.dart
+++ b/lib/src/models/continent_list.dart
@@ -8,16 +8,14 @@ class ContinentList implements Model {
   /// List of continents.
   final List<Continent> continents;
 
-  ContinentList({
-    required this.total,
-    required this.continents,
-  });
+  ContinentList({required this.total, required this.continents});
 
   factory ContinentList.fromMap(Map<String, dynamic> map) {
     return ContinentList(
       total: map['total'],
       continents: List<Continent>.from(
-          map['continents'].map((p) => Continent.fromMap(p))),
+        map['continents'].map((p) => Continent.fromMap(p)),
+      ),
     );
   }
 
diff --git a/lib/src/models/country.dart b/lib/src/models/country.dart
index d11c55db..c52b50f2 100644
--- a/lib/src/models/country.dart
+++ b/lib/src/models/country.dart
@@ -8,22 +8,13 @@ class Country implements Model {
   /// Country two-character ISO 3166-1 alpha code.
   final String code;
 
-  Country({
-    required this.name,
-    required this.code,
-  });
+  Country({required this.name, required this.code});
 
   factory Country.fromMap(Map<String, dynamic> map) {
-    return Country(
-      name: map['name'].toString(),
-      code: map['code'].toString(),
-    );
+    return Country(name: map['name'].toString(), code: map['code'].toString());
   }
 
   Map<String, dynamic> toMap() {
-    return {
-      "name": name,
-      "code": code,
-    };
+    return {"name": name, "code": code};
   }
 }
diff --git a/lib/src/models/country_list.dart b/lib/src/models/country_list.dart
index 0765c718..65e13be3 100644
--- a/lib/src/models/country_list.dart
+++ b/lib/src/models/country_list.dart
@@ -8,16 +8,14 @@ class CountryList implements Model {
   /// List of countries.
   final List<Country> countries;
 
-  CountryList({
-    required this.total,
-    required this.countries,
-  });
+  CountryList({required this.total, required this.countries});
 
   factory CountryList.fromMap(Map<String, dynamic> map) {
     return CountryList(
       total: map['total'],
-      countries:
-          List<Country>.from(map['countries'].map((p) => Country.fromMap(p))),
+      countries: List<Country>.from(
+        map['countries'].map((p) => Country.fromMap(p)),
+      ),
     );
   }
 
diff --git a/lib/src/models/currency_list.dart b/lib/src/models/currency_list.dart
index 46377f23..7a957f1a 100644
--- a/lib/src/models/currency_list.dart
+++ b/lib/src/models/currency_list.dart
@@ -8,16 +8,14 @@ class CurrencyList implements Model {
   /// List of currencies.
   final List<Currency> currencies;
 
-  CurrencyList({
-    required this.total,
-    required this.currencies,
-  });
+  CurrencyList({required this.total, required this.currencies});
 
   factory CurrencyList.fromMap(Map<String, dynamic> map) {
     return CurrencyList(
       total: map['total'],
       currencies: List<Currency>.from(
-          map['currencies'].map((p) => Currency.fromMap(p))),
+        map['currencies'].map((p) => Currency.fromMap(p)),
+      ),
     );
   }
 
diff --git a/lib/src/models/document_list.dart b/lib/src/models/document_list.dart
index 2fa82c23..4065e17b 100644
--- a/lib/src/models/document_list.dart
+++ b/lib/src/models/document_list.dart
@@ -8,16 +8,14 @@ class DocumentList implements Model {
   /// List of documents.
   final List<Document> documents;
 
-  DocumentList({
-    required this.total,
-    required this.documents,
-  });
+  DocumentList({required this.total, required this.documents});
 
   factory DocumentList.fromMap(Map<String, dynamic> map) {
     return DocumentList(
       total: map['total'],
-      documents:
-          List<Document>.from(map['documents'].map((p) => Document.fromMap(p))),
+      documents: List<Document>.from(
+        map['documents'].map((p) => Document.fromMap(p)),
+      ),
     );
   }
 
diff --git a/lib/src/models/execution.dart b/lib/src/models/execution.dart
index e67bbd8a..0da5c52f 100644
--- a/lib/src/models/execution.dart
+++ b/lib/src/models/execution.dart
@@ -32,7 +32,7 @@ class Execution implements Model {
   /// HTTP request path and query.
   final String requestPath;
 
-  /// HTTP response headers as a key-value object. This will return only whitelisted headers. All headers are returned if execution is created as synchronous.
+  /// HTTP request headers as a key-value object. This will return only whitelisted headers. All headers are returned if execution is created as synchronous.
   final List<Headers> requestHeaders;
 
   /// HTTP response status code.
@@ -90,11 +90,13 @@ class Execution implements Model {
       requestMethod: map['requestMethod'].toString(),
       requestPath: map['requestPath'].toString(),
       requestHeaders: List<Headers>.from(
-          map['requestHeaders'].map((p) => Headers.fromMap(p))),
+        map['requestHeaders'].map((p) => Headers.fromMap(p)),
+      ),
       responseStatusCode: map['responseStatusCode'],
       responseBody: map['responseBody'].toString(),
       responseHeaders: List<Headers>.from(
-          map['responseHeaders'].map((p) => Headers.fromMap(p))),
+        map['responseHeaders'].map((p) => Headers.fromMap(p)),
+      ),
       logs: map['logs'].toString(),
       errors: map['errors'].toString(),
       duration: map['duration'].toDouble(),
diff --git a/lib/src/models/execution_list.dart b/lib/src/models/execution_list.dart
index 5024dd66..4ed73943 100644
--- a/lib/src/models/execution_list.dart
+++ b/lib/src/models/execution_list.dart
@@ -8,16 +8,14 @@ class ExecutionList implements Model {
   /// List of executions.
   final List<Execution> executions;
 
-  ExecutionList({
-    required this.total,
-    required this.executions,
-  });
+  ExecutionList({required this.total, required this.executions});
 
   factory ExecutionList.fromMap(Map<String, dynamic> map) {
     return ExecutionList(
       total: map['total'],
       executions: List<Execution>.from(
-          map['executions'].map((p) => Execution.fromMap(p))),
+        map['executions'].map((p) => Execution.fromMap(p)),
+      ),
     );
   }
 
diff --git a/lib/src/models/file_list.dart b/lib/src/models/file_list.dart
index 1e0dcbfa..63f49abc 100644
--- a/lib/src/models/file_list.dart
+++ b/lib/src/models/file_list.dart
@@ -8,10 +8,7 @@ class FileList implements Model {
   /// List of files.
   final List<File> files;
 
-  FileList({
-    required this.total,
-    required this.files,
-  });
+  FileList({required this.total, required this.files});
 
   factory FileList.fromMap(Map<String, dynamic> map) {
     return FileList(
@@ -21,9 +18,6 @@ class FileList implements Model {
   }
 
   Map<String, dynamic> toMap() {
-    return {
-      "total": total,
-      "files": files.map((p) => p.toMap()).toList(),
-    };
+    return {"total": total, "files": files.map((p) => p.toMap()).toList()};
   }
 }
diff --git a/lib/src/models/headers.dart b/lib/src/models/headers.dart
index 22494998..463cf696 100644
--- a/lib/src/models/headers.dart
+++ b/lib/src/models/headers.dart
@@ -8,10 +8,7 @@ class Headers implements Model {
   /// Header value.
   final String value;
 
-  Headers({
-    required this.name,
-    required this.value,
-  });
+  Headers({required this.name, required this.value});
 
   factory Headers.fromMap(Map<String, dynamic> map) {
     return Headers(
@@ -21,9 +18,6 @@ class Headers implements Model {
   }
 
   Map<String, dynamic> toMap() {
-    return {
-      "name": name,
-      "value": value,
-    };
+    return {"name": name, "value": value};
   }
 }
diff --git a/lib/src/models/identity_list.dart b/lib/src/models/identity_list.dart
index d63ab259..b4c63f7d 100644
--- a/lib/src/models/identity_list.dart
+++ b/lib/src/models/identity_list.dart
@@ -8,16 +8,14 @@ class IdentityList implements Model {
   /// List of identities.
   final List<Identity> identities;
 
-  IdentityList({
-    required this.total,
-    required this.identities,
-  });
+  IdentityList({required this.total, required this.identities});
 
   factory IdentityList.fromMap(Map<String, dynamic> map) {
     return IdentityList(
       total: map['total'],
       identities: List<Identity>.from(
-          map['identities'].map((p) => Identity.fromMap(p))),
+        map['identities'].map((p) => Identity.fromMap(p)),
+      ),
     );
   }
 
diff --git a/lib/src/models/jwt.dart b/lib/src/models/jwt.dart
index e2e31bd2..490a1824 100644
--- a/lib/src/models/jwt.dart
+++ b/lib/src/models/jwt.dart
@@ -5,19 +5,13 @@ class Jwt implements Model {
   /// JWT encoded string.
   final String jwt;
 
-  Jwt({
-    required this.jwt,
-  });
+  Jwt({required this.jwt});
 
   factory Jwt.fromMap(Map<String, dynamic> map) {
-    return Jwt(
-      jwt: map['jwt'].toString(),
-    );
+    return Jwt(jwt: map['jwt'].toString());
   }
 
   Map<String, dynamic> toMap() {
-    return {
-      "jwt": jwt,
-    };
+    return {"jwt": jwt};
   }
 }
diff --git a/lib/src/models/language.dart b/lib/src/models/language.dart
index b6ec6121..9c45adb1 100644
--- a/lib/src/models/language.dart
+++ b/lib/src/models/language.dart
@@ -11,11 +11,7 @@ class Language implements Model {
   /// Language native name.
   final String nativeName;
 
-  Language({
-    required this.name,
-    required this.code,
-    required this.nativeName,
-  });
+  Language({required this.name, required this.code, required this.nativeName});
 
   factory Language.fromMap(Map<String, dynamic> map) {
     return Language(
@@ -26,10 +22,6 @@ class Language implements Model {
   }
 
   Map<String, dynamic> toMap() {
-    return {
-      "name": name,
-      "code": code,
-      "nativeName": nativeName,
-    };
+    return {"name": name, "code": code, "nativeName": nativeName};
   }
 }
diff --git a/lib/src/models/language_list.dart b/lib/src/models/language_list.dart
index d9ab36f3..2e65839e 100644
--- a/lib/src/models/language_list.dart
+++ b/lib/src/models/language_list.dart
@@ -8,16 +8,14 @@ class LanguageList implements Model {
   /// List of languages.
   final List<Language> languages;
 
-  LanguageList({
-    required this.total,
-    required this.languages,
-  });
+  LanguageList({required this.total, required this.languages});
 
   factory LanguageList.fromMap(Map<String, dynamic> map) {
     return LanguageList(
       total: map['total'],
-      languages:
-          List<Language>.from(map['languages'].map((p) => Language.fromMap(p))),
+      languages: List<Language>.from(
+        map['languages'].map((p) => Language.fromMap(p)),
+      ),
     );
   }
 
diff --git a/lib/src/models/locale_code.dart b/lib/src/models/locale_code.dart
index 678e40c4..cd5a1155 100644
--- a/lib/src/models/locale_code.dart
+++ b/lib/src/models/locale_code.dart
@@ -8,10 +8,7 @@ class LocaleCode implements Model {
   /// Locale name
   final String name;
 
-  LocaleCode({
-    required this.code,
-    required this.name,
-  });
+  LocaleCode({required this.code, required this.name});
 
   factory LocaleCode.fromMap(Map<String, dynamic> map) {
     return LocaleCode(
@@ -21,9 +18,6 @@ class LocaleCode implements Model {
   }
 
   Map<String, dynamic> toMap() {
-    return {
-      "code": code,
-      "name": name,
-    };
+    return {"code": code, "name": name};
   }
 }
diff --git a/lib/src/models/locale_code_list.dart b/lib/src/models/locale_code_list.dart
index db6cd869..be6ddb1f 100644
--- a/lib/src/models/locale_code_list.dart
+++ b/lib/src/models/locale_code_list.dart
@@ -8,16 +8,14 @@ class LocaleCodeList implements Model {
   /// List of localeCodes.
   final List<LocaleCode> localeCodes;
 
-  LocaleCodeList({
-    required this.total,
-    required this.localeCodes,
-  });
+  LocaleCodeList({required this.total, required this.localeCodes});
 
   factory LocaleCodeList.fromMap(Map<String, dynamic> map) {
     return LocaleCodeList(
       total: map['total'],
       localeCodes: List<LocaleCode>.from(
-          map['localeCodes'].map((p) => LocaleCode.fromMap(p))),
+        map['localeCodes'].map((p) => LocaleCode.fromMap(p)),
+      ),
     );
   }
 
diff --git a/lib/src/models/log_list.dart b/lib/src/models/log_list.dart
index 29399cb9..22273a8c 100644
--- a/lib/src/models/log_list.dart
+++ b/lib/src/models/log_list.dart
@@ -8,10 +8,7 @@ class LogList implements Model {
   /// List of logs.
   final List<Log> logs;
 
-  LogList({
-    required this.total,
-    required this.logs,
-  });
+  LogList({required this.total, required this.logs});
 
   factory LogList.fromMap(Map<String, dynamic> map) {
     return LogList(
@@ -21,9 +18,6 @@ class LogList implements Model {
   }
 
   Map<String, dynamic> toMap() {
-    return {
-      "total": total,
-      "logs": logs.map((p) => p.toMap()).toList(),
-    };
+    return {"total": total, "logs": logs.map((p) => p.toMap()).toList()};
   }
 }
diff --git a/lib/src/models/membership_list.dart b/lib/src/models/membership_list.dart
index bcfb227c..a4d39dca 100644
--- a/lib/src/models/membership_list.dart
+++ b/lib/src/models/membership_list.dart
@@ -8,16 +8,14 @@ class MembershipList implements Model {
   /// List of memberships.
   final List<Membership> memberships;
 
-  MembershipList({
-    required this.total,
-    required this.memberships,
-  });
+  MembershipList({required this.total, required this.memberships});
 
   factory MembershipList.fromMap(Map<String, dynamic> map) {
     return MembershipList(
       total: map['total'],
       memberships: List<Membership>.from(
-          map['memberships'].map((p) => Membership.fromMap(p))),
+        map['memberships'].map((p) => Membership.fromMap(p)),
+      ),
     );
   }
 
diff --git a/lib/src/models/mfa_recovery_codes.dart b/lib/src/models/mfa_recovery_codes.dart
index 425539e8..63411988 100644
--- a/lib/src/models/mfa_recovery_codes.dart
+++ b/lib/src/models/mfa_recovery_codes.dart
@@ -5,9 +5,7 @@ class MfaRecoveryCodes implements Model {
   /// Recovery codes.
   final List<String> recoveryCodes;
 
-  MfaRecoveryCodes({
-    required this.recoveryCodes,
-  });
+  MfaRecoveryCodes({required this.recoveryCodes});
 
   factory MfaRecoveryCodes.fromMap(Map<String, dynamic> map) {
     return MfaRecoveryCodes(
@@ -16,8 +14,6 @@ class MfaRecoveryCodes implements Model {
   }
 
   Map<String, dynamic> toMap() {
-    return {
-      "recoveryCodes": recoveryCodes,
-    };
+    return {"recoveryCodes": recoveryCodes};
   }
 }
diff --git a/lib/src/models/mfa_type.dart b/lib/src/models/mfa_type.dart
index 0573166e..fa57cb8b 100644
--- a/lib/src/models/mfa_type.dart
+++ b/lib/src/models/mfa_type.dart
@@ -8,10 +8,7 @@ class MfaType implements Model {
   /// URI for authenticator apps.
   final String uri;
 
-  MfaType({
-    required this.secret,
-    required this.uri,
-  });
+  MfaType({required this.secret, required this.uri});
 
   factory MfaType.fromMap(Map<String, dynamic> map) {
     return MfaType(
@@ -21,9 +18,6 @@ class MfaType implements Model {
   }
 
   Map<String, dynamic> toMap() {
-    return {
-      "secret": secret,
-      "uri": uri,
-    };
+    return {"secret": secret, "uri": uri};
   }
 }
diff --git a/lib/src/models/phone_list.dart b/lib/src/models/phone_list.dart
index cf703f96..879edbc4 100644
--- a/lib/src/models/phone_list.dart
+++ b/lib/src/models/phone_list.dart
@@ -8,10 +8,7 @@ class PhoneList implements Model {
   /// List of phones.
   final List<Phone> phones;
 
-  PhoneList({
-    required this.total,
-    required this.phones,
-  });
+  PhoneList({required this.total, required this.phones});
 
   factory PhoneList.fromMap(Map<String, dynamic> map) {
     return PhoneList(
@@ -21,9 +18,6 @@ class PhoneList implements Model {
   }
 
   Map<String, dynamic> toMap() {
-    return {
-      "total": total,
-      "phones": phones.map((p) => p.toMap()).toList(),
-    };
+    return {"total": total, "phones": phones.map((p) => p.toMap()).toList()};
   }
 }
diff --git a/lib/src/models/preferences.dart b/lib/src/models/preferences.dart
index aa9cb4ed..7bc3abc9 100644
--- a/lib/src/models/preferences.dart
+++ b/lib/src/models/preferences.dart
@@ -4,20 +4,14 @@ part of '../../models.dart';
 class Preferences implements Model {
   final Map<String, dynamic> data;
 
-  Preferences({
-    required this.data,
-  });
+  Preferences({required this.data});
 
   factory Preferences.fromMap(Map<String, dynamic> map) {
-    return Preferences(
-      data: map,
-    );
+    return Preferences(data: map);
   }
 
   Map<String, dynamic> toMap() {
-    return {
-      "data": data,
-    };
+    return {"data": data};
   }
 
   T convertTo<T>(T Function(Map<String, dynamic>) fromJson) => fromJson(data);
diff --git a/lib/src/models/row_list.dart b/lib/src/models/row_list.dart
index 50525e63..01f046c6 100644
--- a/lib/src/models/row_list.dart
+++ b/lib/src/models/row_list.dart
@@ -8,10 +8,7 @@ class RowList implements Model {
   /// List of rows.
   final List<Row> rows;
 
-  RowList({
-    required this.total,
-    required this.rows,
-  });
+  RowList({required this.total, required this.rows});
 
   factory RowList.fromMap(Map<String, dynamic> map) {
     return RowList(
@@ -21,10 +18,7 @@ class RowList implements Model {
   }
 
   Map<String, dynamic> toMap() {
-    return {
-      "total": total,
-      "rows": rows.map((p) => p.toMap()).toList(),
-    };
+    return {"total": total, "rows": rows.map((p) => p.toMap()).toList()};
   }
 
   List<T> convertTo<T>(T Function(Map) fromJson) =>
diff --git a/lib/src/models/session_list.dart b/lib/src/models/session_list.dart
index 997a1952..e9c478af 100644
--- a/lib/src/models/session_list.dart
+++ b/lib/src/models/session_list.dart
@@ -8,16 +8,14 @@ class SessionList implements Model {
   /// List of sessions.
   final List<Session> sessions;
 
-  SessionList({
-    required this.total,
-    required this.sessions,
-  });
+  SessionList({required this.total, required this.sessions});
 
   factory SessionList.fromMap(Map<String, dynamic> map) {
     return SessionList(
       total: map['total'],
-      sessions:
-          List<Session>.from(map['sessions'].map((p) => Session.fromMap(p))),
+      sessions: List<Session>.from(
+        map['sessions'].map((p) => Session.fromMap(p)),
+      ),
     );
   }
 
diff --git a/lib/src/models/team_list.dart b/lib/src/models/team_list.dart
index 351123c9..a3994c06 100644
--- a/lib/src/models/team_list.dart
+++ b/lib/src/models/team_list.dart
@@ -8,10 +8,7 @@ class TeamList implements Model {
   /// List of teams.
   final List<Team> teams;
 
-  TeamList({
-    required this.total,
-    required this.teams,
-  });
+  TeamList({required this.total, required this.teams});
 
   factory TeamList.fromMap(Map<String, dynamic> map) {
     return TeamList(
@@ -21,9 +18,6 @@ class TeamList implements Model {
   }
 
   Map<String, dynamic> toMap() {
-    return {
-      "total": total,
-      "teams": teams.map((p) => p.toMap()).toList(),
-    };
+    return {"total": total, "teams": teams.map((p) => p.toMap()).toList()};
   }
 }
diff --git a/lib/src/realtime_io.dart b/lib/src/realtime_io.dart
index 60dc68c7..e54546b5 100644
--- a/lib/src/realtime_io.dart
+++ b/lib/src/realtime_io.dart
@@ -32,9 +32,11 @@ class RealtimeIO extends RealtimeBase with RealtimeMixin {
     final cookies = await (client as ClientIO).cookieJar.loadForRequest(uri);
     headers = {HttpHeaders.cookieHeader: CookieManager.getCookies(cookies)};
 
-    final _websok = IOWebSocketChannel((client as ClientIO).selfSigned
-        ? await _connectForSelfSignedCert(uri, headers)
-        : await WebSocket.connect(uri.toString(), headers: headers));
+    final _websok = IOWebSocketChannel(
+      (client as ClientIO).selfSigned
+          ? await _connectForSelfSignedCert(uri, headers)
+          : await WebSocket.connect(uri.toString(), headers: headers),
+    );
     return _websok;
   }
 
@@ -50,16 +52,18 @@ class RealtimeIO extends RealtimeBase with RealtimeMixin {
   // https://github.com/jonataslaw/getsocket/blob/f25b3a264d8cc6f82458c949b86d286cd0343792/lib/src/io.dart#L104
   // and from official dart sdk websocket_impl.dart connect method
   Future<WebSocket> _connectForSelfSignedCert(
-      Uri uri, Map<String, dynamic> headers) async {
+    Uri uri,
+    Map<String, dynamic> headers,
+  ) async {
     try {
       var r = Random();
       var key = base64.encode(List<int>.generate(16, (_) => r.nextInt(255)));
       var client = HttpClient(context: SecurityContext());
       client.badCertificateCallback =
           (X509Certificate cert, String host, int port) {
-        debugPrint('AppwriteRealtime: Allow self-signed certificate');
-        return true;
-      };
+            debugPrint('AppwriteRealtime: Allow self-signed certificate');
+            return true;
+          };
 
       uri = Uri(
         scheme: uri.scheme == 'wss' ? 'https' : 'http',
diff --git a/lib/src/realtime_mixin.dart b/lib/src/realtime_mixin.dart
index 01e76552..fc8817c2 100644
--- a/lib/src/realtime_mixin.dart
+++ b/lib/src/realtime_mixin.dart
@@ -70,53 +70,57 @@ mixin RealtimeMixin {
       }
       debugPrint('subscription: $_lastUrl');
       _retries = 0;
-      _websocketSubscription = _websok?.stream.listen((response) {
-        final data = RealtimeResponse.fromJson(response);
-        switch (data.type) {
-          case 'error':
-            handleError(data);
-            break;
-          case 'connected':
-            // channels, user?
-            final message = RealtimeResponseConnected.fromMap(data.data);
-            if (message.user.isEmpty) {
-              // send fallback cookie if exists
-              final cookie = getFallbackCookie?.call();
-              if (cookie != null) {
-                _websok?.sink.add(jsonEncode({
-                  "type": "authentication",
-                  "data": {
-                    "session": cookie,
-                  },
-                }));
+      _websocketSubscription = _websok?.stream.listen(
+        (response) {
+          final data = RealtimeResponse.fromJson(response);
+          switch (data.type) {
+            case 'error':
+              handleError(data);
+              break;
+            case 'connected':
+              // channels, user?
+              final message = RealtimeResponseConnected.fromMap(data.data);
+              if (message.user.isEmpty) {
+                // send fallback cookie if exists
+                final cookie = getFallbackCookie?.call();
+                if (cookie != null) {
+                  _websok?.sink.add(
+                    jsonEncode({
+                      "type": "authentication",
+                      "data": {"session": cookie},
+                    }),
+                  );
+                }
               }
-            }
-            _startHeartbeat(); // Start heartbeat after successful connection
-            break;
-          case 'pong':
-            debugPrint('Received heartbeat response from realtime server');
-            break;
-          case 'event':
-            final message = RealtimeMessage.fromMap(data.data);
-            for (var subscription in _subscriptions.values) {
-              for (var channel in message.channels) {
-                if (subscription.channels.contains(channel)) {
-                  subscription.controller.add(message);
+              _startHeartbeat(); // Start heartbeat after successful connection
+              break;
+            case 'pong':
+              debugPrint('Received heartbeat response from realtime server');
+              break;
+            case 'event':
+              final message = RealtimeMessage.fromMap(data.data);
+              for (var subscription in _subscriptions.values) {
+                for (var channel in message.channels) {
+                  if (subscription.channels.contains(channel)) {
+                    subscription.controller.add(message);
+                  }
                 }
               }
-            }
-            break;
-        }
-      }, onDone: () {
-        _stopHeartbeat();
-        _retry();
-      }, onError: (err, stack) {
-        _stopHeartbeat();
-        for (var subscription in _subscriptions.values) {
-          subscription.controller.addError(err, stack);
-        }
-        _retry();
-      });
+              break;
+          }
+        },
+        onDone: () {
+          _stopHeartbeat();
+          _retry();
+        },
+        onError: (err, stack) {
+          _stopHeartbeat();
+          for (var subscription in _subscriptions.values) {
+            subscription.controller.addError(err, stack);
+          }
+          _retry();
+        },
+      );
     } catch (e) {
       if (e is AppwriteException) {
         rethrow;
@@ -142,16 +146,17 @@ mixin RealtimeMixin {
     return _retries < 5
         ? 1
         : _retries < 15
-            ? 5
-            : _retries < 100
-                ? 10
-                : 60;
+        ? 5
+        : _retries < 100
+        ? 10
+        : 60;
   }
 
   Uri _prepareUri() {
     if (client.endPointRealtime == null) {
       throw AppwriteException(
-          "Please set endPointRealtime to connect to realtime server");
+        "Please set endPointRealtime to connect to realtime server",
+      );
     }
     var uri = Uri.parse(client.endPointRealtime!);
     return Uri(
@@ -172,27 +177,29 @@ mixin RealtimeMixin {
     Future.delayed(Duration.zero, () => _createSocket());
     int id = DateTime.now().microsecondsSinceEpoch;
     RealtimeSubscription subscription = RealtimeSubscription(
-        controller: controller,
-        channels: channels,
-        close: () async {
-          _subscriptions.remove(id);
-          controller.close();
-          _cleanup(channels);
+      controller: controller,
+      channels: channels,
+      close: () async {
+        _subscriptions.remove(id);
+        controller.close();
+        _cleanup(channels);
 
-          if (_channels.isNotEmpty) {
-            await Future.delayed(Duration.zero, () => _createSocket());
-          } else {
-            await _closeConnection();
-          }
-        });
+        if (_channels.isNotEmpty) {
+          await Future.delayed(Duration.zero, () => _createSocket());
+        } else {
+          await _closeConnection();
+        }
+      },
+    );
     _subscriptions[id] = subscription;
     return subscription;
   }
 
   void _cleanup(List<String> channels) {
     for (var channel in channels) {
-      bool found = _subscriptions.values
-          .any((subscription) => subscription.channels.contains(channel));
+      bool found = _subscriptions.values.any(
+        (subscription) => subscription.channels.contains(channel),
+      );
       if (!found) {
         _channels.remove(channel);
       }
diff --git a/lib/src/realtime_response.dart b/lib/src/realtime_response.dart
index b0356111..e444cd0b 100644
--- a/lib/src/realtime_response.dart
+++ b/lib/src/realtime_response.dart
@@ -4,26 +4,14 @@ import 'package:flutter/foundation.dart';
 class RealtimeResponse {
   final String type; // error, event, connected, response
   final Map<String, dynamic> data;
-  RealtimeResponse({
-    required this.type,
-    required this.data,
-  });
-
-  RealtimeResponse copyWith({
-    String? type,
-    Map<String, dynamic>? data,
-  }) {
-    return RealtimeResponse(
-      type: type ?? this.type,
-      data: data ?? this.data,
-    );
+  RealtimeResponse({required this.type, required this.data});
+
+  RealtimeResponse copyWith({String? type, Map<String, dynamic>? data}) {
+    return RealtimeResponse(type: type ?? this.type, data: data ?? this.data);
   }
 
   Map<String, dynamic> toMap() {
-    return {
-      'type': type,
-      'data': data,
-    };
+    return {'type': type, 'data': data};
   }
 
   factory RealtimeResponse.fromMap(Map<String, dynamic> map) {
diff --git a/lib/src/realtime_response_connected.dart b/lib/src/realtime_response_connected.dart
index dce0840d..99949587 100644
--- a/lib/src/realtime_response_connected.dart
+++ b/lib/src/realtime_response_connected.dart
@@ -4,10 +4,7 @@ import 'package:flutter/foundation.dart';
 class RealtimeResponseConnected {
   final List<String> channels;
   final Map<String, dynamic> user;
-  RealtimeResponseConnected({
-    required this.channels,
-    this.user = const {},
-  });
+  RealtimeResponseConnected({required this.channels, this.user = const {}});
 
   RealtimeResponseConnected copyWith({
     List<String>? channels,
@@ -20,10 +17,7 @@ class RealtimeResponseConnected {
   }
 
   Map<String, dynamic> toMap() {
-    return {
-      'channels': channels,
-      'user': user,
-    };
+    return {'channels': channels, 'user': user};
   }
 
   factory RealtimeResponseConnected.fromMap(Map<String, dynamic> map) {
diff --git a/lib/src/realtime_stub.dart b/lib/src/realtime_stub.dart
index 3aab4e03..ce0b7e95 100644
--- a/lib/src/realtime_stub.dart
+++ b/lib/src/realtime_stub.dart
@@ -3,5 +3,5 @@ import 'client.dart';
 
 /// Implemented in `realtime_browser.dart` and `realtime_io.dart`.
 RealtimeBase createRealtime(Client client) => throw UnsupportedError(
-      'Cannot create a client without dart:html or dart:io.',
-    );
+  'Cannot create a client without dart:html or dart:io.',
+);
diff --git a/pubspec.yaml b/pubspec.yaml
index 62d93e2b..f6fa4f09 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: appwrite
-version: 19.0.0
+version: 19.1.0
 description: Appwrite is an open-source self-hosted backend server that abstract and simplify complex and repetitive development tasks behind a very simple REST API
 homepage: https://appwrite.io
 repository: https://github.com/appwrite/sdk-for-flutter
diff --git a/test/query_test.dart b/test/query_test.dart
index 4b5697bb..f6302ab5 100644
--- a/test/query_test.dart
+++ b/test/query_test.dart
@@ -186,6 +186,13 @@ void main() {
     expect(query['method'], 'orderDesc');
   });
 
+  test('returns orderRandom', () {
+    final query = jsonDecode(Query.orderRandom());
+    expect(query['attribute'], null);
+    expect(query['values'], null);
+    expect(query['method'], 'orderRandom');
+  });
+
   test('returns cursorBefore', () {
     final query = jsonDecode(Query.cursorBefore('custom'));
     expect(query['attribute'], null);
@@ -307,3 +314,4 @@ void main() {
     expect(query['method'], 'updatedBetween');
   });
 }
+
diff --git a/test/services/account_test.dart b/test/services/account_test.dart
index 475b86e7..ac86fdd1 100644
--- a/test/services/account_test.dart
+++ b/test/services/account_test.dart
@@ -24,11 +24,12 @@ class MockClient extends Mock implements Client {
 
   @override
   Future webAuth(
-    Uri? url, {
-    String? callbackUrlScheme,
-  }) async {
-    return super
-        .noSuchMethod(Invocation.method(#webAuth, [url]), returnValue: 'done');
+    Uri? url,
+    {
+        String? callbackUrlScheme,
+    }
+  ) async {
+    return super.noSuchMethod(Invocation.method(#webAuth, [url]), returnValue: 'done');
   }
 
   @override
@@ -40,1311 +41,1433 @@ class MockClient extends Mock implements Client {
     Map<String, String>? headers,
     Function(UploadProgress)? onProgress,
   }) async {
-    return super.noSuchMethod(
-        Invocation.method(
-            #chunkedUpload, [path, params, paramName, idParamName, headers]),
-        returnValue: Response(data: {}));
+    return super.noSuchMethod(Invocation.method(#chunkedUpload, [path, params, paramName, idParamName, headers]), returnValue: Response(data: {}));
   }
 }
 
 void main() {
-  group('Account test', () {
-    late MockClient client;
-    late Account account;
+    group('Account test', () {
+        late MockClient client;
+        late Account account;
+
+        setUp(() {
+            client = MockClient();
+            account = Account(client);
+        });
+
+        test('test method get()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                'name': 'John Doe',
+                'registration': '2020-10-15T06:38:00.000+00:00',
+                'status': true,
+                'labels': [],
+                'passwordUpdate': '2020-10-15T06:38:00.000+00:00',
+                'email': 'john@appwrite.io',
+                'phone': '+4930901820',
+                'emailVerification': true,
+                'phoneVerification': true,
+                'mfa': true,
+                'prefs': <String, dynamic>{},
+                'targets': [],
+                'accessedAt': '2020-10-15T06:38:00.000+00:00',};
+
+
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.get(
+            );
+            expect(response, isA<models.User>());
+
+        });
+
+        test('test method create()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                'name': 'John Doe',
+                'registration': '2020-10-15T06:38:00.000+00:00',
+                'status': true,
+                'labels': [],
+                'passwordUpdate': '2020-10-15T06:38:00.000+00:00',
+                'email': 'john@appwrite.io',
+                'phone': '+4930901820',
+                'emailVerification': true,
+                'phoneVerification': true,
+                'mfa': true,
+                'prefs': <String, dynamic>{},
+                'targets': [],
+                'accessedAt': '2020-10-15T06:38:00.000+00:00',};
+
+
+            when(client.call(
+                HttpMethod.post,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.create(
+                userId: '<USER_ID>',
+                email: 'email@example.com',
+                password: '',
+            );
+            expect(response, isA<models.User>());
+
+        });
+
+        test('test method updateEmail()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                'name': 'John Doe',
+                'registration': '2020-10-15T06:38:00.000+00:00',
+                'status': true,
+                'labels': [],
+                'passwordUpdate': '2020-10-15T06:38:00.000+00:00',
+                'email': 'john@appwrite.io',
+                'phone': '+4930901820',
+                'emailVerification': true,
+                'phoneVerification': true,
+                'mfa': true,
+                'prefs': <String, dynamic>{},
+                'targets': [],
+                'accessedAt': '2020-10-15T06:38:00.000+00:00',};
+
+
+            when(client.call(
+                HttpMethod.patch,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.updateEmail(
+                email: 'email@example.com',
+                password: 'password',
+            );
+            expect(response, isA<models.User>());
+
+        });
+
+        test('test method listIdentities()', () async {
+            final Map<String, dynamic> data = {
+                'total': 5,
+                'identities': [],};
+
 
-    setUp(() {
-      client = MockClient();
-      account = Account(client);
-    });
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
 
-    test('test method get()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        'name': 'John Doe',
-        'registration': '2020-10-15T06:38:00.000+00:00',
-        'status': true,
-        'labels': [],
-        'passwordUpdate': '2020-10-15T06:38:00.000+00:00',
-        'email': 'john@appwrite.io',
-        'phone': '+4930901820',
-        'emailVerification': true,
-        'phoneVerification': true,
-        'mfa': true,
-        'prefs': <String, dynamic>{},
-        'targets': [],
-        'accessedAt': '2020-10-15T06:38:00.000+00:00',
-      };
-
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await account.get();
-      expect(response, isA<models.User>());
-    });
 
-    test('test method create()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        'name': 'John Doe',
-        'registration': '2020-10-15T06:38:00.000+00:00',
-        'status': true,
-        'labels': [],
-        'passwordUpdate': '2020-10-15T06:38:00.000+00:00',
-        'email': 'john@appwrite.io',
-        'phone': '+4930901820',
-        'emailVerification': true,
-        'phoneVerification': true,
-        'mfa': true,
-        'prefs': <String, dynamic>{},
-        'targets': [],
-        'accessedAt': '2020-10-15T06:38:00.000+00:00',
-      };
-
-      when(client.call(
-        HttpMethod.post,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await account.create(
-        userId: '<USER_ID>',
-        email: 'email@example.com',
-        password: '',
-      );
-      expect(response, isA<models.User>());
-    });
+            final response = await account.listIdentities(
+            );
+            expect(response, isA<models.IdentityList>());
 
-    test('test method updateEmail()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        'name': 'John Doe',
-        'registration': '2020-10-15T06:38:00.000+00:00',
-        'status': true,
-        'labels': [],
-        'passwordUpdate': '2020-10-15T06:38:00.000+00:00',
-        'email': 'john@appwrite.io',
-        'phone': '+4930901820',
-        'emailVerification': true,
-        'phoneVerification': true,
-        'mfa': true,
-        'prefs': <String, dynamic>{},
-        'targets': [],
-        'accessedAt': '2020-10-15T06:38:00.000+00:00',
-      };
-
-      when(client.call(
-        HttpMethod.patch,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await account.updateEmail(
-        email: 'email@example.com',
-        password: 'password',
-      );
-      expect(response, isA<models.User>());
-    });
+        });
 
-    test('test method listIdentities()', () async {
-      final Map<String, dynamic> data = {
-        'total': 5,
-        'identities': [],
-      };
+        test('test method deleteIdentity()', () async {
+            final data = '';
 
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
+            when(client.call(
+                HttpMethod.delete,
+            )).thenAnswer((_) async => Response(data: data));
 
-      final response = await account.listIdentities();
-      expect(response, isA<models.IdentityList>());
-    });
 
-    test('test method deleteIdentity()', () async {
-      final data = '';
+            final response = await account.deleteIdentity(
+                identityId: '<IDENTITY_ID>',
+            );
+        });
 
-      when(client.call(
-        HttpMethod.delete,
-      )).thenAnswer((_) async => Response(data: data));
+        test('test method createJWT()', () async {
+            final Map<String, dynamic> data = {
+                'jwt': 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c',};
 
-      final response = await account.deleteIdentity(
-        identityId: '<IDENTITY_ID>',
-      );
-    });
 
-    test('test method createJWT()', () async {
-      final Map<String, dynamic> data = {
-        'jwt':
-            'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c',
-      };
+            when(client.call(
+                HttpMethod.post,
+            )).thenAnswer((_) async => Response(data: data));
 
-      when(client.call(
-        HttpMethod.post,
-      )).thenAnswer((_) async => Response(data: data));
 
-      final response = await account.createJWT();
-      expect(response, isA<models.Jwt>());
-    });
+            final response = await account.createJWT(
+            );
+            expect(response, isA<models.Jwt>());
 
-    test('test method listLogs()', () async {
-      final Map<String, dynamic> data = {
-        'total': 5,
-        'logs': [],
-      };
+        });
 
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
+        test('test method listLogs()', () async {
+            final Map<String, dynamic> data = {
+                'total': 5,
+                'logs': [],};
 
-      final response = await account.listLogs();
-      expect(response, isA<models.LogList>());
-    });
 
-    test('test method updateMFA()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        'name': 'John Doe',
-        'registration': '2020-10-15T06:38:00.000+00:00',
-        'status': true,
-        'labels': [],
-        'passwordUpdate': '2020-10-15T06:38:00.000+00:00',
-        'email': 'john@appwrite.io',
-        'phone': '+4930901820',
-        'emailVerification': true,
-        'phoneVerification': true,
-        'mfa': true,
-        'prefs': <String, dynamic>{},
-        'targets': [],
-        'accessedAt': '2020-10-15T06:38:00.000+00:00',
-      };
-
-      when(client.call(
-        HttpMethod.patch,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await account.updateMFA(
-        mfa: true,
-      );
-      expect(response, isA<models.User>());
-    });
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
 
-    test('test method createMfaAuthenticator()', () async {
-      final Map<String, dynamic> data = {
-        'secret': '1',
-        'uri': '1',
-      };
 
-      when(client.call(
-        HttpMethod.post,
-      )).thenAnswer((_) async => Response(data: data));
+            final response = await account.listLogs(
+            );
+            expect(response, isA<models.LogList>());
 
-      final response = await account.createMfaAuthenticator(
-        type: enums.AuthenticatorType.totp,
-      );
-      expect(response, isA<models.MfaType>());
-    });
+        });
 
-    test('test method createMFAAuthenticator()', () async {
-      final Map<String, dynamic> data = {
-        'secret': '1',
-        'uri': '1',
-      };
+        test('test method updateMFA()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                'name': 'John Doe',
+                'registration': '2020-10-15T06:38:00.000+00:00',
+                'status': true,
+                'labels': [],
+                'passwordUpdate': '2020-10-15T06:38:00.000+00:00',
+                'email': 'john@appwrite.io',
+                'phone': '+4930901820',
+                'emailVerification': true,
+                'phoneVerification': true,
+                'mfa': true,
+                'prefs': <String, dynamic>{},
+                'targets': [],
+                'accessedAt': '2020-10-15T06:38:00.000+00:00',};
 
-      when(client.call(
-        HttpMethod.post,
-      )).thenAnswer((_) async => Response(data: data));
 
-      final response = await account.createMFAAuthenticator(
-        type: enums.AuthenticatorType.totp,
-      );
-      expect(response, isA<models.MfaType>());
-    });
+            when(client.call(
+                HttpMethod.patch,
+            )).thenAnswer((_) async => Response(data: data));
 
-    test('test method updateMfaAuthenticator()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        'name': 'John Doe',
-        'registration': '2020-10-15T06:38:00.000+00:00',
-        'status': true,
-        'labels': [],
-        'passwordUpdate': '2020-10-15T06:38:00.000+00:00',
-        'email': 'john@appwrite.io',
-        'phone': '+4930901820',
-        'emailVerification': true,
-        'phoneVerification': true,
-        'mfa': true,
-        'prefs': <String, dynamic>{},
-        'targets': [],
-        'accessedAt': '2020-10-15T06:38:00.000+00:00',
-      };
-
-      when(client.call(
-        HttpMethod.put,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await account.updateMfaAuthenticator(
-        type: enums.AuthenticatorType.totp,
-        otp: '<OTP>',
-      );
-      expect(response, isA<models.User>());
-    });
 
-    test('test method updateMFAAuthenticator()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        'name': 'John Doe',
-        'registration': '2020-10-15T06:38:00.000+00:00',
-        'status': true,
-        'labels': [],
-        'passwordUpdate': '2020-10-15T06:38:00.000+00:00',
-        'email': 'john@appwrite.io',
-        'phone': '+4930901820',
-        'emailVerification': true,
-        'phoneVerification': true,
-        'mfa': true,
-        'prefs': <String, dynamic>{},
-        'targets': [],
-        'accessedAt': '2020-10-15T06:38:00.000+00:00',
-      };
-
-      when(client.call(
-        HttpMethod.put,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await account.updateMFAAuthenticator(
-        type: enums.AuthenticatorType.totp,
-        otp: '<OTP>',
-      );
-      expect(response, isA<models.User>());
-    });
+            final response = await account.updateMFA(
+                mfa: true,
+            );
+            expect(response, isA<models.User>());
 
-    test('test method deleteMfaAuthenticator()', () async {
-      final data = '';
+        });
 
-      when(client.call(
-        HttpMethod.delete,
-      )).thenAnswer((_) async => Response(data: data));
+        test('test method createMfaAuthenticator()', () async {
+            final Map<String, dynamic> data = {
+                'secret': '1',
+                'uri': '1',};
 
-      final response = await account.deleteMfaAuthenticator(
-        type: enums.AuthenticatorType.totp,
-      );
-    });
 
-    test('test method deleteMFAAuthenticator()', () async {
-      final data = '';
+            when(client.call(
+                HttpMethod.post,
+            )).thenAnswer((_) async => Response(data: data));
 
-      when(client.call(
-        HttpMethod.delete,
-      )).thenAnswer((_) async => Response(data: data));
 
-      final response = await account.deleteMFAAuthenticator(
-        type: enums.AuthenticatorType.totp,
-      );
-    });
+            final response = await account.createMfaAuthenticator(
+                type: enums.AuthenticatorType.totp,
+            );
+            expect(response, isA<models.MfaType>());
 
-    test('test method createMfaChallenge()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': 'bb8ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        'userId': '5e5ea5c168bb8',
-        'expire': '2020-10-15T06:38:00.000+00:00',
-      };
-
-      when(client.call(
-        HttpMethod.post,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await account.createMfaChallenge(
-        factor: enums.AuthenticationFactor.email,
-      );
-      expect(response, isA<models.MfaChallenge>());
-    });
+        });
 
-    test('test method createMFAChallenge()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': 'bb8ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        'userId': '5e5ea5c168bb8',
-        'expire': '2020-10-15T06:38:00.000+00:00',
-      };
-
-      when(client.call(
-        HttpMethod.post,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await account.createMFAChallenge(
-        factor: enums.AuthenticationFactor.email,
-      );
-      expect(response, isA<models.MfaChallenge>());
-    });
+        test('test method createMFAAuthenticator()', () async {
+            final Map<String, dynamic> data = {
+                'secret': '1',
+                'uri': '1',};
 
-    test('test method updateMfaChallenge()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        'userId': '5e5bb8c16897e',
-        'expire': '2020-10-15T06:38:00.000+00:00',
-        'provider': 'email',
-        'providerUid': 'user@example.com',
-        'providerAccessToken': 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
-        'providerAccessTokenExpiry': '2020-10-15T06:38:00.000+00:00',
-        'providerRefreshToken': 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
-        'ip': '127.0.0.1',
-        'osCode': 'Mac',
-        'osName': 'Mac',
-        'osVersion': 'Mac',
-        'clientType': 'browser',
-        'clientCode': 'CM',
-        'clientName': 'Chrome Mobile iOS',
-        'clientVersion': '84.0',
-        'clientEngine': 'WebKit',
-        'clientEngineVersion': '605.1.15',
-        'deviceName': 'smartphone',
-        'deviceBrand': 'Google',
-        'deviceModel': 'Nexus 5',
-        'countryCode': 'US',
-        'countryName': 'United States',
-        'current': true,
-        'factors': [],
-        'secret': '5e5bb8c16897e',
-        'mfaUpdatedAt': '2020-10-15T06:38:00.000+00:00',
-      };
-
-      when(client.call(
-        HttpMethod.put,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await account.updateMfaChallenge(
-        challengeId: '<CHALLENGE_ID>',
-        otp: '<OTP>',
-      );
-      expect(response, isA<models.Session>());
-    });
 
-    test('test method updateMFAChallenge()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        'userId': '5e5bb8c16897e',
-        'expire': '2020-10-15T06:38:00.000+00:00',
-        'provider': 'email',
-        'providerUid': 'user@example.com',
-        'providerAccessToken': 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
-        'providerAccessTokenExpiry': '2020-10-15T06:38:00.000+00:00',
-        'providerRefreshToken': 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
-        'ip': '127.0.0.1',
-        'osCode': 'Mac',
-        'osName': 'Mac',
-        'osVersion': 'Mac',
-        'clientType': 'browser',
-        'clientCode': 'CM',
-        'clientName': 'Chrome Mobile iOS',
-        'clientVersion': '84.0',
-        'clientEngine': 'WebKit',
-        'clientEngineVersion': '605.1.15',
-        'deviceName': 'smartphone',
-        'deviceBrand': 'Google',
-        'deviceModel': 'Nexus 5',
-        'countryCode': 'US',
-        'countryName': 'United States',
-        'current': true,
-        'factors': [],
-        'secret': '5e5bb8c16897e',
-        'mfaUpdatedAt': '2020-10-15T06:38:00.000+00:00',
-      };
-
-      when(client.call(
-        HttpMethod.put,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await account.updateMFAChallenge(
-        challengeId: '<CHALLENGE_ID>',
-        otp: '<OTP>',
-      );
-      expect(response, isA<models.Session>());
-    });
+            when(client.call(
+                HttpMethod.post,
+            )).thenAnswer((_) async => Response(data: data));
 
-    test('test method listMfaFactors()', () async {
-      final Map<String, dynamic> data = {
-        'totp': true,
-        'phone': true,
-        'email': true,
-        'recoveryCode': true,
-      };
 
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
+            final response = await account.createMFAAuthenticator(
+                type: enums.AuthenticatorType.totp,
+            );
+            expect(response, isA<models.MfaType>());
 
-      final response = await account.listMfaFactors();
-      expect(response, isA<models.MfaFactors>());
-    });
+        });
 
-    test('test method listMFAFactors()', () async {
-      final Map<String, dynamic> data = {
-        'totp': true,
-        'phone': true,
-        'email': true,
-        'recoveryCode': true,
-      };
+        test('test method updateMfaAuthenticator()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                'name': 'John Doe',
+                'registration': '2020-10-15T06:38:00.000+00:00',
+                'status': true,
+                'labels': [],
+                'passwordUpdate': '2020-10-15T06:38:00.000+00:00',
+                'email': 'john@appwrite.io',
+                'phone': '+4930901820',
+                'emailVerification': true,
+                'phoneVerification': true,
+                'mfa': true,
+                'prefs': <String, dynamic>{},
+                'targets': [],
+                'accessedAt': '2020-10-15T06:38:00.000+00:00',};
 
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
 
-      final response = await account.listMFAFactors();
-      expect(response, isA<models.MfaFactors>());
-    });
+            when(client.call(
+                HttpMethod.put,
+            )).thenAnswer((_) async => Response(data: data));
 
-    test('test method getMfaRecoveryCodes()', () async {
-      final Map<String, dynamic> data = {
-        'recoveryCodes': [],
-      };
 
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
+            final response = await account.updateMfaAuthenticator(
+                type: enums.AuthenticatorType.totp,
+                otp: '<OTP>',
+            );
+            expect(response, isA<models.User>());
 
-      final response = await account.getMfaRecoveryCodes();
-      expect(response, isA<models.MfaRecoveryCodes>());
-    });
+        });
 
-    test('test method getMFARecoveryCodes()', () async {
-      final Map<String, dynamic> data = {
-        'recoveryCodes': [],
-      };
+        test('test method updateMFAAuthenticator()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                'name': 'John Doe',
+                'registration': '2020-10-15T06:38:00.000+00:00',
+                'status': true,
+                'labels': [],
+                'passwordUpdate': '2020-10-15T06:38:00.000+00:00',
+                'email': 'john@appwrite.io',
+                'phone': '+4930901820',
+                'emailVerification': true,
+                'phoneVerification': true,
+                'mfa': true,
+                'prefs': <String, dynamic>{},
+                'targets': [],
+                'accessedAt': '2020-10-15T06:38:00.000+00:00',};
+
+
+            when(client.call(
+                HttpMethod.put,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.updateMFAAuthenticator(
+                type: enums.AuthenticatorType.totp,
+                otp: '<OTP>',
+            );
+            expect(response, isA<models.User>());
+
+        });
+
+        test('test method deleteMfaAuthenticator()', () async {
+            final data = '';
+
+            when(client.call(
+                HttpMethod.delete,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.deleteMfaAuthenticator(
+                type: enums.AuthenticatorType.totp,
+            );
+        });
+
+        test('test method deleteMFAAuthenticator()', () async {
+            final data = '';
+
+            when(client.call(
+                HttpMethod.delete,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.deleteMFAAuthenticator(
+                type: enums.AuthenticatorType.totp,
+            );
+        });
+
+        test('test method createMfaChallenge()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': 'bb8ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                'userId': '5e5ea5c168bb8',
+                'expire': '2020-10-15T06:38:00.000+00:00',};
+
+
+            when(client.call(
+                HttpMethod.post,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.createMfaChallenge(
+                factor: enums.AuthenticationFactor.email,
+            );
+            expect(response, isA<models.MfaChallenge>());
+
+        });
+
+        test('test method createMFAChallenge()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': 'bb8ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                'userId': '5e5ea5c168bb8',
+                'expire': '2020-10-15T06:38:00.000+00:00',};
+
+
+            when(client.call(
+                HttpMethod.post,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.createMFAChallenge(
+                factor: enums.AuthenticationFactor.email,
+            );
+            expect(response, isA<models.MfaChallenge>());
+
+        });
+
+        test('test method updateMfaChallenge()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                'userId': '5e5bb8c16897e',
+                'expire': '2020-10-15T06:38:00.000+00:00',
+                'provider': 'email',
+                'providerUid': 'user@example.com',
+                'providerAccessToken': 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
+                'providerAccessTokenExpiry': '2020-10-15T06:38:00.000+00:00',
+                'providerRefreshToken': 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
+                'ip': '127.0.0.1',
+                'osCode': 'Mac',
+                'osName': 'Mac',
+                'osVersion': 'Mac',
+                'clientType': 'browser',
+                'clientCode': 'CM',
+                'clientName': 'Chrome Mobile iOS',
+                'clientVersion': '84.0',
+                'clientEngine': 'WebKit',
+                'clientEngineVersion': '605.1.15',
+                'deviceName': 'smartphone',
+                'deviceBrand': 'Google',
+                'deviceModel': 'Nexus 5',
+                'countryCode': 'US',
+                'countryName': 'United States',
+                'current': true,
+                'factors': [],
+                'secret': '5e5bb8c16897e',
+                'mfaUpdatedAt': '2020-10-15T06:38:00.000+00:00',};
+
+
+            when(client.call(
+                HttpMethod.put,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.updateMfaChallenge(
+                challengeId: '<CHALLENGE_ID>',
+                otp: '<OTP>',
+            );
+            expect(response, isA<models.Session>());
+
+        });
+
+        test('test method updateMFAChallenge()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                'userId': '5e5bb8c16897e',
+                'expire': '2020-10-15T06:38:00.000+00:00',
+                'provider': 'email',
+                'providerUid': 'user@example.com',
+                'providerAccessToken': 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
+                'providerAccessTokenExpiry': '2020-10-15T06:38:00.000+00:00',
+                'providerRefreshToken': 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
+                'ip': '127.0.0.1',
+                'osCode': 'Mac',
+                'osName': 'Mac',
+                'osVersion': 'Mac',
+                'clientType': 'browser',
+                'clientCode': 'CM',
+                'clientName': 'Chrome Mobile iOS',
+                'clientVersion': '84.0',
+                'clientEngine': 'WebKit',
+                'clientEngineVersion': '605.1.15',
+                'deviceName': 'smartphone',
+                'deviceBrand': 'Google',
+                'deviceModel': 'Nexus 5',
+                'countryCode': 'US',
+                'countryName': 'United States',
+                'current': true,
+                'factors': [],
+                'secret': '5e5bb8c16897e',
+                'mfaUpdatedAt': '2020-10-15T06:38:00.000+00:00',};
 
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
 
-      final response = await account.getMFARecoveryCodes();
-      expect(response, isA<models.MfaRecoveryCodes>());
-    });
+            when(client.call(
+                HttpMethod.put,
+            )).thenAnswer((_) async => Response(data: data));
+
 
-    test('test method createMfaRecoveryCodes()', () async {
-      final Map<String, dynamic> data = {
-        'recoveryCodes': [],
-      };
+            final response = await account.updateMFAChallenge(
+                challengeId: '<CHALLENGE_ID>',
+                otp: '<OTP>',
+            );
+            expect(response, isA<models.Session>());
 
-      when(client.call(
-        HttpMethod.post,
-      )).thenAnswer((_) async => Response(data: data));
+        });
 
-      final response = await account.createMfaRecoveryCodes();
-      expect(response, isA<models.MfaRecoveryCodes>());
-    });
+        test('test method listMfaFactors()', () async {
+            final Map<String, dynamic> data = {
+                'totp': true,
+                'phone': true,
+                'email': true,
+                'recoveryCode': true,};
 
-    test('test method createMFARecoveryCodes()', () async {
-      final Map<String, dynamic> data = {
-        'recoveryCodes': [],
-      };
 
-      when(client.call(
-        HttpMethod.post,
-      )).thenAnswer((_) async => Response(data: data));
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
 
-      final response = await account.createMFARecoveryCodes();
-      expect(response, isA<models.MfaRecoveryCodes>());
-    });
 
-    test('test method updateMfaRecoveryCodes()', () async {
-      final Map<String, dynamic> data = {
-        'recoveryCodes': [],
-      };
+            final response = await account.listMfaFactors(
+            );
+            expect(response, isA<models.MfaFactors>());
 
-      when(client.call(
-        HttpMethod.patch,
-      )).thenAnswer((_) async => Response(data: data));
+        });
 
-      final response = await account.updateMfaRecoveryCodes();
-      expect(response, isA<models.MfaRecoveryCodes>());
-    });
+        test('test method listMFAFactors()', () async {
+            final Map<String, dynamic> data = {
+                'totp': true,
+                'phone': true,
+                'email': true,
+                'recoveryCode': true,};
 
-    test('test method updateMFARecoveryCodes()', () async {
-      final Map<String, dynamic> data = {
-        'recoveryCodes': [],
-      };
 
-      when(client.call(
-        HttpMethod.patch,
-      )).thenAnswer((_) async => Response(data: data));
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
 
-      final response = await account.updateMFARecoveryCodes();
-      expect(response, isA<models.MfaRecoveryCodes>());
-    });
 
-    test('test method updateName()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        'name': 'John Doe',
-        'registration': '2020-10-15T06:38:00.000+00:00',
-        'status': true,
-        'labels': [],
-        'passwordUpdate': '2020-10-15T06:38:00.000+00:00',
-        'email': 'john@appwrite.io',
-        'phone': '+4930901820',
-        'emailVerification': true,
-        'phoneVerification': true,
-        'mfa': true,
-        'prefs': <String, dynamic>{},
-        'targets': [],
-        'accessedAt': '2020-10-15T06:38:00.000+00:00',
-      };
-
-      when(client.call(
-        HttpMethod.patch,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await account.updateName(
-        name: '<NAME>',
-      );
-      expect(response, isA<models.User>());
-    });
+            final response = await account.listMFAFactors(
+            );
+            expect(response, isA<models.MfaFactors>());
 
-    test('test method updatePassword()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        'name': 'John Doe',
-        'registration': '2020-10-15T06:38:00.000+00:00',
-        'status': true,
-        'labels': [],
-        'passwordUpdate': '2020-10-15T06:38:00.000+00:00',
-        'email': 'john@appwrite.io',
-        'phone': '+4930901820',
-        'emailVerification': true,
-        'phoneVerification': true,
-        'mfa': true,
-        'prefs': <String, dynamic>{},
-        'targets': [],
-        'accessedAt': '2020-10-15T06:38:00.000+00:00',
-      };
-
-      when(client.call(
-        HttpMethod.patch,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await account.updatePassword(
-        password: '',
-      );
-      expect(response, isA<models.User>());
-    });
+        });
 
-    test('test method updatePhone()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        'name': 'John Doe',
-        'registration': '2020-10-15T06:38:00.000+00:00',
-        'status': true,
-        'labels': [],
-        'passwordUpdate': '2020-10-15T06:38:00.000+00:00',
-        'email': 'john@appwrite.io',
-        'phone': '+4930901820',
-        'emailVerification': true,
-        'phoneVerification': true,
-        'mfa': true,
-        'prefs': <String, dynamic>{},
-        'targets': [],
-        'accessedAt': '2020-10-15T06:38:00.000+00:00',
-      };
-
-      when(client.call(
-        HttpMethod.patch,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await account.updatePhone(
-        phone: '+12065550100',
-        password: 'password',
-      );
-      expect(response, isA<models.User>());
-    });
+        test('test method getMfaRecoveryCodes()', () async {
+            final Map<String, dynamic> data = {
+                'recoveryCodes': [],};
 
-    test('test method getPrefs()', () async {
-      final Map<String, dynamic> data = {};
 
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
 
-      final response = await account.getPrefs();
-      expect(response, isA<models.Preferences>());
-    });
 
-    test('test method updatePrefs()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        'name': 'John Doe',
-        'registration': '2020-10-15T06:38:00.000+00:00',
-        'status': true,
-        'labels': [],
-        'passwordUpdate': '2020-10-15T06:38:00.000+00:00',
-        'email': 'john@appwrite.io',
-        'phone': '+4930901820',
-        'emailVerification': true,
-        'phoneVerification': true,
-        'mfa': true,
-        'prefs': <String, dynamic>{},
-        'targets': [],
-        'accessedAt': '2020-10-15T06:38:00.000+00:00',
-      };
-
-      when(client.call(
-        HttpMethod.patch,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await account.updatePrefs(
-        prefs: {},
-      );
-      expect(response, isA<models.User>());
-    });
+            final response = await account.getMfaRecoveryCodes(
+            );
+            expect(response, isA<models.MfaRecoveryCodes>());
 
-    test('test method createRecovery()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': 'bb8ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        'userId': '5e5ea5c168bb8',
-        'secret': '',
-        'expire': '2020-10-15T06:38:00.000+00:00',
-        'phrase': 'Golden Fox',
-      };
-
-      when(client.call(
-        HttpMethod.post,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await account.createRecovery(
-        email: 'email@example.com',
-        url: 'https://example.com',
-      );
-      expect(response, isA<models.Token>());
-    });
+        });
 
-    test('test method updateRecovery()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': 'bb8ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        'userId': '5e5ea5c168bb8',
-        'secret': '',
-        'expire': '2020-10-15T06:38:00.000+00:00',
-        'phrase': 'Golden Fox',
-      };
-
-      when(client.call(
-        HttpMethod.put,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await account.updateRecovery(
-        userId: '<USER_ID>',
-        secret: '<SECRET>',
-        password: '',
-      );
-      expect(response, isA<models.Token>());
-    });
+        test('test method getMFARecoveryCodes()', () async {
+            final Map<String, dynamic> data = {
+                'recoveryCodes': [],};
 
-    test('test method listSessions()', () async {
-      final Map<String, dynamic> data = {
-        'total': 5,
-        'sessions': [],
-      };
 
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
 
-      final response = await account.listSessions();
-      expect(response, isA<models.SessionList>());
-    });
 
-    test('test method deleteSessions()', () async {
-      final data = '';
+            final response = await account.getMFARecoveryCodes(
+            );
+            expect(response, isA<models.MfaRecoveryCodes>());
 
-      when(client.call(
-        HttpMethod.delete,
-      )).thenAnswer((_) async => Response(data: data));
+        });
 
-      final response = await account.deleteSessions();
-    });
+        test('test method createMfaRecoveryCodes()', () async {
+            final Map<String, dynamic> data = {
+                'recoveryCodes': [],};
 
-    test('test method createAnonymousSession()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        'userId': '5e5bb8c16897e',
-        'expire': '2020-10-15T06:38:00.000+00:00',
-        'provider': 'email',
-        'providerUid': 'user@example.com',
-        'providerAccessToken': 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
-        'providerAccessTokenExpiry': '2020-10-15T06:38:00.000+00:00',
-        'providerRefreshToken': 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
-        'ip': '127.0.0.1',
-        'osCode': 'Mac',
-        'osName': 'Mac',
-        'osVersion': 'Mac',
-        'clientType': 'browser',
-        'clientCode': 'CM',
-        'clientName': 'Chrome Mobile iOS',
-        'clientVersion': '84.0',
-        'clientEngine': 'WebKit',
-        'clientEngineVersion': '605.1.15',
-        'deviceName': 'smartphone',
-        'deviceBrand': 'Google',
-        'deviceModel': 'Nexus 5',
-        'countryCode': 'US',
-        'countryName': 'United States',
-        'current': true,
-        'factors': [],
-        'secret': '5e5bb8c16897e',
-        'mfaUpdatedAt': '2020-10-15T06:38:00.000+00:00',
-      };
-
-      when(client.call(
-        HttpMethod.post,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await account.createAnonymousSession();
-      expect(response, isA<models.Session>());
-    });
 
-    test('test method createEmailPasswordSession()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        'userId': '5e5bb8c16897e',
-        'expire': '2020-10-15T06:38:00.000+00:00',
-        'provider': 'email',
-        'providerUid': 'user@example.com',
-        'providerAccessToken': 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
-        'providerAccessTokenExpiry': '2020-10-15T06:38:00.000+00:00',
-        'providerRefreshToken': 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
-        'ip': '127.0.0.1',
-        'osCode': 'Mac',
-        'osName': 'Mac',
-        'osVersion': 'Mac',
-        'clientType': 'browser',
-        'clientCode': 'CM',
-        'clientName': 'Chrome Mobile iOS',
-        'clientVersion': '84.0',
-        'clientEngine': 'WebKit',
-        'clientEngineVersion': '605.1.15',
-        'deviceName': 'smartphone',
-        'deviceBrand': 'Google',
-        'deviceModel': 'Nexus 5',
-        'countryCode': 'US',
-        'countryName': 'United States',
-        'current': true,
-        'factors': [],
-        'secret': '5e5bb8c16897e',
-        'mfaUpdatedAt': '2020-10-15T06:38:00.000+00:00',
-      };
-
-      when(client.call(
-        HttpMethod.post,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await account.createEmailPasswordSession(
-        email: 'email@example.com',
-        password: 'password',
-      );
-      expect(response, isA<models.Session>());
-    });
+            when(client.call(
+                HttpMethod.post,
+            )).thenAnswer((_) async => Response(data: data));
 
-    test('test method updateMagicURLSession()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        'userId': '5e5bb8c16897e',
-        'expire': '2020-10-15T06:38:00.000+00:00',
-        'provider': 'email',
-        'providerUid': 'user@example.com',
-        'providerAccessToken': 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
-        'providerAccessTokenExpiry': '2020-10-15T06:38:00.000+00:00',
-        'providerRefreshToken': 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
-        'ip': '127.0.0.1',
-        'osCode': 'Mac',
-        'osName': 'Mac',
-        'osVersion': 'Mac',
-        'clientType': 'browser',
-        'clientCode': 'CM',
-        'clientName': 'Chrome Mobile iOS',
-        'clientVersion': '84.0',
-        'clientEngine': 'WebKit',
-        'clientEngineVersion': '605.1.15',
-        'deviceName': 'smartphone',
-        'deviceBrand': 'Google',
-        'deviceModel': 'Nexus 5',
-        'countryCode': 'US',
-        'countryName': 'United States',
-        'current': true,
-        'factors': [],
-        'secret': '5e5bb8c16897e',
-        'mfaUpdatedAt': '2020-10-15T06:38:00.000+00:00',
-      };
-
-      when(client.call(
-        HttpMethod.put,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await account.updateMagicURLSession(
-        userId: '<USER_ID>',
-        secret: '<SECRET>',
-      );
-      expect(response, isA<models.Session>());
-    });
 
-    test('test method createOAuth2Session()', () async {
-      when(client.webAuth(
-        Uri(),
-      )).thenAnswer((_) async => 'done');
+            final response = await account.createMfaRecoveryCodes(
+            );
+            expect(response, isA<models.MfaRecoveryCodes>());
 
-      final response = await account.createOAuth2Session(
-        provider: enums.OAuthProvider.amazon,
-      );
-    });
+        });
 
-    test('test method updatePhoneSession()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        'userId': '5e5bb8c16897e',
-        'expire': '2020-10-15T06:38:00.000+00:00',
-        'provider': 'email',
-        'providerUid': 'user@example.com',
-        'providerAccessToken': 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
-        'providerAccessTokenExpiry': '2020-10-15T06:38:00.000+00:00',
-        'providerRefreshToken': 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
-        'ip': '127.0.0.1',
-        'osCode': 'Mac',
-        'osName': 'Mac',
-        'osVersion': 'Mac',
-        'clientType': 'browser',
-        'clientCode': 'CM',
-        'clientName': 'Chrome Mobile iOS',
-        'clientVersion': '84.0',
-        'clientEngine': 'WebKit',
-        'clientEngineVersion': '605.1.15',
-        'deviceName': 'smartphone',
-        'deviceBrand': 'Google',
-        'deviceModel': 'Nexus 5',
-        'countryCode': 'US',
-        'countryName': 'United States',
-        'current': true,
-        'factors': [],
-        'secret': '5e5bb8c16897e',
-        'mfaUpdatedAt': '2020-10-15T06:38:00.000+00:00',
-      };
-
-      when(client.call(
-        HttpMethod.put,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await account.updatePhoneSession(
-        userId: '<USER_ID>',
-        secret: '<SECRET>',
-      );
-      expect(response, isA<models.Session>());
-    });
+        test('test method createMFARecoveryCodes()', () async {
+            final Map<String, dynamic> data = {
+                'recoveryCodes': [],};
 
-    test('test method createSession()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        'userId': '5e5bb8c16897e',
-        'expire': '2020-10-15T06:38:00.000+00:00',
-        'provider': 'email',
-        'providerUid': 'user@example.com',
-        'providerAccessToken': 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
-        'providerAccessTokenExpiry': '2020-10-15T06:38:00.000+00:00',
-        'providerRefreshToken': 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
-        'ip': '127.0.0.1',
-        'osCode': 'Mac',
-        'osName': 'Mac',
-        'osVersion': 'Mac',
-        'clientType': 'browser',
-        'clientCode': 'CM',
-        'clientName': 'Chrome Mobile iOS',
-        'clientVersion': '84.0',
-        'clientEngine': 'WebKit',
-        'clientEngineVersion': '605.1.15',
-        'deviceName': 'smartphone',
-        'deviceBrand': 'Google',
-        'deviceModel': 'Nexus 5',
-        'countryCode': 'US',
-        'countryName': 'United States',
-        'current': true,
-        'factors': [],
-        'secret': '5e5bb8c16897e',
-        'mfaUpdatedAt': '2020-10-15T06:38:00.000+00:00',
-      };
-
-      when(client.call(
-        HttpMethod.post,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await account.createSession(
-        userId: '<USER_ID>',
-        secret: '<SECRET>',
-      );
-      expect(response, isA<models.Session>());
-    });
 
-    test('test method getSession()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        'userId': '5e5bb8c16897e',
-        'expire': '2020-10-15T06:38:00.000+00:00',
-        'provider': 'email',
-        'providerUid': 'user@example.com',
-        'providerAccessToken': 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
-        'providerAccessTokenExpiry': '2020-10-15T06:38:00.000+00:00',
-        'providerRefreshToken': 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
-        'ip': '127.0.0.1',
-        'osCode': 'Mac',
-        'osName': 'Mac',
-        'osVersion': 'Mac',
-        'clientType': 'browser',
-        'clientCode': 'CM',
-        'clientName': 'Chrome Mobile iOS',
-        'clientVersion': '84.0',
-        'clientEngine': 'WebKit',
-        'clientEngineVersion': '605.1.15',
-        'deviceName': 'smartphone',
-        'deviceBrand': 'Google',
-        'deviceModel': 'Nexus 5',
-        'countryCode': 'US',
-        'countryName': 'United States',
-        'current': true,
-        'factors': [],
-        'secret': '5e5bb8c16897e',
-        'mfaUpdatedAt': '2020-10-15T06:38:00.000+00:00',
-      };
-
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await account.getSession(
-        sessionId: '<SESSION_ID>',
-      );
-      expect(response, isA<models.Session>());
-    });
+            when(client.call(
+                HttpMethod.post,
+            )).thenAnswer((_) async => Response(data: data));
 
-    test('test method updateSession()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        'userId': '5e5bb8c16897e',
-        'expire': '2020-10-15T06:38:00.000+00:00',
-        'provider': 'email',
-        'providerUid': 'user@example.com',
-        'providerAccessToken': 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
-        'providerAccessTokenExpiry': '2020-10-15T06:38:00.000+00:00',
-        'providerRefreshToken': 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
-        'ip': '127.0.0.1',
-        'osCode': 'Mac',
-        'osName': 'Mac',
-        'osVersion': 'Mac',
-        'clientType': 'browser',
-        'clientCode': 'CM',
-        'clientName': 'Chrome Mobile iOS',
-        'clientVersion': '84.0',
-        'clientEngine': 'WebKit',
-        'clientEngineVersion': '605.1.15',
-        'deviceName': 'smartphone',
-        'deviceBrand': 'Google',
-        'deviceModel': 'Nexus 5',
-        'countryCode': 'US',
-        'countryName': 'United States',
-        'current': true,
-        'factors': [],
-        'secret': '5e5bb8c16897e',
-        'mfaUpdatedAt': '2020-10-15T06:38:00.000+00:00',
-      };
-
-      when(client.call(
-        HttpMethod.patch,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await account.updateSession(
-        sessionId: '<SESSION_ID>',
-      );
-      expect(response, isA<models.Session>());
-    });
 
-    test('test method deleteSession()', () async {
-      final data = '';
+            final response = await account.createMFARecoveryCodes(
+            );
+            expect(response, isA<models.MfaRecoveryCodes>());
 
-      when(client.call(
-        HttpMethod.delete,
-      )).thenAnswer((_) async => Response(data: data));
+        });
 
-      final response = await account.deleteSession(
-        sessionId: '<SESSION_ID>',
-      );
-    });
+        test('test method updateMfaRecoveryCodes()', () async {
+            final Map<String, dynamic> data = {
+                'recoveryCodes': [],};
 
-    test('test method updateStatus()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        'name': 'John Doe',
-        'registration': '2020-10-15T06:38:00.000+00:00',
-        'status': true,
-        'labels': [],
-        'passwordUpdate': '2020-10-15T06:38:00.000+00:00',
-        'email': 'john@appwrite.io',
-        'phone': '+4930901820',
-        'emailVerification': true,
-        'phoneVerification': true,
-        'mfa': true,
-        'prefs': <String, dynamic>{},
-        'targets': [],
-        'accessedAt': '2020-10-15T06:38:00.000+00:00',
-      };
-
-      when(client.call(
-        HttpMethod.patch,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await account.updateStatus();
-      expect(response, isA<models.User>());
-    });
 
-    test('test method createPushTarget()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '259125845563242502',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        'name': 'Apple iPhone 12',
-        'userId': '259125845563242502',
-        'providerType': 'email',
-        'identifier': 'token',
-        'expired': true,
-      };
-
-      when(client.call(
-        HttpMethod.post,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await account.createPushTarget(
-        targetId: '<TARGET_ID>',
-        identifier: '<IDENTIFIER>',
-      );
-      expect(response, isA<models.Target>());
-    });
+            when(client.call(
+                HttpMethod.patch,
+            )).thenAnswer((_) async => Response(data: data));
 
-    test('test method updatePushTarget()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '259125845563242502',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        'name': 'Apple iPhone 12',
-        'userId': '259125845563242502',
-        'providerType': 'email',
-        'identifier': 'token',
-        'expired': true,
-      };
-
-      when(client.call(
-        HttpMethod.put,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await account.updatePushTarget(
-        targetId: '<TARGET_ID>',
-        identifier: '<IDENTIFIER>',
-      );
-      expect(response, isA<models.Target>());
-    });
 
-    test('test method deletePushTarget()', () async {
-      final data = '';
+            final response = await account.updateMfaRecoveryCodes(
+            );
+            expect(response, isA<models.MfaRecoveryCodes>());
 
-      when(client.call(
-        HttpMethod.delete,
-      )).thenAnswer((_) async => Response(data: data));
+        });
 
-      final response = await account.deletePushTarget(
-        targetId: '<TARGET_ID>',
-      );
-    });
+        test('test method updateMFARecoveryCodes()', () async {
+            final Map<String, dynamic> data = {
+                'recoveryCodes': [],};
 
-    test('test method createEmailToken()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': 'bb8ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        'userId': '5e5ea5c168bb8',
-        'secret': '',
-        'expire': '2020-10-15T06:38:00.000+00:00',
-        'phrase': 'Golden Fox',
-      };
-
-      when(client.call(
-        HttpMethod.post,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await account.createEmailToken(
-        userId: '<USER_ID>',
-        email: 'email@example.com',
-      );
-      expect(response, isA<models.Token>());
-    });
 
-    test('test method createMagicURLToken()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': 'bb8ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        'userId': '5e5ea5c168bb8',
-        'secret': '',
-        'expire': '2020-10-15T06:38:00.000+00:00',
-        'phrase': 'Golden Fox',
-      };
-
-      when(client.call(
-        HttpMethod.post,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await account.createMagicURLToken(
-        userId: '<USER_ID>',
-        email: 'email@example.com',
-      );
-      expect(response, isA<models.Token>());
-    });
+            when(client.call(
+                HttpMethod.patch,
+            )).thenAnswer((_) async => Response(data: data));
 
-    test('test method createOAuth2Token()', () async {
-      when(client.webAuth(
-        Uri(),
-      )).thenAnswer((_) async => 'done');
 
-      final response = await account.createOAuth2Token(
-        provider: enums.OAuthProvider.amazon,
-      );
-    });
+            final response = await account.updateMFARecoveryCodes(
+            );
+            expect(response, isA<models.MfaRecoveryCodes>());
 
-    test('test method createPhoneToken()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': 'bb8ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        'userId': '5e5ea5c168bb8',
-        'secret': '',
-        'expire': '2020-10-15T06:38:00.000+00:00',
-        'phrase': 'Golden Fox',
-      };
-
-      when(client.call(
-        HttpMethod.post,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await account.createPhoneToken(
-        userId: '<USER_ID>',
-        phone: '+12065550100',
-      );
-      expect(response, isA<models.Token>());
-    });
+        });
 
-    test('test method createVerification()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': 'bb8ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        'userId': '5e5ea5c168bb8',
-        'secret': '',
-        'expire': '2020-10-15T06:38:00.000+00:00',
-        'phrase': 'Golden Fox',
-      };
-
-      when(client.call(
-        HttpMethod.post,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await account.createVerification(
-        url: 'https://example.com',
-      );
-      expect(response, isA<models.Token>());
-    });
+        test('test method updateName()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                'name': 'John Doe',
+                'registration': '2020-10-15T06:38:00.000+00:00',
+                'status': true,
+                'labels': [],
+                'passwordUpdate': '2020-10-15T06:38:00.000+00:00',
+                'email': 'john@appwrite.io',
+                'phone': '+4930901820',
+                'emailVerification': true,
+                'phoneVerification': true,
+                'mfa': true,
+                'prefs': <String, dynamic>{},
+                'targets': [],
+                'accessedAt': '2020-10-15T06:38:00.000+00:00',};
 
-    test('test method updateVerification()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': 'bb8ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        'userId': '5e5ea5c168bb8',
-        'secret': '',
-        'expire': '2020-10-15T06:38:00.000+00:00',
-        'phrase': 'Golden Fox',
-      };
-
-      when(client.call(
-        HttpMethod.put,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await account.updateVerification(
-        userId: '<USER_ID>',
-        secret: '<SECRET>',
-      );
-      expect(response, isA<models.Token>());
-    });
 
-    test('test method createPhoneVerification()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': 'bb8ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        'userId': '5e5ea5c168bb8',
-        'secret': '',
-        'expire': '2020-10-15T06:38:00.000+00:00',
-        'phrase': 'Golden Fox',
-      };
-
-      when(client.call(
-        HttpMethod.post,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await account.createPhoneVerification();
-      expect(response, isA<models.Token>());
-    });
+            when(client.call(
+                HttpMethod.patch,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.updateName(
+                name: '<NAME>',
+            );
+            expect(response, isA<models.User>());
+
+        });
+
+        test('test method updatePassword()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                'name': 'John Doe',
+                'registration': '2020-10-15T06:38:00.000+00:00',
+                'status': true,
+                'labels': [],
+                'passwordUpdate': '2020-10-15T06:38:00.000+00:00',
+                'email': 'john@appwrite.io',
+                'phone': '+4930901820',
+                'emailVerification': true,
+                'phoneVerification': true,
+                'mfa': true,
+                'prefs': <String, dynamic>{},
+                'targets': [],
+                'accessedAt': '2020-10-15T06:38:00.000+00:00',};
+
+
+            when(client.call(
+                HttpMethod.patch,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.updatePassword(
+                password: '',
+            );
+            expect(response, isA<models.User>());
+
+        });
+
+        test('test method updatePhone()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                'name': 'John Doe',
+                'registration': '2020-10-15T06:38:00.000+00:00',
+                'status': true,
+                'labels': [],
+                'passwordUpdate': '2020-10-15T06:38:00.000+00:00',
+                'email': 'john@appwrite.io',
+                'phone': '+4930901820',
+                'emailVerification': true,
+                'phoneVerification': true,
+                'mfa': true,
+                'prefs': <String, dynamic>{},
+                'targets': [],
+                'accessedAt': '2020-10-15T06:38:00.000+00:00',};
+
+
+            when(client.call(
+                HttpMethod.patch,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.updatePhone(
+                phone: '+12065550100',
+                password: 'password',
+            );
+            expect(response, isA<models.User>());
+
+        });
+
+        test('test method getPrefs()', () async {
+            final Map<String, dynamic> data = {};
+
+
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.getPrefs(
+            );
+            expect(response, isA<models.Preferences>());
+
+        });
+
+        test('test method updatePrefs()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                'name': 'John Doe',
+                'registration': '2020-10-15T06:38:00.000+00:00',
+                'status': true,
+                'labels': [],
+                'passwordUpdate': '2020-10-15T06:38:00.000+00:00',
+                'email': 'john@appwrite.io',
+                'phone': '+4930901820',
+                'emailVerification': true,
+                'phoneVerification': true,
+                'mfa': true,
+                'prefs': <String, dynamic>{},
+                'targets': [],
+                'accessedAt': '2020-10-15T06:38:00.000+00:00',};
+
+
+            when(client.call(
+                HttpMethod.patch,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.updatePrefs(
+                prefs: {},
+            );
+            expect(response, isA<models.User>());
+
+        });
+
+        test('test method createRecovery()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': 'bb8ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                'userId': '5e5ea5c168bb8',
+                'secret': '',
+                'expire': '2020-10-15T06:38:00.000+00:00',
+                'phrase': 'Golden Fox',};
+
+
+            when(client.call(
+                HttpMethod.post,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.createRecovery(
+                email: 'email@example.com',
+                url: 'https://example.com',
+            );
+            expect(response, isA<models.Token>());
+
+        });
+
+        test('test method updateRecovery()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': 'bb8ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                'userId': '5e5ea5c168bb8',
+                'secret': '',
+                'expire': '2020-10-15T06:38:00.000+00:00',
+                'phrase': 'Golden Fox',};
+
+
+            when(client.call(
+                HttpMethod.put,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.updateRecovery(
+                userId: '<USER_ID>',
+                secret: '<SECRET>',
+                password: '',
+            );
+            expect(response, isA<models.Token>());
+
+        });
+
+        test('test method listSessions()', () async {
+            final Map<String, dynamic> data = {
+                'total': 5,
+                'sessions': [],};
+
+
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.listSessions(
+            );
+            expect(response, isA<models.SessionList>());
+
+        });
+
+        test('test method deleteSessions()', () async {
+            final data = '';
+
+            when(client.call(
+                HttpMethod.delete,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.deleteSessions(
+            );
+        });
+
+        test('test method createAnonymousSession()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                'userId': '5e5bb8c16897e',
+                'expire': '2020-10-15T06:38:00.000+00:00',
+                'provider': 'email',
+                'providerUid': 'user@example.com',
+                'providerAccessToken': 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
+                'providerAccessTokenExpiry': '2020-10-15T06:38:00.000+00:00',
+                'providerRefreshToken': 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
+                'ip': '127.0.0.1',
+                'osCode': 'Mac',
+                'osName': 'Mac',
+                'osVersion': 'Mac',
+                'clientType': 'browser',
+                'clientCode': 'CM',
+                'clientName': 'Chrome Mobile iOS',
+                'clientVersion': '84.0',
+                'clientEngine': 'WebKit',
+                'clientEngineVersion': '605.1.15',
+                'deviceName': 'smartphone',
+                'deviceBrand': 'Google',
+                'deviceModel': 'Nexus 5',
+                'countryCode': 'US',
+                'countryName': 'United States',
+                'current': true,
+                'factors': [],
+                'secret': '5e5bb8c16897e',
+                'mfaUpdatedAt': '2020-10-15T06:38:00.000+00:00',};
+
+
+            when(client.call(
+                HttpMethod.post,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.createAnonymousSession(
+            );
+            expect(response, isA<models.Session>());
+
+        });
+
+        test('test method createEmailPasswordSession()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                'userId': '5e5bb8c16897e',
+                'expire': '2020-10-15T06:38:00.000+00:00',
+                'provider': 'email',
+                'providerUid': 'user@example.com',
+                'providerAccessToken': 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
+                'providerAccessTokenExpiry': '2020-10-15T06:38:00.000+00:00',
+                'providerRefreshToken': 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
+                'ip': '127.0.0.1',
+                'osCode': 'Mac',
+                'osName': 'Mac',
+                'osVersion': 'Mac',
+                'clientType': 'browser',
+                'clientCode': 'CM',
+                'clientName': 'Chrome Mobile iOS',
+                'clientVersion': '84.0',
+                'clientEngine': 'WebKit',
+                'clientEngineVersion': '605.1.15',
+                'deviceName': 'smartphone',
+                'deviceBrand': 'Google',
+                'deviceModel': 'Nexus 5',
+                'countryCode': 'US',
+                'countryName': 'United States',
+                'current': true,
+                'factors': [],
+                'secret': '5e5bb8c16897e',
+                'mfaUpdatedAt': '2020-10-15T06:38:00.000+00:00',};
+
+
+            when(client.call(
+                HttpMethod.post,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.createEmailPasswordSession(
+                email: 'email@example.com',
+                password: 'password',
+            );
+            expect(response, isA<models.Session>());
+
+        });
+
+        test('test method updateMagicURLSession()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                'userId': '5e5bb8c16897e',
+                'expire': '2020-10-15T06:38:00.000+00:00',
+                'provider': 'email',
+                'providerUid': 'user@example.com',
+                'providerAccessToken': 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
+                'providerAccessTokenExpiry': '2020-10-15T06:38:00.000+00:00',
+                'providerRefreshToken': 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
+                'ip': '127.0.0.1',
+                'osCode': 'Mac',
+                'osName': 'Mac',
+                'osVersion': 'Mac',
+                'clientType': 'browser',
+                'clientCode': 'CM',
+                'clientName': 'Chrome Mobile iOS',
+                'clientVersion': '84.0',
+                'clientEngine': 'WebKit',
+                'clientEngineVersion': '605.1.15',
+                'deviceName': 'smartphone',
+                'deviceBrand': 'Google',
+                'deviceModel': 'Nexus 5',
+                'countryCode': 'US',
+                'countryName': 'United States',
+                'current': true,
+                'factors': [],
+                'secret': '5e5bb8c16897e',
+                'mfaUpdatedAt': '2020-10-15T06:38:00.000+00:00',};
+
+
+            when(client.call(
+                HttpMethod.put,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.updateMagicURLSession(
+                userId: '<USER_ID>',
+                secret: '<SECRET>',
+            );
+            expect(response, isA<models.Session>());
+
+        });
+
+        test('test method createOAuth2Session()', () async {
+
+            when(client.webAuth(
+                Uri(),
+            )).thenAnswer((_) async => 'done');
+
+
+            final response = await account.createOAuth2Session(
+                provider: enums.OAuthProvider.amazon,
+            );
+        });
+
+        test('test method updatePhoneSession()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                'userId': '5e5bb8c16897e',
+                'expire': '2020-10-15T06:38:00.000+00:00',
+                'provider': 'email',
+                'providerUid': 'user@example.com',
+                'providerAccessToken': 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
+                'providerAccessTokenExpiry': '2020-10-15T06:38:00.000+00:00',
+                'providerRefreshToken': 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
+                'ip': '127.0.0.1',
+                'osCode': 'Mac',
+                'osName': 'Mac',
+                'osVersion': 'Mac',
+                'clientType': 'browser',
+                'clientCode': 'CM',
+                'clientName': 'Chrome Mobile iOS',
+                'clientVersion': '84.0',
+                'clientEngine': 'WebKit',
+                'clientEngineVersion': '605.1.15',
+                'deviceName': 'smartphone',
+                'deviceBrand': 'Google',
+                'deviceModel': 'Nexus 5',
+                'countryCode': 'US',
+                'countryName': 'United States',
+                'current': true,
+                'factors': [],
+                'secret': '5e5bb8c16897e',
+                'mfaUpdatedAt': '2020-10-15T06:38:00.000+00:00',};
+
+
+            when(client.call(
+                HttpMethod.put,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.updatePhoneSession(
+                userId: '<USER_ID>',
+                secret: '<SECRET>',
+            );
+            expect(response, isA<models.Session>());
+
+        });
+
+        test('test method createSession()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                'userId': '5e5bb8c16897e',
+                'expire': '2020-10-15T06:38:00.000+00:00',
+                'provider': 'email',
+                'providerUid': 'user@example.com',
+                'providerAccessToken': 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
+                'providerAccessTokenExpiry': '2020-10-15T06:38:00.000+00:00',
+                'providerRefreshToken': 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
+                'ip': '127.0.0.1',
+                'osCode': 'Mac',
+                'osName': 'Mac',
+                'osVersion': 'Mac',
+                'clientType': 'browser',
+                'clientCode': 'CM',
+                'clientName': 'Chrome Mobile iOS',
+                'clientVersion': '84.0',
+                'clientEngine': 'WebKit',
+                'clientEngineVersion': '605.1.15',
+                'deviceName': 'smartphone',
+                'deviceBrand': 'Google',
+                'deviceModel': 'Nexus 5',
+                'countryCode': 'US',
+                'countryName': 'United States',
+                'current': true,
+                'factors': [],
+                'secret': '5e5bb8c16897e',
+                'mfaUpdatedAt': '2020-10-15T06:38:00.000+00:00',};
+
+
+            when(client.call(
+                HttpMethod.post,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.createSession(
+                userId: '<USER_ID>',
+                secret: '<SECRET>',
+            );
+            expect(response, isA<models.Session>());
+
+        });
+
+        test('test method getSession()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                'userId': '5e5bb8c16897e',
+                'expire': '2020-10-15T06:38:00.000+00:00',
+                'provider': 'email',
+                'providerUid': 'user@example.com',
+                'providerAccessToken': 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
+                'providerAccessTokenExpiry': '2020-10-15T06:38:00.000+00:00',
+                'providerRefreshToken': 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
+                'ip': '127.0.0.1',
+                'osCode': 'Mac',
+                'osName': 'Mac',
+                'osVersion': 'Mac',
+                'clientType': 'browser',
+                'clientCode': 'CM',
+                'clientName': 'Chrome Mobile iOS',
+                'clientVersion': '84.0',
+                'clientEngine': 'WebKit',
+                'clientEngineVersion': '605.1.15',
+                'deviceName': 'smartphone',
+                'deviceBrand': 'Google',
+                'deviceModel': 'Nexus 5',
+                'countryCode': 'US',
+                'countryName': 'United States',
+                'current': true,
+                'factors': [],
+                'secret': '5e5bb8c16897e',
+                'mfaUpdatedAt': '2020-10-15T06:38:00.000+00:00',};
+
+
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.getSession(
+                sessionId: '<SESSION_ID>',
+            );
+            expect(response, isA<models.Session>());
+
+        });
+
+        test('test method updateSession()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                'userId': '5e5bb8c16897e',
+                'expire': '2020-10-15T06:38:00.000+00:00',
+                'provider': 'email',
+                'providerUid': 'user@example.com',
+                'providerAccessToken': 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
+                'providerAccessTokenExpiry': '2020-10-15T06:38:00.000+00:00',
+                'providerRefreshToken': 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
+                'ip': '127.0.0.1',
+                'osCode': 'Mac',
+                'osName': 'Mac',
+                'osVersion': 'Mac',
+                'clientType': 'browser',
+                'clientCode': 'CM',
+                'clientName': 'Chrome Mobile iOS',
+                'clientVersion': '84.0',
+                'clientEngine': 'WebKit',
+                'clientEngineVersion': '605.1.15',
+                'deviceName': 'smartphone',
+                'deviceBrand': 'Google',
+                'deviceModel': 'Nexus 5',
+                'countryCode': 'US',
+                'countryName': 'United States',
+                'current': true,
+                'factors': [],
+                'secret': '5e5bb8c16897e',
+                'mfaUpdatedAt': '2020-10-15T06:38:00.000+00:00',};
+
+
+            when(client.call(
+                HttpMethod.patch,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.updateSession(
+                sessionId: '<SESSION_ID>',
+            );
+            expect(response, isA<models.Session>());
+
+        });
+
+        test('test method deleteSession()', () async {
+            final data = '';
+
+            when(client.call(
+                HttpMethod.delete,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.deleteSession(
+                sessionId: '<SESSION_ID>',
+            );
+        });
+
+        test('test method updateStatus()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                'name': 'John Doe',
+                'registration': '2020-10-15T06:38:00.000+00:00',
+                'status': true,
+                'labels': [],
+                'passwordUpdate': '2020-10-15T06:38:00.000+00:00',
+                'email': 'john@appwrite.io',
+                'phone': '+4930901820',
+                'emailVerification': true,
+                'phoneVerification': true,
+                'mfa': true,
+                'prefs': <String, dynamic>{},
+                'targets': [],
+                'accessedAt': '2020-10-15T06:38:00.000+00:00',};
+
+
+            when(client.call(
+                HttpMethod.patch,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.updateStatus(
+            );
+            expect(response, isA<models.User>());
+
+        });
+
+        test('test method createPushTarget()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '259125845563242502',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                'name': 'Apple iPhone 12',
+                'userId': '259125845563242502',
+                'providerType': 'email',
+                'identifier': 'token',
+                'expired': true,};
+
+
+            when(client.call(
+                HttpMethod.post,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.createPushTarget(
+                targetId: '<TARGET_ID>',
+                identifier: '<IDENTIFIER>',
+            );
+            expect(response, isA<models.Target>());
+
+        });
+
+        test('test method updatePushTarget()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '259125845563242502',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                'name': 'Apple iPhone 12',
+                'userId': '259125845563242502',
+                'providerType': 'email',
+                'identifier': 'token',
+                'expired': true,};
+
+
+            when(client.call(
+                HttpMethod.put,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.updatePushTarget(
+                targetId: '<TARGET_ID>',
+                identifier: '<IDENTIFIER>',
+            );
+            expect(response, isA<models.Target>());
+
+        });
+
+        test('test method deletePushTarget()', () async {
+            final data = '';
+
+            when(client.call(
+                HttpMethod.delete,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.deletePushTarget(
+                targetId: '<TARGET_ID>',
+            );
+        });
+
+        test('test method createEmailToken()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': 'bb8ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                'userId': '5e5ea5c168bb8',
+                'secret': '',
+                'expire': '2020-10-15T06:38:00.000+00:00',
+                'phrase': 'Golden Fox',};
+
+
+            when(client.call(
+                HttpMethod.post,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.createEmailToken(
+                userId: '<USER_ID>',
+                email: 'email@example.com',
+            );
+            expect(response, isA<models.Token>());
+
+        });
+
+        test('test method createMagicURLToken()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': 'bb8ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                'userId': '5e5ea5c168bb8',
+                'secret': '',
+                'expire': '2020-10-15T06:38:00.000+00:00',
+                'phrase': 'Golden Fox',};
+
+
+            when(client.call(
+                HttpMethod.post,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.createMagicURLToken(
+                userId: '<USER_ID>',
+                email: 'email@example.com',
+            );
+            expect(response, isA<models.Token>());
+
+        });
+
+        test('test method createOAuth2Token()', () async {
+
+            when(client.webAuth(
+                Uri(),
+            )).thenAnswer((_) async => 'done');
+
+
+            final response = await account.createOAuth2Token(
+                provider: enums.OAuthProvider.amazon,
+            );
+        });
+
+        test('test method createPhoneToken()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': 'bb8ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                'userId': '5e5ea5c168bb8',
+                'secret': '',
+                'expire': '2020-10-15T06:38:00.000+00:00',
+                'phrase': 'Golden Fox',};
+
+
+            when(client.call(
+                HttpMethod.post,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.createPhoneToken(
+                userId: '<USER_ID>',
+                phone: '+12065550100',
+            );
+            expect(response, isA<models.Token>());
+
+        });
+
+        test('test method createVerification()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': 'bb8ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                'userId': '5e5ea5c168bb8',
+                'secret': '',
+                'expire': '2020-10-15T06:38:00.000+00:00',
+                'phrase': 'Golden Fox',};
+
+
+            when(client.call(
+                HttpMethod.post,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.createVerification(
+                url: 'https://example.com',
+            );
+            expect(response, isA<models.Token>());
+
+        });
+
+        test('test method updateVerification()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': 'bb8ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                'userId': '5e5ea5c168bb8',
+                'secret': '',
+                'expire': '2020-10-15T06:38:00.000+00:00',
+                'phrase': 'Golden Fox',};
+
+
+            when(client.call(
+                HttpMethod.put,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.updateVerification(
+                userId: '<USER_ID>',
+                secret: '<SECRET>',
+            );
+            expect(response, isA<models.Token>());
+
+        });
+
+        test('test method createPhoneVerification()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': 'bb8ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                'userId': '5e5ea5c168bb8',
+                'secret': '',
+                'expire': '2020-10-15T06:38:00.000+00:00',
+                'phrase': 'Golden Fox',};
+
+
+            when(client.call(
+                HttpMethod.post,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.createPhoneVerification(
+            );
+            expect(response, isA<models.Token>());
+
+        });
+
+        test('test method updatePhoneVerification()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': 'bb8ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                'userId': '5e5ea5c168bb8',
+                'secret': '',
+                'expire': '2020-10-15T06:38:00.000+00:00',
+                'phrase': 'Golden Fox',};
+
+
+            when(client.call(
+                HttpMethod.put,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await account.updatePhoneVerification(
+                userId: '<USER_ID>',
+                secret: '<SECRET>',
+            );
+            expect(response, isA<models.Token>());
+
+        });
 
-    test('test method updatePhoneVerification()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': 'bb8ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        'userId': '5e5ea5c168bb8',
-        'secret': '',
-        'expire': '2020-10-15T06:38:00.000+00:00',
-        'phrase': 'Golden Fox',
-      };
-
-      when(client.call(
-        HttpMethod.put,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await account.updatePhoneVerification(
-        userId: '<USER_ID>',
-        secret: '<SECRET>',
-      );
-      expect(response, isA<models.Token>());
     });
-  });
-}
+}
\ No newline at end of file
diff --git a/test/services/avatars_test.dart b/test/services/avatars_test.dart
index 01abe69c..0cd4b70d 100644
--- a/test/services/avatars_test.dart
+++ b/test/services/avatars_test.dart
@@ -24,11 +24,12 @@ class MockClient extends Mock implements Client {
 
   @override
   Future webAuth(
-    Uri? url, {
-    String? callbackUrlScheme,
-  }) async {
-    return super
-        .noSuchMethod(Invocation.method(#webAuth, [url]), returnValue: 'done');
+    Uri? url,
+    {
+        String? callbackUrlScheme,
+    }
+  ) async {
+    return super.noSuchMethod(Invocation.method(#webAuth, [url]), returnValue: 'done');
   }
 
   @override
@@ -40,110 +41,116 @@ class MockClient extends Mock implements Client {
     Map<String, String>? headers,
     Function(UploadProgress)? onProgress,
   }) async {
-    return super.noSuchMethod(
-        Invocation.method(
-            #chunkedUpload, [path, params, paramName, idParamName, headers]),
-        returnValue: Response(data: {}));
+    return super.noSuchMethod(Invocation.method(#chunkedUpload, [path, params, paramName, idParamName, headers]), returnValue: Response(data: {}));
   }
 }
 
 void main() {
-  group('Avatars test', () {
-    late MockClient client;
-    late Avatars avatars;
+    group('Avatars test', () {
+        late MockClient client;
+        late Avatars avatars;
 
-    setUp(() {
-      client = MockClient();
-      avatars = Avatars(client);
-    });
+        setUp(() {
+            client = MockClient();
+            avatars = Avatars(client);
+        });
 
-    test('test method getBrowser()', () async {
-      final Uint8List data = Uint8List.fromList([]);
+        test('test method getBrowser()', () async {final Uint8List data = Uint8List.fromList([]);
 
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
 
-      final response = await avatars.getBrowser(
-        code: enums.Browser.avantBrowser,
-      );
-      expect(response, isA<Uint8List>());
-    });
 
-    test('test method getCreditCard()', () async {
-      final Uint8List data = Uint8List.fromList([]);
+            final response = await avatars.getBrowser(
+                code: enums.Browser.avantBrowser,
+            );
+            expect(response, isA<Uint8List>());
 
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
+        });
 
-      final response = await avatars.getCreditCard(
-        code: enums.CreditCard.americanExpress,
-      );
-      expect(response, isA<Uint8List>());
-    });
+        test('test method getCreditCard()', () async {final Uint8List data = Uint8List.fromList([]);
 
-    test('test method getFavicon()', () async {
-      final Uint8List data = Uint8List.fromList([]);
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
 
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
 
-      final response = await avatars.getFavicon(
-        url: 'https://example.com',
-      );
-      expect(response, isA<Uint8List>());
-    });
+            final response = await avatars.getCreditCard(
+                code: enums.CreditCard.americanExpress,
+            );
+            expect(response, isA<Uint8List>());
 
-    test('test method getFlag()', () async {
-      final Uint8List data = Uint8List.fromList([]);
+        });
 
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
+        test('test method getFavicon()', () async {final Uint8List data = Uint8List.fromList([]);
 
-      final response = await avatars.getFlag(
-        code: enums.Flag.afghanistan,
-      );
-      expect(response, isA<Uint8List>());
-    });
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
 
-    test('test method getImage()', () async {
-      final Uint8List data = Uint8List.fromList([]);
 
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
+            final response = await avatars.getFavicon(
+                url: 'https://example.com',
+            );
+            expect(response, isA<Uint8List>());
 
-      final response = await avatars.getImage(
-        url: 'https://example.com',
-      );
-      expect(response, isA<Uint8List>());
-    });
+        });
 
-    test('test method getInitials()', () async {
-      final Uint8List data = Uint8List.fromList([]);
+        test('test method getFlag()', () async {final Uint8List data = Uint8List.fromList([]);
 
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
 
-      final response = await avatars.getInitials();
-      expect(response, isA<Uint8List>());
-    });
 
-    test('test method getQR()', () async {
-      final Uint8List data = Uint8List.fromList([]);
+            final response = await avatars.getFlag(
+                code: enums.Flag.afghanistan,
+            );
+            expect(response, isA<Uint8List>());
+
+        });
+
+        test('test method getImage()', () async {final Uint8List data = Uint8List.fromList([]);
+
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
+
 
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
+            final response = await avatars.getImage(
+                url: 'https://example.com',
+            );
+            expect(response, isA<Uint8List>());
+
+        });
+
+        test('test method getInitials()', () async {final Uint8List data = Uint8List.fromList([]);
+
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await avatars.getInitials(
+            );
+            expect(response, isA<Uint8List>());
+
+        });
+
+        test('test method getQR()', () async {final Uint8List data = Uint8List.fromList([]);
+
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await avatars.getQR(
+                text: '<TEXT>',
+            );
+            expect(response, isA<Uint8List>());
+
+        });
 
-      final response = await avatars.getQR(
-        text: '<TEXT>',
-      );
-      expect(response, isA<Uint8List>());
     });
-  });
-}
+}
\ No newline at end of file
diff --git a/test/services/databases_test.dart b/test/services/databases_test.dart
index fb78fbb0..aeceecf2 100644
--- a/test/services/databases_test.dart
+++ b/test/services/databases_test.dart
@@ -24,11 +24,12 @@ class MockClient extends Mock implements Client {
 
   @override
   Future webAuth(
-    Uri? url, {
-    String? callbackUrlScheme,
-  }) async {
-    return super
-        .noSuchMethod(Invocation.method(#webAuth, [url]), returnValue: 'done');
+    Uri? url,
+    {
+        String? callbackUrlScheme,
+    }
+  ) async {
+    return super.noSuchMethod(Invocation.method(#webAuth, [url]), returnValue: 'done');
   }
 
   @override
@@ -40,194 +41,207 @@ class MockClient extends Mock implements Client {
     Map<String, String>? headers,
     Function(UploadProgress)? onProgress,
   }) async {
-    return super.noSuchMethod(
-        Invocation.method(
-            #chunkedUpload, [path, params, paramName, idParamName, headers]),
-        returnValue: Response(data: {}));
+    return super.noSuchMethod(Invocation.method(#chunkedUpload, [path, params, paramName, idParamName, headers]), returnValue: Response(data: {}));
   }
 }
 
 void main() {
-  group('Databases test', () {
-    late MockClient client;
-    late Databases databases;
+    group('Databases test', () {
+        late MockClient client;
+        late Databases databases;
+
+        setUp(() {
+            client = MockClient();
+            databases = Databases(client);
+        });
+
+        test('test method listDocuments()', () async {
+            final Map<String, dynamic> data = {
+                'total': 5,
+                'documents': [],};
+
+
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await databases.listDocuments(
+                databaseId: '<DATABASE_ID>',
+                collectionId: '<COLLECTION_ID>',
+            );
+            expect(response, isA<models.DocumentList>());
+
+        });
+
+        test('test method createDocument()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$sequence': 1,
+                '\$collectionId': '5e5ea5c15117e',
+                '\$databaseId': '5e5ea5c15117e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                '\$permissions': [],};
 
-    setUp(() {
-      client = MockClient();
-      databases = Databases(client);
-    });
 
-    test('test method listDocuments()', () async {
-      final Map<String, dynamic> data = {
-        'total': 5,
-        'documents': [],
-      };
-
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await databases.listDocuments(
-        databaseId: '<DATABASE_ID>',
-        collectionId: '<COLLECTION_ID>',
-      );
-      expect(response, isA<models.DocumentList>());
-    });
+            when(client.call(
+                HttpMethod.post,
+            )).thenAnswer((_) async => Response(data: data));
 
-    test('test method createDocument()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$sequence': 1,
-        '\$collectionId': '5e5ea5c15117e',
-        '\$databaseId': '5e5ea5c15117e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        '\$permissions': [],
-      };
-
-      when(client.call(
-        HttpMethod.post,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await databases.createDocument(
-        databaseId: '<DATABASE_ID>',
-        collectionId: '<COLLECTION_ID>',
-        documentId: '<DOCUMENT_ID>',
-        data: {},
-      );
-      expect(response, isA<models.Document>());
-    });
 
-    test('test method getDocument()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$sequence': 1,
-        '\$collectionId': '5e5ea5c15117e',
-        '\$databaseId': '5e5ea5c15117e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        '\$permissions': [],
-      };
-
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await databases.getDocument(
-        databaseId: '<DATABASE_ID>',
-        collectionId: '<COLLECTION_ID>',
-        documentId: '<DOCUMENT_ID>',
-      );
-      expect(response, isA<models.Document>());
-    });
+            final response = await databases.createDocument(
+                databaseId: '<DATABASE_ID>',
+                collectionId: '<COLLECTION_ID>',
+                documentId: '<DOCUMENT_ID>',
+                data: {},
+            );
+            expect(response, isA<models.Document>());
+
+        });
+
+        test('test method getDocument()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$sequence': 1,
+                '\$collectionId': '5e5ea5c15117e',
+                '\$databaseId': '5e5ea5c15117e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                '\$permissions': [],};
+
+
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await databases.getDocument(
+                databaseId: '<DATABASE_ID>',
+                collectionId: '<COLLECTION_ID>',
+                documentId: '<DOCUMENT_ID>',
+            );
+            expect(response, isA<models.Document>());
+
+        });
+
+        test('test method upsertDocument()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$sequence': 1,
+                '\$collectionId': '5e5ea5c15117e',
+                '\$databaseId': '5e5ea5c15117e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                '\$permissions': [],};
+
+
+            when(client.call(
+                HttpMethod.put,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await databases.upsertDocument(
+                databaseId: '<DATABASE_ID>',
+                collectionId: '<COLLECTION_ID>',
+                documentId: '<DOCUMENT_ID>',
+                data: {},
+            );
+            expect(response, isA<models.Document>());
+
+        });
+
+        test('test method updateDocument()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$sequence': 1,
+                '\$collectionId': '5e5ea5c15117e',
+                '\$databaseId': '5e5ea5c15117e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                '\$permissions': [],};
 
-    test('test method upsertDocument()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$sequence': 1,
-        '\$collectionId': '5e5ea5c15117e',
-        '\$databaseId': '5e5ea5c15117e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        '\$permissions': [],
-      };
-
-      when(client.call(
-        HttpMethod.put,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await databases.upsertDocument(
-        databaseId: '<DATABASE_ID>',
-        collectionId: '<COLLECTION_ID>',
-        documentId: '<DOCUMENT_ID>',
-        data: {},
-      );
-      expect(response, isA<models.Document>());
-    });
 
-    test('test method updateDocument()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$sequence': 1,
-        '\$collectionId': '5e5ea5c15117e',
-        '\$databaseId': '5e5ea5c15117e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        '\$permissions': [],
-      };
-
-      when(client.call(
-        HttpMethod.patch,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await databases.updateDocument(
-        databaseId: '<DATABASE_ID>',
-        collectionId: '<COLLECTION_ID>',
-        documentId: '<DOCUMENT_ID>',
-      );
-      expect(response, isA<models.Document>());
-    });
+            when(client.call(
+                HttpMethod.patch,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await databases.updateDocument(
+                databaseId: '<DATABASE_ID>',
+                collectionId: '<COLLECTION_ID>',
+                documentId: '<DOCUMENT_ID>',
+            );
+            expect(response, isA<models.Document>());
+
+        });
+
+        test('test method deleteDocument()', () async {
+            final data = '';
+
+            when(client.call(
+                HttpMethod.delete,
+            )).thenAnswer((_) async => Response(data: data));
+
 
-    test('test method deleteDocument()', () async {
-      final data = '';
+            final response = await databases.deleteDocument(
+                databaseId: '<DATABASE_ID>',
+                collectionId: '<COLLECTION_ID>',
+                documentId: '<DOCUMENT_ID>',
+            );
+        });
+
+        test('test method decrementDocumentAttribute()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$sequence': 1,
+                '\$collectionId': '5e5ea5c15117e',
+                '\$databaseId': '5e5ea5c15117e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                '\$permissions': [],};
+
+
+            when(client.call(
+                HttpMethod.patch,
+            )).thenAnswer((_) async => Response(data: data));
 
-      when(client.call(
-        HttpMethod.delete,
-      )).thenAnswer((_) async => Response(data: data));
 
-      final response = await databases.deleteDocument(
-        databaseId: '<DATABASE_ID>',
-        collectionId: '<COLLECTION_ID>',
-        documentId: '<DOCUMENT_ID>',
-      );
-    });
+            final response = await databases.decrementDocumentAttribute(
+                databaseId: '<DATABASE_ID>',
+                collectionId: '<COLLECTION_ID>',
+                documentId: '<DOCUMENT_ID>',
+                attribute: '',
+            );
+            expect(response, isA<models.Document>());
+
+        });
+
+        test('test method incrementDocumentAttribute()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$sequence': 1,
+                '\$collectionId': '5e5ea5c15117e',
+                '\$databaseId': '5e5ea5c15117e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                '\$permissions': [],};
+
+
+            when(client.call(
+                HttpMethod.patch,
+            )).thenAnswer((_) async => Response(data: data));
 
-    test('test method decrementDocumentAttribute()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$sequence': 1,
-        '\$collectionId': '5e5ea5c15117e',
-        '\$databaseId': '5e5ea5c15117e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        '\$permissions': [],
-      };
-
-      when(client.call(
-        HttpMethod.patch,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await databases.decrementDocumentAttribute(
-        databaseId: '<DATABASE_ID>',
-        collectionId: '<COLLECTION_ID>',
-        documentId: '<DOCUMENT_ID>',
-        attribute: '',
-      );
-      expect(response, isA<models.Document>());
-    });
 
-    test('test method incrementDocumentAttribute()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$sequence': 1,
-        '\$collectionId': '5e5ea5c15117e',
-        '\$databaseId': '5e5ea5c15117e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        '\$permissions': [],
-      };
-
-      when(client.call(
-        HttpMethod.patch,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await databases.incrementDocumentAttribute(
-        databaseId: '<DATABASE_ID>',
-        collectionId: '<COLLECTION_ID>',
-        documentId: '<DOCUMENT_ID>',
-        attribute: '',
-      );
-      expect(response, isA<models.Document>());
+            final response = await databases.incrementDocumentAttribute(
+                databaseId: '<DATABASE_ID>',
+                collectionId: '<COLLECTION_ID>',
+                documentId: '<DOCUMENT_ID>',
+                attribute: '',
+            );
+            expect(response, isA<models.Document>());
+
+        });
+
     });
-  });
-}
+}
\ No newline at end of file
diff --git a/test/services/functions_test.dart b/test/services/functions_test.dart
index c6e50a50..69b86785 100644
--- a/test/services/functions_test.dart
+++ b/test/services/functions_test.dart
@@ -24,11 +24,12 @@ class MockClient extends Mock implements Client {
 
   @override
   Future webAuth(
-    Uri? url, {
-    String? callbackUrlScheme,
-  }) async {
-    return super
-        .noSuchMethod(Invocation.method(#webAuth, [url]), returnValue: 'done');
+    Uri? url,
+    {
+        String? callbackUrlScheme,
+    }
+  ) async {
+    return super.noSuchMethod(Invocation.method(#webAuth, [url]), returnValue: 'done');
   }
 
   @override
@@ -40,100 +41,104 @@ class MockClient extends Mock implements Client {
     Map<String, String>? headers,
     Function(UploadProgress)? onProgress,
   }) async {
-    return super.noSuchMethod(
-        Invocation.method(
-            #chunkedUpload, [path, params, paramName, idParamName, headers]),
-        returnValue: Response(data: {}));
+    return super.noSuchMethod(Invocation.method(#chunkedUpload, [path, params, paramName, idParamName, headers]), returnValue: Response(data: {}));
   }
 }
 
 void main() {
-  group('Functions test', () {
-    late MockClient client;
-    late Functions functions;
+    group('Functions test', () {
+        late MockClient client;
+        late Functions functions;
 
-    setUp(() {
-      client = MockClient();
-      functions = Functions(client);
-    });
+        setUp(() {
+            client = MockClient();
+            functions = Functions(client);
+        });
 
-    test('test method listExecutions()', () async {
-      final Map<String, dynamic> data = {
-        'total': 5,
-        'executions': [],
-      };
+        test('test method listExecutions()', () async {
+            final Map<String, dynamic> data = {
+                'total': 5,
+                'executions': [],};
 
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
 
-      final response = await functions.listExecutions(
-        functionId: '<FUNCTION_ID>',
-      );
-      expect(response, isA<models.ExecutionList>());
-    });
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await functions.listExecutions(
+                functionId: '<FUNCTION_ID>',
+            );
+            expect(response, isA<models.ExecutionList>());
+
+        });
+
+        test('test method createExecution()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                '\$permissions': [],
+                'functionId': '5e5ea6g16897e',
+                'deploymentId': '5e5ea5c16897e',
+                'trigger': 'http',
+                'status': 'processing',
+                'requestMethod': 'GET',
+                'requestPath': '/articles?id=5',
+                'requestHeaders': [],
+                'responseStatusCode': 200,
+                'responseBody': '',
+                'responseHeaders': [],
+                'logs': '',
+                'errors': '',
+                'duration': 0.4,};
+
+
+            when(client.call(
+                HttpMethod.post,
+            )).thenAnswer((_) async => Response(data: data));
 
-    test('test method createExecution()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        '\$permissions': [],
-        'functionId': '5e5ea6g16897e',
-        'deploymentId': '5e5ea5c16897e',
-        'trigger': 'http',
-        'status': 'processing',
-        'requestMethod': 'GET',
-        'requestPath': '/articles?id=5',
-        'requestHeaders': [],
-        'responseStatusCode': 200,
-        'responseBody': '',
-        'responseHeaders': [],
-        'logs': '',
-        'errors': '',
-        'duration': 0.4,
-      };
-
-      when(client.call(
-        HttpMethod.post,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await functions.createExecution(
-        functionId: '<FUNCTION_ID>',
-      );
-      expect(response, isA<models.Execution>());
-    });
 
-    test('test method getExecution()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        '\$permissions': [],
-        'functionId': '5e5ea6g16897e',
-        'deploymentId': '5e5ea5c16897e',
-        'trigger': 'http',
-        'status': 'processing',
-        'requestMethod': 'GET',
-        'requestPath': '/articles?id=5',
-        'requestHeaders': [],
-        'responseStatusCode': 200,
-        'responseBody': '',
-        'responseHeaders': [],
-        'logs': '',
-        'errors': '',
-        'duration': 0.4,
-      };
-
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await functions.getExecution(
-        functionId: '<FUNCTION_ID>',
-        executionId: '<EXECUTION_ID>',
-      );
-      expect(response, isA<models.Execution>());
+            final response = await functions.createExecution(
+                functionId: '<FUNCTION_ID>',
+            );
+            expect(response, isA<models.Execution>());
+
+        });
+
+        test('test method getExecution()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                '\$permissions': [],
+                'functionId': '5e5ea6g16897e',
+                'deploymentId': '5e5ea5c16897e',
+                'trigger': 'http',
+                'status': 'processing',
+                'requestMethod': 'GET',
+                'requestPath': '/articles?id=5',
+                'requestHeaders': [],
+                'responseStatusCode': 200,
+                'responseBody': '',
+                'responseHeaders': [],
+                'logs': '',
+                'errors': '',
+                'duration': 0.4,};
+
+
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await functions.getExecution(
+                functionId: '<FUNCTION_ID>',
+                executionId: '<EXECUTION_ID>',
+            );
+            expect(response, isA<models.Execution>());
+
+        });
+
     });
-  });
-}
+}
\ No newline at end of file
diff --git a/test/services/graphql_test.dart b/test/services/graphql_test.dart
index 84b7de1c..1c096784 100644
--- a/test/services/graphql_test.dart
+++ b/test/services/graphql_test.dart
@@ -24,11 +24,12 @@ class MockClient extends Mock implements Client {
 
   @override
   Future webAuth(
-    Uri? url, {
-    String? callbackUrlScheme,
-  }) async {
-    return super
-        .noSuchMethod(Invocation.method(#webAuth, [url]), returnValue: 'done');
+    Uri? url,
+    {
+        String? callbackUrlScheme,
+    }
+  ) async {
+    return super.noSuchMethod(Invocation.method(#webAuth, [url]), returnValue: 'done');
   }
 
   @override
@@ -40,45 +41,45 @@ class MockClient extends Mock implements Client {
     Map<String, String>? headers,
     Function(UploadProgress)? onProgress,
   }) async {
-    return super.noSuchMethod(
-        Invocation.method(
-            #chunkedUpload, [path, params, paramName, idParamName, headers]),
-        returnValue: Response(data: {}));
+    return super.noSuchMethod(Invocation.method(#chunkedUpload, [path, params, paramName, idParamName, headers]), returnValue: Response(data: {}));
   }
 }
 
 void main() {
-  group('Graphql test', () {
-    late MockClient client;
-    late Graphql graphql;
+    group('Graphql test', () {
+        late MockClient client;
+        late Graphql graphql;
 
-    setUp(() {
-      client = MockClient();
-      graphql = Graphql(client);
-    });
+        setUp(() {
+            client = MockClient();
+            graphql = Graphql(client);
+        });
 
-    test('test method query()', () async {
-      final data = '';
+        test('test method query()', () async {
+            final data = '';
 
-      when(client.call(
-        HttpMethod.post,
-      )).thenAnswer((_) async => Response(data: data));
+            when(client.call(
+                HttpMethod.post,
+            )).thenAnswer((_) async => Response(data: data));
 
-      final response = await graphql.query(
-        query: {},
-      );
-    });
 
-    test('test method mutation()', () async {
-      final data = '';
+            final response = await graphql.query(
+                query: {},
+            );
+        });
+
+        test('test method mutation()', () async {
+            final data = '';
 
-      when(client.call(
-        HttpMethod.post,
-      )).thenAnswer((_) async => Response(data: data));
+            when(client.call(
+                HttpMethod.post,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await graphql.mutation(
+                query: {},
+            );
+        });
 
-      final response = await graphql.mutation(
-        query: {},
-      );
     });
-  });
-}
+}
\ No newline at end of file
diff --git a/test/services/locale_test.dart b/test/services/locale_test.dart
index f9f6489d..ccdcb5d3 100644
--- a/test/services/locale_test.dart
+++ b/test/services/locale_test.dart
@@ -24,11 +24,12 @@ class MockClient extends Mock implements Client {
 
   @override
   Future webAuth(
-    Uri? url, {
-    String? callbackUrlScheme,
-  }) async {
-    return super
-        .noSuchMethod(Invocation.method(#webAuth, [url]), returnValue: 'done');
+    Uri? url,
+    {
+        String? callbackUrlScheme,
+    }
+  ) async {
+    return super.noSuchMethod(Invocation.method(#webAuth, [url]), returnValue: 'done');
   }
 
   @override
@@ -40,138 +41,160 @@ class MockClient extends Mock implements Client {
     Map<String, String>? headers,
     Function(UploadProgress)? onProgress,
   }) async {
-    return super.noSuchMethod(
-        Invocation.method(
-            #chunkedUpload, [path, params, paramName, idParamName, headers]),
-        returnValue: Response(data: {}));
+    return super.noSuchMethod(Invocation.method(#chunkedUpload, [path, params, paramName, idParamName, headers]), returnValue: Response(data: {}));
   }
 }
 
 void main() {
-  group('Locale test', () {
-    late MockClient client;
-    late Locale locale;
+    group('Locale test', () {
+        late MockClient client;
+        late Locale locale;
 
-    setUp(() {
-      client = MockClient();
-      locale = Locale(client);
-    });
+        setUp(() {
+            client = MockClient();
+            locale = Locale(client);
+        });
 
-    test('test method get()', () async {
-      final Map<String, dynamic> data = {
-        'ip': '127.0.0.1',
-        'countryCode': 'US',
-        'country': 'United States',
-        'continentCode': 'NA',
-        'continent': 'North America',
-        'eu': true,
-        'currency': 'USD',
-      };
-
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await locale.get();
-      expect(response, isA<models.Locale>());
-    });
+        test('test method get()', () async {
+            final Map<String, dynamic> data = {
+                'ip': '127.0.0.1',
+                'countryCode': 'US',
+                'country': 'United States',
+                'continentCode': 'NA',
+                'continent': 'North America',
+                'eu': true,
+                'currency': 'USD',};
 
-    test('test method listCodes()', () async {
-      final Map<String, dynamic> data = {
-        'total': 5,
-        'localeCodes': [],
-      };
 
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
 
-      final response = await locale.listCodes();
-      expect(response, isA<models.LocaleCodeList>());
-    });
 
-    test('test method listContinents()', () async {
-      final Map<String, dynamic> data = {
-        'total': 5,
-        'continents': [],
-      };
+            final response = await locale.get(
+            );
+            expect(response, isA<models.Locale>());
 
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
+        });
 
-      final response = await locale.listContinents();
-      expect(response, isA<models.ContinentList>());
-    });
+        test('test method listCodes()', () async {
+            final Map<String, dynamic> data = {
+                'total': 5,
+                'localeCodes': [],};
 
-    test('test method listCountries()', () async {
-      final Map<String, dynamic> data = {
-        'total': 5,
-        'countries': [],
-      };
 
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
 
-      final response = await locale.listCountries();
-      expect(response, isA<models.CountryList>());
-    });
 
-    test('test method listCountriesEU()', () async {
-      final Map<String, dynamic> data = {
-        'total': 5,
-        'countries': [],
-      };
+            final response = await locale.listCodes(
+            );
+            expect(response, isA<models.LocaleCodeList>());
 
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
+        });
 
-      final response = await locale.listCountriesEU();
-      expect(response, isA<models.CountryList>());
-    });
+        test('test method listContinents()', () async {
+            final Map<String, dynamic> data = {
+                'total': 5,
+                'continents': [],};
 
-    test('test method listCountriesPhones()', () async {
-      final Map<String, dynamic> data = {
-        'total': 5,
-        'phones': [],
-      };
 
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
 
-      final response = await locale.listCountriesPhones();
-      expect(response, isA<models.PhoneList>());
-    });
 
-    test('test method listCurrencies()', () async {
-      final Map<String, dynamic> data = {
-        'total': 5,
-        'currencies': [],
-      };
+            final response = await locale.listContinents(
+            );
+            expect(response, isA<models.ContinentList>());
 
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
+        });
 
-      final response = await locale.listCurrencies();
-      expect(response, isA<models.CurrencyList>());
-    });
+        test('test method listCountries()', () async {
+            final Map<String, dynamic> data = {
+                'total': 5,
+                'countries': [],};
+
+
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await locale.listCountries(
+            );
+            expect(response, isA<models.CountryList>());
+
+        });
+
+        test('test method listCountriesEU()', () async {
+            final Map<String, dynamic> data = {
+                'total': 5,
+                'countries': [],};
+
+
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await locale.listCountriesEU(
+            );
+            expect(response, isA<models.CountryList>());
 
-    test('test method listLanguages()', () async {
-      final Map<String, dynamic> data = {
-        'total': 5,
-        'languages': [],
-      };
+        });
 
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
+        test('test method listCountriesPhones()', () async {
+            final Map<String, dynamic> data = {
+                'total': 5,
+                'phones': [],};
+
+
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await locale.listCountriesPhones(
+            );
+            expect(response, isA<models.PhoneList>());
+
+        });
+
+        test('test method listCurrencies()', () async {
+            final Map<String, dynamic> data = {
+                'total': 5,
+                'currencies': [],};
+
+
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await locale.listCurrencies(
+            );
+            expect(response, isA<models.CurrencyList>());
+
+        });
+
+        test('test method listLanguages()', () async {
+            final Map<String, dynamic> data = {
+                'total': 5,
+                'languages': [],};
+
+
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await locale.listLanguages(
+            );
+            expect(response, isA<models.LanguageList>());
+
+        });
 
-      final response = await locale.listLanguages();
-      expect(response, isA<models.LanguageList>());
     });
-  });
-}
+}
\ No newline at end of file
diff --git a/test/services/messaging_test.dart b/test/services/messaging_test.dart
index 0c938eff..ddb93457 100644
--- a/test/services/messaging_test.dart
+++ b/test/services/messaging_test.dart
@@ -24,11 +24,12 @@ class MockClient extends Mock implements Client {
 
   @override
   Future webAuth(
-    Uri? url, {
-    String? callbackUrlScheme,
-  }) async {
-    return super
-        .noSuchMethod(Invocation.method(#webAuth, [url]), returnValue: 'done');
+    Uri? url,
+    {
+        String? callbackUrlScheme,
+    }
+  ) async {
+    return super.noSuchMethod(Invocation.method(#webAuth, [url]), returnValue: 'done');
   }
 
   @override
@@ -40,68 +41,69 @@ class MockClient extends Mock implements Client {
     Map<String, String>? headers,
     Function(UploadProgress)? onProgress,
   }) async {
-    return super.noSuchMethod(
-        Invocation.method(
-            #chunkedUpload, [path, params, paramName, idParamName, headers]),
-        returnValue: Response(data: {}));
+    return super.noSuchMethod(Invocation.method(#chunkedUpload, [path, params, paramName, idParamName, headers]), returnValue: Response(data: {}));
   }
 }
 
 void main() {
-  group('Messaging test', () {
-    late MockClient client;
-    late Messaging messaging;
+    group('Messaging test', () {
+        late MockClient client;
+        late Messaging messaging;
 
-    setUp(() {
-      client = MockClient();
-      messaging = Messaging(client);
-    });
+        setUp(() {
+            client = MockClient();
+            messaging = Messaging(client);
+        });
+
+        test('test method createSubscriber()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '259125845563242502',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                'targetId': '259125845563242502',
+                'target': <String, dynamic>{
+    '\$id': '259125845563242502',
+    '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+    '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+    'name': 'Apple iPhone 12',
+    'userId': '259125845563242502',
+    'providerType': 'email',
+    'identifier': 'token',
+    'expired': true,
+  },
+                'userId': '5e5ea5c16897e',
+                'userName': 'Aegon Targaryen',
+                'topicId': '259125845563242502',
+                'providerType': 'email',};
+
+
+            when(client.call(
+                HttpMethod.post,
+            )).thenAnswer((_) async => Response(data: data));
 
-    test('test method createSubscriber()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '259125845563242502',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        'targetId': '259125845563242502',
-        'target': <String, dynamic>{
-          '\$id': '259125845563242502',
-          '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-          '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-          'name': 'Apple iPhone 12',
-          'userId': '259125845563242502',
-          'providerType': 'email',
-          'identifier': 'token',
-          'expired': true,
-        },
-        'userId': '5e5ea5c16897e',
-        'userName': 'Aegon Targaryen',
-        'topicId': '259125845563242502',
-        'providerType': 'email',
-      };
-
-      when(client.call(
-        HttpMethod.post,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await messaging.createSubscriber(
-        topicId: '<TOPIC_ID>',
-        subscriberId: '<SUBSCRIBER_ID>',
-        targetId: '<TARGET_ID>',
-      );
-      expect(response, isA<models.Subscriber>());
-    });
 
-    test('test method deleteSubscriber()', () async {
-      final data = '';
+            final response = await messaging.createSubscriber(
+                topicId: '<TOPIC_ID>',
+                subscriberId: '<SUBSCRIBER_ID>',
+                targetId: '<TARGET_ID>',
+            );
+            expect(response, isA<models.Subscriber>());
 
-      when(client.call(
-        HttpMethod.delete,
-      )).thenAnswer((_) async => Response(data: data));
+        });
+
+        test('test method deleteSubscriber()', () async {
+            final data = '';
+
+            when(client.call(
+                HttpMethod.delete,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await messaging.deleteSubscriber(
+                topicId: '<TOPIC_ID>',
+                subscriberId: '<SUBSCRIBER_ID>',
+            );
+        });
 
-      final response = await messaging.deleteSubscriber(
-        topicId: '<TOPIC_ID>',
-        subscriberId: '<SUBSCRIBER_ID>',
-      );
     });
-  });
-}
+}
\ No newline at end of file
diff --git a/test/services/storage_test.dart b/test/services/storage_test.dart
index 19b0d334..9d250109 100644
--- a/test/services/storage_test.dart
+++ b/test/services/storage_test.dart
@@ -24,11 +24,12 @@ class MockClient extends Mock implements Client {
 
   @override
   Future webAuth(
-    Uri? url, {
-    String? callbackUrlScheme,
-  }) async {
-    return super
-        .noSuchMethod(Invocation.method(#webAuth, [url]), returnValue: 'done');
+    Uri? url,
+    {
+        String? callbackUrlScheme,
+    }
+  ) async {
+    return super.noSuchMethod(Invocation.method(#webAuth, [url]), returnValue: 'done');
   }
 
   @override
@@ -40,175 +41,185 @@ class MockClient extends Mock implements Client {
     Map<String, String>? headers,
     Function(UploadProgress)? onProgress,
   }) async {
-    return super.noSuchMethod(
-        Invocation.method(
-            #chunkedUpload, [path, params, paramName, idParamName, headers]),
-        returnValue: Response(data: {}));
+    return super.noSuchMethod(Invocation.method(#chunkedUpload, [path, params, paramName, idParamName, headers]), returnValue: Response(data: {}));
   }
 }
 
 void main() {
-  group('Storage test', () {
-    late MockClient client;
-    late Storage storage;
+    group('Storage test', () {
+        late MockClient client;
+        late Storage storage;
+
+        setUp(() {
+            client = MockClient();
+            storage = Storage(client);
+        });
+
+        test('test method listFiles()', () async {
+            final Map<String, dynamic> data = {
+                'total': 5,
+                'files': [],};
+
+
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await storage.listFiles(
+                bucketId: '<BUCKET_ID>',
+            );
+            expect(response, isA<models.FileList>());
+
+        });
+
+        test('test method createFile()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                'bucketId': '5e5ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                '\$permissions': [],
+                'name': 'Pink.png',
+                'signature': '5d529fd02b544198ae075bd57c1762bb',
+                'mimeType': 'image/png',
+                'sizeOriginal': 17890,
+                'chunksTotal': 17890,
+                'chunksUploaded': 17890,};
+
+
+            when(client.chunkedUpload(
+                path: argThat(isNotNull),
+                params: argThat(isNotNull),
+                paramName: argThat(isNotNull),
+                idParamName: argThat(isNotNull),
+                headers: argThat(isNotNull),
+            )).thenAnswer((_) async => Response(data: data));
+
 
-    setUp(() {
-      client = MockClient();
-      storage = Storage(client);
-    });
+            final response = await storage.createFile(
+                bucketId: '<BUCKET_ID>',
+                fileId: '<FILE_ID>',
+                file: InputFile.fromPath(path: './image.png'),
+            );
+            expect(response, isA<models.File>());
 
-    test('test method listFiles()', () async {
-      final Map<String, dynamic> data = {
-        'total': 5,
-        'files': [],
-      };
+        });
 
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
+        test('test method getFile()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                'bucketId': '5e5ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                '\$permissions': [],
+                'name': 'Pink.png',
+                'signature': '5d529fd02b544198ae075bd57c1762bb',
+                'mimeType': 'image/png',
+                'sizeOriginal': 17890,
+                'chunksTotal': 17890,
+                'chunksUploaded': 17890,};
 
-      final response = await storage.listFiles(
-        bucketId: '<BUCKET_ID>',
-      );
-      expect(response, isA<models.FileList>());
-    });
 
-    test('test method createFile()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        'bucketId': '5e5ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        '\$permissions': [],
-        'name': 'Pink.png',
-        'signature': '5d529fd02b544198ae075bd57c1762bb',
-        'mimeType': 'image/png',
-        'sizeOriginal': 17890,
-        'chunksTotal': 17890,
-        'chunksUploaded': 17890,
-      };
-
-      when(client.chunkedUpload(
-        path: argThat(isNotNull),
-        params: argThat(isNotNull),
-        paramName: argThat(isNotNull),
-        idParamName: argThat(isNotNull),
-        headers: argThat(isNotNull),
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await storage.createFile(
-        bucketId: '<BUCKET_ID>',
-        fileId: '<FILE_ID>',
-        file: InputFile.fromPath(path: './image.png'),
-      );
-      expect(response, isA<models.File>());
-    });
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
 
-    test('test method getFile()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        'bucketId': '5e5ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        '\$permissions': [],
-        'name': 'Pink.png',
-        'signature': '5d529fd02b544198ae075bd57c1762bb',
-        'mimeType': 'image/png',
-        'sizeOriginal': 17890,
-        'chunksTotal': 17890,
-        'chunksUploaded': 17890,
-      };
-
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await storage.getFile(
-        bucketId: '<BUCKET_ID>',
-        fileId: '<FILE_ID>',
-      );
-      expect(response, isA<models.File>());
-    });
 
-    test('test method updateFile()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        'bucketId': '5e5ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        '\$permissions': [],
-        'name': 'Pink.png',
-        'signature': '5d529fd02b544198ae075bd57c1762bb',
-        'mimeType': 'image/png',
-        'sizeOriginal': 17890,
-        'chunksTotal': 17890,
-        'chunksUploaded': 17890,
-      };
-
-      when(client.call(
-        HttpMethod.put,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await storage.updateFile(
-        bucketId: '<BUCKET_ID>',
-        fileId: '<FILE_ID>',
-      );
-      expect(response, isA<models.File>());
-    });
+            final response = await storage.getFile(
+                bucketId: '<BUCKET_ID>',
+                fileId: '<FILE_ID>',
+            );
+            expect(response, isA<models.File>());
 
-    test('test method deleteFile()', () async {
-      final data = '';
+        });
 
-      when(client.call(
-        HttpMethod.delete,
-      )).thenAnswer((_) async => Response(data: data));
+        test('test method updateFile()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                'bucketId': '5e5ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                '\$permissions': [],
+                'name': 'Pink.png',
+                'signature': '5d529fd02b544198ae075bd57c1762bb',
+                'mimeType': 'image/png',
+                'sizeOriginal': 17890,
+                'chunksTotal': 17890,
+                'chunksUploaded': 17890,};
 
-      final response = await storage.deleteFile(
-        bucketId: '<BUCKET_ID>',
-        fileId: '<FILE_ID>',
-      );
-    });
 
-    test('test method getFileDownload()', () async {
-      final Uint8List data = Uint8List.fromList([]);
+            when(client.call(
+                HttpMethod.put,
+            )).thenAnswer((_) async => Response(data: data));
 
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
 
-      final response = await storage.getFileDownload(
-        bucketId: '<BUCKET_ID>',
-        fileId: '<FILE_ID>',
-      );
-      expect(response, isA<Uint8List>());
-    });
+            final response = await storage.updateFile(
+                bucketId: '<BUCKET_ID>',
+                fileId: '<FILE_ID>',
+            );
+            expect(response, isA<models.File>());
 
-    test('test method getFilePreview()', () async {
-      final Uint8List data = Uint8List.fromList([]);
+        });
 
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
+        test('test method deleteFile()', () async {
+            final data = '';
 
-      final response = await storage.getFilePreview(
-        bucketId: '<BUCKET_ID>',
-        fileId: '<FILE_ID>',
-      );
-      expect(response, isA<Uint8List>());
-    });
+            when(client.call(
+                HttpMethod.delete,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await storage.deleteFile(
+                bucketId: '<BUCKET_ID>',
+                fileId: '<FILE_ID>',
+            );
+        });
+
+        test('test method getFileDownload()', () async {final Uint8List data = Uint8List.fromList([]);
+
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
 
-    test('test method getFileView()', () async {
-      final Uint8List data = Uint8List.fromList([]);
 
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
+            final response = await storage.getFileDownload(
+                bucketId: '<BUCKET_ID>',
+                fileId: '<FILE_ID>',
+            );
+            expect(response, isA<Uint8List>());
+
+        });
+
+        test('test method getFilePreview()', () async {final Uint8List data = Uint8List.fromList([]);
+
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await storage.getFilePreview(
+                bucketId: '<BUCKET_ID>',
+                fileId: '<FILE_ID>',
+            );
+            expect(response, isA<Uint8List>());
+
+        });
+
+        test('test method getFileView()', () async {final Uint8List data = Uint8List.fromList([]);
+
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await storage.getFileView(
+                bucketId: '<BUCKET_ID>',
+                fileId: '<FILE_ID>',
+            );
+            expect(response, isA<Uint8List>());
+
+        });
 
-      final response = await storage.getFileView(
-        bucketId: '<BUCKET_ID>',
-        fileId: '<FILE_ID>',
-      );
-      expect(response, isA<Uint8List>());
     });
-  });
-}
+}
\ No newline at end of file
diff --git a/test/services/tables_db_test.dart b/test/services/tables_db_test.dart
index 59098320..9b11eb45 100644
--- a/test/services/tables_db_test.dart
+++ b/test/services/tables_db_test.dart
@@ -24,11 +24,12 @@ class MockClient extends Mock implements Client {
 
   @override
   Future webAuth(
-    Uri? url, {
-    String? callbackUrlScheme,
-  }) async {
-    return super
-        .noSuchMethod(Invocation.method(#webAuth, [url]), returnValue: 'done');
+    Uri? url,
+    {
+        String? callbackUrlScheme,
+    }
+  ) async {
+    return super.noSuchMethod(Invocation.method(#webAuth, [url]), returnValue: 'done');
   }
 
   @override
@@ -40,193 +41,206 @@ class MockClient extends Mock implements Client {
     Map<String, String>? headers,
     Function(UploadProgress)? onProgress,
   }) async {
-    return super.noSuchMethod(
-        Invocation.method(
-            #chunkedUpload, [path, params, paramName, idParamName, headers]),
-        returnValue: Response(data: {}));
+    return super.noSuchMethod(Invocation.method(#chunkedUpload, [path, params, paramName, idParamName, headers]), returnValue: Response(data: {}));
   }
 }
 
 void main() {
-  group('TablesDB test', () {
-    late MockClient client;
-    late TablesDB tablesDB;
+    group('TablesDB test', () {
+        late MockClient client;
+        late TablesDB tablesDB;
+
+        setUp(() {
+            client = MockClient();
+            tablesDB = TablesDB(client);
+        });
+
+        test('test method listRows()', () async {
+            final Map<String, dynamic> data = {
+                'total': 5,
+                'rows': [],};
 
-    setUp(() {
-      client = MockClient();
-      tablesDB = TablesDB(client);
-    });
 
-    test('test method listRows()', () async {
-      final Map<String, dynamic> data = {
-        'total': 5,
-        'rows': [],
-      };
-
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await tablesDB.listRows(
-        databaseId: '<DATABASE_ID>',
-        tableId: '<TABLE_ID>',
-      );
-      expect(response, isA<models.RowList>());
-    });
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
 
-    test('test method createRow()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$sequence': 1,
-        '\$tableId': '5e5ea5c15117e',
-        '\$databaseId': '5e5ea5c15117e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        '\$permissions': [],
-      };
-
-      when(client.call(
-        HttpMethod.post,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await tablesDB.createRow(
-        databaseId: '<DATABASE_ID>',
-        tableId: '<TABLE_ID>',
-        rowId: '<ROW_ID>',
-        data: {},
-      );
-      expect(response, isA<models.Row>());
-    });
 
-    test('test method getRow()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$sequence': 1,
-        '\$tableId': '5e5ea5c15117e',
-        '\$databaseId': '5e5ea5c15117e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        '\$permissions': [],
-      };
-
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await tablesDB.getRow(
-        databaseId: '<DATABASE_ID>',
-        tableId: '<TABLE_ID>',
-        rowId: '<ROW_ID>',
-      );
-      expect(response, isA<models.Row>());
-    });
+            final response = await tablesDB.listRows(
+                databaseId: '<DATABASE_ID>',
+                tableId: '<TABLE_ID>',
+            );
+            expect(response, isA<models.RowList>());
+
+        });
+
+        test('test method createRow()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$sequence': 1,
+                '\$tableId': '5e5ea5c15117e',
+                '\$databaseId': '5e5ea5c15117e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                '\$permissions': [],};
 
-    test('test method upsertRow()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$sequence': 1,
-        '\$tableId': '5e5ea5c15117e',
-        '\$databaseId': '5e5ea5c15117e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        '\$permissions': [],
-      };
-
-      when(client.call(
-        HttpMethod.put,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await tablesDB.upsertRow(
-        databaseId: '<DATABASE_ID>',
-        tableId: '<TABLE_ID>',
-        rowId: '<ROW_ID>',
-      );
-      expect(response, isA<models.Row>());
-    });
 
-    test('test method updateRow()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$sequence': 1,
-        '\$tableId': '5e5ea5c15117e',
-        '\$databaseId': '5e5ea5c15117e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        '\$permissions': [],
-      };
-
-      when(client.call(
-        HttpMethod.patch,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await tablesDB.updateRow(
-        databaseId: '<DATABASE_ID>',
-        tableId: '<TABLE_ID>',
-        rowId: '<ROW_ID>',
-      );
-      expect(response, isA<models.Row>());
-    });
+            when(client.call(
+                HttpMethod.post,
+            )).thenAnswer((_) async => Response(data: data));
 
-    test('test method deleteRow()', () async {
-      final data = '';
 
-      when(client.call(
-        HttpMethod.delete,
-      )).thenAnswer((_) async => Response(data: data));
+            final response = await tablesDB.createRow(
+                databaseId: '<DATABASE_ID>',
+                tableId: '<TABLE_ID>',
+                rowId: '<ROW_ID>',
+                data: {},
+            );
+            expect(response, isA<models.Row>());
+
+        });
+
+        test('test method getRow()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$sequence': 1,
+                '\$tableId': '5e5ea5c15117e',
+                '\$databaseId': '5e5ea5c15117e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                '\$permissions': [],};
+
+
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
+
 
-      final response = await tablesDB.deleteRow(
-        databaseId: '<DATABASE_ID>',
-        tableId: '<TABLE_ID>',
-        rowId: '<ROW_ID>',
-      );
-    });
+            final response = await tablesDB.getRow(
+                databaseId: '<DATABASE_ID>',
+                tableId: '<TABLE_ID>',
+                rowId: '<ROW_ID>',
+            );
+            expect(response, isA<models.Row>());
+
+        });
+
+        test('test method upsertRow()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$sequence': 1,
+                '\$tableId': '5e5ea5c15117e',
+                '\$databaseId': '5e5ea5c15117e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                '\$permissions': [],};
+
+
+            when(client.call(
+                HttpMethod.put,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await tablesDB.upsertRow(
+                databaseId: '<DATABASE_ID>',
+                tableId: '<TABLE_ID>',
+                rowId: '<ROW_ID>',
+            );
+            expect(response, isA<models.Row>());
 
-    test('test method decrementRowColumn()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$sequence': 1,
-        '\$tableId': '5e5ea5c15117e',
-        '\$databaseId': '5e5ea5c15117e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        '\$permissions': [],
-      };
-
-      when(client.call(
-        HttpMethod.patch,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await tablesDB.decrementRowColumn(
-        databaseId: '<DATABASE_ID>',
-        tableId: '<TABLE_ID>',
-        rowId: '<ROW_ID>',
-        column: '',
-      );
-      expect(response, isA<models.Row>());
-    });
+        });
+
+        test('test method updateRow()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$sequence': 1,
+                '\$tableId': '5e5ea5c15117e',
+                '\$databaseId': '5e5ea5c15117e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                '\$permissions': [],};
+
+
+            when(client.call(
+                HttpMethod.patch,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await tablesDB.updateRow(
+                databaseId: '<DATABASE_ID>',
+                tableId: '<TABLE_ID>',
+                rowId: '<ROW_ID>',
+            );
+            expect(response, isA<models.Row>());
+
+        });
+
+        test('test method deleteRow()', () async {
+            final data = '';
+
+            when(client.call(
+                HttpMethod.delete,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await tablesDB.deleteRow(
+                databaseId: '<DATABASE_ID>',
+                tableId: '<TABLE_ID>',
+                rowId: '<ROW_ID>',
+            );
+        });
+
+        test('test method decrementRowColumn()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$sequence': 1,
+                '\$tableId': '5e5ea5c15117e',
+                '\$databaseId': '5e5ea5c15117e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                '\$permissions': [],};
+
+
+            when(client.call(
+                HttpMethod.patch,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await tablesDB.decrementRowColumn(
+                databaseId: '<DATABASE_ID>',
+                tableId: '<TABLE_ID>',
+                rowId: '<ROW_ID>',
+                column: '',
+            );
+            expect(response, isA<models.Row>());
+
+        });
+
+        test('test method incrementRowColumn()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$sequence': 1,
+                '\$tableId': '5e5ea5c15117e',
+                '\$databaseId': '5e5ea5c15117e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                '\$permissions': [],};
+
+
+            when(client.call(
+                HttpMethod.patch,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await tablesDB.incrementRowColumn(
+                databaseId: '<DATABASE_ID>',
+                tableId: '<TABLE_ID>',
+                rowId: '<ROW_ID>',
+                column: '',
+            );
+            expect(response, isA<models.Row>());
+
+        });
 
-    test('test method incrementRowColumn()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$sequence': 1,
-        '\$tableId': '5e5ea5c15117e',
-        '\$databaseId': '5e5ea5c15117e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        '\$permissions': [],
-      };
-
-      when(client.call(
-        HttpMethod.patch,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await tablesDB.incrementRowColumn(
-        databaseId: '<DATABASE_ID>',
-        tableId: '<TABLE_ID>',
-        rowId: '<ROW_ID>',
-        column: '',
-      );
-      expect(response, isA<models.Row>());
     });
-  });
-}
+}
\ No newline at end of file
diff --git a/test/services/teams_test.dart b/test/services/teams_test.dart
index 9a2eb930..c2e5ff04 100644
--- a/test/services/teams_test.dart
+++ b/test/services/teams_test.dart
@@ -24,11 +24,12 @@ class MockClient extends Mock implements Client {
 
   @override
   Future webAuth(
-    Uri? url, {
-    String? callbackUrlScheme,
-  }) async {
-    return super
-        .noSuchMethod(Invocation.method(#webAuth, [url]), returnValue: 'done');
+    Uri? url,
+    {
+        String? callbackUrlScheme,
+    }
+  ) async {
+    return super.noSuchMethod(Invocation.method(#webAuth, [url]), returnValue: 'done');
   }
 
   @override
@@ -40,280 +41,305 @@ class MockClient extends Mock implements Client {
     Map<String, String>? headers,
     Function(UploadProgress)? onProgress,
   }) async {
-    return super.noSuchMethod(
-        Invocation.method(
-            #chunkedUpload, [path, params, paramName, idParamName, headers]),
-        returnValue: Response(data: {}));
+    return super.noSuchMethod(Invocation.method(#chunkedUpload, [path, params, paramName, idParamName, headers]), returnValue: Response(data: {}));
   }
 }
 
 void main() {
-  group('Teams test', () {
-    late MockClient client;
-    late Teams teams;
+    group('Teams test', () {
+        late MockClient client;
+        late Teams teams;
 
-    setUp(() {
-      client = MockClient();
-      teams = Teams(client);
-    });
+        setUp(() {
+            client = MockClient();
+            teams = Teams(client);
+        });
 
-    test('test method list()', () async {
-      final Map<String, dynamic> data = {
-        'total': 5,
-        'teams': [],
-      };
+        test('test method list()', () async {
+            final Map<String, dynamic> data = {
+                'total': 5,
+                'teams': [],};
 
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
 
-      final response = await teams.list();
-      expect(response, isA<models.TeamList>());
-    });
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
 
-    test('test method create()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        'name': 'VIP',
-        'total': 7,
-        'prefs': <String, dynamic>{},
-      };
-
-      when(client.call(
-        HttpMethod.post,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await teams.create(
-        teamId: '<TEAM_ID>',
-        name: '<NAME>',
-      );
-      expect(response, isA<models.Team>());
-    });
 
-    test('test method get()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        'name': 'VIP',
-        'total': 7,
-        'prefs': <String, dynamic>{},
-      };
-
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await teams.get(
-        teamId: '<TEAM_ID>',
-      );
-      expect(response, isA<models.Team>());
-    });
+            final response = await teams.list(
+            );
+            expect(response, isA<models.TeamList>());
 
-    test('test method updateName()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        'name': 'VIP',
-        'total': 7,
-        'prefs': <String, dynamic>{},
-      };
-
-      when(client.call(
-        HttpMethod.put,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await teams.updateName(
-        teamId: '<TEAM_ID>',
-        name: '<NAME>',
-      );
-      expect(response, isA<models.Team>());
-    });
+        });
 
-    test('test method delete()', () async {
-      final data = '';
+        test('test method create()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                'name': 'VIP',
+                'total': 7,
+                'prefs': <String, dynamic>{},};
 
-      when(client.call(
-        HttpMethod.delete,
-      )).thenAnswer((_) async => Response(data: data));
 
-      final response = await teams.delete(
-        teamId: '<TEAM_ID>',
-      );
-    });
+            when(client.call(
+                HttpMethod.post,
+            )).thenAnswer((_) async => Response(data: data));
 
-    test('test method listMemberships()', () async {
-      final Map<String, dynamic> data = {
-        'total': 5,
-        'memberships': [],
-      };
 
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
+            final response = await teams.create(
+                teamId: '<TEAM_ID>',
+                name: '<NAME>',
+            );
+            expect(response, isA<models.Team>());
 
-      final response = await teams.listMemberships(
-        teamId: '<TEAM_ID>',
-      );
-      expect(response, isA<models.MembershipList>());
-    });
+        });
 
-    test('test method createMembership()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        'userId': '5e5ea5c16897e',
-        'userName': 'John Doe',
-        'userEmail': 'john@appwrite.io',
-        'teamId': '5e5ea5c16897e',
-        'teamName': 'VIP',
-        'invited': '2020-10-15T06:38:00.000+00:00',
-        'joined': '2020-10-15T06:38:00.000+00:00',
-        'confirm': true,
-        'mfa': true,
-        'roles': [],
-      };
-
-      when(client.call(
-        HttpMethod.post,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await teams.createMembership(
-        teamId: '<TEAM_ID>',
-        roles: [],
-      );
-      expect(response, isA<models.Membership>());
-    });
+        test('test method get()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                'name': 'VIP',
+                'total': 7,
+                'prefs': <String, dynamic>{},};
 
-    test('test method getMembership()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        'userId': '5e5ea5c16897e',
-        'userName': 'John Doe',
-        'userEmail': 'john@appwrite.io',
-        'teamId': '5e5ea5c16897e',
-        'teamName': 'VIP',
-        'invited': '2020-10-15T06:38:00.000+00:00',
-        'joined': '2020-10-15T06:38:00.000+00:00',
-        'confirm': true,
-        'mfa': true,
-        'roles': [],
-      };
-
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await teams.getMembership(
-        teamId: '<TEAM_ID>',
-        membershipId: '<MEMBERSHIP_ID>',
-      );
-      expect(response, isA<models.Membership>());
-    });
 
-    test('test method updateMembership()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        'userId': '5e5ea5c16897e',
-        'userName': 'John Doe',
-        'userEmail': 'john@appwrite.io',
-        'teamId': '5e5ea5c16897e',
-        'teamName': 'VIP',
-        'invited': '2020-10-15T06:38:00.000+00:00',
-        'joined': '2020-10-15T06:38:00.000+00:00',
-        'confirm': true,
-        'mfa': true,
-        'roles': [],
-      };
-
-      when(client.call(
-        HttpMethod.patch,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await teams.updateMembership(
-        teamId: '<TEAM_ID>',
-        membershipId: '<MEMBERSHIP_ID>',
-        roles: [],
-      );
-      expect(response, isA<models.Membership>());
-    });
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
 
-    test('test method deleteMembership()', () async {
-      final data = '';
 
-      when(client.call(
-        HttpMethod.delete,
-      )).thenAnswer((_) async => Response(data: data));
+            final response = await teams.get(
+                teamId: '<TEAM_ID>',
+            );
+            expect(response, isA<models.Team>());
 
-      final response = await teams.deleteMembership(
-        teamId: '<TEAM_ID>',
-        membershipId: '<MEMBERSHIP_ID>',
-      );
-    });
+        });
 
-    test('test method updateMembershipStatus()', () async {
-      final Map<String, dynamic> data = {
-        '\$id': '5e5ea5c16897e',
-        '\$createdAt': '2020-10-15T06:38:00.000+00:00',
-        '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
-        'userId': '5e5ea5c16897e',
-        'userName': 'John Doe',
-        'userEmail': 'john@appwrite.io',
-        'teamId': '5e5ea5c16897e',
-        'teamName': 'VIP',
-        'invited': '2020-10-15T06:38:00.000+00:00',
-        'joined': '2020-10-15T06:38:00.000+00:00',
-        'confirm': true,
-        'mfa': true,
-        'roles': [],
-      };
-
-      when(client.call(
-        HttpMethod.patch,
-      )).thenAnswer((_) async => Response(data: data));
-
-      final response = await teams.updateMembershipStatus(
-        teamId: '<TEAM_ID>',
-        membershipId: '<MEMBERSHIP_ID>',
-        userId: '<USER_ID>',
-        secret: '<SECRET>',
-      );
-      expect(response, isA<models.Membership>());
-    });
+        test('test method updateName()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                'name': 'VIP',
+                'total': 7,
+                'prefs': <String, dynamic>{},};
 
-    test('test method getPrefs()', () async {
-      final Map<String, dynamic> data = {};
 
-      when(client.call(
-        HttpMethod.get,
-      )).thenAnswer((_) async => Response(data: data));
+            when(client.call(
+                HttpMethod.put,
+            )).thenAnswer((_) async => Response(data: data));
 
-      final response = await teams.getPrefs(
-        teamId: '<TEAM_ID>',
-      );
-      expect(response, isA<models.Preferences>());
-    });
 
-    test('test method updatePrefs()', () async {
-      final Map<String, dynamic> data = {};
+            final response = await teams.updateName(
+                teamId: '<TEAM_ID>',
+                name: '<NAME>',
+            );
+            expect(response, isA<models.Team>());
+
+        });
+
+        test('test method delete()', () async {
+            final data = '';
+
+            when(client.call(
+                HttpMethod.delete,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await teams.delete(
+                teamId: '<TEAM_ID>',
+            );
+        });
+
+        test('test method listMemberships()', () async {
+            final Map<String, dynamic> data = {
+                'total': 5,
+                'memberships': [],};
+
+
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await teams.listMemberships(
+                teamId: '<TEAM_ID>',
+            );
+            expect(response, isA<models.MembershipList>());
+
+        });
+
+        test('test method createMembership()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                'userId': '5e5ea5c16897e',
+                'userName': 'John Doe',
+                'userEmail': 'john@appwrite.io',
+                'teamId': '5e5ea5c16897e',
+                'teamName': 'VIP',
+                'invited': '2020-10-15T06:38:00.000+00:00',
+                'joined': '2020-10-15T06:38:00.000+00:00',
+                'confirm': true,
+                'mfa': true,
+                'roles': [],};
+
+
+            when(client.call(
+                HttpMethod.post,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await teams.createMembership(
+                teamId: '<TEAM_ID>',
+                roles: [],
+            );
+            expect(response, isA<models.Membership>());
+
+        });
+
+        test('test method getMembership()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                'userId': '5e5ea5c16897e',
+                'userName': 'John Doe',
+                'userEmail': 'john@appwrite.io',
+                'teamId': '5e5ea5c16897e',
+                'teamName': 'VIP',
+                'invited': '2020-10-15T06:38:00.000+00:00',
+                'joined': '2020-10-15T06:38:00.000+00:00',
+                'confirm': true,
+                'mfa': true,
+                'roles': [],};
+
+
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await teams.getMembership(
+                teamId: '<TEAM_ID>',
+                membershipId: '<MEMBERSHIP_ID>',
+            );
+            expect(response, isA<models.Membership>());
 
-      when(client.call(
-        HttpMethod.put,
-      )).thenAnswer((_) async => Response(data: data));
+        });
+
+        test('test method updateMembership()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                'userId': '5e5ea5c16897e',
+                'userName': 'John Doe',
+                'userEmail': 'john@appwrite.io',
+                'teamId': '5e5ea5c16897e',
+                'teamName': 'VIP',
+                'invited': '2020-10-15T06:38:00.000+00:00',
+                'joined': '2020-10-15T06:38:00.000+00:00',
+                'confirm': true,
+                'mfa': true,
+                'roles': [],};
+
+
+            when(client.call(
+                HttpMethod.patch,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await teams.updateMembership(
+                teamId: '<TEAM_ID>',
+                membershipId: '<MEMBERSHIP_ID>',
+                roles: [],
+            );
+            expect(response, isA<models.Membership>());
+
+        });
+
+        test('test method deleteMembership()', () async {
+            final data = '';
+
+            when(client.call(
+                HttpMethod.delete,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await teams.deleteMembership(
+                teamId: '<TEAM_ID>',
+                membershipId: '<MEMBERSHIP_ID>',
+            );
+        });
+
+        test('test method updateMembershipStatus()', () async {
+            final Map<String, dynamic> data = {
+                '\$id': '5e5ea5c16897e',
+                '\$createdAt': '2020-10-15T06:38:00.000+00:00',
+                '\$updatedAt': '2020-10-15T06:38:00.000+00:00',
+                'userId': '5e5ea5c16897e',
+                'userName': 'John Doe',
+                'userEmail': 'john@appwrite.io',
+                'teamId': '5e5ea5c16897e',
+                'teamName': 'VIP',
+                'invited': '2020-10-15T06:38:00.000+00:00',
+                'joined': '2020-10-15T06:38:00.000+00:00',
+                'confirm': true,
+                'mfa': true,
+                'roles': [],};
+
+
+            when(client.call(
+                HttpMethod.patch,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await teams.updateMembershipStatus(
+                teamId: '<TEAM_ID>',
+                membershipId: '<MEMBERSHIP_ID>',
+                userId: '<USER_ID>',
+                secret: '<SECRET>',
+            );
+            expect(response, isA<models.Membership>());
+
+        });
+
+        test('test method getPrefs()', () async {
+            final Map<String, dynamic> data = {};
+
+
+            when(client.call(
+                HttpMethod.get,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await teams.getPrefs(
+                teamId: '<TEAM_ID>',
+            );
+            expect(response, isA<models.Preferences>());
+
+        });
+
+        test('test method updatePrefs()', () async {
+            final Map<String, dynamic> data = {};
+
+
+            when(client.call(
+                HttpMethod.put,
+            )).thenAnswer((_) async => Response(data: data));
+
+
+            final response = await teams.updatePrefs(
+                teamId: '<TEAM_ID>',
+                prefs: {},
+            );
+            expect(response, isA<models.Preferences>());
+
+        });
 
-      final response = await teams.updatePrefs(
-        teamId: '<TEAM_ID>',
-        prefs: {},
-      );
-      expect(response, isA<models.Preferences>());
     });
-  });
-}
+}
\ No newline at end of file
diff --git a/test/src/models/algo_argon2_test.dart b/test/src/models/algo_argon2_test.dart
index 261daa46..15e85f5a 100644
--- a/test/src/models/algo_argon2_test.dart
+++ b/test/src/models/algo_argon2_test.dart
@@ -14,10 +14,10 @@ void main() {
       final map = model.toMap();
       final result = AlgoArgon2.fromMap(map);
 
-      expect(result.type, 'argon2');
-      expect(result.memoryCost, 65536);
-      expect(result.timeCost, 4);
-      expect(result.threads, 3);
-    });
+            expect(result.type, 'argon2');
+                  expect(result.memoryCost, 65536);
+                  expect(result.timeCost, 4);
+                  expect(result.threads, 3);
+          });
   });
 }
diff --git a/test/src/models/algo_bcrypt_test.dart b/test/src/models/algo_bcrypt_test.dart
index 3da36624..87a3ca3c 100644
--- a/test/src/models/algo_bcrypt_test.dart
+++ b/test/src/models/algo_bcrypt_test.dart
@@ -11,7 +11,7 @@ void main() {
       final map = model.toMap();
       final result = AlgoBcrypt.fromMap(map);
 
-      expect(result.type, 'bcrypt');
-    });
+            expect(result.type, 'bcrypt');
+          });
   });
 }
diff --git a/test/src/models/algo_md5_test.dart b/test/src/models/algo_md5_test.dart
index e58fa5b5..3b842e6c 100644
--- a/test/src/models/algo_md5_test.dart
+++ b/test/src/models/algo_md5_test.dart
@@ -11,7 +11,7 @@ void main() {
       final map = model.toMap();
       final result = AlgoMd5.fromMap(map);
 
-      expect(result.type, 'md5');
-    });
+            expect(result.type, 'md5');
+          });
   });
 }
diff --git a/test/src/models/algo_phpass_test.dart b/test/src/models/algo_phpass_test.dart
index 3bcbb488..49b1e22c 100644
--- a/test/src/models/algo_phpass_test.dart
+++ b/test/src/models/algo_phpass_test.dart
@@ -11,7 +11,7 @@ void main() {
       final map = model.toMap();
       final result = AlgoPhpass.fromMap(map);
 
-      expect(result.type, 'phpass');
-    });
+            expect(result.type, 'phpass');
+          });
   });
 }
diff --git a/test/src/models/algo_scrypt_modified_test.dart b/test/src/models/algo_scrypt_modified_test.dart
index b2084927..dd7fa8c3 100644
--- a/test/src/models/algo_scrypt_modified_test.dart
+++ b/test/src/models/algo_scrypt_modified_test.dart
@@ -8,18 +8,16 @@ void main() {
         type: 'scryptMod',
         salt: 'UxLMreBr6tYyjQ==',
         saltSeparator: 'Bw==',
-        signerKey:
-            'XyEKE9RcTDeLEsL/RjwPDBv/RqDl8fb3gpYEOQaPihbxf1ZAtSOHCjuAAa7Q3oHpCYhXSN9tizHgVOwn6krflQ==',
+        signerKey: 'XyEKE9RcTDeLEsL/RjwPDBv/RqDl8fb3gpYEOQaPihbxf1ZAtSOHCjuAAa7Q3oHpCYhXSN9tizHgVOwn6krflQ==',
       );
 
       final map = model.toMap();
       final result = AlgoScryptModified.fromMap(map);
 
-      expect(result.type, 'scryptMod');
-      expect(result.salt, 'UxLMreBr6tYyjQ==');
-      expect(result.saltSeparator, 'Bw==');
-      expect(result.signerKey,
-          'XyEKE9RcTDeLEsL/RjwPDBv/RqDl8fb3gpYEOQaPihbxf1ZAtSOHCjuAAa7Q3oHpCYhXSN9tizHgVOwn6krflQ==');
-    });
+            expect(result.type, 'scryptMod');
+                  expect(result.salt, 'UxLMreBr6tYyjQ==');
+                  expect(result.saltSeparator, 'Bw==');
+                  expect(result.signerKey, 'XyEKE9RcTDeLEsL/RjwPDBv/RqDl8fb3gpYEOQaPihbxf1ZAtSOHCjuAAa7Q3oHpCYhXSN9tizHgVOwn6krflQ==');
+          });
   });
 }
diff --git a/test/src/models/algo_scrypt_test.dart b/test/src/models/algo_scrypt_test.dart
index 8c131568..c7d9cdbf 100644
--- a/test/src/models/algo_scrypt_test.dart
+++ b/test/src/models/algo_scrypt_test.dart
@@ -15,11 +15,11 @@ void main() {
       final map = model.toMap();
       final result = AlgoScrypt.fromMap(map);
 
-      expect(result.type, 'scrypt');
-      expect(result.costCpu, 8);
-      expect(result.costMemory, 14);
-      expect(result.costParallel, 1);
-      expect(result.length, 64);
-    });
+            expect(result.type, 'scrypt');
+                  expect(result.costCpu, 8);
+                  expect(result.costMemory, 14);
+                  expect(result.costParallel, 1);
+                  expect(result.length, 64);
+          });
   });
 }
diff --git a/test/src/models/algo_sha_test.dart b/test/src/models/algo_sha_test.dart
index d080569c..ae58b57e 100644
--- a/test/src/models/algo_sha_test.dart
+++ b/test/src/models/algo_sha_test.dart
@@ -11,7 +11,7 @@ void main() {
       final map = model.toMap();
       final result = AlgoSha.fromMap(map);
 
-      expect(result.type, 'sha');
-    });
+            expect(result.type, 'sha');
+          });
   });
 }
diff --git a/test/src/models/continent_list_test.dart b/test/src/models/continent_list_test.dart
index e71dcae1..8de695b0 100644
--- a/test/src/models/continent_list_test.dart
+++ b/test/src/models/continent_list_test.dart
@@ -12,8 +12,8 @@ void main() {
       final map = model.toMap();
       final result = ContinentList.fromMap(map);
 
-      expect(result.total, 5);
-      expect(result.continents, []);
-    });
+            expect(result.total, 5);
+                  expect(result.continents, []);
+          });
   });
 }
diff --git a/test/src/models/continent_test.dart b/test/src/models/continent_test.dart
index 85e559f5..d5242a4e 100644
--- a/test/src/models/continent_test.dart
+++ b/test/src/models/continent_test.dart
@@ -12,8 +12,8 @@ void main() {
       final map = model.toMap();
       final result = Continent.fromMap(map);
 
-      expect(result.name, 'Europe');
-      expect(result.code, 'EU');
-    });
+            expect(result.name, 'Europe');
+                  expect(result.code, 'EU');
+          });
   });
 }
diff --git a/test/src/models/country_list_test.dart b/test/src/models/country_list_test.dart
index 6df5c584..869f5db6 100644
--- a/test/src/models/country_list_test.dart
+++ b/test/src/models/country_list_test.dart
@@ -12,8 +12,8 @@ void main() {
       final map = model.toMap();
       final result = CountryList.fromMap(map);
 
-      expect(result.total, 5);
-      expect(result.countries, []);
-    });
+            expect(result.total, 5);
+                  expect(result.countries, []);
+          });
   });
 }
diff --git a/test/src/models/country_test.dart b/test/src/models/country_test.dart
index d5404a7f..bc66ab7b 100644
--- a/test/src/models/country_test.dart
+++ b/test/src/models/country_test.dart
@@ -12,8 +12,8 @@ void main() {
       final map = model.toMap();
       final result = Country.fromMap(map);
 
-      expect(result.name, 'United States');
-      expect(result.code, 'US');
-    });
+            expect(result.name, 'United States');
+                  expect(result.code, 'US');
+          });
   });
 }
diff --git a/test/src/models/currency_list_test.dart b/test/src/models/currency_list_test.dart
index d7410db8..09da675c 100644
--- a/test/src/models/currency_list_test.dart
+++ b/test/src/models/currency_list_test.dart
@@ -12,8 +12,8 @@ void main() {
       final map = model.toMap();
       final result = CurrencyList.fromMap(map);
 
-      expect(result.total, 5);
-      expect(result.currencies, []);
-    });
+            expect(result.total, 5);
+                  expect(result.currencies, []);
+          });
   });
 }
diff --git a/test/src/models/currency_test.dart b/test/src/models/currency_test.dart
index 00e046c7..29890008 100644
--- a/test/src/models/currency_test.dart
+++ b/test/src/models/currency_test.dart
@@ -17,13 +17,13 @@ void main() {
       final map = model.toMap();
       final result = Currency.fromMap(map);
 
-      expect(result.symbol, '\$');
-      expect(result.name, 'US dollar');
-      expect(result.symbolNative, '\$');
-      expect(result.decimalDigits, 2);
-      expect(result.rounding, 0);
-      expect(result.code, 'USD');
-      expect(result.namePlural, 'US dollars');
-    });
+            expect(result.symbol, '\$');
+                  expect(result.name, 'US dollar');
+                  expect(result.symbolNative, '\$');
+                  expect(result.decimalDigits, 2);
+                  expect(result.rounding, 0);
+                  expect(result.code, 'USD');
+                  expect(result.namePlural, 'US dollars');
+          });
   });
 }
diff --git a/test/src/models/document_list_test.dart b/test/src/models/document_list_test.dart
index 217d37e8..f1a5b3cc 100644
--- a/test/src/models/document_list_test.dart
+++ b/test/src/models/document_list_test.dart
@@ -12,8 +12,8 @@ void main() {
       final map = model.toMap();
       final result = DocumentList.fromMap(map);
 
-      expect(result.total, 5);
-      expect(result.documents, []);
-    });
+            expect(result.total, 5);
+                  expect(result.documents, []);
+          });
   });
 }
diff --git a/test/src/models/document_test.dart b/test/src/models/document_test.dart
index fd46464b..be617cc6 100644
--- a/test/src/models/document_test.dart
+++ b/test/src/models/document_test.dart
@@ -18,13 +18,13 @@ void main() {
       final map = model.toMap();
       final result = Document.fromMap(map);
 
-      expect(result.$id, '5e5ea5c16897e');
-      expect(result.$sequence, 1);
-      expect(result.$collectionId, '5e5ea5c15117e');
-      expect(result.$databaseId, '5e5ea5c15117e');
-      expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
-      expect(result.$updatedAt, '2020-10-15T06:38:00.000+00:00');
-      expect(result.$permissions, []);
-    });
+            expect(result.$id, '5e5ea5c16897e');
+                  expect(result.$sequence, 1);
+                  expect(result.$collectionId, '5e5ea5c15117e');
+                  expect(result.$databaseId, '5e5ea5c15117e');
+                  expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
+                  expect(result.$updatedAt, '2020-10-15T06:38:00.000+00:00');
+                  expect(result.$permissions, []);
+          });
   });
 }
diff --git a/test/src/models/execution_list_test.dart b/test/src/models/execution_list_test.dart
index a3305e55..fe74af58 100644
--- a/test/src/models/execution_list_test.dart
+++ b/test/src/models/execution_list_test.dart
@@ -12,8 +12,8 @@ void main() {
       final map = model.toMap();
       final result = ExecutionList.fromMap(map);
 
-      expect(result.total, 5);
-      expect(result.executions, []);
-    });
+            expect(result.total, 5);
+                  expect(result.executions, []);
+          });
   });
 }
diff --git a/test/src/models/execution_test.dart b/test/src/models/execution_test.dart
index e5682521..ed6fb8e2 100644
--- a/test/src/models/execution_test.dart
+++ b/test/src/models/execution_test.dart
@@ -27,23 +27,23 @@ void main() {
       final map = model.toMap();
       final result = Execution.fromMap(map);
 
-      expect(result.$id, '5e5ea5c16897e');
-      expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
-      expect(result.$updatedAt, '2020-10-15T06:38:00.000+00:00');
-      expect(result.$permissions, []);
-      expect(result.functionId, '5e5ea6g16897e');
-      expect(result.deploymentId, '5e5ea5c16897e');
-      expect(result.trigger, 'http');
-      expect(result.status, 'processing');
-      expect(result.requestMethod, 'GET');
-      expect(result.requestPath, '/articles?id=5');
-      expect(result.requestHeaders, []);
-      expect(result.responseStatusCode, 200);
-      expect(result.responseBody, '');
-      expect(result.responseHeaders, []);
-      expect(result.logs, '');
-      expect(result.errors, '');
-      expect(result.duration, 0.4);
-    });
+            expect(result.$id, '5e5ea5c16897e');
+                  expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
+                  expect(result.$updatedAt, '2020-10-15T06:38:00.000+00:00');
+                  expect(result.$permissions, []);
+                  expect(result.functionId, '5e5ea6g16897e');
+                  expect(result.deploymentId, '5e5ea5c16897e');
+                  expect(result.trigger, 'http');
+                  expect(result.status, 'processing');
+                  expect(result.requestMethod, 'GET');
+                  expect(result.requestPath, '/articles?id=5');
+                  expect(result.requestHeaders, []);
+                  expect(result.responseStatusCode, 200);
+                  expect(result.responseBody, '');
+                  expect(result.responseHeaders, []);
+                  expect(result.logs, '');
+                  expect(result.errors, '');
+                  expect(result.duration, 0.4);
+          });
   });
 }
diff --git a/test/src/models/file_list_test.dart b/test/src/models/file_list_test.dart
index 8e02f65e..d8e6c95c 100644
--- a/test/src/models/file_list_test.dart
+++ b/test/src/models/file_list_test.dart
@@ -12,8 +12,8 @@ void main() {
       final map = model.toMap();
       final result = FileList.fromMap(map);
 
-      expect(result.total, 5);
-      expect(result.files, []);
-    });
+            expect(result.total, 5);
+                  expect(result.files, []);
+          });
   });
 }
diff --git a/test/src/models/file_test.dart b/test/src/models/file_test.dart
index e6d6dae5..08da5e9a 100644
--- a/test/src/models/file_test.dart
+++ b/test/src/models/file_test.dart
@@ -21,17 +21,17 @@ void main() {
       final map = model.toMap();
       final result = File.fromMap(map);
 
-      expect(result.$id, '5e5ea5c16897e');
-      expect(result.bucketId, '5e5ea5c16897e');
-      expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
-      expect(result.$updatedAt, '2020-10-15T06:38:00.000+00:00');
-      expect(result.$permissions, []);
-      expect(result.name, 'Pink.png');
-      expect(result.signature, '5d529fd02b544198ae075bd57c1762bb');
-      expect(result.mimeType, 'image/png');
-      expect(result.sizeOriginal, 17890);
-      expect(result.chunksTotal, 17890);
-      expect(result.chunksUploaded, 17890);
-    });
+            expect(result.$id, '5e5ea5c16897e');
+                  expect(result.bucketId, '5e5ea5c16897e');
+                  expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
+                  expect(result.$updatedAt, '2020-10-15T06:38:00.000+00:00');
+                  expect(result.$permissions, []);
+                  expect(result.name, 'Pink.png');
+                  expect(result.signature, '5d529fd02b544198ae075bd57c1762bb');
+                  expect(result.mimeType, 'image/png');
+                  expect(result.sizeOriginal, 17890);
+                  expect(result.chunksTotal, 17890);
+                  expect(result.chunksUploaded, 17890);
+          });
   });
 }
diff --git a/test/src/models/headers_test.dart b/test/src/models/headers_test.dart
index 9252b469..489891d4 100644
--- a/test/src/models/headers_test.dart
+++ b/test/src/models/headers_test.dart
@@ -12,8 +12,8 @@ void main() {
       final map = model.toMap();
       final result = Headers.fromMap(map);
 
-      expect(result.name, 'Content-Type');
-      expect(result.value, 'application/json');
-    });
+            expect(result.name, 'Content-Type');
+                  expect(result.value, 'application/json');
+          });
   });
 }
diff --git a/test/src/models/identity_list_test.dart b/test/src/models/identity_list_test.dart
index 8c35afec..65f562a7 100644
--- a/test/src/models/identity_list_test.dart
+++ b/test/src/models/identity_list_test.dart
@@ -12,8 +12,8 @@ void main() {
       final map = model.toMap();
       final result = IdentityList.fromMap(map);
 
-      expect(result.total, 5);
-      expect(result.identities, []);
-    });
+            expect(result.total, 5);
+                  expect(result.identities, []);
+          });
   });
 }
diff --git a/test/src/models/identity_test.dart b/test/src/models/identity_test.dart
index 525af4ea..708c8c60 100644
--- a/test/src/models/identity_test.dart
+++ b/test/src/models/identity_test.dart
@@ -20,16 +20,16 @@ void main() {
       final map = model.toMap();
       final result = Identity.fromMap(map);
 
-      expect(result.$id, '5e5ea5c16897e');
-      expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
-      expect(result.$updatedAt, '2020-10-15T06:38:00.000+00:00');
-      expect(result.userId, '5e5bb8c16897e');
-      expect(result.provider, 'email');
-      expect(result.providerUid, '5e5bb8c16897e');
-      expect(result.providerEmail, 'user@example.com');
-      expect(result.providerAccessToken, 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3');
-      expect(result.providerAccessTokenExpiry, '2020-10-15T06:38:00.000+00:00');
-      expect(result.providerRefreshToken, 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3');
-    });
+            expect(result.$id, '5e5ea5c16897e');
+                  expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
+                  expect(result.$updatedAt, '2020-10-15T06:38:00.000+00:00');
+                  expect(result.userId, '5e5bb8c16897e');
+                  expect(result.provider, 'email');
+                  expect(result.providerUid, '5e5bb8c16897e');
+                  expect(result.providerEmail, 'user@example.com');
+                  expect(result.providerAccessToken, 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3');
+                  expect(result.providerAccessTokenExpiry, '2020-10-15T06:38:00.000+00:00');
+                  expect(result.providerRefreshToken, 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3');
+          });
   });
 }
diff --git a/test/src/models/jwt_test.dart b/test/src/models/jwt_test.dart
index 93376af1..e616a956 100644
--- a/test/src/models/jwt_test.dart
+++ b/test/src/models/jwt_test.dart
@@ -5,15 +5,13 @@ void main() {
   group('Jwt', () {
     test('model', () {
       final model = Jwt(
-        jwt:
-            'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c',
+        jwt: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c',
       );
 
       final map = model.toMap();
       final result = Jwt.fromMap(map);
 
-      expect(result.jwt,
-          'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c');
-    });
+            expect(result.jwt, 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c');
+          });
   });
 }
diff --git a/test/src/models/language_list_test.dart b/test/src/models/language_list_test.dart
index a07c0b5f..94c1e33f 100644
--- a/test/src/models/language_list_test.dart
+++ b/test/src/models/language_list_test.dart
@@ -12,8 +12,8 @@ void main() {
       final map = model.toMap();
       final result = LanguageList.fromMap(map);
 
-      expect(result.total, 5);
-      expect(result.languages, []);
-    });
+            expect(result.total, 5);
+                  expect(result.languages, []);
+          });
   });
 }
diff --git a/test/src/models/language_test.dart b/test/src/models/language_test.dart
index 4a6c96c1..d4087d5e 100644
--- a/test/src/models/language_test.dart
+++ b/test/src/models/language_test.dart
@@ -13,9 +13,9 @@ void main() {
       final map = model.toMap();
       final result = Language.fromMap(map);
 
-      expect(result.name, 'Italian');
-      expect(result.code, 'it');
-      expect(result.nativeName, 'Italiano');
-    });
+            expect(result.name, 'Italian');
+                  expect(result.code, 'it');
+                  expect(result.nativeName, 'Italiano');
+          });
   });
 }
diff --git a/test/src/models/locale_code_list_test.dart b/test/src/models/locale_code_list_test.dart
index 65b44ad1..b6de5137 100644
--- a/test/src/models/locale_code_list_test.dart
+++ b/test/src/models/locale_code_list_test.dart
@@ -12,8 +12,8 @@ void main() {
       final map = model.toMap();
       final result = LocaleCodeList.fromMap(map);
 
-      expect(result.total, 5);
-      expect(result.localeCodes, []);
-    });
+            expect(result.total, 5);
+                  expect(result.localeCodes, []);
+          });
   });
 }
diff --git a/test/src/models/locale_code_test.dart b/test/src/models/locale_code_test.dart
index 88cf157b..f0fcdbce 100644
--- a/test/src/models/locale_code_test.dart
+++ b/test/src/models/locale_code_test.dart
@@ -12,8 +12,8 @@ void main() {
       final map = model.toMap();
       final result = LocaleCode.fromMap(map);
 
-      expect(result.code, 'en-us');
-      expect(result.name, 'US');
-    });
+            expect(result.code, 'en-us');
+                  expect(result.name, 'US');
+          });
   });
 }
diff --git a/test/src/models/locale_test.dart b/test/src/models/locale_test.dart
index 49cb1fc9..72102045 100644
--- a/test/src/models/locale_test.dart
+++ b/test/src/models/locale_test.dart
@@ -17,13 +17,13 @@ void main() {
       final map = model.toMap();
       final result = Locale.fromMap(map);
 
-      expect(result.ip, '127.0.0.1');
-      expect(result.countryCode, 'US');
-      expect(result.country, 'United States');
-      expect(result.continentCode, 'NA');
-      expect(result.continent, 'North America');
-      expect(result.eu, true);
-      expect(result.currency, 'USD');
-    });
+            expect(result.ip, '127.0.0.1');
+                  expect(result.countryCode, 'US');
+                  expect(result.country, 'United States');
+                  expect(result.continentCode, 'NA');
+                  expect(result.continent, 'North America');
+                  expect(result.eu, true);
+                  expect(result.currency, 'USD');
+          });
   });
 }
diff --git a/test/src/models/log_list_test.dart b/test/src/models/log_list_test.dart
index b07ca8ee..84c560c8 100644
--- a/test/src/models/log_list_test.dart
+++ b/test/src/models/log_list_test.dart
@@ -12,8 +12,8 @@ void main() {
       final map = model.toMap();
       final result = LogList.fromMap(map);
 
-      expect(result.total, 5);
-      expect(result.logs, []);
-    });
+            expect(result.total, 5);
+                  expect(result.logs, []);
+          });
   });
 }
diff --git a/test/src/models/log_test.dart b/test/src/models/log_test.dart
index b328ad58..7724b875 100644
--- a/test/src/models/log_test.dart
+++ b/test/src/models/log_test.dart
@@ -31,27 +31,27 @@ void main() {
       final map = model.toMap();
       final result = Log.fromMap(map);
 
-      expect(result.event, 'account.sessions.create');
-      expect(result.userId, '610fc2f985ee0');
-      expect(result.userEmail, 'john@appwrite.io');
-      expect(result.userName, 'John Doe');
-      expect(result.mode, 'admin');
-      expect(result.ip, '127.0.0.1');
-      expect(result.time, '2020-10-15T06:38:00.000+00:00');
-      expect(result.osCode, 'Mac');
-      expect(result.osName, 'Mac');
-      expect(result.osVersion, 'Mac');
-      expect(result.clientType, 'browser');
-      expect(result.clientCode, 'CM');
-      expect(result.clientName, 'Chrome Mobile iOS');
-      expect(result.clientVersion, '84.0');
-      expect(result.clientEngine, 'WebKit');
-      expect(result.clientEngineVersion, '605.1.15');
-      expect(result.deviceName, 'smartphone');
-      expect(result.deviceBrand, 'Google');
-      expect(result.deviceModel, 'Nexus 5');
-      expect(result.countryCode, 'US');
-      expect(result.countryName, 'United States');
-    });
+            expect(result.event, 'account.sessions.create');
+                  expect(result.userId, '610fc2f985ee0');
+                  expect(result.userEmail, 'john@appwrite.io');
+                  expect(result.userName, 'John Doe');
+                  expect(result.mode, 'admin');
+                  expect(result.ip, '127.0.0.1');
+                  expect(result.time, '2020-10-15T06:38:00.000+00:00');
+                  expect(result.osCode, 'Mac');
+                  expect(result.osName, 'Mac');
+                  expect(result.osVersion, 'Mac');
+                  expect(result.clientType, 'browser');
+                  expect(result.clientCode, 'CM');
+                  expect(result.clientName, 'Chrome Mobile iOS');
+                  expect(result.clientVersion, '84.0');
+                  expect(result.clientEngine, 'WebKit');
+                  expect(result.clientEngineVersion, '605.1.15');
+                  expect(result.deviceName, 'smartphone');
+                  expect(result.deviceBrand, 'Google');
+                  expect(result.deviceModel, 'Nexus 5');
+                  expect(result.countryCode, 'US');
+                  expect(result.countryName, 'United States');
+          });
   });
 }
diff --git a/test/src/models/membership_list_test.dart b/test/src/models/membership_list_test.dart
index 4f30c48e..bb1f0946 100644
--- a/test/src/models/membership_list_test.dart
+++ b/test/src/models/membership_list_test.dart
@@ -12,8 +12,8 @@ void main() {
       final map = model.toMap();
       final result = MembershipList.fromMap(map);
 
-      expect(result.total, 5);
-      expect(result.memberships, []);
-    });
+            expect(result.total, 5);
+                  expect(result.memberships, []);
+          });
   });
 }
diff --git a/test/src/models/membership_test.dart b/test/src/models/membership_test.dart
index 2fee0d28..32ba0f4e 100644
--- a/test/src/models/membership_test.dart
+++ b/test/src/models/membership_test.dart
@@ -23,19 +23,19 @@ void main() {
       final map = model.toMap();
       final result = Membership.fromMap(map);
 
-      expect(result.$id, '5e5ea5c16897e');
-      expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
-      expect(result.$updatedAt, '2020-10-15T06:38:00.000+00:00');
-      expect(result.userId, '5e5ea5c16897e');
-      expect(result.userName, 'John Doe');
-      expect(result.userEmail, 'john@appwrite.io');
-      expect(result.teamId, '5e5ea5c16897e');
-      expect(result.teamName, 'VIP');
-      expect(result.invited, '2020-10-15T06:38:00.000+00:00');
-      expect(result.joined, '2020-10-15T06:38:00.000+00:00');
-      expect(result.confirm, true);
-      expect(result.mfa, true);
-      expect(result.roles, []);
-    });
+            expect(result.$id, '5e5ea5c16897e');
+                  expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
+                  expect(result.$updatedAt, '2020-10-15T06:38:00.000+00:00');
+                  expect(result.userId, '5e5ea5c16897e');
+                  expect(result.userName, 'John Doe');
+                  expect(result.userEmail, 'john@appwrite.io');
+                  expect(result.teamId, '5e5ea5c16897e');
+                  expect(result.teamName, 'VIP');
+                  expect(result.invited, '2020-10-15T06:38:00.000+00:00');
+                  expect(result.joined, '2020-10-15T06:38:00.000+00:00');
+                  expect(result.confirm, true);
+                  expect(result.mfa, true);
+                  expect(result.roles, []);
+          });
   });
 }
diff --git a/test/src/models/mfa_challenge_test.dart b/test/src/models/mfa_challenge_test.dart
index 5d3febca..9410baa3 100644
--- a/test/src/models/mfa_challenge_test.dart
+++ b/test/src/models/mfa_challenge_test.dart
@@ -14,10 +14,10 @@ void main() {
       final map = model.toMap();
       final result = MfaChallenge.fromMap(map);
 
-      expect(result.$id, 'bb8ea5c16897e');
-      expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
-      expect(result.userId, '5e5ea5c168bb8');
-      expect(result.expire, '2020-10-15T06:38:00.000+00:00');
-    });
+            expect(result.$id, 'bb8ea5c16897e');
+                  expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
+                  expect(result.userId, '5e5ea5c168bb8');
+                  expect(result.expire, '2020-10-15T06:38:00.000+00:00');
+          });
   });
 }
diff --git a/test/src/models/mfa_factors_test.dart b/test/src/models/mfa_factors_test.dart
index 64cc55e4..ed6467d3 100644
--- a/test/src/models/mfa_factors_test.dart
+++ b/test/src/models/mfa_factors_test.dart
@@ -14,10 +14,10 @@ void main() {
       final map = model.toMap();
       final result = MfaFactors.fromMap(map);
 
-      expect(result.totp, true);
-      expect(result.phone, true);
-      expect(result.email, true);
-      expect(result.recoveryCode, true);
-    });
+            expect(result.totp, true);
+                  expect(result.phone, true);
+                  expect(result.email, true);
+                  expect(result.recoveryCode, true);
+          });
   });
 }
diff --git a/test/src/models/mfa_recovery_codes_test.dart b/test/src/models/mfa_recovery_codes_test.dart
index 500913c8..fa097a49 100644
--- a/test/src/models/mfa_recovery_codes_test.dart
+++ b/test/src/models/mfa_recovery_codes_test.dart
@@ -11,7 +11,7 @@ void main() {
       final map = model.toMap();
       final result = MfaRecoveryCodes.fromMap(map);
 
-      expect(result.recoveryCodes, []);
-    });
+            expect(result.recoveryCodes, []);
+          });
   });
 }
diff --git a/test/src/models/mfa_type_test.dart b/test/src/models/mfa_type_test.dart
index fb964947..dcee3fcb 100644
--- a/test/src/models/mfa_type_test.dart
+++ b/test/src/models/mfa_type_test.dart
@@ -12,8 +12,8 @@ void main() {
       final map = model.toMap();
       final result = MfaType.fromMap(map);
 
-      expect(result.secret, '1');
-      expect(result.uri, '1');
-    });
+            expect(result.secret, '1');
+                  expect(result.uri, '1');
+          });
   });
 }
diff --git a/test/src/models/phone_list_test.dart b/test/src/models/phone_list_test.dart
index bf22a5c7..6ca46a63 100644
--- a/test/src/models/phone_list_test.dart
+++ b/test/src/models/phone_list_test.dart
@@ -12,8 +12,8 @@ void main() {
       final map = model.toMap();
       final result = PhoneList.fromMap(map);
 
-      expect(result.total, 5);
-      expect(result.phones, []);
-    });
+            expect(result.total, 5);
+                  expect(result.phones, []);
+          });
   });
 }
diff --git a/test/src/models/phone_test.dart b/test/src/models/phone_test.dart
index f70db0e3..d0e5333b 100644
--- a/test/src/models/phone_test.dart
+++ b/test/src/models/phone_test.dart
@@ -13,9 +13,9 @@ void main() {
       final map = model.toMap();
       final result = Phone.fromMap(map);
 
-      expect(result.code, '+1');
-      expect(result.countryCode, 'US');
-      expect(result.countryName, 'United States');
-    });
+            expect(result.code, '+1');
+                  expect(result.countryCode, 'US');
+                  expect(result.countryName, 'United States');
+          });
   });
 }
diff --git a/test/src/models/preferences_test.dart b/test/src/models/preferences_test.dart
index 9db30b03..acde349c 100644
--- a/test/src/models/preferences_test.dart
+++ b/test/src/models/preferences_test.dart
@@ -10,6 +10,7 @@ void main() {
 
       final map = model.toMap();
       final result = Preferences.fromMap(map);
+
     });
   });
 }
diff --git a/test/src/models/row_list_test.dart b/test/src/models/row_list_test.dart
index 12693926..d4900dd4 100644
--- a/test/src/models/row_list_test.dart
+++ b/test/src/models/row_list_test.dart
@@ -12,8 +12,8 @@ void main() {
       final map = model.toMap();
       final result = RowList.fromMap(map);
 
-      expect(result.total, 5);
-      expect(result.rows, []);
-    });
+            expect(result.total, 5);
+                  expect(result.rows, []);
+          });
   });
 }
diff --git a/test/src/models/row_test.dart b/test/src/models/row_test.dart
index fed01ffa..4c525e1b 100644
--- a/test/src/models/row_test.dart
+++ b/test/src/models/row_test.dart
@@ -18,13 +18,13 @@ void main() {
       final map = model.toMap();
       final result = Row.fromMap(map);
 
-      expect(result.$id, '5e5ea5c16897e');
-      expect(result.$sequence, 1);
-      expect(result.$tableId, '5e5ea5c15117e');
-      expect(result.$databaseId, '5e5ea5c15117e');
-      expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
-      expect(result.$updatedAt, '2020-10-15T06:38:00.000+00:00');
-      expect(result.$permissions, []);
-    });
+            expect(result.$id, '5e5ea5c16897e');
+                  expect(result.$sequence, 1);
+                  expect(result.$tableId, '5e5ea5c15117e');
+                  expect(result.$databaseId, '5e5ea5c15117e');
+                  expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
+                  expect(result.$updatedAt, '2020-10-15T06:38:00.000+00:00');
+                  expect(result.$permissions, []);
+          });
   });
 }
diff --git a/test/src/models/session_list_test.dart b/test/src/models/session_list_test.dart
index 708e0583..eaab249e 100644
--- a/test/src/models/session_list_test.dart
+++ b/test/src/models/session_list_test.dart
@@ -12,8 +12,8 @@ void main() {
       final map = model.toMap();
       final result = SessionList.fromMap(map);
 
-      expect(result.total, 5);
-      expect(result.sessions, []);
-    });
+            expect(result.total, 5);
+                  expect(result.sessions, []);
+          });
   });
 }
diff --git a/test/src/models/session_test.dart b/test/src/models/session_test.dart
index 689e6048..0177e477 100644
--- a/test/src/models/session_test.dart
+++ b/test/src/models/session_test.dart
@@ -39,35 +39,35 @@ void main() {
       final map = model.toMap();
       final result = Session.fromMap(map);
 
-      expect(result.$id, '5e5ea5c16897e');
-      expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
-      expect(result.$updatedAt, '2020-10-15T06:38:00.000+00:00');
-      expect(result.userId, '5e5bb8c16897e');
-      expect(result.expire, '2020-10-15T06:38:00.000+00:00');
-      expect(result.provider, 'email');
-      expect(result.providerUid, 'user@example.com');
-      expect(result.providerAccessToken, 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3');
-      expect(result.providerAccessTokenExpiry, '2020-10-15T06:38:00.000+00:00');
-      expect(result.providerRefreshToken, 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3');
-      expect(result.ip, '127.0.0.1');
-      expect(result.osCode, 'Mac');
-      expect(result.osName, 'Mac');
-      expect(result.osVersion, 'Mac');
-      expect(result.clientType, 'browser');
-      expect(result.clientCode, 'CM');
-      expect(result.clientName, 'Chrome Mobile iOS');
-      expect(result.clientVersion, '84.0');
-      expect(result.clientEngine, 'WebKit');
-      expect(result.clientEngineVersion, '605.1.15');
-      expect(result.deviceName, 'smartphone');
-      expect(result.deviceBrand, 'Google');
-      expect(result.deviceModel, 'Nexus 5');
-      expect(result.countryCode, 'US');
-      expect(result.countryName, 'United States');
-      expect(result.current, true);
-      expect(result.factors, []);
-      expect(result.secret, '5e5bb8c16897e');
-      expect(result.mfaUpdatedAt, '2020-10-15T06:38:00.000+00:00');
-    });
+            expect(result.$id, '5e5ea5c16897e');
+                  expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
+                  expect(result.$updatedAt, '2020-10-15T06:38:00.000+00:00');
+                  expect(result.userId, '5e5bb8c16897e');
+                  expect(result.expire, '2020-10-15T06:38:00.000+00:00');
+                  expect(result.provider, 'email');
+                  expect(result.providerUid, 'user@example.com');
+                  expect(result.providerAccessToken, 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3');
+                  expect(result.providerAccessTokenExpiry, '2020-10-15T06:38:00.000+00:00');
+                  expect(result.providerRefreshToken, 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3');
+                  expect(result.ip, '127.0.0.1');
+                  expect(result.osCode, 'Mac');
+                  expect(result.osName, 'Mac');
+                  expect(result.osVersion, 'Mac');
+                  expect(result.clientType, 'browser');
+                  expect(result.clientCode, 'CM');
+                  expect(result.clientName, 'Chrome Mobile iOS');
+                  expect(result.clientVersion, '84.0');
+                  expect(result.clientEngine, 'WebKit');
+                  expect(result.clientEngineVersion, '605.1.15');
+                  expect(result.deviceName, 'smartphone');
+                  expect(result.deviceBrand, 'Google');
+                  expect(result.deviceModel, 'Nexus 5');
+                  expect(result.countryCode, 'US');
+                  expect(result.countryName, 'United States');
+                  expect(result.current, true);
+                  expect(result.factors, []);
+                  expect(result.secret, '5e5bb8c16897e');
+                  expect(result.mfaUpdatedAt, '2020-10-15T06:38:00.000+00:00');
+          });
   });
 }
diff --git a/test/src/models/subscriber_test.dart b/test/src/models/subscriber_test.dart
index 7445514c..94c6a502 100644
--- a/test/src/models/subscriber_test.dart
+++ b/test/src/models/subscriber_test.dart
@@ -10,15 +10,15 @@ void main() {
         $updatedAt: '2020-10-15T06:38:00.000+00:00',
         targetId: '259125845563242502',
         target: Target(
-          $id: '259125845563242502',
-          $createdAt: '2020-10-15T06:38:00.000+00:00',
-          $updatedAt: '2020-10-15T06:38:00.000+00:00',
-          name: 'Apple iPhone 12',
-          userId: '259125845563242502',
-          providerType: 'email',
-          identifier: 'token',
-          expired: true,
-        ),
+    $id: '259125845563242502',
+    $createdAt: '2020-10-15T06:38:00.000+00:00',
+    $updatedAt: '2020-10-15T06:38:00.000+00:00',
+    name: 'Apple iPhone 12',
+    userId: '259125845563242502',
+    providerType: 'email',
+    identifier: 'token',
+    expired: true,
+  ),
         userId: '5e5ea5c16897e',
         userName: 'Aegon Targaryen',
         topicId: '259125845563242502',
@@ -28,14 +28,14 @@ void main() {
       final map = model.toMap();
       final result = Subscriber.fromMap(map);
 
-      expect(result.$id, '259125845563242502');
-      expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
-      expect(result.$updatedAt, '2020-10-15T06:38:00.000+00:00');
-      expect(result.targetId, '259125845563242502');
-      expect(result.userId, '5e5ea5c16897e');
-      expect(result.userName, 'Aegon Targaryen');
-      expect(result.topicId, '259125845563242502');
-      expect(result.providerType, 'email');
-    });
+            expect(result.$id, '259125845563242502');
+                  expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
+                  expect(result.$updatedAt, '2020-10-15T06:38:00.000+00:00');
+                  expect(result.targetId, '259125845563242502');
+                        expect(result.userId, '5e5ea5c16897e');
+                  expect(result.userName, 'Aegon Targaryen');
+                  expect(result.topicId, '259125845563242502');
+                  expect(result.providerType, 'email');
+          });
   });
 }
diff --git a/test/src/models/target_test.dart b/test/src/models/target_test.dart
index 49f1e75e..a49f3def 100644
--- a/test/src/models/target_test.dart
+++ b/test/src/models/target_test.dart
@@ -18,14 +18,14 @@ void main() {
       final map = model.toMap();
       final result = Target.fromMap(map);
 
-      expect(result.$id, '259125845563242502');
-      expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
-      expect(result.$updatedAt, '2020-10-15T06:38:00.000+00:00');
-      expect(result.name, 'Apple iPhone 12');
-      expect(result.userId, '259125845563242502');
-      expect(result.providerType, 'email');
-      expect(result.identifier, 'token');
-      expect(result.expired, true);
-    });
+            expect(result.$id, '259125845563242502');
+                  expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
+                  expect(result.$updatedAt, '2020-10-15T06:38:00.000+00:00');
+                  expect(result.name, 'Apple iPhone 12');
+                  expect(result.userId, '259125845563242502');
+                  expect(result.providerType, 'email');
+                  expect(result.identifier, 'token');
+                  expect(result.expired, true);
+          });
   });
 }
diff --git a/test/src/models/team_list_test.dart b/test/src/models/team_list_test.dart
index fe2f4a85..a19b667d 100644
--- a/test/src/models/team_list_test.dart
+++ b/test/src/models/team_list_test.dart
@@ -12,8 +12,8 @@ void main() {
       final map = model.toMap();
       final result = TeamList.fromMap(map);
 
-      expect(result.total, 5);
-      expect(result.teams, []);
-    });
+            expect(result.total, 5);
+                  expect(result.teams, []);
+          });
   });
 }
diff --git a/test/src/models/team_test.dart b/test/src/models/team_test.dart
index f652f2c1..43b2e45c 100644
--- a/test/src/models/team_test.dart
+++ b/test/src/models/team_test.dart
@@ -16,11 +16,11 @@ void main() {
       final map = model.toMap();
       final result = Team.fromMap(map);
 
-      expect(result.$id, '5e5ea5c16897e');
-      expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
-      expect(result.$updatedAt, '2020-10-15T06:38:00.000+00:00');
-      expect(result.name, 'VIP');
-      expect(result.total, 7);
-    });
+            expect(result.$id, '5e5ea5c16897e');
+                  expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
+                  expect(result.$updatedAt, '2020-10-15T06:38:00.000+00:00');
+                  expect(result.name, 'VIP');
+                  expect(result.total, 7);
+                });
   });
 }
diff --git a/test/src/models/token_test.dart b/test/src/models/token_test.dart
index 8f0957c9..7ee4b268 100644
--- a/test/src/models/token_test.dart
+++ b/test/src/models/token_test.dart
@@ -16,12 +16,12 @@ void main() {
       final map = model.toMap();
       final result = Token.fromMap(map);
 
-      expect(result.$id, 'bb8ea5c16897e');
-      expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
-      expect(result.userId, '5e5ea5c168bb8');
-      expect(result.secret, '');
-      expect(result.expire, '2020-10-15T06:38:00.000+00:00');
-      expect(result.phrase, 'Golden Fox');
-    });
+            expect(result.$id, 'bb8ea5c16897e');
+                  expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
+                  expect(result.userId, '5e5ea5c168bb8');
+                  expect(result.secret, '');
+                  expect(result.expire, '2020-10-15T06:38:00.000+00:00');
+                  expect(result.phrase, 'Golden Fox');
+          });
   });
 }
diff --git a/test/src/models/user_test.dart b/test/src/models/user_test.dart
index 77c7dd97..c058ea26 100644
--- a/test/src/models/user_test.dart
+++ b/test/src/models/user_test.dart
@@ -26,21 +26,21 @@ void main() {
       final map = model.toMap();
       final result = User.fromMap(map);
 
-      expect(result.$id, '5e5ea5c16897e');
-      expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
-      expect(result.$updatedAt, '2020-10-15T06:38:00.000+00:00');
-      expect(result.name, 'John Doe');
-      expect(result.registration, '2020-10-15T06:38:00.000+00:00');
-      expect(result.status, true);
-      expect(result.labels, []);
-      expect(result.passwordUpdate, '2020-10-15T06:38:00.000+00:00');
-      expect(result.email, 'john@appwrite.io');
-      expect(result.phone, '+4930901820');
-      expect(result.emailVerification, true);
-      expect(result.phoneVerification, true);
-      expect(result.mfa, true);
-      expect(result.targets, []);
-      expect(result.accessedAt, '2020-10-15T06:38:00.000+00:00');
-    });
+            expect(result.$id, '5e5ea5c16897e');
+                  expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
+                  expect(result.$updatedAt, '2020-10-15T06:38:00.000+00:00');
+                  expect(result.name, 'John Doe');
+                  expect(result.registration, '2020-10-15T06:38:00.000+00:00');
+                  expect(result.status, true);
+                  expect(result.labels, []);
+                  expect(result.passwordUpdate, '2020-10-15T06:38:00.000+00:00');
+                  expect(result.email, 'john@appwrite.io');
+                  expect(result.phone, '+4930901820');
+                  expect(result.emailVerification, true);
+                  expect(result.phoneVerification, true);
+                  expect(result.mfa, true);
+                        expect(result.targets, []);
+                  expect(result.accessedAt, '2020-10-15T06:38:00.000+00:00');
+          });
   });
 }