diff --git a/test_cases/schema/default_schema.json b/test_cases/schema/default_schema.json
index e2d81835..a0640a3f 100644
--- a/test_cases/schema/default_schema.json
+++ b/test_cases/schema/default_schema.json
@@ -29,6 +29,29 @@
                 "$id": "#root/parser/abi/inputs",
                 "title": "Inputs",
                 "type": "array",
+                "items": {
+                  "type": "object",
+                  "properties": {
+                    "indexed": {
+                      "type": "boolean"
+                    },
+                    "name": {
+                      "type": "string",
+                      "minLength": 1,
+                      "description": "Cannot be empty. Use unnamedField0, unnamedField1, etc. as placeholders."
+                    },
+                    "internalType": {
+                      "type": "string"
+                    },
+                    "type": {
+                      "type": "string"
+                    }
+                  },
+                  "required": [
+                    "name",
+                    "type"
+                  ]
+                },
                 "default": []
               },
               "name": {
@@ -123,6 +146,26 @@
             "$id": "#root/table/schema",
             "title": "Schema",
             "type": "array",
+            "items": {
+              "type": "object",
+              "properties": {
+                "description": {
+                  "type": "string"
+                },
+                "name": {
+                  "type": "string",
+                  "minLength": 1,
+                  "description": "Cannot be empty. Use unnamedField0, unnamedField1, etc. as placeholders."
+                },
+                "type": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "name",
+                "type"
+              ]
+            },
             "default": []
           },
           "table_description": {
diff --git a/tests/test_validate_json.py b/tests/test_validate_json.py
index 7492b83d..31c10530 100644
--- a/tests/test_validate_json.py
+++ b/tests/test_validate_json.py
@@ -25,18 +25,8 @@ def load_json_file(path):
 
 def validate_json(filename):
     """REF: https://json-schema.org/ """
-    # Describe what kind of json you expect.
     json_data = load_json_file(filename)
-
-    try:
-        jsonschema.validate(instance=json_data, schema=schema)
-    except jsonschema.exceptions.ValidationError as err:
-        err = f"Given JSON data is InValid for file {filename}: \n {str(err)}"
-        print(err)
-        return False, err
-
-    message = "Given JSON data is Valid"
-    return True, message
+    jsonschema.validate(instance=json_data, schema=schema)
 
 
 def get_json_files_in_dir(dir):
@@ -50,22 +40,21 @@ def get_json_files_in_dir(dir):
 
 @pytest.mark.parametrize("filename", pass_tests)
 def test_correct_cases(filename):
-    valid, msg = validate_json(filename)
-    assert (valid == True)
+    validate_json(filename)
 
 
 @pytest.mark.parametrize("filename", fail_tests)
 def test_wrong_cases(filename):
-    valid, msg = validate_json(filename)
-    assert (valid == False)
+    with pytest.raises(jsonschema.exceptions.ValidationError):
+        validate_json(filename)
 
 
 all_files = get_json_files_in_dir('./airflow/dags/resources/stages/parse/')
 
+
 @pytest.mark.parametrize("filename", all_files)
 def test_file(filename):
-    valid, msg = validate_json(filename)
-    assert (valid == True)
+    validate_json(filename)
 
 
 @pytest.mark.parametrize("filename", all_files)
@@ -74,3 +63,11 @@ def test_dataset_name_is_correct(filename):
     dataset_name = json_data.get('table', {}).get('dataset_name', None)
     assert os.path.split(filename)[0].split("/")[-1] == dataset_name
 
+
+@pytest.mark.parametrize("filename", all_files)
+def test_table_name_is_correct(filename):
+    json_data = load_json_file(filename)
+    table_name = json_data.get('table', {}).get('table_name', None)
+    basename = os.path.basename(filename)
+    expected_table_name = basename.replace('.json', '')
+    assert expected_table_name == table_name