diff --git a/irs-cucumber-tests/src/test/resources/expected-files/TRI-2035-expected-tombstones.json b/irs-cucumber-tests/src/test/resources/expected-files/TRI-2035-expected-tombstones.json
index 3d1bdc45f..4d501f3f0 100644
--- a/irs-cucumber-tests/src/test/resources/expected-files/TRI-2035-expected-tombstones.json
+++ b/irs-cucumber-tests/src/test/resources/expected-files/TRI-2035-expected-tombstones.json
@@ -2,8 +2,8 @@
   "tombstones": [
     {
       "catenaXId": "urn:uuid:aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee",
-      "endpointURL": null,
-      "businessPartnerNumber": null,
+      "endpointURL": "http://umbrella-dataprovider-edc-controlplane:8084",
+      "businessPartnerNumber": "BPNL00000003AYRE",
       "processingError": {
         "processStep": "DigitalTwinRequest",
         "errorDetail": "Unable to find any of the requested shells",
diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Tombstone.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Tombstone.java
index 7ca62db58..10fb2b17c 100644
--- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Tombstone.java
+++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Tombstone.java
@@ -30,6 +30,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.ToString;
 import lombok.extern.jackson.Jacksonized;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.eclipse.tractusx.irs.component.enums.NodeType;
@@ -41,6 +42,7 @@
 @Builder(toBuilder = true)
 @Jacksonized
 @Schema(description = "Tombstone with information about request failure")
+@ToString
 public class Tombstone {
 
     public static final int CATENA_X_ID_LENGTH = 45;