diff --git a/tap-agent/src/tap/receipt_checks_adapter.rs b/tap-agent/src/tap/receipt_checks_adapter.rs
index 1bd7026d..c4257ea1 100644
--- a/tap-agent/src/tap/receipt_checks_adapter.rs
+++ b/tap-agent/src/tap/receipt_checks_adapter.rs
@@ -72,7 +72,7 @@ impl ReceiptChecksAdapterTrait for ReceiptChecksAdapter {
         _receipt: &EIP712SignedMessage<Receipt>,
         _receipt_id: u64,
     ) -> Result<bool, Self::AdapterError> {
-        panic!("Not implemented.");
+        unimplemented!();
     }
 
     async fn is_valid_allocation_id(
diff --git a/tap-agent/src/tap/receipt_storage_adapter.rs b/tap-agent/src/tap/receipt_storage_adapter.rs
index 615aa54d..3586592c 100644
--- a/tap-agent/src/tap/receipt_storage_adapter.rs
+++ b/tap-agent/src/tap/receipt_storage_adapter.rs
@@ -91,7 +91,7 @@ impl ReceiptStorageAdapterTrait for ReceiptStorageAdapter {
 
     /// We don't need this method in TAP Agent.
     async fn store_receipt(&self, _receipt: ReceivedReceipt) -> Result<u64, Self::AdapterError> {
-        panic!("Not implemented");
+        unimplemented!();
     }
 
     async fn retrieve_receipts_in_timestamp_range<R: RangeBounds<u64> + Send>(
@@ -131,7 +131,7 @@ impl ReceiptStorageAdapterTrait for ReceiptStorageAdapter {
         _receipt_id: u64,
         _receipt: ReceivedReceipt,
     ) -> Result<(), Self::AdapterError> {
-        panic!("Not implemented");
+        unimplemented!();
     }
 
     async fn remove_receipts_in_timestamp_range<R: RangeBounds<u64> + Send>(
diff --git a/tap-agent/src/tap/sender_allocation_relationship.rs b/tap-agent/src/tap/sender_allocation_relationship.rs
index 01e41a88..b7e1a49d 100644
--- a/tap-agent/src/tap/sender_allocation_relationship.rs
+++ b/tap-agent/src/tap/sender_allocation_relationship.rs
@@ -438,7 +438,6 @@ mod tests {
             config: None,
             ethereum: config::Ethereum {
                 indexer_address: INDEXER.1,
-                ..Default::default()
             },
             tap: config::Tap {
                 rav_request_trigger_value: 100,
diff --git a/tap-agent/src/tap/sender_allocation_relationships_manager.rs b/tap-agent/src/tap/sender_allocation_relationships_manager.rs
index 9365666d..4e0e8f4a 100644
--- a/tap-agent/src/tap/sender_allocation_relationships_manager.rs
+++ b/tap-agent/src/tap/sender_allocation_relationships_manager.rs
@@ -326,7 +326,6 @@ mod tests {
             config: None,
             ethereum: config::Ethereum {
                 indexer_address: INDEXER.1,
-                ..Default::default()
             },
             tap: config::Tap {
                 rav_request_trigger_value: 100,