diff --git a/schemas.py b/schemas.py
index 946cb6cc..760be600 100644
--- a/schemas.py
+++ b/schemas.py
@@ -6,7 +6,7 @@
             "type": "integer"
         },
         "name": {
-            "type": "integer"
+            "type": "string"
         },
         "type": {
             "type": "string",
diff --git a/test_pet.py b/test_pet.py
index e2156781..9cc55f73 100644
--- a/test_pet.py
+++ b/test_pet.py
@@ -26,7 +26,7 @@ def test_pet_schema():
 3) Validate the 'status' property in the response is equal to the expected status
 4) Validate the schema for each object in the response
 '''
-@pytest.mark.parametrize("status", [("available")])
+@pytest.mark.parametrize("status", ["available", "sold", "pending"])
 def test_find_by_status_200(status):
     test_endpoint = "/pets/findByStatus"
     params = {
@@ -34,13 +34,24 @@ def test_find_by_status_200(status):
     }
 
     response = api_helpers.get_api_data(test_endpoint, params)
-    # TODO...
 
+    assert response.status_code == 200
+
+    response_data = response.json()
+
+    for pet in response_data:
+        assert pet["status"] == status
+        validate(instance=pet, schema=schemas.pet)
+        
 '''
 TODO: Finish this test by...
 1) Testing and validating the appropriate 404 response for /pets/{pet_id}
 2) Parameterizing the test for any edge cases
 '''
-def test_get_by_id_404():
-    # TODO...
-    pass
\ No newline at end of file
+@pytest.mark.parametrize("pet_id", [999, -1])
+def test_get_by_id_404(pet_id):
+    test_endpoint = f"/pets/{pet_id}"
+
+    response = api_helpers.get_api_data(test_endpoint)
+
+    assert response.status_code == 404
\ No newline at end of file