diff --git a/macros/generic_tests/test_date_not_in_future.sql b/macros/generic_tests/test_date_not_in_future.sql
new file mode 100644
index 000000000..633cb7c60
--- /dev/null
+++ b/macros/generic_tests/test_date_not_in_future.sql
@@ -0,0 +1,17 @@
+{% test date_not_in_future(model, column_name) %}
+
+{#
+    Generic test: asserts that no date values in the column
+    are greater than the current date.
+
+    Usage in schema.yml:
+      tests:
+        - date_not_in_future
+#}
+
+select
+    {{ column_name }} as failing_date
+from {{ model }}
+where {{ column_name }} > current_date
+
+{% endtest %}
diff --git a/macros/generic_tests/test_not_negative.sql b/macros/generic_tests/test_not_negative.sql
new file mode 100644
index 000000000..20ad849b2
--- /dev/null
+++ b/macros/generic_tests/test_not_negative.sql
@@ -0,0 +1,17 @@
+{% test not_negative(model, column_name) %}
+
+{#
+    Generic test: asserts that no numeric values in the column
+    are negative (less than zero).
+
+    Usage in schema.yml:
+      tests:
+        - not_negative
+#}
+
+select
+    {{ column_name }} as failing_value
+from {{ model }}
+where {{ column_name }} < 0
+
+{% endtest %}
diff --git a/models/core/final/schema.yml b/models/core/final/schema.yml
new file mode 100644
index 000000000..e2debc93d
--- /dev/null
+++ b/models/core/final/schema.yml
@@ -0,0 +1,107 @@
+version: 2
+
+models:
+  - name: core__patient
+    description: >
+      Patient dimension table containing one record per unique patient.
+      This is the primary patient reference table used across all core models
+      and data marts.
+    columns:
+      - name: patient_id
+        description: "Unique patient identifier (primary key)"
+        tests:
+          - not_null
+          - unique
+
+      - name: sex
+        description: "Patient sex"
+        tests:
+          - not_null
+          - accepted_values:
+              values: ['male', 'female', 'unknown']
+
+      - name: race
+        description: "Patient race"
+        tests:
+          - accepted_values:
+              values: ['white', 'black', 'asian', 'hispanic', 'other', 'unknown']
+
+      - name: birth_date
+        description: "Patient date of birth in YYYY-MM-DD format"
+        tests:
+          - not_null
+
+      - name: death_date
+        description: "Patient date of death in YYYY-MM-DD format"
+        tests:
+          - date_not_in_future
+
+      - name: death_flag
+        description: "1 if patient is deceased, 0 otherwise"
+        tests:
+          - not_null
+          - accepted_values:
+              values: [0, 1]
+
+      - name: tuva_last_run
+        description: "Timestamp of last dbt run that populated this record"
+        tests:
+          - not_null
+
+  - name: core__encounter
+    description: >
+      Encounter fact table containing one record per unique patient encounter.
+      Encounters represent discrete healthcare events such as inpatient stays,
+      outpatient visits, or emergency department visits.
+    columns:
+      - name: encounter_id
+        description: "Unique encounter identifier (primary key)"
+        tests:
+          - not_null
+          - unique
+
+      - name: patient_id
+        description: "Foreign key to the patient dimension table"
+        tests:
+          - not_null
+          - relationships:
+              to: ref('core__patient')
+              field: patient_id
+
+      - name: encounter_type
+        description: "Type of encounter"
+        tests:
+          - not_null
+          - accepted_values:
+              values:
+                - acute inpatient
+                - ambulatory surgery center
+                - emergency department
+                - home health
+                - hospice
+                - inpatient psychiatric
+                - inpatient rehabilitation
+                - lab
+                - office visit
+                - outpatient
+                - outpatient psychiatric
+                - outpatient rehabilitation
+                - skilled nursing facility
+                - telehealth
+                - urgent care
+
+      - name: encounter_start_date
+        description: "Date the encounter began in YYYY-MM-DD format"
+        tests:
+          - not_null
+          - date_not_in_future
+
+      - name: encounter_end_date
+        description: "Date the encounter ended in YYYY-MM-DD format"
+        tests:
+          - not_null
+
+      - name: tuva_last_run
+        description: "Timestamp of last dbt run that populated this record"
+        tests:
+          - not_null