diff --git a/data_creation/data_injection/inject_jaffle_shop_tests.py b/data_creation/data_injection/inject_jaffle_shop_tests.py
index 60b3e5d..9b93e3c 100644
--- a/data_creation/data_injection/inject_jaffle_shop_tests.py
+++ b/data_creation/data_injection/inject_jaffle_shop_tests.py
@@ -216,6 +216,7 @@ def inject_jaffle_shop_tests(
             test_name="not_null",
             test_column_name="order_id",
             status=TestStatuses.FAIL,
+            description="The order_id column in the order_items table should not contain null values",
             result_rows=[
                 dict(
                     coupon_amount=100,
diff --git a/jaffle_shop_online/models/marketing/schema.yml b/jaffle_shop_online/models/marketing/schema.yml
index 3579315..1e1abbd 100644
--- a/jaffle_shop_online/models/marketing/schema.yml
+++ b/jaffle_shop_online/models/marketing/schema.yml
@@ -6,7 +6,7 @@ models:
     meta:
       owner: "Ella"
     config:
-      tags: ["Marketing", "Finance"]
+      tags: ["marketing", "finance"]
       elementary:
         timestamp_column: "date_day"
     columns:
@@ -35,7 +35,7 @@ models:
     meta:
       owner: "Ella"
     config:
-      tags: ["Marketing", "PII"]
+      tags: ["marketing", "pii"]
       elementary:
         timestamp_column: "converted_at"
     columns:
@@ -120,7 +120,7 @@ models:
     meta:
       owner: "Ella"
     config:
-      tags: ["Marketing", "Finance"]
+      tags: ["marketing", "finance"]
       elementary:
         timestamp_column: "date_month"
     columns:
@@ -157,7 +157,7 @@ models:
     meta:
       owner: "Ella"
     config:
-      tags: ["Marketing", "Finance"]
+      tags: ["marketing", "finance"]
       elementary:
         timestamp_column: "date"
     columns:
@@ -190,7 +190,7 @@ models:
     meta:
       owner: "Ella"
     config:
-        tags: ["Marketing"]
+        tags: ["marketing"]
         elementary:
             timestamp_column: "started_at"
     columns:
@@ -227,7 +227,7 @@ models:
     meta:
       owner: "Ella"
     config:
-        tags: ["Marketing", "Finance", "PII"]
+        tags: ["marketing", "finance", "pii"]
         elementary:
             timestamp_column: "converted_at"
     columns:
@@ -248,7 +248,7 @@ models:
     meta:
       owner: "Ella"
     config:
-        tags: ["Marketing", "PII"]
+        tags: ["marketing", "pii"]
         elementary:
             timestamp_column: "started_at"
     columns:
diff --git a/jaffle_shop_online/models/schema.yml b/jaffle_shop_online/models/schema.yml
index 845b6a0..14d7522 100644
--- a/jaffle_shop_online/models/schema.yml
+++ b/jaffle_shop_online/models/schema.yml
@@ -6,7 +6,7 @@ models:
     meta:
       owner: "Maayan"
     config:
-      tags: ["PII"]
+      tags: ["pii"]
       elementary:
         timestamp_column: "signup_date"
     columns:
diff --git a/jaffle_shop_online/models/staging/schema.yml b/jaffle_shop_online/models/staging/schema.yml
index 622c884..26be30a 100644
--- a/jaffle_shop_online/models/staging/schema.yml
+++ b/jaffle_shop_online/models/staging/schema.yml
@@ -5,7 +5,7 @@ models:
     meta:
       owner: "Idan"
     config:
-      tags: ["staging", "PII"]
+      tags: ["staging", "pii"]
     columns:
       - name: customer_id
         tests:
@@ -63,7 +63,7 @@ models:
     meta:
       owner: "Idan"
     config:
-      tags: ["staging", "PII"]
+      tags: ["staging", "pii"]
       elementary:
         timestamp_column: "signup_date"
     columns: