diff --git a/README.md b/README.md
index ffe3bc0b4..06f12e260 100644
--- a/README.md
+++ b/README.md
@@ -1569,18 +1569,18 @@ generate inspec_metadata      Generate an InSpec metadata template for "saf conv
 
 #### Inspec Profile
 ```
-generate inspec_profile              Generate a new skeleton profile based on a XCCDF benchmark file
+generate inspec_profile              Generate a new skeleton profile based on a (STIG or CIS) XCCDF benchmark file 
 
 USAGE
-  $ saf generate inspec_profile -i <stig-xccdf-xml> [-o <output-folder>] [-h] [-m <metadata-json>] [-T (rule|group|cis|version)] [-s] [-L (info|warn|debug|verbose)]
+  $ saf generate inspec_profile -X <[stig or cis]-xccdf-xml> [-O <oval-xccdf-xml>] [-o <output-folder>] [-m <metadata-json>] [-s] [-T rule|group|cis|version] [--interactive] [-L info|warn|debug|verbose] 
 
 FLAGS
+  -X, --xccdfXmlFile=<value>     (required) Path to the XCCDF benchmark file
   -O, --ovalDefinitions=<value>  Path to an OVAL definitions file to populate profile elements that reference OVAL definitions
   -T, --idType=<option>          [default: rule] Control ID Types: 'rule' - Vulnerability IDs (ex. 'SV-XXXXX'), 'group' -
                                  Group IDs (ex. 'V-XXXXX'), 'cis' - CIS Rule IDs (ex.
                                  C-1.1.1.1), 'version' - Version IDs (ex. RHEL-07-010020 - also known as STIG IDs)
                                  <options: rule|group|cis|version>
-  -i, --xccdfXmlFile=<value>     (required) Path to the XCCDF benchmark file
   -m, --metadata=<value>         Path to a JSON file with additional metadata for the inspec.yml
                                  The metadata Json is of the following format:
                                  {"maintainer": string, "copyright": string, "copyright_email": string, "license": string, "version": string}
@@ -1597,8 +1597,8 @@ ALIASES
   $ saf generate xccdf_benchmark2inspec_stub
 
 EXAMPLES
-  $ saf generate xccdf_benchmark2inspec_stub -i ./U_RHEL_6_STIG_V2R2_Manual-xccdf.xml -T group --logLevel debug -r rhel-6-update-report.md
-  $ saf generate xccdf_benchmark2inspec_stub -i ./CIS_Ubuntu_Linux_18.04_LTS_Benchmark_v1.1.0-xccdf.xml -O ./CIS_Ubuntu_Linux_18.04_LTS_Benchmark_v1.1.0-oval.xml --logLevel debug
+  $ saf generate xccdf_benchmark2inspec_stub -X ./U_RHEL_6_STIG_V2R2_Manual-xccdf.xml -T group --logLevel debug -r rhel-6-update-report.md
+  $ saf generate xccdf_benchmark2inspec_stub -X ./CIS_Ubuntu_Linux_18.04_LTS_Benchmark_v1.1.0-xccdf.xml -O ./CIS_Ubuntu_Linux_18.04_LTS_Benchmark_v1.1.0-oval.xml --logLevel debug
 ```
 [top](#generate-data-reports-and-more)
 #### Thresholds
diff --git a/package-lock.json b/package-lock.json
index 11ee51ed0..e10bc3c57 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10375,19 +10375,6 @@
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
     },
-    "node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
     "node_modules/function-bind": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
diff --git a/package.json b/package.json
index 956c45a7c..e02fab3d2 100644
--- a/package.json
+++ b/package.json
@@ -192,8 +192,8 @@
     "dev": "rm -rf lib && tsc && node bin/run",
     "test": "npm run test:mocha && npm run test:jest",
     "tests": "npm run test",
-    "test:mocha": "ts-mocha --timeout 8500 --forbid-only \"test/**/*.test.ts\"",
-    "test:mocha:one": "ts-mocha --timeout 8500 --forbid-only",
+    "test:mocha": "ts-mocha --timeout 25000 --forbid-only \"test/**/*.test.ts\"",
+    "test:mocha:one": "ts-mocha --timeout 25000 --forbid-only",
     "test:jest": "jest",
     "test:jest:one": "jest --findRelatedTests",
     "prepack": "run-script-os",
diff --git a/src/commands/generate/inspec_profile.ts b/src/commands/generate/inspec_profile.ts
index 678c5c232..227ea8653 100644
--- a/src/commands/generate/inspec_profile.ts
+++ b/src/commands/generate/inspec_profile.ts
@@ -13,20 +13,20 @@ import YAML from 'yaml'
 
 export default class InspecProfile extends BaseCommand<typeof InspecProfile> {
   static readonly usage =
-    '<%= command.id %> -i <stig-xccdf-xml> [-o <output-folder>] [-h] [-m <metadata-json>] ' +
-    '[-T (rule|group|cis|version)] [-s] [-L (info|warn|debug|verbose)]'
+    '<%= command.id %> -X <[stig or cis]-xccdf-xml> [--interactive] [-L info|warn|debug|verbose] ' +
+    '[-m <metadata-json>] [-s] [-T rule|group|cis|version] [-O <oval-xccdf-xml>] [-o <output-folder>]'
 
   static readonly description =
-    'Generate a new skeleton profile based on a XCCDF benchmark file'
+    'Generate a new skeleton profile based on a (STIG or CIS) XCCDF benchmark file'
 
   static readonly examples = [
     {
       description: '\x1B[93mRequired flag only\x1B[0m',
-      command: '<%= config.bin %> <%= command.id %> -i ./U_RHEL_6_STIG_V2R2_Manual-xccdf.xml',
+      command: '<%= config.bin %> <%= command.id %> -X ./U_RHEL_6_STIG_V2R2_Manual-xccdf.xml',
     },
     {
       description: '\x1B[93mSpecifying OVAL and Output location\x1B[0m',
-      command: '<%= config.bin %> <%= command.id %> -i ./U_RHEL_9_STIG_V1R2_Manual-xccdf.xml -O ./RHEL_9_Benchmark-oval.xml -o ./output/directory',
+      command: '<%= config.bin %> <%= command.id %> -X ./U_RHEL_9_STIG_V1R2_Manual-xccdf.xml -O ./RHEL_9_Benchmark-oval.xml -o ./output/directory',
     },
   ]
 
@@ -34,7 +34,7 @@ export default class InspecProfile extends BaseCommand<typeof InspecProfile> {
 
   static readonly flags = {
     xccdfXmlFile: Flags.string({
-      char: 'i',
+      char: 'X',
       required: true,
       description: 'Path to the XCCDF benchmark file',
     }),
@@ -113,7 +113,9 @@ export default class InspecProfile extends BaseCommand<typeof InspecProfile> {
     const xmlDoc = new parser.XMLParser(options).parse(xccdf)
     let outDir = ''
     if (flags.output === 'profile') {
-      const benchmarkTitle = _.get(xmlDoc, 'Benchmark.title')
+      const benchmarkTitle = (flags.idType.toLocaleLowerCase() === 'cis') ?
+        _.get(xmlDoc, 'xccdf:Benchmark.xccdf:title.#text') :
+        _.get(xmlDoc, 'Benchmark.title')
       outDir = (benchmarkTitle === undefined) ?
         flags.output :
         benchmarkTitle.replace('Security Technical Implementation Guide', 'stig-baseline')
@@ -176,8 +178,11 @@ export default class InspecProfile extends BaseCommand<typeof InspecProfile> {
 
     // Set profile default values (values used to generate the inspect.yml file)
     logger.info('Generating markdown and yaml files...')
-    const readmeObj = getReadmeContent(xmlDoc)
+    const readmeObj = flags.idType.toLocaleLowerCase() === 'cis' ?
+      getCISReadmeContent(xmlDoc) :
+      getDISAReadmeContent(xmlDoc)
 
+    // Set default values for the inspec.yml file
     profile.name = readmeObj.profileName
     profile.title = readmeObj.profileTitle
     profile.maintainer = 'MITRE SAF Team'
@@ -206,6 +211,7 @@ export default class InspecProfile extends BaseCommand<typeof InspecProfile> {
     generateLicense(outDir, logger)
     generateNotice(outDir, logger)
     generateRubocopYml(outDir, logger)
+    generateGemRc(outDir, logger)
     generateGemFile(outDir, logger)
     generateRakeFile(outDir, logger)
     generateGitIgnoreFile(outDir, logger)
@@ -231,17 +237,25 @@ export default class InspecProfile extends BaseCommand<typeof InspecProfile> {
         )
       })
     }
+
+    logger.info('Generation of skeleton profile completed - All done now')
   }
 }
 
-function getReadmeContent(_xmlDoc: any): InspecReadme {
+function getDISAReadmeContent(_xmlDoc: any): InspecReadme {
   const readmeObj: InspecReadme = {
     profileName: '',
     profileTitle: '',
     profileVersion: '',
-    stigVersion: '',
-    stigDate: '',
+    benchmarkVersion: '',
+    benchmarkDate: '',
     profileShortName: '',
+    profileType: 'STIG',
+    profileGuidance: 'STIG Guidance',
+    profileGuidanceAgency: 'Defense Information Systems Agency (DISA)',
+    profileDeveloperPartner: 'in partnership between the DISA Services Directorate (SD) and the DISA Risk Management Executive (RME) office',
+    profileCompliance: '[Department of Defense (DoD) STIG](https://public.cyber.mil/stigs/)',
+    profileDevelopers: 'DISA RME and DISA SD Office, along with their vendor partners, create and maintain a set of Security Technical Implementation Guides',
   }
 
   const benchmarkTitle = _.get(_xmlDoc, 'Benchmark.title')
@@ -256,7 +270,7 @@ function getReadmeContent(_xmlDoc: any): InspecReadme {
   // stigRelDate is in the form of: ["Release"," 1 Benchmark Date"," 24 Jul 2024"]
   const stigRelDate = releaseInfoObj['#text'].split(':')
   const stigRelease = stigRelDate[1].trim().split(' ')[0]
-  const sitgVersion = `Version ${stigVersion} Release ${stigRelease} (V${stigVersion}R${stigRelease})`
+  const stigDisplayVersion = `Version ${stigVersion} Release ${stigRelease} (V${stigVersion}R${stigRelease})`
   const stigDate = stigRelDate[2]
 
   readmeObj.profileName = benchmarkTitle.replace(
@@ -265,8 +279,38 @@ function getReadmeContent(_xmlDoc: any): InspecReadme {
   readmeObj.profileShortName = benchmarkTitle.replace('Security Technical Implementation Guide', '').trim()
   readmeObj.profileTitle = benchmarkTitle
   readmeObj.profileVersion = `${stigVersion}.${stigRelease}.0`
-  readmeObj.stigDate = stigDate
-  readmeObj.stigVersion = sitgVersion
+  readmeObj.benchmarkDate = stigDate
+  readmeObj.benchmarkVersion = stigDisplayVersion
+
+  return readmeObj
+}
+
+function getCISReadmeContent(_xmlDoc: any): InspecReadme {
+  const readmeObj: InspecReadme = {
+    profileName: '',
+    profileTitle: '',
+    profileVersion: '',
+    benchmarkVersion: '',
+    benchmarkDate: '',
+    profileShortName: '',
+    profileType: 'CIS',
+    profileGuidance: 'CIS Guidance',
+    profileGuidanceAgency: 'Center for Internet Security (CIS)',
+    profileDeveloperPartner: '',
+    profileCompliance: '[Center for Internet Security (CIS) Benchmark](https://www.cisecurity.org/cis-benchmarks)',
+    profileDevelopers: 'Center for Internet Security, Inc. (CIS®) create and maintain a set of Critical Security Controls (CIS Controls)',
+  }
+
+  const benchmarkTitle = _.get(_xmlDoc, 'xccdf:Benchmark.xccdf:title.#text')
+  const cisVersion = _.get(_xmlDoc, 'xccdf:Benchmark.xccdf:version')
+  const cisDate = _.get(_xmlDoc, 'xccdf:Benchmark.xccdf:status.@_date')
+
+  readmeObj.profileName = benchmarkTitle.replaceAll(' ', '-').toLowerCase()
+  readmeObj.profileShortName = benchmarkTitle.replace('Benchmark', '').trim()
+  readmeObj.profileTitle = benchmarkTitle
+  readmeObj.profileVersion = cisVersion
+  readmeObj.benchmarkDate = cisDate
+  readmeObj.benchmarkVersion = cisVersion
 
   return readmeObj
 }
@@ -275,29 +319,28 @@ function generateReadme(contentObj: InspecReadme, outDir: string, logger: Logger
   const readmeContent =
 `# ${contentObj.profileTitle}
 This InSpec Profile was created to facilitate testing and auditing of \`${contentObj.profileShortName}\`
-infrastructure and applications when validating compliancy with Department of [Defense (DoD) STIG](https://iase.disa.mil/stigs/)
+infrastructure and applications when validating compliancy with ${contentObj.profileCompliance}
 requirements
 
-- Profile Version: ${contentObj.profileVersion}
-- STIG Date: ${contentObj.stigDate}    
-- STIG Version: ${contentObj.stigVersion}
+- Profile Version: **${contentObj.profileVersion.trim()}**
+- Benchmark Date: **${contentObj.benchmarkDate.trim()}**
+- Benchmark Version: **${contentObj.benchmarkVersion.trim()}**
 
 
 This profile was developed to reduce the time it takes to perform a security checks based upon the
-STIG Guidance from the Defense Information Systems Agency (DISA) in partnership between the DISA
-Services Directorate (SD) and the DISA Risk Management Executive (RME) office.
+${contentObj.profileGuidance} from the ${contentObj.profileGuidanceAgency} ${contentObj.profileDeveloperPartner}.
 
 The results of a profile run will provide information needed to support an Authority to Operate (ATO)
 decision for the applicable technology.
 
-The ${contentObj.profileShortName} STIG Profile uses the [InSpec](https://github.com/inspec/inspec)
+The ${contentObj.profileShortName} ${contentObj.profileType} Profile uses the [InSpec](https://github.com/inspec/inspec)
 open-source compliance validation language to support automation of the required compliance, security
 and policy testing for Assessment and Authorization (A&A) and Authority to Operate (ATO) decisions
 and Continuous Authority to Operate (cATO) processes.
 
 Table of Contents
 =================
-* [STIG Information](#stig-information)
+* [${contentObj.profileType} Benchmark  Information](#benchmark-information)
 * [Getting Started](#getting-started)
     * [Intended Usage](#intended-usage)
     * [Tailoring to Your Environment](#tailoring-to-your-environment)
@@ -308,21 +351,20 @@ Table of Contents
     * [Different Run Options](#different-run-options)
 * [Using Heimdall for Viewing Test Results](#using-heimdall-for-viewing-test-results)
 
-## STIG Information
-The DISA RME and DISA SD Office, along with their vendor partners, create and maintain a set
-of Security Technical Implementation Guides for applications, computer systems and networks
+## Benchmark Information
+The ${contentObj.profileDevelopers} for applications, computer systems and networks
 connected to the Department of Defense (DoD). These guidelines are the primary security standards
-used by the DoD agencies. In addition to defining security guidelines, the STIGs also stipulate
+used by the DoD agencies. In addition to defining security guidelines, the ${contentObj.profileType}s also stipulate
 how security training should proceed and when security checks should occur. Organizations must
 stay compliant with these guidelines or they risk having their access to the DoD terminated.
 
-Requirements associated with the ${contentObj.profileShortName} STIG are derived from the
+Requirements associated with the ${contentObj.profileShortName} ${contentObj.profileType} are derived from the
 [Security Requirements Guides](https://csrc.nist.gov/glossary/term/security_requirements_guide)
 and align to the [National Institute of Standards and Technology](https://www.nist.gov/) (NIST)
 [Special Publication (SP) 800-53](https://csrc.nist.gov/Projects/risk-management/sp800-53-controls/release-search#!/800-53)
 Security Controls, [DoD Control Correlation Identifier](https://public.cyber.mil/stigs/cci/) and related standards.
 
-The ${contentObj.profileShortName} STIG profile checks were developed to provide technical implementation
+The ${contentObj.profileShortName} ${contentObj.profileType} profile checks were developed to provide technical implementation
 validation to the defined DoD requirements, the guidance can provide insight for any organizations wishing
 to enhance their security posture and can be tailored easily for use in your organization.
 
@@ -330,7 +372,7 @@ to enhance their security posture and can be tailored easily for use in your org
 ## Getting Started  
 It is intended and recommended that InSpec run this profile from a __"runner"__ host
 (such as a DevOps orchestration server, an administrative management system, or a developer's workstation/laptop)
-against the target remotely over __winrm__.
+against the target remotely over the best transporter (SSH, TLS, HTTPS, WinRM, etc).
 
 __For the best security of the runner, always install the _latest version_ of InSpec on the runner
     and supporting Ruby language components.__ 
@@ -350,40 +392,69 @@ The latest versions and installation options are available at the [InSpec](http:
 [top](#table-of-contents)
 ### Tailoring to Your Environment
 The \`inspec.yml\` file contains metadata that describes the profile.
+<h3>
 
-***[Update the \`inspec.yml\` file parameter \`inputs\` with a list of inputs appropriate
- for the profile and specific environment. Also update the inspec_version to the required version]***
+> [!WARNING] 
+>Do not change the inputs in the inspec.yml file
+</h3>
 
-Chef InSpec Resources:
-- [InSpec Profile Documentation](https://docs.chef.io/inspec/profiles/).
-- [InSpec Inputs](https://docs.chef.io/inspec/profiles/inputs/).
-- [inspec.yml](https://docs.chef.io/inspec/profiles/inspec_yml/).
+This profile uses InSpec Inputs to make the tests more flexible. You are able to provide inputs at
+runtime either via the cli or via YAML files to help the profile work best in your deployment.
+
+The \`inputs\` configured in the \`inspec.yml\` file are **profile definition and defaults for the profile**
+only. InSpec provides two ways to customize profiles behavior at run-time that does not require modifying
+the \`inspec.yml\` file itself. 
+
+The reason the \`inspec.ym;\` should not be modified is because automated profiles like this one are invoked
+from a script, inside a pipeline or some kind of task scheduler. Such automation usually works by running the
+profile directly from its source (i.e. this repository), which means the runner will not have access to the
+\`inspec.yml\`.
+
+To tailor the tested values for your deployment or organizationally defined values, **_you may update the inputs_**.
 
 >[!NOTE]
 > Inputs are variables that can be referenced by any control in the profile, and are defined
-  and given a default value in the \`inspec.yml\` file.
+  and given a default value in the \`inspec.yml\` file. 
 
-Below is an example how the \`inputs\` are defined in the \`inspec.yml\`:
-\`\`\`
-inputs:
-  # Skip controls that take a long time to test 
-  - name: disable_slow_controls
-    description: Controls that are known to consistently have long run times can be disabled with this attribute
-    type: Boolean
-    value: false
+#### Update Profile Inputs from the CLI or Local File
+Inputs can be overridden by providing an input file or a CLI flag at execution time.
+
+1. Via the cli with the \`--input\` flag
+  
+    Example: \`[inspec or cinc-auditor] exec <my-profile.tar.gz> --input disable_slow_controls=true\`
+
+2. Pass them in a YAML file with the \`--input-file\` flag.
+    
+    Example: \`[inspec or cinc-auditor] exec <my-profile.tar.gz> --input-file=<my_inputs_file.yml>\`
+
+Example Inputs
+
+\`\`\`yaml
+  # This file specifies the attributes for the configurable controls
+  # used in the ${contentObj.profileShortName} ${contentObj.profileType}.
+
+  # Controls that are known to consistently have long run times can be disabled with this attribute
+  disable_slow_controls: false
 
   # List of configuration files for the specific system
-  - name: logging_conf_files
-    description: Configuration files for the logging service
-    type: Array
-    value:
-      - <dir-path-1>/*.conf
-      - <dir-path-2>/*.conf
+  logging_conf_files: [
+    <dir-path-1>/*.conf
+    <dir-path-2>/*.conf
+  ]
 \`\`\`
 
+>[!TIP]
+> For additional information about \`input\` file examples references the [MITRE SAF Training](https://mitre.github.io/saf-training/courses/beginner/06.html#input-file-example)
+
+Chef InSpec Resources:
+- [InSpec Profile Documentation](https://docs.chef.io/inspec/profiles/).
+- [InSpec Inputs](https://docs.chef.io/inspec/profiles/inputs/).
+- [inspec.yml](https://docs.chef.io/inspec/profiles/inspec_yml/).
+
+
 [top](#table-of-contents)
 ### Testing the Profile Controls
-The Gemfile provided contains all necessary ruby dependencies for checking the profile controls.
+The Gemfile provided contains all the necessary ruby dependencies for checking the profile controls.
 #### Requirements
 All action are conducted using \`ruby\` (gemstone/programming language). Currently \`inspec\` 
 commands have been tested with ruby version 3.1.2. A higher version of ruby is not guaranteed to
@@ -393,27 +464,23 @@ Install ruby based on the OS being used, see [Installing Ruby](https://www.ruby-
 
 After installing \`ruby\` install the necessary dependencies by invoking the bundler command
 (must be in the same directory where the Gemfile is located):
-\`\`\`
+\`\`\`bash
 bundle install
 \`\`\`
 
 #### Testing Commands
-Ensure the controls are chef-style formatted:
-\`\`\`
-  bundle exec cookstyle -a ./controls
-\`\`\`
 
 Linting and validating controls:
-\`\`\`
-  bundle exec rake inspec:check          # validate the inspec profile
-  bundle exec rake lint                  # Run RuboCop
-  bundle exec rake lint:autocorrect      # Autocorrect RuboCop offenses (only when it's safe)
-  bundle exec rake lint:autocorrect_all  # Autocorrect RuboCop offenses (safe and unsafe)
-  bundle exec rake pre_commit_checks     # pre-commit checks
+\`\`\`bash
+  bundle exec rake [inspec or cinc-auditor]:check # validate the inspec profile
+  bundle exec rake lint                           # Run RuboCop
+  bundle exec rake lint:autocorrect               # Autocorrect RuboCop offenses (only when it's safe)
+  bundle exec rake lint:autocorrect_all           # Autocorrect RuboCop offenses (safe and unsafe)
+  bundle exec rake pre_commit_checks              # pre-commit checks
 \`\`\`
 
 Ensure the controls are ready to be committed into the repo:
-\`\`\`
+\`\`\`bash
   bundle exec rake pre_commit_checks
 \`\`\`
 
@@ -424,12 +491,12 @@ Ensure the controls are ready to be committed into the repo:
 This options is best used when network connectivity is available and policies permit
 access to the hosting repository.
 
-\`\`\`
+\`\`\`bash
 # Using \`ssh\` transport
-bundle exec inspec exec https://github.com/mitre/${contentObj.profileTitle}/archive/main.tar.gz --input-file=<your_inputs_file.yml> -t ssh://<hostname>:<port> --sudo --reporter=cli json:<your_results_file.json>
+bundle exec [inspec or cinc-auditor] exec https://github.com/mitre/${contentObj.profileName}/archive/main.tar.gz --input-file=<your_inputs_file.yml> -t ssh://<hostname>:<port> --sudo --reporter=cli json:<your_results_file.json>
 
 # Using \`winrm\` transport
-bundle exec inspec exec https://github.com/mitre/${contentObj.profileTitle}/archive/master.tar.gz --target winrm://<hostip> --user '<admin-account>' --password=<password> --input-file=<path_to_your_inputs_file/name_of_your_inputs_file.yml> --reporter=cli json:<path_to_your_output_file/name_of_your_output_file.json>
+bundle exec [inspec or cinc-auditor] exec https://github.com/mitre/${contentObj.profileName}/archive/master.tar.gz --target winrm://<hostip> --user '<admin-account>' --password=<password> --input-file=<path_to_your_inputs_file/name_of_your_inputs_file.yml> --reporter=cli json:<path_to_your_output_file/name_of_your_output_file.json>
 \`\`\`
 
 [top](#table-of-contents)
@@ -442,32 +509,32 @@ Git can be downloaded from the [Git](https://git-scm.com/book/en/v2/Getting-Star
 
 When the **"runner"** host uses this profile overlay for the first time, follow these steps:
 
-\`\`\`
+\`\`\`bash
 mkdir profiles
 cd profiles
-git clone https://github.com/mitre/${contentObj.profileTitle}.git
-bundle exec inspec archive ${contentObj.profileTitle}
+git clone https://github.com/mitre/${contentObj.profileName}.git
+bundle exec [inspec or cinc-auditor] archive ${contentObj.profileName}
 
 # Using \`ssh\` transport
-bundle exec inspec exec <name of generated archive> --input-file=<your_inputs_file.yml> -t ssh://<hostname>:<port> --sudo --reporter=cli json:<your_results_file.json>
+bundle exec [inspec or cinc-auditor] exec <name of generated archive> --input-file=<your_inputs_file.yml> -t ssh://<hostname>:<port> --sudo --reporter=cli json:<your_results_file.json>
 
 # Using \`winrm\` transport
-bundle exec inspec exec <name of generated archive> --target winrm://<hostip> --user '<admin-account>' --password=<password> --input-file=<path_to_your_inputs_file/name_of_your_inputs_file.yml> --reporter=cli json:<path_to_your_output_file/name_of_your_output_file.json>    
+bundle exec [inspec or cinc-auditor] exec <name of generated archive> --target winrm://<hostip> --user '<admin-account>' --password=<password> --input-file=<path_to_your_inputs_file/name_of_your_inputs_file.yml> --reporter=cli json:<path_to_your_output_file/name_of_your_output_file.json>    
 \`\`\`
 
 For every successive run, follow these steps to always have the latest version of this profile baseline:
 
-\`\`\`
-cd ${contentObj.profileTitle}
+\`\`\`bash
+cd ${contentObj.profileName}
 git pull
 cd ..
-bundle exec inspec archive ${contentObj.profileTitle} --overwrite
+bundle exec [inspec or cinc-auditor] archive ${contentObj.profileName} --overwrite
 
 # Using \`ssh\` transport
-bundle exec inspec exec <name of generated archive> --input-file=<your_inputs_file.yml> -t ssh://<hostname>:<port> --sudo --reporter=cli json:<your_results_file.json>
+bundle exec [inspec or cinc-auditor] exec <name of generated archive> --input-file=<your_inputs_file.yml> -t ssh://<hostname>:<port> --sudo --reporter=cli json:<your_results_file.json>
 
 # Using \`winrm\` transport
-bundle exec inspec exec <name of generated archive> --target winrm://<hostip> --user '<admin-account>' --password=<password> --input-file=<path_to_your_inputs_file/name_of_your_inputs_file.yml> --reporter=cli json:<path_to_your_output_file/name_of_your_output_file.json>    
+bundle exec [inspec or cinc-auditor] exec <name of generated archive> --target winrm://<hostip> --user '<admin-account>' --password=<password> --input-file=<path_to_your_inputs_file/name_of_your_inputs_file.yml> --reporter=cli json:<path_to_your_output_file/name_of_your_output_file.json>    
 \`\`\`
 
 [top](#table-of-contents)
@@ -489,20 +556,42 @@ Heimdall can **_export your results into a DISA Checklist (CKL) file_** for easi
 Depending on your environment restrictions, the [SAF CLI](https://saf-cli.mitre.org) can be used to run a local docker instance
 of Heimdall-Lite via the \`saf view:heimdall\` command.
 
-Additionally both Heimdall applications can be deployed via docker, kurbernetes, or the installation packages.
+Additionally both Heimdall applications can be deployed via docker, kubernetes, or the installation packages.
 
 [top](#table-of-contents)
 ## Authors
-Defense Information Systems Agency (DISA) https://www.disa.mil/
-
-STIG support by DISA Risk Management Team and Cyber Exchange https://public.cyber.mil/
+${contentObj.profileType === 'CIS' ?
+    'Center for Internet Security (CIS) https://www.cisecurity.org/' :
+    'Defense Information Systems Agency (DISA) https://www.disa.mil/\n\n' +
+  'STIG support by DISA Risk Management Team and Cyber Exchange https://public.cyber.mil/'
+}
 
 MITRE Security Automation Framework Team https://saf.mitre.org
 
 ## NOTICE
-DISA STIGs are published by DISA IASE, see: https://iase.disa.mil/Pages/privacy_policy.aspx
-`
 
+© 2018-2025 The MITRE Corporation.
+
+Approved for Public Release; Distribution Unlimited. Case Number 18-3678.
+
+## NOTICE 
+
+MITRE hereby grants express written permission to use, reproduce, distribute, modify, and otherwise leverage this software to the extent permitted by the licensed terms provided in the LICENSE.md file included with this project.
+
+## NOTICE  
+
+This software was produced for the U. S. Government under Contract Number HHSM-500-2012-00008I, and is subject to Federal Acquisition Regulation Clause 52.227-14, Rights in Data-General.  
+
+No other use other than that granted to the U. S. Government, or to those acting on behalf of the U. S. Government under that Clause is authorized without the express written permission of The MITRE Corporation.
+
+For further information, please contact The MITRE Corporation, Contracts Management Office, 7515 Colshire Drive, McLean, VA  22102-7539, (703) 983-6000.
+
+## NOTICE
+${contentObj.profileType === 'CIS' ?
+    'CIS Benchmarks are published by Center for Internet Security, see: https://www.cisecurity.org/cis-benchmarks' :
+    'DISA STIGs are published by DISA IASE, see: https://iase.disa.mil/Pages/privacy_policy.aspx'
+}
+`
   fs.writeFile(path.join(outDir, 'README.md'), readmeContent, err => {
     if (err) {
       logger.error(`Error saving the README.md file to: ${outDir}. Cause: ${err}`)
@@ -531,7 +620,27 @@ function generateYaml(profile: Profile, outDir: string, logger: Logger) {
     supports: profile.supports,
     depends: profile.depends,
     inspec_version: YAML.stringify(`${profile.inspec_version}`, {defaultStringType: 'QUOTE_DOUBLE'}),
-  })
+  }) +
+`
+
+### INPUTS ###
+# Inputs are variables that can be referenced by any control in the profile,
+# and are defined and given a default value in this file.
+
+# By default, each parameter is set to exactly comply with the profile baseline
+# wherever possible. Some profile controls will require a unique value reflecting
+# the necessary context for the supporting system.
+
+# Values provided here can be overridden using an input file or a CLI flag at
+# execution time. See InSpec's Inputs docs at https://docs.chef.io/inspec/profiles/inputs/
+# for details.
+
+# NOTE: DO NOT directly change the default values by editing this file. Use
+# overrides instead.
+###
+
+inputs:
+`
 
   fs.writeFile(path.join(outDir, 'inspec.yml'), inspecYmlContent, err => {
     if (err) {
@@ -609,6 +718,9 @@ Naming/FileName:
 Metrics/BlockLength:
   Max: 1000
 
+Layout/MultilineBlockLayout:
+  Enabled: true
+
 Lint/ConstantDefinitionInBlock:
   Enabled: false
 
@@ -768,17 +880,25 @@ Style/SwapValues: # new in 1.1
   })
 }
 
+function generateGemRc(outDir: string, logger: Logger) {
+  const gemRc =
+`gem: --no-document
+`
+  fs.writeFile(path.join(outDir, '.gemrc'), gemRc, err => {
+    if (err) {
+      logger.error(`Error saving the .gemrc file to: ${outDir}. Cause: ${err}`)
+    } else {
+      logger.debug('.gemrc generated successfully!')
+    }
+  })
+}
+
 function generateGemFile(outDir: string, logger: Logger) {
   const gemFileContent =
 `# frozen_string_literal: true
 
 source 'https://rubygems.org'
-
-gem 'cookstyle'
 gem 'highline'
-gem 'inspec', '>= 6.6.0'
-gem 'inspec-bin'
-gem 'inspec-core'
 gem 'kitchen-ansible'
 gem 'kitchen-docker'
 gem 'kitchen-dokken'
@@ -786,13 +906,21 @@ gem 'kitchen-ec2'
 gem 'kitchen-inspec'
 gem 'kitchen-sync'
 gem 'kitchen-vagrant'
-gem 'parser', '3.3.0.5'
+gem 'berkshelf'
 gem 'pry-byebug'
 gem 'rake'
 gem 'rubocop'
 gem 'rubocop-rake'
 gem 'test-kitchen'
 gem 'train-awsssm'
+
+source 'https://rubygems.cinc.sh/' do
+  gem 'chef-config'
+  gem 'chef-utils'
+  gem 'cinc-auditor-bin'
+  gem 'inspec'
+  gem 'inspec-core'
+end
 `
   fs.writeFile(path.join(outDir, 'Gemfile'), gemFileContent, err => {
     if (err) {
@@ -813,9 +941,9 @@ require 'rake/testtask'
 require 'rubocop/rake_task'
 
 namespace :inspec do
-  desc 'validate the inspec profile'
+  desc 'validate the profile'
   task :check do
-    system 'bundle exec inspec check .'
+    system 'bundle exec cinc-auditor check .'
   end
 end
 
diff --git a/src/commands/generate/update_controls4delta.ts b/src/commands/generate/update_controls4delta.ts
index 116005ffd..478c3aab0 100644
--- a/src/commands/generate/update_controls4delta.ts
+++ b/src/commands/generate/update_controls4delta.ts
@@ -6,9 +6,9 @@ import {Flags} from '@oclif/core'
 import {createWinstonLogger} from '../../utils/logging'
 import Profile from '@mitre/inspec-objects/lib/objects/profile'
 import {
+  getExistingDescribeFromControl,
   processInSpecProfile,
   processXCCDF,
-  updateControl,
 } from '@mitre/inspec-objects'
 import colors from 'colors' // eslint-disable-line no-restricted-imports
 import {BaseCommand} from '../../utils/oclif/baseCommand'
@@ -100,9 +100,9 @@ export default class GenerateUpdateControls extends BaseCommand<typeof GenerateU
     const {flags} = await this.parse(GenerateUpdateControls)
     const logger = createWinstonLogger('generate:update_controls', flags.logLevel)
 
-    logger.warn(colors.yellow('╔═══════════════════════════════════════════════════════════════════════════════════════════════╗'))
-    logger.warn(colors.yellow('║ Ensure profile controls are in cookstyle format (https://docs.chef.io/workstation/cookstyle/) ║'))
-    logger.warn(colors.yellow('╚═══════════════════════════════════════════════════════════════════════════════════════════════╝'))
+    logger.warn(colors.yellow('╔═══════════════════════════════════════════════╗'))
+    logger.warn(colors.yellow('║ Profile controls are formatted using Rubocop  ║'))
+    logger.warn(colors.yellow('╚═══════════════════════════════════════════════╝'))
 
     let inspecProfile: Profile = new Profile()
     GenerateUpdateControls.backupDir = path.join(path.dirname(flags.controlsDir), 'oldControls')
@@ -302,14 +302,22 @@ export default class GenerateUpdateControls extends BaseCommand<typeof GenerateU
         }
       }
 
-      const oldControlId = control.id
-      const newControl = updateControl(control, xccdfNewControlsMetaDataMap.get(control.id), logger)
-      if (flags.formatControls) {
-        logger.debug('  Formatted the same way `generate delta` will write controls.')
-        baselineYControls.set(oldControlId, newControl.toRuby(false))
-      } else {
-        logger.debug('  Did not formatted the same way `generate delta` will write controls.')
-        baselineYControls.set(oldControlId, newControl.toString())
+      // NOTE: Not using the ts-object updateControl function as it maps the
+      // metadata (aka tags) from the source onto the new control. Need to add
+      // a new function that simply retrieves the describe block (code) from
+      // the source and adds to the destination (update) control)
+      if (xccdfNewControlsMetaDataMap.has(control.id)) {
+        const newControl = xccdfNewControlsMetaDataMap.get(control.id)
+        const existingDescribeBlock = getExistingDescribeFromControl(control)
+        newControl.describe = existingDescribeBlock
+
+        if (flags.formatControls) {
+          logger.debug('  Formatted the same way `generate delta` will write controls.')
+          baselineYControls.set(control.id, newControl.toRuby(false))
+        } else {
+          logger.debug('  Did not formatted the same way `generate delta` will write controls.')
+          baselineYControls.set(control.id, newControl.toString())
+        }
       }
     }
 
diff --git a/src/types/inspec.d.ts b/src/types/inspec.d.ts
index 4b54bf4f8..6b83d8285 100644
--- a/src/types/inspec.d.ts
+++ b/src/types/inspec.d.ts
@@ -44,10 +44,16 @@ export interface InSpecMetaData {
 }
 
 export interface InspecReadme {
+    profileType: string,
+    profileGuidance: string,
+    profileGuidanceAgency: string,
+    profileDeveloperPartner: string,
+    profileCompliance: string,
+    profileDevelopers: string,
     profileName: string;
     profileShortName: string;
     profileTitle: string;
     profileVersion: string;
-    stigVersion: string;
-    stigDate: string;
+    benchmarkVersion: string;
+    benchmarkDate: string;
 }
diff --git a/test/commands/attest/apply.test.ts b/test/commands/attest/apply.test.ts
index 1c0fd475e..badecc546 100644
--- a/test/commands/attest/apply.test.ts
+++ b/test/commands/attest/apply.test.ts
@@ -1,4 +1,7 @@
-import {expect, test} from '@oclif/test'
+/* eslint-disable array-bracket-newline */
+/* eslint-disable array-element-newline */
+import {expect} from 'chai'
+import {runCommand} from '@oclif/test'
 import tmp from 'tmp'
 import path from 'path'
 import fs from 'fs'
@@ -8,34 +11,31 @@ describe('Test attest apply', () => {
   const tmpobj = tmp.dirSync({unsafeCleanup: true})
 
   // NOTE: replacing all CR from the files being generated to ensure proper comparison.
-  test
-    .stdout()
-    .stderr()
-    .command(['attest apply', '-i', path.resolve('./test/sample_data/attestations/rhel8_sample_oneOfEachControlStatus.json'), path.resolve('./test/sample_data/attestations/attestations_jsonFormat.json'), '-o', `${tmpobj.name}/rhel8_attestations_jsonOutput.json`])
-    .it('Successfully applies a JSON attestations file', () => {
-      const output = JSON.parse(fs.readFileSync(`${tmpobj.name}/rhel8_attestations_jsonOutput.json`, 'utf8').replaceAll(/\r/gi, ''))
-      const expected = JSON.parse(fs.readFileSync(path.resolve('./test/sample_data/attestations/rhel8_sample_oneOfEachControlStatus_output.json'), 'utf8').replaceAll(/\r/gi, ''))
+  it('Successfully applies a JSON attestations file', async () => {
+    await runCommand<{name: string}>(['attest apply',
+      '-i', path.resolve('./test/sample_data/attestations/rhel8_sample_oneOfEachControlStatus.json'),
+      path.resolve('./test/sample_data/attestations/attestations_jsonFormat.json'),
+      '-o', `${tmpobj.name}/rhel8_attestations_jsonOutput.json`,
+    ])
+    const output = JSON.parse(fs.readFileSync(`${tmpobj.name}/rhel8_attestations_jsonOutput.json`, 'utf8').replaceAll(/\r/gi, ''))
+    const expected = JSON.parse(fs.readFileSync(path.resolve('./test/sample_data/attestations/rhel8_sample_oneOfEachControlStatus_output.json'), 'utf8').replaceAll(/\r/gi, ''))
 
-      expect(omitHDFChangingFields(output)).to.eql(omitHDFChangingFields(expected))
-    })
+    expect(omitHDFChangingFields(output)).to.eql(omitHDFChangingFields(expected))
+  })
 
-  test
-    .stdout()
-    .command(['attest apply', '-i', path.resolve('./test/sample_data/attestations/rhel8_sample_oneOfEachControlStatus.json'), path.resolve('./test/sample_data/attestations/attestations_xlsxFormat.xlsx'), '-o', `${tmpobj.name}/rhel8_attestations_xlsxOutput.json`])
-    .it('Successfully applies an XLSX attestations file', () => {
-      const output = JSON.parse(fs.readFileSync(`${tmpobj.name}/rhel8_attestations_xlsxOutput.json`, 'utf8').replaceAll(/\r/gi, ''))
-      const expected = JSON.parse(fs.readFileSync(path.resolve('./test/sample_data/attestations/rhel8_sample_oneOfEachControlStatus_output.json'), 'utf8').replaceAll(/\r/gi, ''))
+  it('Successfully applies an XLSX attestations file', async () => {
+    await runCommand<{name: string}>(['attest apply', '-i', path.resolve('./test/sample_data/attestations/rhel8_sample_oneOfEachControlStatus.json'), path.resolve('./test/sample_data/attestations/attestations_xlsxFormat.xlsx'), '-o', `${tmpobj.name}/rhel8_attestations_xlsxOutput.json`])
+    const output = JSON.parse(fs.readFileSync(`${tmpobj.name}/rhel8_attestations_xlsxOutput.json`, 'utf8').replaceAll(/\r/gi, ''))
+    const expected = JSON.parse(fs.readFileSync(path.resolve('./test/sample_data/attestations/rhel8_sample_oneOfEachControlStatus_output.json'), 'utf8').replaceAll(/\r/gi, ''))
 
-      expect(omitHDFChangingFields(output)).to.eql(omitHDFChangingFields(expected))
-    })
+    expect(omitHDFChangingFields(output)).to.eql(omitHDFChangingFields(expected))
+  })
 
-  test
-    .stdout()
-    .command(['attest apply', '-i', path.resolve('./test/sample_data/attestations/rhel8_sample_oneOfEachControlStatus.json'), path.resolve('./test/sample_data/attestations/attestations_yamlFormat.yaml'), '-o', `${tmpobj.name}/rhel8_attestations_yamlOutput.json`])
-    .it('Successfully applies a YAML attestations file', () => {
-      const output = JSON.parse(fs.readFileSync(`${tmpobj.name}/rhel8_attestations_yamlOutput.json`, 'utf8').replaceAll(/\r/gi, ''))
-      const expected = JSON.parse(fs.readFileSync(path.resolve('./test/sample_data/attestations/rhel8_sample_oneOfEachControlStatus_output.json'), 'utf8').replaceAll(/\r/gi, ''))
+  it('Successfully applies a YAML attestations file', async () => {
+    await runCommand<{name: string}>(['attest apply', '-i', path.resolve('./test/sample_data/attestations/rhel8_sample_oneOfEachControlStatus.json'), path.resolve('./test/sample_data/attestations/attestations_yamlFormat.yaml'), '-o', `${tmpobj.name}/rhel8_attestations_yamlOutput.json`])
+    const output = JSON.parse(fs.readFileSync(`${tmpobj.name}/rhel8_attestations_yamlOutput.json`, 'utf8').replaceAll(/\r/gi, ''))
+    const expected = JSON.parse(fs.readFileSync(path.resolve('./test/sample_data/attestations/rhel8_sample_oneOfEachControlStatus_output.json'), 'utf8').replaceAll(/\r/gi, ''))
 
-      expect(omitHDFChangingFields(output)).to.eql(omitHDFChangingFields(expected))
-    })
+    expect(omitHDFChangingFields(output)).to.eql(omitHDFChangingFields(expected))
+  })
 })
diff --git a/test/commands/convert/anchoregrype2hdf.test.ts b/test/commands/convert/anchoregrype2hdf.test.ts
index 948b93862..3e1930bb3 100644
--- a/test/commands/convert/anchoregrype2hdf.test.ts
+++ b/test/commands/convert/anchoregrype2hdf.test.ts
@@ -1,188 +1,166 @@
-import { expect, test } from "@oclif/test";
-import tmp from "tmp";
-import path from "path";
-import fs from "fs";
-import { omitHDFChangingFields } from "../utils";
+/* eslint-disable array-bracket-newline */
+/* eslint-disable array-element-newline */
+import {expect} from 'chai'
+import {runCommand} from '@oclif/test'
+import tmp from 'tmp'
+import path from 'path'
+import fs from 'fs'
+import {omitHDFChangingFields} from '../utils'
 
-describe("Test anchore grype", () => {
-  const tmpobj = tmp.dirSync({ unsafeCleanup: true });
+describe('Test anchore grype', () => {
+  const tmpobj = tmp.dirSync({unsafeCleanup: true})
 
-  test
-    .stdout()
-    .command([
-      "convert anchoregrype2hdf",
-      "-i",
-      path.resolve(
-        "./test/sample_data/anchoregrype/sample_input_report/anchore_grype.json"
-      ),
-      "-o",
-      `${tmpobj.name}/anchore-grype-hdf.json`,
+  it('hdf-converter output test', async () => {
+    await runCommand<{name: string}>(['convert anchoregrype2hdf',
+      '-i', path.resolve('./test/sample_data/anchoregrype/sample_input_report/anchore_grype.json'),
+      '-o', `${tmpobj.name}/anchore-grype-hdf.json`,
     ])
-    .it("hdf-converter output test", () => {
-      const converted = JSON.parse(
-        fs.readFileSync(`${tmpobj.name}/anchore-grype-hdf.json`, "utf8")
-      );
-      const sample = JSON.parse(
-        fs.readFileSync(
-          path.resolve("./test/sample_data/anchoregrype/anchore-grype-hdf.json"),
-          "utf8"
-        )
-      );
-      expect(omitHDFChangingFields(converted)).to.eql(
-        omitHDFChangingFields(sample)
-      );
-    });
-});
+    const converted = JSON.parse(
+      fs.readFileSync(`${tmpobj.name}/anchore-grype-hdf.json`, 'utf8'),
+    )
+    const sample = JSON.parse(
+      fs.readFileSync(path.resolve('./test/sample_data/anchoregrype/anchore-grype-hdf.json'), 'utf8'),
+    )
+    expect(omitHDFChangingFields(converted)).to.eql(omitHDFChangingFields(sample))
+  })
+})
 
-describe("Test anchore grype withraw flag", () => {
-  const tmpobj = tmp.dirSync({ unsafeCleanup: true });
+describe('Test anchore grype withraw flag', () => {
+  const tmpobj = tmp.dirSync({unsafeCleanup: true})
 
-  test
-    .stdout()
-    .command([
-      "convert anchoregrype2hdf",
-      "-i",
-      path.resolve(
-        "./test/sample_data/anchoregrype/sample_input_report/anchore_grype.json"
-      ),
-      "-o",
-      `${tmpobj.name}/anchore-grype-withraw.json`,
-      "-w",
+  it('hdf-converter withraw output test', async () => {
+    await runCommand<{name: string}>(['convert anchoregrype2hdf',
+      '-i', path.resolve('./test/sample_data/anchoregrype/sample_input_report/anchore_grype.json'),
+      '-o', `${tmpobj.name}/anchore-grype-withraw.json`, '-w',
     ])
-    .it("hdf-converter withraw output test", () => {
-      const converted = JSON.parse(
-        fs.readFileSync(`${tmpobj.name}/anchore-grype-withraw.json`, "utf8")
-      );
-      const sample = JSON.parse(
-        fs.readFileSync(
-          path.resolve("./test/sample_data/anchoregrype/anchore-grype-withraw.json"),
-          "utf8"
-        )
-      );
-      expect(omitHDFChangingFields(converted)).to.eql(
-        omitHDFChangingFields(sample)
-      );
-    });
-});
+    const converted = JSON.parse(
+      fs.readFileSync(`${tmpobj.name}/anchore-grype-withraw.json`, 'utf8'),
+    )
+    const sample = JSON.parse(
+      fs.readFileSync(path.resolve('./test/sample_data/anchoregrype/anchore-grype-withraw.json'), 'utf8'),
+    )
+    expect(omitHDFChangingFields(converted)).to.eql(omitHDFChangingFields(sample))
+  })
+})
 
-describe("Test amazon anchore grype", () => {
-    const tmpobj = tmp.dirSync({ unsafeCleanup: true });
-  
-    test
-      .stdout()
-      .command([
-        "convert anchoregrype2hdf",
-        "-i",
-        path.resolve(
-          "./test/sample_data/anchoregrype/sample_input_report/amazon.json"
-        ),
-        "-o",
-        `${tmpobj.name}/amazon-grype-hdf.json`,
-      ])
-      .it("hdf-converter output test", () => {
-        const converted = JSON.parse(
-          fs.readFileSync(`${tmpobj.name}/amazon-grype-hdf.json`, "utf8")
-        );
-        const sample = JSON.parse(
-          fs.readFileSync(
-            path.resolve("./test/sample_data/anchoregrype/amazon-grype-hdf.json"),
-            "utf8"
-          )
-        );
-        expect(omitHDFChangingFields(converted)).to.eql(
-          omitHDFChangingFields(sample)
-        );
-      });
-  });
-  
-  describe("Test amazon anchore grype withraw flag", () => {
-    const tmpobj = tmp.dirSync({ unsafeCleanup: true });
-  
-    test
-      .stdout()
-      .command([
-        "convert anchoregrype2hdf",
-        "-i",
-        path.resolve(
-          "./test/sample_data/anchoregrype/sample_input_report/amazon.json"
-        ),
-        "-o",
-        `${tmpobj.name}/amazon-grype-withraw.json`,
-        "-w",
-      ])
-      .it("hdf-converter withraw output test", () => {
-        const converted = JSON.parse(
-          fs.readFileSync(`${tmpobj.name}/amazon-grype-withraw.json`, "utf8")
-        );
-        const sample = JSON.parse(
-          fs.readFileSync(
-            path.resolve("./test/sample_data/anchoregrype/amazon-grype-withraw.json"),
-            "utf8"
-          )
-        );
-        expect(omitHDFChangingFields(converted)).to.eql(
-          omitHDFChangingFields(sample)
-        );
-      });
-  });
+// describe('Test amazon anchore grype', () => {
+//   const tmpobj = tmp.dirSync({ unsafeCleanup: true })
 
-  describe("Test tensorflow anchore grype", () => {
-    const tmpobj = tmp.dirSync({ unsafeCleanup: true });
-  
-    test
-      .stdout()
-      .command([
-        "convert anchoregrype2hdf",
-        "-i",
-        path.resolve(
-          "./test/sample_data/anchoregrype/sample_input_report/tensorflow.json"
-        ),
-        "-o",
-        `${tmpobj.name}/tensorflow-grype-hdf.json`,
-      ])
-      .it("hdf-converter output test", () => {
-        const converted = JSON.parse(
-          fs.readFileSync(`${tmpobj.name}/tensorflow-grype-hdf.json`, "utf8")
-        );
-        const sample = JSON.parse(
-          fs.readFileSync(
-            path.resolve("./test/sample_data/anchoregrype/tensorflow-grype-hdf.json"),
-            "utf8"
-          )
-        );
-        expect(omitHDFChangingFields(converted)).to.eql(
-          omitHDFChangingFields(sample)
-        );
-      });
-  });
-  
-  describe("Test tensorflow anchore grype withraw flag", () => {
-    const tmpobj = tmp.dirSync({ unsafeCleanup: true });
-  
-    test
-      .stdout()
-      .command([
-        "convert anchoregrype2hdf",
-        "-i",
-        path.resolve(
-          "./test/sample_data/anchoregrype/sample_input_report/tensorflow.json"
-        ),
-        "-o",
-        `${tmpobj.name}/tensorflow-grype-withraw.json`,
-        "-w",
-      ])
-      .it("hdf-converter withraw output test", () => {
-        const converted = JSON.parse(
-          fs.readFileSync(`${tmpobj.name}/tensorflow-grype-withraw.json`, "utf8")
-        );
-        const sample = JSON.parse(
-          fs.readFileSync(
-            path.resolve("./test/sample_data/anchoregrype/tensorflow-grype-withraw.json"),
-            "utf8"
-          )
-        );
-        expect(omitHDFChangingFields(converted)).to.eql(
-          omitHDFChangingFields(sample)
-        );
-      });
-  });
\ No newline at end of file
+//   test
+//     .stdout()
+//     .command([
+//       'convert anchoregrype2hdf',
+//       '-i',
+//       path.resolve(
+//         './test/sample_data/anchoregrype/sample_input_report/amazon.json',
+//       ),
+//       '-o',
+//       `${tmpobj.name}/amazon-grype-hdf.json`,
+//     ])
+//     .it('hdf-converter output test', () => {
+//       const converted = JSON.parse(
+//         fs.readFileSync(`${tmpobj.name}/amazon-grype-hdf.json`, 'utf8'),
+//       )
+//       const sample = JSON.parse(
+//         fs.readFileSync(
+//           path.resolve('./test/sample_data/anchoregrype/amazon-grype-hdf.json'),
+//           'utf8',
+//         ),
+//       )
+//       expect(omitHDFChangingFields(converted)).to.eql(
+//         omitHDFChangingFields(sample),
+//       )
+//     })
+// })
+
+// describe('Test amazon anchore grype withraw flag', () => {
+//   const tmpobj = tmp.dirSync({ unsafeCleanup: true })
+
+//   test
+//     .stdout()
+//     .command([
+//       'convert anchoregrype2hdf',
+//       '-i',
+//       path.resolve(
+//         './test/sample_data/anchoregrype/sample_input_report/amazon.json',
+//       ),
+//       '-o',
+//       `${tmpobj.name}/amazon-grype-withraw.json`,
+//       '-w',
+//     ])
+//     .it('hdf-converter withraw output test', () => {
+//       const converted = JSON.parse(
+//         fs.readFileSync(`${tmpobj.name}/amazon-grype-withraw.json`, 'utf8'),
+//       )
+//       const sample = JSON.parse(
+//         fs.readFileSync(
+//           path.resolve('./test/sample_data/anchoregrype/amazon-grype-withraw.json'),
+//           'utf8',
+//         ),
+//       )
+//       expect(omitHDFChangingFields(converted)).to.eql(
+//         omitHDFChangingFields(sample),
+//       )
+//     })
+// })
+
+// describe('Test tensorflow anchore grype', () => {
+//   const tmpobj = tmp.dirSync({ unsafeCleanup: true })
+
+//   test
+//     .stdout()
+//     .command([
+//       'convert anchoregrype2hdf',
+//       '-i',
+//       path.resolve(
+//         './test/sample_data/anchoregrype/sample_input_report/tensorflow.json',
+//       ),
+//       '-o',
+//       `${tmpobj.name}/tensorflow-grype-hdf.json`,
+//     ])
+//     .it('hdf-converter output test', () => {
+//       const converted = JSON.parse(
+//         fs.readFileSync(`${tmpobj.name}/tensorflow-grype-hdf.json`, 'utf8'),
+//       )
+//       const sample = JSON.parse(
+//         fs.readFileSync(
+//           path.resolve('./test/sample_data/anchoregrype/tensorflow-grype-hdf.json'),
+//           'utf8',
+//         ),
+//       )
+//       expect(omitHDFChangingFields(converted)).to.eql(
+//         omitHDFChangingFields(sample),
+//       )
+//     })
+// })
+
+// describe('Test tensorflow anchore grype withraw flag', () => {
+//   const tmpobj = tmp.dirSync({ unsafeCleanup: true })
+
+//   test
+//     .stdout()
+//     .command([
+//       'convert anchoregrype2hdf',
+//       '-i',
+//       path.resolve(
+//         './test/sample_data/anchoregrype/sample_input_report/tensorflow.json',
+//       ),
+//       '-o',
+//       `${tmpobj.name}/tensorflow-grype-withraw.json`,
+//       '-w',
+//     ])
+//     .it('hdf-converter withraw output test', () => {
+//       const converted = JSON.parse(
+//         fs.readFileSync(`${tmpobj.name}/tensorflow-grype-withraw.json`, 'utf8'),
+//       )
+//       const sample = JSON.parse(
+//         fs.readFileSync(
+//           path.resolve('./test/sample_data/anchoregrype/tensorflow-grype-withraw.json'),
+//           'utf8',
+//         ),
+//       )
+//       expect(omitHDFChangingFields(converted)).to.eql(
+//         omitHDFChangingFields(sample),
+//       )
+//     })
+// })
diff --git a/test/commands/emasser/delete.test.ts b/test/commands/emasser/delete.test.ts
index f8cd49631..34c6d5a06 100644
--- a/test/commands/emasser/delete.test.ts
+++ b/test/commands/emasser/delete.test.ts
@@ -1,4 +1,4 @@
-import {expect, test} from '@oclif/test'
+import {expect} from 'chai'
 import {InitMockServer} from './mock.server'
 import {ArtifactsApi, POAMApi, MilestonesApi} from '@mitre/emass_client'
 import {ArtifactsResponseDel, PoamResponseDelete,
@@ -12,51 +12,48 @@ describe('Test eMASS API CLI (delete) commands', () => {
     statusText: 'OK',
   }
 
-  test
-    .it('Successfully tested endpoint - artifacts', async () => {
-      const delArtifact = new ArtifactsApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
-      await delArtifact.deleteArtifact(123, []).then((response: ArtifactsResponseDel) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error)
-        }
+  it('Successfully tested endpoint - artifacts', async () => {
+    const delArtifact = new ArtifactsApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
+    await delArtifact.deleteArtifact(123, []).then((response: ArtifactsResponseDel) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error)
+      }
 
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
+      responseDataObj = new Map(Object.entries(testOk))
     })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
 
-  test
-    .it('Successfully tested endpoint - poams', async () => {
-      const delPoam = new POAMApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
-      await delPoam.deletePoam(34, []).then((response: PoamResponseDelete) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error)
-        }
+  it('Successfully tested endpoint - poams', async () => {
+    const delPoam = new POAMApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
+    await delPoam.deletePoam(34, []).then((response: PoamResponseDelete) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error)
+      }
 
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
+      responseDataObj = new Map(Object.entries(testOk))
     })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
 
-  test
-    .it('Successfully tested endpoint - milestones', async () => {
-      const delMilestones = new MilestonesApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
-      await delMilestones.deleteMilestone(36, 76, []).then((response: MilestonesPutPostDelete) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error)
-        }
+  it('Successfully tested endpoint - milestones', async () => {
+    const delMilestones = new MilestonesApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
+    await delMilestones.deleteMilestone(36, 76, []).then((response: MilestonesPutPostDelete) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error)
+      }
 
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
+      responseDataObj = new Map(Object.entries(testOk))
     })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
 })
diff --git a/test/commands/emasser/get.test.ts b/test/commands/emasser/get.test.ts
index a6830b824..5b32134f5 100644
--- a/test/commands/emasser/get.test.ts
+++ b/test/commands/emasser/get.test.ts
@@ -1,4 +1,4 @@
-import {expect, test} from '@oclif/test'
+import {expect} from 'chai'
 import {InitMockServer} from './mock.server'
 import {SystemsApi, SystemRolesApi, TestApi,
   POAMApi, CACApi, PACApi, MilestonesApi, ControlsApi,
@@ -15,512 +15,504 @@ describe('Test eMASS API CLI (get) commands', () => {
     statusText: 'OK',
   }
 
-  test
-    .it('Successfully tested endpoint - test connection', async () => {
-      const getTestApi = new TestApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
-      await getTestApi.testConnection().then((response: SystemResponse) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
-    })
-
-  test
-    .it('Successfully tested endpoint - system', async () => {
-      const getSystems = new SystemsApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
-      await getSystems.getSystem(123, true, 'rmf').then((response: SystemResponse) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
-    })
-
-  test
-    .it('Successfully tested endpoint - systems', async () => {
-      const getSystems = new SystemsApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
-      await getSystems.getSystems(false, 'regular', 'ditprid', 'coamsid', 'rmf', false, false, true).then((response: SystemsResponse) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
-    })
-
-  test
-    .it('Successfully tested endpoint - roles', async () => {
-      const getSystemRoles = new SystemRolesApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
-      await getSystemRoles.getSystemRoles().then((response: SystemRolesResponse) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
-    })
-
-  test
-    .it('Successfully tested endpoint - poams', async () => {
-      const getPoams = new POAMApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
-      await getPoams.getSystemPoamsByPoamId(34, 56).then((response: PoamResponseGetPoams) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
-    })
-
-  test
-    .it('Successfully tested endpoint - cac', async () => {
-      const getCac = new CACApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
-      await getCac.getSystemCac(34, 'acronym').then((response: CacResponseGet) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
-    })
-
-  test
-    .it('Successfully tested endpoint - pac', async () => {
-      const getPac = new PACApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
-      await getPac.getSystemPac(34).then((response: PacResponseGet) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
-    })
-
-  test
-    .it('Successfully tested endpoint - milestones', async () => {
-      const getMilestones = new MilestonesApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
-      await getMilestones.getSystemMilestonesByPoamIdAndMilestoneId(36, 76, 89).then((response: MilestoneResponseGetMilestone) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
-    })
-
-  test
-    .it('Successfully tested endpoint - controls', async () => {
-      const getControls = new ControlsApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
-      await getControls.getSystemControls(34, 'acronym').then((response: CacResponseGet) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
-    })
+  it('Successfully tested endpoint - test connection', async () => {
+    const getTestApi = new TestApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
+    await getTestApi.testConnection().then((response: SystemResponse) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
+    })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - system', async () => {
+    const getSystems = new SystemsApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
+    await getSystems.getSystem(123, true, 'rmf').then((response: SystemResponse) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
+    })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - systems', async () => {
+    const getSystems = new SystemsApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
+    await getSystems.getSystems(false, 'regular', 'ditprid', 'coamsid', 'rmf', false, false, true).then((response: SystemsResponse) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
+    })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - roles', async () => {
+    const getSystemRoles = new SystemRolesApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
+    await getSystemRoles.getSystemRoles().then((response: SystemRolesResponse) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
+    })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - poams', async () => {
+    const getPoams = new POAMApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
+    await getPoams.getSystemPoamsByPoamId(34, 56).then((response: PoamResponseGetPoams) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
+    })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - cac', async () => {
+    const getCac = new CACApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
+    await getCac.getSystemCac(34, 'acronym').then((response: CacResponseGet) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
+    })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - pac', async () => {
+    const getPac = new PACApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
+    await getPac.getSystemPac(34).then((response: PacResponseGet) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
+    })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - milestones', async () => {
+    const getMilestones = new MilestonesApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
+    await getMilestones.getSystemMilestonesByPoamIdAndMilestoneId(36, 76, 89).then((response: MilestoneResponseGetMilestone) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
+    })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - controls', async () => {
+    const getControls = new ControlsApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
+    await getControls.getSystemControls(34, 'acronym').then((response: CacResponseGet) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
+    })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
   const getDashboards = new DashboardsApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
-  test
-    .it('Successfully tested endpoint - dashboards (status_details)', async () => {
-      await getDashboards.getSystemStatusDetails(45, false, 1, 2000).then((response: object) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error.message)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
-    })
-  test
-    .it('Successfully tested endpoint - dashboards (control_compliance_summary)', async () => {
-      await getDashboards.getSystemControlComplianceSummary(45, false, 1, 2000).then((response: object) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error.message)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
-    })
-  test
-    .it('Successfully tested endpoint - dashboards (security_control_details)', async () => {
-      await getDashboards.getSystemSecurityControlDetails(45, false, 1, 2000).then((response: object) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error.message)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
-    })
-  test
-    .it('Successfully tested endpoint - dashboards (assessment_procedures_details)', async () => {
-      await getDashboards.getSystemAssessmentProceduresDetails(45, false, 1, 2000).then((response: object) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error.message)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
-    })
-  test
-    .it('Successfully tested endpoint - dashboards (poam_summary)', async () => {
-      await getDashboards.getSystemPoamSummary(45, false, 1, 2000).then((response: object) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error.message)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
-    })
-  test
-    .it('Successfully tested endpoint - dashboards (poam_details)', async () => {
-      await getDashboards.getSystemPoamDetails(45, false, 1, 2000).then((response: object) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error.message)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
-    })
-  test
-    .it('Successfully tested endpoint - dashboards (artifacts_summary)', async () => {
-      await getDashboards.getSystemArtifactsSummary(45, false, 1, 2000).then((response: object) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error.message)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
-    })
-  test
-    .it('Successfully tested endpoint - dashboards (artifacts_details)', async () => {
-      await getDashboards.getSystemArtifactsDetails(45, false, 1, 2000).then((response: object) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error.message)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
-    })
-  test
-    .it('Successfully tested endpoint - dashboards (hardware_summary)', async () => {
-      await getDashboards.getSystemHardwareSummary(45, false, 1, 2000).then((response: object) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error.message)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
-    })
-  test
-    .it('Successfully tested endpoint - dashboards (hardware_details)', async () => {
-      await getDashboards.getSystemHardwareDetails(45, false, 1, 2000).then((response: object) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error.message)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
-    })
-  test
-    .it('Successfully tested endpoint - dashboards (sensor_hardware_summary)', async () => {
-      await getDashboards.getSystemSensorHardwareSummary(45, false, 1, 2000).then((response: object) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error.message)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
-    })
-  test
-    .it('Successfully tested endpoint - dashboards (sensor_hardware_details)', async () => {
-      await getDashboards.getSystemSensorHardwareDetails(45, false, 1, 2000).then((response: object) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error.message)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
-    })
-  test
-    .it('Successfully tested endpoint - dashboards (ports_protocols_summary)', async () => {
-      await getDashboards.getSystemPortsProtocolsSummary(45, false, 1, 2000).then((response: object) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error.message)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
-    })
-  test
-    .it('Successfully tested endpoint - dashboards (ports_protocols_details)', async () => {
-      await getDashboards.getSystemPortsProtocolsDetails(45, false, 1, 2000).then((response: object) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error.message)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
-    })
-  test
-    .it('Successfully tested endpoint - dashboards (associations_details)', async () => {
-      await getDashboards.getSystemAssociationsDetails(45, false, 1, 2000).then((response: object) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error.message)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
-    })
-  test
-    .it('Successfully tested endpoint - dashboards (assignments_details)', async () => {
-      await getDashboards.getUserSystemAssignmentsDetails(45, false, 1, 2000).then((response: object) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error.message)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
-    })
-  test
-    .it('Successfully tested endpoint - dashboards (privacy_summary)', async () => {
-      await getDashboards.getSystemPrivacySummary(45, false, 1, 2000).then((response: object) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error.message)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
-    })
-  test
-    .it('Successfully tested endpoint - dashboards (fisma_saop_summary)', async () => {
-      await getDashboards.getVaOmbFsmaSaopSummary(45, false, 1, 2000).then((response: object) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error.message)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
-    })
-  test
-    .it('Successfully tested endpoint - dashboards (va_aa_summary)', async () => {
-      await getDashboards.getVaSystemAaSummary(45, false, 1, 2000).then((response: object) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error.message)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
-    })
-  test
-    .it('Successfully tested endpoint - dashboards (va_a2_summary)', async () => {
-      await getDashboards.getVaSystemA2Summary(45, false, 1, 2000).then((response: object) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error.message)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
-    })
-  test
-    .it('Successfully tested endpoint - dashboards (va_pl_109_summary)', async () => {
-      await getDashboards.getVaSystemPl109ReportingSummary(45, false, 1, 2000).then((response: object) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error.message)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
-    })
-  test
-    .it('Successfully tested endpoint - dashboards (fisma_inventory_summary)', async () => {
-      await getDashboards.getVaSystemFismaInvetorySummary(45, false, 1, 2000).then((response: object) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error.message)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
-    })
-  test
-    .it('Successfully tested endpoint - dashboards (fisma_inventory_crypto_summary)', async () => {
-      await getDashboards.getVaSystemFismaInvetoryCryptoSummary(45, false, 1, 2000).then((response: object) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error.message)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
-    })
-  test
-    .it('Successfully tested endpoint - dashboards (threat_risk_summary)', async () => {
-      await getDashboards.getVaSystemThreatRiskSummary(45, false, 1, 2000).then((response: object) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error.message)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
-    })
-  test
-    .it('Successfully tested endpoint - dashboards (threat_source_details)', async () => {
-      await getDashboards.getVaSystemThreatSourceDetails(45, false, 1, 2000).then((response: object) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error.message)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
-    })
-  test
-    .it('Successfully tested endpoint - dashboards (threat_architecture_details)', async () => {
-      await getDashboards.getVaSystemThreatArchitectureDetails(45, false, 1, 2000).then((response: object) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error.message)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
-    })
+
+  it('Successfully tested endpoint - dashboards (status_details)', async () => {
+    await getDashboards.getSystemStatusDetails(45, false, 1, 2000).then((response: object) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error.message)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
+    })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - dashboards (control_compliance_summary)', async () => {
+    await getDashboards.getSystemControlComplianceSummary(45, false, 1, 2000).then((response: object) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error.message)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
+    })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - dashboards (security_control_details)', async () => {
+    await getDashboards.getSystemSecurityControlDetails(45, false, 1, 2000).then((response: object) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error.message)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
+    })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - dashboards (assessment_procedures_details)', async () => {
+    await getDashboards.getSystemAssessmentProceduresDetails(45, false, 1, 2000).then((response: object) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error.message)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
+    })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - dashboards (poam_summary)', async () => {
+    await getDashboards.getSystemPoamSummary(45, false, 1, 2000).then((response: object) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error.message)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
+    })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - dashboards (poam_details)', async () => {
+    await getDashboards.getSystemPoamDetails(45, false, 1, 2000).then((response: object) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error.message)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
+    })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - dashboards (artifacts_summary)', async () => {
+    await getDashboards.getSystemArtifactsSummary(45, false, 1, 2000).then((response: object) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error.message)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
+    })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - dashboards (artifacts_details)', async () => {
+    await getDashboards.getSystemArtifactsDetails(45, false, 1, 2000).then((response: object) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error.message)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
+    })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - dashboards (hardware_summary)', async () => {
+    await getDashboards.getSystemHardwareSummary(45, false, 1, 2000).then((response: object) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error.message)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
+    })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - dashboards (hardware_details)', async () => {
+    await getDashboards.getSystemHardwareDetails(45, false, 1, 2000).then((response: object) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error.message)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
+    })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - dashboards (sensor_hardware_summary)', async () => {
+    await getDashboards.getSystemSensorHardwareSummary(45, false, 1, 2000).then((response: object) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error.message)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
+    })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - dashboards (sensor_hardware_details)', async () => {
+    await getDashboards.getSystemSensorHardwareDetails(45, false, 1, 2000).then((response: object) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error.message)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
+    })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - dashboards (ports_protocols_summary)', async () => {
+    await getDashboards.getSystemPortsProtocolsSummary(45, false, 1, 2000).then((response: object) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error.message)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
+    })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - dashboards (ports_protocols_details)', async () => {
+    await getDashboards.getSystemPortsProtocolsDetails(45, false, 1, 2000).then((response: object) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error.message)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
+    })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - dashboards (associations_details)', async () => {
+    await getDashboards.getSystemAssociationsDetails(45, false, 1, 2000).then((response: object) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error.message)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
+    })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - dashboards (assignments_details)', async () => {
+    await getDashboards.getUserSystemAssignmentsDetails(45, false, 1, 2000).then((response: object) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error.message)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
+    })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - dashboards (privacy_summary)', async () => {
+    await getDashboards.getSystemPrivacySummary(45, false, 1, 2000).then((response: object) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error.message)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
+    })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - dashboards (fisma_saop_summary)', async () => {
+    await getDashboards.getVaOmbFsmaSaopSummary(45, false, 1, 2000).then((response: object) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error.message)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
+    })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - dashboards (va_aa_summary)', async () => {
+    await getDashboards.getVaSystemAaSummary(45, false, 1, 2000).then((response: object) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error.message)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
+    })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - dashboards (va_a2_summary)', async () => {
+    await getDashboards.getVaSystemA2Summary(45, false, 1, 2000).then((response: object) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error.message)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
+    })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - dashboards (va_pl_109_summary)', async () => {
+    await getDashboards.getVaSystemPl109ReportingSummary(45, false, 1, 2000).then((response: object) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error.message)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
+    })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - dashboards (fisma_inventory_summary)', async () => {
+    await getDashboards.getVaSystemFismaInvetorySummary(45, false, 1, 2000).then((response: object) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error.message)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
+    })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - dashboards (fisma_inventory_crypto_summary)', async () => {
+    await getDashboards.getVaSystemFismaInvetoryCryptoSummary(45, false, 1, 2000).then((response: object) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error.message)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
+    })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - dashboards (threat_risk_summary)', async () => {
+    await getDashboards.getVaSystemThreatRiskSummary(45, false, 1, 2000).then((response: object) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error.message)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
+    })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - dashboards (threat_source_details)', async () => {
+    await getDashboards.getVaSystemThreatSourceDetails(45, false, 1, 2000).then((response: object) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error.message)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
+    })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - dashboards (threat_architecture_details)', async () => {
+    await getDashboards.getVaSystemThreatArchitectureDetails(45, false, 1, 2000).then((response: object) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error.message)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
+    })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
 })
diff --git a/test/commands/emasser/post.test.ts b/test/commands/emasser/post.test.ts
index 941080671..0aa8bad09 100644
--- a/test/commands/emasser/post.test.ts
+++ b/test/commands/emasser/post.test.ts
@@ -1,4 +1,4 @@
-import {expect, test} from '@oclif/test'
+import {expect} from 'chai'
 import {InitMockServer} from './mock.server'
 import {CACApi, PACApi, CloudResourceResultsApi, ContainerScanResultsApi,
   MilestonesApi, POAMApi, RegistrationApi, StaticCodeScansApi,
@@ -15,139 +15,138 @@ describe('Test eMASS API CLI (post) commands', () => {
     statusText: 'OK',
   }
 
-  test
-    .it('Successfully tested endpoint - cac', async () => {
-      const addCac = new CACApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
-      await addCac.addSystemCac(123, []).then((response: CacResponsePost) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
+  it('Successfully tested endpoint - cac', async () => {
+    const addCac = new CACApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
+    await addCac.addSystemCac(123, []).then((response: CacResponsePost) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
     })
-  test
-    .it('Successfully tested endpoint - pac', async () => {
-      const addCac = new PACApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
-      await addCac.addSystemPac(123, []).then((response: PacResponsePost) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - pac', async () => {
+    const addCac = new PACApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
+    await addCac.addSystemPac(123, []).then((response: PacResponsePost) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
     })
-  test
-    .it('Successfully tested endpoint - cloud_resources', async () => {
-      const addCloudResource = new CloudResourceResultsApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
-      await addCloudResource.addCloudResourcesBySystemId(123, []).then((response: CloudResourcesResponsePost) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - cloud_resources', async () => {
+    const addCloudResource = new CloudResourceResultsApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
+    await addCloudResource.addCloudResourcesBySystemId(123, []).then((response: CloudResourcesResponsePost) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
     })
-  test
-    .it('Successfully tested endpoint - container_scans', async () => {
-      const addContainer = new ContainerScanResultsApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
-      await addContainer.addContainerSansBySystemId(123, []).then((response: ContainersResponsePost) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - container_scans', async () => {
+    const addContainer = new ContainerScanResultsApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
+    await addContainer.addContainerSansBySystemId(123, []).then((response: ContainersResponsePost) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
     })
-  test
-    .it('Successfully tested endpoint - milestones', async () => {
-      const addMilestone = new MilestonesApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
-      await addMilestone.addMilestoneBySystemIdAndPoamId(123, 456, []).then((response: MilestoneResponsePost) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - milestones', async () => {
+    const addMilestone = new MilestonesApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
+    await addMilestone.addMilestoneBySystemIdAndPoamId(123, 456, []).then((response: MilestoneResponsePost) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
     })
-  test
-    .it('Successfully tested endpoint - poams', async () => {
-      const addPoam = new POAMApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
-      await addPoam.addPoamBySystemId(123, []).then((response: PoamResponsePost) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - poams', async () => {
+    const addPoam = new POAMApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
+    await addPoam.addPoamBySystemId(123, []).then((response: PoamResponsePost) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
     })
-  test
-    .it('Successfully tested endpoint - register', async () => {
-      const registerAPI = new RegistrationApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
-      await registerAPI.registerUser().then((response: Register) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - register', async () => {
+    const registerAPI = new RegistrationApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
+    await registerAPI.registerUser().then((response: Register) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
     })
-  test
-    .it('Successfully tested endpoint - static_code_scans', async () => {
-      const addStaticCodeScans = new StaticCodeScansApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
-      await addStaticCodeScans.addStaticCodeScansBySystemId(123, {}).then((response: StaticCodeResponsePost) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - static_code_scans', async () => {
+    const addStaticCodeScans = new StaticCodeScansApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
+    await addStaticCodeScans.addStaticCodeScansBySystemId(123, {}).then((response: StaticCodeResponsePost) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
     })
-  test
-    .it('Successfully tested endpoint - test_results', async () => {
-      const addTestResults = new TestResultsApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
-      await addTestResults.addTestResultsBySystemId(123, []).then((response: TestResultsResponsePost) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error)
-        }
-
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - test_results', async () => {
+    const addTestResults = new TestResultsApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
+    await addTestResults.addTestResultsBySystemId(123, []).then((response: TestResultsResponsePost) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
     })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
 })
diff --git a/test/commands/emasser/put.test.ts b/test/commands/emasser/put.test.ts
index 7f4816163..b221debf5 100644
--- a/test/commands/emasser/put.test.ts
+++ b/test/commands/emasser/put.test.ts
@@ -1,4 +1,4 @@
-import {expect, test} from '@oclif/test'
+import {expect} from 'chai'
 import {InitMockServer} from './mock.server'
 import {ArtifactsApi, ControlsApi, MilestonesApi, POAMApi} from '@mitre/emass_client'
 import {ArtifactsResponsePutPost, ControlsResponsePut,
@@ -12,64 +12,63 @@ describe('Test eMASS API CLI (put) commands', () => {
     statusText: 'OK',
   }
 
-  test
-    .it('Successfully tested endpoint - artifacts', async () => {
-      const artifactApi = new ArtifactsApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
-      await artifactApi.updateArtifactBySystemId(123, []).then((response: ArtifactsResponsePutPost) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error)
-        }
+  it('Successfully tested endpoint - artifacts', async () => {
+    const artifactApi = new ArtifactsApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
+    await artifactApi.updateArtifactBySystemId(123, []).then((response: ArtifactsResponsePutPost) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error)
+      }
 
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
+      responseDataObj = new Map(Object.entries(testOk))
     })
-  test
-    .it('Successfully tested endpoint - controls', async () => {
-      const updateControl = new ControlsApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
-      await updateControl.updateControlBySystemId(123, []).then((response: ControlsResponsePut) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error)
-        }
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
 
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
+  it('Successfully tested endpoint - controls', async () => {
+    const updateControl = new ControlsApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
+    await updateControl.updateControlBySystemId(123, []).then((response: ControlsResponsePut) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error)
+      }
+
+      responseDataObj = new Map(Object.entries(testOk))
     })
-  test
-    .it('Successfully tested endpoint - milestones', async () => {
-      const putMilestones = new MilestonesApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
-      await putMilestones.updateMilestoneBySystemIdAndPoamId(123, 456, []).then((response: MilestoneResponsePut) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error)
-        }
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - milestones', async () => {
+    const putMilestones = new MilestonesApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
+    await putMilestones.updateMilestoneBySystemIdAndPoamId(123, 456, []).then((response: MilestoneResponsePut) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error)
+      }
 
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
+      responseDataObj = new Map(Object.entries(testOk))
     })
-  test
-    .it('Successfully tested endpoint - poams', async () => {
-      const updatePoam = new POAMApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
-      await updatePoam.updatePoamBySystemId(123, []).then((response: PoamResponsePut) => {
-        responseDataObj = new Map(Object.entries(response))
-      }).catch((error:any) => {
-        if (error.message.includes('unexpected end of file') === false) {
-          console.error(error)
-        }
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
+
+  it('Successfully tested endpoint - poams', async () => {
+    const updatePoam = new POAMApi(mocSer.configuration, mocSer.basePath, mocSer.axiosInstances)
+    await updatePoam.updatePoamBySystemId(123, []).then((response: PoamResponsePut) => {
+      responseDataObj = new Map(Object.entries(response))
+    }).catch((error:any) => {
+      if (error.message.includes('unexpected end of file') === false) {
+        console.error(error)
+      }
 
-        responseDataObj = new Map(Object.entries(testOk))
-      })
-      expect(responseDataObj.get('status')).to.equal(200)
-      expect(responseDataObj.get('statusText')).to.equal('OK')
+      responseDataObj = new Map(Object.entries(testOk))
     })
+    expect(responseDataObj.get('status')).to.equal(200)
+    expect(responseDataObj.get('statusText')).to.equal('OK')
+  })
 })
diff --git a/test/commands/generate/delta.test.ts b/test/commands/generate/delta.test.ts
index fed4c36ae..bbb50b8cd 100644
--- a/test/commands/generate/delta.test.ts
+++ b/test/commands/generate/delta.test.ts
@@ -1,6 +1,7 @@
 /* eslint-disable array-bracket-newline */
 /* eslint-disable array-element-newline */
-import {expect, test} from '@oclif/test'
+import {expect} from 'chai'
+import {runCommand} from '@oclif/test'
 import tmp from 'tmp'
 import path from 'path'
 import fs from 'fs'
@@ -10,142 +11,118 @@ describe('The generate delta command', () => {
   const tmpobj = tmp.dirSync({unsafeCleanup: true})
 
   // should process delta request with rule id type
-  test
-    .stdout()
-    .command(['generate delta',
+  it('should generate the controls for delta request with "rule" id type', async () => {
+    await runCommand<{name: string}>(['generate delta',
       '-J', path.resolve('./test/sample_data/inspec/json/rhel-7-v3r7-mini-sample-profile.json'),
       '-X', path.resolve('./test/sample_data/xccdf/stigs/rhel-7-v3r8-mini-sample-xxcdf.xml'),
       '-o', `${tmpobj.name}`,
       '-T', 'rule',
     ])
-    .it('should generate the controls for delta request with "rule" id type', () => {
-      const fileCount = fs.readdirSync(`${tmpobj.name}/controls/`).length
-      expect(fileCount).to.eql(4)
-    })
+    const fileCount = fs.readdirSync(`${tmpobj.name}/controls/`).length
+    expect(fileCount).to.eql(4)
+  })
 
   // should process delta request with no id type specified
   // should process delta with initially empty output folder
-  test
-    .stdout()
-    .command(['generate delta',
+  it('should generate the output folder and place the controls in newly created folder for review', async () => {
+    await runCommand<{name: string}>(['generate delta',
       '-J', path.resolve('./test/sample_data/inspec/json/rhel-7-v3r7-mini-sample-profile.json'),
       '-X', path.resolve('./test/sample_data/xccdf/stigs/rhel-7-v3r8-mini-sample-xxcdf.xml'),
       '-o', `${tmpobj.name}/RHEL_7`,
     ])
-    .it('should generate the output folder and place the controls in newly created folder for review', () => {
-      const fileCount = fs.readdirSync(`${tmpobj.name}/RHEL_7/controls/`).length
-      expect(fileCount).to.eql(4)
-    })
+    const fileCount = fs.readdirSync(`${tmpobj.name}/RHEL_7/controls/`).length
+    expect(fileCount).to.eql(4)
+  })
 
-  test
-    .stdout()
-    .command(['generate delta',
+  it('should generate a report with given file name and place it on the specified directory', async () => {
+    await runCommand<{name: string}>(['generate delta',
       '-J', path.resolve('./test/sample_data/inspec/json/rhel-7-v3r7-mini-sample-profile.json'),
       '-X', path.resolve('./test/sample_data/xccdf/stigs/rhel-7-v3r8-mini-sample-xxcdf.xml'),
       '-o', `${tmpobj.name}/RHEL_7`,
       '-r', `${tmpobj.name}/RHEL_7/my-report.md`,
     ])
-    .it('should generate a report with given file name and place it on the specified directory', () => {
-      expect(fs.lstatSync((`${tmpobj.name}/RHEL_7/my-report.md`)).isFile()).to.be.true // skipcq: JS-0354
-    })
+    expect(fs.lstatSync((`${tmpobj.name}/RHEL_7/my-report.md`)).isFile()).to.be.true // skipcq: JS-0354
+  })
 
-  test
-    .stdout()
-    .command(['generate delta',
+  it('should generate a report name delta.md and place it in the default directory', async () => {
+    await runCommand<{name: string}>(['generate delta',
       '-J', path.resolve('./test/sample_data/inspec/json/rhel-7-v3r7-mini-sample-profile.json'),
       '-X', path.resolve('./test/sample_data/xccdf/stigs/rhel-7-v3r8-mini-sample-xxcdf.xml'),
       '-o', `${tmpobj.name}`,
       '-r', `${tmpobj.name}`,
     ])
-    .it('should generate a report name delta.md and place it in the default directory', () => {
-      expect(fs.lstatSync((`${tmpobj.name}/delta.md`)).isFile()).to.be.true // skipcq: JS-0354
-    })
+    expect(fs.lstatSync((`${tmpobj.name}/delta.md`)).isFile()).to.be.true // skipcq: JS-0354
+  })
 
   // should process delta request with group id type
   // should process delta with output folder that contains controls information
-  test
-    .stdout()
-    .command(['generate delta',
+  it('should generate the controls for delta request with "group" id type', async () => {
+    await runCommand<{name: string}>(['generate delta',
       '-J', path.resolve('./test/sample_data/inspec/json/rhel-7-v3r7-mini-sample-profile.json'),
       '-X', path.resolve('./test/sample_data/xccdf/stigs/rhel-7-v3r8-mini-sample-xxcdf.xml'),
       '-o', `${tmpobj.name}`,
       '-T', 'group',
     ])
-    .it('should generate the controls for delta request with "group" id type', () => {
-      const fileCount = fs.readdirSync(`${tmpobj.name}/controls/`).length
-      expect(fileCount).to.eql(4)
-    })
+    const fileCount = fs.readdirSync(`${tmpobj.name}/controls/`).length
+    expect(fileCount).to.eql(4)
+  })
 
   // should process delta request with cis id type
-  test
-    .stdout()
-    .command(['generate delta',
+  it('should generate the controls for delta request with "cis" id type', async () => {
+    await runCommand<{name: string}>(['generate delta',
       '-J', path.resolve('./test/sample_data/inspec/json/rhel-7-v3r7-mini-sample-profile.json'),
       '-X', path.resolve('./test/sample_data/xccdf/stigs/rhel-7-v3r8-mini-sample-xxcdf.xml'),
       '-o', `${tmpobj.name}`,
       '-T', 'cis',
     ])
-    .it('should generate the controls for delta request with "cis" id type', () => {
-      const fileCount = fs.readdirSync(`${tmpobj.name}/controls/`).length
-      expect(fileCount).to.eql(4)
-    })
+    const fileCount = fs.readdirSync(`${tmpobj.name}/controls/`).length
+    expect(fileCount).to.eql(4)
+  })
 
   // should process delta request with version id type
   // should process delta request if given the "controls" folder
-  test
-    .stdout()
-    .command(['generate delta',
+  it('should generate the controls for delta request with "version" id type', async () => {
+    await runCommand<{name: string}>(['generate delta',
       '-J', path.resolve('./test/sample_data/inspec/json/rhel-7-v3r7-mini-sample-profile.json'),
       '-X', path.resolve('./test/sample_data/xccdf/stigs/rhel-7-v3r8-mini-sample-xxcdf.xml'),
       '-o', `${tmpobj.name}/controls`,
       '-T', 'version',
     ])
-    .it('should generate the controls for delta request with "version" id type', () => {
-      const fileCount = fs.readdirSync(`${tmpobj.name}/controls/`).length
-      expect(fileCount).to.eql(4)
-    })
+    const fileCount = fs.readdirSync(`${tmpobj.name}/controls/`).length
+    expect(fileCount).to.eql(4)
+  })
 
   // should process delta request with oval definitions file specified
   // should provide error if oval definitions flag is specified with incorrect file format
-
-  // Process delta mapping functionality
-  test
-    .stdout()
-    .command(['generate delta',
+  it('should match and map controls from one profile to another', async () => {
+    const {stdout} = await runCommand<{name: string}>(['generate delta',
       '-J', path.resolve('./test/sample_data/inspec/json/profile_and_controls/Windows_Server_2022_v1r3_mini-profile.json'),
       '-X', path.resolve('./test/sample_data/xccdf/stigs/Windows_Server_2022_V2R1_mini-sample-xccdf.xml'),
       '-o', `${tmpobj.name}`,
       '-T', 'rule', '-M',
       '-c', path.resolve('./test/sample_data/inspec/json/profile_and_controls/windows_server_2022_v1r3_mini_controls/'),
     ])
-    .timeout(25000)
-    .it('should match and map controls from one profile to another', async ctx => {
-      // Wait for the command to finish execution
-      await ctx.returned
 
-      // Now you can safely access the output
-      expect(ctx.stdout).to.contain('Match Controls:  5')
-    })
-  test
-    .stdout()
-    .command(['generate delta',
+    // Now you can safely access the output
+    expect(stdout).to.contain('Match Controls:  5')
+  }, 25000)
+
+  it('should map to the correct filenames', async () => {
+    const {stdout} = await runCommand<{name: string}>(['generate delta',
       '-J', path.resolve('./test/sample_data/inspec/json/profile_and_controls/Windows_Server_2022_v1r3_mini-profile.json'),
       '-X', path.resolve('./test/sample_data/xccdf/stigs/Windows_Server_2022_V2R1_mini-sample-xccdf.xml'),
       '-o', `${tmpobj.name}`,
       '-T', 'rule', '-M',
       '-c', path.resolve('./test/sample_data/inspec/json/profile_and_controls/windows_server_2022_v1r3_mini_controls/'),
     ])
-    .timeout(25000)
-    .it('should map to the correct filenames', async ctx => {
-      await ctx.returned
 
-      const output = ctx.stdout.split('\n')
-      expect(output.includes('Total Controls Found on Delta Directory:  5'))
-      expect(output.includes('Total Controls Found on XCCDF:  5'))
-      expect(output.includes('["+","SV-254238"]'))
-      expect(output.includes('["+","SV-254239"]'))
-      expect(output.includes('["+","SV-254240"]'))
-      expect(output.includes('["+","SV-254241"]'))
-      expect(output.includes('["+","SV-254242"]'))
-    })
+    const output = stdout.split('\n')
+    expect(output.includes('Total Controls Found on Delta Directory:  5'))
+    expect(output.includes('Total Controls Found on XCCDF:  5'))
+    expect(output.includes('["+","SV-254238"]'))
+    expect(output.includes('["+","SV-254239"]'))
+    expect(output.includes('["+","SV-254240"]'))
+    expect(output.includes('["+","SV-254241"]'))
+    expect(output.includes('["+","SV-254242"]'))
+  }, 25000)
 })
diff --git a/test/commands/generate/inspec_profile.test.ts b/test/commands/generate/inspec_profile.test.ts
index 2142693c4..7a22d188f 100644
--- a/test/commands/generate/inspec_profile.test.ts
+++ b/test/commands/generate/inspec_profile.test.ts
@@ -1,4 +1,5 @@
-import {expect, test} from '@oclif/test'
+import {expect} from 'chai'
+import {runCommand} from '@oclif/test'
 import tmp from 'tmp'
 import path from 'path'
 import fs from 'fs'
@@ -8,13 +9,11 @@ describe('Test inspec_profile (aliases:xccdf_benchmark2inspec)', () => {
   const tmpobj = tmp.dirSync({unsafeCleanup: true})
 
   fs.readdirSync('./test/sample_data/xccdf/stigs').forEach(file => {
-    test
-      .stdout()
-      .command(['generate inspec_profile', '-i', path.resolve('./test/sample_data/xccdf/stigs', file), '-o', `${tmpobj.name}/${file}`])
-      .it(`Has the same number of controls in the stig as generated - ${file}`, () => {
-        const parsedXCCDF = processXCCDF(fs.readFileSync(path.resolve('./test/sample_data/xccdf/stigs', file), 'utf8'), false, 'rule')
-        const fileCount = fs.readdirSync(`${tmpobj.name}/${file}/controls/`).length
-        expect(fileCount).to.eql(parsedXCCDF.controls.length)
-      })
+    it(`Has the same number of controls in the stig as generated - ${file}`, async () => {
+      await runCommand<{name: string}>(['generate inspec_profile', '-X', path.resolve('./test/sample_data/xccdf/stigs', file), '-o', `${tmpobj.name}/${file}`])
+      const parsedXCCDF = processXCCDF(fs.readFileSync(path.resolve('./test/sample_data/xccdf/stigs', file), 'utf8'), false, 'rule')
+      const fileCount = fs.readdirSync(`${tmpobj.name}/${file}/controls/`).length
+      expect(fileCount).to.eql(parsedXCCDF.controls.length)
+    })
   })
 })
diff --git a/test/commands/generate/spreadsheet2inspec_stub.test.ts b/test/commands/generate/spreadsheet2inspec_stub.test.ts
index d04a938be..8aeee2f85 100644
--- a/test/commands/generate/spreadsheet2inspec_stub.test.ts
+++ b/test/commands/generate/spreadsheet2inspec_stub.test.ts
@@ -1,4 +1,7 @@
-import {expect, test} from '@oclif/test'
+/* eslint-disable array-bracket-newline */
+/* eslint-disable array-element-newline */
+import {expect} from 'chai'
+import {runCommand} from '@oclif/test'
 import tmp from 'tmp'
 import path from 'path'
 import fs from 'fs'
@@ -6,11 +9,12 @@ import fs from 'fs'
 describe('Test spreadsheet2inspec_stub', () => {
   const tmpobj = tmp.dirSync({unsafeCleanup: true})
 
-  test
-    .stdout()
-    .command(['generate spreadsheet2inspec_stub', '-i', path.resolve('./test/sample_data/csv/input/Ubuntu.csv'), '-o', `${tmpobj.name}/Ubuntu`, '--format', 'disa'])
-    .it('Has the same number of controls in the CSV as generated - Ubuntu', () => {
-      const fileCount = fs.readdirSync(`${tmpobj.name}/Ubuntu/controls/`).length
-      expect(fileCount).to.eql(194)
-    })
+  it('Has the same number of controls in the CSV as generated - Ubuntu', async () => {
+    await runCommand<{name: string}>(['generate spreadsheet2inspec_stub',
+      '-i', path.resolve('./test/sample_data/csv/input/Ubuntu.csv'),
+      '-o', `${tmpobj.name}/Ubuntu`, '--format', 'disa',
+    ])
+    const fileCount = fs.readdirSync(`${tmpobj.name}/Ubuntu/controls/`).length
+    expect(fileCount).to.eql(194)
+  })
 })
diff --git a/test/commands/generate/threshold.test.ts b/test/commands/generate/threshold.test.ts
index 4b9c817a5..395e21631 100644
--- a/test/commands/generate/threshold.test.ts
+++ b/test/commands/generate/threshold.test.ts
@@ -1,4 +1,5 @@
-import {expect, test} from '@oclif/test'
+import {expect} from 'chai'
+import {runCommand} from '@oclif/test'
 import tmp from 'tmp'
 import path from 'path'
 import fs from 'fs'
@@ -7,22 +8,18 @@ import YAML from 'yaml'
 describe('Generate threshold', () => {
   const tmpobj = tmp.dirSync({unsafeCleanup: true})
 
-  test
-    .stdout()
-    .command(['generate threshold', '-i', path.resolve('./test/sample_data/HDF/input/red_hat_good.json'), '-o', `${tmpobj.name}/red_hat_good.counts.good.yml`])
-    .it('when provided an output file to store threshold', () => {
-      // Need to convert to linefeed (\n) otherwise the test will fail when executed in a Windows platform.
-      // The YAML.stringify will always include \n as the last character, as is expected of YAML documents.
-      const test = YAML.stringify(fs.readFileSync(`${tmpobj.name}/red_hat_good.counts.good.yml`, 'utf8').replaceAll(/\r\n/gi, '\n'))
-      const sample = YAML.stringify(fs.readFileSync(path.resolve('./test/sample_data/thresholds/red_hat_good.counts.good.yml'), 'utf8').replaceAll(/\r\n/gi, '\n'))
-      expect(test).to.eql(sample)
-    })
+  it('when provided an output file to store threshold', async () => {
+    // Need to convert to linefeed (\n) otherwise the test will fail when executed in a Windows platform.
+    // The YAML.stringify will always include \n as the last character, as is expected of YAML documents.
+    await runCommand<{name: string}>(['generate threshold', '-i', path.resolve('./test/sample_data/HDF/input/red_hat_good.json'), '-o', `${tmpobj.name}/red_hat_good.counts.good.yml`])
+    const test = YAML.stringify(fs.readFileSync(`${tmpobj.name}/red_hat_good.counts.good.yml`, 'utf8').replaceAll(/\r\n/gi, '\n'))
+    const sample = YAML.stringify(fs.readFileSync(path.resolve('./test/sample_data/thresholds/red_hat_good.counts.good.yml'), 'utf8').replaceAll(/\r\n/gi, '\n'))
+    expect(test).to.eql(sample)
+  })
 
-  test
-    .stdout()
-    .command(['generate threshold', '-i', path.resolve('./test/sample_data/HDF/input/red_hat_good.json')])
-    .it('when not provided an output file to store threshold', output => {
-      // Need to convert to linefeed (\n) otherwise the test will fail when executed in a Windows platform.
-      expect(output.stdout.replaceAll(/\r\n/gi, '\n')).to.contain(fs.readFileSync(path.resolve('./test/sample_data/thresholds/red_hat_good.counts.good.yml'), 'utf8').replaceAll(/\r\n/gi, '\n'))
-    })
+  it('when not provided an output file to store threshold', async () => {
+    // Need to convert to linefeed (\n) otherwise the test will fail when executed in a Windows platform.
+    const {stdout} = await runCommand<{name: string}>(['generate threshold', '-i', path.resolve('./test/sample_data/HDF/input/red_hat_good.json')])
+    expect(stdout.replaceAll(/\r\n/gi, '\n')).to.contain(fs.readFileSync(path.resolve('./test/sample_data/thresholds/red_hat_good.counts.good.yml'), 'utf8').replaceAll(/\r\n/gi, '\n'))
+  })
 })
diff --git a/test/commands/supplement/passthrough.test.ts b/test/commands/supplement/passthrough.test.ts
index 2e7a71a15..0bfbee6f1 100644
--- a/test/commands/supplement/passthrough.test.ts
+++ b/test/commands/supplement/passthrough.test.ts
@@ -1,4 +1,7 @@
-import {expect, test} from '@oclif/test'
+/* eslint-disable array-bracket-newline */
+/* eslint-disable array-element-newline */
+import {expect} from 'chai'
+import {runCommand} from '@oclif/test'
 import tmp from 'tmp'
 import path from 'path'
 import fs from 'fs'
@@ -8,49 +11,57 @@ describe('Test supplement passthrough', () => {
   const tmpobj = tmp.dirSync({unsafeCleanup: true})
   fs.copyFileSync(path.resolve('./test/sample_data/HDF/input/minimal-hdf.json'), path.resolve(`${tmpobj.name}/minimal-hdf.json`))
 
-  test
-    .command(['supplement passthrough write', '-i', path.resolve('./test/sample_data/HDF/input/minimal-hdf.json'), '-f', path.resolve('./test/sample_data/passthrough/passthrough-object.json'), '-o', `${tmpobj.name}/minimal-hdf-passthrough-object.json`])
-    .it('Successfully writes a passthrough json to an HDF and makes a new output file', () => {
-      const output = JSON.parse(fs.readFileSync(`${tmpobj.name}/minimal-hdf-passthrough-object.json`, 'utf8'))
-      const expected = JSON.parse(fs.readFileSync(path.resolve('./test/sample_data/passthrough/minimal-hdf-passthrough-object.json'), 'utf8'))
-
-      expect(omitHDFChangingFields(output)).to.eql(omitHDFChangingFields(expected))
-    })
-
-  test
-    .command(['supplement passthrough write', '-i', path.resolve(`${tmpobj.name}/minimal-hdf.json`), '-f', path.resolve('./test/sample_data/passthrough/passthrough-object.json')])
-    .it('Successfully writes a passthrough json to an HDF inline', () => {
-      const output = JSON.parse(fs.readFileSync(`${tmpobj.name}/minimal-hdf.json`, 'utf8'))
-      const expected = JSON.parse(fs.readFileSync(path.resolve('./test/sample_data/passthrough/minimal-hdf-passthrough-object.json'), 'utf8'))
-
-      expect(omitHDFChangingFields(output)).to.eql(omitHDFChangingFields(expected))
-    })
-
-  test
-    .command(['supplement passthrough write', '-i', path.resolve('./test/sample_data/HDF/input/minimal-hdf.json'), '-d', 'test string', '-o', `${tmpobj.name}/minimal-hdf-passthrough-nonobject.json`])
-    .it('Successfully writes passthrough data to an HDF and makes a new output file', () => {
-      const output = JSON.parse(fs.readFileSync(`${tmpobj.name}/minimal-hdf-passthrough-nonobject.json`, 'utf8'))
-      const expected = JSON.parse(fs.readFileSync(path.resolve('./test/sample_data/passthrough/minimal-hdf-passthrough-nonobject.json'), 'utf8'))
-
-      expect(omitHDFChangingFields(output)).to.eql(omitHDFChangingFields(expected))
-    })
-
-  test
-    .command(['supplement passthrough read', '-i', path.resolve('./test/sample_data/passthrough/minimal-hdf-passthrough-object.json'), '-o', `${tmpobj.name}/passthrough-object.json`])
-    .it('Successfully reads passthrough data from an HDF and writes it to a file', () => {
-      const output = JSON.parse(fs.readFileSync(`${tmpobj.name}/passthrough-object.json`, 'utf8'))
-      const expected = JSON.parse(fs.readFileSync(path.resolve('./test/sample_data/passthrough/passthrough-object.json'), 'utf8'))
-
-      expect(output).to.eql(expected)
-    })
-
-  test
-    .stdout()
-    .command(['supplement passthrough read', '-i', path.resolve('./test/sample_data/passthrough/minimal-hdf-passthrough-object.json')])
-    .it('Successfully reads passthrough data from an HDF and writes it to stdout', ctx => {
-      const output = JSON.parse(ctx.stdout)
-      const expected = JSON.parse(fs.readFileSync(path.resolve('./test/sample_data/passthrough/passthrough-object.json'), 'utf8'))
-
-      expect(output).to.eql(expected)
-    })
+  it('Successfully writes a passthrough json to an HDF and makes a new output file', async () => {
+    await runCommand<{name: string}>(['supplement passthrough write',
+      '-i', path.resolve('./test/sample_data/HDF/input/minimal-hdf.json'),
+      '-f', path.resolve('./test/sample_data/passthrough/passthrough-object.json'),
+      '-o', `${tmpobj.name}/minimal-hdf-passthrough-object.json`,
+    ])
+    const output = JSON.parse(fs.readFileSync(`${tmpobj.name}/minimal-hdf-passthrough-object.json`, 'utf8'))
+    const expected = JSON.parse(fs.readFileSync(path.resolve('./test/sample_data/passthrough/minimal-hdf-passthrough-object.json'), 'utf8'))
+
+    expect(omitHDFChangingFields(output)).to.eql(omitHDFChangingFields(expected))
+  })
+
+  it('Successfully writes a passthrough json to an HDF inline', async () => {
+    await runCommand<{name: string}>(['supplement passthrough write',
+      '-i', path.resolve(`${tmpobj.name}/minimal-hdf.json`),
+      '-f', path.resolve('./test/sample_data/passthrough/passthrough-object.json'),
+    ])
+    const output = JSON.parse(fs.readFileSync(`${tmpobj.name}/minimal-hdf.json`, 'utf8'))
+    const expected = JSON.parse(fs.readFileSync(path.resolve('./test/sample_data/passthrough/minimal-hdf-passthrough-object.json'), 'utf8'))
+
+    expect(omitHDFChangingFields(output)).to.eql(omitHDFChangingFields(expected))
+  })
+
+  it('Successfully writes passthrough data to an HDF and makes a new output file', async () => {
+    await runCommand<{name: string}>(['supplement passthrough write',
+      '-i', path.resolve('./test/sample_data/HDF/input/minimal-hdf.json'),
+      '-d', '"test string"', '-o', `${tmpobj.name}/minimal-hdf-passthrough-nonobject.json`,
+    ])
+    const output = JSON.parse(fs.readFileSync(`${tmpobj.name}/minimal-hdf-passthrough-nonobject.json`, 'utf8'))
+    const expected = JSON.parse(fs.readFileSync(path.resolve('./test/sample_data/passthrough/minimal-hdf-passthrough-nonobject.json'), 'utf8'))
+
+    expect(omitHDFChangingFields(output)).to.eql(omitHDFChangingFields(expected))
+  })
+
+  it('Successfully reads passthrough data from an HDF and writes it to a file', async () => {
+    await runCommand<{name: string}>(['supplement passthrough read',
+      '-i', path.resolve('./test/sample_data/passthrough/minimal-hdf-passthrough-object.json'),
+      '-o', `${tmpobj.name}/passthrough-object.json`])
+    const output = JSON.parse(fs.readFileSync(`${tmpobj.name}/passthrough-object.json`, 'utf8'))
+    const expected = JSON.parse(fs.readFileSync(path.resolve('./test/sample_data/passthrough/passthrough-object.json'), 'utf8'))
+
+    expect(output).to.eql(expected)
+  })
+
+  it('Successfully reads passthrough data from an HDF and writes it to stdout', async () => {
+    const {stdout} = await runCommand<{name: string}>(['supplement passthrough read',
+      '-i', path.resolve('./test/sample_data/passthrough/minimal-hdf-passthrough-object.json'),
+    ])
+    const output = JSON.parse(stdout)
+    const expected = JSON.parse(fs.readFileSync(path.resolve('./test/sample_data/passthrough/passthrough-object.json'), 'utf8'))
+
+    expect(output).to.eql(expected)
+  })
 })
diff --git a/test/commands/supplement/target.test.ts b/test/commands/supplement/target.test.ts
index 0e7308da5..bfe9956c2 100644
--- a/test/commands/supplement/target.test.ts
+++ b/test/commands/supplement/target.test.ts
@@ -1,4 +1,7 @@
-import {expect, test} from '@oclif/test'
+/* eslint-disable array-bracket-newline */
+/* eslint-disable array-element-newline */
+import {expect} from 'chai'
+import {runCommand} from '@oclif/test'
 import tmp from 'tmp'
 import path from 'path'
 import fs from 'fs'
@@ -8,49 +11,58 @@ describe('Test supplement target', () => {
   const tmpobj = tmp.dirSync({unsafeCleanup: true})
   fs.copyFileSync(path.resolve('./test/sample_data/HDF/input/minimal-hdf.json'), path.resolve(`${tmpobj.name}/minimal-hdf.json`))
 
-  test
-    .command(['supplement target write', '-i', path.resolve('./test/sample_data/HDF/input/minimal-hdf.json'), '-f', path.resolve('./test/sample_data/target/target-object.json'), '-o', `${tmpobj.name}/minimal-hdf-target-object.json`])
-    .it('Successfully writes a target json to an HDF and makes a new output file', () => {
-      const output = JSON.parse(fs.readFileSync(`${tmpobj.name}/minimal-hdf-target-object.json`, 'utf8'))
-      const expected = JSON.parse(fs.readFileSync(path.resolve('./test/sample_data/target/minimal-hdf-target-object.json'), 'utf8'))
-
-      expect(omitHDFChangingFields(output)).to.eql(omitHDFChangingFields(expected))
-    })
-
-  test
-    .command(['supplement target write', '-i', path.resolve(`${tmpobj.name}/minimal-hdf.json`), '-f', path.resolve('./test/sample_data/target/target-object.json')])
-    .it('Successfully writes a target json to an HDF inline', () => {
-      const output = JSON.parse(fs.readFileSync(`${tmpobj.name}/minimal-hdf.json`, 'utf8'))
-      const expected = JSON.parse(fs.readFileSync(path.resolve('./test/sample_data/target/minimal-hdf-target-object.json'), 'utf8'))
-
-      expect(omitHDFChangingFields(output)).to.eql(omitHDFChangingFields(expected))
-    })
-
-  test
-    .command(['supplement target write', '-i', path.resolve('./test/sample_data/HDF/input/minimal-hdf.json'), '-d', 'test string', '-o', `${tmpobj.name}/minimal-hdf-target-nonobject.json`])
-    .it('Successfully writes target data to an HDF and makes a new output file', () => {
-      const output = JSON.parse(fs.readFileSync(`${tmpobj.name}/minimal-hdf-target-nonobject.json`, 'utf8'))
-      const expected = JSON.parse(fs.readFileSync(path.resolve('./test/sample_data/target/minimal-hdf-target-nonobject.json'), 'utf8'))
-
-      expect(omitHDFChangingFields(output)).to.eql(omitHDFChangingFields(expected))
-    })
-
-  test
-    .command(['supplement target read', '-i', path.resolve('./test/sample_data/target/minimal-hdf-target-object.json'), '-o', `${tmpobj.name}/target-object.json`])
-    .it('Successfully reads target data from an HDF and writes it to a file', () => {
-      const output = JSON.parse(fs.readFileSync(`${tmpobj.name}/target-object.json`, 'utf8'))
-      const expected = JSON.parse(fs.readFileSync(path.resolve('./test/sample_data/target/target-object.json'), 'utf8'))
-
-      expect(output).to.eql(expected)
-    })
-
-  test
-    .stdout()
-    .command(['supplement target read', '-i', path.resolve('./test/sample_data/target/minimal-hdf-target-object.json')])
-    .it('Successfully reads target data from an HDF and writes it to stdout', ctx => {
-      const output = JSON.parse(ctx.stdout)
-      const expected = JSON.parse(fs.readFileSync(path.resolve('./test/sample_data/target/target-object.json'), 'utf8'))
-
-      expect(output).to.eql(expected)
-    })
+  it('Successfully writes a target json to an HDF and makes a new output file', async () => {
+    await runCommand<{name: string}>(['supplement target write',
+      '-i', path.resolve('./test/sample_data/HDF/input/minimal-hdf.json'),
+      '-f', path.resolve('./test/sample_data/target/target-object.json'),
+      '-o', `${tmpobj.name}/minimal-hdf-target-object.json`,
+    ])
+    const output = JSON.parse(fs.readFileSync(`${tmpobj.name}/minimal-hdf-target-object.json`, 'utf8'))
+    const expected = JSON.parse(fs.readFileSync(path.resolve('./test/sample_data/target/minimal-hdf-target-object.json'), 'utf8'))
+
+    expect(omitHDFChangingFields(output)).to.eql(omitHDFChangingFields(expected))
+  })
+
+  it('Successfully writes a target json to an HDF inline', async () => {
+    await runCommand<{name: string}>(['supplement target write',
+      '-i', path.resolve(`${tmpobj.name}/minimal-hdf.json`),
+      '-f', path.resolve('./test/sample_data/target/target-object.json'),
+    ])
+    const output = JSON.parse(fs.readFileSync(`${tmpobj.name}/minimal-hdf.json`, 'utf8'))
+    const expected = JSON.parse(fs.readFileSync(path.resolve('./test/sample_data/target/minimal-hdf-target-object.json'), 'utf8'))
+
+    expect(omitHDFChangingFields(output)).to.eql(omitHDFChangingFields(expected))
+  })
+
+  it('Successfully writes target data to an HDF and makes a new output file', async () => {
+    await runCommand<{name: string}>(['supplement target write',
+      '-i', path.resolve('./test/sample_data/HDF/input/minimal-hdf.json'),
+      '-d', '"test string"', '-o', `${tmpobj.name}/minimal-hdf-target-nonobject.json`,
+    ])
+    const output = JSON.parse(fs.readFileSync(`${tmpobj.name}/minimal-hdf-target-nonobject.json`, 'utf8'))
+    const expected = JSON.parse(fs.readFileSync(path.resolve('./test/sample_data/target/minimal-hdf-target-nonobject.json'), 'utf8'))
+
+    expect(omitHDFChangingFields(output)).to.eql(omitHDFChangingFields(expected))
+  })
+
+  it('Successfully reads target data from an HDF and writes it to a file', async () => {
+    await runCommand<{name: string}>(['supplement target read',
+      '-i', path.resolve('./test/sample_data/target/minimal-hdf-target-object.json'),
+      '-o', `${tmpobj.name}/target-object.json`,
+    ])
+    const output = JSON.parse(fs.readFileSync(`${tmpobj.name}/target-object.json`, 'utf8'))
+    const expected = JSON.parse(fs.readFileSync(path.resolve('./test/sample_data/target/target-object.json'), 'utf8'))
+
+    expect(output).to.eql(expected)
+  })
+
+  it('Successfully reads target data from an HDF and writes it to stdout', async () => {
+    const {stdout} = await runCommand<{name: string}>(['supplement target read',
+      '-i', path.resolve('./test/sample_data/target/minimal-hdf-target-object.json'),
+    ])
+    const output = JSON.parse(stdout)
+    const expected = JSON.parse(fs.readFileSync(path.resolve('./test/sample_data/target/target-object.json'), 'utf8'))
+
+    expect(output).to.eql(expected)
+  })
 })
diff --git a/test/commands/validate/threshold.test.ts b/test/commands/validate/threshold.test.ts
index 4e015c748..cf7d83ade 100644
--- a/test/commands/validate/threshold.test.ts
+++ b/test/commands/validate/threshold.test.ts
@@ -1,130 +1,57 @@
-import {expect, test} from '@oclif/test'
+/* eslint-disable array-element-newline */
+/* eslint-disable array-bracket-newline */
+import {expect} from 'chai'
+import {runCommand} from '@oclif/test'
 import path from 'path'
 
 describe('Test validate threshold', () => {
-  test
-    .stdout()
-    .stderr()
-    .command([
-      'validate threshold',
-      '-i',
-      path.resolve(
-        './test/sample_data/HDF/input/triple_overlay_profile_example.json',
-      ),
-      '--templateFile',
-      path.resolve(
-        './test/sample_data/thresholds/triple_overlay_profile_example.json.counts.good.yml',
-      ),
+  it('Validate threshold test - Triple Overlay Valid Counts', async () => {
+    const {stdout, stderr} = await runCommand<{name: string}>(['validate threshold',
+      '-i', path.resolve('./test/sample_data/HDF/input/triple_overlay_profile_example.json'),
+      '--templateFile', path.resolve('./test/sample_data/thresholds/triple_overlay_profile_example.json.counts.good.yml'),
     ])
-    .it('Validate threshold test - Triple Overlay Valid Counts', ctx => {
-      expect(ctx.stdout).to.equal('All validation tests passed\n')
-      expect(ctx.stderr).to.equal('')
-    })
+    expect(stdout).to.equal('All validation tests passed\n')
+    expect(stderr).to.equal('')
+  })
 
-  test
-    .stdout()
-    .stderr()
-    .command([
-      'validate threshold',
-      '-i',
-      path.resolve(
-        './test/sample_data/HDF/input/triple_overlay_profile_example.json',
-      ),
-      '--templateFile',
-      path.resolve(
-        './test/sample_data/thresholds/triple_overlay_profile_example.json.counts.bad.total.yml',
-      ),
+  it('Validate threshold test - Triple Overlay Invalid Total Counts', async () => {
+    const {stdout} = await runCommand<{name: string}>(['validate threshold',
+      '-i', path.resolve('./test/sample_data/HDF/input/triple_overlay_profile_example.json'),
+      '--templateFile', path.resolve('./test/sample_data/thresholds/triple_overlay_profile_example.json.counts.bad.total.yml'),
     ])
-    .it('Validate threshold test - Triple Overlay Invalid Total Counts',
-      ctx => {
-        expect(ctx.stdout).to.equal('')
-      },
-    )
+    expect(stdout).to.equal('')
+  })
 
-  test
-    .stdout()
-    .stderr()
-    .command([
-      'validate threshold',
-      '-i',
-      path.resolve(
-        './test/sample_data/HDF/input/triple_overlay_profile_example.json',
-      ),
-      '--templateFile',
-      path.resolve(
-        './test/sample_data/thresholds/triple_overlay_profile_example.json.counts.bad.compliance.yml',
-      ),
+  it('Validate threshold test - Triple Overlay Compliance', async () => {
+    const {stdout} = await runCommand<{name: string}>(['validate threshold',
+      '-i', path.resolve('./test/sample_data/HDF/input/triple_overlay_profile_example.json'),
+      '--templateFile', path.resolve('./test/sample_data/thresholds/triple_overlay_profile_example.json.counts.bad.compliance.yml'),
     ])
-    // .catch(error => {
-    //   expect(error.message).to.equal('Overall compliance minimum was not satisfied')
-    // })
-    .it('Validate threshold test - Triple Overlay Compliance',
-      ctx => {
-        expect(ctx.stdout).to.equal('')
-      },
-    )
+    expect(stdout).to.equal('')
+  })
 
-  test.stdout().stderr()
-    .command([
-      'validate threshold',
-      '-i',
-      path.resolve(
-        './test/sample_data/HDF/input/triple_overlay_profile_example.json',
-      ),
-      '--templateFile',
-      path.resolve(
-        './test/sample_data/thresholds/triple_overlay_profile_example.json.counts.totalMinMax.yml',
-      ),
+  it('Validate threshold minMaxTotal - Triple Overlay Compliance', async () => {
+    const {stdout} = await runCommand<{name: string}>(['validate threshold',
+      '-i', path.resolve('./test/sample_data/HDF/input/triple_overlay_profile_example.json'),
+      '--templateFile', path.resolve('./test/sample_data/thresholds/triple_overlay_profile_example.json.counts.totalMinMax.yml'),
     ])
-    // .catch(error => {
-    //   expect(error.message).to.equal('passed.total.max: Threshold not met. Number of received total passed controls (19) is greater than your set threshold for the number of passed controls (18)')
-    // })
-    .it('Validate threshold minMaxTotal - Triple Overlay Compliance',
-      ctx => {
-        expect(ctx.stdout).to.equal('')
-      },
-    )
+    expect(stdout).to.equal('')
+  })
 
-  test
-    .stdout()
-    .stderr()
-    .command([
-      'validate threshold',
-      '-i',
-      path.resolve(
-        './test/sample_data/HDF/input/rhel-8_hardened.json',
-      ),
-      '--templateFile',
-      path.resolve(
-        './test/sample_data/thresholds/rhel-8_hardened.counts.good.exact.yml',
-      ),
+  it('Validate threshold test - RHEL-8 Hardened Valid Exact Counts', async () => {
+    const {stdout, stderr} = await runCommand<{name: string}>(['validate threshold',
+      '-i', path.resolve('./test/sample_data/HDF/input/rhel-8_hardened.json'),
+      '--templateFile', path.resolve('./test/sample_data/thresholds/rhel-8_hardened.counts.good.exact.yml'),
     ])
-    .it('Validate threshold test - RHEL-8 Hardened Valid Exact Counts', ctx => {
-      expect(ctx.stdout).to.equal('All validation tests passed\n')
-      expect(ctx.stderr).to.equal('')
-    })
+    expect(stdout).to.equal('All validation tests passed\n')
+    expect(stderr).to.equal('')
+  })
 
-  test
-    .stdout()
-    .stderr()
-    .command([
-      'validate threshold',
-      '-i',
-      path.resolve(
-        './test/sample_data/HDF/input/rhel-8_hardened.json',
-      ),
-      '--templateFile',
-      path.resolve(
-        './test/sample_data/thresholds/rhel-8_hardened.counts.bad.noimpactHigh.yml',
-      ),
+  it('Validate threshold test - RHEL-8 Hardened Invalid Total Counts', async () => {
+    const {stdout} = await runCommand<{name: string}>(['validate threshold',
+      '-i', path.resolve('./test/sample_data/HDF/input/rhel-8_hardened.json'),
+      '--templateFile', path.resolve('./test/sample_data/thresholds/rhel-8_hardened.counts.bad.noimpactHigh.yml'),
     ])
-    // .catch(error => {
-    //   expect(error.message).to.equal('no_impact.high.max: Threshold not met. Number of received total no_impact controls (3) is greater than your set threshold for the number of no_impact controls (2)')
-    // })
-    .it(
-      'Validate threshold test - RHEL-8 Hardened Invalid Total Counts',
-      ctx => {
-        expect(ctx.stdout).to.equal('')
-      },
-    )
+    expect(stdout).to.equal('')
+  })
 })
diff --git a/test/commands/view/summary.test.ts b/test/commands/view/summary.test.ts
index 701bffd94..3df07926c 100644
--- a/test/commands/view/summary.test.ts
+++ b/test/commands/view/summary.test.ts
@@ -1,4 +1,5 @@
-import {expect, test} from '@oclif/test'
+import {expect} from 'chai'
+import {runCommand} from '@oclif/test'
 import fs from 'fs'
 import path from 'path'
 import yaml from 'js-yaml'
@@ -11,64 +12,50 @@ describe('Summary command', () => {
   const generatedMD = 'generatedMD.md'
   const UTF8_ENCODING = 'utf8'
 
-  test
-    .stdout()
-    .command(['summary', '-i', hdfFilePath, '--format=json'])
-    .it('runs summary with JSON output and matches the JSON reference file', ctx => {
-      const expectedOutput = JSON.parse(fs.readFileSync(JSON_reference, UTF8_ENCODING))
-      expect(JSON.parse(ctx.stdout)).to.deep.equal(expectedOutput)
-    })
+  it('runs summary with JSON output and matches the JSON reference file', async () => {
+    const {stdout} = await runCommand<{name: string}>(['summary', '-i', hdfFilePath, '--format=json'])
+    const expectedOutput = JSON.parse(fs.readFileSync(JSON_reference, UTF8_ENCODING))
+    expect(JSON.parse(stdout)).to.deep.equal(expectedOutput)
+  })
 
   // NOTE: replacing the CR from both files to ensure proper comparison.
-  test
-    .stdout()
-    .command(['summary', '-i', hdfFilePath, '--format=markdown', '--no-title-table', '-o', generatedMD])
-    .it('runs summary with Markdown output and matches the markdown reference file', () => {
-      const expectedOutput = fs.readFileSync(MD_reference, 'utf8').replaceAll(/\r/gi, '').trim()
-      const actualOutput = fs.readFileSync(generatedMD, 'utf8').replaceAll(/\r/gi, '').trim()
-      expect(actualOutput).to.equal(expectedOutput)
-    })
-
-  test
-    .stdout()
-    .command(['summary', '-i', hdfFilePath, '--format=yaml'])
-    .it('runs summary with YAML output and matches the YAML reference file', ctx => {
-      const expectedOutputYaml = fs.readFileSync(YAML_reference, UTF8_ENCODING)
-      const expectedOutput = yaml.load(expectedOutputYaml)
-      const actualOutput = yaml.load(ctx.stdout)
-      expect(actualOutput).to.deep.equal(expectedOutput)
-    })
-
-  test
-    .stdout()
-    .command(['summary', '-i', hdfFilePath, '--format=json', '--no-print-pretty'])
-    .it('runs summary with --no-pretty flag and produces flat JSON output', ctx => {
-      const actualOutput = JSON.parse(ctx.stdout)
-      const flatOutput = JSON.parse(JSON.stringify(actualOutput))
-      expect(actualOutput).to.deep.equal(flatOutput)
-    })
-
-  test
-    .stdout()
-    .command(['summary', '-i', hdfFilePath, '--format=json', '--print-pretty'])
-    .it('runs summary with --pretty flag and produces formatted JSON output', ctx => {
-      const actualOutput = JSON.parse(ctx.stdout)
-      const prettyOutput = JSON.parse(JSON.stringify(actualOutput, null, 2))
-      expect(actualOutput).to.deep.equal(prettyOutput)
-    })
-
-  test
-    .stdout()
-    .command(['summary', '-i', hdfFilePath, '--format=json', '--stdout'])
-    .it('runs summary with --stdout flag and prints output to console', ctx => {
-      const actualOutput = JSON.parse(ctx.stdout)
-      expect(actualOutput).to.not.be.empty.equal(true)
-    })
-
-  test
-    .stdout()
-    .command(['summary', '-i', hdfFilePath, '--format=json', '--no-stdout'])
-    .it('runs summary with no-stdout flag and does not write to stdout', ctx => {
-      expect(ctx.stdout).to.be.empty.equal('')
-    })
+  it('runs summary with Markdown output and matches the markdown reference file', async () => {
+    await runCommand<{name: string}>(['summary', '-i', hdfFilePath, '--format=markdown', '--no-title-table', '-o', generatedMD])
+    const expectedOutput = fs.readFileSync(MD_reference, 'utf8').replaceAll(/\r/gi, '').trim()
+    const actualOutput = fs.readFileSync(generatedMD, 'utf8').replaceAll(/\r/gi, '').trim()
+    expect(actualOutput).to.equal(expectedOutput)
+  })
+
+  it('runs summary with YAML output and matches the YAML reference file', async () => {
+    const {stdout} = await runCommand<{name: string}>(['summary', '-i', hdfFilePath, '--format=yaml'])
+    const expectedOutputYaml = fs.readFileSync(YAML_reference, UTF8_ENCODING)
+    const expectedOutput = yaml.load(expectedOutputYaml)
+    const actualOutput = yaml.load(stdout)
+    expect(actualOutput).to.deep.equal(expectedOutput)
+  })
+
+  it('runs summary with --no-pretty flag and produces flat JSON output', async () => {
+    const {stdout} = await runCommand<{name: string}>(['summary', '-i', hdfFilePath, '--format=json', '--no-print-pretty'])
+    const actualOutput = JSON.parse(stdout)
+    const flatOutput = structuredClone(actualOutput)
+    expect(actualOutput).to.deep.equal(flatOutput)
+  })
+
+  it('runs summary with --pretty flag and produces formatted JSON output', async () => {
+    const {stdout} = await runCommand<{name: string}>(['summary', '-i', hdfFilePath, '--format=json', '--print-pretty'])
+    const actualOutput = JSON.parse(stdout)
+    const prettyOutput = JSON.parse(JSON.stringify(actualOutput, null, 2))
+    expect(actualOutput).to.deep.equal(prettyOutput)
+  })
+
+  it('runs summary with --stdout flag and prints output to console', async () => {
+    const {stdout} = await runCommand<{name: string}>(['summary', '-i', hdfFilePath, '--format=json', '--stdout'])
+    const actualOutput = JSON.parse(stdout)
+    expect(actualOutput).to.not.be.empty.equal(true)
+  })
+
+  it('runs summary with no-stdout flag and does not write to stdout', async () => {
+    const {stdout} = await runCommand<{name: string}>(['summary', '-i', hdfFilePath, '--format=json', '--no-stdout'])
+    expect(stdout).to.be.empty.equal('')
+  })
 })
diff --git a/test/sample_data/inspec/json/profile_and_controls/mapped_controls/V-93205.rb b/test/sample_data/inspec/json/profile_and_controls/mapped_controls/V-93205.rb
index 6ffd24acc..a30d85dfc 100644
--- a/test/sample_data/inspec/json/profile_and_controls/mapped_controls/V-93205.rb
+++ b/test/sample_data/inspec/json/profile_and_controls/mapped_controls/V-93205.rb
@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-control 'V-254240' do
+control 'SV-254240' do
   title "Windows Server 2019 administrative accounts must not be used with
 applications that access the Internet, such as web browsers, or with potential
 Internet sources, such as email."
diff --git a/test/sample_data/inspec/json/profile_and_controls/mapped_controls/V-93207.rb b/test/sample_data/inspec/json/profile_and_controls/mapped_controls/V-93207.rb
index 358c6ab71..dab1cad4e 100644
--- a/test/sample_data/inspec/json/profile_and_controls/mapped_controls/V-93207.rb
+++ b/test/sample_data/inspec/json/profile_and_controls/mapped_controls/V-93207.rb
@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-control 'V-254241' do
+control 'SV-254241' do
   title "Windows Server 2019 members of the Backup Operators group must have
 separate accounts for backup duties and normal operational tasks."
   desc  "Backup Operators are able to read and write to any file in the system,
diff --git a/test/sample_data/inspec/json/profile_and_controls/mapped_controls/V-93369.rb b/test/sample_data/inspec/json/profile_and_controls/mapped_controls/V-93369.rb
index 89ed7ca03..c4e66a529 100644
--- a/test/sample_data/inspec/json/profile_and_controls/mapped_controls/V-93369.rb
+++ b/test/sample_data/inspec/json/profile_and_controls/mapped_controls/V-93369.rb
@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-control 'V-254238' do
+control 'SV-254238' do
   title "Windows Server 2019 users with Administrative privileges must have separate accounts for administrative duties and normal operational tasks."
   desc  "Using a privileged account to perform routine functions makes the computer vulnerable to malicious software inadvertently introduced during a session that has been granted full privileges."
   desc  "rationale", ""
diff --git a/test/sample_data/inspec/json/profile_and_controls/mapped_controls/V-93461.rb b/test/sample_data/inspec/json/profile_and_controls/mapped_controls/V-93461.rb
index fe5b32b1a..99da4cb57 100644
--- a/test/sample_data/inspec/json/profile_and_controls/mapped_controls/V-93461.rb
+++ b/test/sample_data/inspec/json/profile_and_controls/mapped_controls/V-93461.rb
@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-control 'V-254242' do
+control 'SV-254242' do
   title "Windows Server 2019 manually managed application account passwords must be at least #{input('minimum_password_length_manual')} characters in length."
   desc  "Application/service account passwords must be of sufficient length to prevent being easily cracked. Application/service accounts that are manually managed must have passwords at least #{input('minimum_password_length_manual')} characters in length."
   desc  "rationale", ""
diff --git a/test/sample_data/inspec/json/profile_and_controls/mapped_controls/V-93473.rb b/test/sample_data/inspec/json/profile_and_controls/mapped_controls/V-93473.rb
index 0b98b8426..7e817ccc0 100644
--- a/test/sample_data/inspec/json/profile_and_controls/mapped_controls/V-93473.rb
+++ b/test/sample_data/inspec/json/profile_and_controls/mapped_controls/V-93473.rb
@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-control 'V-254239' do
+control 'SV-254239' do
   title "Windows Server 2019 passwords for the built-in Administrator account must be changed at least every 60 days."
   desc  "The longer a password is in use, the greater the opportunity for someone to gain unauthorized knowledge of the password. The built-in Administrator account is not generally used and its password not may be changed as frequently as necessary. Changing the password for the built-in Administrator account on a regular basis will limit its exposure.
     Organizations that use an automated tool, such Microsoft's Local Administrator Password Solution (LAPS), on domain-joined systems can configure this to occur more frequently. LAPS will change the password every \"30\" days by default."