diff --git a/tests/tests__fact_block_pool_depths__block_id_assert_no_gaps.sql b/tests/tests__fact_block_pool_depths__block_id_assert_no_gaps.sql
index d11bc39..0dac968 100644
--- a/tests/tests__fact_block_pool_depths__block_id_assert_no_gaps.sql
+++ b/tests/tests__fact_block_pool_depths__block_id_assert_no_gaps.sql
@@ -1 +1 @@
-{{ sequence_distinct_gaps_dim_block_id (ref("core__fact_block_pool_depths"), "block_id") }}
+{{ sequence_distinct_gaps_dim_block_id (ref("defi__fact_block_pool_depths"), "block_id") }}
diff --git a/tests/tests__fact_block_rewards__day_assert_no_gap.sql b/tests/tests__fact_block_rewards__day_assert_no_gap.sql
index 6a7f4cc..672eda7 100644
--- a/tests/tests__fact_block_rewards__day_assert_no_gap.sql
+++ b/tests/tests__fact_block_rewards__day_assert_no_gap.sql
@@ -1 +1 @@
-{{ date_gaps(ref("core__fact_block_rewards"), [], "day", dict(start_date = "cast('2021-07-22' as date)", end_date = "cast('2021-08-11' as date)")) }}
+{{ date_gaps(ref("defi__fact_block_rewards"), [], "day", dict(start_date = "cast('2021-07-22' as date)", end_date = "cast('2021-08-11' as date)")) }}
diff --git a/tests/tests__fact_daily_earnings__day_assert_no_gaps.sql b/tests/tests__fact_daily_earnings__day_assert_no_gaps.sql
index 28c25b4..face59b 100644
--- a/tests/tests__fact_daily_earnings__day_assert_no_gaps.sql
+++ b/tests/tests__fact_daily_earnings__day_assert_no_gaps.sql
@@ -1 +1 @@
-{{ date_gaps(ref("core__fact_daily_earnings"), [], "day", dict(start_date = "cast('2021-07-22' as date)", end_date = "cast('2021-08-11' as date)")) }}
+{{ date_gaps(ref("defi__fact_daily_earnings"), [], "day", dict(start_date = "cast('2021-07-22' as date)", end_date = "cast('2021-08-11' as date)")) }}
diff --git a/tests/tests__fact_daily_pool_stats__day_assert_no_gaps.sql b/tests/tests__fact_daily_pool_stats__day_assert_no_gaps.sql
index 65a1271..18f6fb9 100644
--- a/tests/tests__fact_daily_pool_stats__day_assert_no_gaps.sql
+++ b/tests/tests__fact_daily_pool_stats__day_assert_no_gaps.sql
@@ -1 +1 @@
-{{ date_gaps(ref("core__fact_daily_pool_stats"), [], "day", dict(start_date = "cast('2021-07-22' as date)", end_date = "cast('2021-08-11' as date)")) }}
+{{ date_gaps(ref("defi__fact_daily_pool_stats"), [], "day", dict(start_date = "cast('2021-07-22' as date)", end_date = "cast('2021-08-11' as date)")) }}
diff --git a/tests/tests__fact_daily_tvl__day_assert_no_gaps.sql b/tests/tests__fact_daily_tvl__day_assert_no_gaps.sql
index 7906364..2d1a597 100644
--- a/tests/tests__fact_daily_tvl__day_assert_no_gaps.sql
+++ b/tests/tests__fact_daily_tvl__day_assert_no_gaps.sql
@@ -1 +1 @@
-{{ date_gaps(ref("core__fact_daily_tvl"), [], "day", dict(start_date = "cast('2021-07-22' as date)", end_date = "cast('2021-08-11' as date)")) }}
+{{ date_gaps(ref("defi__fact_daily_tvl"), [], "day", dict(start_date = "cast('2021-07-22' as date)", end_date = "cast('2021-08-11' as date)")) }}
diff --git a/tests/tests__fact_pool_block_balances__block_id_assert_no_gaps.sql b/tests/tests__fact_pool_block_balances__block_id_assert_no_gaps.sql
index 4870a35..839b29c 100644
--- a/tests/tests__fact_pool_block_balances__block_id_assert_no_gaps.sql
+++ b/tests/tests__fact_pool_block_balances__block_id_assert_no_gaps.sql
@@ -1 +1 @@
-{{ sequence_distinct_gaps_dim_block_id(ref("corte__fact_pool_block_balances"), "block_id") }}
+{{ sequence_distinct_gaps_dim_block_id(ref("defi__fact_pool_block_balances"), "block_id") }}
diff --git a/tests/tests__fact_pool_block_fees__day_assert_no_gap.sql b/tests/tests__fact_pool_block_fees__day_assert_no_gap.sql
index c77881f..153d177 100644
--- a/tests/tests__fact_pool_block_fees__day_assert_no_gap.sql
+++ b/tests/tests__fact_pool_block_fees__day_assert_no_gap.sql
@@ -1 +1 @@
-{{ date_gaps(ref("core__fact_pool_block_fees"), [], "day", dict(start_date = "cast('2021-07-22' as date)", end_date = "cast('2021-08-11' as date)")) }}
+{{ date_gaps(ref("defi__fact_pool_block_fees"), [], "day", dict(start_date = "cast('2021-07-22' as date)", end_date = "cast('2021-08-11' as date)")) }}
diff --git a/tests/tests__fact_pool_block_statistics__day_assert_no_gap.sql b/tests/tests__fact_pool_block_statistics__day_assert_no_gap.sql
index 1c7da6b..1c91c87 100644
--- a/tests/tests__fact_pool_block_statistics__day_assert_no_gap.sql
+++ b/tests/tests__fact_pool_block_statistics__day_assert_no_gap.sql
@@ -1 +1 @@
-{{ date_gaps(ref("core__fact_pool_block_statistics"), [], "day", dict(start_date = "cast('2021-07-22' as date)", end_date = "cast('2021-08-11' as date)")) }}
+{{ date_gaps(ref("defi__fact_pool_block_statistics"), [], "day", dict(start_date = "cast('2021-07-22' as date)", end_date = "cast('2021-08-11' as date)")) }}
diff --git a/tests/tests__fact_prices__block_id-assert_no_gaps.sql b/tests/tests__fact_prices__block_id-assert_no_gaps.sql
index b144002..d5fed24 100644
--- a/tests/tests__fact_prices__block_id-assert_no_gaps.sql
+++ b/tests/tests__fact_prices__block_id-assert_no_gaps.sql
@@ -1 +1 @@
-{{ sequence_distinct_gaps_dim_block_id(ref("core__fact_prices"), "block_id") }}
+{{ sequence_distinct_gaps_dim_block_id(ref("price__fact_prices"), "block_id") }}
diff --git a/tests/tests__fact_swaps_assert_all_ids_exist_swap_events.sql b/tests/tests__fact_swaps_assert_all_ids_exist_swap_events.sql
deleted file mode 100644
index c4ad79d..0000000
--- a/tests/tests__fact_swaps_assert_all_ids_exist_swap_events.sql
+++ /dev/null
@@ -1 +0,0 @@
-{{ all_ids_exist(ref("core__fact_swap_events"), "tx_id", ref("core__fact_swaps"), "tx_id") }}
diff --git a/tests/tests__fact_total_block_rewards_block_id_assert_no_gaps.sql b/tests/tests__fact_total_block_rewards_block_id_assert_no_gaps.sql
index 9df0a6d..9e967f0 100644
--- a/tests/tests__fact_total_block_rewards_block_id_assert_no_gaps.sql
+++ b/tests/tests__fact_total_block_rewards_block_id_assert_no_gaps.sql
@@ -2,4 +2,4 @@
     warn_if = "> 10",
     severity = "warn"
 ) }}
-{{ sequence_distinct_gaps_dim_block_id(ref("core__fact_total_block_rewards"), "block_id") }}
+{{ sequence_distinct_gaps_dim_block_id(ref("defi__fact_total_block_rewards"), "block_id") }}
diff --git a/tests/tests__fact_total_value_locked_day_assert_no_gap.sql b/tests/tests__fact_total_value_locked_day_assert_no_gap.sql
index 5f24caf..faae3ff 100644
--- a/tests/tests__fact_total_value_locked_day_assert_no_gap.sql
+++ b/tests/tests__fact_total_value_locked_day_assert_no_gap.sql
@@ -1 +1 @@
-{{ date_gaps(ref("core__fact_total_value_locked"), [], "day", dict(start_date = "cast('2021-07-22' as date)", end_date = "cast('2021-08-11' as date)"), dict(start_date = "cast('2021-11-12' as date)", end_date = "cast('2021-11-18' as date)")) }}
+{{ date_gaps(ref("defi__fact_total_value_locked"), [], "day", dict(start_date = "cast('2021-07-22' as date)", end_date = "cast('2021-08-11' as date)"), dict(start_date = "cast('2021-11-12' as date)", end_date = "cast('2021-11-18' as date)")) }}