diff --git a/api/tests/checker.rs b/api/tests/checker.rs
index 31d4784f..5e9141a3 100644
--- a/api/tests/checker.rs
+++ b/api/tests/checker.rs
@@ -57,7 +57,21 @@ impl JsonChecker for JsonCheckerImpl {
         value: &T,
         r#type: CheckType,
     ) -> bool {
-        let type_name = std::any::type_name::<T>().to_string();
+        let type_name = std::any::type_name::<T>().to_string().replace("::", "_");
+
+        let serialized_json =
+            serde_json::to_string_pretty(value).expect("Failed to serialize value");
+        let serialized_bson = bson::to_vec(value).expect("Failed to serialize value");
+
+        if self.r#override {
+            let bson_file_path = self.location() + &format!("/{}.bson", type_name);
+            let json_file_path = self.location() + &format!("/{}.json", type_name);
+
+            std::fs::write(json_file_path, serialized_json).expect("Failed to write JSON file");
+            std::fs::write(bson_file_path, serialized_bson).expect("Failed to write BSON file");
+            panic!("Override flag is enabled, remember to disable and commit the changes");
+        }
+
         let file_path = match r#type {
             CheckType::Json => self.location() + &format!("/{}.json", type_name),
             CheckType::Bson => self.location() + &format!("/{}.bson", type_name),
@@ -65,16 +79,13 @@ impl JsonChecker for JsonCheckerImpl {
 
         match r#type {
             CheckType::Json => {
-                let serialized =
-                    serde_json::to_string_pretty(value).expect("Failed to serialize value");
-
-                let file = File::open(file_path.clone());
-
                 if self.r#override {
-                    std::fs::write(file_path, serialized).expect("Failed to write to file");
+                    std::fs::write(file_path, serialized_json).expect("Failed to write to file");
                     panic!("Override flag is enabled, remember to disable and commit the changes");
                 }
 
+                let file = File::open(file_path.clone());
+
                 if file.is_err() {
                     return false;
                 }
@@ -89,21 +100,14 @@ impl JsonChecker for JsonCheckerImpl {
                 let expected = serde_json::from_str::<T>(&contents)
                     .expect("Failed to deserialize expect value");
 
-                let actual = serde_json::from_str::<T>(&serialized)
+                let actual = serde_json::from_str::<T>(&serialized_json)
                     .expect("Failed to deserialize actual value");
 
                 expected == actual
             }
             CheckType::Bson => {
-                let serialized = bson::to_vec(value).expect("Failed to serialize value");
-
                 let file = File::open(file_path.clone());
 
-                if self.r#override {
-                    std::fs::write(file_path, serialized).expect("Failed to write to file");
-                    panic!("Override flag is enabled, remember to disable and commit the changes");
-                }
-
                 if file.is_err() {
                     return false;
                 }
@@ -118,8 +122,8 @@ impl JsonChecker for JsonCheckerImpl {
                 let expected =
                     bson::from_slice::<T>(&contents).expect("Failed to deserialize expect value");
 
-                let actual =
-                    bson::from_slice::<T>(&serialized).expect("Failed to deserialize actual value");
+                let actual = bson::from_slice::<T>(&serialized_bson)
+                    .expect("Failed to deserialize actual value");
 
                 expected == actual
             }
diff --git a/api/tests/resource/entities::domain::connection::Connection.bson b/api/tests/resource/entities_domain_connection_Connection.bson
similarity index 74%
rename from api/tests/resource/entities::domain::connection::Connection.bson
rename to api/tests/resource/entities_domain_connection_Connection.bson
index 4130fa63..d0e21290 100644
Binary files a/api/tests/resource/entities::domain::connection::Connection.bson and b/api/tests/resource/entities_domain_connection_Connection.bson differ
diff --git a/api/tests/resource/entities::domain::connection::Connection.json b/api/tests/resource/entities_domain_connection_Connection.json
similarity index 98%
rename from api/tests/resource/entities::domain::connection::Connection.json
rename to api/tests/resource/entities_domain_connection_Connection.json
index 0184b158..04ab553c 100644
--- a/api/tests/resource/entities::domain::connection::Connection.json
+++ b/api/tests/resource/entities_domain_connection_Connection.json
@@ -39,6 +39,7 @@
       "expires_at": 100
     }
   },
+  "hasError": false,
   "createdAt": 0,
   "updatedAt": 0,
   "updated": false,
@@ -47,4 +48,4 @@
   "deleted": false,
   "active": true,
   "deprecated": false
-}
+}
\ No newline at end of file
diff --git a/api/tests/resource/entities::domain::connection::connection_definition::ConnectionDefinition.bson b/api/tests/resource/entities_domain_connection_connection_definition_ConnectionDefinition.bson
similarity index 100%
rename from api/tests/resource/entities::domain::connection::connection_definition::ConnectionDefinition.bson
rename to api/tests/resource/entities_domain_connection_connection_definition_ConnectionDefinition.bson
diff --git a/api/tests/resource/entities::domain::connection::connection_definition::ConnectionDefinition.json b/api/tests/resource/entities_domain_connection_connection_definition_ConnectionDefinition.json
similarity index 100%
rename from api/tests/resource/entities::domain::connection::connection_definition::ConnectionDefinition.json
rename to api/tests/resource/entities_domain_connection_connection_definition_ConnectionDefinition.json
diff --git a/api/tests/resource/entities::domain::connection::connection_model_definition::ConnectionModelDefinition.bson b/api/tests/resource/entities_domain_connection_connection_model_definition_ConnectionModelDefinition.bson
similarity index 79%
rename from api/tests/resource/entities::domain::connection::connection_model_definition::ConnectionModelDefinition.bson
rename to api/tests/resource/entities_domain_connection_connection_model_definition_ConnectionModelDefinition.bson
index 1f559a79..b02607f5 100644
Binary files a/api/tests/resource/entities::domain::connection::connection_model_definition::ConnectionModelDefinition.bson and b/api/tests/resource/entities_domain_connection_connection_model_definition_ConnectionModelDefinition.bson differ
diff --git a/api/tests/resource/entities::domain::connection::connection_model_definition::ConnectionModelDefinition.json b/api/tests/resource/entities_domain_connection_connection_model_definition_ConnectionModelDefinition.json
similarity index 96%
rename from api/tests/resource/entities::domain::connection::connection_model_definition::ConnectionModelDefinition.json
rename to api/tests/resource/entities_domain_connection_connection_model_definition_ConnectionModelDefinition.json
index 45f1a557..8d416f67 100644
--- a/api/tests/resource/entities::domain::connection::connection_model_definition::ConnectionModelDefinition.json
+++ b/api/tests/resource/entities_domain_connection_connection_model_definition_ConnectionModelDefinition.json
@@ -41,6 +41,7 @@
     "fromCommonModel": "from-common-model",
     "toCommonModel": "to-common-model"
   },
+  "supported": false,
   "createdAt": 0,
   "updatedAt": 0,
   "updated": false,
@@ -48,6 +49,5 @@
   "lastModifiedBy": "system",
   "deleted": false,
   "active": true,
-  "deprecated": false,
-  "supported": false
+  "deprecated": false
 }
\ No newline at end of file
diff --git a/api/tests/resource/entities::domain::connection::connection_model_schema::ConnectionModelSchema.bson b/api/tests/resource/entities_domain_connection_connection_model_schema_ConnectionModelSchema.bson
similarity index 100%
rename from api/tests/resource/entities::domain::connection::connection_model_schema::ConnectionModelSchema.bson
rename to api/tests/resource/entities_domain_connection_connection_model_schema_ConnectionModelSchema.bson
diff --git a/api/tests/resource/entities::domain::connection::connection_model_schema::ConnectionModelSchema.json b/api/tests/resource/entities_domain_connection_connection_model_schema_ConnectionModelSchema.json
similarity index 100%
rename from api/tests/resource/entities::domain::connection::connection_model_schema::ConnectionModelSchema.json
rename to api/tests/resource/entities_domain_connection_connection_model_schema_ConnectionModelSchema.json
diff --git a/api/tests/resource/entities::domain::schema::common_model::CommonEnum.bson b/api/tests/resource/entities_domain_schema_common_model_CommonEnum.bson
similarity index 100%
rename from api/tests/resource/entities::domain::schema::common_model::CommonEnum.bson
rename to api/tests/resource/entities_domain_schema_common_model_CommonEnum.bson
diff --git a/api/tests/resource/entities::domain::schema::common_model::CommonEnum.json b/api/tests/resource/entities_domain_schema_common_model_CommonEnum.json
similarity index 100%
rename from api/tests/resource/entities::domain::schema::common_model::CommonEnum.json
rename to api/tests/resource/entities_domain_schema_common_model_CommonEnum.json
diff --git a/api/tests/resource/entities::domain::schema::common_model::CommonModel.bson b/api/tests/resource/entities_domain_schema_common_model_CommonModel.bson
similarity index 100%
rename from api/tests/resource/entities::domain::schema::common_model::CommonModel.bson
rename to api/tests/resource/entities_domain_schema_common_model_CommonModel.bson
diff --git a/api/tests/resource/entities::domain::schema::common_model::CommonModel.json b/api/tests/resource/entities_domain_schema_common_model_CommonModel.json
similarity index 100%
rename from api/tests/resource/entities::domain::schema::common_model::CommonModel.json
rename to api/tests/resource/entities_domain_schema_common_model_CommonModel.json