Merge pull request #214 from PlagueHO/Issue-188

Refactor Module to Remove Harness - Fixes #188
dsccommunity · Apr 13, 2019 · 91eba65 · 91eba65
2 parents 2f890b2 + d6ae914
commit 91eba65
Show file tree

Hide file tree

Showing 95 changed files with 326 additions and 391 deletions.
diff --git a/.vscode/RunAllTests.ps1 b/.vscode/RunAllTests.ps1
diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,14 @@
   - IdleWaitTimeout returned from Get-TargetResource always null - Fixes [Issue #186](https://github.com/PowerShell/ComputerManagementDsc/issues/186).
   - Added BuiltInAccount Property to allow running task as one of the build in
     service accounts - Fixes [Issue #130](https://github.com/PowerShell/ComputerManagementDsc/issues/130).
+- Refactored module folder structure to move resource to root folder of
+  repository and remove test harness - fixes [Issue #188](https://github.com/PowerShell/ComputerManagementDsc/issues/188).
+- Added a CODE\_OF\_CONDUCT.md with the same content as in the README.md and
+  linked to it from README.MD instead.
+- Updated test header for all unit tests to version 1.2.4.
+- Updated test header for all imtegration to version 1.3.3.
+- Enabled example publish to PowerShell Gallery by adding `gallery_api`
+  environment variable to `AppVeyor.yml`.
 
 ## 6.3.0.0
 

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -0,0 +1,6 @@
+# Code of conduct
+
+This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
+For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/)
+or contact [[email protected]](mailto:[email protected]) with any additional
+questions or comments.
diff --git a/...rManagementDsc/ComputerManagementDsc.psd1 → ComputerManagementDsc.psd1 b/...rManagementDsc/ComputerManagementDsc.psd1 → ComputerManagementDsc.psd1
diff --git a/...esources/MSFT_Computer/MSFT_Computer.psm1 → ...esources/MSFT_Computer/MSFT_Computer.psm1 b/...esources/MSFT_Computer/MSFT_Computer.psm1 → ...esources/MSFT_Computer/MSFT_Computer.psm1
diff --git a/...es/MSFT_Computer/MSFT_Computer.schema.mof → ...es/MSFT_Computer/MSFT_Computer.schema.mof b/...es/MSFT_Computer/MSFT_Computer.schema.mof → ...es/MSFT_Computer/MSFT_Computer.schema.mof
diff --git a/...tDsc/DSCResources/MSFT_Computer/README.md → DSCResources/MSFT_Computer/README.md b/...tDsc/DSCResources/MSFT_Computer/README.md → DSCResources/MSFT_Computer/README.md
diff --git a/...Computer/en-US/MSFT_Computer.strings.psd1 → ...Computer/en-US/MSFT_Computer.strings.psd1 b/...Computer/en-US/MSFT_Computer.strings.psd1 → ...Computer/en-US/MSFT_Computer.strings.psd1
diff --git a/...ineDomainJoin/MSFT_OfflineDomainJoin.psm1 → ...ineDomainJoin/MSFT_OfflineDomainJoin.psm1 b/...ineDomainJoin/MSFT_OfflineDomainJoin.psm1 → ...ineDomainJoin/MSFT_OfflineDomainJoin.psm1
diff --git a/...ainJoin/MSFT_OfflineDomainJoin.schema.mof → ...ainJoin/MSFT_OfflineDomainJoin.schema.mof b/...ainJoin/MSFT_OfflineDomainJoin.schema.mof → ...ainJoin/MSFT_OfflineDomainJoin.schema.mof
diff --git a/...esources/MSFT_OfflineDomainJoin/README.md → ...esources/MSFT_OfflineDomainJoin/README.md b/...esources/MSFT_OfflineDomainJoin/README.md → ...esources/MSFT_OfflineDomainJoin/README.md
diff --git a/...en-US/MSFT_OfflineDomainJoin.strings.psd1 → ...en-US/MSFT_OfflineDomainJoin.strings.psd1 b/...en-US/MSFT_OfflineDomainJoin.strings.psd1 → ...en-US/MSFT_OfflineDomainJoin.strings.psd1
diff --git a/...ources/MSFT_PowerPlan/MSFT_PowerPlan.psm1 → ...ources/MSFT_PowerPlan/MSFT_PowerPlan.psm1 b/...ources/MSFT_PowerPlan/MSFT_PowerPlan.psm1 → ...ources/MSFT_PowerPlan/MSFT_PowerPlan.psm1
diff --git a/.../MSFT_PowerPlan/MSFT_PowerPlan.schema.mof → .../MSFT_PowerPlan/MSFT_PowerPlan.schema.mof b/.../MSFT_PowerPlan/MSFT_PowerPlan.schema.mof → .../MSFT_PowerPlan/MSFT_PowerPlan.schema.mof
diff --git a/...Dsc/DSCResources/MSFT_PowerPlan/README.md → DSCResources/MSFT_PowerPlan/README.md b/...Dsc/DSCResources/MSFT_PowerPlan/README.md → DSCResources/MSFT_PowerPlan/README.md
diff --git a/...PowerPlan/en-US/MSFT_PowerPlan.schema.mfl → ...PowerPlan/en-US/MSFT_PowerPlan.schema.mfl b/...PowerPlan/en-US/MSFT_PowerPlan.schema.mfl → ...PowerPlan/en-US/MSFT_PowerPlan.schema.mfl
diff --git a/...werPlan/en-US/MSFT_PowerPlan.strings.psd1 → ...werPlan/en-US/MSFT_PowerPlan.strings.psd1 b/...werPlan/en-US/MSFT_PowerPlan.strings.psd1 → ...werPlan/en-US/MSFT_PowerPlan.strings.psd1
diff --git a/...olicy/MSFT_PowerShellExecutionPolicy.psm1 → ...olicy/MSFT_PowerShellExecutionPolicy.psm1 b/...olicy/MSFT_PowerShellExecutionPolicy.psm1 → ...olicy/MSFT_PowerShellExecutionPolicy.psm1
diff --git a/...MSFT_PowerShellExecutionPolicy.schema.mof → ...MSFT_PowerShellExecutionPolicy.schema.mof b/...MSFT_PowerShellExecutionPolicy.schema.mof → ...MSFT_PowerShellExecutionPolicy.schema.mof
diff --git a/.../MSFT_PowerShellExecutionPolicy/README.md → .../MSFT_PowerShellExecutionPolicy/README.md b/.../MSFT_PowerShellExecutionPolicy/README.md → .../MSFT_PowerShellExecutionPolicy/README.md
diff --git a/...FT_PowerShellExecutionPolicy.strings.psd1 → ...FT_PowerShellExecutionPolicy.strings.psd1 b/...FT_PowerShellExecutionPolicy.strings.psd1 → ...FT_PowerShellExecutionPolicy.strings.psd1
diff --git a/...SFT_ScheduledTask/MSFT_ScheduledTask.psm1 → ...SFT_ScheduledTask/MSFT_ScheduledTask.psm1 b/...SFT_ScheduledTask/MSFT_ScheduledTask.psm1 → ...SFT_ScheduledTask/MSFT_ScheduledTask.psm1
diff --git a/...heduledTask/MSFT_ScheduledTask.schema.mof → ...heduledTask/MSFT_ScheduledTask.schema.mof b/...heduledTask/MSFT_ScheduledTask.schema.mof → ...heduledTask/MSFT_ScheduledTask.schema.mof
diff --git a/...DSCResources/MSFT_ScheduledTask/README.md → DSCResources/MSFT_ScheduledTask/README.md b/...DSCResources/MSFT_ScheduledTask/README.md → DSCResources/MSFT_ScheduledTask/README.md
diff --git a/...ask/en-US/MSFT_ScheduledTask.strings.psd1 → ...ask/en-US/MSFT_ScheduledTask.strings.psd1 b/...ask/en-US/MSFT_ScheduledTask.strings.psd1 → ...ask/en-US/MSFT_ScheduledTask.strings.psd1
diff --git a/...esources/MSFT_TimeZone/MSFT_TimeZone.psm1 → ...esources/MSFT_TimeZone/MSFT_TimeZone.psm1 b/...esources/MSFT_TimeZone/MSFT_TimeZone.psm1 → ...esources/MSFT_TimeZone/MSFT_TimeZone.psm1
diff --git a/...es/MSFT_TimeZone/MSFT_TimeZone.schema.mof → ...es/MSFT_TimeZone/MSFT_TimeZone.schema.mof b/...es/MSFT_TimeZone/MSFT_TimeZone.schema.mof → ...es/MSFT_TimeZone/MSFT_TimeZone.schema.mof
diff --git a/...tDsc/DSCResources/MSFT_TimeZone/README.md → DSCResources/MSFT_TimeZone/README.md b/...tDsc/DSCResources/MSFT_TimeZone/README.md → DSCResources/MSFT_TimeZone/README.md
diff --git a/...TimeZone/en-us/MSFT_TimeZone.strings.psd1 → ...TimeZone/en-us/MSFT_TimeZone.strings.psd1 b/...TimeZone/en-us/MSFT_TimeZone.strings.psd1 → ...TimeZone/en-us/MSFT_TimeZone.strings.psd1
diff --git a/...SFT_VirtualMemory/MSFT_VirtualMemory.psm1 → ...SFT_VirtualMemory/MSFT_VirtualMemory.psm1 b/...SFT_VirtualMemory/MSFT_VirtualMemory.psm1 → ...SFT_VirtualMemory/MSFT_VirtualMemory.psm1
diff --git a/...rtualMemory/MSFT_VirtualMemory.schema.mof → ...rtualMemory/MSFT_VirtualMemory.schema.mof b/...rtualMemory/MSFT_VirtualMemory.schema.mof → ...rtualMemory/MSFT_VirtualMemory.schema.mof
diff --git a/...DSCResources/MSFT_VirtualMemory/README.md → DSCResources/MSFT_VirtualMemory/README.md b/...DSCResources/MSFT_VirtualMemory/README.md → DSCResources/MSFT_VirtualMemory/README.md
diff --git a/...ory/en-US/MSFT_VirtualMemory.strings.psd1 → ...ory/en-US/MSFT_VirtualMemory.strings.psd1 b/...ory/en-US/MSFT_VirtualMemory.strings.psd1 → ...ory/en-US/MSFT_VirtualMemory.strings.psd1
diff --git a/...WindowsEventLog/MSFT_WindowsEventLog.psm1 → ...WindowsEventLog/MSFT_WindowsEventLog.psm1 b/...WindowsEventLog/MSFT_WindowsEventLog.psm1 → ...WindowsEventLog/MSFT_WindowsEventLog.psm1
diff --git a/...sEventLog/MSFT_WindowsEventLog.schema.mof → ...sEventLog/MSFT_WindowsEventLog.schema.mof b/...sEventLog/MSFT_WindowsEventLog.schema.mof → ...sEventLog/MSFT_WindowsEventLog.schema.mof
diff --git a/...CResources/MSFT_WindowsEventLog/README.md → DSCResources/MSFT_WindowsEventLog/README.md b/...CResources/MSFT_WindowsEventLog/README.md → DSCResources/MSFT_WindowsEventLog/README.md
diff --git a/...g/en-US/MSFT_WindowsEventLog.strings.psd1 → ...g/en-US/MSFT_WindowsEventLog.strings.psd1 b/...g/en-US/MSFT_WindowsEventLog.strings.psd1 → ...g/en-US/MSFT_WindowsEventLog.strings.psd1
diff --git a/..._RenameComputerAndSetWorkgroup_Config.ps1 → ..._RenameComputerAndSetWorkgroup_Config.ps1 b/..._RenameComputerAndSetWorkgroup_Config.ps1 → ..._RenameComputerAndSetWorkgroup_Config.ps1
diff --git a/...Computer/2-Computer_JoinDomain_Config.ps1 → ...Computer/2-Computer_JoinDomain_Config.ps1 b/...Computer/2-Computer_JoinDomain_Config.ps1 → ...Computer/2-Computer_JoinDomain_Config.ps1
diff --git a/...omputer_RenameComputerInDomain_Config.ps1 → ...omputer_RenameComputerInDomain_Config.ps1 b/...omputer_RenameComputerInDomain_Config.ps1 → ...omputer_RenameComputerInDomain_Config.ps1
diff --git a/...uter_RenameComputerInWorkgroup_Config.ps1 → ...uter_RenameComputerInWorkgroup_Config.ps1 b/...uter_RenameComputerInWorkgroup_Config.ps1 → ...uter_RenameComputerInWorkgroup_Config.ps1
diff --git a/...r_UnjoinDomainAndJoinWorkgroup_Config.ps1 → ...r_UnjoinDomainAndJoinWorkgroup_Config.ps1 b/...r_UnjoinDomainAndJoinWorkgroup_Config.ps1 → ...r_UnjoinDomainAndJoinWorkgroup_Config.ps1
diff --git a/...ComputerDescriptionInWorkgroup_Config.ps1 → ...ComputerDescriptionInWorkgroup_Config.ps1 b/...ComputerDescriptionInWorkgroup_Config.ps1 → ...ComputerDescriptionInWorkgroup_Config.ps1
diff --git a/...omputer_JoinDomainSpecifyingDC_Config.ps1 → ...omputer_JoinDomainSpecifyingDC_Config.ps1 b/...omputer_JoinDomainSpecifyingDC_Config.ps1 → ...omputer_JoinDomainSpecifyingDC_Config.ps1
diff --git a/...ainJoin_JoinDomainUsingODJBlob_Config.ps1 → ...ainJoin_JoinDomainUsingODJBlob_Config.ps1 b/...ainJoin_JoinDomainUsingODJBlob_Config.ps1 → ...ainJoin_JoinDomainUsingODJBlob_Config.ps1
diff --git a/...rPlan/1-PowerPlan_SetPowerPlan_Config.ps1 → ...rPlan/1-PowerPlan_SetPowerPlan_Config.ps1 b/...rPlan/1-PowerPlan_SetPowerPlan_Config.ps1 → ...rPlan/1-PowerPlan_SetPowerPlan_Config.ps1
diff --git a/...ShellExecutionPolicy_SetPolicy_Config.ps1 → ...ShellExecutionPolicy_SetPolicy_Config.ps1 b/...ShellExecutionPolicy_SetPolicy_Config.ps1 → ...ShellExecutionPolicy_SetPolicy_Config.ps1
diff --git a/...icy_SetPolicyForMultipleScopes_Config.ps1 → ...icy_SetPolicyForMultipleScopes_Config.ps1 b/...icy_SetPolicyForMultipleScopes_Config.ps1 → ...icy_SetPolicyForMultipleScopes_Config.ps1
diff --git a/...edTask_CreateScheduledTaskOnce_Config.ps1 → ...edTask_CreateScheduledTaskOnce_Config.ps1 b/...edTask_CreateScheduledTaskOnce_Config.ps1 → ...edTask_CreateScheduledTaskOnce_Config.ps1
diff --git a/...lTaskOnceAsUserInteractiveOnly_Config.ps1 → ...lTaskOnceAsUserInteractiveOnly_Config.ps1 b/...lTaskOnceAsUserInteractiveOnly_Config.ps1 → ...lTaskOnceAsUserInteractiveOnly_Config.ps1
diff --git a/...eduledTask_DisableABuiltInTask_Config.ps1 → ...eduledTask_DisableABuiltInTask_Config.ps1 b/...eduledTask_DisableABuiltInTask_Config.ps1 → ...eduledTask_DisableABuiltInTask_Config.ps1
diff --git a/...heduledTask_DeleteABuiltInTask_Config.ps1 → ...heduledTask_DeleteABuiltInTask_Config.ps1 b/...heduledTask_DeleteABuiltInTask_Config.ps1 → ...heduledTask_DeleteABuiltInTask_Config.ps1
diff --git a/...sk_CreateScheduledTasksOnEvent_Config.ps1 → ...sk_CreateScheduledTasksOnEvent_Config.ps1 b/...sk_CreateScheduledTasksOnEvent_Config.ps1 → ...sk_CreateScheduledTasksOnEvent_Config.ps1
diff --git a/...ceAsGroupManagedServiceAccount_Config.ps1 → ...ceAsGroupManagedServiceAccount_Config.ps1 b/...ceAsGroupManagedServiceAccount_Config.ps1 → ...ceAsGroupManagedServiceAccount_Config.ps1
diff --git a/...nchronizeAcrossTimeZoneEnabled_Config.ps1 → ...nchronizeAcrossTimeZoneEnabled_Config.ps1 b/...nchronizeAcrossTimeZoneEnabled_Config.ps1 → ...nchronizeAcrossTimeZoneEnabled_Config.ps1
diff --git a/...edTasksAsBuiltInServiceAccount_Config.ps1 → ...edTasksAsBuiltInServiceAccount_Config.ps1 b/...edTasksAsBuiltInServiceAccount_Config.ps1 → ...edTasksAsBuiltInServiceAccount_Config.ps1
diff --git a/...dTask_CreateScheduledTaskDaily_Config.ps1 → ...dTask_CreateScheduledTaskDaily_Config.ps1 b/...dTask_CreateScheduledTaskDaily_Config.ps1 → ...dTask_CreateScheduledTaskDaily_Config.ps1
diff --git a/...cheduledTasksDailyIndefinitely_Config.ps1 → ...cheduledTasksDailyIndefinitely_Config.ps1 b/...cheduledTasksDailyIndefinitely_Config.ps1 → ...cheduledTasksDailyIndefinitely_Config.ps1
diff --git a/...ask_CreateScheduledTasksWeekly_Config.ps1 → ...ask_CreateScheduledTasksWeekly_Config.ps1 b/...ask_CreateScheduledTasksWeekly_Config.ps1 → ...ask_CreateScheduledTasksWeekly_Config.ps1
diff --git a/...sk_CreateScheduledTasksAtLogon_Config.ps1 → ...sk_CreateScheduledTasksAtLogon_Config.ps1 b/...sk_CreateScheduledTasksAtLogon_Config.ps1 → ...sk_CreateScheduledTasksAtLogon_Config.ps1
diff --git a/..._CreateScheduledTasksAtStartup_Config.ps1 → ..._CreateScheduledTasksAtStartup_Config.ps1 b/..._CreateScheduledTasksAtStartup_Config.ps1 → ..._CreateScheduledTasksAtStartup_Config.ps1
diff --git a/...unPowerShellTaskEvery15Minutes_Config.ps1 → ...unPowerShellTaskEvery15Minutes_Config.ps1 b/...unPowerShellTaskEvery15Minutes_Config.ps1 → ...unPowerShellTaskEvery15Minutes_Config.ps1
diff --git a/...TaskEvery15MinutesIndefinitely_Config.ps1 → ...TaskEvery15MinutesIndefinitely_Config.ps1 b/...TaskEvery15MinutesIndefinitely_Config.ps1 → ...TaskEvery15MinutesIndefinitely_Config.ps1
diff --git a/...nceAsUserWithHighestPriveleges_Config.ps1 → ...nceAsUserWithHighestPriveleges_Config.ps1 b/...nceAsUserWithHighestPriveleges_Config.ps1 → ...nceAsUserWithHighestPriveleges_Config.ps1
diff --git a/...imeZone/1-TimeZone_SetTimeZone_Config.ps1 → ...imeZone/1-TimeZone_SetTimeZone_Config.ps1 b/...imeZone/1-TimeZone_SetTimeZone_Config.ps1 → ...imeZone/1-TimeZone_SetTimeZone_Config.ps1
diff --git a/...VirtualMemory_SetVirtualMemory_Config.ps1 → ...VirtualMemory_SetVirtualMemory_Config.ps1 b/...VirtualMemory_SetVirtualMemory_Config.ps1 → ...VirtualMemory_SetVirtualMemory_Config.ps1
diff --git a/...ventlog_SetWindowsEventlogSize_Config.ps1 → ...ventlog_SetWindowsEventlogSize_Config.ps1 b/...ventlog_SetWindowsEventlogSize_Config.ps1 → ...ventlog_SetWindowsEventlogSize_Config.ps1
diff --git a/...tlog_SetWindowsEventlogLogMode_Config.ps1 → ...tlog_SetWindowsEventlogLogMode_Config.ps1 b/...tlog_SetWindowsEventlogLogMode_Config.ps1 → ...tlog_SetWindowsEventlogLogMode_Config.ps1
diff --git a/...Eventlog_EnableWindowsEventLog_Config.ps1 → ...Eventlog_EnableWindowsEventLog_Config.ps1 b/...Eventlog_EnableWindowsEventLog_Config.ps1 → ...Eventlog_EnableWindowsEventLog_Config.ps1
diff --git a/...tlog_SetWindowsEventlogLogMode_Config.ps1 → ...tlog_SetWindowsEventlogLogMode_Config.ps1 b/...tlog_SetWindowsEventlogLogMode_Config.ps1 → ...tlog_SetWindowsEventlogLogMode_Config.ps1
diff --git a/...dowsEventlogSecurityDescriptor_Config.ps1 → ...dowsEventlogSecurityDescriptor_Config.ps1 b/...dowsEventlogSecurityDescriptor_Config.ps1 → ...dowsEventlogSecurityDescriptor_Config.ps1
diff --git a/...ventlog_DisableWindowsEventlog_Config.ps1 → ...ventlog_DisableWindowsEventlog_Config.ps1 b/...ventlog_DisableWindowsEventlog_Config.ps1 → ...ventlog_DisableWindowsEventlog_Config.ps1
diff --git a/....Common/ComputerManagementDsc.Common.psm1 → ....Common/ComputerManagementDsc.Common.psm1 b/....Common/ComputerManagementDsc.Common.psm1 → ....Common/ComputerManagementDsc.Common.psm1
diff --git a/...mputerManagementDsc.Common/SetTimeZone.cs → ...mputerManagementDsc.Common/SetTimeZone.cs b/...mputerManagementDsc.Common/SetTimeZone.cs → ...mputerManagementDsc.Common/SetTimeZone.cs
diff --git a/...ComputerManagementDsc.Common.strings.psd1 → ...ComputerManagementDsc.Common.strings.psd1 b/...ComputerManagementDsc.Common.strings.psd1 → ...ComputerManagementDsc.Common.strings.psd1
diff --git a/...ComputerManagementDsc.ResourceHelper.psm1 → ...ComputerManagementDsc.ResourceHelper.psm1 b/...ComputerManagementDsc.ResourceHelper.psm1 → ...ComputerManagementDsc.ResourceHelper.psm1
diff --git a/README.md b/README.md
@@ -23,10 +23,7 @@ The **ComputerManagementDsc** module contains the following resources:
 - **WindowsEventLog**: This resource allows configuration of a specified
   Windows Event Log.
 
-This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
-For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/)
-or contact [[email protected]](mailto:[email protected]) with any
-additional questions or comments.
+This project has adopted [this code of conduct](CODE_OF_CONDUCT.md).
 
 ## Documentation and Examples
 

diff --git a/Tests/Integration/ComputerManagementDsc.Common.Tests.ps1 b/Tests/Integration/ComputerManagementDsc.Common.Tests.ps1
@@ -1,17 +1,17 @@
+#region HEADER
 $script:ModuleName = 'ComputerManagementDsc.Common'
 
 Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot -Parent) -ChildPath 'TestHelpers') -ChildPath 'CommonTestHelper.psm1') -Global
 
-#region HEADER
-# Unit Test Template Version: 1.1.0
-$script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\ComputerManagementDsc'
+# Unit Test Template Version: 1.2.4
+$script:moduleRoot = Split-Path -Parent (Split-Path -Parent $PSScriptRoot)
 if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests'))) -or `
     (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) )
 {
-    & git @('clone', 'https://github.com/PowerShell/DscResource.Tests.git', (Join-Path -Path $script:moduleRoot -ChildPath '\DSCResource.Tests\'))
+    & git @('clone', 'https://github.com/PowerShell/DscResource.Tests.git', (Join-Path -Path $script:moduleRoot -ChildPath 'DscResource.Tests'))
 }
 
-Import-Module (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1') -Force
+Import-Module -Name (Join-Path -Path $script:moduleRoot -ChildPath (Join-Path -Path 'DSCResource.Tests' -ChildPath 'TestHelper.psm1')) -Force
 Import-Module (Join-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath (Join-Path -Path 'Modules' -ChildPath $script:ModuleName)) -ChildPath "$script:ModuleName.psm1") -Force
 #endregion HEADER
 

diff --git a/Tests/Integration/MSFT_PowerShellExecutionPolicy.Integration.Tests.ps1 b/Tests/Integration/MSFT_PowerShellExecutionPolicy.Integration.Tests.ps1
@@ -1,34 +1,33 @@
-$script:DSCModuleName = 'ComputerManagementDsc'
-$script:DSCResourceName = 'MSFT_PowerShellExecutionPolicy'
-
 #region HEADER
-# Integration Test Template Version: 1.1.1
-$script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\ComputerManagementDsc'
+$script:dscModuleName = 'ComputerManagementDsc'
+$script:dscResourceName = 'MSFT_PowerShellExecutionPolicy'
+
+# Integration Test Template Version: 1.3.3
+$script:moduleRoot = Split-Path -Parent (Split-Path -Parent $PSScriptRoot)
 if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests'))) -or `
     (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) )
 {
-    & git @('clone', 'https://github.com/PowerShell/DscResource.Tests.git', (Join-Path -Path $script:moduleRoot -ChildPath '\DSCResource.Tests\'))
+    & git @('clone', 'https://github.com/PowerShell/DscResource.Tests.git', (Join-Path -Path $script:moduleRoot -ChildPath 'DscResource.Tests'))
 }
 
 Import-Module -Name (Join-Path -Path $script:moduleRoot -ChildPath (Join-Path -Path 'DSCResource.Tests' -ChildPath 'TestHelper.psm1')) -Force
 $TestEnvironment = Initialize-TestEnvironment `
-    -DSCModuleName $script:DSCModuleName `
-    -DSCResourceName $script:DSCResourceName `
+    -DSCModuleName $script:dscModuleName `
+    -DSCResourceName $script:dscResourceName `
     -TestType Integration
-
 #endregion
 
 try
 {
     #region Integration Tests
-    $configFile = Join-Path -Path $PSScriptRoot -ChildPath "$($script:DSCResourceName).config.ps1"
+    $configFile = Join-Path -Path $PSScriptRoot -ChildPath "$($script:dscResourceName).config.ps1"
     . $configFile
 
-    Describe "$($script:DSCResourceName)_Integration" {
+    Describe "$($script:dscResourceName)_Integration" {
         #region DEFAULT TESTS
         It 'Should compile and apply the MOF without throwing' {
             {
-                & "$($script:DSCResourceName)_Config" -OutputPath $TestDrive
+                & "$($script:dscResourceName)_Config" -OutputPath $TestDrive
 
                 $startDscConfigurationParameters = @{
                     Path         = $TestDrive
@@ -52,7 +51,7 @@ try
 
         It 'Should have set the resource and all the parameters should match' {
             $current = Get-DscConfiguration | Where-Object -FilterScript {
-                $_.ConfigurationName -eq "$($script:DSCResourceName)_Config"
+                $_.ConfigurationName -eq "$($script:dscResourceName)_Config"
             }
             $current.ExecutionPolicy      | Should Be 'RemoteSigned'
             $current.ExecutionPolicyScope | Should Be 'LocalMachine'

diff --git a/Tests/Integration/MSFT_ScheduledTask.Integration.Tests.ps1 b/Tests/Integration/MSFT_ScheduledTask.Integration.Tests.ps1
@@ -1,32 +1,36 @@
 #Requires -Version 5.0
-$Script:DSCModuleName = 'ComputerManagementDsc'
-$Script:DSCResourceName = 'MSFT_ScheduledTask'
 #region HEADER
-# Integration Test Template Version: 1.1.1
-$script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\ComputerManagementDsc'
+$script:dscModuleName = 'ComputerManagementDsc'
+$script:dscResourceName = 'MSFT_ScheduledTask'
+
+# Integration Test Template Version: 1.3.3
+$script:moduleRoot = Split-Path -Parent (Split-Path -Parent $PSScriptRoot)
 if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests'))) -or `
     (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) )
 {
-    & git @('clone', 'https://github.com/PowerShell/DscResource.Tests.git', (Join-Path -Path $script:moduleRoot -ChildPath '\DSCResource.Tests\'))
+    & git @('clone', 'https://github.com/PowerShell/DscResource.Tests.git', (Join-Path -Path $script:moduleRoot -ChildPath 'DscResource.Tests'))
 }
 
 Import-Module -Name (Join-Path -Path $script:moduleRoot -ChildPath (Join-Path -Path 'DSCResource.Tests' -ChildPath 'TestHelper.psm1')) -Force
 $TestEnvironment = Initialize-TestEnvironment `
-    -DSCModuleName $Script:DSCModuleName `
-    -DSCResourceName $Script:DSCResourceName `
+    -DSCModuleName $script:dscModuleName `
+    -DSCResourceName $script:dscResourceName `
     -TestType Integration
 #endregion
 
 Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot -Parent) -ChildPath 'TestHelpers') -ChildPath 'CommonTestHelper.psm1') -Global
 
+# Load the ComputerManagementDsc.Common module to use Set-TimezoneId function
+Import-Module -Name (Join-Path -Path $script:moduleRoot -ChildPath (Join-Path -Path 'Modules' -ChildPath 'ComputerManagementDsc.Common')) -Force
+
 # Begin Testing
 try
 {
-    $ConfigFile = Join-Path -Path $PSScriptRoot -ChildPath "$($Script:DSCResourceName).config.ps1"
+    $ConfigFile = Join-Path -Path $PSScriptRoot -ChildPath "$($script:dscResourceName).config.ps1"
     . $ConfigFile
 
     #region Pester Tests
-    Describe $Script:DSCResourceName {
+    Describe $script:dscResourceName {
 
         $contexts = @{
             Once              = 'ScheduledTaskOnce'

diff --git a/Tests/Integration/MSFT_TimeZone.Integration.Tests.ps1 b/Tests/Integration/MSFT_TimeZone.Integration.Tests.ps1
@@ -1,20 +1,21 @@
-$script:DSCModuleName      = 'ComputerManagementDsc'
-$script:DSCResourceName    = 'MSFT_TimeZone'
-
 #region HEADER
-# Integration Test Template Version: 1.1.1
-$script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\ComputerManagementDsc'
+$script:dscModuleName      = 'ComputerManagementDsc'
+$script:dscResourceName    = 'MSFT_TimeZone'
+
+# Integration Test Template Version: 1.3.3
+$script:moduleRoot = Split-Path -Parent (Split-Path -Parent $PSScriptRoot)
 if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests'))) -or `
-     (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) )
+    (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) )
 {
-    & git @('clone','https://github.com/PowerShell/DscResource.Tests.git',(Join-Path -Path $script:moduleRoot -ChildPath '\DSCResource.Tests\'))
+    & git @('clone', 'https://github.com/PowerShell/DscResource.Tests.git', (Join-Path -Path $script:moduleRoot -ChildPath 'DscResource.Tests'))
 }
 
 Import-Module -Name (Join-Path -Path $script:moduleRoot -ChildPath (Join-Path -Path 'DSCResource.Tests' -ChildPath 'TestHelper.psm1')) -Force
 $TestEnvironment = Initialize-TestEnvironment `
-    -DSCModuleName $script:DSCModuleName `
-    -DSCResourceName $script:DSCResourceName `
+    -DSCModuleName $script:dscModuleName `
+    -DSCResourceName $script:dscResourceName `
     -TestType Integration
+#endregion
 
 # Store the test machine timezone
 $currentTimeZone = & tzutil.exe /g
@@ -26,10 +27,10 @@ tzutil.exe /s 'Eastern Standard Time'
 try
 {
     #region Integration Tests
-    $configFile = Join-Path -Path $PSScriptRoot -ChildPath "$($script:DSCResourceName).config.ps1"
+    $configFile = Join-Path -Path $PSScriptRoot -ChildPath "$($script:dscResourceName).config.ps1"
     . $configFile -Verbose -ErrorAction Stop
 
-    Describe "$($script:DSCResourceName)_Integration" {
+    Describe "$($script:dscResourceName)_Integration" {
         $configData = @{
             AllNodes = @(
                 @{
@@ -42,7 +43,7 @@ try
 
         It 'Should compile and apply the MOF without throwing' {
             {
-                & "$($script:DSCResourceName)_Config" `
+                & "$($script:dscResourceName)_Config" `
                     -OutputPath $TestDrive `
                     -ConfigurationData $configData
 
@@ -62,7 +63,7 @@ try
 
         It 'Should have set the configuration and all the parameters should match' {
             $current = Get-DscConfiguration | Where-Object -FilterScript {
-                $_.ConfigurationName -eq "$($script:DSCResourceName)_Config"
+                $_.ConfigurationName -eq "$($script:dscResourceName)_Config"
             }
             $current.TimeZone         | Should -Be $configData.AllNodes[0].TimeZone
             $current.IsSingleInstance | Should -Be $configData.AllNodes[0].IsSingleInstance

diff --git a/Tests/Integration/MSFT_VirtualMemory.Integration.Tests.ps1 b/Tests/Integration/MSFT_VirtualMemory.Integration.Tests.ps1
@@ -1,31 +1,30 @@
-$script:DSCModuleName      = 'ComputerManagementDsc'
-$script:DSCResourceName    = 'MSFT_VirtualMemory'
-
 #region HEADER
-# Integration Test Template Version: 1.1.1
-$script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\ComputerManagementDsc'
+$script:dscModuleName = 'ComputerManagementDsc'
+$script:dscResourceName = 'MSFT_VirtualMemory'
+
+# Integration Test Template Version: 1.3.3
+$script:moduleRoot = Split-Path -Parent (Split-Path -Parent $PSScriptRoot)
 if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests'))) -or `
-     (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) )
+    (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) )
 {
-    & git @('clone','https://github.com/PowerShell/DscResource.Tests.git',(Join-Path -Path $script:moduleRoot -ChildPath '\DSCResource.Tests\'))
+    & git @('clone', 'https://github.com/PowerShell/DscResource.Tests.git', (Join-Path -Path $script:moduleRoot -ChildPath 'DscResource.Tests'))
 }
 
 Import-Module -Name (Join-Path -Path $script:moduleRoot -ChildPath (Join-Path -Path 'DSCResource.Tests' -ChildPath 'TestHelper.psm1')) -Force
 $TestEnvironment = Initialize-TestEnvironment `
-    -DSCModuleName $script:DSCModuleName `
-    -DSCResourceName $script:DSCResourceName `
+    -DSCModuleName $script:dscModuleName `
+    -DSCResourceName $script:dscResourceName `
     -TestType Integration
-
 #endregion
 
 # Using try/finally to always cleanup.
 try
 {
     #region Integration Tests
-    $configFile = Join-Path -Path $PSScriptRoot -ChildPath "$($script:DSCResourceName).config.ps1"
+    $configFile = Join-Path -Path $PSScriptRoot -ChildPath "$($script:dscResourceName).config.ps1"
     . $configFile
 
-    Describe "$($script:DSCResourceName)_Integration" {
+    Describe "$($script:dscResourceName)_Integration" {
 
         Context 'Set page file to automatically managed' {
             $CurrentConfig = 'setToAuto'

diff --git a/Tests/Integration/MSFT_WindowsEventLog.Integration.Tests.ps1 b/Tests/Integration/MSFT_WindowsEventLog.Integration.Tests.ps1
@@ -1,30 +1,29 @@
-$script:DSCModuleName = 'ComputerManagementDsc'
-$script:DSCResourceName = 'MSFT_WindowsEventLog'
-
 #region HEADER
-# Integration Test Template Version: 1.1.1
-$script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\ComputerManagementDsc'
+$script:dscModuleName = 'ComputerManagementDsc'
+$script:dscResourceName = 'MSFT_WindowsEventLog'
+
+# Integration Test Template Version: 1.3.3
+$script:moduleRoot = Split-Path -Parent (Split-Path -Parent $PSScriptRoot)
 if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests'))) -or `
-     (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) )
+    (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) )
 {
-    & git @('clone','https://github.com/PowerShell/DscResource.Tests.git',(Join-Path -Path $script:moduleRoot -ChildPath '\DSCResource.Tests\'))
+    & git @('clone', 'https://github.com/PowerShell/DscResource.Tests.git', (Join-Path -Path $script:moduleRoot -ChildPath 'DscResource.Tests'))
 }
 
 Import-Module -Name (Join-Path -Path $script:moduleRoot -ChildPath (Join-Path -Path 'DSCResource.Tests' -ChildPath 'TestHelper.psm1')) -Force
 $TestEnvironment = Initialize-TestEnvironment `
-    -DSCModuleName $script:DSCModuleName `
-    -DSCResourceName $script:DSCResourceName `
+    -DSCModuleName $script:dscModuleName `
+    -DSCResourceName $script:dscResourceName `
     -TestType Integration
-
 #endregion
 
 # Using try/finally to always cleanup.
 try
 {
     #region Integration Tests
-    $configFile = Join-Path -Path $PSScriptRoot -ChildPath "$($script:DSCResourceName).config.ps1"
+    $configFile = Join-Path -Path $PSScriptRoot -ChildPath "$($script:dscResourceName).config.ps1"
     . $configFile
-    Describe "$($script:DSCResourceName)_Integration" {
+    Describe "$($script:dscResourceName)_Integration" {
 
         Context 'Set Windows Event Log to Logmode Retain' {
             $CurrentConfig = 'MSFT_WindowsEventLog_RetainSize'