diff --git a/src/main/java/org/opensearch/flowframework/workflow/WorkflowStepFactory.java b/src/main/java/org/opensearch/flowframework/workflow/WorkflowStepFactory.java
index 8d3f12c33..839b8e9b8 100644
--- a/src/main/java/org/opensearch/flowframework/workflow/WorkflowStepFactory.java
+++ b/src/main/java/org/opensearch/flowframework/workflow/WorkflowStepFactory.java
@@ -10,7 +10,6 @@
 
 import org.opensearch.client.Client;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.settings.Settings;
 import org.opensearch.core.rest.RestStatus;
 import org.opensearch.flowframework.common.FlowFrameworkSettings;
 import org.opensearch.flowframework.exception.FlowFrameworkException;
diff --git a/src/test/java/org/opensearch/flowframework/common/FlowFrameworkSettingsTests.java b/src/test/java/org/opensearch/flowframework/common/FlowFrameworkSettingsTests.java
index ac82eaec8..6b7b3ba65 100644
--- a/src/test/java/org/opensearch/flowframework/common/FlowFrameworkSettingsTests.java
+++ b/src/test/java/org/opensearch/flowframework/common/FlowFrameworkSettingsTests.java
@@ -1,3 +1,11 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
 package org.opensearch.flowframework.common;
 
 import org.opensearch.cluster.service.ClusterService;
@@ -28,8 +36,8 @@ public void setUp() throws Exception {
 
         settings = Settings.builder().build();
         final Set<Setting<?>> settingsSet = Stream.concat(
-                ClusterSettings.BUILT_IN_CLUSTER_SETTINGS.stream(),
-                Stream.of(FlowFrameworkSettings.FLOW_FRAMEWORK_ENABLED, FlowFrameworkSettings.MAX_GET_TASK_REQUEST_RETRY)
+            ClusterSettings.BUILT_IN_CLUSTER_SETTINGS.stream(),
+            Stream.of(FlowFrameworkSettings.FLOW_FRAMEWORK_ENABLED, FlowFrameworkSettings.MAX_GET_TASK_REQUEST_RETRY)
         ).collect(Collectors.toSet());
         clusterSettings = new ClusterSettings(settings, settingsSet);
         clusterService = mock(ClusterService.class);
diff --git a/src/test/java/org/opensearch/flowframework/model/WorkflowValidatorTests.java b/src/test/java/org/opensearch/flowframework/model/WorkflowValidatorTests.java
index 533f0875a..de5ae440b 100644
--- a/src/test/java/org/opensearch/flowframework/model/WorkflowValidatorTests.java
+++ b/src/test/java/org/opensearch/flowframework/model/WorkflowValidatorTests.java
@@ -51,7 +51,6 @@ public void setUp() throws Exception {
         invalidWorkflowStepJson =
             "{\"workflow_step_1\":{\"bad_field\":[\"input_1\",\"input_2\"],\"outputs\":[\"output_1\"]},\"workflow_step_2\":{\"inputs\":[\"input_1\",\"input_2\",\"input_3\"],\"outputs\":[\"output_1\",\"output_2\",\"output_3\"]}}";
 
-
         flowFrameworkSettings = mock(FlowFrameworkSettings.class);
         when(flowFrameworkSettings.isFlowFrameworkEnabled()).thenReturn(true);
     }
@@ -101,7 +100,7 @@ public void testWorkflowStepFactoryHasValidators() throws IOException {
             client,
             mlClient,
             flowFrameworkIndicesHandler,
-                flowFrameworkSettings
+            flowFrameworkSettings
         );
 
         // Read in workflow-steps.json
diff --git a/src/test/java/org/opensearch/flowframework/workflow/DeployModelStepTests.java b/src/test/java/org/opensearch/flowframework/workflow/DeployModelStepTests.java
index 5869407ae..bc174a849 100644
--- a/src/test/java/org/opensearch/flowframework/workflow/DeployModelStepTests.java
+++ b/src/test/java/org/opensearch/flowframework/workflow/DeployModelStepTests.java
@@ -95,6 +95,7 @@ public void setUp() throws Exception {
 
         flowFrameworkSettings = mock(FlowFrameworkSettings.class);
         when(flowFrameworkSettings.isFlowFrameworkEnabled()).thenReturn(true);
+        when(flowFrameworkSettings.getMaxRetry()).thenReturn(5);
 
         testThreadPool = new TestThreadPool(
             DeployModelStepTests.class.getName(),
diff --git a/src/test/java/org/opensearch/flowframework/workflow/RegisterLocalModelStepTests.java b/src/test/java/org/opensearch/flowframework/workflow/RegisterLocalModelStepTests.java
index e25a98c3c..4c80d8f3a 100644
--- a/src/test/java/org/opensearch/flowframework/workflow/RegisterLocalModelStepTests.java
+++ b/src/test/java/org/opensearch/flowframework/workflow/RegisterLocalModelStepTests.java
@@ -90,6 +90,7 @@ public void setUp() throws Exception {
 
         flowFrameworkSettings = mock(FlowFrameworkSettings.class);
         when(flowFrameworkSettings.isFlowFrameworkEnabled()).thenReturn(true);
+        when(flowFrameworkSettings.getMaxRetry()).thenReturn(5);
 
         testThreadPool = new TestThreadPool(
             RegisterLocalModelStepTests.class.getName(),
diff --git a/src/test/java/org/opensearch/flowframework/workflow/WorkflowProcessSorterTests.java b/src/test/java/org/opensearch/flowframework/workflow/WorkflowProcessSorterTests.java
index 1c34e66be..5c3ff6e43 100644
--- a/src/test/java/org/opensearch/flowframework/workflow/WorkflowProcessSorterTests.java
+++ b/src/test/java/org/opensearch/flowframework/workflow/WorkflowProcessSorterTests.java
@@ -137,7 +137,7 @@ public static void setup() throws IOException {
             client,
             mlClient,
             flowFrameworkIndicesHandler,
-                flowFrameworkSettings
+            flowFrameworkSettings
         );
         workflowProcessSorter = new WorkflowProcessSorter(factory, testThreadPool, clusterService, client, settings);
         validator = WorkflowValidator.parse("mappings/workflow-steps.json");