diff --git a/Sources/MeiliSearch/Model/Key.swift b/Sources/MeiliSearch/Model/Key.swift
index 6017e9a7..b05b3773 100644
--- a/Sources/MeiliSearch/Model/Key.swift
+++ b/Sources/MeiliSearch/Model/Key.swift
@@ -8,7 +8,7 @@ public struct Key: Codable, Equatable {
 
   public let uid: String
   public let name: String?
-  public let description: String
+  public let description: String?
   public let key: String
   public let actions: [String]
   public let indexes: [String]
diff --git a/Sources/MeiliSearch/Model/KeyParams.swift b/Sources/MeiliSearch/Model/KeyParams.swift
index 4424b55a..ce846add 100644
--- a/Sources/MeiliSearch/Model/KeyParams.swift
+++ b/Sources/MeiliSearch/Model/KeyParams.swift
@@ -4,7 +4,7 @@ import Foundation
  `KeyParams` contains all the parameters to create an API key.
  */
 public struct KeyParams: Codable, Equatable {
-  public let description: String
+  public var description: String?
   public var name: String?
   public var uid: String?
   public let actions: [String]
diff --git a/Tests/MeiliSearchIntegrationTests/KeysTests.swift b/Tests/MeiliSearchIntegrationTests/KeysTests.swift
index 4eb2ef50..37c2c951 100644
--- a/Tests/MeiliSearchIntegrationTests/KeysTests.swift
+++ b/Tests/MeiliSearchIntegrationTests/KeysTests.swift
@@ -5,69 +5,93 @@ import Foundation
 // swiftlint:disable force_try
 class KeysTests: XCTestCase {
   private var client: MeiliSearch!
-  private var key: String = ""
   private var session: URLSessionProtocol!
 
   // MARK: Setup
 
   override func setUp() {
     super.setUp()
+
     session = URLSession(configuration: .ephemeral)
     client = try! MeiliSearch(host: "http://localhost:7700", apiKey: "masterKey", session: session)
-    let keyExpectation = XCTestExpectation(description: "Get all keys")
 
-    self.client.getKeys { result in
+    // remove all keys to keep a clean state
+    self.client.getKeys(params: KeysQuery(limit: 100, offset: 0)) { result in
       switch result {
       case .success(let keys):
-        if keys.results.count > 0 {
-          let key = keys.results.first
-          if let firstKey: Key = key {
-            self.key = firstKey.key
+        keys.results.forEach {
+          self.client.deleteKey(key: $0.uid) { result in
+            switch result {
+            case .success:
+              ()
+            case .failure(let error):
+              dump(error)
+              XCTFail("Failed to delete key")
+            }
           }
-        } else {
-          XCTFail("Failed to get keys")
         }
-        keyExpectation.fulfill()
       case .failure(let error):
         dump(error)
-        XCTFail("Failed to get keys")
-        keyExpectation.fulfill()
+        XCTFail("Failed to retrieve and delete all keys")
       }
     }
-    self.wait(for: [keyExpectation], timeout: TESTS_TIME_OUT)
   }
 
   func testGetKeys() {
-    let keyExpectation = XCTestExpectation(description: "Get all keys")
+    let keyExpectation = XCTestExpectation(description: "Get a list of keys")
 
-    self.client.getKeys { result in
+    self.client.createKey(KeyParams(actions: ["*"], indexes: ["*"], expiresAt: nil)) { result in
       switch result {
-      case .success(let keys):
-        XCTAssertNotEqual(keys.results.count, 0)
+      case .success:
+        self.client.getKeys { result in
+          switch result {
+          case .success(let keys):
+            XCTAssertNotEqual(keys.results.count, 0)
+          case .failure(let error):
+            dump(error)
+            XCTFail("Failed to get all keys")
+          }
+        }
+
         keyExpectation.fulfill()
       case .failure(let error):
         dump(error)
-        XCTFail("Failed to get all keys")
+        XCTFail("Failed to create a key")
         keyExpectation.fulfill()
       }
     }
+
     self.wait(for: [keyExpectation], timeout: TESTS_TIME_OUT)
   }
 
   func testGetKey() {
     let keyExpectation = XCTestExpectation(description: "Get one key")
 
-    self.client.getKey(key: self.key) { result in
+    self.client.createKey(KeyParams(actions: ["*"], indexes: ["*"], expiresAt: nil)) { result in
       switch result {
-      case .success(let key):
-        XCTAssertNotNil(key.description)
+      case .success(let createdKey):
+        self.client.getKey(key: createdKey.uid) { result in
+          switch result {
+          case .success(let fetchedKey):
+            XCTAssertEqual(fetchedKey.expiresAt, nil)
+            XCTAssertEqual(fetchedKey.description, createdKey.description)
+            XCTAssertEqual(fetchedKey.actions, createdKey.actions)
+            XCTAssertEqual(fetchedKey.indexes, createdKey.indexes)
+            XCTAssertEqual(fetchedKey.uid, createdKey.uid)
+          case .failure(let error):
+            dump(error)
+            XCTFail("Failed to get key by uid \(createdKey.uid)")
+          }
+        }
+
         keyExpectation.fulfill()
       case .failure(let error):
         dump(error)
-        XCTFail("Failed to get a key")
+        XCTFail("Failed to create a key")
         keyExpectation.fulfill()
       }
     }
+
     self.wait(for: [keyExpectation], timeout: TESTS_TIME_OUT)
   }
 
@@ -93,6 +117,29 @@ class KeysTests: XCTestCase {
     self.wait(for: [keyExpectation], timeout: TESTS_TIME_OUT)
   }
 
+  func testCreateKeyWithOptionalUid() {
+    let keyExpectation = XCTestExpectation(description: "Create a key")
+    let uid = "1f05fa47-cfa6-40f7-8b80-7bd17b39f105"
+    let keyParams = KeyParams(uid: uid, actions: ["*"], indexes: ["*"], expiresAt: nil)
+
+    self.client.createKey(keyParams) { result in
+      switch result {
+      case .success(let key):
+        XCTAssertEqual(key.expiresAt, nil)
+        XCTAssertEqual(key.uid, uid)
+        XCTAssertEqual(key.actions, keyParams.actions)
+        XCTAssertEqual(key.indexes, keyParams.indexes)
+        keyExpectation.fulfill()
+      case .failure(let error):
+        dump(error)
+        XCTFail("Failed to create a key")
+        keyExpectation.fulfill()
+      }
+    }
+
+    self.wait(for: [keyExpectation], timeout: TESTS_TIME_OUT)
+  }
+
   func testCreateKeyWithExpire() {
     let keyExpectation = XCTestExpectation(description: "Create a key with an expireAt value")