diff --git a/.ruff.toml b/.ruff.toml
index 970ab493..ea72e327 100644
--- a/.ruff.toml
+++ b/.ruff.toml
@@ -38,10 +38,7 @@ target-version = "py38"
 
 [lint]
 # Enable Pyflakes (`F`) and a subset of the pycodestyle (`E`)  codes by default.
-
-select = ["E4", "E7", "E9", "F", "COM812", "D103","I001"]
-
-
+select = ["E4", "E7", "E9", "F", "COM812", "D102", "D103","I001"]
 ignore = []
 
 # Allow fix for all enabled rules (when `--fix`) is provided.
diff --git a/app/migrations/0017_merge_20240604_2359.py b/app/migrations/0017_merge_20240604_2359.py
new file mode 100644
index 00000000..88bf4e9c
--- /dev/null
+++ b/app/migrations/0017_merge_20240604_2359.py
@@ -0,0 +1,14 @@
+# Generated by Django 5.0.4 on 2024-06-05 02:59
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('app', '0015_merge_20240603_1125'),
+        ('app', '0016_delete_veterinario'),
+    ]
+
+    operations = [
+    ]
diff --git a/app/migrations/0019_merge_20240605_0942.py b/app/migrations/0019_merge_20240605_0942.py
new file mode 100644
index 00000000..ae7f9605
--- /dev/null
+++ b/app/migrations/0019_merge_20240605_0942.py
@@ -0,0 +1,14 @@
+# Generated by Django 5.0.4 on 2024-06-05 12:42
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('app', '0017_merge_20240604_2359'),
+        ('app', '0018_remove_client_address_client_city'),
+    ]
+
+    operations = [
+    ]
diff --git a/app/tests_integration.py b/app/tests_integration.py
index 454bec43..e3543989 100644
--- a/app/tests_integration.py
+++ b/app/tests_integration.py
@@ -134,6 +134,9 @@ def test_edit_user_with_valid_data_test(self):
         self.assertEqual(editedClient.city, "Berisso")
 
     def test_edit_user_with_invalid_data_test_city(self):
+        """
+        Se testea la función editar con datos de ciudad invalido.
+        """
 
         client = Client.objects.create(
             name="Guido Carrillo",
diff --git a/app/tests_unit.py b/app/tests_unit.py
index 9615ae18..8de10055 100644
--- a/app/tests_unit.py
+++ b/app/tests_unit.py
@@ -27,6 +27,9 @@ def test_can_create_and_get_client(self):
         self.assertEqual(clients[0].email, "brujita75@vetsoft.com")
 
     def test_can_update_client(self):
+        """
+        Se testea si se puede actualizar los datos del cliente.
+        """
 
         Client.save_client(
             {
@@ -75,6 +78,9 @@ def test_update_client_with_error(self):
         self.assertEqual(client_updated.phone, "221555232")
 
     def test_update_client_with_email_null(self): #nuevo test verificando que no pueda hacer update con email nulo
+        """
+        Esta funcion testea el cliente acutalizado con un email nulo
+        """
         Client.save_client(
             {
                 "name": "Juan Sebastian Veron",
diff --git a/functional_tests/tests.py b/functional_tests/tests.py
index 924f2a44..a146c057 100644
--- a/functional_tests/tests.py
+++ b/functional_tests/tests.py
@@ -479,6 +479,9 @@ def test_should_show_error_for_present_birth_date(self):
         expect(self.page.get_by_text("La fecha de nacimiento debe ser menor a la fecha actual")).to_be_visible()     
 
     def test_should_be_able_to_create_a_new_pet_goto(self):
+        """
+        Verifica si el test me permite crear una nueva masota.
+        """
         self.page.goto(f"{self.live_server_url}{reverse('pet_form')}")