diff --git a/aixplain/modules/agent/__init__.py b/aixplain/modules/agent/__init__.py
index a7586c8b..41bb0a2e 100644
--- a/aixplain/modules/agent/__init__.py
+++ b/aixplain/modules/agent/__init__.py
@@ -252,6 +252,10 @@ def delete(self) -> None:
             if r.status_code != 200:
                 raise Exception()
         except Exception:
-            message = f"Agent Deletion Error (HTTP {r.status_code}): Make sure the agent exists and you are the owner."
+            try:
+                response_json = r.json()
+                message = f"Agent Deletion Error (HTTP {r.status_code}): {response_json.get('message')}."
+            except ValueError:
+                message = f"Agent Deletion Error (HTTP {r.status_code}): There was an error in deleting the agent."
             logging.error(message)
-            raise Exception(f"{message}")
+            raise Exception(message)
\ No newline at end of file
diff --git a/pyproject.toml b/pyproject.toml
index 1f034299..1656947a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -10,7 +10,7 @@ namespaces = true
 
 [project]
 name = "aiXplain"
-version = "0.2.21rc1"
+version = "0.2.21"
 description = "aiXplain SDK adds AI functions to software."
 readme = "README.md"
 requires-python = ">=3.5, <4"
diff --git a/tests/functional/apikey/test_api.py b/tests/functional/apikey/test_api.py
index 221a58fb..2c228f6b 100644
--- a/tests/functional/apikey/test_api.py
+++ b/tests/functional/apikey/test_api.py
@@ -199,62 +199,6 @@ def test_list_update_api_keys():
         break
 
 
-
-def test_list_update_api_keys():
-    api_keys = APIKeyFactory.list()
-    assert isinstance(api_keys, list)
-
-    for api_key in api_keys:
-        assert isinstance(api_key, APIKey)
-        assert api_key.id != ""
-
-        from random import randint
-
-        number = randint(0, 10000)
-        if api_key.global_limits is None:
-            api_key.global_limits = APIKeyGlobalLimits(
-                token_per_minute=number,
-                token_per_day=number,
-                request_per_day=number,
-                request_per_minute=number,
-            )
-        else:
-            api_key.global_limits.token_per_day = number
-            api_key.global_limits.token_per_minute = number
-            api_key.global_limits.request_per_day = number
-            api_key.global_limits.request_per_minute = number
-
-        if api_key.asset_limits is None:
-            api_key.asset_limits = []
-
-        if len(api_key.asset_limits) == 0:
-            api_key.asset_limits.append(
-                APIKeyGlobalLimits(
-                    model="640b517694bf816d35a59125",
-                    token_per_minute=number,
-                    token_per_day=number,
-                    request_per_day=number,
-                    request_per_minute=number,
-                )
-            )
-        else:
-            api_key.asset_limits[0].request_per_day = number
-            api_key.asset_limits[0].request_per_minute = number
-            api_key.asset_limits[0].token_per_day = number
-            api_key.asset_limits[0].token_per_minute = number
-        api_key = APIKeyFactory.update(api_key)
-
-        assert api_key.global_limits.token_per_day == number
-        assert api_key.global_limits.token_per_minute == number
-        assert api_key.global_limits.request_per_day == number
-        assert api_key.global_limits.request_per_minute == number
-        assert api_key.asset_limits[0].request_per_day == number
-        assert api_key.asset_limits[0].request_per_minute == number
-        assert api_key.asset_limits[0].token_per_day == number
-        assert api_key.asset_limits[0].token_per_minute == number
-        break
-
-
 def test_create_api_key_wrong_input():
     api_key_name = "Test API Key"
 
diff --git a/tests/functional/model/run_model_test.py b/tests/functional/model/run_model_test.py
index 0e97a2ab..04335d19 100644
--- a/tests/functional/model/run_model_test.py
+++ b/tests/functional/model/run_model_test.py
@@ -12,11 +12,17 @@ def pytest_generate_tests(metafunc):
         four_weeks_ago = datetime.now(timezone.utc) - timedelta(weeks=4)
         models = ModelFactory.list(function=Function.TEXT_GENERATION)["results"]
 
-        predefined_models = ["Groq Llama 3 70B", "Chat GPT 3.5", "GPT-4o"]
+        predefined_models = []
+        for predefined_model in ["Groq Llama 3 70B", "Chat GPT 3.5", "GPT-4o"]:
+            predefined_models.extend(
+                [
+                    m
+                    for m in ModelFactory.list(query=predefined_model, function=Function.TEXT_GENERATION)["results"]
+                    if m.name == predefined_model and "aiXplain-testing" not in str(m.supplier)
+                ]
+            )
         recent_models = [model for model in models if model.created_at and model.created_at >= four_weeks_ago]
-        combined_models = recent_models + [
-            ModelFactory.list(query=model, function=Function.TEXT_GENERATION)["results"][0] for model in predefined_models
-        ]
+        combined_models = recent_models + predefined_models
         metafunc.parametrize("llm_model", combined_models)
 
 
@@ -24,7 +30,6 @@ def test_llm_run(llm_model):
     """Testing LLMs with history context"""
 
     assert isinstance(llm_model, LLM)
-
     response = llm_model.run(
         data="What is my name?",
         history=[{"role": "user", "content": "Hello! My name is Thiago."}, {"role": "assistant", "content": "Hello!"}],