diff --git a/packages/nocodb/src/__tests__/unit/rest/init/cleanupMeta.ts b/packages/nocodb/src/__tests__/unit/rest/init/cleanupMeta.ts
index 64cbca1ece..38c504c0ec 100644
--- a/packages/nocodb/src/__tests__/unit/rest/init/cleanupMeta.ts
+++ b/packages/nocodb/src/__tests__/unit/rest/init/cleanupMeta.ts
@@ -1,4 +1,3 @@
-import Base from '../../../../lib/models/Base';
 import Model from '../../../../lib/models/Model';
 import Project from '../../../../lib/models/Project';
 import NcConnectionMgrv2 from '../../../../lib/utils/common/NcConnectionMgrv2';
diff --git a/packages/nocodb/src/__tests__/unit/rest/init/index.ts b/packages/nocodb/src/__tests__/unit/rest/init/index.ts
index 9dba451f3a..15d590dfdb 100644
--- a/packages/nocodb/src/__tests__/unit/rest/init/index.ts
+++ b/packages/nocodb/src/__tests__/unit/rest/init/index.ts
@@ -3,7 +3,7 @@ import { Noco } from '../../../../lib';
 import express from 'express';
 import cleanupMeta from './cleanupMeta';
 import cleanUpSakila from './cleanupSakila';
-import { createUser } from '../tests/helpers/user';
+import { createUser } from '../tests/factory/user';
 import knex from 'knex';
 
 const knexClient = knex(dbConfig);
diff --git a/packages/nocodb/src/__tests__/unit/rest/tests/auth.test.ts b/packages/nocodb/src/__tests__/unit/rest/tests/auth.test.ts
index 8ac4db97d2..8d074d0a0a 100644
--- a/packages/nocodb/src/__tests__/unit/rest/tests/auth.test.ts
+++ b/packages/nocodb/src/__tests__/unit/rest/tests/auth.test.ts
@@ -2,7 +2,7 @@ import { expect } from 'chai';
 import 'mocha';
 import request from 'supertest';
 import init from '../init';
-import { defaultUserArgs } from './helpers/user';
+import { defaultUserArgs } from './factory/user';
 
 function authTests() {
   let context;
diff --git a/packages/nocodb/src/__tests__/unit/rest/tests/helpers/column.ts b/packages/nocodb/src/__tests__/unit/rest/tests/factory/column.ts
similarity index 100%
rename from packages/nocodb/src/__tests__/unit/rest/tests/helpers/column.ts
rename to packages/nocodb/src/__tests__/unit/rest/tests/factory/column.ts
diff --git a/packages/nocodb/src/__tests__/unit/rest/tests/helpers/project.ts b/packages/nocodb/src/__tests__/unit/rest/tests/factory/project.ts
similarity index 100%
rename from packages/nocodb/src/__tests__/unit/rest/tests/helpers/project.ts
rename to packages/nocodb/src/__tests__/unit/rest/tests/factory/project.ts
diff --git a/packages/nocodb/src/__tests__/unit/rest/tests/helpers/row.ts b/packages/nocodb/src/__tests__/unit/rest/tests/factory/row.ts
similarity index 100%
rename from packages/nocodb/src/__tests__/unit/rest/tests/helpers/row.ts
rename to packages/nocodb/src/__tests__/unit/rest/tests/factory/row.ts
diff --git a/packages/nocodb/src/__tests__/unit/rest/tests/helpers/table.ts b/packages/nocodb/src/__tests__/unit/rest/tests/factory/table.ts
similarity index 100%
rename from packages/nocodb/src/__tests__/unit/rest/tests/helpers/table.ts
rename to packages/nocodb/src/__tests__/unit/rest/tests/factory/table.ts
diff --git a/packages/nocodb/src/__tests__/unit/rest/tests/helpers/user.ts b/packages/nocodb/src/__tests__/unit/rest/tests/factory/user.ts
similarity index 100%
rename from packages/nocodb/src/__tests__/unit/rest/tests/helpers/user.ts
rename to packages/nocodb/src/__tests__/unit/rest/tests/factory/user.ts
diff --git a/packages/nocodb/src/__tests__/unit/rest/tests/project.test.ts b/packages/nocodb/src/__tests__/unit/rest/tests/project.test.ts
index 8580edec48..7a74cc3605 100644
--- a/packages/nocodb/src/__tests__/unit/rest/tests/project.test.ts
+++ b/packages/nocodb/src/__tests__/unit/rest/tests/project.test.ts
@@ -1,7 +1,7 @@
 import 'mocha';
 import request from 'supertest';
 import Project from '../../../../lib/models/Project';
-import { createProject, createSharedBase } from './helpers/project';
+import { createProject, createSharedBase } from './factory/project';
 import { beforeEach } from 'mocha';
 import { Exception } from 'handlebars';
 import init from '../init/index';
diff --git a/packages/nocodb/src/__tests__/unit/rest/tests/table.test.ts b/packages/nocodb/src/__tests__/unit/rest/tests/table.test.ts
index 06af97c188..f1d6c932b4 100644
--- a/packages/nocodb/src/__tests__/unit/rest/tests/table.test.ts
+++ b/packages/nocodb/src/__tests__/unit/rest/tests/table.test.ts
@@ -1,10 +1,10 @@
 // import { expect } from 'chai';
 import 'mocha';
 import request from 'supertest';
-import { createTable } from './helpers/table';
-import { createProject } from './helpers/project';
+import { createTable } from './factory/table';
+import { createProject } from './factory/project';
 import Model from '../../../../lib/models/Model';
-import { defaultColumns } from './helpers/column';
+import { defaultColumns } from './factory/column';
 import init from '../init';
 
 function tableTest() {
diff --git a/packages/nocodb/src/__tests__/unit/rest/tests/tableRow.test.ts b/packages/nocodb/src/__tests__/unit/rest/tests/tableRow.test.ts
index 3dc7bed6da..c98f23c08c 100644
--- a/packages/nocodb/src/__tests__/unit/rest/tests/tableRow.test.ts
+++ b/packages/nocodb/src/__tests__/unit/rest/tests/tableRow.test.ts
@@ -1,5 +1,5 @@
 import 'mocha';
-import { createSakilaProject } from './helpers/project';
+import { createSakilaProject } from './factory/project';
 import Model from '../../../../lib/models/Model';
 import init from '../init';
 import request from 'supertest';
@@ -8,7 +8,7 @@ import {
   createColumn,
   createLookupColumn,
   createRollupColumn,
-} from './helpers/column';
+} from './factory/column';
 
 const isColumnsCorrectInResponse = (response, columns: ColumnType[]) => {
   const responseColumnsListStr = Object.keys(response.body.list[0])