diff --git a/src/containers/Flow/Flow.test.tsx b/src/containers/Flow/Flow.test.tsx
index 4ab4153cfc..37ed83f3a7 100644
--- a/src/containers/Flow/Flow.test.tsx
+++ b/src/containers/Flow/Flow.test.tsx
@@ -29,7 +29,7 @@ const mocks = [
   ...getOrganizationQuery,
   getFlowQuery({ id: 1 }),
   getFlowQuery({ id: '1' }),
-  filterFlowQuery,
+  filterFlowQuery({ isActive: true, isTemplate: false }),
   getFilterTagQuery,
   getRoleNameQuery,
   getOrganizationLanguagesQuery,
@@ -261,8 +261,6 @@ it('buttons should be disabled in template state', async () => {
     expect(screen.getByText('Edit flow')).toBeInTheDocument();
   });
 
-  screen.debug(document, Infinity);
-
   await waitFor(() => {
     expect(screen.getByTestId('submitActionButton')).toBeDisabled();
     expect(screen.getByTestId('remove-icon')).toBeDisabled();
diff --git a/src/containers/Flow/FlowList/FlowList.test.tsx b/src/containers/Flow/FlowList/FlowList.test.tsx
index 4b018f559b..eda758cbcc 100644
--- a/src/containers/Flow/FlowList/FlowList.test.tsx
+++ b/src/containers/Flow/FlowList/FlowList.test.tsx
@@ -22,15 +22,17 @@ import { Flow } from '../Flow';
 import { getFilterTagQuery } from 'mocks/Tag';
 import { getRoleNameQuery } from 'mocks/Role';
 
+const isActiveFilter = { isActive: true, isTemplate: false };
+
 const mocks = [
-  getFlowCountQuery({ isActive: true, isTemplate: false }),
-  getFlowCountQuery({ isActive: true, isTemplate: false }),
-  getFlowCountQuery({ isActive: true, isTemplate: false }),
-  getFlowCountQuery({ isActive: true, isTemplate: false }),
-  filterFlowQuery,
-  filterFlowQuery,
-  filterFlowQuery,
-  filterFlowQuery,
+  getFlowCountQuery(isActiveFilter),
+  getFlowCountQuery(isActiveFilter),
+  getFlowCountQuery(isActiveFilter),
+  getFlowCountQuery(isActiveFilter),
+  filterFlowQuery(isActiveFilter),
+  filterFlowQuery(isActiveFilter),
+  filterFlowQuery(isActiveFilter),
+  filterFlowQuery(isActiveFilter),
   filterFlowNewQuery,
   getFlowCountNewQuery,
   getFlowQuery({ id: 1 }),
diff --git a/src/containers/Form/FormLayout.test.helper.ts b/src/containers/Form/FormLayout.test.helper.ts
index f7dba6e3a4..32646a5588 100644
--- a/src/containers/Form/FormLayout.test.helper.ts
+++ b/src/containers/Form/FormLayout.test.helper.ts
@@ -87,8 +87,8 @@ export const LIST_ITEM_MOCKS = [
   ...getOrganizationQuery,
   getOrganizationLanguagesQuery,
   getFlowQuery({ id: 1 }),
-  filterFlowQuery,
-  filterFlowQuery,
+  filterFlowQuery({ isActive: true, isTemplate: false }),
+  filterFlowQuery({ isActive: true, isTemplate: false }),
   getFlowCountQuery({ isTemplate: false, isActive: true }),
   getFlowCountQuery({ isTemplate: false, isActive: true }),
   getFilterTagQuery,
diff --git a/src/containers/List/List.test.helper.ts b/src/containers/List/List.test.helper.ts
index e79ac52d04..ad856bba25 100644
--- a/src/containers/List/List.test.helper.ts
+++ b/src/containers/List/List.test.helper.ts
@@ -45,11 +45,11 @@ export const defaultProps = {
 
 export const LIST_MOCKS = [
   getCurrentUserQuery,
-  filterFlowQuery,
-  getFlowCountQuery({ isTemplate: false, isActive: true }),
-  filterFlowQuery,
+  filterFlowQuery({ isActive: true }),
+  getFlowCountQuery({ isActive: true }),
+  filterFlowQuery({ isActive: true }),
   filterFlowSortQuery,
-  getFlowCountQuery({ isTemplate: false, isActive: true }),
+  getFlowCountQuery({ isActive: true }),
   filterFlowWithNameOrKeywordOrTagQuery,
   getFlowCountWithFilterQuery,
   getCurrentUserQuery,
diff --git a/src/mocks/Flow.tsx b/src/mocks/Flow.tsx
index 35f09269ba..dd65aafadf 100644
--- a/src/mocks/Flow.tsx
+++ b/src/mocks/Flow.tsx
@@ -174,11 +174,11 @@ const filterFlowResult = {
   },
 };
 
-export const filterFlowQuery = {
+export const filterFlowQuery = (filter: any) => ({
   request: {
     query: FILTER_FLOW,
     variables: {
-      filter: { isActive: true, isTemplate: false },
+      filter,
       opts: {
         limit: 50,
         offset: 0,
@@ -189,7 +189,7 @@ export const filterFlowQuery = {
   },
 
   result: filterFlowResult,
-};
+});
 
 export const filterTemplateFlows = {
   request: {