diff --git a/src/entity/schema.rs b/src/entity/schema.rs
index 727eab06..06c688a8 100644
--- a/src/entity/schema.rs
+++ b/src/entity/schema.rs
@@ -21,10 +21,10 @@ where
             column_def.unique_key();
         }
         for primary_key in E::PrimaryKey::iter() {
-            if column.to_string() == primary_key.into_column().to_string()
-                && E::PrimaryKey::auto_increment()
-            {
-                column_def.auto_increment();
+            if column.to_string() == primary_key.into_column().to_string() {
+                if E::PrimaryKey::auto_increment() {
+                    column_def.auto_increment();
+                }
                 if E::PrimaryKey::iter().count() == 1 {
                     column_def.primary_key();
                 }
diff --git a/src/tests_cfg/cake.rs b/src/tests_cfg/cake.rs
index 49ada3aa..0eeb0738 100644
--- a/src/tests_cfg/cake.rs
+++ b/src/tests_cfg/cake.rs
@@ -75,6 +75,7 @@ impl Related<super::filling::Entity> for Entity {
     }
 }
 
+#[derive(Debug)]
 pub struct CakeToFilling;
 
 impl Linked for CakeToFilling {
diff --git a/tests/common/setup/schema.rs b/tests/common/setup/schema.rs
index 2dc5f239..32e7d8a5 100644
--- a/tests/common/setup/schema.rs
+++ b/tests/common/setup/schema.rs
@@ -286,5 +286,5 @@ pub async fn create_metadata_table(db: &DbConn) -> Result<ExecResult, DbErr> {
         .col(ColumnDef::new(metadata::Column::Value).string().not_null())
         .to_owned();
 
-    create_table(db, &stmt).await
+    create_table(db, &stmt, Metadata).await
 }
diff --git a/tests/relational_tests.rs b/tests/relational_tests.rs
index 198d4b24..c950ddc6 100644
--- a/tests/relational_tests.rs
+++ b/tests/relational_tests.rs
@@ -494,7 +494,7 @@ pub async fn linked() -> Result<(), DbErr> {
         profit_margin: Set(10.4),
         ..Default::default()
     };
-    let seaside_bakery_res: InsertResult = Bakery::insert(seaside_bakery).exec(&ctx.db).await?;
+    let seaside_bakery_res = Bakery::insert(seaside_bakery).exec(&ctx.db).await?;
 
     // Bob's Baker, Cake & Cake Baker
     let baker_bob = baker::ActiveModel {
@@ -507,7 +507,7 @@ pub async fn linked() -> Result<(), DbErr> {
         bakery_id: Set(Some(seaside_bakery_res.last_insert_id as i32)),
         ..Default::default()
     };
-    let baker_bob_res: InsertResult = Baker::insert(baker_bob).exec(&ctx.db).await?;
+    let baker_bob_res = Baker::insert(baker_bob).exec(&ctx.db).await?;
     let mud_cake = cake::ActiveModel {
         name: Set("Mud Cake".to_owned()),
         price: Set(dec!(10.25)),
@@ -516,7 +516,7 @@ pub async fn linked() -> Result<(), DbErr> {
         bakery_id: Set(Some(seaside_bakery_res.last_insert_id as i32)),
         ..Default::default()
     };
-    let mud_cake_res: InsertResult = Cake::insert(mud_cake).exec(&ctx.db).await?;
+    let mud_cake_res = Cake::insert(mud_cake).exec(&ctx.db).await?;
     let bob_cakes_bakers = cakes_bakers::ActiveModel {
         cake_id: Set(mud_cake_res.last_insert_id as i32),
         baker_id: Set(baker_bob_res.last_insert_id as i32),
@@ -533,7 +533,7 @@ pub async fn linked() -> Result<(), DbErr> {
         bakery_id: Set(Some(seaside_bakery_res.last_insert_id as i32)),
         ..Default::default()
     };
-    let baker_bobby_res: InsertResult = Baker::insert(baker_bobby).exec(&ctx.db).await?;
+    let baker_bobby_res = Baker::insert(baker_bobby).exec(&ctx.db).await?;
     let cheese_cake = cake::ActiveModel {
         name: Set("Cheese Cake".to_owned()),
         price: Set(dec!(20.5)),
@@ -542,7 +542,7 @@ pub async fn linked() -> Result<(), DbErr> {
         bakery_id: Set(Some(seaside_bakery_res.last_insert_id as i32)),
         ..Default::default()
     };
-    let cheese_cake_res: InsertResult = Cake::insert(cheese_cake).exec(&ctx.db).await?;
+    let cheese_cake_res = Cake::insert(cheese_cake).exec(&ctx.db).await?;
     let bobby_cakes_bakers = cakes_bakers::ActiveModel {
         cake_id: Set(cheese_cake_res.last_insert_id as i32),
         baker_id: Set(baker_bobby_res.last_insert_id as i32),
@@ -559,7 +559,7 @@ pub async fn linked() -> Result<(), DbErr> {
         bakery_id: Set(Some(seaside_bakery_res.last_insert_id as i32)),
         ..Default::default()
     };
-    let chocolate_cake_res: InsertResult = Cake::insert(chocolate_cake).exec(&ctx.db).await?;
+    let chocolate_cake_res = Cake::insert(chocolate_cake).exec(&ctx.db).await?;
     let bobby_cakes_bakers = cakes_bakers::ActiveModel {
         cake_id: Set(chocolate_cake_res.last_insert_id as i32),
         baker_id: Set(baker_bobby_res.last_insert_id as i32),
@@ -575,7 +575,7 @@ pub async fn linked() -> Result<(), DbErr> {
         notes: Set(Some("Loves cheese cake".to_owned())),
         ..Default::default()
     };
-    let customer_kate_res: InsertResult = Customer::insert(customer_kate).exec(&ctx.db).await?;
+    let customer_kate_res = Customer::insert(customer_kate).exec(&ctx.db).await?;
     let kate_order_1 = order::ActiveModel {
         bakery_id: Set(seaside_bakery_res.last_insert_id as i32),
         customer_id: Set(customer_kate_res.last_insert_id as i32),
@@ -583,7 +583,7 @@ pub async fn linked() -> Result<(), DbErr> {
         placed_at: Set(Utc::now().naive_utc()),
         ..Default::default()
     };
-    let kate_order_1_res: InsertResult = Order::insert(kate_order_1).exec(&ctx.db).await?;
+    let kate_order_1_res = Order::insert(kate_order_1).exec(&ctx.db).await?;
     lineitem::ActiveModel {
         cake_id: Set(cheese_cake_res.last_insert_id as i32),
         order_id: Set(kate_order_1_res.last_insert_id as i32),
@@ -600,7 +600,7 @@ pub async fn linked() -> Result<(), DbErr> {
         placed_at: Set(Utc::now().naive_utc()),
         ..Default::default()
     };
-    let kate_order_2_res: InsertResult = Order::insert(kate_order_2).exec(&ctx.db).await?;
+    let kate_order_2_res = Order::insert(kate_order_2).exec(&ctx.db).await?;
     lineitem::ActiveModel {
         cake_id: Set(chocolate_cake_res.last_insert_id as i32),
         order_id: Set(kate_order_2_res.last_insert_id as i32),
@@ -617,7 +617,7 @@ pub async fn linked() -> Result<(), DbErr> {
         notes: Set(Some("Loves all cakes".to_owned())),
         ..Default::default()
     };
-    let customer_kara_res: InsertResult = Customer::insert(customer_kara).exec(&ctx.db).await?;
+    let customer_kara_res = Customer::insert(customer_kara).exec(&ctx.db).await?;
     let kara_order_1 = order::ActiveModel {
         bakery_id: Set(seaside_bakery_res.last_insert_id as i32),
         customer_id: Set(customer_kara_res.last_insert_id as i32),
@@ -625,7 +625,7 @@ pub async fn linked() -> Result<(), DbErr> {
         placed_at: Set(Utc::now().naive_utc()),
         ..Default::default()
     };
-    let kara_order_1_res: InsertResult = Order::insert(kara_order_1).exec(&ctx.db).await?;
+    let kara_order_1_res = Order::insert(kara_order_1).exec(&ctx.db).await?;
     lineitem::ActiveModel {
         cake_id: Set(mud_cake_res.last_insert_id as i32),
         order_id: Set(kara_order_1_res.last_insert_id as i32),
@@ -642,7 +642,7 @@ pub async fn linked() -> Result<(), DbErr> {
         placed_at: Set(Utc::now().naive_utc()),
         ..Default::default()
     };
-    let kara_order_2_res: InsertResult = Order::insert(kara_order_2).exec(&ctx.db).await?;
+    let kara_order_2_res = Order::insert(kara_order_2).exec(&ctx.db).await?;
     lineitem::ActiveModel {
         cake_id: Set(cheese_cake_res.last_insert_id as i32),
         order_id: Set(kara_order_2_res.last_insert_id as i32),