diff --git a/plugin/build.gradle b/plugin/build.gradle
index c2cf65b258..1b1a52b274 100644
--- a/plugin/build.gradle
+++ b/plugin/build.gradle
@@ -199,6 +199,13 @@ def _numNodes = findProperty('numNodes') as Integer ?: 1
 test {
     include '**/*Tests.class'
     systemProperty 'tests.security.manager', 'false'
+    // In FIPS mode, bc-fips is excluded from the plugin bundle to avoid jar hell with OpenSearch core.
+    // Unit tests don't run inside OpenSearch, so we add bc-fips directly to the test classpath.
+    if (FipsBuildParams.isInFipsMode()) {
+        classpath += configurations.detachedConfiguration(
+            dependencies.create("org.bouncycastle:bc-fips:2.1.2")
+        )
+    }
 }
 
 def opensearch_tmp_dir = rootProject.file('build/private/opensearch_tmp').absoluteFile
diff --git a/plugin/src/test/java/org/opensearch/ml/rest/RestMLInferenceSearchRequestProcessorIT.java b/plugin/src/test/java/org/opensearch/ml/rest/RestMLInferenceSearchRequestProcessorIT.java
index 98fe2b0bf7..03c59b9da4 100644
--- a/plugin/src/test/java/org/opensearch/ml/rest/RestMLInferenceSearchRequestProcessorIT.java
+++ b/plugin/src/test/java/org/opensearch/ml/rest/RestMLInferenceSearchRequestProcessorIT.java
@@ -101,9 +101,7 @@ public class RestMLInferenceSearchRequestProcessorIT extends MLCommonsRestTestCa
         + "        \"content-type\": \"application/json\",\n"
         + "        \"x-amz-content-sha256\": \"required\"\n"
         + "      },\n"
-        + "      \"request_body\": \"{ \\\"inputText\\\": \\\"${parameters.input}\\\" }\",\n"
-        + "      \"pre_process_function\": \"connector.pre_process.bedrock.embedding\",\n"
-        + "      \"post_process_function\": \"connector.post_process.bedrock.embedding\"\n"
+        + "      \"request_body\": \"{ \\\"inputText\\\": \\\"${parameters.input}\\\" }\"\n"
         + "    }\n"
         + "  ]\n"
         + "}";
@@ -343,7 +341,7 @@ public void testMLInferenceProcessorRemoteModelRewriteQueryType() throws Excepti
             + "            \"model_id\": \""
             + this.bedrockEmbeddingModelId
             + "\",\n"
-            + "        \"query_template\": \"{\\\"query\\\":{\\\"range\\\":{\\\"diary_embedding_size\\\":{\\\"lte\\\":${modelPrediction}}}}}\",\n"
+            + "        \"query_template\": \"{\\\"query\\\":{\\\"range\\\":{\\\"diary_embedding_size_int\\\":{\\\"lte\\\":${modelPrediction}}}}}\",\n"
             + "        \"input_map\": [\n"
             + "          {\n"
             + "            \"input\": \"query.term.diary_embedding_size.value\"\n"
diff --git a/plugin/src/test/java/org/opensearch/ml/rest/RestMLRAGSearchProcessorIT.java b/plugin/src/test/java/org/opensearch/ml/rest/RestMLRAGSearchProcessorIT.java
index 2be0cd495f..8678d2ce53 100644
--- a/plugin/src/test/java/org/opensearch/ml/rest/RestMLRAGSearchProcessorIT.java
+++ b/plugin/src/test/java/org/opensearch/ml/rest/RestMLRAGSearchProcessorIT.java
@@ -332,7 +332,7 @@ public class RestMLRAGSearchProcessorIT extends MLCommonsRestTestCase {
         + "\"\n"
         + "    },\n"
         + "    \"parameters\": {\n"
-        + "        \"model\": \"command-a-03-2025\"\n"
+        + "        \"model\": \"command-r-08-2024\"\n"
         + "    },\n"
         + "    \"actions\": [\n"
         + "        {\n"