diff --git a/tests/default/flow_framework/deprovision.yaml b/tests/default/flow_framework/deprovision.yaml
index 43babeeb..dada6f1f 100644
--- a/tests/default/flow_framework/deprovision.yaml
+++ b/tests/default/flow_framework/deprovision.yaml
@@ -25,16 +25,6 @@ epilogues:
     parameters:
       workflow_id: ${create_flow_framework.test_workflow_id}
 chapters:
-  - synopsis: Check the provision status before calling the deprovision API.
-    path: /_plugins/_flow_framework/workflow/{workflow_id}/_status
-    method: GET
-    parameters:
-      workflow_id: ${create_flow_framework.test_workflow_id}
-    response:
-      status: 200
-      payload:
-        workflow_id: ${create_flow_framework.test_workflow_id}
-        state: PROVISIONING
   - synopsis: Deprovision workflow.
     path: /_plugins/_flow_framework/workflow/{workflow_id}/_deprovision
     method: POST
@@ -42,16 +32,6 @@ chapters:
       workflow_id: ${create_flow_framework.test_workflow_id}
     response:
       status: 200
-  - synopsis: Check the provision status after calling the deprovision API.
-    path: /_plugins/_flow_framework/workflow/{workflow_id}/_status
-    method: GET
-    parameters:
-      workflow_id: ${create_flow_framework.test_workflow_id}
-    response:
-      status: 200
-      payload:
-        workflow_id: ${create_flow_framework.test_workflow_id}
-        state: NOT_STARTED
   - synopsis: Deprovision workflow using an invalid ID.
     path: /_plugins/_flow_framework/workflow/{workflow_id}/_deprovision
     method: POST
diff --git a/tests/default/flow_framework/provision.yaml b/tests/default/flow_framework/provision.yaml
index 2d52e83e..fb1e41a0 100644
--- a/tests/default/flow_framework/provision.yaml
+++ b/tests/default/flow_framework/provision.yaml
@@ -23,16 +23,6 @@ epilogues:
     parameters:
       workflow_id: ${create_flow_framework.test_workflow_id}
 chapters:
-  - synopsis: Check the status before calling provision API.
-    path: /_plugins/_flow_framework/workflow/{workflow_id}/_status
-    method: GET
-    parameters:
-      workflow_id: ${create_flow_framework.test_workflow_id}
-    response:
-      status: 200
-      payload:
-        workflow_id: ${create_flow_framework.test_workflow_id}
-        state: NOT_STARTED
   - synopsis: Provision workflow.
     path: /_plugins/_flow_framework/workflow/{workflow_id}/_provision
     method: POST
@@ -42,14 +32,4 @@ chapters:
       payload:
         openai_key: '1234556'
     response:
-      status: 200
-  - synopsis: Check the provision status after calling provision API.
-    path: /_plugins/_flow_framework/workflow/{workflow_id}/_status
-    method: GET
-    parameters:
-      workflow_id: ${create_flow_framework.test_workflow_id}
-    response:
-      status: 200
-      payload:
-        workflow_id: ${create_flow_framework.test_workflow_id}
-        state: PROVISIONING
\ No newline at end of file
+      status: 200
\ No newline at end of file
diff --git a/tests/default/flow_framework/sample_templates_test/deploy_openai_model.yaml b/tests/default/flow_framework/template.yaml
similarity index 87%
rename from tests/default/flow_framework/sample_templates_test/deploy_openai_model.yaml
rename to tests/default/flow_framework/template.yaml
index 71f75c34..76f8bd3f 100644
--- a/tests/default/flow_framework/sample_templates_test/deploy_openai_model.yaml
+++ b/tests/default/flow_framework/template.yaml
@@ -1,4 +1,4 @@
-$schema: ../../../../json_schemas/test_story.schema.yaml
+$schema: ../../../json_schemas/test_story.schema.yaml
 description: Test flow_framework endpoints using sample template.
 version: '>= 2.12'
 epilogues:
@@ -37,7 +37,7 @@ chapters:
                     model: gpt-3.5-turbo
                     response_filter: '$.choices[0].message.content'
                   credential:
-                    openAI_key: test_API_key
+                    openAI_key: '1234556'
                   actions:
                     - action_type: predict
                       method: POST
@@ -100,7 +100,7 @@ chapters:
               - id: create_openai_connector
                 type: create_connector
                 user_inputs:
-                  name: OpenAI Chat Connector update
+                  name: OpenAI Chat Connector
                   description: The connector to public OpenAI model service for GPT 3.5 update
                   version: '1'
                   protocol: http
@@ -109,7 +109,7 @@ chapters:
                     model: gpt-3.5-turbo
                     response_filter: '$.choices[0].message.content'
                   credential:
-                    openAI_key: test_API_key
+                    openAI_key: '1234556'
                   actions:
                     - action_type: predict
                       method: POST
@@ -126,15 +126,6 @@ chapters:
                   register_openai_model: model_id
     response:
       status: 201
-  - synopsis: Get workflow status and status should be not started.
-    path: /_plugins/_flow_framework/workflow/{workflow_id}/_status
-    method: GET
-    parameters:
-      workflow_id: ${create_flow_framework.test_workflow_id}
-    response:
-      status: 200
-      payload:
-        state: NOT_STARTED
   - synopsis: Provision workflow.
     path: /_plugins/_flow_framework/workflow/{workflow_id}/_provision
     method: POST
@@ -142,15 +133,6 @@ chapters:
       workflow_id: ${create_flow_framework.test_workflow_id}
     response:
       status: 200
-  - synopsis: Get workflow status and status should be provisioning.
-    path: /_plugins/_flow_framework/workflow/{workflow_id}/_status
-    method: GET
-    parameters:
-      workflow_id: ${create_flow_framework.test_workflow_id}
-    response:
-      status: 200
-      payload:
-        state: PROVISIONING
   - synopsis: Update workflow fail With provision and update_fields set true.
     path: /_plugins/_flow_framework/workflow/{workflow_id}
     method: PUT
@@ -252,13 +234,4 @@ chapters:
     parameters:
       workflow_id: ${create_flow_framework.test_workflow_id}
     response:
-      status: 200
-  - synopsis: Delete workflow using an invalid ID.
-    path: /_plugins/_flow_framework/workflow/{workflow_id}
-    method: DELETE
-    parameters:
-      workflow_id: invalid
-    response:
-      status: 200
-      payload:
-        result: not_found
\ No newline at end of file
+      status: 200
\ No newline at end of file
diff --git a/tests/default/flow_framework/workflow.yaml b/tests/default/flow_framework/workflow.yaml
index d136c804..4f50a012 100644
--- a/tests/default/flow_framework/workflow.yaml
+++ b/tests/default/flow_framework/workflow.yaml
@@ -118,16 +118,6 @@ chapters:
         name: test_update_work_flow
     response:
       status: 404
-  - synopsis: Search workflow state.
-    path: /_plugins/_flow_framework/workflow/state/_search
-    method: POST
-    request:
-      payload:
-        query:
-          match:
-            state: test
-    response:
-      status: 200
   - synopsis: Delete workflow.
     path: /_plugins/_flow_framework/workflow/{workflow_id}
     method: DELETE