diff --git a/package-lock.json b/package-lock.json
index 5a969c6dc3..ccb553ab56 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5964,6 +5964,13 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/proxyquire": {
+      "version": "1.3.31",
+      "resolved": "https://registry.npmjs.org/@types/proxyquire/-/proxyquire-1.3.31.tgz",
+      "integrity": "sha512-uALowNG2TSM1HNPMMOR0AJwv4aPYPhqB0xlEhkeRTMuto5hjoSPZkvgu1nbPUkz3gEPAHv4sy4DmKsurZiEfRQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/qs": {
       "version": "6.14.0",
       "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.14.0.tgz",
@@ -12201,6 +12208,20 @@
         "node": ">=10"
       }
     },
+    "node_modules/fill-keys": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/fill-keys/-/fill-keys-1.0.2.tgz",
+      "integrity": "sha512-tcgI872xXjwFF4xgQmLxi76GnwJG3g/3isB1l4/G5Z4zrbddGpBjqZCO9oEAcB5wX0Hj/5iQB3toxfO7in1hHA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-object": "~1.0.1",
+        "merge-descriptors": "~1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/fill-range": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
@@ -14607,6 +14628,16 @@
         "node": ">=8"
       }
     },
+    "node_modules/is-object": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz",
+      "integrity": "sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-observable": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-observable/-/is-observable-1.1.0.tgz",
@@ -17642,6 +17673,13 @@
       "integrity": "sha512-tukRdb9Beu27t6dN+XztSRHq9J0B/CoAOySGzHfn8UTfmqipA5yNT/sDUEyYdAV3Hpka6Wx6kOMxuObdOex60Q==",
       "license": "MIT"
     },
+    "node_modules/module-not-found-error": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/module-not-found-error/-/module-not-found-error-1.0.1.tgz",
+      "integrity": "sha512-pEk4ECWQXV6z2zjhRZUongnLJNUeGQJ3w6OQ5ctGwD+i5o93qjRQUk2Rt6VdNeu3sEP0AB4LcfvdebpxBRVr4g==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@@ -22109,6 +22147,18 @@
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
       "license": "MIT"
     },
+    "node_modules/proxyquire": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-2.1.3.tgz",
+      "integrity": "sha512-BQWfCqYM+QINd+yawJz23tbBM40VIGXOdDw3X344KcclI/gtBbdWF6SlQ4nK/bYhF9d27KYug9WzljHC6B9Ysg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fill-keys": "^1.0.2",
+        "module-not-found-error": "^1.0.1",
+        "resolve": "^1.11.1"
+      }
+    },
     "node_modules/psl": {
       "version": "1.15.0",
       "resolved": "https://registry.npmjs.org/psl/-/psl-1.15.0.tgz",
@@ -28878,6 +28928,7 @@
         "@types/mkdirp": "^1.0.2",
         "@types/mocha": "^8.2.3",
         "@types/node": "^14.18.63",
+        "@types/proxyquire": "^1.3.31",
         "@types/rewire": "^2.5.30",
         "@types/tar": "^6.1.13",
         "@types/uuid": "^9.0.8",
@@ -28888,6 +28939,7 @@
         "mocha": "^10.8.2",
         "nyc": "^15.1.0",
         "oclif": "^4.17.46",
+        "proxyquire": "^2.1.3",
         "rewire": "^9.0.1",
         "ts-node": "^10.9.2",
         "tsx": "^4.20.3",
@@ -29141,7 +29193,7 @@
     },
     "packages/contentstack-seed": {
       "name": "@contentstack/cli-cm-seed",
-      "version": "2.0.0-beta.2",
+      "version": "2.0.0-beta.3",
       "license": "MIT",
       "dependencies": {
         "@contentstack/cli-cm-import": "~2.0.0-beta.2",
diff --git a/packages/contentstack-import-setup/.eslintrc b/packages/contentstack-import-setup/.eslintrc
index 55a92e2b63..26efdd2eed 100644
--- a/packages/contentstack-import-setup/.eslintrc
+++ b/packages/contentstack-import-setup/.eslintrc
@@ -8,7 +8,6 @@
         "sourceType": "module"
     },
     "extends": [
-        "oclif-typescript",
         "plugin:@typescript-eslint/recommended"
     ],
     "rules": {
diff --git a/packages/contentstack-import-setup/README.md b/packages/contentstack-import-setup/README.md
index 52125daa58..f29a400093 100644
--- a/packages/contentstack-import-setup/README.md
+++ b/packages/contentstack-import-setup/README.md
@@ -69,14 +69,14 @@ USAGE
   $ csdx cm:stacks:import-setup [-k <value>] [-d <value>] [-a <value>] [--modules <value,value>]
 
 FLAGS
-  -B, --branch=<value>         The name of the branch where you want to import your content. If you don't mention the
-                               branch name, then by default the content will be imported to the main branch.
   -a, --alias=<value>          The management token of the destination stack where you will import the content.
   -d, --data-dir=<value>       The path or the location in your file system where the content, you intend to import, is
                                stored. For example, -d "C:\Users\Name\Desktop\cli\content". If the export folder has
                                branches involved, then the path should point till the particular branch. For example,
                                “-d "C:\Users\Name\Desktop\cli\content\branch_name"
   -k, --stack-api-key=<value>  API key of the target stack
+      --branch=<value>         The name of the branch where you want to import your content. If you don't mention the
+                               branch name, then by default the content will be imported to the main branch.
       --branch-alias=<value>   Specify the branch alias where you want to import your content. If not specified, the
                                content is imported into the main branch by default.
       --module=<option>...     [optional] Specify the modules/module to import into the target stack. currently options
@@ -87,11 +87,7 @@ DESCRIPTION
   Helps to generate mappers and backup folder for importing (overwriting) specific modules
 
 EXAMPLES
-  $ csdx cm:stacks:import-setup --stack-api-key <target_stack_api_key> --data-dir <path/of/export/destination/dir> --modules <module_name, module_name>
-
-  $ csdx cm:stacks:import-setup -k <target_stack_api_key> -d <path/of/export/destination/dir> --modules <module_name, module_name>
-
-  $ csdx cm:stacks:import-setup -k <target_stack_api_key> -d <path/of/export/destination/dir> --modules <module_name, module_name> -b <branch_name>
+  $ csdx cm:stacks:import-setup --stack-api-key <target_stack_api_key> --data-dir <path/of/export/destination/dir> --modules <module_name, module_name> --branch <branch_name>
 ```
 
 _See code: [src/commands/cm/stacks/import-setup.ts](https://github.com/contentstack/cli/blob/main/packages/contentstack-import-setup/src/commands/cm/stacks/import-setup.ts)_
diff --git a/packages/contentstack-import-setup/package.json b/packages/contentstack-import-setup/package.json
index fa80aab692..28a25a9b6f 100644
--- a/packages/contentstack-import-setup/package.json
+++ b/packages/contentstack-import-setup/package.json
@@ -24,6 +24,7 @@
     "@types/mkdirp": "^1.0.2",
     "@types/mocha": "^8.2.3",
     "@types/node": "^14.18.63",
+    "@types/proxyquire": "^1.3.31",
     "@types/rewire": "^2.5.30",
     "@types/tar": "^6.1.13",
     "@types/uuid": "^9.0.8",
@@ -34,6 +35,7 @@
     "mocha": "^10.8.2",
     "nyc": "^15.1.0",
     "oclif": "^4.17.46",
+    "proxyquire": "^2.1.3",
     "rewire": "^9.0.1",
     "ts-node": "^10.9.2",
     "tsx": "^4.20.3",
diff --git a/packages/contentstack-import-setup/src/commands/cm/stacks/import-setup.ts b/packages/contentstack-import-setup/src/commands/cm/stacks/import-setup.ts
index 00b6b3e471..50e8db591a 100644
--- a/packages/contentstack-import-setup/src/commands/cm/stacks/import-setup.ts
+++ b/packages/contentstack-import-setup/src/commands/cm/stacks/import-setup.ts
@@ -2,7 +2,6 @@ import path from 'node:path';
 import { Command } from '@contentstack/cli-command';
 import {
   messageHandler,
-  printFlagDeprecation,
   managementSDKClient,
   flags,
   FlagInput,
@@ -21,9 +20,7 @@ export default class ImportSetupCommand extends Command {
   );
 
   static examples: string[] = [
-    `csdx cm:stacks:import-setup --stack-api-key <target_stack_api_key> --data-dir <path/of/export/destination/dir> --modules <module_name, module_name>`,
-    `csdx cm:stacks:import-setup -k <target_stack_api_key> -d <path/of/export/destination/dir> --modules <module_name, module_name>`,
-    `csdx cm:stacks:import-setup -k <target_stack_api_key> -d <path/of/export/destination/dir> --modules <module_name, module_name> -b <branch_name>`,
+    `csdx cm:stacks:import-setup --stack-api-key <target_stack_api_key> --data-dir <path/of/export/destination/dir> --modules <module_name, module_name> --branch <branch_name>`,
   ];
 
   static flags: FlagInput = {
@@ -46,27 +43,25 @@ export default class ImportSetupCommand extends Command {
       multiple: true,
     }),
     branch: flags.string({
-      char: 'B',
       description:
         "The name of the branch where you want to import your content. If you don't mention the branch name, then by default the content will be imported to the main branch.",
-      parse: printFlagDeprecation(['-B'], ['--branch']),
-      exclusive: ['branch-alias']
+      exclusive: ['branch-alias'],
     }),
     'branch-alias': flags.string({
       description:
-        "Specify the branch alias where you want to import your content. If not specified, the content is imported into the main branch by default.",
+        'Specify the branch alias where you want to import your content. If not specified, the content is imported into the main branch by default.',
       exclusive: ['branch'],
     }),
   };
 
-  static aliases: string[] = ['cm:import-setup'];
+  static aliases: string[] = [];
 
-  static usage: string = 'cm:stacks:import-setup [-k <value>] [-d <value>] [-a <value>] [--modules <value,value>]';
+  static usage = 'cm:stacks:import-setup [-k <value>] [-d <value>] [-a <value>] [--modules <value,value>]';
 
   async run(): Promise<void> {
     try {
       const { flags } = await this.parse(ImportSetupCommand);
-      let importSetupConfig = await setupImportConfig(flags);
+      const importSetupConfig = await setupImportConfig(flags);
       // Note setting host to create cma client
       importSetupConfig.host = this.cmaHost;
       importSetupConfig.region = this.region;
diff --git a/packages/contentstack-import-setup/src/import/import-setup.ts b/packages/contentstack-import-setup/src/import/import-setup.ts
index 76eaaf2de6..35b8980ffb 100644
--- a/packages/contentstack-import-setup/src/import/import-setup.ts
+++ b/packages/contentstack-import-setup/src/import/import-setup.ts
@@ -1,13 +1,12 @@
 import { ImportConfig, Modules } from '../types';
 import { backupHandler, log, setupBranchConfig } from '../utils';
 import { ContentstackClient } from '@contentstack/cli-utilities';
-import { validateBranch } from '../utils';
 
 export default class ImportSetup {
   protected config: ImportConfig;
-  private managementAPIClient: ContentstackClient;
-  private importConfig: ImportConfig;
-  private stackAPIClient: any;
+  private readonly managementAPIClient: ContentstackClient;
+  private readonly importConfig: ImportConfig;
+  private readonly stackAPIClient: any;
   public dependencyTree: { [key: string]: string[] } = {};
 
   constructor(config: ImportConfig, managementAPIClient: ContentstackClient) {
@@ -35,7 +34,7 @@ export default class ImportSetup {
       visited.add(module);
       const dependencies: Modules[] = this.config.modules[module]?.dependencies || [];
 
-      let allDeps: Modules[] = [...dependencies];
+      const allDeps: Modules[] = [...dependencies];
 
       for (const dependency of dependencies) {
         allDeps.push(...getAllDependencies(dependency as ModulesKey));
@@ -53,7 +52,9 @@ export default class ImportSetup {
       this.dependencyTree[module] = allDependencies;
 
       // Mark these dependencies as assigned so they won't be included in later modules
-      allDependencies.forEach((dep) => assignedDependencies.add(dep));
+      for (const dep of allDependencies) {
+        assignedDependencies.add(dep);
+      }
     }
   }
 
@@ -107,7 +108,7 @@ export default class ImportSetup {
       await this.generateDependencyTree();
       await this.runModuleImports();
     } catch (error) {
-      console.log(error);
+      log(this.config, `Error during import setup: ${error instanceof Error ? error.message : String(error)}`, 'error');
       throw error;
     }
   }
diff --git a/packages/contentstack-import-setup/src/import/modules/assets.ts b/packages/contentstack-import-setup/src/import/modules/assets.ts
index e27081a1ae..189aed4cae 100644
--- a/packages/contentstack-import-setup/src/import/modules/assets.ts
+++ b/packages/contentstack-import-setup/src/import/modules/assets.ts
@@ -89,7 +89,7 @@ export default class AssetImportSetup extends BaseImportSetup {
       });
 
       if (chunk) {
-        let apiContent = orderBy(values(chunk as Record<string, any>[]), '_version');
+        const apiContent = orderBy(values(chunk as Record<string, any>[]), '_version');
 
         await this.makeConcurrentCall(
           {
diff --git a/packages/contentstack-import-setup/src/import/modules/taxonomies.ts b/packages/contentstack-import-setup/src/import/modules/taxonomies.ts
index 38dcad4c9c..2017dd2902 100644
--- a/packages/contentstack-import-setup/src/import/modules/taxonomies.ts
+++ b/packages/contentstack-import-setup/src/import/modules/taxonomies.ts
@@ -18,7 +18,7 @@ export default class TaxonomiesImportSetup {
   private taxonomiesMapperDirPath: string;
   private termsMapperDirPath: string;
   private localesFilePath: string;
-  private isLocaleBasedStructure: boolean = false;
+  private isLocaleBasedStructure = false;
   public taxonomiesMapper: Record<string, unknown> = {};
   public termsMapper: Record<string, unknown> = {};
   public masterLocaleFilePath: string;
diff --git a/packages/contentstack-import-setup/src/types/index.ts b/packages/contentstack-import-setup/src/types/index.ts
index 844e765f5a..18584e6595 100644
--- a/packages/contentstack-import-setup/src/types/index.ts
+++ b/packages/contentstack-import-setup/src/types/index.ts
@@ -62,7 +62,7 @@ export interface InquirePayload {
   name: string;
   message: string;
   choices?: Array<any>;
-  transformer?: Function;
+  transformer?: (...args: any[]) => any;
 }
 
 export interface User {
diff --git a/packages/contentstack-import-setup/src/utils/file-helper.ts b/packages/contentstack-import-setup/src/utils/file-helper.ts
index e5c613b90d..d71aa9bbc9 100644
--- a/packages/contentstack-import-setup/src/utils/file-helper.ts
+++ b/packages/contentstack-import-setup/src/utils/file-helper.ts
@@ -4,7 +4,7 @@ import mkdirp from 'mkdirp';
 import * as bigJSON from 'big-json';
 import { FsUtility, sanitizePath } from '@contentstack/cli-utilities';
 
-export const readFileSync = function (filePath: string, parse: boolean = true): any {
+export const readFileSync = function (filePath: string, parse = true): any {
   let data;
   filePath = path.resolve(sanitizePath(filePath));
   if (fs.existsSync(filePath)) {
@@ -87,7 +87,7 @@ export const writeLargeFile = function (filePath: string, data: any): Promise<an
     const stringifyStream = bigJSON.createStringifyStream({
       body: data,
     });
-    var writeStream = fs.createWriteStream(filePath, 'utf-8');
+    const writeStream = fs.createWriteStream(filePath, 'utf-8');
     stringifyStream.pipe(writeStream);
     writeStream.on('finish', () => {
       resolve('');
@@ -98,9 +98,9 @@ export const writeLargeFile = function (filePath: string, data: any): Promise<an
   });
 };
 
-export const makeDirectory = function (dir: string): void {
-  for (let key in arguments) {
-    const dirname = path.resolve(arguments[key]);
+export const makeDirectory = function (...dirs: string[]): void {
+  for (const dir of dirs) {
+    const dirname = path.resolve(dir);
     if (!fs.existsSync(dirname)) {
       mkdirp.sync(dirname);
     }
diff --git a/packages/contentstack-import-setup/src/utils/import-config-handler.ts b/packages/contentstack-import-setup/src/utils/import-config-handler.ts
index 9949274beb..ea2161254b 100644
--- a/packages/contentstack-import-setup/src/utils/import-config-handler.ts
+++ b/packages/contentstack-import-setup/src/utils/import-config-handler.ts
@@ -1,6 +1,5 @@
 import merge from 'merge';
 import * as path from 'path';
-import { omit, filter, includes, isArray } from 'lodash';
 import { configHandler, isAuthenticated, cliux, sanitizePath } from '@contentstack/cli-utilities';
 import defaultConfig from '../config';
 import { readFile, fileExistsSync } from './file-helper';
@@ -9,7 +8,7 @@ import login from './login-handler';
 import { ImportConfig } from '../types';
 
 const setupConfig = async (importCmdFlags: any): Promise<ImportConfig> => {
-  let config: ImportConfig = merge({}, defaultConfig);
+  const config: ImportConfig = merge({}, defaultConfig);
   // setup the config
   // if (importCmdFlags['config']) {
   //   let externalConfig = await readFile(importCmdFlags['config']);
diff --git a/packages/contentstack-import-setup/src/utils/interactive.ts b/packages/contentstack-import-setup/src/utils/interactive.ts
index 899eeb577b..be31614017 100644
--- a/packages/contentstack-import-setup/src/utils/interactive.ts
+++ b/packages/contentstack-import-setup/src/utils/interactive.ts
@@ -1,7 +1,5 @@
 import { cliux, validatePath } from '@contentstack/cli-utilities';
 import * as path from 'path';
-import first from 'lodash/first';
-import split from 'lodash/split';
 
 export const askContentDir = async (): Promise<string> => {
   let result = await cliux.inquire<string>({
diff --git a/packages/contentstack-import-setup/src/utils/logger.ts b/packages/contentstack-import-setup/src/utils/logger.ts
index f766334b3f..eecd26715b 100644
--- a/packages/contentstack-import-setup/src/utils/logger.ts
+++ b/packages/contentstack-import-setup/src/utils/logger.ts
@@ -6,19 +6,16 @@
 
 import * as winston from 'winston';
 import * as path from 'path';
-import mkdirp from 'mkdirp';
 import { ImportConfig } from '../types';
 import { sanitizePath, redactObject } from '@contentstack/cli-utilities';
 
-const slice = Array.prototype.slice;
-
 const ansiRegexPattern = [
   '[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)',
   '(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))',
 ].join('|');
 
 function returnString(args: any[]) {
-  var returnStr = '';
+  let returnStr = '';
   if (args && args.length) {
     returnStr = args
       .map(function (item) {
@@ -39,7 +36,7 @@ function returnString(args: any[]) {
   returnStr = returnStr.replace(new RegExp(ansiRegexPattern, 'g'), '').trim();
   return returnStr;
 }
-var myCustomLevels = {
+const myCustomLevels = {
   levels: {
     warn: 1,
     info: 2,
@@ -108,30 +105,26 @@ function init(_logPath: string) {
   }
 
   return {
-    log: function (message: any) {
-      let args = slice.call(arguments);
-      let logString = returnString(args);
+    log: function (...args: any[]) {
+      const logString = returnString(args);
       if (logString) {
         logger.log('info', logString);
       }
     },
-    warn: function (message: any) {
-      let args = slice.call(arguments);
-      let logString = returnString(args);
+    warn: function (...args: any[]) {
+      const logString = returnString(args);
       if (logString) {
         logger.log('warn', logString);
       }
     },
-    error: function (message: any) {
-      let args = slice.call(arguments);
-      let logString = returnString(args);
+    error: function (...args: any[]) {
+      const logString = returnString(args);
       if (logString) {
         errorLogger.log('error', logString);
       }
     },
-    debug: function () {
-      let args = slice.call(arguments);
-      let logString = returnString(args);
+    debug: function (...args: any[]) {
+      const logString = returnString(args);
       if (logString) {
         logger.log('debug', logString);
       }
diff --git a/packages/contentstack-import-setup/src/utils/login-handler.ts b/packages/contentstack-import-setup/src/utils/login-handler.ts
index 996e7797a8..0c05e6d80d 100644
--- a/packages/contentstack-import-setup/src/utils/login-handler.ts
+++ b/packages/contentstack-import-setup/src/utils/login-handler.ts
@@ -35,7 +35,7 @@ const login = async (config: ImportConfig): Promise<any> => {
       management_token: config.management_token,
     });
     const stack = await stackAPIClient.fetch().catch((error: any) => {
-      let errorstack_key = error?.errors?.api_key;
+      const errorstack_key = error?.errors?.api_key;
       if (errorstack_key) {
         log(config, 'Stack Api key ' + errorstack_key[0] + 'Please enter valid Key', 'error');
         throw error;
diff --git a/packages/contentstack-import-setup/test/unit/import-setup.test.ts b/packages/contentstack-import-setup/test/unit/import-setup.test.ts
index ee0eca6b6d..3f660f87c7 100644
--- a/packages/contentstack-import-setup/test/unit/import-setup.test.ts
+++ b/packages/contentstack-import-setup/test/unit/import-setup.test.ts
@@ -3,17 +3,17 @@ import { stub, restore, SinonStub } from 'sinon';
 import ImportSetup from '../../src/import/import-setup';
 import * as backupHandlerModule from '../../src/utils/backup-handler';
 import * as loggerModule from '../../src/utils/logger';
-import * as commonHelperModule from '../../src/utils/common-helper';
-import { ImportConfig } from '../../src/types';
+import * as setupBranchModule from '../../src/utils/setup-branch';
+import { ImportConfig, Modules } from '../../src/types';
 
 describe('ImportSetup', () => {
   let mockStackAPIClient: any;
   let mockManagementAPIClient: any;
   let backupHandlerStub: SinonStub;
-  let logStub: SinonStub;
-  let validateBranchStub: SinonStub;
+  let setupBranchConfigStub: SinonStub;
   let importSetup: ImportSetup;
   let fetchStub: SinonStub;
+  let branchQueryStub: SinonStub;
 
   const baseConfig: ImportConfig = {
     host: 'https://api.contentstack.io',
@@ -58,6 +58,11 @@ describe('ImportSetup', () => {
         fileName: 'environments',
         dependencies: [],
       },
+      locales: {
+        dirName: 'locales',
+        fileName: 'locales',
+        dependencies: [],
+      },
       entries: {
         dirName: 'entries',
         fileName: 'entries',
@@ -90,8 +95,16 @@ describe('ImportSetup', () => {
       org_uid: 'test-org-uid',
     });
 
+    branchQueryStub = stub().returns({
+      find: stub().resolves({ items: [] }),
+    });
+
     mockStackAPIClient = {
       fetch: fetchStub,
+      branch: stub().returns({
+        query: branchQueryStub,
+        fetch: stub().resolves({ uid: 'branch-uid', name: 'test-branch' }),
+      }),
     };
 
     mockManagementAPIClient = {
@@ -99,8 +112,9 @@ describe('ImportSetup', () => {
     };
 
     backupHandlerStub = stub(backupHandlerModule, 'default').resolves('/backup/path');
-    logStub = stub(loggerModule, 'log');
-    validateBranchStub = stub(commonHelperModule, 'validateBranch').resolves({ uid: 'branch-uid' });
+    // Stub log to prevent console output during tests
+    stub(loggerModule, 'log');
+    setupBranchConfigStub = stub(setupBranchModule, 'setupBranchConfig').resolves();
 
     importSetup = new ImportSetup(baseConfig, mockManagementAPIClient);
   });
@@ -136,29 +150,78 @@ describe('ImportSetup', () => {
     expect((importSetup as any).config.backupDir).to.equal('/backup/path');
   });
 
-  it('should validate branch if branchName is provided', async () => {
-    const configWithBranch = { ...baseConfig, branchName: 'development' };
-    importSetup = new ImportSetup(configWithBranch, mockManagementAPIClient);
-
+  it('should call setupBranchConfig during start', async () => {
     await importSetup.start();
-    expect(validateBranchStub.calledOnce).to.be.true;
-    expect(validateBranchStub.calledWith(mockStackAPIClient, configWithBranch, 'development')).to.be.true;
+    expect(setupBranchConfigStub.calledOnce).to.be.true;
+    expect(setupBranchConfigStub.calledWith(baseConfig, mockStackAPIClient)).to.be.true;
   });
 
-  it('should not validate branch if branchName is not provided', async () => {
-    await importSetup.start();
-    expect(validateBranchStub.called).to.be.false;
+  it('should generate dependency tree correctly for single module', async () => {
+    await (importSetup as any).generateDependencyTree();
+
+    const dependencyTree = importSetup.dependencyTree;
+    expect(dependencyTree).to.have.property('entries');
+    expect(dependencyTree.entries).to.include('content-types');
+    expect(dependencyTree.entries).to.include('assets');
+    expect(dependencyTree.entries).to.include('global-fields');
   });
 
-  it('should generate dependency tree correctly', async () => {
-    // Access the protected method using any
+  it('should generate dependency tree correctly for multiple modules', async () => {
+    const configWithMultipleModules: ImportConfig = {
+      ...baseConfig,
+      selectedModules: ['entries', 'content-types'] as Modules[],
+    };
+    importSetup = new ImportSetup(configWithMultipleModules, mockManagementAPIClient);
     await (importSetup as any).generateDependencyTree();
 
     const dependencyTree = importSetup.dependencyTree;
     expect(dependencyTree).to.have.property('entries');
+    expect(dependencyTree).to.have.property('content-types');
+    // entries should have content-types, assets, and global-fields
     expect(dependencyTree.entries).to.include('content-types');
     expect(dependencyTree.entries).to.include('assets');
     expect(dependencyTree.entries).to.include('global-fields');
+    // content-types should have empty dependencies since global-fields was already assigned to entries
+    // This is the expected behavior - dependencies are not duplicated across modules
+    expect(dependencyTree['content-types']).to.be.an('array');
+  });
+
+  it('should handle visited modules to prevent infinite loops', async () => {
+    // Test that the visited set prevents processing the same module twice
+    const configWithRepeatedDeps: ImportConfig = {
+      ...baseConfig,
+      selectedModules: ['entries', 'content-types'] as Modules[],
+    };
+    importSetup = new ImportSetup(configWithRepeatedDeps, mockManagementAPIClient);
+
+    await (importSetup as any).generateDependencyTree();
+    const dependencyTree = importSetup.dependencyTree;
+    // Both modules should be in the tree
+    expect(dependencyTree).to.have.property('entries');
+    expect(dependencyTree).to.have.property('content-types');
+  });
+
+  it('should call runModuleImports after generating dependency tree in start', async () => {
+    const runModuleImportsSpy = stub(importSetup as any, 'runModuleImports').resolves();
+
+    await importSetup.start();
+
+    // Verify runModuleImports was called after dependency tree generation
+    expect(runModuleImportsSpy.calledOnce).to.be.true;
+    expect(importSetup.dependencyTree).to.not.be.empty;
+  });
+
+  it('should handle errors during module import and propagate them', async () => {
+    const testError = new Error('Module import failed');
+    stub(importSetup as any, 'runModuleImports').rejects(testError);
+
+    try {
+      await importSetup.start();
+      expect.fail('Should have thrown an error');
+    } catch (error: any) {
+      expect(error.message).to.include('Module import failed');
+      // Error should be propagated from start method
+    }
   });
 
   it('should handle errors during start process', async () => {
@@ -171,4 +234,79 @@ describe('ImportSetup', () => {
       expect(error.message).to.equal('API Error');
     }
   });
+
+  it('should handle backup handler returning undefined', async () => {
+    backupHandlerStub.resolves(undefined);
+
+    await importSetup.start();
+    expect(backupHandlerStub.calledOnce).to.be.true;
+    // backupDir should remain unchanged if backupHandler returns undefined
+  });
+
+  it('should complete full start process successfully', async () => {
+    // This test verifies the entire flow works together
+    await importSetup.start();
+
+    expect(fetchStub.calledOnce).to.be.true;
+    expect(backupHandlerStub.calledOnce).to.be.true;
+    expect(setupBranchConfigStub.calledOnce).to.be.true;
+    expect(importSetup.dependencyTree).to.have.property('entries');
+  });
+
+  it('should handle empty selected modules', async () => {
+    const configWithEmptyModules: ImportConfig = {
+      ...baseConfig,
+      selectedModules: [] as Modules[],
+    };
+    importSetup = new ImportSetup(configWithEmptyModules, mockManagementAPIClient);
+
+    await (importSetup as any).generateDependencyTree();
+    expect(Object.keys(importSetup.dependencyTree)).to.have.length(0);
+  });
+
+  it('should handle modules with no dependencies', async () => {
+    const configWithNoDeps: ImportConfig = {
+      ...baseConfig,
+      selectedModules: ['assets'] as Modules[],
+    };
+    importSetup = new ImportSetup(configWithNoDeps, mockManagementAPIClient);
+
+    await (importSetup as any).generateDependencyTree();
+    const dependencyTree = importSetup.dependencyTree;
+    expect(dependencyTree).to.have.property('assets');
+    expect(dependencyTree.assets).to.be.an('array').that.is.empty;
+  });
+
+  it('should call setupBranchConfig with branchName when provided', async () => {
+    const configWithBranch: ImportConfig = {
+      ...baseConfig,
+      branchName: 'development',
+    };
+    importSetup = new ImportSetup(configWithBranch, mockManagementAPIClient);
+
+    await importSetup.start();
+
+    expect(setupBranchConfigStub.calledOnce).to.be.true;
+    expect(setupBranchConfigStub.calledWith(configWithBranch, mockStackAPIClient)).to.be.true;
+  });
+
+  it('should call setupBranchConfig with branchAlias when provided', async () => {
+    const configWithBranchAlias: ImportConfig = {
+      ...baseConfig,
+      branchAlias: 'dev-alias',
+    };
+    importSetup = new ImportSetup(configWithBranchAlias, mockManagementAPIClient);
+
+    await importSetup.start();
+
+    expect(setupBranchConfigStub.calledOnce).to.be.true;
+    expect(setupBranchConfigStub.calledWith(configWithBranchAlias, mockStackAPIClient)).to.be.true;
+  });
+
+  it('should call setupBranchConfig even when no branch is provided', async () => {
+    await importSetup.start();
+
+    expect(setupBranchConfigStub.calledOnce).to.be.true;
+    expect(setupBranchConfigStub.calledWith(baseConfig, mockStackAPIClient)).to.be.true;
+  });
 });
diff --git a/packages/contentstack-import-setup/test/unit/login-handler.test.ts b/packages/contentstack-import-setup/test/unit/login-handler.test.ts
index dfdb08450c..4ba66c63bf 100644
--- a/packages/contentstack-import-setup/test/unit/login-handler.test.ts
+++ b/packages/contentstack-import-setup/test/unit/login-handler.test.ts
@@ -1,10 +1,10 @@
 import { expect } from 'chai';
 import { stub, restore, SinonStub } from 'sinon';
-import proxyquire from 'proxyquire';
-import loginHandler from '../../src/utils/login-handler';
-import * as logger from '../../src/utils/logger';
 import { ImportConfig } from '../../src/types';
 
+// Use CommonJS require for proxyquire to work properly
+const proxyquire = require('proxyquire');
+
 describe('Login Handler', () => {
   let managementSDKClientStub: SinonStub;
   let clientLoginStub: SinonStub;
@@ -13,34 +13,7 @@ describe('Login Handler', () => {
   let logStub: SinonStub;
   let isAuthenticatedStub: SinonStub;
   let mockStack: any;
-
-  // Setup stubs for client methods
-  clientLoginStub = stub();
-  fetchStub = stub();
-
-  mockStack = {
-    fetch: fetchStub,
-  };
-
-  stackStub = stub().returns(mockStack);
-
-  // Create a mock client that will be returned by managementSDKClient
-  const mockClient = {
-    login: clientLoginStub,
-    stack: stackStub,
-  };
-
-  // Make managementSDKClient return our mock client
-  managementSDKClientStub = stub().resolves(mockClient);
-  isAuthenticatedStub = stub().returns(false);
-
-  // Load the compiled JS version of your TS file
-  const { default: loginHandler } = proxyquire('../../src/utils/login-handler', {
-    '@contentstack/cli-utilities': {
-      managementSDKClient: managementSDKClientStub,
-      isAuthenticated: isAuthenticatedStub,
-    },
-  });
+  let loginHandler: any;
 
   // Base mock config that satisfies ImportConfig type
   const baseConfig: Partial<ImportConfig> = {
@@ -60,7 +33,48 @@ describe('Login Handler', () => {
   beforeEach(() => {
     restore();
 
-    logStub = stub(logger, 'log');
+    // Setup stubs for client methods
+    clientLoginStub = stub();
+    fetchStub = stub();
+    logStub = stub();
+
+    mockStack = {
+      fetch: fetchStub,
+    };
+
+    stackStub = stub().returns(mockStack);
+
+    // Create a mock client that will be returned by managementSDKClient
+    const mockClient = {
+      login: clientLoginStub,
+      stack: stackStub,
+    };
+
+    // Make managementSDKClient return our mock client
+    managementSDKClientStub = stub().resolves(mockClient);
+    isAuthenticatedStub = stub().returns(false);
+
+    // Use proxyquire to load the compiled JS module with mocked dependencies
+    // Need to use require.resolve to get the proper module path
+    // Clear cache to ensure fresh module load
+    const loginHandlerPath = require.resolve('../../lib/utils/login-handler.js');
+    if (require.cache[loginHandlerPath]) {
+      delete require.cache[loginHandlerPath];
+    }
+
+    // Use proxyquire to mock the dependencies
+    // Also stub the logger module so we can verify log calls
+    const loginHandlerModule = proxyquire(loginHandlerPath, {
+      '@contentstack/cli-utilities': {
+        managementSDKClient: managementSDKClientStub,
+        isAuthenticated: isAuthenticatedStub,
+      },
+      './logger': {
+        log: logStub,
+      },
+    });
+
+    loginHandler = loginHandlerModule.default || loginHandlerModule;
   });
 
   afterEach(() => {
diff --git a/packages/contentstack/README.md b/packages/contentstack/README.md
index e19ed7b138..00b3caa965 100644
--- a/packages/contentstack/README.md
+++ b/packages/contentstack/README.md
@@ -2718,14 +2718,14 @@ USAGE
   $ csdx cm:stacks:import-setup [-k <value>] [-d <value>] [-a <value>] [--modules <value,value>]
 
 FLAGS
-  -B, --branch=<value>         The name of the branch where you want to import your content. If you don't mention the
-                               branch name, then by default the content will be imported to the main branch.
   -a, --alias=<value>          The management token of the destination stack where you will import the content.
   -d, --data-dir=<value>       The path or the location in your file system where the content, you intend to import, is
                                stored. For example, -d "C:\Users\Name\Desktop\cli\content". If the export folder has
                                branches involved, then the path should point till the particular branch. For example,
                                “-d "C:\Users\Name\Desktop\cli\content\branch_name"
   -k, --stack-api-key=<value>  API key of the target stack
+      --branch=<value>         The name of the branch where you want to import your content. If you don't mention the
+                               branch name, then by default the content will be imported to the main branch.
       --branch-alias=<value>   Specify the branch alias where you want to import your content. If not specified, the
                                content is imported into the main branch by default.
       --module=<option>...     [optional] Specify the modules/module to import into the target stack. currently options
@@ -2736,11 +2736,7 @@ DESCRIPTION
   Helps to generate mappers and backup folder for importing (overwriting) specific modules
 
 EXAMPLES
-  $ csdx cm:stacks:import-setup --stack-api-key <target_stack_api_key> --data-dir <path/of/export/destination/dir> --modules <module_name, module_name>
-
-  $ csdx cm:stacks:import-setup -k <target_stack_api_key> -d <path/of/export/destination/dir> --modules <module_name, module_name>
-
-  $ csdx cm:stacks:import-setup -k <target_stack_api_key> -d <path/of/export/destination/dir> --modules <module_name, module_name> -b <branch_name>
+  $ csdx cm:stacks:import-setup --stack-api-key <target_stack_api_key> --data-dir <path/of/export/destination/dir> --modules <module_name, module_name> --branch <branch_name>
 ```
 
 _See code: [@contentstack/cli-cm-import-setup](https://github.com/contentstack/cli/blob/main/packages/contentstack-import-setup/src/commands/cm/stacks/import-setup.ts)_