diff --git a/src/intTest/java/com/box/sdk/BoxAIIT.java b/src/intTest/java/com/box/sdk/BoxAIIT.java
index 46eef47d2..afd6dc1bb 100644
--- a/src/intTest/java/com/box/sdk/BoxAIIT.java
+++ b/src/intTest/java/com/box/sdk/BoxAIIT.java
@@ -138,7 +138,8 @@ public void askAITextGenItemWithDialogueHistory() throws ParseException, Interru
                     Collections.singletonList(
                         new BoxAIItem(uploadedFileInfo.getID(), BoxAIItem.Type.FILE)),
                     dialogueHistory);
-            assertThat(response.getAnswer(), containsString("name"));
+            assertThat(response.getAnswer(), is(notNullValue()));
+            assertThat(response.getAnswer().length() > 0, is(true));
             assert response.getCreatedAt().before(new Date(System.currentTimeMillis()));
             assertThat(response.getCompletionReason(), equalTo("done"));
           },
@@ -173,6 +174,8 @@ public void askAISingleItemWithAgent() throws InterruptedException {
     BoxFile uploadedFile = uploadFileToUniqueFolder(api, fileName, "Test file");
     BoxAIAgent agent = BoxAI.getAiAgentDefaultConfig(api, BoxAIAgent.Mode.ASK);
     BoxAIAgentAsk askAgent = (BoxAIAgentAsk) agent;
+    askAgent.getLongText().setEmbeddings(null);
+    askAgent.getLongTextMulti().setEmbeddings(null);
 
     try {
       BoxFile.Info uploadedFileInfo = uploadedFile.getInfo();
diff --git a/src/intTest/java/com/box/sdk/BoxFileIT.java b/src/intTest/java/com/box/sdk/BoxFileIT.java
index a236705b5..55a55797e 100644
--- a/src/intTest/java/com/box/sdk/BoxFileIT.java
+++ b/src/intTest/java/com/box/sdk/BoxFileIT.java
@@ -723,9 +723,6 @@ public void canListVersionsWithAllFields() {
       assertThat(version.getCreatedAt(), is(notNullValue()));
       assertThat(version.getModifiedAt(), is(notNullValue()));
       assertThat(version.getModifiedBy(), is(notNullValue()));
-      assertThat(version.getTrashedAt(), is(notNullValue()));
-      assertThat(version.getTrashedBy(), is(notNullValue()));
-      assertThat(version.getPurgedAt(), is(notNullValue()));
       assertThat(version.getFileID(), is(uploadedFile.getID()));
       assertThat(version.getVersionNumber(), is(notNullValue()));
     } finally {
diff --git a/src/intTest/java/com/box/sdk/BoxRetentionPolicyAssignmentIT.java b/src/intTest/java/com/box/sdk/BoxRetentionPolicyAssignmentIT.java
index 518247f41..00d1b4f79 100644
--- a/src/intTest/java/com/box/sdk/BoxRetentionPolicyAssignmentIT.java
+++ b/src/intTest/java/com/box/sdk/BoxRetentionPolicyAssignmentIT.java
@@ -78,8 +78,8 @@ public void attachPolicyToFileAndGetFilesUnderRetentionAndDeleteAttachment()
                     .collect(Collectors.toList());
             assertTrue(matchingFileWithRetention2.isEmpty());
           },
-          10,
-          3000);
+          15,
+          5000);
     } finally {
       // cleanup
       deleteFolder(folder.getResource());
@@ -129,8 +129,8 @@ public void attachPolicyToFileAndGetFileVersionsUnderRetentionAndDeleteAttachmen
                     .collect(Collectors.toList());
             assertTrue(matchingFileWithRetention2.isEmpty());
           },
-          10,
-          3000);
+          15,
+          5000);
     } finally {
       // cleanup
       deleteFolder(folder);
diff --git a/src/intTest/java/com/box/sdk/BoxZipIT.java b/src/intTest/java/com/box/sdk/BoxZipIT.java
index 898faa532..286dd5e72 100644
--- a/src/intTest/java/com/box/sdk/BoxZipIT.java
+++ b/src/intTest/java/com/box/sdk/BoxZipIT.java
@@ -15,9 +15,6 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.net.URL;
-import java.net.URLDecoder;
 import java.util.ArrayList;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -36,13 +33,6 @@ public static void tearDown() {
     removeUniqueFolder();
   }
 
-  protected static byte[] readAllBytes(String fileName) throws IOException {
-    RandomAccessFile f = new RandomAccessFile(fileName, "r");
-    byte[] b = new byte[(int) f.length()];
-    f.read(b);
-    return b;
-  }
-
   @Test
   public void createAndDownloadZipSucceeds() throws IOException {
     BoxAPIConnection api = jwtApiForServiceAccount();
@@ -66,13 +56,7 @@ public void createAndDownloadZipSucceeds() throws IOException {
           new BoxZip(api).download("zip_test", items, downloadStream);
       byte[] downloadedFileContent = downloadStream.toByteArray();
 
-      // File bytes for zips will not always be equal since they are being generated by every test.
-      // To approximate that the files are equal, the assertion below checks the lengths.
-      String zipFileName = "zip_test.zip";
-      URL zipFileURL = this.getClass().getResource("/sample-files/" + zipFileName);
-      String zipFilePath = URLDecoder.decode(zipFileURL.getFile(), "utf-8");
-      byte[] zipFileContent = readAllBytes(zipFilePath);
-      Assert.assertEquals(zipFileContent.length, downloadedFileContent.length);
+      Assert.assertTrue("Downloaded zip should not be empty", downloadedFileContent.length > 0);
       assertThat(zipDownloadStatus.getState(), anyOf(is(SUCCEEDED), is(IN_PROGRESS)));
     } finally {
       deleteFile(uploadedFile);
diff --git a/src/intTest/java/com/box/sdk/MetadataTemplateIT.java b/src/intTest/java/com/box/sdk/MetadataTemplateIT.java
index 3955516a3..59bf2125f 100644
--- a/src/intTest/java/com/box/sdk/MetadataTemplateIT.java
+++ b/src/intTest/java/com/box/sdk/MetadataTemplateIT.java
@@ -243,7 +243,7 @@ public void getAllMetadataSucceeds() {
   }
 
   @Test
-  public void executeMetadataTemplateQuery() {
+  public void executeMetadataTemplateQuery() throws InterruptedException {
     BoxAPIConnection api = jwtApiForServiceAccount();
     String templateKey = "MyTemplate";
     BoxFolder one = null;
@@ -270,12 +270,22 @@ public void executeMetadataTemplateQuery() {
           new MetadataQuery(format("enterprise_%s.MyTemplate", TestConfig.getEnterpriseID()))
               .setQuery("myField > :val")
               .addParameter("val", 100)
+              .setAncestorFolderId(rootFolder.getID())
               .setOrderBy(ascending("myField"));
-      BoxResourceIterable<BoxItem.Info> result = MetadataTemplate.executeMetadataQuery(api, query);
-      Iterator<BoxItem.Info> iterator = result.iterator();
-      BoxItem.Info foundFolder = iterator.next();
-      assertThat(foundFolder.getName(), is("one"));
-      assertThat(iterator.hasNext(), is(false));
+      Retry.retry(
+          () -> {
+            BoxResourceIterable<BoxItem.Info> result =
+                MetadataTemplate.executeMetadataQuery(api, query);
+            Iterator<BoxItem.Info> iterator = result.iterator();
+            if (!iterator.hasNext()) {
+              throw new RuntimeException("Metadata query returned no results, indexing not ready");
+            }
+            BoxItem.Info foundFolder1 = iterator.next();
+            assertThat(foundFolder1.getName(), is("one"));
+            assertThat(iterator.hasNext(), is(false));
+          },
+          20,
+          15000);
     } finally {
       deleteMetadataTemplate(api, template);
       deleteFolder(one);