diff --git a/jans-cedarling/cedarling/src/common/policy_store/token_entity_metadata.rs b/jans-cedarling/cedarling/src/common/policy_store/token_entity_metadata.rs
index 66bd17ca6ef..c940cef9517 100644
--- a/jans-cedarling/cedarling/src/common/policy_store/token_entity_metadata.rs
+++ b/jans-cedarling/cedarling/src/common/policy_store/token_entity_metadata.rs
@@ -3,7 +3,7 @@ use serde::{de, Deserialize};
 use serde_json::Value;
 use std::collections::HashMap;
 
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Clone, Default)]
 #[allow(dead_code)]
 pub struct TokenEntityMetadata {
     pub user_id: Option<String>,
diff --git a/jans-cedarling/cedarling/src/common/policy_store/trusted_issuer_metadata.rs b/jans-cedarling/cedarling/src/common/policy_store/trusted_issuer_metadata.rs
index eb3a74110e3..b01c168a4e2 100644
--- a/jans-cedarling/cedarling/src/common/policy_store/trusted_issuer_metadata.rs
+++ b/jans-cedarling/cedarling/src/common/policy_store/trusted_issuer_metadata.rs
@@ -75,26 +75,10 @@ mod test {
             description: "Consumer IDP".to_string(),
             openid_configuration_endpoint:
                 "https://accounts.google.com/.well-known/openid-configuration".to_string(),
-            access_tokens: TokenEntityMetadata {
-                user_id: None,
-                role_mapping: None,
-                claim_mapping: None,
-            },
-            id_tokens: TokenEntityMetadata {
-                user_id: Some("sub".to_string()),
-                role_mapping: Some("role".to_string()),
-                claim_mapping: None,
-            },
-            userinfo_tokens: TokenEntityMetadata {
-                user_id: None,
-                role_mapping: None,
-                claim_mapping: None,
-            },
-            tx_tokens: TokenEntityMetadata {
-                user_id: None,
-                role_mapping: None,
-                claim_mapping: None,
-            },
+            access_tokens: TokenEntityMetadata::default(),
+            id_tokens: TokenEntityMetadata::default(),
+            userinfo_tokens: TokenEntityMetadata::default(),
+            tx_tokens: TokenEntityMetadata::default(),
         };
 
         assert_eq!(