diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts
index baf121d342..59c31e360d 100644
--- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts
+++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts
@@ -1860,7 +1860,7 @@ class BaseModelSqlv2 {
     await this.handleHooks('After.insert', data, req);
     // if (req?.headers?.['xc-gui']) {
     const id = this._extractPksValues(data);
-    Audit.insert({
+    await Audit.insert({
       fk_model_id: this.model.id,
       row_id: id,
       op_type: AuditOperationTypes.DATA,
diff --git a/packages/nocodb/tests/unit/rest/dbConfig.ts b/packages/nocodb/tests/unit/dbConfig.ts
similarity index 95%
rename from packages/nocodb/tests/unit/rest/dbConfig.ts
rename to packages/nocodb/tests/unit/dbConfig.ts
index 64eb84d4a8..533d97801b 100644
--- a/packages/nocodb/tests/unit/rest/dbConfig.ts
+++ b/packages/nocodb/tests/unit/dbConfig.ts
@@ -1,4 +1,4 @@
-import { NcConfigFactory } from "../../../src/lib";
+import { NcConfigFactory } from "../../src/lib";
 
 
 const sakilaTableNames = [
diff --git a/packages/nocodb/tests/unit/rest/tests/factory/column.ts b/packages/nocodb/tests/unit/factory/column.ts
similarity index 92%
rename from packages/nocodb/tests/unit/rest/tests/factory/column.ts
rename to packages/nocodb/tests/unit/factory/column.ts
index 08b4b55cde..a6ead8210f 100644
--- a/packages/nocodb/tests/unit/rest/tests/factory/column.ts
+++ b/packages/nocodb/tests/unit/factory/column.ts
@@ -1,12 +1,12 @@
 import { UITypes } from 'nocodb-sdk';
 import request from 'supertest';
-import Column from '../../../../../src/lib/models/Column';
-import FormViewColumn from '../../../../../src/lib/models/FormViewColumn';
-import GalleryViewColumn from '../../../../../src/lib/models/GalleryViewColumn';
-import GridViewColumn from '../../../../../src/lib/models/GridViewColumn';
-import Model from '../../../../../src/lib/models/Model';
-import Project from '../../../../../src/lib/models/Project';
-import View from '../../../../../src/lib/models/View';
+import Column from '../../../src/lib/models/Column';
+import FormViewColumn from '../../../src/lib/models/FormViewColumn';
+import GalleryViewColumn from '../../../src/lib/models/GalleryViewColumn';
+import GridViewColumn from '../../../src/lib/models/GridViewColumn';
+import Model from '../../../src/lib/models/Model';
+import Project from '../../../src/lib/models/Project';
+import View from '../../../src/lib/models/View';
 
 const defaultColumns = [
   {
diff --git a/packages/nocodb/tests/unit/rest/tests/factory/project.ts b/packages/nocodb/tests/unit/factory/project.ts
similarity index 93%
rename from packages/nocodb/tests/unit/rest/tests/factory/project.ts
rename to packages/nocodb/tests/unit/factory/project.ts
index 92141b5352..2c6ec2b7f1 100644
--- a/packages/nocodb/tests/unit/rest/tests/factory/project.ts
+++ b/packages/nocodb/tests/unit/factory/project.ts
@@ -1,6 +1,6 @@
 import request from 'supertest';
-import Project from '../../../../../src/lib/models/Project';
-import { sakilaDbName } from '../../dbConfig';
+import Project from '../../../src/lib/models/Project';
+import { sakilaDbName } from '../dbConfig';
 
 const externalProjectConfig = {
   title: 'sakila',
diff --git a/packages/nocodb/tests/unit/rest/tests/factory/row.ts b/packages/nocodb/tests/unit/factory/row.ts
similarity index 89%
rename from packages/nocodb/tests/unit/rest/tests/factory/row.ts
rename to packages/nocodb/tests/unit/factory/row.ts
index 8f6d9dd920..29b4682402 100644
--- a/packages/nocodb/tests/unit/rest/tests/factory/row.ts
+++ b/packages/nocodb/tests/unit/factory/row.ts
@@ -1,11 +1,11 @@
 import { ColumnType, UITypes } from 'nocodb-sdk';
 import request from 'supertest';
-import Column from '../../../../../src/lib/models/Column';
-import Filter from '../../../../../src/lib/models/Filter';
-import Model from '../../../../../src/lib/models/Model';
-import Project from '../../../../../src/lib/models/Project';
-import Sort from '../../../../../src/lib/models/Sort';
-import NcConnectionMgrv2 from '../../../../../src/lib/utils/common/NcConnectionMgrv2';
+import Column from '../../../src/lib/models/Column';
+import Filter from '../../../src/lib/models/Filter';
+import Model from '../../../src/lib/models/Model';
+import Project from '../../../src/lib/models/Project';
+import Sort from '../../../src/lib/models/Sort';
+import NcConnectionMgrv2 from '../../../src/lib/utils/common/NcConnectionMgrv2';
 
 const rowValue = (column: ColumnType, index: number) => {
   switch (column.uidt) {
diff --git a/packages/nocodb/tests/unit/rest/tests/factory/table.ts b/packages/nocodb/tests/unit/factory/table.ts
similarity index 89%
rename from packages/nocodb/tests/unit/rest/tests/factory/table.ts
rename to packages/nocodb/tests/unit/factory/table.ts
index e5dd3bc747..2b64e6cff4 100644
--- a/packages/nocodb/tests/unit/rest/tests/factory/table.ts
+++ b/packages/nocodb/tests/unit/factory/table.ts
@@ -1,6 +1,6 @@
 import request from 'supertest';
-import Model from '../../../../../src/lib/models/Model';
-import Project from '../../../../../src/lib/models/Project';
+import Model from '../../../src/lib/models/Model';
+import Project from '../../../src/lib/models/Project';
 import { defaultColumns } from './column';
 
 const defaultTableValue = {
diff --git a/packages/nocodb/tests/unit/rest/tests/factory/user.ts b/packages/nocodb/tests/unit/factory/user.ts
similarity index 89%
rename from packages/nocodb/tests/unit/rest/tests/factory/user.ts
rename to packages/nocodb/tests/unit/factory/user.ts
index 9bcd051cfa..d75ebf21df 100644
--- a/packages/nocodb/tests/unit/rest/tests/factory/user.ts
+++ b/packages/nocodb/tests/unit/factory/user.ts
@@ -1,5 +1,5 @@
 import request from 'supertest';
-import User from '../../../../../src/lib/models/User';
+import User from '../../../src/lib/models/User';
 
 const defaultUserArgs = {
   email: 'test@example.com',
diff --git a/packages/nocodb/tests/unit/rest/tests/factory/view.ts b/packages/nocodb/tests/unit/factory/view.ts
similarity index 76%
rename from packages/nocodb/tests/unit/rest/tests/factory/view.ts
rename to packages/nocodb/tests/unit/factory/view.ts
index ce8524ea57..f6f49529a3 100644
--- a/packages/nocodb/tests/unit/rest/tests/factory/view.ts
+++ b/packages/nocodb/tests/unit/factory/view.ts
@@ -1,8 +1,7 @@
-import { UITypes, ViewTypes } from 'nocodb-sdk';
+import { ViewTypes } from 'nocodb-sdk';
 import request from 'supertest';
-import Column from '../../../../../src/lib/models/Column';
-import Model from '../../../../../src/lib/models/Model';
-import View from '../../../../../src/lib/models/View';
+import Model from '../../../src/lib/models/Model';
+import View from '../../../src/lib/models/View';
 
 const createView = async (context, {title, table, type}: {title: string, table: Model, type: ViewTypes}) => {
   const viewTypeStr = (type) => {
diff --git a/packages/nocodb/tests/unit/rest/init/cleanupMeta.ts b/packages/nocodb/tests/unit/init/cleanupMeta.ts
similarity index 83%
rename from packages/nocodb/tests/unit/rest/init/cleanupMeta.ts
rename to packages/nocodb/tests/unit/init/cleanupMeta.ts
index 3f58744025..ae7dd5f613 100644
--- a/packages/nocodb/tests/unit/rest/init/cleanupMeta.ts
+++ b/packages/nocodb/tests/unit/init/cleanupMeta.ts
@@ -1,7 +1,7 @@
-import Model from "../../../../src/lib/models/Model";
-import Project from "../../../../src/lib/models/Project";
-import NcConnectionMgrv2 from "../../../../src/lib/utils/common/NcConnectionMgrv2";
-import { orderedMetaTables } from "../../../../src/lib/utils/globals";
+import Model from "../../../src/lib/models/Model";
+import Project from "../../../src/lib/models/Project";
+import NcConnectionMgrv2 from "../../../src/lib/utils/common/NcConnectionMgrv2";
+import { orderedMetaTables } from "../../../src/lib/utils/globals";
 
 const dropTablesAllNonExternalProjects = async (knexClient) => {
   const projects = await Project.list({});
diff --git a/packages/nocodb/tests/unit/rest/init/cleanupSakila.ts b/packages/nocodb/tests/unit/init/cleanupSakila.ts
similarity index 92%
rename from packages/nocodb/tests/unit/rest/init/cleanupSakila.ts
rename to packages/nocodb/tests/unit/init/cleanupSakila.ts
index 0c20b33f75..da796ee9f2 100644
--- a/packages/nocodb/tests/unit/rest/init/cleanupSakila.ts
+++ b/packages/nocodb/tests/unit/init/cleanupSakila.ts
@@ -1,5 +1,5 @@
-import Audit from '../../../../src/lib/models/Audit';
-import Project from '../../../../src/lib/models/Project';
+import Audit from '../../../src/lib/models/Audit';
+import Project from '../../../src/lib/models/Project';
 import { dbPassword, dbUser, sakilaTableNames, sakilaDbName } from '../dbConfig';
 import { exec } from 'child_process';
 
@@ -30,7 +30,7 @@ const resetAndSeedSakila = async (sakilaKnexClient) => {
   try {
     await dropTablesOfSakila(sakilaKnexClient);
     
-    const testsDir = __dirname.replace('tests/unit/rest/init', 'tests');
+    const testsDir = __dirname.replace('tests/unit/init', 'tests');
     await sh(`echo "SOURCE ${testsDir}/mysql-sakila-db/03-test-sakila-schema.sql" | mysql -u ${dbUser} -p${dbPassword} ${sakilaDbName}`);
     await sh(`echo "SOURCE ${testsDir}/mysql-sakila-db/04-test-sakila-data.sql" | mysql -u ${dbUser} -p${dbPassword} ${sakilaDbName}`);
     
diff --git a/packages/nocodb/tests/unit/rest/init/db.ts b/packages/nocodb/tests/unit/init/db.ts
similarity index 80%
rename from packages/nocodb/tests/unit/rest/init/db.ts
rename to packages/nocodb/tests/unit/init/db.ts
index fda5dc7675..017972720f 100644
--- a/packages/nocodb/tests/unit/rest/init/db.ts
+++ b/packages/nocodb/tests/unit/init/db.ts
@@ -1,4 +1,4 @@
-import { DbConfig } from "../../../../src/interface/config";
+import { DbConfig } from "../../../src/interface/config";
 
 
 const isSqlite = (context) =>
diff --git a/packages/nocodb/tests/unit/rest/init/index.ts b/packages/nocodb/tests/unit/init/index.ts
similarity index 95%
rename from packages/nocodb/tests/unit/rest/init/index.ts
rename to packages/nocodb/tests/unit/init/index.ts
index 1919fbf85b..5cd497d400 100644
--- a/packages/nocodb/tests/unit/rest/init/index.ts
+++ b/packages/nocodb/tests/unit/init/index.ts
@@ -1,12 +1,12 @@
 
 import express from 'express';
 import knex from 'knex';
-import { Noco } from '../../../../src/lib';
+import { Noco } from '../../../src/lib';
 
 import { dbConfig, dbName, sakilaDbName } from '../dbConfig';
 import cleanupMeta from './cleanupMeta';
 import {cleanUpSakila, resetAndSeedSakila} from './cleanupSakila';
-import { createUser } from '../tests/factory/user';
+import { createUser } from '../factory/user';
 
 let server;
 const knexClient = knex(dbConfig);
diff --git a/packages/nocodb/tests/unit/model/baseModelSql.test.ts b/packages/nocodb/tests/unit/model/baseModelSql.test.ts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/nocodb/tests/unit/rest/index.test.ts b/packages/nocodb/tests/unit/rest/index.test.ts
index 850018aa27..e38186b6de 100644
--- a/packages/nocodb/tests/unit/rest/index.test.ts
+++ b/packages/nocodb/tests/unit/rest/index.test.ts
@@ -5,7 +5,7 @@ import tableTests from './tests/table.test';
 import tableRowTests from './tests/tableRow.test';
 import viewRowTests from './tests/viewRow.test';
 import knex from 'knex';
-import { dbName } from './dbConfig';
+import { dbName } from '../dbConfig';
 
 process.env.NODE_ENV = 'test';
 process.env.TEST = 'test';
diff --git a/packages/nocodb/tests/unit/rest/tests/auth.test.ts b/packages/nocodb/tests/unit/rest/tests/auth.test.ts
index 09c7b9052b..4b0ae080b0 100644
--- a/packages/nocodb/tests/unit/rest/tests/auth.test.ts
+++ b/packages/nocodb/tests/unit/rest/tests/auth.test.ts
@@ -1,8 +1,8 @@
 import { expect } from 'chai';
 import 'mocha';
 import request from 'supertest';
-import init from '../init';
-import { defaultUserArgs } from './factory/user';
+import init from '../../init';
+import { defaultUserArgs } from '../../factory/user';
 
 function authTests() {
   let context;
diff --git a/packages/nocodb/tests/unit/rest/tests/project.test.ts b/packages/nocodb/tests/unit/rest/tests/project.test.ts
index 0eed89e8f5..caf563d8fc 100644
--- a/packages/nocodb/tests/unit/rest/tests/project.test.ts
+++ b/packages/nocodb/tests/unit/rest/tests/project.test.ts
@@ -1,7 +1,7 @@
 import 'mocha';
 import request from 'supertest';
-import init from '../init/index';
-import { createProject, createSharedBase } from './factory/project';
+import init from '../../init/index';
+import { createProject, createSharedBase } from '../../factory/project';
 import { beforeEach } from 'mocha';
 import { Exception } from 'handlebars';
 import Project from '../../../../src/lib/models/Project';
diff --git a/packages/nocodb/tests/unit/rest/tests/table.test.ts b/packages/nocodb/tests/unit/rest/tests/table.test.ts
index a373e9a228..150d4026ae 100644
--- a/packages/nocodb/tests/unit/rest/tests/table.test.ts
+++ b/packages/nocodb/tests/unit/rest/tests/table.test.ts
@@ -1,10 +1,10 @@
 // import { expect } from 'chai';
 import 'mocha';
 import request from 'supertest';
-import init from '../init';
-import { createTable, getAllTables } from './factory/table';
-import { createProject } from './factory/project';
-import { defaultColumns } from './factory/column';
+import init from '../../init';
+import { createTable, getAllTables } from '../../factory/table';
+import { createProject } from '../../factory/project';
+import { defaultColumns } from '../../factory/column';
 import Model from '../../../../src/lib/models/Model';
 
 function tableTest() {
diff --git a/packages/nocodb/tests/unit/rest/tests/tableRow.test.ts b/packages/nocodb/tests/unit/rest/tests/tableRow.test.ts
index 78073f44ab..9a4c69df04 100644
--- a/packages/nocodb/tests/unit/rest/tests/tableRow.test.ts
+++ b/packages/nocodb/tests/unit/rest/tests/tableRow.test.ts
@@ -1,6 +1,6 @@
 import 'mocha';
-import init from '../init';
-import { createProject, createSakilaProject } from './factory/project';
+import init from '../../init';
+import { createProject, createSakilaProject } from '../../factory/project';
 import request from 'supertest';
 import { ColumnType, UITypes } from 'nocodb-sdk';
 import {
@@ -8,8 +8,8 @@ import {
   createLookupColumn,
   createLtarColumn,
   createRollupColumn,
-} from './factory/column';
-import { createTable, getTable } from './factory/table';
+} from '../../factory/column';
+import { createTable, getTable } from '../../factory/table';
 import {
   createRelation,
   createRow,
@@ -17,8 +17,8 @@ import {
   getOneRow,
   getRow,
   listRow,
-} from './factory/row';
-import { isMysql, isSqlite } from '../init/db';
+} from '../../factory/row';
+import { isMysql, isSqlite } from '../../init/db';
 import Model from '../../../../src/lib/models/Model';
 import Project from '../../../../src/lib/models/Project';
 
diff --git a/packages/nocodb/tests/unit/rest/tests/viewRow.test.ts b/packages/nocodb/tests/unit/rest/tests/viewRow.test.ts
index 36f2bc14d2..7658fdc5ee 100644
--- a/packages/nocodb/tests/unit/rest/tests/viewRow.test.ts
+++ b/packages/nocodb/tests/unit/rest/tests/viewRow.test.ts
@@ -1,18 +1,15 @@
 import 'mocha';
-import init from '../init';
-import { createProject, createSakilaProject } from './factory/project';
+import init from '../../init';
+import { createProject, createSakilaProject } from '../../factory/project';
 import request from 'supertest';
 import Project from '../../../../src/lib/models/Project';
 import Model from '../../../../src/lib/models/Model';
-import { createTable, getTable } from './factory/table';
+import { createTable, getTable } from '../../factory/table';
 import View from '../../../../src/lib/models/View';
-import { ColumnType, UITypes, ViewType, ViewTypes } from 'nocodb-sdk';
-import { createView } from './factory/view';
-import { createColumn, createLookupColumn, createLtarColumn, createRollupColumn, updateViewColumn } from './factory/column';
-import Audit from '../../../../src/lib/models/Audit';
-import Column from '../../../../src/lib/models/Column';
-import GalleryView from '../../../../src/lib/models/GalleryView';
-import { createRelation, createRow, getOneRow, getRow } from './factory/row';
+import { ColumnType, UITypes, ViewTypes } from 'nocodb-sdk';
+import { createView } from '../../factory/view';
+import { createColumn, createLookupColumn, createLtarColumn, createRollupColumn, updateViewColumn } from '../../factory/column';
+import { createRelation, createRow, getOneRow, getRow } from '../../factory/row';
 
 const isColumnsCorrectInResponse = (row, columns: ColumnType[]) => {
   const responseColumnsListStr = Object.keys(row).sort().join(',');
diff --git a/packages/nocodb/tests/unit/tsconfig.json b/packages/nocodb/tests/unit/tsconfig.json
index dbeabd3d6a..e361d28856 100644
--- a/packages/nocodb/tests/unit/tsconfig.json
+++ b/packages/nocodb/tests/unit/tsconfig.json
@@ -55,16 +55,18 @@
       "src/types"
     ]
   },
+  "parserOptions": {
+    "sourceType": "module",
+    "tsconfigRootDir": "./",
+    "project": "./tsconfig.json",
+  },
   "include": [
-    "src/**/*.ts",
-//    "src/lib/xgene/migrations/*.js",
-    "src/**/*.json"
+    "./tests/**/**/**.ts",
+    "./tests/**/**.ts"
+    // "**/*.ts",
+    // "**/*.json"
   ],
   "exclude": [
-    "node_modules/**",
-    "node_modules",
-    "../../../xc-lib-private/**",
-    "../../../xc-lib-private"
   ],
   "compileOnSave": false
 }