diff --git a/src/test/java/com/intercom/api/integration/ContactsTest.java b/src/test/java/com/intercom/api/integration/ContactsTest.java
index e112835..02fe924 100644
--- a/src/test/java/com/intercom/api/integration/ContactsTest.java
+++ b/src/test/java/com/intercom/api/integration/ContactsTest.java
@@ -64,7 +64,7 @@ public void before() {
                         .externalId(Utils.randomString())
                         .phone("+353871234567")
                         .build()));
-        contactId = contact.getId().orElseThrow(() -> new RuntimeException("Contact ID is required"));
+        contactId = contact.getId();
 
         // act
         company = client.companies()
@@ -151,8 +151,7 @@ public void testCreateLead() {
         try {
             client.contacts()
                     .delete(DeleteContactRequest.builder()
-                            .contactId(
-                                    response.getId().orElseThrow(() -> new RuntimeException("Contact ID is required")))
+                            .contactId(response.getId())
                             .build());
         } catch (Exception e) {
             throw new RuntimeException("Failed to delete contact.", e);
@@ -218,7 +217,7 @@ public void testDelete() {
                         .role("lead")
                         .name("Roman Bowling")
                         .build()));
-        String createdId = created.getId().orElseThrow(() -> new RuntimeException("Contact ID is required"));
+        String createdId = created.getId();
         ContactDeleted response = client.contacts()
                 .delete(DeleteContactRequest.builder().contactId(createdId).build());
 
@@ -234,7 +233,7 @@ public void testMergeLeadInUser() {
                         .role("lead")
                         .name("Roman Bowling")
                         .build()));
-        String leadId = lead.getId().orElseThrow(() -> new RuntimeException("Lead ID is required"));
+        String leadId = lead.getId();
         ContactsMergeLeadInUserResponse response = client.contacts()
                 .mergeLeadInUser(MergeContactsRequest.builder()
                         .leadId(leadId)
diff --git a/src/test/java/com/intercom/api/integration/ConversationsTest.java b/src/test/java/com/intercom/api/integration/ConversationsTest.java
index 61b7496..a3e6f9f 100644
--- a/src/test/java/com/intercom/api/integration/ConversationsTest.java
+++ b/src/test/java/com/intercom/api/integration/ConversationsTest.java
@@ -86,19 +86,19 @@ public void before() {
                         .externalId(Utils.randomString())
                         .name("Baba Booey")
                         .build()));
-        userId = user.getId().orElseThrow(() -> new RuntimeException("User ID is required"));
+        userId = user.getId();
         secondUser = client.contacts()
                 .create(CreateContactRequest.of(CreateContactRequest.WithExternalId.builder()
                         .externalId(Utils.randomString())
                         .name("Babusha Boy")
                         .build()));
-        secondUserId = secondUser.getId().orElseThrow(() -> new RuntimeException("Second user ID is required"));
+        secondUserId = secondUser.getId();
         lead = client.contacts()
                 .create(CreateContactRequest.of(CreateContactRequest.WithExternalId.builder()
                         .externalId(Utils.randomString())
                         .name("Babushka Lead")
                         .build()));
-        leadId = lead.getId().orElseThrow(() -> new RuntimeException("Lead ID is required"));
+        leadId = lead.getId();
 
         Message conversationMessage = client.conversations()
                 .create(CreateConversationRequest.builder()
@@ -120,14 +120,12 @@ public void before() {
             after();
         }
 
-        String msgConversationId = conversationMessage
-                .getConversationId()
-                .orElseThrow(() -> new RuntimeException("Conversation ID is required"));
+        String msgConversationId = conversationMessage.getConversationId();
         conversation = client.conversations()
                 .find(FindConversationRequest.builder()
                         .conversationId(msgConversationId)
                         .build());
-        conversationId = conversation.getId().orElseThrow(() -> new RuntimeException("Conversation ID is required"));
+        conversationId = conversation.getId();
     }
 
     @AfterEach
diff --git a/src/test/java/com/intercom/api/integration/NotesTest.java b/src/test/java/com/intercom/api/integration/NotesTest.java
index 380ef5b..22121e5 100644
--- a/src/test/java/com/intercom/api/integration/NotesTest.java
+++ b/src/test/java/com/intercom/api/integration/NotesTest.java
@@ -43,7 +43,7 @@ public void before() {
                 .create(CreateContactRequest.of(CreateContactRequest.WithExternalId.builder()
                         .externalId(Utils.randomString())
                         .build()));
-        contactId = contact.getId().orElseThrow(() -> new RuntimeException("Contact ID is required"));
+        contactId = contact.getId();
 
         note = client.notes()
                 .create(CreateContactNoteRequest.builder()
@@ -51,7 +51,7 @@ public void before() {
                         .body(Utils.randomString())
                         .adminId(adminId)
                         .build());
-        noteId = Integer.parseInt(note.getId().orElseThrow(() -> new RuntimeException("Note ID is required")));
+        noteId = Integer.parseInt(note.getId());
     }
 
     @AfterEach
diff --git a/src/test/java/com/intercom/api/integration/TagsTest.java b/src/test/java/com/intercom/api/integration/TagsTest.java
index 35df891..80bda65 100644
--- a/src/test/java/com/intercom/api/integration/TagsTest.java
+++ b/src/test/java/com/intercom/api/integration/TagsTest.java
@@ -121,7 +121,7 @@ public void testTagContact() {
                 .create(CreateContactRequest.of(CreateContactRequest.WithExternalId.builder()
                         .externalId(Utils.randomString())
                         .build()));
-        String contactId = contact.getId().orElseThrow(() -> new RuntimeException("Contact ID is required"));
+        String contactId = contact.getId();
 
         // act
         Tag response = client.tags()
@@ -204,7 +204,7 @@ public void testTagConversation() {
                         .externalId(Utils.randomString())
                         .name("John Smith")
                         .build()));
-        String contactId = contact.getId().orElseThrow(() -> new RuntimeException("Contact ID is required"));
+        String contactId = contact.getId();
 
         Message conversationMessage = client.conversations()
                 .create(CreateConversationRequest.builder()
@@ -228,12 +228,9 @@ public void testTagConversation() {
 
         Conversation conversation = client.conversations()
                 .find(FindConversationRequest.builder()
-                        .conversationId(conversationMessage
-                                .getConversationId()
-                                .orElseThrow(() -> new RuntimeException("Conversation ID is required")))
+                        .conversationId(conversationMessage.getConversationId())
                         .build());
-        String conversationId =
-                conversation.getId().orElseThrow(() -> new RuntimeException("Conversation ID is required"));
+        String conversationId = conversation.getId();
 
         // act
         Tag response = client.tags()