diff --git a/.github/instructions/SqlServerDsc-guidelines.instructions.md b/.github/instructions/SqlServerDsc-guidelines.instructions.md
index ec64ae1271..12677a9144 100644
--- a/.github/instructions/SqlServerDsc-guidelines.instructions.md
+++ b/.github/instructions/SqlServerDsc-guidelines.instructions.md
@@ -6,10 +6,11 @@ applyTo: "**"
 # SqlServerDsc Requirements
 
 ## Build & Test Workflow Requirements
-- Run PowerShell script files from repository root
+- Never use VS Code task, always use PowerShell scripts via terminal, from repository root
 - Setup build and test environment (once per `pwsh` session): `./build.ps1 -Tasks noop`
 - Build project before running tests: `./build.ps1 -Tasks build`
 - Run tests without coverage (wildcards allowed): `Invoke-PesterJob -Path '{tests filepath}' -SkipCodeCoverage`
+- Run tests with coverage (wildcards allowed): `Invoke-PesterJob -Path '{tests filepath}' -EnableSourceLineMapping -FilterCodeCoverageResult '{pattern}'`
 - Run QA tests: `Invoke-PesterJob -Path 'tests/QA' -SkipCodeCoverage`
 - Never run integration tests locally
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f9da463bd..e205bad10b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,15 +7,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- Added integration tests for `Remove-SqlDscAudit` command to ensure it functions
-  correctly in real environments
-  [issue #2241](https://github.com/dsccommunity/SqlServerDsc/issues/2241).
+- `Remove-SqlDscTraceFlag`
+  - Added missing integration test to ensure command reliability ([issue #2239](https://github.com/dsccommunity/SqlServerDsc/issues/2239)).
+- `Remove-SqlDscAudit`
+  - Added missing integration test to ensure command reliability ([issue #2241](https://github.com/dsccommunity/SqlServerDsc/issues/2241)).
 - Added integration tests for `Test-SqlDscIsRole` command to ensure it functions
   correctly in real environments
   [issue #2229](https://github.com/dsccommunity/SqlServerDsc/issues/2229).
 
 ### Fixed
 
+- `Add-SqlDscTraceFlag` and `Remove-SqlDscTraceFlag`
+  - Fixed parameter binding error when `ErrorAction` was specified both
+    explicitly and via `PSBoundParameters` by using `Remove-CommonParameter`
+    instead of manual parameter removal
+    ([issue #2239](https://github.com/dsccommunity/SqlServerDsc/issues/2239)).
+- `Remove-SqlDscTraceFlag`
+  - Optimized to skip unnecessary Set operations when removal results in no
+    effective change
+    ([issue #2239](https://github.com/dsccommunity/SqlServerDsc/issues/2239)).
 - Updated `.gitattributes` to enforce LF line endings for PowerShell files to
   ensure cross-platform compatibility.
 - Updated GitHub Copilot setup workflow to fix environment variable assignment
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 2293052956..4e22310b37 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -333,6 +333,7 @@ stages:
                   'tests/Integration/Commands/Remove-SqlDscDatabase.Integration.Tests.ps1'
                   'tests/Integration/Commands/Remove-SqlDscRole.Integration.Tests.ps1'
                   'tests/Integration/Commands/Remove-SqlDscLogin.Integration.Tests.ps1'
+                  'tests/Integration/Commands/Remove-SqlDscTraceFlag.Integration.Tests.ps1'
                   # Group 9
                   'tests/Integration/Commands/Uninstall-SqlDscServer.Integration.Tests.ps1'
               )
diff --git a/source/Public/Add-SqlDscTraceFlag.ps1 b/source/Public/Add-SqlDscTraceFlag.ps1
index 20bce6e634..075737be44 100644
--- a/source/Public/Add-SqlDscTraceFlag.ps1
+++ b/source/Public/Add-SqlDscTraceFlag.ps1
@@ -96,12 +96,10 @@ function Add-SqlDscTraceFlag
         }
 
         # Copy $PSBoundParameters to keep it intact.
-        $getSqlDscTraceFlagParameters = @{} + $PSBoundParameters
+        $getSqlDscTraceFlagParameters = Remove-CommonParameter -Hashtable $PSBoundParameters
 
-        $commonParameters = [System.Management.Automation.PSCmdlet]::OptionalCommonParameters
-
-        # Remove parameters that Get-SqlDscTraceFLag does not have/support.
-        $commonParameters + @('Force', 'TraceFlag') |
+        # Remove parameters that Get-SqlDscTraceFlag does not have/support.
+        @('Force', 'TraceFlag') |
             ForEach-Object -Process {
                 $getSqlDscTraceFlagParameters.Remove($_)
             }
@@ -132,9 +130,9 @@ function Add-SqlDscTraceFlag
         if ($PSCmdlet.ShouldProcess($verboseDescriptionMessage, $verboseWarningMessage, $captionMessage))
         {
             # Copy $PSBoundParameters to keep it intact.
-            $setSqlDscTraceFlagParameters = @{} + $PSBoundParameters
+            $setSqlDscTraceFlagParameters = Remove-CommonParameter -Hashtable $PSBoundParameters
 
-            $setSqlDscTraceFlagParameters.TraceFLag = $desiredTraceFlags
+            $setSqlDscTraceFlagParameters.TraceFlag = $desiredTraceFlags
 
             $originalErrorActionPreference = $ErrorActionPreference
 
diff --git a/source/Public/Remove-SqlDscTraceFlag.ps1 b/source/Public/Remove-SqlDscTraceFlag.ps1
index be30fa4aa7..ba35cfef9b 100644
--- a/source/Public/Remove-SqlDscTraceFlag.ps1
+++ b/source/Public/Remove-SqlDscTraceFlag.ps1
@@ -96,12 +96,10 @@ function Remove-SqlDscTraceFlag
         }
 
         # Copy $PSBoundParameters to keep it intact.
-        $getSqlDscTraceFlagParameters = @{} + $PSBoundParameters
+        $getSqlDscTraceFlagParameters = Remove-CommonParameter -Hashtable $PSBoundParameters
 
-        $commonParameters = [System.Management.Automation.PSCmdlet]::OptionalCommonParameters
-
-        # Remove parameters that Get-SqlDscTraceFLag does not have/support.
-        $commonParameters + @('Force', 'TraceFlag') |
+        # Remove parameters that Get-SqlDscTraceFlag does not have/support.
+        @('Force', 'TraceFlag') |
             ForEach-Object -Process {
                 $getSqlDscTraceFlagParameters.Remove($_)
             }
@@ -128,6 +126,13 @@ function Remove-SqlDscTraceFlag
                     }
             )
 
+            # Short-circuit if removal results in no effective change
+            if (-not (Compare-Object -ReferenceObject $currentTraceFlags -DifferenceObject $desiredTraceFlags))
+            {
+                Write-Debug -Message $script:localizedData.TraceFlag_Remove_NoChange
+                return
+            }
+
             $verboseDescriptionMessage = $script:localizedData.TraceFlag_Remove_ShouldProcessVerboseDescription -f $InstanceName, ($TraceFlag -join ', ')
             $verboseWarningMessage = $script:localizedData.TraceFlag_Remove_ShouldProcessVerboseWarning -f $InstanceName
             $captionMessage = $script:localizedData.TraceFlag_Remove_ShouldProcessCaption
@@ -135,9 +140,9 @@ function Remove-SqlDscTraceFlag
             if ($PSCmdlet.ShouldProcess($verboseDescriptionMessage, $verboseWarningMessage, $captionMessage))
             {
                 # Copy $PSBoundParameters to keep it intact.
-                $setSqlDscTraceFlagParameters = @{} + $PSBoundParameters
+                $setSqlDscTraceFlagParameters = Remove-CommonParameter -Hashtable $PSBoundParameters
 
-                $setSqlDscTraceFlagParameters.TraceFLag = $desiredTraceFlags
+                $setSqlDscTraceFlagParameters.TraceFlag = $desiredTraceFlags
 
                 $originalErrorActionPreference = $ErrorActionPreference
 
diff --git a/source/en-US/SqlServerDsc.strings.psd1 b/source/en-US/SqlServerDsc.strings.psd1
index bf276cb8ee..7235f33528 100644
--- a/source/en-US/SqlServerDsc.strings.psd1
+++ b/source/en-US/SqlServerDsc.strings.psd1
@@ -216,6 +216,7 @@ ConvertFrom-StringData @'
     # This string shall not end with full stop (.) since it is used as a title of ShouldProcess messages.
     TraceFlag_Remove_ShouldProcessCaption = Remove trace flag from instance
     TraceFlag_Remove_NoCurrentTraceFlags = There are no current trace flags on instance. Nothing to remove.
+    TraceFlag_Remove_NoChange = The specified trace flags are not currently set on the instance. No changes needed.
 
     ## Get-SqlDscPreferredModule
     PreferredModule_ModuleVersionFound = Preferred module '{0}' with version '{1}' found.
diff --git a/tests/Integration/Commands/Assert-SqlDscAgentOperator.Integration.Tests.ps1 b/tests/Integration/Commands/Assert-SqlDscAgentOperator.Integration.Tests.ps1
index 87cbe7c895..2454fdf707 100644
--- a/tests/Integration/Commands/Assert-SqlDscAgentOperator.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Assert-SqlDscAgentOperator.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Assert-SqlDscLogin.Integration.Tests.ps1 b/tests/Integration/Commands/Assert-SqlDscLogin.Integration.Tests.ps1
index 3cdbba3c44..88e35ae40a 100644
--- a/tests/Integration/Commands/Assert-SqlDscLogin.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Assert-SqlDscLogin.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Connect-SqlDscDatabaseEngine.Integration.Tests.ps1 b/tests/Integration/Commands/Connect-SqlDscDatabaseEngine.Integration.Tests.ps1
index 59fb4d69ff..5a878651f8 100644
--- a/tests/Integration/Commands/Connect-SqlDscDatabaseEngine.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Connect-SqlDscDatabaseEngine.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Deny-SqlDscServerPermission.Integration.Tests.ps1 b/tests/Integration/Commands/Deny-SqlDscServerPermission.Integration.Tests.ps1
index 1ce96d96dd..d659811579 100644
--- a/tests/Integration/Commands/Deny-SqlDscServerPermission.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Deny-SqlDscServerPermission.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Disable-SqlDscAgentOperator.Integration.Tests.ps1 b/tests/Integration/Commands/Disable-SqlDscAgentOperator.Integration.Tests.ps1
index acfe627718..4e94a8362c 100644
--- a/tests/Integration/Commands/Disable-SqlDscAgentOperator.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Disable-SqlDscAgentOperator.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Disable-SqlDscLogin.Integration.Tests.ps1 b/tests/Integration/Commands/Disable-SqlDscLogin.Integration.Tests.ps1
index 1c86325aac..ea47f91d31 100644
--- a/tests/Integration/Commands/Disable-SqlDscLogin.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Disable-SqlDscLogin.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Enable-SqlDscAgentOperator.Integration.Tests.ps1 b/tests/Integration/Commands/Enable-SqlDscAgentOperator.Integration.Tests.ps1
index 47fe8f878b..36c37da923 100644
--- a/tests/Integration/Commands/Enable-SqlDscAgentOperator.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Enable-SqlDscAgentOperator.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Enable-SqlDscLogin.Integration.Tests.ps1 b/tests/Integration/Commands/Enable-SqlDscLogin.Integration.Tests.ps1
index 48f0b03748..e834d5776e 100644
--- a/tests/Integration/Commands/Enable-SqlDscLogin.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Enable-SqlDscLogin.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Get-SqlDscAgentAlert.Integration.Tests.ps1 b/tests/Integration/Commands/Get-SqlDscAgentAlert.Integration.Tests.ps1
index 8b34fe4e22..c9172260fe 100644
--- a/tests/Integration/Commands/Get-SqlDscAgentAlert.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Get-SqlDscAgentAlert.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Get-SqlDscAgentOperator.Integration.Tests.ps1 b/tests/Integration/Commands/Get-SqlDscAgentOperator.Integration.Tests.ps1
index 650095d582..837f1c593d 100644
--- a/tests/Integration/Commands/Get-SqlDscAgentOperator.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Get-SqlDscAgentOperator.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Get-SqlDscConfigurationOption.Integration.Tests.ps1 b/tests/Integration/Commands/Get-SqlDscConfigurationOption.Integration.Tests.ps1
index 3fd0101fa0..965e390f03 100644
--- a/tests/Integration/Commands/Get-SqlDscConfigurationOption.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Get-SqlDscConfigurationOption.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Get-SqlDscDatabase.Integration.Tests.ps1 b/tests/Integration/Commands/Get-SqlDscDatabase.Integration.Tests.ps1
index 1e6edaa343..52ed64dba9 100644
--- a/tests/Integration/Commands/Get-SqlDscDatabase.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Get-SqlDscDatabase.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Get-SqlDscInstalledInstance.Integration.Tests.ps1 b/tests/Integration/Commands/Get-SqlDscInstalledInstance.Integration.Tests.ps1
index 60f934e9bc..bfa6babd92 100644
--- a/tests/Integration/Commands/Get-SqlDscInstalledInstance.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Get-SqlDscInstalledInstance.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Get-SqlDscLogin.Integration.Tests.ps1 b/tests/Integration/Commands/Get-SqlDscLogin.Integration.Tests.ps1
index d8a4976295..f835934ae2 100644
--- a/tests/Integration/Commands/Get-SqlDscLogin.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Get-SqlDscLogin.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Get-SqlDscManagedComputerInstance.Integration.Tests.ps1 b/tests/Integration/Commands/Get-SqlDscManagedComputerInstance.Integration.Tests.ps1
index cbb80fdb15..b755ccfc5e 100644
--- a/tests/Integration/Commands/Get-SqlDscManagedComputerInstance.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Get-SqlDscManagedComputerInstance.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Get-SqlDscRSSetupConfiguration.Integration.Tests.ps1 b/tests/Integration/Commands/Get-SqlDscRSSetupConfiguration.Integration.Tests.ps1
index 60679426ab..591d778cdd 100644
--- a/tests/Integration/Commands/Get-SqlDscRSSetupConfiguration.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Get-SqlDscRSSetupConfiguration.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Get-SqlDscRole.Integration.Tests.ps1 b/tests/Integration/Commands/Get-SqlDscRole.Integration.Tests.ps1
index 814a1c11b6..c24529a9ba 100644
--- a/tests/Integration/Commands/Get-SqlDscRole.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Get-SqlDscRole.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Get-SqlDscServerPermission.Integration.Tests.ps1 b/tests/Integration/Commands/Get-SqlDscServerPermission.Integration.Tests.ps1
index caf7abbda8..c1990a51ac 100644
--- a/tests/Integration/Commands/Get-SqlDscServerPermission.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Get-SqlDscServerPermission.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Get-SqlDscServerProtocol.Integration.Tests.ps1 b/tests/Integration/Commands/Get-SqlDscServerProtocol.Integration.Tests.ps1
index b74c45d1ff..20bee68814 100644
--- a/tests/Integration/Commands/Get-SqlDscServerProtocol.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Get-SqlDscServerProtocol.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Get-SqlDscServerProtocolName.Integration.Tests.ps1 b/tests/Integration/Commands/Get-SqlDscServerProtocolName.Integration.Tests.ps1
index 0938a2e153..73439c17b7 100644
--- a/tests/Integration/Commands/Get-SqlDscServerProtocolName.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Get-SqlDscServerProtocolName.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Grant-SqlDscServerPermission.Integration.Tests.ps1 b/tests/Integration/Commands/Grant-SqlDscServerPermission.Integration.Tests.ps1
index 1ac0cedeac..733b8ca238 100644
--- a/tests/Integration/Commands/Grant-SqlDscServerPermission.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Grant-SqlDscServerPermission.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Install-SqlDscBIReportServer.Integration.Tests.ps1 b/tests/Integration/Commands/Install-SqlDscBIReportServer.Integration.Tests.ps1
index 9dbcd7fc38..74a3f97296 100644
--- a/tests/Integration/Commands/Install-SqlDscBIReportServer.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Install-SqlDscBIReportServer.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Install-SqlDscReportingService.Integration.Tests.ps1 b/tests/Integration/Commands/Install-SqlDscReportingService.Integration.Tests.ps1
index f4817a6fef..a25817d2d4 100644
--- a/tests/Integration/Commands/Install-SqlDscReportingService.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Install-SqlDscReportingService.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Install-SqlDscServer.Integration.Tests.ps1 b/tests/Integration/Commands/Install-SqlDscServer.Integration.Tests.ps1
index 983a5e7bbc..71482d7583 100644
--- a/tests/Integration/Commands/Install-SqlDscServer.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Install-SqlDscServer.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/New-SqlDscAgentAlert.Integration.Tests.ps1 b/tests/Integration/Commands/New-SqlDscAgentAlert.Integration.Tests.ps1
index 4603860921..d3a91335b1 100644
--- a/tests/Integration/Commands/New-SqlDscAgentAlert.Integration.Tests.ps1
+++ b/tests/Integration/Commands/New-SqlDscAgentAlert.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/New-SqlDscAgentOperator.Integration.Tests.ps1 b/tests/Integration/Commands/New-SqlDscAgentOperator.Integration.Tests.ps1
index ad8fbf3a19..bc205726a4 100644
--- a/tests/Integration/Commands/New-SqlDscAgentOperator.Integration.Tests.ps1
+++ b/tests/Integration/Commands/New-SqlDscAgentOperator.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/New-SqlDscDatabase.Integration.Tests.ps1 b/tests/Integration/Commands/New-SqlDscDatabase.Integration.Tests.ps1
index 7923fb404d..a9afedf4da 100644
--- a/tests/Integration/Commands/New-SqlDscDatabase.Integration.Tests.ps1
+++ b/tests/Integration/Commands/New-SqlDscDatabase.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/New-SqlDscLogin.Integration.Tests.ps1 b/tests/Integration/Commands/New-SqlDscLogin.Integration.Tests.ps1
index 4516a16b9e..f96973d15f 100644
--- a/tests/Integration/Commands/New-SqlDscLogin.Integration.Tests.ps1
+++ b/tests/Integration/Commands/New-SqlDscLogin.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/New-SqlDscRole.Integration.Tests.ps1 b/tests/Integration/Commands/New-SqlDscRole.Integration.Tests.ps1
index 20057e3584..cfe2f388b5 100644
--- a/tests/Integration/Commands/New-SqlDscRole.Integration.Tests.ps1
+++ b/tests/Integration/Commands/New-SqlDscRole.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Prerequisites.Integration.Tests.ps1 b/tests/Integration/Commands/Prerequisites.Integration.Tests.ps1
index 17e17bc5e6..1889617bf8 100644
--- a/tests/Integration/Commands/Prerequisites.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Prerequisites.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/README.md b/tests/Integration/Commands/README.md
index f013f5a5a0..a129762113 100644
--- a/tests/Integration/Commands/README.md
+++ b/tests/Integration/Commands/README.md
@@ -84,6 +84,7 @@ Remove-SqlDscAudit | 8 | - | DSCSQLTEST | -
 Remove-SqlDscDatabase | 8 | 2 (New-SqlDscDatabase) | DSCSQLTEST | -
 Remove-SqlDscRole | 8 | 2 (New-SqlDscRole) | DSCSQLTEST | -
 Remove-SqlDscLogin | 8 | 2 (New-SqlDscLogin) | DSCSQLTEST | -
+Remove-SqlDscTraceFlag | 8 | 1 (Install-SqlDscServer) | DSCSQLTEST | -
 Uninstall-SqlDscServer | 9 | 8 (Remove commands) | - | -
 Install-SqlDscReportingService | 1 | 0 (Prerequisites) | - | SSRS instance
 Get-SqlDscInstalledInstance | 2 | 1 (Install-SqlDscReportingService), 0 (Prerequisites) | SSRS | -
diff --git a/tests/Integration/Commands/Remove-SqlDscAgentAlert.Integration.Tests.ps1 b/tests/Integration/Commands/Remove-SqlDscAgentAlert.Integration.Tests.ps1
index b386ac6d3a..2a9e998f1b 100644
--- a/tests/Integration/Commands/Remove-SqlDscAgentAlert.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Remove-SqlDscAgentAlert.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Remove-SqlDscAgentOperator.Integration.Tests.ps1 b/tests/Integration/Commands/Remove-SqlDscAgentOperator.Integration.Tests.ps1
index 960819462e..389cdec5e0 100644
--- a/tests/Integration/Commands/Remove-SqlDscAgentOperator.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Remove-SqlDscAgentOperator.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Remove-SqlDscAudit.Integration.Tests.ps1 b/tests/Integration/Commands/Remove-SqlDscAudit.Integration.Tests.ps1
index 3123e28e14..17b0c6fa7d 100644
--- a/tests/Integration/Commands/Remove-SqlDscAudit.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Remove-SqlDscAudit.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
@@ -151,7 +151,7 @@ Describe 'Remove-SqlDscAudit' -Tag @('Integration_SQL2017', 'Integration_SQL2019
                 'SqlDscTestMultiRemove1_' + (Get-Random),
                 'SqlDscTestMultiRemove2_' + (Get-Random)
             )
-            
+
             foreach ($auditName in $script:testAuditNames)
             {
                 $null = New-SqlDscAudit -ServerObject $script:serverObject -Name $auditName -LogType 'ApplicationLog' -Force -ErrorAction Stop
diff --git a/tests/Integration/Commands/Remove-SqlDscDatabase.Integration.Tests.ps1 b/tests/Integration/Commands/Remove-SqlDscDatabase.Integration.Tests.ps1
index e1603df260..4f564a6983 100644
--- a/tests/Integration/Commands/Remove-SqlDscDatabase.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Remove-SqlDscDatabase.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Remove-SqlDscLogin.Integration.Tests.ps1 b/tests/Integration/Commands/Remove-SqlDscLogin.Integration.Tests.ps1
index 282e4e10f6..ad6d0f669f 100644
--- a/tests/Integration/Commands/Remove-SqlDscLogin.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Remove-SqlDscLogin.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Remove-SqlDscRole.Integration.Tests.ps1 b/tests/Integration/Commands/Remove-SqlDscRole.Integration.Tests.ps1
index b36befeabe..6b4ebdc954 100644
--- a/tests/Integration/Commands/Remove-SqlDscRole.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Remove-SqlDscRole.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Remove-SqlDscTraceFlag.Integration.Tests.ps1 b/tests/Integration/Commands/Remove-SqlDscTraceFlag.Integration.Tests.ps1
new file mode 100644
index 0000000000..eac60e9d4a
--- /dev/null
+++ b/tests/Integration/Commands/Remove-SqlDscTraceFlag.Integration.Tests.ps1
@@ -0,0 +1,159 @@
+[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseDeclaredVarsMoreThanAssignments', '', Justification = 'Suppressing this rule because Script Analyzer does not understand Pester syntax.')]
+param ()
+
+BeforeDiscovery {
+    try
+    {
+        if (-not (Get-Module -Name 'DscResource.Test'))
+        {
+            # Assumes dependencies have been resolved, so if this module is not available, run 'noop' task.
+            if (-not (Get-Module -Name 'DscResource.Test' -ListAvailable))
+            {
+                # Redirect all streams to $null, except the error stream (stream 2)
+                & "$PSScriptRoot/../../../build.ps1" -Tasks 'noop' 3>&1 4>&1 5>&1 6>&1 > $null
+            }
+
+            # If the dependencies have not been resolved, this will throw an error.
+            Import-Module -Name 'DscResource.Test' -Force -ErrorAction 'Stop'
+        }
+    }
+    catch [System.IO.FileNotFoundException]
+    {
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
+    }
+}
+
+BeforeAll {
+    $script:moduleName = 'SqlServerDsc'
+
+    Import-Module -Name $script:moduleName -Force -ErrorAction 'Stop'
+}
+
+Describe 'Remove-SqlDscTraceFlag' -Tag @('Integration_SQL2017', 'Integration_SQL2019', 'Integration_SQL2022') {
+    BeforeAll {
+        $script:mockInstanceName = 'DSCSQLTEST'
+        $script:mockComputerName = Get-ComputerName
+
+        # Test trace flags to use for testing
+        $script:testTraceFlags = @(4199, 3226)
+        $script:singleTestTraceFlag = 1118
+    }
+
+    Context 'When removing trace flags using ServerName and InstanceName parameters' {
+        It 'Should remove a single trace flag without error' {
+            # Arrange - Add a test trace flag first
+            {
+                Add-SqlDscTraceFlag -ServerName $script:mockComputerName -InstanceName $script:mockInstanceName -TraceFlag $script:singleTestTraceFlag -Force -ErrorAction 'Stop'
+            } | Should -Not -Throw
+
+            # Act - Remove the trace flag
+            {
+                Remove-SqlDscTraceFlag -ServerName $script:mockComputerName -InstanceName $script:mockInstanceName -TraceFlag $script:singleTestTraceFlag -Force -ErrorAction 'Stop'
+            } | Should -Not -Throw
+
+            # Assert - Verify the trace flag was removed
+            $currentTraceFlags = Get-SqlDscTraceFlag -ServerName $script:mockComputerName -InstanceName $script:mockInstanceName -ErrorAction 'Stop'
+            $currentTraceFlags | Should -Not -Contain $script:singleTestTraceFlag
+        }
+
+        It 'Should remove multiple trace flags without error' {
+            # Arrange - Add test trace flags first
+            {
+                Add-SqlDscTraceFlag -ServerName $script:mockComputerName -InstanceName $script:mockInstanceName -TraceFlag $script:testTraceFlags -Force -ErrorAction 'Stop'
+            } | Should -Not -Throw
+
+            # Act - Remove the trace flags
+            {
+                Remove-SqlDscTraceFlag -ServerName $script:mockComputerName -InstanceName $script:mockInstanceName -TraceFlag $script:testTraceFlags -Force -ErrorAction 'Stop'
+            } | Should -Not -Throw
+
+            # Assert - Verify the trace flags were removed
+            $currentTraceFlags = Get-SqlDscTraceFlag -ServerName $script:mockComputerName -InstanceName $script:mockInstanceName -ErrorAction 'Stop'
+            foreach ($traceFlag in $script:testTraceFlags)
+            {
+                $currentTraceFlags | Should -Not -Contain $traceFlag
+            }
+        }
+
+        It 'Should not error when removing non-existent trace flags' {
+            # Act & Assert - Removing a trace flag that doesn't exist should not throw
+            {
+                Remove-SqlDscTraceFlag -ServerName $script:mockComputerName -InstanceName $script:mockInstanceName -TraceFlag 9999 -Force -ErrorAction 'Stop'
+            } | Should -Not -Throw
+        }
+
+        It 'Should preserve other existing trace flags when removing specific ones' {
+            # Arrange - Add multiple trace flags
+            $allTestFlags = @(4199, 3226, 1118, 2544)
+            $flagsToRemove = @(4199, 1118)
+            $flagsToKeep = @(3226, 2544)
+
+            {
+                Add-SqlDscTraceFlag -ServerName $script:mockComputerName -InstanceName $script:mockInstanceName -TraceFlag $allTestFlags -Force -ErrorAction 'Stop'
+            } | Should -Not -Throw
+
+            # Act - Remove only some of the trace flags
+            {
+                Remove-SqlDscTraceFlag -ServerName $script:mockComputerName -InstanceName $script:mockInstanceName -TraceFlag $flagsToRemove -Force -ErrorAction 'Stop'
+            } | Should -Not -Throw
+
+            # Assert - Verify correct flags were removed and others preserved
+            $currentTraceFlags = Get-SqlDscTraceFlag -ServerName $script:mockComputerName -InstanceName $script:mockInstanceName -ErrorAction 'Stop'
+
+            foreach ($removedFlag in $flagsToRemove)
+            {
+                $currentTraceFlags | Should -Not -Contain $removedFlag
+            }
+
+            foreach ($keptFlag in $flagsToKeep)
+            {
+                $currentTraceFlags | Should -Contain $keptFlag
+            }
+
+            # Clean up - Remove remaining test flags
+            Remove-SqlDscTraceFlag -ServerName $script:mockComputerName -InstanceName $script:mockInstanceName -TraceFlag $flagsToKeep -Force -ErrorAction 'SilentlyContinue'
+        }
+    }
+
+    Context 'When removing trace flags using ServiceObject parameter' {
+        BeforeAll {
+            # Get the service object for the test instance
+            $script:serviceObject = Get-SqlDscManagedComputerService -ServiceType 'DatabaseEngine' -InstanceName $script:mockInstanceName -ErrorAction 'Stop'
+        }
+
+        It 'Should remove a single trace flag using ServiceObject parameter' {
+            # Arrange - Add a test trace flag first
+            {
+                Add-SqlDscTraceFlag -ServiceObject $script:serviceObject -TraceFlag $script:singleTestTraceFlag -Force -ErrorAction 'Stop'
+            } | Should -Not -Throw
+
+            # Act - Remove the trace flag
+            {
+                Remove-SqlDscTraceFlag -ServiceObject $script:serviceObject -TraceFlag $script:singleTestTraceFlag -Force -ErrorAction 'Stop'
+            } | Should -Not -Throw
+
+            # Assert - Verify the trace flag was removed
+            $currentTraceFlags = Get-SqlDscTraceFlag -ServiceObject $script:serviceObject -ErrorAction 'Stop'
+            $currentTraceFlags | Should -Not -Contain $script:singleTestTraceFlag
+        }
+
+        It 'Should remove multiple trace flags using ServiceObject parameter' {
+            # Arrange - Add test trace flags first
+            {
+                Add-SqlDscTraceFlag -ServiceObject $script:serviceObject -TraceFlag $script:testTraceFlags -Force -ErrorAction 'Stop'
+            } | Should -Not -Throw
+
+            # Act - Remove the trace flags
+            {
+                Remove-SqlDscTraceFlag -ServiceObject $script:serviceObject -TraceFlag $script:testTraceFlags -Force -ErrorAction 'Stop'
+            } | Should -Not -Throw
+
+            # Assert - Verify the trace flags were removed
+            $currentTraceFlags = Get-SqlDscTraceFlag -ServiceObject $script:serviceObject -ErrorAction 'Stop'
+            foreach ($traceFlag in $script:testTraceFlags)
+            {
+                $currentTraceFlags | Should -Not -Contain $traceFlag
+            }
+        }
+    }
+}
diff --git a/tests/Integration/Commands/Repair-SqlDscBIReportServer.Integration.Tests.ps1 b/tests/Integration/Commands/Repair-SqlDscBIReportServer.Integration.Tests.ps1
index 0c0dad4585..85a08bbae2 100644
--- a/tests/Integration/Commands/Repair-SqlDscBIReportServer.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Repair-SqlDscBIReportServer.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Repair-SqlDscReportingService.Integration.Tests.ps1 b/tests/Integration/Commands/Repair-SqlDscReportingService.Integration.Tests.ps1
index 03222bc8e6..1c452e0557 100644
--- a/tests/Integration/Commands/Repair-SqlDscReportingService.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Repair-SqlDscReportingService.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Revoke-SqlDscServerPermission.Integration.Tests.ps1 b/tests/Integration/Commands/Revoke-SqlDscServerPermission.Integration.Tests.ps1
index 1044deb848..7dc5edb629 100644
--- a/tests/Integration/Commands/Revoke-SqlDscServerPermission.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Revoke-SqlDscServerPermission.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Set-SqlDscAgentAlert.Integration.Tests.ps1 b/tests/Integration/Commands/Set-SqlDscAgentAlert.Integration.Tests.ps1
index 560bf2ce64..712d1b8183 100644
--- a/tests/Integration/Commands/Set-SqlDscAgentAlert.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Set-SqlDscAgentAlert.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Set-SqlDscAgentOperator.Integration.Tests.ps1 b/tests/Integration/Commands/Set-SqlDscAgentOperator.Integration.Tests.ps1
index 30565bea19..7664b668a3 100644
--- a/tests/Integration/Commands/Set-SqlDscAgentOperator.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Set-SqlDscAgentOperator.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Set-SqlDscConfigurationOption.Integration.Tests.ps1 b/tests/Integration/Commands/Set-SqlDscConfigurationOption.Integration.Tests.ps1
index c9e4041b45..516ad49f8b 100644
--- a/tests/Integration/Commands/Set-SqlDscConfigurationOption.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Set-SqlDscConfigurationOption.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Set-SqlDscDatabase.Integration.Tests.ps1 b/tests/Integration/Commands/Set-SqlDscDatabase.Integration.Tests.ps1
index 66726e0f9c..2363c2ef05 100644
--- a/tests/Integration/Commands/Set-SqlDscDatabase.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Set-SqlDscDatabase.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Set-SqlDscDatabaseDefault.Integration.Tests.ps1 b/tests/Integration/Commands/Set-SqlDscDatabaseDefault.Integration.Tests.ps1
index e117581b37..34cab2cf13 100644
--- a/tests/Integration/Commands/Set-SqlDscDatabaseDefault.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Set-SqlDscDatabaseDefault.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Test-SqlDscAgentAlertProperty.Integration.Tests.ps1 b/tests/Integration/Commands/Test-SqlDscAgentAlertProperty.Integration.Tests.ps1
index 8590dcea1e..a61c2f9439 100644
--- a/tests/Integration/Commands/Test-SqlDscAgentAlertProperty.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Test-SqlDscAgentAlertProperty.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Test-SqlDscConfigurationOption.Integration.Tests.ps1 b/tests/Integration/Commands/Test-SqlDscConfigurationOption.Integration.Tests.ps1
index c1a9e75ebf..b811d8692e 100644
--- a/tests/Integration/Commands/Test-SqlDscConfigurationOption.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Test-SqlDscConfigurationOption.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Test-SqlDscDatabase.Integration.Tests.ps1 b/tests/Integration/Commands/Test-SqlDscDatabase.Integration.Tests.ps1
index 4d91e79981..c5cc235896 100644
--- a/tests/Integration/Commands/Test-SqlDscDatabase.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Test-SqlDscDatabase.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Test-SqlDscIsAgentAlert.Integration.Tests.ps1 b/tests/Integration/Commands/Test-SqlDscIsAgentAlert.Integration.Tests.ps1
index 1229eb23d2..be26d5723e 100644
--- a/tests/Integration/Commands/Test-SqlDscIsAgentAlert.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Test-SqlDscIsAgentAlert.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Test-SqlDscIsAgentOperator.Integration.Tests.ps1 b/tests/Integration/Commands/Test-SqlDscIsAgentOperator.Integration.Tests.ps1
index a781fb2089..e4fa394b8d 100644
--- a/tests/Integration/Commands/Test-SqlDscIsAgentOperator.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Test-SqlDscIsAgentOperator.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Test-SqlDscIsLoginEnabled.Integration.Tests.ps1 b/tests/Integration/Commands/Test-SqlDscIsLoginEnabled.Integration.Tests.ps1
index 89e96007c6..83987ec851 100644
--- a/tests/Integration/Commands/Test-SqlDscIsLoginEnabled.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Test-SqlDscIsLoginEnabled.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Test-SqlDscRSInstalled.Integration.Tests.ps1 b/tests/Integration/Commands/Test-SqlDscRSInstalled.Integration.Tests.ps1
index abfd6335dc..5a56ddd182 100644
--- a/tests/Integration/Commands/Test-SqlDscRSInstalled.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Test-SqlDscRSInstalled.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Test-SqlDscServerPermission.Integration.Tests.ps1 b/tests/Integration/Commands/Test-SqlDscServerPermission.Integration.Tests.ps1
index 1e337a66b3..00cf5b1e66 100644
--- a/tests/Integration/Commands/Test-SqlDscServerPermission.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Test-SqlDscServerPermission.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Uninstall-SqlDscBIReportServer.Integration.Tests.ps1 b/tests/Integration/Commands/Uninstall-SqlDscBIReportServer.Integration.Tests.ps1
index 91493231b5..57fae5e921 100644
--- a/tests/Integration/Commands/Uninstall-SqlDscBIReportServer.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Uninstall-SqlDscBIReportServer.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Uninstall-SqlDscReportingService.Integration.Tests.ps1 b/tests/Integration/Commands/Uninstall-SqlDscReportingService.Integration.Tests.ps1
index e3ff239118..cbac6079dc 100644
--- a/tests/Integration/Commands/Uninstall-SqlDscReportingService.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Uninstall-SqlDscReportingService.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Commands/Uninstall-SqlDscServer.Integration.Tests.ps1 b/tests/Integration/Commands/Uninstall-SqlDscServer.Integration.Tests.ps1
index 6c7c120e9f..990cd08a71 100644
--- a/tests/Integration/Commands/Uninstall-SqlDscServer.Integration.Tests.ps1
+++ b/tests/Integration/Commands/Uninstall-SqlDscServer.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Integration/Resources/DSC_SqlAgentAlert.Integration.Tests.ps1 b/tests/Integration/Resources/DSC_SqlAgentAlert.Integration.Tests.ps1
index 46da08f632..3c71fd4649 100644
--- a/tests/Integration/Resources/DSC_SqlAgentAlert.Integration.Tests.ps1
+++ b/tests/Integration/Resources/DSC_SqlAgentAlert.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 
     <#
@@ -104,7 +104,7 @@ Describe "<dscResourceFriendlyName>_Integration" -Tag @('Integration_SQL2016', '
 
             $resourceCurrentState.Ensure | Should -Be 'Present'
             $resourceCurrentState.Name | Should -Be $ConfigurationData.AllNodes.Name
-            
+
             if ($configurationName -eq "$($script:dscResourceName)_Add_Config")
             {
                 $resourceCurrentState.Severity | Should -Be $ConfigurationData.AllNodes.Severity
diff --git a/tests/Integration/Resources/DSC_SqlAgentFailsafe.Integration.Tests.ps1 b/tests/Integration/Resources/DSC_SqlAgentFailsafe.Integration.Tests.ps1
index 9e0a64d836..3bfb498111 100644
--- a/tests/Integration/Resources/DSC_SqlAgentFailsafe.Integration.Tests.ps1
+++ b/tests/Integration/Resources/DSC_SqlAgentFailsafe.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 
     <#
diff --git a/tests/Integration/Resources/DSC_SqlAgentOperator.Integration.Tests.ps1 b/tests/Integration/Resources/DSC_SqlAgentOperator.Integration.Tests.ps1
index 85986cc74c..ccd267b269 100644
--- a/tests/Integration/Resources/DSC_SqlAgentOperator.Integration.Tests.ps1
+++ b/tests/Integration/Resources/DSC_SqlAgentOperator.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 
     <#
diff --git a/tests/Integration/Resources/DSC_SqlAlwaysOnService.Integration.Tests.ps1 b/tests/Integration/Resources/DSC_SqlAlwaysOnService.Integration.Tests.ps1
index 25dcc5ffab..1b705ea867 100644
--- a/tests/Integration/Resources/DSC_SqlAlwaysOnService.Integration.Tests.ps1
+++ b/tests/Integration/Resources/DSC_SqlAlwaysOnService.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 
     <#
diff --git a/tests/Integration/Resources/DSC_SqlAudit.Integration.Tests.ps1 b/tests/Integration/Resources/DSC_SqlAudit.Integration.Tests.ps1
index d391bdcb42..eba3346c2b 100644
--- a/tests/Integration/Resources/DSC_SqlAudit.Integration.Tests.ps1
+++ b/tests/Integration/Resources/DSC_SqlAudit.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 
     <#
diff --git a/tests/Integration/Resources/DSC_SqlDatabase.Integration.Tests.ps1 b/tests/Integration/Resources/DSC_SqlDatabase.Integration.Tests.ps1
index 9b89c2c63e..de653c0e55 100644
--- a/tests/Integration/Resources/DSC_SqlDatabase.Integration.Tests.ps1
+++ b/tests/Integration/Resources/DSC_SqlDatabase.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 
     <#
diff --git a/tests/Integration/Resources/DSC_SqlDatabaseDefaultLocation.Integration.Tests.ps1 b/tests/Integration/Resources/DSC_SqlDatabaseDefaultLocation.Integration.Tests.ps1
index 9ed2b79e5a..afff0eabc4 100644
--- a/tests/Integration/Resources/DSC_SqlDatabaseDefaultLocation.Integration.Tests.ps1
+++ b/tests/Integration/Resources/DSC_SqlDatabaseDefaultLocation.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 
     <#
diff --git a/tests/Integration/Resources/DSC_SqlDatabaseMail.Integration.Tests.ps1 b/tests/Integration/Resources/DSC_SqlDatabaseMail.Integration.Tests.ps1
index c04f9baef3..3782ad0a1f 100644
--- a/tests/Integration/Resources/DSC_SqlDatabaseMail.Integration.Tests.ps1
+++ b/tests/Integration/Resources/DSC_SqlDatabaseMail.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 
     <#
diff --git a/tests/Integration/Resources/DSC_SqlDatabaseObjectPermission.Integration.Tests.ps1 b/tests/Integration/Resources/DSC_SqlDatabaseObjectPermission.Integration.Tests.ps1
index 1e15efa5e9..2e83c3200b 100644
--- a/tests/Integration/Resources/DSC_SqlDatabaseObjectPermission.Integration.Tests.ps1
+++ b/tests/Integration/Resources/DSC_SqlDatabaseObjectPermission.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 
     <#
diff --git a/tests/Integration/Resources/DSC_SqlDatabasePermission.Integration.Tests.ps1 b/tests/Integration/Resources/DSC_SqlDatabasePermission.Integration.Tests.ps1
index 8d26e64b8f..0405748a87 100644
--- a/tests/Integration/Resources/DSC_SqlDatabasePermission.Integration.Tests.ps1
+++ b/tests/Integration/Resources/DSC_SqlDatabasePermission.Integration.Tests.ps1
@@ -20,7 +20,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 
     <#
diff --git a/tests/Integration/Resources/DSC_SqlDatabaseUser.Integration.Tests.ps1 b/tests/Integration/Resources/DSC_SqlDatabaseUser.Integration.Tests.ps1
index c03ff07ff2..49faa0d323 100644
--- a/tests/Integration/Resources/DSC_SqlDatabaseUser.Integration.Tests.ps1
+++ b/tests/Integration/Resources/DSC_SqlDatabaseUser.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 
     <#
diff --git a/tests/Integration/Resources/DSC_SqlEndpoint.Integration.Tests.ps1 b/tests/Integration/Resources/DSC_SqlEndpoint.Integration.Tests.ps1
index 10db02958b..742ef0fa87 100644
--- a/tests/Integration/Resources/DSC_SqlEndpoint.Integration.Tests.ps1
+++ b/tests/Integration/Resources/DSC_SqlEndpoint.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 
     <#
diff --git a/tests/Integration/Resources/DSC_SqlLogin.Integration.Tests.ps1 b/tests/Integration/Resources/DSC_SqlLogin.Integration.Tests.ps1
index 6990a30d88..015d3a281e 100644
--- a/tests/Integration/Resources/DSC_SqlLogin.Integration.Tests.ps1
+++ b/tests/Integration/Resources/DSC_SqlLogin.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 
     <#
@@ -1202,4 +1202,3 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
         }
     }
 }
-
diff --git a/tests/Integration/Resources/DSC_SqlPermission.Integration.Tests.ps1 b/tests/Integration/Resources/DSC_SqlPermission.Integration.Tests.ps1
index 00c9bf8e30..fbb3a51ff5 100644
--- a/tests/Integration/Resources/DSC_SqlPermission.Integration.Tests.ps1
+++ b/tests/Integration/Resources/DSC_SqlPermission.Integration.Tests.ps1
@@ -20,7 +20,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 
     <#
diff --git a/tests/Integration/Resources/DSC_SqlProtocol.Integration.Tests.ps1 b/tests/Integration/Resources/DSC_SqlProtocol.Integration.Tests.ps1
index ecc885bc47..9db1c5fcd9 100644
--- a/tests/Integration/Resources/DSC_SqlProtocol.Integration.Tests.ps1
+++ b/tests/Integration/Resources/DSC_SqlProtocol.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 
     <#
diff --git a/tests/Integration/Resources/DSC_SqlProtocolTcpIp.Integration.Tests.ps1 b/tests/Integration/Resources/DSC_SqlProtocolTcpIp.Integration.Tests.ps1
index b3830f0e98..f74db6d3a2 100644
--- a/tests/Integration/Resources/DSC_SqlProtocolTcpIp.Integration.Tests.ps1
+++ b/tests/Integration/Resources/DSC_SqlProtocolTcpIp.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 
     <#
diff --git a/tests/Integration/Resources/DSC_SqlRS.Integration.Tests.ps1 b/tests/Integration/Resources/DSC_SqlRS.Integration.Tests.ps1
index 02abeb7451..258b128374 100644
--- a/tests/Integration/Resources/DSC_SqlRS.Integration.Tests.ps1
+++ b/tests/Integration/Resources/DSC_SqlRS.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 
     <#
@@ -276,4 +276,3 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
         }
     }
 }
-
diff --git a/tests/Integration/Resources/DSC_SqlRSSetup.Integration.Tests.ps1 b/tests/Integration/Resources/DSC_SqlRSSetup.Integration.Tests.ps1
index d566bfa34a..451894b403 100644
--- a/tests/Integration/Resources/DSC_SqlRSSetup.Integration.Tests.ps1
+++ b/tests/Integration/Resources/DSC_SqlRSSetup.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 
     <#
diff --git a/tests/Integration/Resources/DSC_SqlRS_Default.Integration.Tests.ps1 b/tests/Integration/Resources/DSC_SqlRS_Default.Integration.Tests.ps1
index 877d8b0982..a70c86b756 100644
--- a/tests/Integration/Resources/DSC_SqlRS_Default.Integration.Tests.ps1
+++ b/tests/Integration/Resources/DSC_SqlRS_Default.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 
     <#
@@ -463,4 +463,3 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
         }
     }
 }
-
diff --git a/tests/Integration/Resources/DSC_SqlReplication.Integration.Tests.ps1 b/tests/Integration/Resources/DSC_SqlReplication.Integration.Tests.ps1
index f7bab6e15c..17cdd868f9 100644
--- a/tests/Integration/Resources/DSC_SqlReplication.Integration.Tests.ps1
+++ b/tests/Integration/Resources/DSC_SqlReplication.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 
     <#
diff --git a/tests/Integration/Resources/DSC_SqlRole.Integration.Tests.ps1 b/tests/Integration/Resources/DSC_SqlRole.Integration.Tests.ps1
index ad05ce4add..87111f8846 100644
--- a/tests/Integration/Resources/DSC_SqlRole.Integration.Tests.ps1
+++ b/tests/Integration/Resources/DSC_SqlRole.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 
     <#
diff --git a/tests/Integration/Resources/DSC_SqlScript.Integration.Tests.ps1 b/tests/Integration/Resources/DSC_SqlScript.Integration.Tests.ps1
index 5414a4ed08..6081d038a0 100644
--- a/tests/Integration/Resources/DSC_SqlScript.Integration.Tests.ps1
+++ b/tests/Integration/Resources/DSC_SqlScript.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 
     <#
diff --git a/tests/Integration/Resources/DSC_SqlScriptQuery.Integration.Tests.ps1 b/tests/Integration/Resources/DSC_SqlScriptQuery.Integration.Tests.ps1
index 5d5eed79af..91a59f8765 100644
--- a/tests/Integration/Resources/DSC_SqlScriptQuery.Integration.Tests.ps1
+++ b/tests/Integration/Resources/DSC_SqlScriptQuery.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 
     <#
diff --git a/tests/Integration/Resources/DSC_SqlSecureConnection.Integration.Tests.ps1 b/tests/Integration/Resources/DSC_SqlSecureConnection.Integration.Tests.ps1
index c617c0b06f..28409ef735 100644
--- a/tests/Integration/Resources/DSC_SqlSecureConnection.Integration.Tests.ps1
+++ b/tests/Integration/Resources/DSC_SqlSecureConnection.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 
     <#
diff --git a/tests/Integration/Resources/DSC_SqlServiceAccount.Integration.Tests.ps1 b/tests/Integration/Resources/DSC_SqlServiceAccount.Integration.Tests.ps1
index 252e9cfefb..28bffab4a3 100644
--- a/tests/Integration/Resources/DSC_SqlServiceAccount.Integration.Tests.ps1
+++ b/tests/Integration/Resources/DSC_SqlServiceAccount.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 
     <#
diff --git a/tests/Integration/Resources/DSC_SqlSetup.Integration.Tests.ps1 b/tests/Integration/Resources/DSC_SqlSetup.Integration.Tests.ps1
index 6375d86046..42599adf64 100644
--- a/tests/Integration/Resources/DSC_SqlSetup.Integration.Tests.ps1
+++ b/tests/Integration/Resources/DSC_SqlSetup.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 
     <#
diff --git a/tests/Integration/Resources/DSC_SqlTraceFlag.Integration.Tests.ps1 b/tests/Integration/Resources/DSC_SqlTraceFlag.Integration.Tests.ps1
index 9e2aa3ab9e..402c635269 100644
--- a/tests/Integration/Resources/DSC_SqlTraceFlag.Integration.Tests.ps1
+++ b/tests/Integration/Resources/DSC_SqlTraceFlag.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 
     <#
diff --git a/tests/Integration/Resources/DSC_SqlWindowsFirewall.Integration.Tests.ps1 b/tests/Integration/Resources/DSC_SqlWindowsFirewall.Integration.Tests.ps1
index 5bd3a215f4..5cc5e42a2d 100644
--- a/tests/Integration/Resources/DSC_SqlWindowsFirewall.Integration.Tests.ps1
+++ b/tests/Integration/Resources/DSC_SqlWindowsFirewall.Integration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 
     <#
diff --git a/tests/QA/ScriptAnalyzer.Tests.ps1 b/tests/QA/ScriptAnalyzer.Tests.ps1
index 614863c10d..c137a857a6 100644
--- a/tests/QA/ScriptAnalyzer.Tests.ps1
+++ b/tests/QA/ScriptAnalyzer.Tests.ps1
@@ -31,7 +31,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 
     <#
diff --git a/tests/QA/module.tests.ps1 b/tests/QA/module.tests.ps1
index 36625bbda2..d63bcadfa9 100644
--- a/tests/QA/module.tests.ps1
+++ b/tests/QA/module.tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 
     $projectPath = "$($PSScriptRoot)\..\.." | Convert-Path
diff --git a/tests/Unit/Classes/DatabasePermission.Tests.ps1 b/tests/Unit/Classes/DatabasePermission.Tests.ps1
index 006fba616e..fe6034b1a0 100644
--- a/tests/Unit/Classes/DatabasePermission.Tests.ps1
+++ b/tests/Unit/Classes/DatabasePermission.Tests.ps1
@@ -24,7 +24,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Classes/ServerPermission.Tests.ps1 b/tests/Unit/Classes/ServerPermission.Tests.ps1
index 795786d5b4..d85c8c4851 100644
--- a/tests/Unit/Classes/ServerPermission.Tests.ps1
+++ b/tests/Unit/Classes/ServerPermission.Tests.ps1
@@ -24,7 +24,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Classes/SqlAgentAlert.Tests.ps1 b/tests/Unit/Classes/SqlAgentAlert.Tests.ps1
index c3c483d171..52ddf3578e 100644
--- a/tests/Unit/Classes/SqlAgentAlert.Tests.ps1
+++ b/tests/Unit/Classes/SqlAgentAlert.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Classes/SqlAudit.Tests.ps1 b/tests/Unit/Classes/SqlAudit.Tests.ps1
index 29611c4b52..70ea05d305 100644
--- a/tests/Unit/Classes/SqlAudit.Tests.ps1
+++ b/tests/Unit/Classes/SqlAudit.Tests.ps1
@@ -25,7 +25,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Classes/SqlDatabasePermission.Tests.ps1 b/tests/Unit/Classes/SqlDatabasePermission.Tests.ps1
index f801a16a74..478072827d 100644
--- a/tests/Unit/Classes/SqlDatabasePermission.Tests.ps1
+++ b/tests/Unit/Classes/SqlDatabasePermission.Tests.ps1
@@ -25,7 +25,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Classes/SqlPermission.Tests.ps1 b/tests/Unit/Classes/SqlPermission.Tests.ps1
index 558f6702d4..939a87863b 100644
--- a/tests/Unit/Classes/SqlPermission.Tests.ps1
+++ b/tests/Unit/Classes/SqlPermission.Tests.ps1
@@ -25,7 +25,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Classes/SqlRSSetup.Tests.ps1 b/tests/Unit/Classes/SqlRSSetup.Tests.ps1
index 2278d2d278..159dc9406a 100644
--- a/tests/Unit/Classes/SqlRSSetup.Tests.ps1
+++ b/tests/Unit/Classes/SqlRSSetup.Tests.ps1
@@ -25,7 +25,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Classes/SqlReason.Tests.ps1 b/tests/Unit/Classes/SqlReason.Tests.ps1
index 092810737d..526dea2228 100644
--- a/tests/Unit/Classes/SqlReason.Tests.ps1
+++ b/tests/Unit/Classes/SqlReason.Tests.ps1
@@ -24,7 +24,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Classes/SqlResourceBase.Tests.ps1 b/tests/Unit/Classes/SqlResourceBase.Tests.ps1
index 25629a91dc..f952c165c4 100644
--- a/tests/Unit/Classes/SqlResourceBase.Tests.ps1
+++ b/tests/Unit/Classes/SqlResourceBase.Tests.ps1
@@ -24,7 +24,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Classes/StartupParameters.Tests.ps1 b/tests/Unit/Classes/StartupParameters.Tests.ps1
index c5046356a9..fe77387e8d 100644
--- a/tests/Unit/Classes/StartupParameters.Tests.ps1
+++ b/tests/Unit/Classes/StartupParameters.Tests.ps1
@@ -24,7 +24,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/DSC_SqlAG.Tests.ps1 b/tests/Unit/DSC_SqlAG.Tests.ps1
index f92bafed91..e7b5c36e17 100644
--- a/tests/Unit/DSC_SqlAG.Tests.ps1
+++ b/tests/Unit/DSC_SqlAG.Tests.ps1
@@ -27,7 +27,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/DSC_SqlAGListener.Tests.ps1 b/tests/Unit/DSC_SqlAGListener.Tests.ps1
index 543d9fa6d3..d8410eafb7 100644
--- a/tests/Unit/DSC_SqlAGListener.Tests.ps1
+++ b/tests/Unit/DSC_SqlAGListener.Tests.ps1
@@ -27,7 +27,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/DSC_SqlAGReplica.Tests.ps1 b/tests/Unit/DSC_SqlAGReplica.Tests.ps1
index f4308d1575..240ecf869d 100644
--- a/tests/Unit/DSC_SqlAGReplica.Tests.ps1
+++ b/tests/Unit/DSC_SqlAGReplica.Tests.ps1
@@ -27,7 +27,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/DSC_SqlAgentFailsafe.Tests.ps1 b/tests/Unit/DSC_SqlAgentFailsafe.Tests.ps1
index aadef6ea1f..0cf742bc67 100644
--- a/tests/Unit/DSC_SqlAgentFailsafe.Tests.ps1
+++ b/tests/Unit/DSC_SqlAgentFailsafe.Tests.ps1
@@ -25,7 +25,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/DSC_SqlAgentOperator.Tests.ps1 b/tests/Unit/DSC_SqlAgentOperator.Tests.ps1
index 5a6991f6c1..3f928c8227 100644
--- a/tests/Unit/DSC_SqlAgentOperator.Tests.ps1
+++ b/tests/Unit/DSC_SqlAgentOperator.Tests.ps1
@@ -25,7 +25,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/DSC_SqlAlias.Tests.ps1 b/tests/Unit/DSC_SqlAlias.Tests.ps1
index 3a8a6cc4cf..5702be0c7b 100644
--- a/tests/Unit/DSC_SqlAlias.Tests.ps1
+++ b/tests/Unit/DSC_SqlAlias.Tests.ps1
@@ -25,7 +25,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/DSC_SqlAlwaysOnService.Tests.ps1 b/tests/Unit/DSC_SqlAlwaysOnService.Tests.ps1
index 9a11d1fcc4..f27e9f1cd6 100644
--- a/tests/Unit/DSC_SqlAlwaysOnService.Tests.ps1
+++ b/tests/Unit/DSC_SqlAlwaysOnService.Tests.ps1
@@ -25,7 +25,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/DSC_SqlConfiguration.Tests.ps1 b/tests/Unit/DSC_SqlConfiguration.Tests.ps1
index 4a4737348d..96c10bc2e9 100644
--- a/tests/Unit/DSC_SqlConfiguration.Tests.ps1
+++ b/tests/Unit/DSC_SqlConfiguration.Tests.ps1
@@ -25,7 +25,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/DSC_SqlDatabase.Tests.ps1 b/tests/Unit/DSC_SqlDatabase.Tests.ps1
index 94e82b1e52..c473c0c404 100644
--- a/tests/Unit/DSC_SqlDatabase.Tests.ps1
+++ b/tests/Unit/DSC_SqlDatabase.Tests.ps1
@@ -25,7 +25,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/DSC_SqlDatabaseDefaultLocation.Tests.ps1 b/tests/Unit/DSC_SqlDatabaseDefaultLocation.Tests.ps1
index 5d0d8facc6..b47f5b2e18 100644
--- a/tests/Unit/DSC_SqlDatabaseDefaultLocation.Tests.ps1
+++ b/tests/Unit/DSC_SqlDatabaseDefaultLocation.Tests.ps1
@@ -25,7 +25,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/DSC_SqlDatabaseMail.Tests.ps1 b/tests/Unit/DSC_SqlDatabaseMail.Tests.ps1
index 944e76b4ee..33feb8c2ce 100644
--- a/tests/Unit/DSC_SqlDatabaseMail.Tests.ps1
+++ b/tests/Unit/DSC_SqlDatabaseMail.Tests.ps1
@@ -26,7 +26,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/DSC_SqlDatabaseObjectPermission.Tests.ps1 b/tests/Unit/DSC_SqlDatabaseObjectPermission.Tests.ps1
index feeba59459..11a1a524f9 100644
--- a/tests/Unit/DSC_SqlDatabaseObjectPermission.Tests.ps1
+++ b/tests/Unit/DSC_SqlDatabaseObjectPermission.Tests.ps1
@@ -25,7 +25,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/DSC_SqlDatabaseRole.Tests.ps1 b/tests/Unit/DSC_SqlDatabaseRole.Tests.ps1
index 3c7f387eb2..ad7e45601c 100644
--- a/tests/Unit/DSC_SqlDatabaseRole.Tests.ps1
+++ b/tests/Unit/DSC_SqlDatabaseRole.Tests.ps1
@@ -25,7 +25,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/DSC_SqlDatabaseUser.Tests.ps1 b/tests/Unit/DSC_SqlDatabaseUser.Tests.ps1
index 4026eb2dc6..9a57a8e903 100644
--- a/tests/Unit/DSC_SqlDatabaseUser.Tests.ps1
+++ b/tests/Unit/DSC_SqlDatabaseUser.Tests.ps1
@@ -25,7 +25,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/DSC_SqlEndpoint.Tests.ps1 b/tests/Unit/DSC_SqlEndpoint.Tests.ps1
index fc4b5aab36..486d717920 100644
--- a/tests/Unit/DSC_SqlEndpoint.Tests.ps1
+++ b/tests/Unit/DSC_SqlEndpoint.Tests.ps1
@@ -25,7 +25,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/DSC_SqlEndpointPermission.Tests.ps1 b/tests/Unit/DSC_SqlEndpointPermission.Tests.ps1
index d81a36d996..55edb3a8e2 100644
--- a/tests/Unit/DSC_SqlEndpointPermission.Tests.ps1
+++ b/tests/Unit/DSC_SqlEndpointPermission.Tests.ps1
@@ -25,7 +25,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/DSC_SqlLogin.Tests.ps1 b/tests/Unit/DSC_SqlLogin.Tests.ps1
index 5d45d7399e..1d1c52eade 100644
--- a/tests/Unit/DSC_SqlLogin.Tests.ps1
+++ b/tests/Unit/DSC_SqlLogin.Tests.ps1
@@ -27,7 +27,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/DSC_SqlMaxDop.Tests.ps1 b/tests/Unit/DSC_SqlMaxDop.Tests.ps1
index e2648161ef..55fe934bdf 100644
--- a/tests/Unit/DSC_SqlMaxDop.Tests.ps1
+++ b/tests/Unit/DSC_SqlMaxDop.Tests.ps1
@@ -25,7 +25,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/DSC_SqlMemory.Tests.ps1 b/tests/Unit/DSC_SqlMemory.Tests.ps1
index 0188de7b50..9768dba8ce 100644
--- a/tests/Unit/DSC_SqlMemory.Tests.ps1
+++ b/tests/Unit/DSC_SqlMemory.Tests.ps1
@@ -25,7 +25,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/DSC_SqlProtocol.Tests.ps1 b/tests/Unit/DSC_SqlProtocol.Tests.ps1
index ff8b7e688b..fd3d6291d3 100644
--- a/tests/Unit/DSC_SqlProtocol.Tests.ps1
+++ b/tests/Unit/DSC_SqlProtocol.Tests.ps1
@@ -25,7 +25,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/DSC_SqlProtocolTcpIp.Tests.ps1 b/tests/Unit/DSC_SqlProtocolTcpIp.Tests.ps1
index be82f9572c..244b8b0cec 100644
--- a/tests/Unit/DSC_SqlProtocolTcpIp.Tests.ps1
+++ b/tests/Unit/DSC_SqlProtocolTcpIp.Tests.ps1
@@ -25,7 +25,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/DSC_SqlRS.Tests.ps1 b/tests/Unit/DSC_SqlRS.Tests.ps1
index 372544725f..eacfddc53b 100644
--- a/tests/Unit/DSC_SqlRS.Tests.ps1
+++ b/tests/Unit/DSC_SqlRS.Tests.ps1
@@ -25,7 +25,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/DSC_SqlReplication.Tests.ps1 b/tests/Unit/DSC_SqlReplication.Tests.ps1
index 74ba386023..e1fddf0eae 100644
--- a/tests/Unit/DSC_SqlReplication.Tests.ps1
+++ b/tests/Unit/DSC_SqlReplication.Tests.ps1
@@ -27,7 +27,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/DSC_SqlRole.Tests.ps1 b/tests/Unit/DSC_SqlRole.Tests.ps1
index c1f0b5c664..2d42e4e1b7 100644
--- a/tests/Unit/DSC_SqlRole.Tests.ps1
+++ b/tests/Unit/DSC_SqlRole.Tests.ps1
@@ -25,7 +25,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first'
     }
 }
 
diff --git a/tests/Unit/DSC_SqlScript.Tests.ps1 b/tests/Unit/DSC_SqlScript.Tests.ps1
index cc25a52fa0..e48c8d332a 100644
--- a/tests/Unit/DSC_SqlScript.Tests.ps1
+++ b/tests/Unit/DSC_SqlScript.Tests.ps1
@@ -25,7 +25,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/DSC_SqlScriptQuery.Tests.ps1 b/tests/Unit/DSC_SqlScriptQuery.Tests.ps1
index 194a3bfac3..9f217406fd 100644
--- a/tests/Unit/DSC_SqlScriptQuery.Tests.ps1
+++ b/tests/Unit/DSC_SqlScriptQuery.Tests.ps1
@@ -25,7 +25,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/DSC_SqlSecureConnection.Tests.ps1 b/tests/Unit/DSC_SqlSecureConnection.Tests.ps1
index 1816997a90..027d2b79cb 100644
--- a/tests/Unit/DSC_SqlSecureConnection.Tests.ps1
+++ b/tests/Unit/DSC_SqlSecureConnection.Tests.ps1
@@ -25,7 +25,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/DSC_SqlServiceAccount.Tests.ps1 b/tests/Unit/DSC_SqlServiceAccount.Tests.ps1
index 10f65b926e..7fb921204d 100644
--- a/tests/Unit/DSC_SqlServiceAccount.Tests.ps1
+++ b/tests/Unit/DSC_SqlServiceAccount.Tests.ps1
@@ -27,7 +27,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/DSC_SqlSetup.Tests.ps1 b/tests/Unit/DSC_SqlSetup.Tests.ps1
index 5eab0f6bf3..f7354258bd 100644
--- a/tests/Unit/DSC_SqlSetup.Tests.ps1
+++ b/tests/Unit/DSC_SqlSetup.Tests.ps1
@@ -27,7 +27,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 
     # Testing each supported SQL Server version
diff --git a/tests/Unit/DSC_SqlTraceFlag.Tests.ps1 b/tests/Unit/DSC_SqlTraceFlag.Tests.ps1
index 2ec75bd148..4dc6fcf738 100644
--- a/tests/Unit/DSC_SqlTraceFlag.Tests.ps1
+++ b/tests/Unit/DSC_SqlTraceFlag.Tests.ps1
@@ -25,7 +25,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/DSC_SqlWaitForAG.Tests.ps1 b/tests/Unit/DSC_SqlWaitForAG.Tests.ps1
index ecc4c8a0b7..7a4cbd3fb9 100644
--- a/tests/Unit/DSC_SqlWaitForAG.Tests.ps1
+++ b/tests/Unit/DSC_SqlWaitForAG.Tests.ps1
@@ -25,7 +25,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/DSC_SqlWindowsFirewall.Tests.ps1 b/tests/Unit/DSC_SqlWindowsFirewall.Tests.ps1
index fb6399da03..8504a8cb9d 100644
--- a/tests/Unit/DSC_SqlWindowsFirewall.Tests.ps1
+++ b/tests/Unit/DSC_SqlWindowsFirewall.Tests.ps1
@@ -27,7 +27,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Private/Assert-Feature.Tests.ps1 b/tests/Unit/Private/Assert-Feature.Tests.ps1
index 77de5b8c3a..2ca08bcb98 100644
--- a/tests/Unit/Private/Assert-Feature.Tests.ps1
+++ b/tests/Unit/Private/Assert-Feature.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Private/Assert-ManagedServiceType.Tests.ps1 b/tests/Unit/Private/Assert-ManagedServiceType.Tests.ps1
index fe4c7ff9ab..f4f212cdcb 100644
--- a/tests/Unit/Private/Assert-ManagedServiceType.Tests.ps1
+++ b/tests/Unit/Private/Assert-ManagedServiceType.Tests.ps1
@@ -20,7 +20,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Private/Assert-SetupActionProperties.Tests.ps1 b/tests/Unit/Private/Assert-SetupActionProperties.Tests.ps1
index 9852e846ca..e0aed6a98c 100644
--- a/tests/Unit/Private/Assert-SetupActionProperties.Tests.ps1
+++ b/tests/Unit/Private/Assert-SetupActionProperties.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Private/ConvertFrom-ManagedServiceType.Tests.ps1 b/tests/Unit/Private/ConvertFrom-ManagedServiceType.Tests.ps1
index 7ff1aaa76e..35c3b698bd 100644
--- a/tests/Unit/Private/ConvertFrom-ManagedServiceType.Tests.ps1
+++ b/tests/Unit/Private/ConvertFrom-ManagedServiceType.Tests.ps1
@@ -20,7 +20,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Private/ConvertTo-FormattedParameterDescription.Tests.ps1 b/tests/Unit/Private/ConvertTo-FormattedParameterDescription.Tests.ps1
index c9b2fcfbd0..7d3b173d42 100644
--- a/tests/Unit/Private/ConvertTo-FormattedParameterDescription.Tests.ps1
+++ b/tests/Unit/Private/ConvertTo-FormattedParameterDescription.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Private/ConvertTo-ManagedServiceType.Tests.ps1 b/tests/Unit/Private/ConvertTo-ManagedServiceType.Tests.ps1
index 4003c15112..ecb90aae9b 100644
--- a/tests/Unit/Private/ConvertTo-ManagedServiceType.Tests.ps1
+++ b/tests/Unit/Private/ConvertTo-ManagedServiceType.Tests.ps1
@@ -20,7 +20,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Private/ConvertTo-RedactedText.Tests.ps1 b/tests/Unit/Private/ConvertTo-RedactedText.Tests.ps1
index 6b2bf0aa4c..6d19627c50 100644
--- a/tests/Unit/Private/ConvertTo-RedactedText.Tests.ps1
+++ b/tests/Unit/Private/ConvertTo-RedactedText.Tests.ps1
@@ -20,7 +20,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Private/Get-AgentAlertObject.Tests.ps1 b/tests/Unit/Private/Get-AgentAlertObject.Tests.ps1
index 480567b14c..699f0b20ba 100644
--- a/tests/Unit/Private/Get-AgentAlertObject.Tests.ps1
+++ b/tests/Unit/Private/Get-AgentAlertObject.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Private/Get-AgentOperatorObject.Tests.ps1 b/tests/Unit/Private/Get-AgentOperatorObject.Tests.ps1
index 6e8d736f45..d58e47df51 100644
--- a/tests/Unit/Private/Get-AgentOperatorObject.Tests.ps1
+++ b/tests/Unit/Private/Get-AgentOperatorObject.Tests.ps1
@@ -20,7 +20,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Private/Get-CommandParameter.Tests.ps1 b/tests/Unit/Private/Get-CommandParameter.Tests.ps1
index cca9e42833..4bb2aa793c 100644
--- a/tests/Unit/Private/Get-CommandParameter.Tests.ps1
+++ b/tests/Unit/Private/Get-CommandParameter.Tests.ps1
@@ -16,7 +16,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Private/Get-FileVersionInformation.Tests.ps1 b/tests/Unit/Private/Get-FileVersionInformation.Tests.ps1
index 6d32149d77..7f625e0f8f 100644
--- a/tests/Unit/Private/Get-FileVersionInformation.Tests.ps1
+++ b/tests/Unit/Private/Get-FileVersionInformation.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Private/Get-SMOModuleCalculatedVersion.Tests.ps1 b/tests/Unit/Private/Get-SMOModuleCalculatedVersion.Tests.ps1
index 842be5a2eb..475c286721 100644
--- a/tests/Unit/Private/Get-SMOModuleCalculatedVersion.Tests.ps1
+++ b/tests/Unit/Private/Get-SMOModuleCalculatedVersion.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Private/Invoke-ReportServerSetupAction.Tests.ps1 b/tests/Unit/Private/Invoke-ReportServerSetupAction.Tests.ps1
index cfb8312fd2..3f58be4354 100644
--- a/tests/Unit/Private/Invoke-ReportServerSetupAction.Tests.ps1
+++ b/tests/Unit/Private/Invoke-ReportServerSetupAction.Tests.ps1
@@ -20,7 +20,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Private/Invoke-SetupAction.Tests.ps1 b/tests/Unit/Private/Invoke-SetupAction.Tests.ps1
index 1f57031cf5..6d9bdb95b2 100644
--- a/tests/Unit/Private/Invoke-SetupAction.Tests.ps1
+++ b/tests/Unit/Private/Invoke-SetupAction.Tests.ps1
@@ -20,7 +20,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Add-SqlDscNode.Tests.ps1 b/tests/Unit/Public/Add-SqlDscNode.Tests.ps1
index 881b50180a..58cce1c6e3 100644
--- a/tests/Unit/Public/Add-SqlDscNode.Tests.ps1
+++ b/tests/Unit/Public/Add-SqlDscNode.Tests.ps1
@@ -20,7 +20,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Add-SqlDscTraceFlag.Tests.ps1 b/tests/Unit/Public/Add-SqlDscTraceFlag.Tests.ps1
index 4ef8ce0ccb..aa95217ac7 100644
--- a/tests/Unit/Public/Add-SqlDscTraceFlag.Tests.ps1
+++ b/tests/Unit/Public/Add-SqlDscTraceFlag.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Assert-SqlDscAgentOperator.Tests.ps1 b/tests/Unit/Public/Assert-SqlDscAgentOperator.Tests.ps1
index 3f7bc0774f..fba2f30a3c 100644
--- a/tests/Unit/Public/Assert-SqlDscAgentOperator.Tests.ps1
+++ b/tests/Unit/Public/Assert-SqlDscAgentOperator.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Assert-SqlDscLogin.Tests.ps1 b/tests/Unit/Public/Assert-SqlDscLogin.Tests.ps1
index 7905b4419c..22c0430bd6 100644
--- a/tests/Unit/Public/Assert-SqlDscLogin.Tests.ps1
+++ b/tests/Unit/Public/Assert-SqlDscLogin.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Complete-SqlDscFailoverCluster.Tests.ps1 b/tests/Unit/Public/Complete-SqlDscFailoverCluster.Tests.ps1
index a9d5af52fb..dddb2868b0 100644
--- a/tests/Unit/Public/Complete-SqlDscFailoverCluster.Tests.ps1
+++ b/tests/Unit/Public/Complete-SqlDscFailoverCluster.Tests.ps1
@@ -20,7 +20,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Complete-SqlDscImage.Tests.ps1 b/tests/Unit/Public/Complete-SqlDscImage.Tests.ps1
index 65542f6e6c..ae0f08bb1d 100644
--- a/tests/Unit/Public/Complete-SqlDscImage.Tests.ps1
+++ b/tests/Unit/Public/Complete-SqlDscImage.Tests.ps1
@@ -20,7 +20,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Connect-SqlDscDatabaseEngine.Tests.ps1 b/tests/Unit/Public/Connect-SqlDscDatabaseEngine.Tests.ps1
index 125e309ac8..c718d79667 100644
--- a/tests/Unit/Public/Connect-SqlDscDatabaseEngine.Tests.ps1
+++ b/tests/Unit/Public/Connect-SqlDscDatabaseEngine.Tests.ps1
@@ -20,7 +20,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/ConvertFrom-SqlDscDatabasePermission.Tests.ps1 b/tests/Unit/Public/ConvertFrom-SqlDscDatabasePermission.Tests.ps1
index 6c2e80405e..06a736d9de 100644
--- a/tests/Unit/Public/ConvertFrom-SqlDscDatabasePermission.Tests.ps1
+++ b/tests/Unit/Public/ConvertFrom-SqlDscDatabasePermission.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/ConvertFrom-SqlDscServerPermission.Tests.ps1 b/tests/Unit/Public/ConvertFrom-SqlDscServerPermission.Tests.ps1
index c5c87fc0fb..b54d84a189 100644
--- a/tests/Unit/Public/ConvertFrom-SqlDscServerPermission.Tests.ps1
+++ b/tests/Unit/Public/ConvertFrom-SqlDscServerPermission.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/ConvertTo-SqlDscDatabasePermission.Tests.ps1 b/tests/Unit/Public/ConvertTo-SqlDscDatabasePermission.Tests.ps1
index f77b47bfd8..db2d4e8c31 100644
--- a/tests/Unit/Public/ConvertTo-SqlDscDatabasePermission.Tests.ps1
+++ b/tests/Unit/Public/ConvertTo-SqlDscDatabasePermission.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/ConvertTo-SqlDscEditionName.Tests.ps1 b/tests/Unit/Public/ConvertTo-SqlDscEditionName.Tests.ps1
index 804ee379c2..7735fae900 100644
--- a/tests/Unit/Public/ConvertTo-SqlDscEditionName.Tests.ps1
+++ b/tests/Unit/Public/ConvertTo-SqlDscEditionName.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/ConvertTo-SqlDscServerPermission.Tests.ps1 b/tests/Unit/Public/ConvertTo-SqlDscServerPermission.Tests.ps1
index f34695676b..80a0d609c0 100644
--- a/tests/Unit/Public/ConvertTo-SqlDscServerPermission.Tests.ps1
+++ b/tests/Unit/Public/ConvertTo-SqlDscServerPermission.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Deny-SqlDscServerPermission.Tests.ps1 b/tests/Unit/Public/Deny-SqlDscServerPermission.Tests.ps1
index a210aa7e80..3240f4d40e 100644
--- a/tests/Unit/Public/Deny-SqlDscServerPermission.Tests.ps1
+++ b/tests/Unit/Public/Deny-SqlDscServerPermission.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Disable-SqlDscAgentOperator.Tests.ps1 b/tests/Unit/Public/Disable-SqlDscAgentOperator.Tests.ps1
index 4cb83186c4..f4874a8f26 100644
--- a/tests/Unit/Public/Disable-SqlDscAgentOperator.Tests.ps1
+++ b/tests/Unit/Public/Disable-SqlDscAgentOperator.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Disable-SqlDscAudit.Tests.ps1 b/tests/Unit/Public/Disable-SqlDscAudit.Tests.ps1
index c6d140628d..ed8e111e02 100644
--- a/tests/Unit/Public/Disable-SqlDscAudit.Tests.ps1
+++ b/tests/Unit/Public/Disable-SqlDscAudit.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Disable-SqlDscLogin.Tests.ps1 b/tests/Unit/Public/Disable-SqlDscLogin.Tests.ps1
index 67b5ea8854..badab20224 100644
--- a/tests/Unit/Public/Disable-SqlDscLogin.Tests.ps1
+++ b/tests/Unit/Public/Disable-SqlDscLogin.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Disconnect-SqlDscDatabaseEngine.Tests.ps1 b/tests/Unit/Public/Disconnect-SqlDscDatabaseEngine.Tests.ps1
index 0acc01e26a..b418de373a 100644
--- a/tests/Unit/Public/Disconnect-SqlDscDatabaseEngine.Tests.ps1
+++ b/tests/Unit/Public/Disconnect-SqlDscDatabaseEngine.Tests.ps1
@@ -20,7 +20,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Enable-SqlDscAgentOperator.Tests.ps1 b/tests/Unit/Public/Enable-SqlDscAgentOperator.Tests.ps1
index 41e4404685..cf314d2375 100644
--- a/tests/Unit/Public/Enable-SqlDscAgentOperator.Tests.ps1
+++ b/tests/Unit/Public/Enable-SqlDscAgentOperator.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Enable-SqlDscAudit.Tests.ps1 b/tests/Unit/Public/Enable-SqlDscAudit.Tests.ps1
index e35e09091d..5f2af71263 100644
--- a/tests/Unit/Public/Enable-SqlDscAudit.Tests.ps1
+++ b/tests/Unit/Public/Enable-SqlDscAudit.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Enable-SqlDscLogin.Tests.ps1 b/tests/Unit/Public/Enable-SqlDscLogin.Tests.ps1
index 16e546828f..83609baa26 100644
--- a/tests/Unit/Public/Enable-SqlDscLogin.Tests.ps1
+++ b/tests/Unit/Public/Enable-SqlDscLogin.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Get-SqlDscAgentAlert.Tests.ps1 b/tests/Unit/Public/Get-SqlDscAgentAlert.Tests.ps1
index 10a04400dd..2a61100172 100644
--- a/tests/Unit/Public/Get-SqlDscAgentAlert.Tests.ps1
+++ b/tests/Unit/Public/Get-SqlDscAgentAlert.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Get-SqlDscAgentOperator.Tests.ps1 b/tests/Unit/Public/Get-SqlDscAgentOperator.Tests.ps1
index f202a0fca0..d70f3d7b97 100644
--- a/tests/Unit/Public/Get-SqlDscAgentOperator.Tests.ps1
+++ b/tests/Unit/Public/Get-SqlDscAgentOperator.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Get-SqlDscAudit.Tests.ps1 b/tests/Unit/Public/Get-SqlDscAudit.Tests.ps1
index d367ce5420..d90a44d260 100644
--- a/tests/Unit/Public/Get-SqlDscAudit.Tests.ps1
+++ b/tests/Unit/Public/Get-SqlDscAudit.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Get-SqlDscConfigurationOption.Tests.ps1 b/tests/Unit/Public/Get-SqlDscConfigurationOption.Tests.ps1
index d3b52be61f..c0a0a9402e 100644
--- a/tests/Unit/Public/Get-SqlDscConfigurationOption.Tests.ps1
+++ b/tests/Unit/Public/Get-SqlDscConfigurationOption.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
@@ -355,7 +355,7 @@ Describe 'Get-SqlDscConfigurationOption' -Tag 'Public' {
 
             $completions | Should -Not -BeNullOrEmpty
             $completions | Should -HaveCount 2
-            
+
             $completions[0].CompletionText | Should -Be "'max degree of parallelism'"
             $completions[1].CompletionText | Should -Be "'max server memory (MB)'"
         }
diff --git a/tests/Unit/Public/Get-SqlDscDatabase.Tests.ps1 b/tests/Unit/Public/Get-SqlDscDatabase.Tests.ps1
index 37f212db18..7c26fc3117 100644
--- a/tests/Unit/Public/Get-SqlDscDatabase.Tests.ps1
+++ b/tests/Unit/Public/Get-SqlDscDatabase.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
@@ -162,4 +162,4 @@ Describe 'Get-SqlDscDatabase' -Tag 'Public' {
             $parameterInfo.Attributes.Mandatory | Should -BeFalse
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Unit/Public/Get-SqlDscDatabasePermission.Tests.ps1 b/tests/Unit/Public/Get-SqlDscDatabasePermission.Tests.ps1
index 7f4def8b08..af26749d03 100644
--- a/tests/Unit/Public/Get-SqlDscDatabasePermission.Tests.ps1
+++ b/tests/Unit/Public/Get-SqlDscDatabasePermission.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Get-SqlDscInstalledInstance.Tests.ps1 b/tests/Unit/Public/Get-SqlDscInstalledInstance.Tests.ps1
index 8e2b7c93da..4d89b3c9ab 100644
--- a/tests/Unit/Public/Get-SqlDscInstalledInstance.Tests.ps1
+++ b/tests/Unit/Public/Get-SqlDscInstalledInstance.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Get-SqlDscLogin.Tests.ps1 b/tests/Unit/Public/Get-SqlDscLogin.Tests.ps1
index eba07594d4..5b19c8ee8c 100644
--- a/tests/Unit/Public/Get-SqlDscLogin.Tests.ps1
+++ b/tests/Unit/Public/Get-SqlDscLogin.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
@@ -77,16 +77,16 @@ Describe 'Get-SqlDscLogin' -Tag 'Public' {
 
     It 'Should have the correct parameter metadata for ServerObject, Name, and Refresh' {
         $cmd = Get-Command -Name 'Get-SqlDscLogin'
-        
+
         # Test ServerObject parameter
         $cmd.Parameters['ServerObject'].ParameterType.FullName | Should -Be 'Microsoft.SqlServer.Management.Smo.Server'
         $cmd.Parameters['ServerObject'].Attributes.Mandatory | Should -BeTrue
         $cmd.Parameters['ServerObject'].Attributes.ValueFromPipeline | Should -BeTrue
-        
+
         # Test Name parameter
         $cmd.Parameters['Name'].ParameterType.FullName | Should -Be 'System.String'
         $cmd.Parameters['Name'].Attributes.Mandatory | Should -BeFalse
-        
+
         # Test Refresh parameter
         $cmd.Parameters['Refresh'].ParameterType.FullName | Should -Be 'System.Management.Automation.SwitchParameter'
         $cmd.Parameters['Refresh'].Attributes.Mandatory | Should -BeFalse
diff --git a/tests/Unit/Public/Get-SqlDscManagedComputer.Tests.ps1 b/tests/Unit/Public/Get-SqlDscManagedComputer.Tests.ps1
index 776021e274..4d0d465774 100644
--- a/tests/Unit/Public/Get-SqlDscManagedComputer.Tests.ps1
+++ b/tests/Unit/Public/Get-SqlDscManagedComputer.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Get-SqlDscManagedComputerInstance.Tests.ps1 b/tests/Unit/Public/Get-SqlDscManagedComputerInstance.Tests.ps1
index 4522591bb5..d51059c65a 100644
--- a/tests/Unit/Public/Get-SqlDscManagedComputerInstance.Tests.ps1
+++ b/tests/Unit/Public/Get-SqlDscManagedComputerInstance.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Get-SqlDscManagedComputerService.Tests.ps1 b/tests/Unit/Public/Get-SqlDscManagedComputerService.Tests.ps1
index abefa48794..6e0cb54cc8 100644
--- a/tests/Unit/Public/Get-SqlDscManagedComputerService.Tests.ps1
+++ b/tests/Unit/Public/Get-SqlDscManagedComputerService.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Get-SqlDscPreferredModule.Tests.ps1 b/tests/Unit/Public/Get-SqlDscPreferredModule.Tests.ps1
index 3258a1cd69..4278ce58f7 100644
--- a/tests/Unit/Public/Get-SqlDscPreferredModule.Tests.ps1
+++ b/tests/Unit/Public/Get-SqlDscPreferredModule.Tests.ps1
@@ -20,7 +20,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Get-SqlDscRSSetupConfiguration.Tests.ps1 b/tests/Unit/Public/Get-SqlDscRSSetupConfiguration.Tests.ps1
index a917ae5286..b014c228bf 100644
--- a/tests/Unit/Public/Get-SqlDscRSSetupConfiguration.Tests.ps1
+++ b/tests/Unit/Public/Get-SqlDscRSSetupConfiguration.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Get-SqlDscRole.Tests.ps1 b/tests/Unit/Public/Get-SqlDscRole.Tests.ps1
index 33220071bf..53baefd178 100644
--- a/tests/Unit/Public/Get-SqlDscRole.Tests.ps1
+++ b/tests/Unit/Public/Get-SqlDscRole.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
@@ -77,7 +77,7 @@ Describe 'Get-SqlDscRole' -Tag 'Public' {
 
         It 'Should call Refresh when Refresh parameter is specified' {
             Mock -CommandName 'Write-Verbose'
-            
+
             $script:refreshCalled = $false
             $mockServerObjectWithRefresh = New-Object -TypeName 'Microsoft.SqlServer.Management.Smo.Server'
             $mockServerObjectWithRefresh | Add-Member -MemberType 'NoteProperty' -Name 'InstanceName' -Value 'TestInstance' -Force
diff --git a/tests/Unit/Public/Get-SqlDscServerPermission.Tests.ps1 b/tests/Unit/Public/Get-SqlDscServerPermission.Tests.ps1
index dbdc381abe..95378906a2 100644
--- a/tests/Unit/Public/Get-SqlDscServerPermission.Tests.ps1
+++ b/tests/Unit/Public/Get-SqlDscServerPermission.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Get-SqlDscServerProtocol.Tests.ps1 b/tests/Unit/Public/Get-SqlDscServerProtocol.Tests.ps1
index ba6b4bd996..3bd544faa3 100644
--- a/tests/Unit/Public/Get-SqlDscServerProtocol.Tests.ps1
+++ b/tests/Unit/Public/Get-SqlDscServerProtocol.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Get-SqlDscServerProtocolName.Tests.ps1 b/tests/Unit/Public/Get-SqlDscServerProtocolName.Tests.ps1
index b76db65e42..711545d002 100644
--- a/tests/Unit/Public/Get-SqlDscServerProtocolName.Tests.ps1
+++ b/tests/Unit/Public/Get-SqlDscServerProtocolName.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Get-SqlDscStartupParameter.Tests.ps1 b/tests/Unit/Public/Get-SqlDscStartupParameter.Tests.ps1
index 94677cb532..11d59440f6 100644
--- a/tests/Unit/Public/Get-SqlDscStartupParameter.Tests.ps1
+++ b/tests/Unit/Public/Get-SqlDscStartupParameter.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Get-SqlDscTraceFlag.Tests.ps1 b/tests/Unit/Public/Get-SqlDscTraceFlag.Tests.ps1
index 3de7102bd1..7112fec10e 100644
--- a/tests/Unit/Public/Get-SqlDscTraceFlag.Tests.ps1
+++ b/tests/Unit/Public/Get-SqlDscTraceFlag.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Grant-SqlDscServerPermission.Tests.ps1 b/tests/Unit/Public/Grant-SqlDscServerPermission.Tests.ps1
index 5d7ad164fb..795619e213 100644
--- a/tests/Unit/Public/Grant-SqlDscServerPermission.Tests.ps1
+++ b/tests/Unit/Public/Grant-SqlDscServerPermission.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Import-SqlDscPreferredModule.Tests.ps1 b/tests/Unit/Public/Import-SqlDscPreferredModule.Tests.ps1
index b146aa83bf..7424817b40 100644
--- a/tests/Unit/Public/Import-SqlDscPreferredModule.Tests.ps1
+++ b/tests/Unit/Public/Import-SqlDscPreferredModule.Tests.ps1
@@ -20,7 +20,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Initialize-SqlDscRebuildDatabase.Tests.ps1 b/tests/Unit/Public/Initialize-SqlDscRebuildDatabase.Tests.ps1
index e663185ab8..ef9791ab91 100644
--- a/tests/Unit/Public/Initialize-SqlDscRebuildDatabase.Tests.ps1
+++ b/tests/Unit/Public/Initialize-SqlDscRebuildDatabase.Tests.ps1
@@ -20,7 +20,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Install-SqlDscBIReportServer.Tests.ps1 b/tests/Unit/Public/Install-SqlDscBIReportServer.Tests.ps1
index 64fe568f83..5c3d3fb772 100644
--- a/tests/Unit/Public/Install-SqlDscBIReportServer.Tests.ps1
+++ b/tests/Unit/Public/Install-SqlDscBIReportServer.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Install-SqlDscReportingService.Tests.ps1 b/tests/Unit/Public/Install-SqlDscReportingService.Tests.ps1
index 24c444bb8e..55809c3215 100644
--- a/tests/Unit/Public/Install-SqlDscReportingService.Tests.ps1
+++ b/tests/Unit/Public/Install-SqlDscReportingService.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Install-SqlDscServer.Tests.ps1 b/tests/Unit/Public/Install-SqlDscServer.Tests.ps1
index ae200de3bf..ab1184d991 100644
--- a/tests/Unit/Public/Install-SqlDscServer.Tests.ps1
+++ b/tests/Unit/Public/Install-SqlDscServer.Tests.ps1
@@ -20,7 +20,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Invoke-SqlDscQuery.Tests.ps1 b/tests/Unit/Public/Invoke-SqlDscQuery.Tests.ps1
index e8be6009e0..135a6888da 100644
--- a/tests/Unit/Public/Invoke-SqlDscQuery.Tests.ps1
+++ b/tests/Unit/Public/Invoke-SqlDscQuery.Tests.ps1
@@ -20,7 +20,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/New-SqlDscAgentAlert.Tests.ps1 b/tests/Unit/Public/New-SqlDscAgentAlert.Tests.ps1
index cfa35b8cbb..fa25108625 100644
--- a/tests/Unit/Public/New-SqlDscAgentAlert.Tests.ps1
+++ b/tests/Unit/Public/New-SqlDscAgentAlert.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/New-SqlDscAgentOperator.Tests.ps1 b/tests/Unit/Public/New-SqlDscAgentOperator.Tests.ps1
index 047411659c..ff18be0bb2 100644
--- a/tests/Unit/Public/New-SqlDscAgentOperator.Tests.ps1
+++ b/tests/Unit/Public/New-SqlDscAgentOperator.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/New-SqlDscAudit.Tests.ps1 b/tests/Unit/Public/New-SqlDscAudit.Tests.ps1
index 59a9a2050a..173bc18baa 100644
--- a/tests/Unit/Public/New-SqlDscAudit.Tests.ps1
+++ b/tests/Unit/Public/New-SqlDscAudit.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/New-SqlDscDatabase.Tests.ps1 b/tests/Unit/Public/New-SqlDscDatabase.Tests.ps1
index 3d0ab41705..c9ec3b76e8 100644
--- a/tests/Unit/Public/New-SqlDscDatabase.Tests.ps1
+++ b/tests/Unit/Public/New-SqlDscDatabase.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
@@ -171,4 +171,4 @@ Describe 'New-SqlDscDatabase' -Tag 'Public' {
             $parameterInfo.Attributes.Mandatory | Should -BeTrue
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Unit/Public/New-SqlDscLogin.Tests.ps1 b/tests/Unit/Public/New-SqlDscLogin.Tests.ps1
index c84a432898..26f67e1090 100644
--- a/tests/Unit/Public/New-SqlDscLogin.Tests.ps1
+++ b/tests/Unit/Public/New-SqlDscLogin.Tests.ps1
@@ -20,7 +20,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/New-SqlDscRole.Tests.ps1 b/tests/Unit/Public/New-SqlDscRole.Tests.ps1
index 6ae376002f..7ef41cf8e3 100644
--- a/tests/Unit/Public/New-SqlDscRole.Tests.ps1
+++ b/tests/Unit/Public/New-SqlDscRole.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
@@ -82,7 +82,7 @@ Describe 'New-SqlDscRole' -Tag 'Public' {
 
         It 'Should create a new server role successfully' {
             Mock -CommandName 'Write-Verbose'
-            
+
             # Create a mock role object that can be returned
             $mockNewRole = New-Object -TypeName Object
             $mockNewRole | Add-Member -MemberType 'NoteProperty' -Name 'Name' -Value 'TestRole' -Force
@@ -101,7 +101,7 @@ Describe 'New-SqlDscRole' -Tag 'Public' {
 
             $result | Should -Not -BeNullOrEmpty
             $result.Name | Should -Be 'TestRole'
-            
+
             Should -Invoke -CommandName 'New-Object' -ParameterFilter {
                 $TypeName -eq 'Microsoft.SqlServer.Management.Smo.ServerRole'
             } -Exactly -Times 1
@@ -109,7 +109,7 @@ Describe 'New-SqlDscRole' -Tag 'Public' {
 
         It 'Should set the owner when Owner parameter is specified' {
             Mock -CommandName 'Write-Verbose'
-            
+
             # Create a mock role object that can be returned
             $mockNewRole = New-Object -TypeName Object
             $mockNewRole | Add-Member -MemberType 'NoteProperty' -Name 'Name' -Value 'TestRole' -Force
@@ -132,7 +132,7 @@ Describe 'New-SqlDscRole' -Tag 'Public' {
 
         It 'Should call Refresh when Refresh parameter is specified' {
             Mock -CommandName 'Write-Verbose'
-            
+
             # Create a mock role object that can be returned
             $mockNewRole = New-Object -TypeName Object
             $mockNewRole | Add-Member -MemberType 'NoteProperty' -Name 'Name' -Value 'TestRole' -Force
@@ -176,7 +176,7 @@ Describe 'New-SqlDscRole' -Tag 'Public' {
             # Create mock existing role
             $mockExistingRole = New-Object -TypeName Object
             $mockExistingRole | Add-Member -MemberType 'NoteProperty' -Name 'Name' -Value 'ExistingRole' -Force
-            
+
             # Create mock roles collection that returns the existing role
             $mockServerObject | Add-Member -MemberType 'ScriptProperty' -Name 'Roles' -Value {
                 return @{
@@ -218,7 +218,7 @@ Describe 'New-SqlDscRole' -Tag 'Public' {
 
         It 'Should throw an error when role creation fails' {
             Mock -CommandName 'Write-Verbose'
-            
+
             # Create a mock role object that fails to create
             $mockNewRole = New-Object -TypeName Object
             $mockNewRole | Add-Member -MemberType 'NoteProperty' -Name 'Name' -Value 'TestRole' -Force
diff --git a/tests/Unit/Public/Remove-SqlDscAgentAlert.Tests.ps1 b/tests/Unit/Public/Remove-SqlDscAgentAlert.Tests.ps1
index cdc94f1ba0..80fe543558 100644
--- a/tests/Unit/Public/Remove-SqlDscAgentAlert.Tests.ps1
+++ b/tests/Unit/Public/Remove-SqlDscAgentAlert.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Remove-SqlDscAgentOperator.Tests.ps1 b/tests/Unit/Public/Remove-SqlDscAgentOperator.Tests.ps1
index 92ca0ce161..52fd7d331d 100644
--- a/tests/Unit/Public/Remove-SqlDscAgentOperator.Tests.ps1
+++ b/tests/Unit/Public/Remove-SqlDscAgentOperator.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Remove-SqlDscAudit.Tests.ps1 b/tests/Unit/Public/Remove-SqlDscAudit.Tests.ps1
index 16cd17b5fb..2ad293ac6c 100644
--- a/tests/Unit/Public/Remove-SqlDscAudit.Tests.ps1
+++ b/tests/Unit/Public/Remove-SqlDscAudit.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Remove-SqlDscDatabase.Tests.ps1 b/tests/Unit/Public/Remove-SqlDscDatabase.Tests.ps1
index 7cac54d2fb..a30b5c1f77 100644
--- a/tests/Unit/Public/Remove-SqlDscDatabase.Tests.ps1
+++ b/tests/Unit/Public/Remove-SqlDscDatabase.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
@@ -157,4 +157,4 @@ Describe 'Remove-SqlDscDatabase' -Tag 'Public' {
             $result.ParameterListAsString | Should -Be $ExpectedParameters
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Unit/Public/Remove-SqlDscLogin.Tests.ps1 b/tests/Unit/Public/Remove-SqlDscLogin.Tests.ps1
index 93b0589537..5355c3f3df 100644
--- a/tests/Unit/Public/Remove-SqlDscLogin.Tests.ps1
+++ b/tests/Unit/Public/Remove-SqlDscLogin.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Remove-SqlDscNode.Tests.ps1 b/tests/Unit/Public/Remove-SqlDscNode.Tests.ps1
index 1e8c641167..525368cad7 100644
--- a/tests/Unit/Public/Remove-SqlDscNode.Tests.ps1
+++ b/tests/Unit/Public/Remove-SqlDscNode.Tests.ps1
@@ -20,7 +20,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Remove-SqlDscRole.Tests.ps1 b/tests/Unit/Public/Remove-SqlDscRole.Tests.ps1
index b3bfb5f1c6..17986a82f5 100644
--- a/tests/Unit/Public/Remove-SqlDscRole.Tests.ps1
+++ b/tests/Unit/Public/Remove-SqlDscRole.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Remove-SqlDscTraceFlag.Tests.ps1 b/tests/Unit/Public/Remove-SqlDscTraceFlag.Tests.ps1
index da067687dd..9324eb116d 100644
--- a/tests/Unit/Public/Remove-SqlDscTraceFlag.Tests.ps1
+++ b/tests/Unit/Public/Remove-SqlDscTraceFlag.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
@@ -180,13 +180,11 @@ Describe 'Remove-SqlDscTraceFlag' -Tag 'Public' {
                 $mockServiceObject.Name = 'MSSQL$SQL2022'
             }
 
-            It 'Should call the mocked method and have correct value in the object' {
+            It 'Should not call Set-SqlDscTraceFlag when there is no effective change' {
                 { Remove-SqlDscTraceFlag -ServiceObject $mockServiceObject -TraceFlag 3226 -Force } | Should -Not -Throw
 
-                # Should still re-set the existing trace flag.
-                Should -Invoke -CommandName Set-SqlDscTraceFlag -ParameterFilter {
-                    $TraceFlag -contains 4199
-                } -Exactly -Times 1 -Scope It
+                # Should not call Set since the trace flag to remove doesn't exist (no effective change).
+                Should -Invoke -CommandName Set-SqlDscTraceFlag -Exactly -Times 0 -Scope It
             }
         }
     }
diff --git a/tests/Unit/Public/Repair-SqlDscBIReportServer.Tests.ps1 b/tests/Unit/Public/Repair-SqlDscBIReportServer.Tests.ps1
index 50d48173f8..a9f5fd45ee 100644
--- a/tests/Unit/Public/Repair-SqlDscBIReportServer.Tests.ps1
+++ b/tests/Unit/Public/Repair-SqlDscBIReportServer.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Repair-SqlDscReportingService.Tests.ps1 b/tests/Unit/Public/Repair-SqlDscReportingService.Tests.ps1
index aa00ec31a0..47ecebf5af 100644
--- a/tests/Unit/Public/Repair-SqlDscReportingService.Tests.ps1
+++ b/tests/Unit/Public/Repair-SqlDscReportingService.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Repair-SqlDscServer.Tests.ps1 b/tests/Unit/Public/Repair-SqlDscServer.Tests.ps1
index 404116ecc4..07fa76da42 100644
--- a/tests/Unit/Public/Repair-SqlDscServer.Tests.ps1
+++ b/tests/Unit/Public/Repair-SqlDscServer.Tests.ps1
@@ -20,7 +20,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Revoke-SqlDscServerPermission.Tests.ps1 b/tests/Unit/Public/Revoke-SqlDscServerPermission.Tests.ps1
index 2ff90bfc24..21b13d6c0e 100644
--- a/tests/Unit/Public/Revoke-SqlDscServerPermission.Tests.ps1
+++ b/tests/Unit/Public/Revoke-SqlDscServerPermission.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Save-SqlDscSqlServerMediaFile.Tests.ps1 b/tests/Unit/Public/Save-SqlDscSqlServerMediaFile.Tests.ps1
index e8cae20f9b..b509f3ef5b 100644
--- a/tests/Unit/Public/Save-SqlDscSqlServerMediaFile.Tests.ps1
+++ b/tests/Unit/Public/Save-SqlDscSqlServerMediaFile.Tests.ps1
@@ -20,7 +20,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Set-SqlDscAgentAlert.Tests.ps1 b/tests/Unit/Public/Set-SqlDscAgentAlert.Tests.ps1
index 0c29c5d592..01013bd377 100644
--- a/tests/Unit/Public/Set-SqlDscAgentAlert.Tests.ps1
+++ b/tests/Unit/Public/Set-SqlDscAgentAlert.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Set-SqlDscAgentOperator.Tests.ps1 b/tests/Unit/Public/Set-SqlDscAgentOperator.Tests.ps1
index 6c4c76d772..c4c8f6d645 100644
--- a/tests/Unit/Public/Set-SqlDscAgentOperator.Tests.ps1
+++ b/tests/Unit/Public/Set-SqlDscAgentOperator.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Set-SqlDscAudit.Tests.ps1 b/tests/Unit/Public/Set-SqlDscAudit.Tests.ps1
index a6c65110bf..014da6d77d 100644
--- a/tests/Unit/Public/Set-SqlDscAudit.Tests.ps1
+++ b/tests/Unit/Public/Set-SqlDscAudit.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Set-SqlDscConfigurationOption.Tests.ps1 b/tests/Unit/Public/Set-SqlDscConfigurationOption.Tests.ps1
index 56685d29bc..1ac12c194c 100644
--- a/tests/Unit/Public/Set-SqlDscConfigurationOption.Tests.ps1
+++ b/tests/Unit/Public/Set-SqlDscConfigurationOption.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Set-SqlDscDatabase.Tests.ps1 b/tests/Unit/Public/Set-SqlDscDatabase.Tests.ps1
index b975bd4005..de4dacf02e 100644
--- a/tests/Unit/Public/Set-SqlDscDatabase.Tests.ps1
+++ b/tests/Unit/Public/Set-SqlDscDatabase.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
@@ -314,4 +314,4 @@ Describe 'Set-SqlDscDatabase' -Tag 'Public' {
             $result.ParameterListAsString | Should -Be $ExpectedParameters
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Unit/Public/Set-SqlDscDatabaseDefault.Tests.ps1 b/tests/Unit/Public/Set-SqlDscDatabaseDefault.Tests.ps1
index 17d668b945..528d1b2aaf 100644
--- a/tests/Unit/Public/Set-SqlDscDatabaseDefault.Tests.ps1
+++ b/tests/Unit/Public/Set-SqlDscDatabaseDefault.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Set-SqlDscDatabasePermission.Tests.ps1 b/tests/Unit/Public/Set-SqlDscDatabasePermission.Tests.ps1
index bd875c012b..3d42d15f9a 100644
--- a/tests/Unit/Public/Set-SqlDscDatabasePermission.Tests.ps1
+++ b/tests/Unit/Public/Set-SqlDscDatabasePermission.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Set-SqlDscServerPermission.Tests.ps1 b/tests/Unit/Public/Set-SqlDscServerPermission.Tests.ps1
index da154d9e9c..6bb0d1b536 100644
--- a/tests/Unit/Public/Set-SqlDscServerPermission.Tests.ps1
+++ b/tests/Unit/Public/Set-SqlDscServerPermission.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Set-SqlDscStartupParameter.Tests.ps1 b/tests/Unit/Public/Set-SqlDscStartupParameter.Tests.ps1
index 557ea54df2..8d0fab8db0 100644
--- a/tests/Unit/Public/Set-SqlDscStartupParameter.Tests.ps1
+++ b/tests/Unit/Public/Set-SqlDscStartupParameter.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Set-SqlDscTraceFlag.Tests.ps1 b/tests/Unit/Public/Set-SqlDscTraceFlag.Tests.ps1
index ec538c3e52..21e2839994 100644
--- a/tests/Unit/Public/Set-SqlDscTraceFlag.Tests.ps1
+++ b/tests/Unit/Public/Set-SqlDscTraceFlag.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Test-SqlDscAgentAlertProperty.Tests.ps1 b/tests/Unit/Public/Test-SqlDscAgentAlertProperty.Tests.ps1
index 191ba05c39..3b0fc2d248 100644
--- a/tests/Unit/Public/Test-SqlDscAgentAlertProperty.Tests.ps1
+++ b/tests/Unit/Public/Test-SqlDscAgentAlertProperty.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Test-SqlDscConfigurationOption.Tests.ps1 b/tests/Unit/Public/Test-SqlDscConfigurationOption.Tests.ps1
index 6c4c00ce6b..217dc2d7cb 100644
--- a/tests/Unit/Public/Test-SqlDscConfigurationOption.Tests.ps1
+++ b/tests/Unit/Public/Test-SqlDscConfigurationOption.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Test-SqlDscDatabase.Tests.ps1 b/tests/Unit/Public/Test-SqlDscDatabase.Tests.ps1
index 3bcc02e87a..44338697c9 100644
--- a/tests/Unit/Public/Test-SqlDscDatabase.Tests.ps1
+++ b/tests/Unit/Public/Test-SqlDscDatabase.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
@@ -183,4 +183,4 @@ Describe 'Test-SqlDscDatabase' -Tag 'Public' {
             $parameterInfo.Attributes.Mandatory | Should -BeTrue
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Unit/Public/Test-SqlDscIsAgentAlert.Tests.ps1 b/tests/Unit/Public/Test-SqlDscIsAgentAlert.Tests.ps1
index 275c255ad9..cc8d332768 100644
--- a/tests/Unit/Public/Test-SqlDscIsAgentAlert.Tests.ps1
+++ b/tests/Unit/Public/Test-SqlDscIsAgentAlert.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Test-SqlDscIsAgentOperator.Tests.ps1 b/tests/Unit/Public/Test-SqlDscIsAgentOperator.Tests.ps1
index e331d30a15..281fc01ddb 100644
--- a/tests/Unit/Public/Test-SqlDscIsAgentOperator.Tests.ps1
+++ b/tests/Unit/Public/Test-SqlDscIsAgentOperator.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Test-SqlDscIsDatabasePrincipal.Tests.ps1 b/tests/Unit/Public/Test-SqlDscIsDatabasePrincipal.Tests.ps1
index 408099f9bc..45d619b7cc 100644
--- a/tests/Unit/Public/Test-SqlDscIsDatabasePrincipal.Tests.ps1
+++ b/tests/Unit/Public/Test-SqlDscIsDatabasePrincipal.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Test-SqlDscIsLogin.Tests.ps1 b/tests/Unit/Public/Test-SqlDscIsLogin.Tests.ps1
index 5b01e7b601..ff414dfc1a 100644
--- a/tests/Unit/Public/Test-SqlDscIsLogin.Tests.ps1
+++ b/tests/Unit/Public/Test-SqlDscIsLogin.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Test-SqlDscIsLoginEnabled.Tests.ps1 b/tests/Unit/Public/Test-SqlDscIsLoginEnabled.Tests.ps1
index 159b71d6de..c8d053e680 100644
--- a/tests/Unit/Public/Test-SqlDscIsLoginEnabled.Tests.ps1
+++ b/tests/Unit/Public/Test-SqlDscIsLoginEnabled.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Test-SqlDscIsRole.Tests.ps1 b/tests/Unit/Public/Test-SqlDscIsRole.Tests.ps1
index 41e8ea385b..3e6f0e50d4 100644
--- a/tests/Unit/Public/Test-SqlDscIsRole.Tests.ps1
+++ b/tests/Unit/Public/Test-SqlDscIsRole.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Test-SqlDscIsSupportedFeature.Tests.ps1 b/tests/Unit/Public/Test-SqlDscIsSupportedFeature.Tests.ps1
index dac4f7f443..308baca24a 100644
--- a/tests/Unit/Public/Test-SqlDscIsSupportedFeature.Tests.ps1
+++ b/tests/Unit/Public/Test-SqlDscIsSupportedFeature.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Test-SqlDscRSInstalled.Tests.ps1 b/tests/Unit/Public/Test-SqlDscRSInstalled.Tests.ps1
index ad7689813b..2deb5f9e39 100644
--- a/tests/Unit/Public/Test-SqlDscRSInstalled.Tests.ps1
+++ b/tests/Unit/Public/Test-SqlDscRSInstalled.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Test-SqlDscServerPermission.Tests.ps1 b/tests/Unit/Public/Test-SqlDscServerPermission.Tests.ps1
index 2350641d9c..0a9b285d77 100644
--- a/tests/Unit/Public/Test-SqlDscServerPermission.Tests.ps1
+++ b/tests/Unit/Public/Test-SqlDscServerPermission.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Uninstall-SqlDscBIReportServer.Tests.ps1 b/tests/Unit/Public/Uninstall-SqlDscBIReportServer.Tests.ps1
index 2142054702..1f37e13d21 100644
--- a/tests/Unit/Public/Uninstall-SqlDscBIReportServer.Tests.ps1
+++ b/tests/Unit/Public/Uninstall-SqlDscBIReportServer.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Uninstall-SqlDscReportingService.Tests.ps1 b/tests/Unit/Public/Uninstall-SqlDscReportingService.Tests.ps1
index afc7b3a561..c5bd8aeda1 100644
--- a/tests/Unit/Public/Uninstall-SqlDscReportingService.Tests.ps1
+++ b/tests/Unit/Public/Uninstall-SqlDscReportingService.Tests.ps1
@@ -19,7 +19,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/Public/Uninstall-SqlDscServer.Tests.ps1 b/tests/Unit/Public/Uninstall-SqlDscServer.Tests.ps1
index 433788fd5c..c3f8018775 100644
--- a/tests/Unit/Public/Uninstall-SqlDscServer.Tests.ps1
+++ b/tests/Unit/Public/Uninstall-SqlDscServer.Tests.ps1
@@ -20,7 +20,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }
 
diff --git a/tests/Unit/SqlServerDsc.Common.Tests.ps1 b/tests/Unit/SqlServerDsc.Common.Tests.ps1
index c4f6fcc57f..3bae5eb98d 100644
--- a/tests/Unit/SqlServerDsc.Common.Tests.ps1
+++ b/tests/Unit/SqlServerDsc.Common.Tests.ps1
@@ -43,7 +43,7 @@ BeforeDiscovery {
     }
     catch [System.IO.FileNotFoundException]
     {
-        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks build" first.'
+        throw 'DscResource.Test module dependency not found. Please run ".\build.ps1 -ResolveDependency -Tasks noop" first.'
     }
 }