diff --git a/libraries/bot-ai-qna/src/main/java/com/microsoft/bot/ai/qna/QnAMaker.java b/libraries/bot-ai-qna/src/main/java/com/microsoft/bot/ai/qna/QnAMaker.java
index 821cf0196..91a233d4e 100644
--- a/libraries/bot-ai-qna/src/main/java/com/microsoft/bot/ai/qna/QnAMaker.java
+++ b/libraries/bot-ai-qna/src/main/java/com/microsoft/bot/ai/qna/QnAMaker.java
@@ -33,7 +33,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.google.common.base.Strings;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.LoggerFactory;
 
@@ -91,15 +90,15 @@ public QnAMaker(
         }
         this.endpoint = withEndpoint;
 
-        if (Strings.isNullOrEmpty(this.endpoint.getKnowledgeBaseId())) {
+        if (StringUtils.isBlank(this.endpoint.getKnowledgeBaseId())) {
             throw new IllegalArgumentException("knowledgeBaseId");
         }
 
-        if (Strings.isNullOrEmpty(this.endpoint.getHost())) {
+        if (StringUtils.isBlank(this.endpoint.getHost())) {
             throw new IllegalArgumentException("host");
         }
 
-        if (Strings.isNullOrEmpty(this.endpoint.getEndpointKey())) {
+        if (StringUtils.isBlank(this.endpoint.getEndpointKey())) {
             throw new IllegalArgumentException("endpointKey");
         }
 
@@ -222,7 +221,7 @@ public CompletableFuture<QueryResults> getAnswersRaw(
             return Async.completeExceptionally(new IllegalArgumentException("Activity type is not a message"));
         }
 
-        if (Strings.isNullOrEmpty(turnContext.getActivity().getText())) {
+        if (StringUtils.isBlank(turnContext.getActivity().getText())) {
             return Async.completeExceptionally(new IllegalArgumentException("Null or empty text"));
         }
 
diff --git a/libraries/bot-ai-qna/src/main/java/com/microsoft/bot/ai/qna/models/FeedbackRecord.java b/libraries/bot-ai-qna/src/main/java/com/microsoft/bot/ai/qna/models/FeedbackRecord.java
index c58ef5f0e..f96c87729 100644
--- a/libraries/bot-ai-qna/src/main/java/com/microsoft/bot/ai/qna/models/FeedbackRecord.java
+++ b/libraries/bot-ai-qna/src/main/java/com/microsoft/bot/ai/qna/models/FeedbackRecord.java
@@ -19,7 +19,7 @@ public class FeedbackRecord {
     private Integer qnaId;
 
     /**
-     * Gets the feedback recod's user ID.
+     * Gets the feedback record's user ID.
      *
      * @return The user ID.
      */
@@ -28,7 +28,7 @@ public String getUserId() {
     }
 
     /**
-     * Sets the feedback recod's user ID.
+     * Sets the feedback record's user ID.
      *
      * @param withUserId The user ID.
      */
diff --git a/libraries/bot-ai-qna/src/main/java/com/microsoft/bot/ai/qna/utils/BindToActivity.java b/libraries/bot-ai-qna/src/main/java/com/microsoft/bot/ai/qna/utils/BindToActivity.java
index 0262ba9bf..d365cbc34 100644
--- a/libraries/bot-ai-qna/src/main/java/com/microsoft/bot/ai/qna/utils/BindToActivity.java
+++ b/libraries/bot-ai-qna/src/main/java/com/microsoft/bot/ai/qna/utils/BindToActivity.java
@@ -14,11 +14,11 @@
  * Class to bind activities.
  */
 public class BindToActivity {
-    private Activity activity;
+    private final Activity activity;
 
     /**
      * Construct to bind an Activity.
-     * 
+     *
      * @param withActivity activity to bind.
      */
     public BindToActivity(Activity withActivity) {
@@ -37,7 +37,7 @@ public CompletableFuture<Activity> bind(DialogContext context, @Nullable Object
 
     /**
      * Get the activity text.
-     * 
+     *
      * @return The activity text.
      */
     public String toString() {
diff --git a/libraries/bot-ai-qna/src/main/java/com/microsoft/bot/ai/qna/utils/HttpRequestUtils.java b/libraries/bot-ai-qna/src/main/java/com/microsoft/bot/ai/qna/utils/HttpRequestUtils.java
index b76a6d8cd..3ffd9e8a9 100644
--- a/libraries/bot-ai-qna/src/main/java/com/microsoft/bot/ai/qna/utils/HttpRequestUtils.java
+++ b/libraries/bot-ai-qna/src/main/java/com/microsoft/bot/ai/qna/utils/HttpRequestUtils.java
@@ -24,7 +24,7 @@
  * Helper for HTTP requests.
  */
 public class HttpRequestUtils {
-    private OkHttpClient httpClient = new OkHttpClient();
+    private final OkHttpClient httpClient = new OkHttpClient();
 
     /**
      * Execute Http request.
diff --git a/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/QnAMakerRecognizerTests.java b/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/QnAMakerRecognizerTests.java
index 3adb6ef60..f8e0526ea 100644
--- a/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/QnAMakerRecognizerTests.java
+++ b/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/QnAMakerRecognizerTests.java
@@ -219,7 +219,7 @@ public void returnAnswersWithIntents() {
 
     private String readFileContent (String fileName) throws IOException {
         String path = Paths.get("", "src", "test", "java", "com", "microsoft", "bot", "ai", "qna",
-            "testData", fileName).toAbsolutePath().toString();
+            "testdata", fileName).toAbsolutePath().toString();
         File file = new File(path);
         return FileUtils.readFileToString(file, "utf-8");
     }
diff --git a/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/QnAMakerTests.java b/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/QnAMakerTests.java
index 46298f17f..1dbc9eb9f 100644
--- a/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/QnAMakerTests.java
+++ b/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/QnAMakerTests.java
@@ -1109,7 +1109,7 @@ public void qnaMakerTestOptionsHydration() {
 
             QnAMakerOptions allChangedRequestOptions = new QnAMakerOptions();
             allChangedRequestOptions.setTop(2000);
-            allChangedRequestOptions.setScoreThreshold(0.4f);
+            allChangedRequestOptions.setScoreThreshold(0.42f);
             allChangedRequestOptions.setStrictFilters(allChangedRequestOptionsFilters);
 
             QnAMaker qna = new QnAMaker(qnAMakerEndpoint, noFiltersOptions);
diff --git a/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testData/QnaMaker_IsTest_True.json b/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testdata/QnaMaker_IsTest_True.json
similarity index 100%
rename from libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testData/QnaMaker_IsTest_True.json
rename to libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testdata/QnaMaker_IsTest_True.json
diff --git a/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testData/QnaMaker_LegacyEndpointAnswer.json b/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testdata/QnaMaker_LegacyEndpointAnswer.json
similarity index 100%
rename from libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testData/QnaMaker_LegacyEndpointAnswer.json
rename to libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testdata/QnaMaker_LegacyEndpointAnswer.json
diff --git a/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testData/QnaMaker_RankerType_QuestionOnly.json b/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testdata/QnaMaker_RankerType_QuestionOnly.json
similarity index 100%
rename from libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testData/QnaMaker_RankerType_QuestionOnly.json
rename to libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testdata/QnaMaker_RankerType_QuestionOnly.json
diff --git a/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testData/QnaMaker_ReturnAnswer_MultiTurnLevel1.json b/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testdata/QnaMaker_ReturnAnswer_MultiTurnLevel1.json
similarity index 100%
rename from libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testData/QnaMaker_ReturnAnswer_MultiTurnLevel1.json
rename to libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testdata/QnaMaker_ReturnAnswer_MultiTurnLevel1.json
diff --git a/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testData/QnaMaker_ReturnAnswer_withPrompts.json b/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testdata/QnaMaker_ReturnAnswer_withPrompts.json
similarity index 100%
rename from libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testData/QnaMaker_ReturnAnswer_withPrompts.json
rename to libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testdata/QnaMaker_ReturnAnswer_withPrompts.json
diff --git a/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testData/QnaMaker_ReturnsAnswer.json b/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testdata/QnaMaker_ReturnsAnswer.json
similarity index 100%
rename from libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testData/QnaMaker_ReturnsAnswer.json
rename to libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testdata/QnaMaker_ReturnsAnswer.json
diff --git a/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testData/QnaMaker_ReturnsAnswerWithContext.json b/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testdata/QnaMaker_ReturnsAnswerWithContext.json
similarity index 100%
rename from libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testData/QnaMaker_ReturnsAnswerWithContext.json
rename to libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testdata/QnaMaker_ReturnsAnswerWithContext.json
diff --git a/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testData/QnaMaker_ReturnsAnswerWithIntent.json b/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testdata/QnaMaker_ReturnsAnswerWithIntent.json
similarity index 100%
rename from libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testData/QnaMaker_ReturnsAnswerWithIntent.json
rename to libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testdata/QnaMaker_ReturnsAnswerWithIntent.json
diff --git a/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testData/QnaMaker_ReturnsAnswerWithoutContext.json b/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testdata/QnaMaker_ReturnsAnswerWithoutContext.json
similarity index 100%
rename from libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testData/QnaMaker_ReturnsAnswerWithoutContext.json
rename to libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testdata/QnaMaker_ReturnsAnswerWithoutContext.json
diff --git a/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testData/QnaMaker_ReturnsAnswer_GivenScoreThresholdQueryOption.json b/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testdata/QnaMaker_ReturnsAnswer_GivenScoreThresholdQueryOption.json
similarity index 100%
rename from libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testData/QnaMaker_ReturnsAnswer_GivenScoreThresholdQueryOption.json
rename to libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testdata/QnaMaker_ReturnsAnswer_GivenScoreThresholdQueryOption.json
diff --git a/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testData/QnaMaker_ReturnsAnswer_WhenNoAnswerFoundInKb.json b/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testdata/QnaMaker_ReturnsAnswer_WhenNoAnswerFoundInKb.json
similarity index 100%
rename from libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testData/QnaMaker_ReturnsAnswer_WhenNoAnswerFoundInKb.json
rename to libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testdata/QnaMaker_ReturnsAnswer_WhenNoAnswerFoundInKb.json
diff --git a/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testData/QnaMaker_ReturnsAnswersWithMetadataBoost.json b/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testdata/QnaMaker_ReturnsAnswersWithMetadataBoost.json
similarity index 100%
rename from libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testData/QnaMaker_ReturnsAnswersWithMetadataBoost.json
rename to libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testdata/QnaMaker_ReturnsAnswersWithMetadataBoost.json
diff --git a/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testData/QnaMaker_ReturnsNoAnswer.json b/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testdata/QnaMaker_ReturnsNoAnswer.json
similarity index 100%
rename from libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testData/QnaMaker_ReturnsNoAnswer.json
rename to libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testdata/QnaMaker_ReturnsNoAnswer.json
diff --git a/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testData/QnaMaker_TestThreshold.json b/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testdata/QnaMaker_TestThreshold.json
similarity index 100%
rename from libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testData/QnaMaker_TestThreshold.json
rename to libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testdata/QnaMaker_TestThreshold.json
diff --git a/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testData/QnaMaker_TopNAnswer.json b/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testdata/QnaMaker_TopNAnswer.json
similarity index 100%
rename from libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testData/QnaMaker_TopNAnswer.json
rename to libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testdata/QnaMaker_TopNAnswer.json
diff --git a/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testData/QnaMaker_TopNAnswer_DisableActiveLearning.json b/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testdata/QnaMaker_TopNAnswer_DisableActiveLearning.json
similarity index 100%
rename from libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testData/QnaMaker_TopNAnswer_DisableActiveLearning.json
rename to libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testdata/QnaMaker_TopNAnswer_DisableActiveLearning.json
diff --git a/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testData/QnaMaker_UsesStrictFilters_ToReturnAnswer.json b/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testdata/QnaMaker_UsesStrictFilters_ToReturnAnswer.json
similarity index 100%
rename from libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testData/QnaMaker_UsesStrictFilters_ToReturnAnswer.json
rename to libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testdata/QnaMaker_UsesStrictFilters_ToReturnAnswer.json
diff --git a/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testData/qnamaker.settings.development.westus.json b/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testdata/qnamaker.settings.development.westus.json
similarity index 100%
rename from libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testData/qnamaker.settings.development.westus.json
rename to libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/testdata/qnamaker.settings.development.westus.json