diff --git a/assistant/src/test/java/com/ibm/watson/assistant/v1/AssistantServiceIT.java b/assistant/src/test/java/com/ibm/watson/assistant/v1/AssistantServiceIT.java
index a3332aced41..5d34f83dc61 100644
--- a/assistant/src/test/java/com/ibm/watson/assistant/v1/AssistantServiceIT.java
+++ b/assistant/src/test/java/com/ibm/watson/assistant/v1/AssistantServiceIT.java
@@ -23,60 +23,7 @@
 import com.ibm.cloud.sdk.core.security.BasicAuthenticator;
 import com.ibm.cloud.sdk.core.service.exception.ForbiddenException;
 import com.ibm.cloud.sdk.core.service.exception.NotFoundException;
-import com.ibm.watson.assistant.v1.model.Context;
-import com.ibm.watson.assistant.v1.model.Counterexample;
-import com.ibm.watson.assistant.v1.model.CounterexampleCollection;
-import com.ibm.watson.assistant.v1.model.CreateCounterexampleOptions;
-import com.ibm.watson.assistant.v1.model.CreateDialogNodeOptions;
-import com.ibm.watson.assistant.v1.model.CreateEntity;
-import com.ibm.watson.assistant.v1.model.CreateExampleOptions;
-import com.ibm.watson.assistant.v1.model.CreateIntent;
-import com.ibm.watson.assistant.v1.model.CreateIntentOptions;
-import com.ibm.watson.assistant.v1.model.CreateValue;
-import com.ibm.watson.assistant.v1.model.CreateWorkspaceOptions;
-import com.ibm.watson.assistant.v1.model.DeleteCounterexampleOptions;
-import com.ibm.watson.assistant.v1.model.DeleteDialogNodeOptions;
-import com.ibm.watson.assistant.v1.model.DeleteExampleOptions;
-import com.ibm.watson.assistant.v1.model.DeleteIntentOptions;
-import com.ibm.watson.assistant.v1.model.DeleteUserDataOptions;
-import com.ibm.watson.assistant.v1.model.DeleteWorkspaceOptions;
-import com.ibm.watson.assistant.v1.model.DialogNode;
-import com.ibm.watson.assistant.v1.model.DialogNodeCollection;
-import com.ibm.watson.assistant.v1.model.EntityMentionCollection;
-import com.ibm.watson.assistant.v1.model.Example;
-import com.ibm.watson.assistant.v1.model.ExampleCollection;
-import com.ibm.watson.assistant.v1.model.GetCounterexampleOptions;
-import com.ibm.watson.assistant.v1.model.GetDialogNodeOptions;
-import com.ibm.watson.assistant.v1.model.GetExampleOptions;
-import com.ibm.watson.assistant.v1.model.GetIntentOptions;
-import com.ibm.watson.assistant.v1.model.GetWorkspaceOptions;
-import com.ibm.watson.assistant.v1.model.Intent;
-import com.ibm.watson.assistant.v1.model.IntentCollection;
-import com.ibm.watson.assistant.v1.model.ListCounterexamplesOptions;
-import com.ibm.watson.assistant.v1.model.ListDialogNodesOptions;
-import com.ibm.watson.assistant.v1.model.ListExamplesOptions;
-import com.ibm.watson.assistant.v1.model.ListIntentsOptions;
-import com.ibm.watson.assistant.v1.model.ListLogsOptions;
-import com.ibm.watson.assistant.v1.model.ListMentionsOptions;
-import com.ibm.watson.assistant.v1.model.ListWorkspacesOptions;
-import com.ibm.watson.assistant.v1.model.Log;
-import com.ibm.watson.assistant.v1.model.LogCollection;
-import com.ibm.watson.assistant.v1.model.MessageInput;
-import com.ibm.watson.assistant.v1.model.MessageOptions;
-import com.ibm.watson.assistant.v1.model.MessageResponse;
-import com.ibm.watson.assistant.v1.model.RuntimeIntent;
-import com.ibm.watson.assistant.v1.model.UpdateCounterexampleOptions;
-import com.ibm.watson.assistant.v1.model.UpdateDialogNodeOptions;
-import com.ibm.watson.assistant.v1.model.UpdateExampleOptions;
-import com.ibm.watson.assistant.v1.model.UpdateIntentOptions;
-import com.ibm.watson.assistant.v1.model.UpdateWorkspaceOptions;
-import com.ibm.watson.assistant.v1.model.Webhook;
-import com.ibm.watson.assistant.v1.model.WebhookHeader;
-import com.ibm.watson.assistant.v1.model.Workspace;
-import com.ibm.watson.assistant.v1.model.WorkspaceCollection;
-import com.ibm.watson.assistant.v1.model.WorkspaceSystemSettings;
-import com.ibm.watson.assistant.v1.model.WorkspaceSystemSettingsDisambiguation;
-import com.ibm.watson.assistant.v1.model.WorkspaceSystemSettingsTooling;
+import com.ibm.watson.assistant.v1.model.*;
 import com.ibm.watson.common.RetryRunner;
 import io.reactivex.Single;
 import io.reactivex.functions.Consumer;
@@ -1823,7 +1770,7 @@ public void testDeleteUserData() {
   /** Test list mentions. */
   @Test
   public void testListMentions() {
-    String entity = "amenity";
+    String entity = "holiday";
 
     ListMentionsOptions listMentionsOptions =
         new ListMentionsOptions.Builder().workspaceId(workspaceId).entity(entity).build();
diff --git a/assistant/src/test/java/com/ibm/watson/assistant/v2/AssistantServiceIT.java b/assistant/src/test/java/com/ibm/watson/assistant/v2/AssistantServiceIT.java
index 203b5fae21c..16b02f35d0d 100644
--- a/assistant/src/test/java/com/ibm/watson/assistant/v2/AssistantServiceIT.java
+++ b/assistant/src/test/java/com/ibm/watson/assistant/v2/AssistantServiceIT.java
@@ -54,7 +54,7 @@ public void testSendMessages() {
     String sessionId = sessionResponse.getSessionId();
 
     final List<String> messages =
-        Arrays.asList("I want some pizza.", "I'd like 3 pizzas.", "Large");
+        Arrays.asList("Hello");
     MessageContext context = new MessageContext.Builder().build();
 
     try {
@@ -112,7 +112,7 @@ public void testSendMessageStateless() {
     String sessionId = sessionResponse.getSessionId();
 
     final List<String> messages =
-        Arrays.asList("I want some pizza.", "I'd like 3 pizzas.", "Large");
+        Arrays.asList("Hello");
     MessageContextStateless context = new MessageContextStateless.Builder().build();
 
     try {
diff --git a/common/src/test/resources/config.properties.enc b/common/src/test/resources/config.properties.enc
new file mode 100644
index 00000000000..39d39cdad3c
Binary files /dev/null and b/common/src/test/resources/config.properties.enc differ