Merge branch 'master' into AzureVpg_v2

Release into Master

.gitignore

@@ -6,3 +6,4 @@ SourceTestResults.xml
 publish/*
 CodeCoverage.xml
 scratch
+.DS_Store

.vscode/settings.json

@@ -4,5 +4,6 @@
     "editor.insertSpaces": true,
     "editor.tabSize": 4,
     "powershell.codeFormatting.preset": "OTBS",
-    "terminal.integrated.shell.windows": "c:/Program Files/PowerShell/6/pwsh.exe"
+    "terminal.integrated.shell.windows": "c:/Program Files/PowerShell/7/pwsh.exe",
+    "powershell.codeFormatting.addWhitespaceAroundPipe": true
 }

CHANGELOG.md

@@ -0,0 +1,145 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project is transitioning to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## Unreleased
+
+### Zerto Virtual Manager
+
+#### New
+
+* Added `Get-ZertoAzureResource` function to the module. This function is designed to retrieve information about resources in Azure that can be utilized when creating VPGs targeting the specified Azure site. Please read the [help file](https://github.com/ZertoPublic/ZertoApiWrapper/blob/master/docs/Get-ZertoAzureResource.md) for more information and examples.
+## [1.5.1]
+
+### Zerto Virtual Manager
+
+#### Fixed
+
+* Fixed an [issue](https://github.com/ZertoPublic/ZertoApiWrapper/issues/108) with `New-ZertoVpg` where when specifying a single host as a recovery target, the host identifier was not properly assigned. - Thanks @jonsouzerto!
+* Fixed an [issue](https://github.com/ZertoPublic/ZertoApiWrapper/issues/86) with `Invoke-ZertoMoveVpg` where parameters should have been mandatory in certain workflows. - Thanks @gdbarron!
+
+## [1.5.0]
+
+### Zerto Virtual Manager
+
+#### New
+
+* Added `Add-ZertoVpgVm` function to the module. Read the [help file](https://github.com/ZertoPublic/ZertoApiWrapper/blob/master/docs/Add-ZertoVpgVm.md) for more information.
+* Added `Remove-ZertoVpgVm` function to the module. Read the [help file](https://github.com/ZertoPublic/ZertoApiWrapper/blob/master/docs/Remove-ZertoVpgVm.md) for more information.
+
+#### Fixed
+
+* Fixed an [issue](https://github.com/ZertoPublic/ZertoApiWrapper/issues/103) with `Add-ZertoPeerSite` where there was an incorrect settings validator on the `-targetHost` parameter where it would not accept a hostname.
+
+## [1.4.3]
+
+### Zerto Virtual Manager
+
+#### Updated
+
+* Updated `Connect-ZertoServer` with a `-AutoReconnect` switch to allow the auto reconnection of a session that has timed-out.
+* Updated `New-ZertoVpg` to have a Default Parameter Set of `recoveryHostDatastore` should no parameters be passed when calling the function.
+* Updated `New-ZertoVpg -recoverySite` parameter to be case-insensitive
+
+#### Fixed
+
+* Fixed an [issue](https://github.com/ZertoPublic/ZertoApiWrapper/issues/96) with `Set-ZertoLicense` so that ShouldProcess functions properly.
+* Fixed an [issue](https://github.com/ZertoPublic/ZertoApiWrapper/issues/95) when attempting to connect to an unlicensed site.
+
+## [1.4.2]
+
+### Zerto Virtual Manager
+
+#### Fixed
+
+* Updated `Get-ZertoEvent` to translate a vpg name parameter to a vpgIdentifier per the API documentation
+* Updated `Invoke-ZertoMoveCommit` to ensure that when one of the parameter switches is defined, all required parameters are sent to avoid conflicts with parameters passed with the `Invoke-ZertoMove` command.
+* Updated `Start-ZertoCloneVpg` to fix an issue where an error would be thrown if an operation specified a subset of VMs to be cloned.
+
+## [1.4.1]
+
+### General
+
+* Removed RELEASENOTES and converted to a CHANGELOG format.
+* Updated the build process to follow Semantic Versioning.
+* Updated the build process to use the latest Pester Version (4.10.1)
+* Updated the build process to use the latest PS Script Analyzer Version (1.19.0)
+* Updated the Tests Files to use a more modern method of grabbing the PSScriptPath
+
+### Zerto Virtual Manager
+
+* Refactored `Copy-ZertoVpg` functionality to leverage identifier and name maps and eliminate `where-object` searches.
+* Updated `Get-ZertoEvent` parameter to fall in line with the filter parameter name in the API documentation. Moved the old parameter name to an alias to ensure that existing functionality continues to work.
+
+## [1.4.0.20200410]
+
+### Zerto Virtual Manager
+
+* Addressed a reported [issue](https://github.com/ZertoPublic/ZertoApiWrapper/issues/60) in the `Get-ZertoRecoveryReport` function where the `-VpgIdentifier` parameter was not working. This parameter is not accepted by the API as a valid filter and is ignored. This parameter has been removed from the function.
+* Addressed a reported [issue](https://github.com/ZertoPublic/ZertoApiWrapper/issues/61) where the `Export-ZertoVpgNicSetting` function would not properly execute when run against a VM with no NICs attached.
+* In reviewing the `Export-ZertoVpgNicSetting`, a review of the `Import-ZertoVpgNicSetting` was completed and it was determined to update the import logic based on various test cases. Along with this, it is now possible to reset the NIC settings to the default state with the `Import-ZertoVpgNicSetting` command. Please review the [Import-ZertoVpgNicSetting help](https://github.com/ZertoPublic/ZertoApiWrapper/blob/master/docs/Import-ZertoVmNicSetting.md) to review the updated options and import logic.
+* Refactored the `Checkpoint-ZertoVpg` command to allow pipeline input (ByValue and ByProperty) for the VpgName parameter.
+* Corrected a parameter typo in the `Get-ZertoVpgSetting` function. The misspelt parameter was added as an alias to ensure any existing scripts using the parameter continue to function.
+* Refactored the `Get-ZertoVpg` command to remove repetitive commands and variables that are no longer required.
+* Moved `Invoke-ZertoRestRequest` and `Invoke-ZARestRequest` to be public functions. As there become more and more scenarios where there are not prebuilt functions to accomplish complex specialized tasks, it became apparent that these functions could be leveraged to make the experience and workflow easier.
+* Updated the `Install-ZertoVra` logic to ensure that the target datastore is available on the target host. There isn't currently any method to validate the target network, but if that becomes available in a later version of the API, the function will be updated.
+* Updated the `Install-ZertoVra` function to allow for installation of the VRA using the host password method. Please review the [Install-ZertoVra](https://github.com/ZertoPublic/ZertoApiWrapper/blob/master/docs/Install-ZertoVra.md) documentation for syntax and examples.
+* Updated the `Edit-ZertoVra` function to allow for modification of the associated ESX host password if the need arises. Please review the [Edit-ZertoVra](https://github.com/ZertoPublic/ZertoApiWrapper/blob/master/docs/Edit-ZertoVra.md) documentation for syntax and examples.
+* Added a new function, `Set-ZertoUserCredential`, to allow the updating of the username and password used to connect the Zerto Virtual Manager to the paired hypervisor. Please see the [Set-ZertoUserCredential](https://github.com/ZertoPublic/ZertoApiWrapper/blob/master/docs/Set-ZertoUserCredential.md) help for additional information.
+* With the release of [Zerto 8.0](https://www.zerto.com/zerto-8-0-general-availability/) some additional API endpoints have become available.
+  * Updated `Get-ZertoVirtualizationSite` to add the `-repository` parameter to enable returning information for LTR repositories.
+  * Updated `Get-ZertoVpgSetting` to add the `-ltr` parameter to enable returning information for current LTR settings for the selected VPG.
+
+### Zerto Analytics
+
+* Added several functions for the newly added [Zerto Analytics](https://analytics.zerto.com) Planner.
+  * `Get-ZAPlannerSite` Help can be found here: [Get-ZAPlannerSite](https://github.com/ZertoPublic/ZertoApiWrapper/blob/master/docs/Get-ZAPlannerSite.md)
+  * `Get-ZAPlannerStatsReport` Help can be found here: [Get-ZAPlannerStatsReport](https://github.com/ZertoPublic/ZertoApiWrapper/blob/master/docs/Get-ZAPlannerStatsReport.md)
+  * `Get-ZAPlannerJournalSizeReport` Help can be found here: [Get-ZAPlannerJournalSizeReport](https://github.com/ZertoPublic/ZertoApiWrapper/blob/master/docs/Get-ZAPlannerJournalSizeReport.md)
+  * `Get-ZAPlannerNetworkPerformanceReport` Help can be found here: [Get-ZAPlannerNetworkPerformanceReport](https://github.com/ZertoPublic/ZertoApiWrapper/blob/master/docs/Get-ZAPlannerNetworkPerformanceReport.md)
+  * `Get-ZAPlannerWanReport` Help can be found here: [Get-ZAPlannerWanReport](https://github.com/ZertoPublic/ZertoApiWrapper/blob/master/docs/Get-ZAPlannerWanReport.md)
+  * `Get-ZAPlannerZcasReport` Help can be found here: [Get-ZAPlannerZcasReport](https://github.com/ZertoPublic/ZertoApiWrapper/blob/master/docs/Get-ZAPlannerZcasReport.md)
+* Created `Get-ZAProtectedVm` and `Get-ZAProtectedVmReport` functions to leverage the newly released Zerto Analytics APIs for this data. Help files can be found here: [Get-ZAProtectedVm](https://github.com/ZertoPublic/ZertoApiWrapper/blob/master/docs/Get-ZAProtectedVm.md) and [Get-ZAProtectedVmReport](https://github.com/ZertoPublic/ZertoApiWrapper/blob/master/docs/Get-ZAProtectedVmReport.md)
+
+## [1.3.0.20191201]
+
+### Zerto Virtual Manager
+
+* [Zerto version 7.5 has been released.](https://s3.amazonaws.com/zertodownload_docs/Latest/Zerto%20Virtual%20Replication%20Release%20Notes.pdf) As part of this release Zerto has added API functionality that requires the following updates.
+  * A token is now required to pair two sites together. The need is discussed in [Issue 46](https://github.com/ZertoPublic/ZertoApiWrapper/issues/46). To implement this change a `-token` parameter has been added to the `Add-ZertoPeerSite` function.
+  * A new function has been added; `New-ZertoPairingToken`. This function will allow users to generate a pairing authentication token from the target ZVM to be used in the pairing process. [Issue 47](https://github.com/ZertoPublic/ZertoApiWrapper/issues/47) covers additional details.
+* A new function has been added; `Invoke-ZertoEvacuateVra`. This function will allow users to evacuate a target VRA by specifying a Host Name, VRA Name, or VRA Identifier. All VMs currently replicating to the specified location will be migrated to different targets. [Issue 51](https://github.com/ZertoPublic/ZertoApiWrapper/issues/51)
+* A function has been added; `Copy-ZertoVpg`. This function will allow users to copy the settings of a single VPG and add new VMs to it. There is currently no customization beyond specifying the VMs to be placed in the newly created VPG. Should additional edits \ updates be required, they should be done post creation. [Issue 54](https://github.com/ZertoPublic/ZertoApiWrapper/issues/54)
+* Fixed [issue 57](https://github.com/ZertoPublic/ZertoApiWrapper/issues/57) where a `Start-ZertoFailoverTest` would throw an error complaining about validating the body parameter. This has been fixed and tested against Zerto Virtual Manager 7.5 Update 1 with Windows PowerShell 5.1 and PowerShell Core 6.2.
+
+## [1.2.0.20190801]
+
+### Zerto Virtual Manager
+
+* Added two functions to aid in bulk updating of NIC information for protected VMs. ([Issue 38](https://github.com/ZertoPublic/ZertoApiWrapper/issues/38))
+  * [Export-ZertoVmNicSetting](https://github.com/ZertoPublic/ZertoApiWrapper/blob/Master/docs/Export-ZertoVmNicSettings.md)
+  * [Import-ZertoVmNicSetting](https://github.com/ZertoPublic/ZertoApiWrapper/blob/Master/docs/Import-ZertoVmNicSettings.md)
+* Fixed an [issue](https://github.com/ZertoPublic/ZertoApiWrapper/issues/43) where a VPG being created with a single VM member would not be parsed by the API correctly using PowerShell 5.1
+
+### Zerto Analytics
+
+* Fixed an [issue](https://github.com/ZertoPublic/ZertoApiWrapper/issues/36) where the Zerto Analytics Rest Request function was not checking for the token before attempting a connection.
+* Fixed an [issue](https://github.com/ZertoPublic/ZertoApiWrapper/issues/40) where the `Get-ZAVpg` method would return a 404 error when a `-vpgIdentifier` parameter was specified.
+
+### General Updates
+
+* Updated the way that tests are invoked and parsed to ensure that both source and built module files are tested. This will ensure that what is being shipped passes all tests along with testing of the source files.
+* Added additional parameter validation tests to several of the functions. On-going effort to complete stand alone unit testing of each function.
+
+## [Initial Release]
+
+### Zerto Virtual Manager
+
+* Updated `Invoke-ZertoRestRequest` to work in Powershell 5.1 as well as Powershell core
+
+### Zerto Analytics
+
+* Implemented Zerto Analytics Functionality. Please see [Getting Started with Zerto Analytics](https://github.com/ZertoPublic/ZertoApiWrapper/wiki/Getting-Started-with-Zerto-Analytics)

README.md

@@ -4,8 +4,8 @@ PowerShell wrapper for Zerto Virtual Manager API
 
 ## Current Build Status
 
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/0e31e5cdad534271ac688a82cc3ca17d)](https://app.codacy.com/app/wcarroll/ZertoApiWrapper?utm_source=github.com&utm_medium=referral&utm_content=wcarroll/ZertoApiWrapper&utm_campaign=Badge_Grade_Settings)
 [![Build Status](https://dev.azure.com/ZertoPublic/ZertoApiWrapper/_apis/build/status/ZertoPublic.ZertoApiWrapper?branchName=master)](https://dev.azure.com/ZertoPublic/ZertoApiWrapper/_build/latest?definitionId=1&branchName=master)
+[![PowerShell Gallery](https://img.shields.io/powershellgallery/dt/ZertoApiWrapper?label=PowerShell%20Gallery%20Downloads)](https://www.powershellgallery.com/packages/ZertoApiWrapper)
 
 ## Legal Disclaimer
 
@@ -27,17 +27,12 @@ PS> Install-Module -name ZertoApiWrapper
 
 ## Getting Started
 
-* [Getting Started with Zerto Virtual Manager and the ZertoApiWrapper](https://github.com/ZertoPublic/ZertoApiWrapper/wiki/Getting-Stated-with-Zerto-Virtual-Manager)
+* [Getting Started with Zerto Virtual Manager and the ZertoApiWrapper](https://github.com/ZertoPublic/ZertoApiWrapper/wiki/Getting-Started-with-Zerto-Virtual-Manager)
 * [Getting Started with Zerto Analytics and the ZertoApiWrapper](https://github.com/ZertoPublic/ZertoApiWrapper/wiki/Getting-Started-with-Zerto-Analytics)
 
 ## Recent Updates
 
-* December 1st, 2019: November Release. See [Release Notes](https://github.com/ZertoPublic/ZertoApiWrapper/releases/tag/1.3.0.20191201).
+All recent updates can now be tracked via the [Change Log](https://github.com/ZertoPublic/ZertoApiWrapper/blob/master/CHANGELOG.md).
-* August 1st, 2019: August Release. See [Release Notes](https://github.com/ZertoPublic/ZertoApiWrapper/releases/tag/1.2.0.20190801).
-* June 16th, 2019: Added functionality for Zerto Analytics.
-* May 31st, 2019: Implement logic to allow use of this module in both Windows PowerShell 5.1 and PowerShell Core.
-* March 15th, 2019: Implement Export and Import Functionality. Please See [Export-ZertoVpg Help](https://github.com/ZertoPublic/ZertoApiWrapper/blob/master/docs/Export-ZertoVpg.md) and [Import-ZertoVpg Help](https://github.com/ZertoPublic/ZertoApiWrapper/blob/master/docs/Import-ZertoVpg.md) for assistance. No current pre-seed support.
-* March 11th, 2019: Create basic VPG completed. Please see [New-ZertoVpg Help](https://github.com/ZertoPublic/ZertoApiWrapper/blob/master/docs/New-ZertoVpg.md)
 
 ## TODO
 

RELEASENOTES.md

@@ -1,10 +0,0 @@
-
-
-### Zerto Virtual Manager
-
-* [Zerto version 7.5 has been released.](https://s3.amazonaws.com/zertodownload_docs/Latest/Zerto%20Virtual%20Replication%20Release%20Notes.pdf) As part of this release Zerto has added API functionality that requires the following updates.
-  * A token is now required to pair two sites together. The need is discussed in [Issue 46](https://github.com/ZertoPublic/ZertoApiWrapper/issues/46). To implement this change a `-token` parameter has been added to the `Add-ZertoPeerSite` function.
-  * A new function has been added; `New-ZertoPairingToken`. This function will allow users to generate a pairing authentication token from the target ZVM to be used in the pairing process. [Issue 47](https://github.com/ZertoPublic/ZertoApiWrapper/issues/47) covers additional details.
-* A new function has been added; `Invoke-ZertoEvacuateVra`. This function will allow users to evacuate a target VRA by specifying a Host Name, VRA Name, or VRA Identifier. All VMs currently replicating to the specified location will be migrated to different targets. [Issue 51](https://github.com/ZertoPublic/ZertoApiWrapper/issues/51)
-* A function has been added; `Copy-ZertoVpg`. This function will allow users to copy the settings of a single VPG and add new VMs to it. There is currently no customization beyond specifying the VMs to be placed in the newly created VPG. Should additional edits \ updates be required, they should be done post creation. [Issue 54](https://github.com/ZertoPublic/ZertoApiWrapper/issues/54)
-* Fixed [issue 57](https://github.com/ZertoPublic/ZertoApiWrapper/issues/57) where a `Start-ZertoFailoverTest` would throw an error complaining about validating the body parameter. This has been fixed and tested against Zerto Virtual Manager 7.5 Update 1 with Windows PowerShell 5.1 and PowerShell Core 6.2.

Tests/Private/Get-Map.Tests.ps1

@@ -1,45 +1,45 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
     InModuleScope -ModuleName ZertoApiWrapper {
         Context "$global:function::Parameter Unit Tests" {
-            it "have a mandatory parameter for the Input Object" {
+            It "have a mandatory parameter for the Input Object" {
                 Get-Command $global:function | Should -HaveParameter InputObject -Mandatory -Type PSCustomObject
             }
 
-            it "Input Object should not accecpt a Null or Empty value" {
+            It "Input Object should not accecpt a Null or Empty value" {
                 $myObj = [PSCustomObject]@{ }
                 { Get-Map -InputObject $myObj -Key "Key" -Value "Value" } | Should Throw
                 { Get-Map -InputObject $null -Key "Key" -Value "Value" } | Should Throw
                 { Get-Map -InputObject "" -Key "Key" -Value "Value" } | Should Throw
             }
 
-            it "have a mandatory string parameter for the Map Key" {
+            It "have a mandatory string parameter for the Map Key" {
                 Get-Command $global:function | Should -HaveParameter Key -Mandatory -Type String
             }
 
-            it "The Map variable should not accecpt a Null or Empty value" {
+            It "The Map variable should not accecpt a Null or Empty value" {
                 $myObj = [PSCustomObject]@{one = 1; two = 2 }
                 { Get-Map -InputObject $myObj -Key "" -Value "Value" } | Should Throw
                 { Get-Map -InputObject $null -Key $null -Value "Value" } | Should Throw
                 { Get-Map -InputObject $myObj -Key 1 -Value "Value" } | Should Throw
             }
 
-            it "The Value variable should not accecpt a Null or Empty value" {
+            It "The Value variable should not accecpt a Null or Empty value" {
                 $myObj = [PSCustomObject]@{one = 1; two = 2 }
                 { Get-Map -InputObject $myObj -Key "Key" -Value "" } | Should Throw
                 { Get-Map -InputObject $myObj -Key "Key" -Value $null } | Should Throw
                 { Get-Map -InputObject $myObj -Key "Key" -Value 1 } | Should Throw
             }
 
-            it "have a mandatory string parameter for the Map Value" {
+            It "have a mandatory string parameter for the Map Value" {
                 Get-Command $global:function | Should -HaveParameter Value -Mandatory -Type String
             }
 
-            it "should have an Output type of Hashtable" {
+            It "should have an Output type of Hashtable" {
                 (Get-Command $global:function).OutputType.Name | Should -Match "Hashtable"
             }
         }
@@ -49,15 +49,15 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
             BeforeEach {
                 $MyMap = Get-Map -InputObject $MyObj -Key "vmIdentifier" -Value "vmName"
             }
-            it "Returned object should be a hashtable" {
+            It "Returned object should be a hashtable" {
                 $myMap | Should -BeOfType Hashtable
             }
 
-            it "should return a hashtable with 3 entries" {
+            It "should return a hashtable with 3 entries" {
-                $myMap.count | should -Be 3
+                $myMap.count | Should -Be 3
             }
 
-            it "should be properly mapped" {
+            It "should be properly mapped" {
                 $myMap["vmid.12"] | Should -Be "ExchangeMailbox"
                 $myMap["vmid.13"] | Should -Be "ExchangeApplication"
                 $myMap["vmid.14"] | Should -Be "ExchangeWeb"

Tests/Private/Get-ZertoApiFilter.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
@@ -16,7 +16,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 { Get-ZertoApiFilter -filtertable $null } | Should Throw
             }
 
-            it "should have an Output type of String" {
+            It "should have an Output type of String" {
                 (Get-Command $global:function).OutputType.Name | Should -Match "String"
             }
         }
@@ -47,19 +47,19 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
             }
 
-            it "converts bool to text" {
+            It "converts bool to text" {
-                Get-ZertoApiFilter -filtertable $singleBoolItemTest | should -Be "?BoolItem=True"
+                Get-ZertoApiFilter -filtertable $singleBoolItemTest | Should -Be "?BoolItem=True"
             }
 
-            it "one item test" {
+            It "one item test" {
-                Get-ZertoApiFilter -filtertable $oneItemTest | should be "?OneItem=Test"
+                Get-ZertoApiFilter -filtertable $oneItemTest | Should -Be "?OneItem=Test"
             }
 
-            it "should ignore CommonParameters" {
+            It "should ignore CommonParameters" {
-                Get-ZertoApiFilter -filtertable $commonParamTest | should be "?OneItem=Test"
+                Get-ZertoApiFilter -filtertable $commonParamTest | Should -Be "?OneItem=Test"
             }
 
-            it "should process a filter table with more than one item" {
+            It "should process a filter table with more than one item" {
                 $returnString = Get-ZertoApiFilter -filtertable $twoItemTest
                 $returnString | Should -match "^\?"
                 $returnString | Should -match "&"

Tests/Public/Add-ZertoPeerSite.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -Leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
     BeforeAll {
@@ -14,7 +14,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
         }
 
         $ParameterTestCases = @(
-            @{ParameterName = 'targetHost'; Type = 'String'; Mandatory = $true; Validation = 'Script' }
+            @{ParameterName = 'targetHost'; Type = 'String'; Mandatory = $true; Validation = 'NotNullOrEmpty' }
             @{ParameterName = 'targetPort'; Type = 'Int32'; Mandatory = $false; Validation = 'Range' }
             @{ParameterName = 'token'; Type = 'String'; Mandatory = $false; Validation = 'NotNullOrEmpty' }
         )
@@ -27,11 +27,6 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
         It "<ParameterName> parameter has correct validation setting"  -TestCases $ParameterTestCases {
             param($ParameterName, $Validation)
             Switch ($Validation) {
-                'Script' {
-                    $attrs = (Get-Command $global:function).Parameters[$ParameterName].Attributes
-                    $attrs.Where{ $_ -is [ValidateScript] }.Count | Should -Be 1
-                }
-
                 'Range' {
                     $attrs = (Get-Command $global:function).Parameters[$ParameterName].Attributes
                     $attrs.Where{ $_ -is [ValidateRange] }.Count | Should -Be 1
@@ -43,7 +38,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | Should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }
@@ -53,18 +48,18 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
         }
 
         It "targetPort Parameter should have a Min value of 1024" {
-            (Get-Command $global:function).Parameters['targetPort'].Attributes.Where{ $_ -is [ValidateRange] }.MinRange | Should Be 1024
+            (Get-Command $global:function).Parameters['targetPort'].Attributes.Where{ $_ -is [ValidateRange] }.MinRange | Should -Be 1024
         }
 
         It "targetPort Parameter should have a Max value of 65535" {
-            (Get-Command $global:function).Parameters['targetPort'].Attributes.Where{ $_ -is [ValidateRange] }.MaxRange | Should Be 65535
+            (Get-Command $global:function).Parameters['targetPort'].Attributes.Where{ $_ -is [ValidateRange] }.MaxRange | Should -Be 65535
         }
 
         It "Supports 'SupportsShouldProcess'" {
             Get-Command $global:function | Should -HaveParameter WhatIf
             Get-Command $global:function | Should -HaveParameter Confirm
-            $script:ScriptBlock | Should -match 'SupportsShouldProcess'
+            $script:ScriptBlock | Should -Match 'SupportsShouldProcess'
-            $script:ScriptBlock | Should -match '\$PSCmdlet\.ShouldProcess\(.+\)'
+            $script:ScriptBlock | Should -Match '\$PSCmdlet\.ShouldProcess\(.+\)'
         }
     }
 

Tests/Public/Add-ZertoVpgVm.Tests.ps1

@@ -0,0 +1,53 @@
+#Requires -Modules Pester
+$global:here = (Split-Path -Parent $PSCommandPath)
+$global:function = ((Split-Path -Leaf $PSCommandPath).Split('.'))[0]
+
+Describe $global:function -Tag 'Unit', 'Source', 'Built' {
+    BeforeAll {
+        $script:ScriptBlock = (Get-Command $global:function).ScriptBlock
+    }
+
+    Context "$global:function::Parameter Unit Tests" {
+
+        It "$global:function should have exactly 16 parameters defined" {
+            (Get-Command $global:function).Parameters.Count | Should -Be 16
+        }
+
+        $ParameterTestCases = @(
+            @{ParameterName = 'vpgSettingsIdentifier'; Type = 'String'; Mandatory = $true; Validation = 'NotNullOrEmpty' }
+            @{ParameterName = 'Vm'; Type = 'String[]'; Mandatory = $true; Validation = 'NotNullOrEmpty' }
+            @{ParameterName = 'VpgName'; Type = 'String'; Mandatory = $true; Validation = 'NotNullOrEmpty' }
+        )
+
+        It "<ParameterName> parameter is of <Type> type" -TestCases $ParameterTestCases {
+            param($ParameterName, $Type, $Mandatory, $Validation)
+            Get-Command $global:function | Should -HaveParameter $ParameterName -Mandatory:$Mandatory -Type $Type
+        }
+
+        It "<ParameterName> parameter has correct validation setting"  -TestCases $ParameterTestCases {
+            param($ParameterName, $Validation)
+            Switch ($Validation) {
+                'NotNullOrEmpty' {
+                    $attrs = (Get-Command $global:function).Parameters[$ParameterName].Attributes
+                    $attrs.Where{ $_ -is [ValidateNotNullOrEmpty] }.Count | Should -Be 1
+                }
+
+                default {
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
+                }
+            }
+        }
+
+        It "Supports 'SupportsShouldProcess'" {
+            Get-Command $global:function | Should -HaveParameter WhatIf
+            Get-Command $global:function | Should -HaveParameter Confirm
+            $script:ScriptBlock | Should -Match 'SupportsShouldProcess'
+            $script:ScriptBlock | Should -Match '\$PSCmdlet\.ShouldProcess\(.+\)'
+        }
+    }
+
+    Context "Add-ZertoPeerSite::Functional Unit Tests" {
+    }
+}
+Remove-Variable -Name here -Scope Global
+Remove-Variable -Name function -Scope Global

Tests/Public/Checkpoint-ZertoVpg.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
     BeforeAll {
@@ -16,7 +16,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
     Context "$($global:function)::Parameter Unit Tests" {
         It "Has a parameter for the VpgName that is Mandatory" {
-            Get-Command $global:function | Should -HaveParameter vpgName -Mandatory -Type String
+            Get-Command $global:function | Should -HaveParameter vpgName -Mandatory -Type 'String[]'
         }
 
         It "Has a parameter for the CheckpointName that is Mandatory" {

Tests/Public/Connect-ZertoAnalytics.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
     BeforeAll {
@@ -13,8 +13,6 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
         }
     }
 
-
-
     Context "$($global:function)::Function Unit Tests" {
 
         InModuleScope -ModuleName ZertoApiWrapper {
@@ -68,7 +66,6 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
         Assert-MockCalled -ModuleName ZertoApiWrapper -CommandName Invoke-ZARestRequest -Exactly 1
     }
-
 }
 
 Remove-Variable -Name function -Scope Global

Tests/Public/Connect-ZertoServer.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -Leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
     BeforeAll {
@@ -45,6 +45,16 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
             { Connect-ZertoServer -zertoServer -credential 1234 } | Should -Throw
             { Connect-ZertoServer -zertoServer -credential $(@{Username = "zerto\build"; Password = 'SecureString' }) } | Should -Throw
         }
+
+        It "has a switch parameter to return the headers" {
+            Get-Command $global:function | Should -HaveParameter returnHeaders
+            Get-Command $global:function | Should -HaveParameter returnHeaders -Type Switch
+        }
+
+        It "has a switch parameter to auto reauthorize the session" {
+            Get-Command $global:function | Should -HaveParameter autoReconnect
+            Get-Command $global:function | Should -HaveParameter autoReconnect -Type Switch
+        }
     }
 
     InModuleScope -ModuleName ZertoApiWrapper {
@@ -57,10 +67,6 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
             return $results
         }
 
-        Mock -ModuleName ZertoApiWrapper -CommandName Get-ZertoLocalSite {
-            return (Get-Content -Path "$global:here\Mocks\LocalSiteInfo.json" -Raw | ConvertFrom-Json)
-        }
-
         Context "$($global:function)::InModuleScope Function Unit Tests" {
 
             BeforeAll {
@@ -89,27 +95,21 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
             It "Module Scope zvmHeaders variable tests" {
                 $script:zvmHeaders | Should -Not -BeNullOrEmpty
                 $script:zvmHeaders | Should -BeOfType PSCustomObject
-                $script:zvmHeaders.keys.count | Should -BeExactly 2
+                $script:zvmHeaders.keys.count | Should -BeExactly 3
                 $script:zvmHeaders.ContainsKey('x-zerto-session') | Should -BeTrue
                 $script:zvmHeaders.ContainsKey('Accept') | Should -BeTrue
                 $script:zvmHeaders['x-zerto-session'] | Should -BeOfType String
                 $script:zvmHeaders['Accept'] | Should -BeOfType String
             }
 
-            It "Module Scope zvmLocalInfo variable tests" {
-                $script:zvmLocalInfo | Should -Not -BeNullOrEmpty
-                $script:zvmLocalInfo | Should -BeOfType PSCustomObject
-                $script:zvmLocalInfo.SiteIdentifier | Should -BeOfType String
-            }
-
             $headers = Connect-ZertoServer -zertoServer $Server -credential $credential -returnHeaders
             It "returns a Hashtable with 2 keys" {
                 $headers | Should -BeOfType Hashtable
-                $headers.keys.count | Should be 2
+                $headers.keys.count | Should -Be 3
             }
 
             It "return value has a key called 'x-zerto-session'" {
-                $headers.ContainsKey('x-zerto-session') | Should be $true
+                $headers.ContainsKey('x-zerto-session') | Should -Be $true
             }
 
             It "return key 'x-zerto-session' value should be a string" {
@@ -118,11 +118,11 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
             }
 
             It "return value has a key called 'accept'" {
-                $headers.ContainsKey('accept') | Should be $true
+                $headers.ContainsKey('accept') | Should -Be $true
             }
 
             It "return key 'accept' value should be 'application/json'" {
-                $headers['accept'] | Should be 'application/json'
+                $headers['accept'] | Should -Be 'application/json'
             }
 
             It "should not require a port to be specified" {
@@ -134,7 +134,6 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
             }
 
             Assert-MockCalled -ModuleName ZertoApiWrapper -CommandName Invoke-ZertoRestRequest -Exactly 4
-            Assert-MockCalled -ModuleName ZertoApiWrapper -CommandName Get-ZertoLocalSite -Exactly 4
         }
     }
 }

Tests/Public/Copy-ZertoVpg.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
     BeforeAll {
@@ -48,7 +48,78 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
     }
 
     Context "$($global:function)::Function Unit Tests" {
+        Mock -ModuleName ZertoApiWrapper -CommandName Get-ZertoVpg -ParameterFilter {
+            $vpgName -eq "MyVpg"
+        } {
+            return (Get-Content "$global:here\Mocks\GetVpg.json" -Raw | ConvertFrom-Json)
+        } -Verifiable
+        Mock -ModuleName ZertoApiWrapper -CommandName Get-ZertoVpg -ParameterFilter {
+            $vpgName -eq "NotAVpg"
+        } {
+            return $null
+        } -Verifiable
+        Mock -ModuleName ZertoApiWrapper -CommandName Get-ZertoUnprotectedVm {
+            return (Get-Content "$global:here\Mocks\UnprotectedVms.json" -Raw | ConvertFrom-Json)
+        } -Verifiable
+        Mock -ModuleName ZertoApiWrapper -CommandName Get-ZertoProtectedVm {
+            return (Get-Content "$global:here\Mocks\ProtectedVms.json" -Raw | ConvertFrom-Json)
+        } -Verifiable
+        Mock -ModuleName ZertoApiWrapper -CommandName Invoke-ZertoRestRequest -ParameterFilter {
+            $uri -eq "vpgSettings/copyVpgSettings"
+        } {
+            return (Get-Content "$global:here\Mocks\VpgId.txt")
+        } -Verifiable
+        Mock -ModuleName ZertoApiWrapper -CommandName Invoke-ZertoRestRequest -ParameterFilter {
+            $uri -eq "vpgSettings/9607f923-00a7-477b-8b04-26a386214455/vms"
+        } {
+            return $null
+        } -Verifiable
+        Mock -ModuleName ZertoApiWrapper -CommandName Invoke-ZertoRestRequest -ParameterFilter {
+            $uri -eq "vpgSettings/9607f923-00a7-477b-8b04-26a386214455"
+        } {
+            return (Get-Content "$global:here\Mocks\CopyVpgSettings.json" -Raw | ConvertFrom-Json)
+        } -Verifiable
+        Mock -ModuleName ZertoApiWrapper -CommandName Save-ZertoVpgSetting {
+            return (Get-Content "$global:here\Mocks\TaskId.txt")
+        } -Verifiable
+        Mock -ModuleName ZertoApiWrapper -CommandName Get-Map -ParameterFilter {
+            $null -ne $InputObject[0].VpgName
+        } {
+            @{
+                "WindowsBox"    = "d809de8e-deb7-45cc-b620-08030a1143e1.vm-90"
+                "CentOS-Test"   = "d809de8e-deb7-45cc-b620-08030a1143e1.vm-88"
+                "Application01" = "d809de8e-deb7-45cc-b620-08030a1143e1.vm-35"
+                "sql01-test"    = "d809de8e-deb7-45cc-b620-08030a1143e1.vm-73"
+                "jenkins"       = "d809de8e-deb7-45cc-b620-08030a1143e1.vm-75"
+            }
+        } -Verifiable
+        Mock -ModuleName ZertoApiWrapper -CommandName Get-Map -ParameterFilter {
+            $null -eq $InputObject[0].VpgName
+        } {
+            @{
+                "Win2019Template" = "d809de8e-deb7-45cc-b620-08030a1143e1.vm-79"
+                "Ubuntu01"        = "d809de8e-deb7-45cc-b620-08030a1143e1.vm-34"
+                "WinTemplate"     = "d809de8e-deb7-45cc-b620-08030a1143e1.vm-25"
+                "sql01-prod"      = "d809de8e-deb7-45cc-b620-08030a1143e1.vm-87"
+                "nczvm.nc.lab"    = "d809de8e-deb7-45cc-b620-08030a1143e1.vm-30"
+            }
+        } -Verifiable
 
+        It "Should throw an error when no VPG is found" {
+            { Copy-ZertoVpg -SourceVpgName "NotAVpg" -NewVpgName "NewVpg" -VMs 'sql01-prod', 'Ubuntu01' } | Should Throw "Unable to find a VPG with the name:"
+        }
+
+        It "Returns a TaskIdentifier when called correctly" {
+            Copy-ZertoVpg -SourceVpgName "MyVpg" -NewVpgName "NewVpg" -VMs 'sql01-prod', 'Ubuntu01' | Should -Be "7e79035e-fb8c-47fe-815c-12ddd41708e6.3e4cdd0d-1064-4022-921f-6265ad6d335a"
+        }
+
+        It "Should warn when VM is not found" {
+            $results = Copy-ZertoVpg -SourceVpgName "MyVpg" -NewVpgName "NewVpg" -VMs 'sql01-prod', 'Ubuntu01', 'DoesNotExist' 3>&1
+            $results[0].ToString() | Should -Match 'Unable to find VM with Name DoesNotExist. Skipping.'
+
+        }
+
+        Assert-VerifiableMock
     }
 }
 

Tests/Public/Disconnect-ZertoServer.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 

Tests/Public/Edit-ZertoVra.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
@@ -8,7 +8,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
         Get-Content $global:here\Mocks\TaskId.txt
     }
 
-    Mock -ModuleName ZertoApiWrapper Get-ZertoVra -ParameterFilter { $vraIdentifier -eq "MyVraIdentifier" } {
+    Mock -ModuleName ZertoApiWrapper Get-ZertoVra -ParameterFilter { $vraIdentifier -in @("MyVraIdentifier", "PasswordVraIdentifier") } {
         Get-Content $global:here\Mocks\GetSingleVra.json -Raw | ConvertFrom-Json
     }
 
@@ -28,6 +28,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
             @{ParameterName = 'vraIpAddress'; Type = 'String'; Mandatory = $false }
             @{ParameterName = 'defaultGateway'; Type = 'String'; Mandatory = $false }
             @{ParameterName = 'subnetMask'; Type = 'String'; Mandatory = $false }
+            @{ParameterName = 'HostRootPassword'; Type = 'securestring'; Mandatory = $false }
         )
 
         It "<ParameterName> parameter is of <Type> type" -TestCases $ParameterTestCases {
@@ -40,7 +41,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
             @{ ParameterName = 'groupName' }
         )
 
-        it "<ParameterName> validates against null or empty values" -TestCases $StringTestCases {
+        It "<ParameterName> validates against null or empty values" -TestCases $StringTestCases {
             param($ParameterName)
             $attrs = (Get-Command $global:function).Parameters[$ParameterName].Attributes
             $attrs.Where{ $_ -is [ValidateNotNullOrEmpty] }.Count | Should -Be 1
@@ -52,11 +53,18 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
             @{ParameterName = 'subnetMask' }
         )
 
-        it "<ParameterName> validates string for a valid IP Address" -TestCases $IpAddrTestCases {
+        It "<ParameterName> validates string for a valid IP Address" -TestCases $IpAddrTestCases {
             param($ParameterName)
             $attrs = (Get-Command $global:function).Parameters[$ParameterName].Attributes
             $attrs.Where{ $_ -is [ValidateScript] }.Count | Should -Be 1
-            $attrs.Where{ $_ -is [ValidateScript] }.ScriptBlock | Should -Match '^\$_ \-match \[IPAddress\]\$_'
+            $attrs.Where{ $_ -is [ValidateScript] }.ScriptBlock | Should -Match '\$_ \-match \[IPAddress\]\$_'
+        }
+
+        It "Supports 'SupportsShouldProcess'" {
+            Get-Command $global:function | Should -HaveParameter WhatIf
+            Get-Command $global:function | Should -HaveParameter Confirm
+            (Get-Command $global:function).ScriptBlock | Should -Match 'SupportsShouldProcess'
+            (Get-Command $global:function).ScriptBlock | Should -Match '\$PSCmdlet\.ShouldProcess\(.+\)'
         }
     }
 
@@ -64,8 +72,8 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
         It "Returns a task id string" {
             $results = Edit-ZertoVra -vraIdentifier "MyVraIdentifier" -groupName "MyGroup"
-            $results | should not benullorempty
+            $results | Should not benullorempty
-            $results | should -BeOfType "String"
+            $results | Should -BeOfType "String"
             $results | Should -BeExactly "7e79035e-fb8c-47fe-815c-12ddd41708e6.3e4cdd0d-1064-4022-921f-6265ad6d335a"
         }
 
@@ -81,16 +89,14 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
             Edit-ZertoVra -vraIdentifier "DhcpVraIdentifier" -groupName "MyNewGroup" | Should -BeExactly "7e79035e-fb8c-47fe-815c-12ddd41708e6.3e4cdd0d-1064-4022-921f-6265ad6d335a"
         }
 
-        it "Supports 'SupportsShouldProcess'" {
+        It "Runs with root password provided" {
-            Get-Command $global:function | Should -HaveParameter WhatIf
+            $SecurePassword = 'NotARealPassword' | ConvertTo-SecureString -AsPlainText -Force
-            Get-Command $global:function | Should -HaveParameter Confirm
+            Edit-ZertoVra -vraIdentifier "PasswordVraIdentifier" -HostRootPassword $SecurePassword | Should -BeExactly "7e79035e-fb8c-47fe-815c-12ddd41708e6.3e4cdd0d-1064-4022-921f-6265ad6d335a"
-            (Get-Command $global:function).ScriptBlock | Should -Match 'SupportsShouldProcess'
-            (Get-Command $global:function).ScriptBlock | Should -Match '\$PSCmdlet\.ShouldProcess\(.+\)'
         }
 
     }
-    Assert-MockCalled -ModuleName ZertoApiWrapper -CommandName Invoke-ZertoRestRequest -Exactly 3
+    Assert-MockCalled -ModuleName ZertoApiWrapper -CommandName Invoke-ZertoRestRequest -Exactly 4
-    Assert-MockCalled -ModuleName ZertoApiWrapper -CommandName Get-ZertoVra -Exactly 4
+    Assert-MockCalled -ModuleName ZertoApiWrapper -CommandName Get-ZertoVra -Exactly 5
 }
 
 Remove-Variable -Name function -Scope Global

Tests/Public/Export-ZertoVmNicSetting.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
@@ -16,7 +16,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
             Get-Command $global:function | Should -HaveParameter $ParameterName -Mandatory:$Mandatory -Type $Type
         }
 
-        it "<ParameterName> has <Validation> validation set" -TestCases $ParameterTestCases {
+        It "<ParameterName> has <Validation> validation set" -TestCases $ParameterTestCases {
             param($ParameterName)
             $attrs = (Get-Command $global:function).Parameters[$ParameterName].Attributes
             $attrs.Where{ $_ -is [ValidateNotNullOrEmpty] }.Count | Should -Be 1

Tests/Public/Export-ZertoVpg.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
@@ -199,11 +199,11 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
         $outputPath = "TestDrive:"
 
-        it "Output path should exist" {
+        It "Output path should exist" {
             $outputPath | Should -Exist
         }
 
-        it "Exported JSON file should exist after function called" {
+        It "Exported JSON file should exist after function called" {
             $vpgName = "HRIS"
             Export-ZertoVpg -outputPath $outputPath -vpgName $vpgName
             $outputFile = "{0}\{1}.json" -f $outputPath, $vpgName
@@ -211,11 +211,11 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
             $outputFile | Should -Not -BeNullOrEmpty
         }
 
-        it "Only one file should be present in the TestDrive" {
+        It "Only one file should be present in the TestDrive" {
             (Get-ChildItem $outputPath).Count | Should -BeExactly 1
         }
 
-        it "Should be valid JSON" {
+        It "Should be valid JSON" {
             $vpgName = "HRIS"
             Export-ZertoVpg -outputPath $outputPath -vpgName $vpgName
             $outputFile = "{0}\{1}.json" -f $outputPath, $vpgName

Tests/Public/Get-ZAAlert.Tests.ps1

@@ -1,13 +1,13 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
     Context "$global:function::Parameter Unit Tests" {
 
-        it "$global:function should have exactly 14 parameters defined" {
+        It "$global:function should have exactly 14 parameters defined" {
-            (get-command $global:function).Parameters.Count | Should -Be 14
+            (Get-Command $global:function).Parameters.Count | Should -Be 14
         }
 
         $ParameterTestCases = @(
@@ -35,17 +35,17 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }
 
         It "LimitTo Parameter should have a Min value of 1" {
-            (Get-Command $global:function).Parameters['limitTo'].Attributes.Where{ $_ -is [ValidateRange] }.MinRange | Should Be 1
+            (Get-Command $global:function).Parameters['limitTo'].Attributes.Where{ $_ -is [ValidateRange] }.MinRange | Should -Be 1
         }
 
         It "LimitTo Parameter should have a Max value of 1000000" {
-            (Get-Command $global:function).Parameters['limitTo'].Attributes.Where{ $_ -is [ValidateRange] }.MaxRange | Should Be 1000000
+            (Get-Command $global:function).Parameters['limitTo'].Attributes.Where{ $_ -is [ValidateRange] }.MaxRange | Should -Be 1000000
         }
     }
 

Tests/Public/Get-ZADatastore.Tests.ps1

@@ -1,12 +1,12 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
     Context "$global:function::Parameter Unit Tests" {
-        it "$global:function should have exactly 14 parameters defined" {
+        It "$global:function should have exactly 14 parameters defined" {
-            (get-command $global:function).Parameters.Count | Should -Be 14
+            (Get-Command $global:function).Parameters.Count | Should -Be 14
         }
 
         $ParameterTestCases = @(
@@ -29,7 +29,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }

Tests/Public/Get-ZAEvent.Tests.ps1

@@ -1,13 +1,13 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
     Context "$global:function::Parameter Unit Tests" {
 
-        it "$global:function should have exactly 16 parameters defined" {
+        It "$global:function should have exactly 16 parameters defined" {
-            (get-command $global:function).Parameters.Count | Should -Be 16
+            (Get-Command $global:function).Parameters.Count | Should -Be 16
         }
 
         $ParameterTestCases = @(
@@ -42,21 +42,21 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }
 
         It "LimitTo Parameter should have a Min value of 1" {
-            (Get-Command $global:function).Parameters['limitTo'].Attributes.Where{ $_ -is [ValidateRange] }.MinRange | Should Be 1
+            (Get-Command $global:function).Parameters['limitTo'].Attributes.Where{ $_ -is [ValidateRange] }.MinRange | Should -Be 1
         }
 
         It "LimitTo Parameter should have a Max value of 1000000" {
-            (Get-Command $global:function).Parameters['limitTo'].Attributes.Where{ $_ -is [ValidateRange] }.MaxRange | Should Be 1000000
+            (Get-Command $global:function).Parameters['limitTo'].Attributes.Where{ $_ -is [ValidateRange] }.MaxRange | Should -Be 1000000
         }
 
         It "Category parameter should only have 2 options" {
-            (Get-Command $global:function).Parameters['category'].Attributes.Where{ $_ -is [ValidateSet] }.ValidValues.Count | Should Be 2
+            (Get-Command $global:function).Parameters['category'].Attributes.Where{ $_ -is [ValidateSet] }.ValidValues.Count | Should -Be 2
         }
 
         It "Category parameter should take 'events'" {

Tests/Public/Get-ZAJournalAverageHistory.Tests.ps1

@@ -1,13 +1,13 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
     Context "$global:function::Parameter Unit Tests" {
 
-        it "$global:function should have exactly 15 parameters defined" {
+        It "$global:function should have exactly 15 parameters defined" {
-            (get-command $global:function).Parameters.Count | Should -Be 15
+            (Get-Command $global:function).Parameters.Count | Should -Be 15
         }
 
         $ParameterTestCases = @(
@@ -36,17 +36,17 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }
 
         It "Interval Parameter should have a Min value of 60" {
-            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MinRange | Should Be 60
+            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MinRange | Should -Be 60
         }
 
         It "Interval Parameter should have a Max value of 2678400" {
-            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MaxRange | Should Be 2678400
+            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MaxRange | Should -Be 2678400
         }
     }
 

Tests/Public/Get-ZAJournalAverageSize.Tests.ps1

@@ -1,12 +1,12 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
     Context "$global:function::Parameter Unit Tests" {
-        it "$global:function should have exactly 15 parameters defined" {
+        It "$global:function should have exactly 15 parameters defined" {
-            (get-command $global:function).Parameters.Count | Should -Be 15
+            (Get-Command $global:function).Parameters.Count | Should -Be 15
         }
 
         $ParameterTestCases = @(
@@ -35,17 +35,17 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }
 
         It "Interval Parameter should have a Min value of 60" {
-            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MinRange | Should Be 60
+            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MinRange | Should -Be 60
         }
 
         It "Interval Parameter should have a Max value of 2678400" {
-            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MaxRange | Should Be 2678400
+            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MaxRange | Should -Be 2678400
         }
     }
 

Tests/Public/Get-ZAJournalBreach.Tests.ps1

@@ -1,12 +1,12 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
     Context "$global:function::Parameter Unit Tests" {
-        it "$global:function should have exactly 14 parameters defined" {
+        It "$global:function should have exactly 14 parameters defined" {
-            (get-command $global:function).Parameters.Count | Should -Be 14
+            (Get-Command $global:function).Parameters.Count | Should -Be 14
         }
 
         $ParameterTestCases = @(
@@ -29,7 +29,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }

Tests/Public/Get-ZAJournalHistoryStat.Tests.ps1

@@ -1,12 +1,12 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
     Context "$global:function::Parameter Unit Tests" {
-        it "$global:function should have exactly 14 parameters defined" {
+        It "$global:function should have exactly 14 parameters defined" {
-            (get-command $global:function).Parameters.Count | Should -Be 14
+            (Get-Command $global:function).Parameters.Count | Should -Be 14
         }
 
         $ParameterTestCases = @(
@@ -29,7 +29,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }

Tests/Public/Get-ZAJournalSiteAverageHistory.Tests.ps1

@@ -1,12 +1,12 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
     Context "$global:function::Parameter Unit Tests" {
-        it "$global:function should have exactly 15 parameters defined" {
+        It "$global:function should have exactly 15 parameters defined" {
-            (get-command $global:function).Parameters.Count | Should -Be 15
+            (Get-Command $global:function).Parameters.Count | Should -Be 15
         }
 
         $ParameterTestCases = @(
@@ -35,17 +35,17 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }
 
         It "Interval Parameter should have a Min value of 60" {
-            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MinRange | Should Be 60
+            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MinRange | Should -Be 60
         }
 
         It "Interval Parameter should have a Max value of 2678400" {
-            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MaxRange | Should Be 2678400
+            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MaxRange | Should -Be 2678400
         }
     }
 

Tests/Public/Get-ZAJournalSiteAverageSize.Tests.ps1

@@ -1,12 +1,12 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
     Context "$global:function::Parameter Unit Tests" {
-        it "$global:function should have exactly 15 parameters defined" {
+        It "$global:function should have exactly 15 parameters defined" {
-            (get-command $global:function).Parameters.Count | Should -Be 15
+            (Get-Command $global:function).Parameters.Count | Should -Be 15
         }
 
         $ParameterTestCases = @(
@@ -35,17 +35,17 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }
 
         It "Interval Parameter should have a Min value of 60" {
-            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MinRange | Should Be 60
+            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MinRange | Should -Be 60
         }
 
         It "Interval Parameter should have a Max value of 2678400" {
-            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MaxRange | Should Be 2678400
+            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MaxRange | Should -Be 2678400
         }
     }
 

Tests/Public/Get-ZAJournalSiteHistoryStat.Tests.ps1

@@ -1,12 +1,12 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
     Context "$global:function::Parameter Unit Tests" {
-        it "$global:function should have exactly 15 parameters defined" {
+        It "$global:function should have exactly 15 parameters defined" {
-            (get-command $global:function).Parameters.Count | Should -Be 15
+            (Get-Command $global:function).Parameters.Count | Should -Be 15
         }
 
         $ParameterTestCases = @(
@@ -35,17 +35,17 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }
 
         It "Interval Parameter should have a Min value of 60" {
-            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MinRange | Should Be 60
+            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MinRange | Should -Be 60
         }
 
         It "Interval Parameter should have a Max value of 2678400" {
-            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MaxRange | Should Be 2678400
+            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MaxRange | Should -Be 2678400
         }
     }
 

Tests/Public/Get-ZAJournalSiteHistorySummary.Tests.ps1

@@ -1,12 +1,12 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
     Context "$global:function::Parameter Unit Tests" {
-        it "$global:function should have exactly 15 parameters defined" {
+        It "$global:function should have exactly 15 parameters defined" {
-            (get-command $global:function).Parameters.Count | Should -Be 15
+            (Get-Command $global:function).Parameters.Count | Should -Be 15
         }
 
         $ParameterTestCases = @(
@@ -35,17 +35,17 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }
 
         It "Interval Parameter should have a Min value of 60" {
-            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MinRange | Should Be 60
+            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MinRange | Should -Be 60
         }
 
         It "Interval Parameter should have a Max value of 2678400" {
-            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MaxRange | Should Be 2678400
+            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MaxRange | Should -Be 2678400
         }
     }
 

Tests/Public/Get-ZAJournalSiteSizeStat.Tests.ps1

@@ -1,12 +1,12 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
     Context "$global:function::Parameter Unit Tests" {
-        it "$global:function should have exactly 15 parameters defined" {
+        It "$global:function should have exactly 15 parameters defined" {
-            (get-command $global:function).Parameters.Count | Should -Be 15
+            (Get-Command $global:function).Parameters.Count | Should -Be 15
         }
 
         $ParameterTestCases = @(
@@ -35,17 +35,17 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }
 
         It "Interval Parameter should have a Min value of 60" {
-            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MinRange | Should Be 60
+            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MinRange | Should -Be 60
         }
 
         It "Interval Parameter should have a Max value of 2678400" {
-            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MaxRange | Should Be 2678400
+            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MaxRange | Should -Be 2678400
         }
     }
 

Tests/Public/Get-ZAJournalStatusProportion.Tests.ps1

@@ -1,12 +1,12 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
     Context "$global:function::Parameter Unit Tests" {
-        it "$global:function should have exactly 14 parameters defined" {
+        It "$global:function should have exactly 14 parameters defined" {
-            (get-command $global:function).Parameters.Count | Should -Be 14
+            (Get-Command $global:function).Parameters.Count | Should -Be 14
         }
 
         $ParameterTestCases = @(
@@ -29,7 +29,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }

Tests/Public/Get-ZAJournalStorageStat.Tests.ps1

@@ -1,12 +1,12 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
     Context "$global:function::Parameter Unit Tests" {
-        it "$global:function should have exactly 14 parameters defined" {
+        It "$global:function should have exactly 14 parameters defined" {
-            (get-command $global:function).Parameters.Count | Should -Be 14
+            (Get-Command $global:function).Parameters.Count | Should -Be 14
         }
 
         $ParameterTestCases = @(
@@ -29,7 +29,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }

Tests/Public/Get-ZAJournalSummary.Tests.ps1

@@ -1,12 +1,12 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
     Context "$global:function::Parameter Unit Tests" {
-        it "$global:function should have exactly 14 parameters defined" {
+        It "$global:function should have exactly 14 parameters defined" {
-            (get-command $global:function).Parameters.Count | Should -Be 14
+            (Get-Command $global:function).Parameters.Count | Should -Be 14
         }
 
         $ParameterTestCases = @(
@@ -29,7 +29,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }

Tests/Public/Get-ZALicense.Tests.ps1

@@ -1,12 +1,12 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
     Context "$global:function::Parameter Unit Tests" {
-        it "$global:function should have exactly 11 parameters defined" {
+        It "$global:function should have exactly 11 parameters defined" {
-            (get-command $global:function).Parameters.Count | Should -Be 11
+            (Get-Command $global:function).Parameters.Count | Should -Be 11
         }
     }
 

Tests/Public/Get-ZAMonitoring.Tests.ps1

@@ -1,15 +1,15 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
     Context "$global:function::Parameter Unit Tests" {
-        it "$global:function should have exactly 12 parameters defined" {
+        It "$global:function should have exactly 12 parameters defined" {
-            (get-command $global:function).Parameters.Count | Should -Be 12
+            (Get-Command $global:function).Parameters.Count | Should -Be 12
         }
 
-        it "$global:function has a non-mandatory string parameter for the zOrgIdentifier" {
+        It "$global:function has a non-mandatory string parameter for the zOrgIdentifier" {
             Get-Command $global:function | Should -HaveParameter zOrgIdentifier -Type String
             Get-Command $global:function | Should -HaveParameter zOrgIdentifier -not -Mandatory
         }

Tests/Public/Get-ZANetworkSiteAverageIOPS.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
@@ -37,17 +37,17 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | Should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }
 
         It "Interval Parameter should have a Min value of 60" {
-            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MinRange | Should Be 60
+            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MinRange | Should -Be 60
         }
 
         It "Interval Parameter should have a Max value of 2678400" {
-            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MaxRange | Should Be 2678400
+            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MaxRange | Should -Be 2678400
         }
     }
 

Tests/Public/Get-ZANetworkSiteAveragePerformance.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
@@ -37,17 +37,17 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | Should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }
 
         It "Interval Parameter should have a Min value of 60" {
-            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MinRange | Should Be 60
+            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MinRange | Should -Be 60
         }
 
         It "Interval Parameter should have a Max value of 2678400" {
-            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MaxRange | Should Be 2678400
+            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MaxRange | Should -Be 2678400
         }
     }
 

Tests/Public/Get-ZANetworkSiteStat.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
@@ -36,7 +36,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | Should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }

Tests/Public/Get-ZANetworkSiteSummary.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
@@ -36,7 +36,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | Should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }

Tests/Public/Get-ZANetworkVpgAverageIOPS.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
@@ -35,17 +35,17 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | Should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }
 
         It "Interval Parameter should have a Min value of 60" {
-            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MinRange | Should Be 60
+            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MinRange | Should -Be 60
         }
 
         It "Interval Parameter should have a Max value of 2678400" {
-            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MaxRange | Should Be 2678400
+            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MaxRange | Should -Be 2678400
         }
     }
 

Tests/Public/Get-ZANetworkVpgAveragePerformance.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
@@ -35,17 +35,17 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | Should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }
 
         It "Interval Parameter should have a Min value of 60" {
-            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MinRange | Should Be 60
+            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MinRange | Should -Be 60
         }
 
         It "Interval Parameter should have a Max value of 2678400" {
-            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MaxRange | Should Be 2678400
+            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MaxRange | Should -Be 2678400
         }
     }
 

Tests/Public/Get-ZANetworkVpgStat.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
@@ -34,7 +34,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | Should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }

Tests/Public/Get-ZANetworkVpgSummary.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
@@ -34,7 +34,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | Should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }

Tests/Public/Get-ZAPlannerJournalSizeReport.Tests.ps1

@@ -0,0 +1,57 @@
+#Requires -Modules Pester
+$global:here = (Split-Path -Parent $PSCommandPath)
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
+
+Describe $global:function -Tag 'Unit', 'Source', 'Built' {
+
+    Context "$global:function::Parameter Unit Tests" {
+        It "$global:function should have exactly 17 parameters defined" {
+            (Get-Command $global:function).Parameters.Count | Should -Be 17
+        }
+
+        $ParameterTestCases = @(
+            @{ParameterName = 'siteIdentifier'; Type = 'String'; Mandatory = $true; Validation = 'NotNullOrEmpty' }
+            @{ParameterName = 'vmIdentifier'; Type = 'String[]'; Mandatory = $true; Validation = 'NotNullOrEmpty' }
+            @{ParameterName = 'recoveryType'; Type = 'String'; Mandatory = $true; Validation = 'Set' }
+            @{ParameterName = 'desiredJournalHistory'; Type = 'Int'; Mandatory = $false; Validation = 'Range' }
+            @{ParameterName = 'startDate'; Type = 'String'; Mandatory = $false; Validation = 'NotNullOrEmpty' }
+            @{ParameterName = 'endDate'; Type = 'String'; Mandatory = $false; Validation = 'NotNullOrEmpty' }
+        )
+
+        It "<ParameterName> parameter is of <Type> type" -TestCases $ParameterTestCases {
+            param($ParameterName, $Type, $Mandatory, $Validation)
+            Get-Command $global:function | Should -HaveParameter $ParameterName -Mandatory:$Mandatory -Type $Type
+        }
+
+        It "<ParameterName> parameter has correct validation setting"  -TestCases $ParameterTestCases {
+            param($ParameterName, $Validation)
+            Switch ($Validation) {
+                'NotNullOrEmpty' {
+                    $attrs = (Get-Command $global:function).Parameters[$ParameterName].Attributes
+                    $attrs.Where{ $_ -is [ValidateNotNullOrEmpty] }.Count | Should -Be 1
+                }
+
+                'Range' {
+                    $attrs = (Get-Command $global:function).Parameters[$ParameterName].Attributes
+                    $attrs.Where{ $_ -is [ValidateRange] }.Count | Should -Be 1
+                }
+
+                'Set' {
+                    $attrs = (Get-Command $global:function).Parameters[$ParameterName].Attributes
+                    $attrs.Where{ $_ -is [ValidateSet] }.Count | Should -Be 1
+                }
+
+                default {
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
+                }
+            }
+        }
+    }
+
+    Context "$global:function::Parameter Functional Tests" {
+
+    }
+}
+
+Remove-Variable -Name here -Scope Global
+Remove-Variable -Name function -Scope Global

Tests/Public/Get-ZAPlannerNetworkPerformanceReport.Tests.ps1

@@ -0,0 +1,57 @@
+#Requires -Modules Pester
+$global:here = (Split-Path -Parent $PSCommandPath)
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
+
+Describe $global:function -Tag 'Unit', 'Source', 'Built' {
+
+    Context "$global:function::Parameter Unit Tests" {
+        It "$global:function should have exactly 17 parameters defined" {
+            (Get-Command $global:function).Parameters.Count | Should -Be 17
+        }
+
+        $ParameterTestCases = @(
+            @{ParameterName = 'siteIdentifier'; Type = 'String'; Mandatory = $true; Validation = 'NotNullOrEmpty' }
+            @{ParameterName = 'vmIdentifier'; Type = 'String[]'; Mandatory = $true; Validation = 'NotNullOrEmpty' }
+            @{ParameterName = 'recoveryType'; Type = 'String'; Mandatory = $true; Validation = 'Set' }
+            @{ParameterName = 'interval'; Type = 'Int'; Mandatory = $false; Validation = 'Range' }
+            @{ParameterName = 'startDate'; Type = 'String'; Mandatory = $false; Validation = 'NotNullOrEmpty' }
+            @{ParameterName = 'endDate'; Type = 'String'; Mandatory = $false; Validation = 'NotNullOrEmpty' }
+        )
+
+        It "<ParameterName> parameter is of <Type> type" -TestCases $ParameterTestCases {
+            param($ParameterName, $Type, $Mandatory, $Validation)
+            Get-Command $global:function | Should -HaveParameter $ParameterName -Mandatory:$Mandatory -Type $Type
+        }
+
+        It "<ParameterName> parameter has correct validation setting"  -TestCases $ParameterTestCases {
+            param($ParameterName, $Validation)
+            Switch ($Validation) {
+                'NotNullOrEmpty' {
+                    $attrs = (Get-Command $global:function).Parameters[$ParameterName].Attributes
+                    $attrs.Where{ $_ -is [ValidateNotNullOrEmpty] }.Count | Should -Be 1
+                }
+
+                'Range' {
+                    $attrs = (Get-Command $global:function).Parameters[$ParameterName].Attributes
+                    $attrs.Where{ $_ -is [ValidateRange] }.Count | Should -Be 1
+                }
+
+                'Set' {
+                    $attrs = (Get-Command $global:function).Parameters[$ParameterName].Attributes
+                    $attrs.Where{ $_ -is [ValidateSet] }.Count | Should -Be 1
+                }
+
+                default {
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
+                }
+            }
+        }
+    }
+
+    Context "$global:function::Parameter Functional Tests" {
+
+    }
+}
+
+Remove-Variable -Name here -Scope Global
+Remove-Variable -Name function -Scope Global

Tests/Public/Get-ZAPlannerSite.Tests.ps1

@@ -0,0 +1,42 @@
+#Requires -Modules Pester
+$global:here = (Split-Path -Parent $PSCommandPath)
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
+
+Describe $global:function -Tag 'Unit', 'Source', 'Built' {
+
+    Context "$global:function::Parameter Unit Tests" {
+        It "$global:function should have exactly 12 parameters defined" {
+            (Get-Command $global:function).Parameters.Count | Should -Be 12
+        }
+
+        $ParameterTestCases = @(
+            @{ParameterName = 'siteIdentifier'; Type = 'String[]'; Mandatory = $false; Validation = 'NotNullOrEmpty' }
+        )
+
+        It "<ParameterName> parameter is of <Type> type" -TestCases $ParameterTestCases {
+            param($ParameterName, $Type, $Mandatory, $Validation)
+            Get-Command $global:function | Should -HaveParameter $ParameterName -Mandatory:$Mandatory -Type $Type
+        }
+
+        It "<ParameterName> parameter has correct validation setting"  -TestCases $ParameterTestCases {
+            param($ParameterName, $Validation)
+            Switch ($Validation) {
+                'NotNullOrEmpty' {
+                    $attrs = (Get-Command $global:function).Parameters[$ParameterName].Attributes
+                    $attrs.Where{ $_ -is [ValidateNotNullOrEmpty] }.Count | Should -Be 1
+                }
+
+                default {
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
+                }
+            }
+        }
+    }
+
+    Context "$global:function::Parameter Functional Tests" {
+
+    }
+}
+
+Remove-Variable -Name here -Scope Global
+Remove-Variable -Name function -Scope Global

Tests/Public/Get-ZAPlannerStatsReport.Tests.ps1

@@ -0,0 +1,57 @@
+#Requires -Modules Pester
+$global:here = (Split-Path -Parent $PSCommandPath)
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
+
+Describe $global:function -Tag 'Unit', 'Source', 'Built' {
+
+    Context "$global:function::Parameter Unit Tests" {
+        It "$global:function should have exactly 17 parameters defined" {
+            (Get-Command $global:function).Parameters.Count | Should -Be 17
+        }
+
+        $ParameterTestCases = @(
+            @{ParameterName = 'siteIdentifier'; Type = 'String'; Mandatory = $true; Validation = 'NotNullOrEmpty' }
+            @{ParameterName = 'vmIdentifier'; Type = 'String[]'; Mandatory = $true; Validation = 'NotNullOrEmpty' }
+            @{ParameterName = 'recoveryType'; Type = 'String'; Mandatory = $true; Validation = 'Set' }
+            @{ParameterName = 'desiredJournalHistory'; Type = 'Int'; Mandatory = $false; Validation = 'Range' }
+            @{ParameterName = 'startDate'; Type = 'String'; Mandatory = $false; Validation = 'NotNullOrEmpty' }
+            @{ParameterName = 'endDate'; Type = 'String'; Mandatory = $false; Validation = 'NotNullOrEmpty' }
+        )
+
+        It "<ParameterName> parameter is of <Type> type" -TestCases $ParameterTestCases {
+            param($ParameterName, $Type, $Mandatory, $Validation)
+            Get-Command $global:function | Should -HaveParameter $ParameterName -Mandatory:$Mandatory -Type $Type
+        }
+
+        It "<ParameterName> parameter has correct validation setting"  -TestCases $ParameterTestCases {
+            param($ParameterName, $Validation)
+            Switch ($Validation) {
+                'NotNullOrEmpty' {
+                    $attrs = (Get-Command $global:function).Parameters[$ParameterName].Attributes
+                    $attrs.Where{ $_ -is [ValidateNotNullOrEmpty] }.Count | Should -Be 1
+                }
+
+                'Range' {
+                    $attrs = (Get-Command $global:function).Parameters[$ParameterName].Attributes
+                    $attrs.Where{ $_ -is [ValidateRange] }.Count | Should -Be 1
+                }
+
+                'Set' {
+                    $attrs = (Get-Command $global:function).Parameters[$ParameterName].Attributes
+                    $attrs.Where{ $_ -is [ValidateSet] }.Count | Should -Be 1
+                }
+
+                default {
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
+                }
+            }
+        }
+    }
+
+    Context "$global:function::Parameter Functional Tests" {
+
+    }
+}
+
+Remove-Variable -Name here -Scope Global
+Remove-Variable -Name function -Scope Global

Tests/Public/Get-ZAPlannerWanReport.Tests.ps1

@@ -0,0 +1,56 @@
+#Requires -Modules Pester
+$global:here = (Split-Path -Parent $PSCommandPath)
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
+
+Describe $global:function -Tag 'Unit', 'Source', 'Built' {
+
+    Context "$global:function::Parameter Unit Tests" {
+        It "$global:function should have exactly 14 parameters defined" {
+            (Get-Command $global:function).Parameters.Count | Should -Be 16
+        }
+
+        $ParameterTestCases = @(
+            @{ParameterName = 'siteIdentifier'; Type = 'String'; Mandatory = $true; Validation = 'NotNullOrEmpty' }
+            @{ParameterName = 'vmIdentifier'; Type = 'String[]'; Mandatory = $true; Validation = 'NotNullOrEmpty' }
+            @{ParameterName = 'recoveryType'; Type = 'String'; Mandatory = $true; Validation = 'Set' }
+            @{ParameterName = 'startDate'; Type = 'String'; Mandatory = $false; Validation = 'NotNullOrEmpty' }
+            @{ParameterName = 'endDate'; Type = 'String'; Mandatory = $false; Validation = 'NotNullOrEmpty' }
+        )
+
+        It "<ParameterName> parameter is of <Type> type" -TestCases $ParameterTestCases {
+            param($ParameterName, $Type, $Mandatory, $Validation)
+            Get-Command $global:function | Should -HaveParameter $ParameterName -Mandatory:$Mandatory -Type $Type
+        }
+
+        It "<ParameterName> parameter has correct validation setting"  -TestCases $ParameterTestCases {
+            param($ParameterName, $Validation)
+            Switch ($Validation) {
+                'NotNullOrEmpty' {
+                    $attrs = (Get-Command $global:function).Parameters[$ParameterName].Attributes
+                    $attrs.Where{ $_ -is [ValidateNotNullOrEmpty] }.Count | Should -Be 1
+                }
+
+                'Range' {
+                    $attrs = (Get-Command $global:function).Parameters[$ParameterName].Attributes
+                    $attrs.Where{ $_ -is [ValidateRange] }.Count | Should -Be 1
+                }
+
+                'Set' {
+                    $attrs = (Get-Command $global:function).Parameters[$ParameterName].Attributes
+                    $attrs.Where{ $_ -is [ValidateSet] }.Count | Should -Be 1
+                }
+
+                default {
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
+                }
+            }
+        }
+    }
+
+    Context "$global:function::Parameter Functional Tests" {
+
+    }
+}
+
+Remove-Variable -Name here -Scope Global
+Remove-Variable -Name function -Scope Global

Tests/Public/Get-ZAPlannerZcasReport.Tests.ps1

@@ -0,0 +1,56 @@
+#Requires -Modules Pester
+$global:here = (Split-Path -Parent $PSCommandPath)
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
+
+Describe $global:function -Tag 'Unit', 'Source', 'Built' {
+
+    Context "$global:function::Parameter Unit Tests" {
+        It "$global:function should have exactly 16 parameters defined" {
+            (Get-Command $global:function).Parameters.Count | Should -Be 16
+        }
+
+        $ParameterTestCases = @(
+            @{ParameterName = 'siteIdentifier'; Type = 'String'; Mandatory = $true; Validation = 'NotNullOrEmpty' }
+            @{ParameterName = 'vmIdentifier'; Type = 'String[]'; Mandatory = $true; Validation = 'NotNullOrEmpty' }
+            @{ParameterName = 'recoveryType'; Type = 'String'; Mandatory = $true; Validation = 'Set' }
+            @{ParameterName = 'startDate'; Type = 'String'; Mandatory = $false; Validation = 'NotNullOrEmpty' }
+            @{ParameterName = 'endDate'; Type = 'String'; Mandatory = $false; Validation = 'NotNullOrEmpty' }
+        )
+
+        It "<ParameterName> parameter is of <Type> type" -TestCases $ParameterTestCases {
+            param($ParameterName, $Type, $Mandatory, $Validation)
+            Get-Command $global:function | Should -HaveParameter $ParameterName -Mandatory:$Mandatory -Type $Type
+        }
+
+        It "<ParameterName> parameter has correct validation setting"  -TestCases $ParameterTestCases {
+            param($ParameterName, $Validation)
+            Switch ($Validation) {
+                'NotNullOrEmpty' {
+                    $attrs = (Get-Command $global:function).Parameters[$ParameterName].Attributes
+                    $attrs.Where{ $_ -is [ValidateNotNullOrEmpty] }.Count | Should -Be 1
+                }
+
+                'Range' {
+                    $attrs = (Get-Command $global:function).Parameters[$ParameterName].Attributes
+                    $attrs.Where{ $_ -is [ValidateRange] }.Count | Should -Be 1
+                }
+
+                'Set' {
+                    $attrs = (Get-Command $global:function).Parameters[$ParameterName].Attributes
+                    $attrs.Where{ $_ -is [ValidateSet] }.Count | Should -Be 1
+                }
+
+                default {
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
+                }
+            }
+        }
+    }
+
+    Context "$global:function::Parameter Functional Tests" {
+
+    }
+}
+
+Remove-Variable -Name here -Scope Global
+Remove-Variable -Name function -Scope Global

Tests/Public/Get-ZAProtectedVm.Tests.ps1

@@ -0,0 +1,41 @@
+#Requires -Modules Pester
+$global:here = (Split-Path -Parent $PSCommandPath)
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
+
+Describe $global:function -Tag 'Unit', 'Source', 'Built' {
+
+    Context "$global:function::Parameter Unit Tests" {
+        It "$global:function should have exactly 14 parameters defined" {
+            (Get-Command $global:function).Parameters.Count | Should -Be 14
+        }
+
+        $ParameterTestCases = @(
+            @{ParameterName = 'AllVms'; Type = 'Switch'; Mandatory = $false; Validation = $Null }
+            @{ParameterName = 'vmIdentifier'; Type = 'String[]'; Mandatory = $true; Validation = 'NotNullOrEmpty' }
+            @{ParameterName = 'Volumes'; Type = 'Switch'; Mandatory = $false; Validation = $Null }
+        )
+
+        It "<ParameterName> parameter is of <Type> type" -TestCases $ParameterTestCases {
+            param($ParameterName, $Type, $Mandatory, $Validation)
+            Get-Command $global:function | Should -HaveParameter $ParameterName -Mandatory:$Mandatory -Type $Type
+        }
+
+        It "<ParameterName> parameter has correct validation setting"  -TestCases $ParameterTestCases {
+            param($ParameterName, $Validation)
+            Switch ($Validation) {
+                'NotNullOrEmpty' {
+                    $attrs = (Get-Command $global:function).Parameters[$ParameterName].Attributes
+                    $attrs.Where{ $_ -is [ValidateNotNullOrEmpty] }.Count | Should -Be 1
+                }
+
+            }
+        }
+    }
+
+    Context "$global:function::Parameter Functional Tests" {
+
+    }
+}
+
+Remove-Variable -Name here -Scope Global
+Remove-Variable -Name function -Scope Global

Tests/Public/Get-ZAProtectedVmReport.Tests.ps1

@@ -0,0 +1,39 @@
+#Requires -Modules Pester
+$global:here = (Split-Path -Parent $PSCommandPath)
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
+
+Describe $global:function -Tag 'Unit', 'Source', 'Built' {
+
+    Context "$global:function::Parameter Unit Tests" {
+        It "$global:function should have exactly 12 parameters defined" {
+            (Get-Command $global:function).Parameters.Count | Should -Be 12
+        }
+
+        $ParameterTestCases = @(
+            @{ParameterName = 'vmIdentifier'; Type = 'String[]'; Mandatory = $true; Validation = 'NotNullOrEmpty' }
+        )
+
+        It "<ParameterName> parameter is of <Type> type" -TestCases $ParameterTestCases {
+            param($ParameterName, $Type, $Mandatory, $Validation)
+            Get-Command $global:function | Should -HaveParameter $ParameterName -Mandatory:$Mandatory -Type $Type
+        }
+
+        It "<ParameterName> parameter has correct validation setting"  -TestCases $ParameterTestCases {
+            param($ParameterName, $Validation)
+            Switch ($Validation) {
+                'NotNullOrEmpty' {
+                    $attrs = (Get-Command $global:function).Parameters[$ParameterName].Attributes
+                    $attrs.Where{ $_ -is [ValidateNotNullOrEmpty] }.Count | Should -Be 1
+                }
+
+            }
+        }
+    }
+
+    Context "$global:function::Parameter Functional Tests" {
+
+    }
+}
+
+Remove-Variable -Name here -Scope Global
+Remove-Variable -Name function -Scope Global

Tests/Public/Get-ZARPOAccountAverage.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
@@ -29,7 +29,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | Should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }

Tests/Public/Get-ZARPOAverage.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
@@ -35,17 +35,17 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | Should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }
 
         It "Interval Parameter should have a Min value of 60" {
-            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MinRange | Should Be 60
+            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MinRange | Should -Be 60
         }
 
         It "Interval Parameter should have a Max value of 2678400" {
-            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MaxRange | Should Be 2678400
+            (Get-Command $global:function).Parameters['Interval'].Attributes.Where{ $_ -is [ValidateRange] }.MaxRange | Should -Be 2678400
         }
     }
 

Tests/Public/Get-ZARPOBreach.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
@@ -29,7 +29,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | Should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }

Tests/Public/Get-ZARPOStat.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
@@ -29,7 +29,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | Should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }

Tests/Public/Get-ZARPOStatusProportion.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
@@ -29,7 +29,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | Should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }

Tests/Public/Get-ZARPOSummary.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
@@ -29,7 +29,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | Should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }

Tests/Public/Get-ZASite.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
@@ -14,7 +14,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
         }
 
         It "zOrgIdentifier has the NotNullOrEmpty Validator" {
-            (Get-Command $global:function).Parameters['zOrgIdentifier'].Attributes.Where{ $_ -is [ValidateNotNullOrEmpty] }.Count | Should Be 1
+            (Get-Command $global:function).Parameters['zOrgIdentifier'].Attributes.Where{ $_ -is [ValidateNotNullOrEmpty] }.Count | Should -Be 1
         }
 
     }

Tests/Public/Get-ZASitePair.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
@@ -29,7 +29,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | Should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }

Tests/Public/Get-ZASiteTopology.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
@@ -27,7 +27,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | Should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }

Tests/Public/Get-ZATask.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
@@ -34,17 +34,17 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | Should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }
 
         It "Interval Parameter should have a Min value of 1" {
-            (Get-Command $global:function).Parameters['limitTo'].Attributes.Where{ $_ -is [ValidateRange] }.MinRange | Should Be 1
+            (Get-Command $global:function).Parameters['limitTo'].Attributes.Where{ $_ -is [ValidateRange] }.MinRange | Should -Be 1
         }
 
         It "Interval Parameter should have a Max value of 1000000" {
-            (Get-Command $global:function).Parameters['limitTo'].Attributes.Where{ $_ -is [ValidateRange] }.MaxRange | Should Be 1000000
+            (Get-Command $global:function).Parameters['limitTo'].Attributes.Where{ $_ -is [ValidateRange] }.MaxRange | Should -Be 1000000
         }
     }
 

Tests/Public/Get-ZAVolume.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
@@ -30,7 +30,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | Should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }

Tests/Public/Get-ZAVpg.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
@@ -28,7 +28,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | Should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }

Tests/Public/Get-ZAzOrg.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 

Tests/Public/Get-ZertoAlert.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 

Tests/Public/Get-ZertoAzureResource.Tests.ps1

@@ -0,0 +1,56 @@
+#Requires -Modules Pester
+$global:here = (Split-Path -Parent $PSCommandPath)
+$global:function = ((Split-Path -Leaf $PSCommandPath).Split('.'))[0]
+
+Describe $global:function -Tag 'Unit', 'Source', 'Built' {
+    BeforeAll {
+        $script:ScriptBlock = (Get-Command $global:function).ScriptBlock
+    }
+
+    Context "$global:function::Parameter Unit Tests" {
+
+        It "$global:function should have exactly 17 parameters defined" {
+            (Get-Command $global:function).Parameters.Count | Should -Be 17
+        }
+
+        $ParameterTestCases = @(
+            @{ParameterName = 'siteName'; Type = 'String'; Mandatory = $true; Validation = 'NotNullOrEmpty' }
+            @{ParameterName = 'SiteIdentifier'; Type = 'String'; Mandatory = $true; Validation = 'NotNullOrEmpty' }
+            @{ParameterName = 'SecurityGroup'; Type = 'Switch'; Mandatory = $true; Validation = 'None' }
+            @{ParameterName = 'Subnet'; Type = 'Switch'; Mandatory = $true; Validation = 'None' }
+            @{ParameterName = 'Network'; Type = 'Switch'; Mandatory = $true; Validation = 'None' }
+            @{ParameterName = 'VmInstanceType'; Type = 'Switch'; Mandatory = $true; Validation = 'None' }
+
+        )
+
+        It "<ParameterName> parameter is of <Type> type" -TestCases $ParameterTestCases {
+            param($ParameterName, $Type, $Mandatory, $Validation)
+            Get-Command $global:function | Should -HaveParameter $ParameterName -Mandatory:$Mandatory -Type $Type
+        }
+
+        It "<ParameterName> parameter has correct validation setting"  -TestCases $ParameterTestCases {
+            param($ParameterName, $Validation)
+            Switch ($Validation) {
+                'None' {
+                    $attrs = (Get-Command $global:function).Parameters[$ParameterName].Attributes
+                    $attrs.Count | Should -Be 3
+                }
+
+                'NotNullOrEmpty' {
+                    $attrs = (Get-Command $global:function).Parameters[$ParameterName].Attributes
+                    $attrs.Where{ $_ -is [ValidateNotNullOrEmpty] }.Count | Should -Be 1
+                }
+
+                default {
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
+                }
+            }
+        }
+    }
+
+    Context "$global:function::Functional Unit Tests" {
+
+    }
+}
+Remove-Variable -Name here -Scope Global
+Remove-Variable -Name function -Scope Global

Tests/Public/Get-ZertoDatastore.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
@@ -12,7 +12,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
         }
 
         It "datastoreIdentifier parameter does not take null or empty values" {
-            (Get-Command $global:function).Parameters['datastoreIdentifier'].Attributes.Where{ $_ -is [ValidateNotNullOrEmpty] }.count | Should Be 1
+            (Get-Command $global:function).Parameters['datastoreIdentifier'].Attributes.Where{ $_ -is [ValidateNotNullOrEmpty] }.count | Should -Be 1
         }
     }
 

Tests/Public/Get-ZertoEvent.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -Leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
@@ -53,13 +53,13 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | Should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }
 
         It "entityType parameter only accecpts 4 different values" {
-            (Get-Command $global:function).Parameters['entityType'].Attributes.Where{ $_ -is [ValidateSet] }.ValidValues.Count | Should be 4
+            (Get-Command $global:function).Parameters['entityType'].Attributes.Where{ $_ -is [ValidateSet] }.ValidValues.Count | Should -Be 4
         }
 
         It "entityType parameter accecpts 'VPG' as a Value" {
@@ -79,7 +79,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
         }
 
         It "category parameter only accecpts 3 different values" {
-            (Get-Command $global:function).Parameters['category'].Attributes.Where{ $_ -is [ValidateSet] }.ValidValues.Count | Should be 3
+            (Get-Command $global:function).Parameters['category'].Attributes.Where{ $_ -is [ValidateSet] }.ValidValues.Count | Should -Be 3
         }
 
         It "category parameter accecpts 'All' as a Value" {
@@ -95,7 +95,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
         }
 
         It "eventCategory parameter only accecpts 3 different values" {
-            (Get-Command $global:function).Parameters['eventCategory'].Attributes.Where{ $_ -is [ValidateSet] }.ValidValues.Count | Should be 3
+            (Get-Command $global:function).Parameters['eventCategory'].Attributes.Where{ $_ -is [ValidateSet] }.ValidValues.Count | Should -Be 3
         }
 
         It "eventCategory parameter accecpts 'All' as a Value" {

Tests/Public/Get-ZertoLicense.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 

Tests/Public/Get-ZertoLocalSite.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 

Tests/Public/Get-ZertoPeerSite.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
@@ -38,7 +38,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | Should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }

Tests/Public/Get-ZertoProtectedVm.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 

Tests/Public/Get-ZertoRecoveryReport.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 

Tests/Public/Get-ZertoResourcesReport.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 

Tests/Public/Get-ZertoServiceProfile.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 

Tests/Public/Get-ZertoTask.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 

Tests/Public/Get-ZertoUnprotectedVm.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 

Tests/Public/Get-ZertoVirtualizationSite.Tests.ps1

@@ -1,15 +1,259 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
+    BeforeAll {
+        $script:ScriptBlock = (Get-Command $global:function).ScriptBlock
+    }
 
     Context "$global:function::Parameter Unit Tests" {
+        It "$global:function should have exactly 23 parameters defined" {
+            (Get-Command $global:function).Parameters.Count | Should -Be 23
+        }
+
+        $ParameterTestCases = @(
+            @{ParameterName = 'siteIdentifier'; Type = 'String'; Mandatory = $true; Validation = 'NotNullOrEmpty' }
+            @{ParameterName = 'hostIdentifier'; Type = 'String'; Mandatory = $false; Validation = 'NotNullOrEmpty' }
+            @{ParameterName = 'folders'; Type = 'Switch'; Mandatory = $true; Validation = $Null }
+            @{ParameterName = 'hostClusters'; Type = 'Switch'; Mandatory = $true; Validation = $Null }
+            @{ParameterName = 'hosts'; Type = 'Switch'; Mandatory = $true; Validation = $Null }
+            @{ParameterName = 'networks'; Type = 'Switch'; Mandatory = $true; Validation = $Null }
+            @{ParameterName = 'resourcePools'; Type = 'Switch'; Mandatory = $true; Validation = $Null }
+            @{ParameterName = 'vms'; Type = 'Switch'; Mandatory = $true; Validation = $Null }
+            @{ParameterName = 'repositories'; Type = 'Switch'; Mandatory = $true; Validation = $Null }
+        )
+
+        It "<ParameterName> parameter is of <Type> type" -TestCases $ParameterTestCases {
+            param($ParameterName, $Type, $Mandatory)
+            Get-Command $global:function | Should -HaveParameter $ParameterName -Mandatory:$Mandatory -Type $Type
+        }
+
+        It "<ParameterName> parameter has correct validation setting of <Validation>"  -TestCases $ParameterTestCases {
+            param($ParameterName, $Type, $Validation)
+            $attrs = (Get-Command $global:function).Parameters[$ParameterName].Attributes
+            Switch ($Validation) {
+
+                'NotNullOrEmpty' {
+                    $attrs.Where{ $_ -is [ValidateNotNullOrEmpty] }.Count | Should -Be 1
+                }
+
+                $Null {
+                    $Type -match 'Switch' | Should -BeTrue -Because "Only Switch Parameters should not have validation"
+                }
+
+                default {
+                    $true | Should -BeFalse -Because "No Validation Selected. Review test cases"
+                }
+
+            }
+        }
+
+        It "$($global:function) does not have 'SupportsShouldProcess'" {
+            Get-Command $global:function | Should -not -HaveParameter WhatIf
+            Get-Command $global:function | Should -not -HaveParameter Confirm
+            $script:ScriptBlock | Should -not -match 'SupportsShouldProcess'
+            $script:ScriptBlock | Should -not -match '\$PSCmdlet\.ShouldProcess\(.+\)'
+        }
 
     }
 
     Context "$global:function::Parameter Functional Tests" {
+        Mock -ModuleName ZertoApiWrapper -CommandName Invoke-ZertoRestRequest -ParameterFilter {
+            $uri -eq 'virtualizationsites'
+        } {
+            return (Get-Content "$global:here\Mocks\VirtualSite-NoParams.json" -Raw) | ConvertFrom-Json
+        } -Verifiable
+        Mock -ModuleName ZertoApiWrapper -CommandName Invoke-ZertoRestRequest -ParameterFilter {
+            $uri -eq 'virtualizationsites/1234/devices'
+        } {
+            return (Get-Content "$global:here\Mocks\VirtualSite-devices.json" -Raw) | ConvertFrom-Json
+        } -Verifiable
+        Mock -ModuleName ZertoApiWrapper -CommandName Invoke-ZertoRestRequest -ParameterFilter {
+            $uri -eq 'virtualizationsites/1234/devices?hostIdentifier=4567'
+        } {
+            return (Get-Content "$global:here\Mocks\VirtualSite-devices-hostid.json" -Raw) | ConvertFrom-Json
+        } -Verifiable
+        Mock -ModuleName ZertoApiWrapper -CommandName Invoke-ZertoRestRequest -ParameterFilter {
+            $uri -eq 'virtualizationsites/1234/hosts'
+        } {
+            return (Get-Content "$global:here\Mocks\VirtualSite-hosts.json" -Raw) | ConvertFrom-Json
+        } -Verifiable
+        Mock -ModuleName ZertoApiWrapper -CommandName Invoke-ZertoRestRequest -ParameterFilter {
+            $uri -eq 'virtualizationsites/1234/hosts/4567'
+        } {
+            return (Get-Content "$global:here\Mocks\VirtualSite-hosts-hostid.json" -Raw) | ConvertFrom-Json
+        } -Verifiable
+        Mock -ModuleName ZertoApiWrapper -CommandName Invoke-ZertoRestRequest -ParameterFilter {
+            $uri -eq 'virtualizationsites/1234'
+        } {
+            return (Get-Content "$global:here\Mocks\VirtualSite-SiteId.json" -Raw) | ConvertFrom-Json
+        } -Verifiable
+        Mock -ModuleName ZertoApiWrapper -CommandName Invoke-ZertoRestRequest -ParameterFilter {
+            $uri -eq 'virtualizationsites/1234/datastores'
+        } {
+            return (Get-Content "$global:here\Mocks\VirtualSite-datastores.json" -Raw) | ConvertFrom-Json
+        } -Verifiable
+        Mock -ModuleName ZertoApiWrapper -CommandName Invoke-ZertoRestRequest -ParameterFilter {
+            $uri -eq 'virtualizationsites/1234/datastoreclusters'
+        } {
+            return (Get-Content "$global:here\Mocks\VirtualSite-datastoreClusters.json" -Raw) | ConvertFrom-Json
+        } -Verifiable
+        Mock -ModuleName ZertoApiWrapper -CommandName Invoke-ZertoRestRequest -ParameterFilter {
+            $uri -eq 'virtualizationsites/1234/networks'
+        } {
+            return (Get-Content "$global:here\Mocks\VirtualSite-Networks.json" -Raw) | ConvertFrom-Json
+        } -Verifiable
+        Mock -ModuleName ZertoApiWrapper -CommandName Invoke-ZertoRestRequest -ParameterFilter {
+            $uri -eq 'virtualizationsites/1234/folders'
+        } {
+            return (Get-Content "$global:here\Mocks\VirtualSite-Folders.json" -Raw) | ConvertFrom-Json
+        } -Verifiable
+        Mock -ModuleName ZertoApiWrapper -CommandName Invoke-ZertoRestRequest -ParameterFilter {
+            $uri -eq 'virtualizationsites/1234/hostclusters'
+        } {
+            return (Get-Content "$global:here\Mocks\VirtualSite-hostClusters.json" -Raw) | ConvertFrom-Json
+        } -Verifiable
+        Mock -ModuleName ZertoApiWrapper -CommandName Invoke-ZertoRestRequest -ParameterFilter {
+            $uri -eq 'virtualizationsites/1234/resourcepools'
+        } {
+            return (Get-Content "$global:here\Mocks\VirtualSite-ResourcePools.json" -Raw) | ConvertFrom-Json
+        } -Verifiable
+        Mock -ModuleName ZertoApiWrapper -CommandName Invoke-ZertoRestRequest -ParameterFilter {
+            $uri -eq 'virtualizationsites/1234/vms'
+        } {
+            return (Get-Content "$global:here\Mocks\VirtualSite-VMs.json" -Raw) | ConvertFrom-Json
+        } -Verifiable
+        Mock -ModuleName ZertoApiWrapper -CommandName Invoke-ZertoRestRequest -ParameterFilter {
+            $uri -eq 'virtualizationsites/1234/repositories'
+        } {
+            return (Get-Content "$global:here\Mocks\VirtualSite-repositories.json" -Raw) | ConvertFrom-Json
+        } -Verifiable
 
+        It "Should return all known sites when called without parameters" {
+            $results = Get-ZertoVirtualizationSite
+            $results.Count | Should -BeExactly 2
+        }
+
+        It "Should return a single site when a siteIdentifier is provided" {
+            $results = Get-ZertoVirtualizationSite -siteIdentifier '1234'
+            $results.VirtualizationSiteName | Should -BeExactly 'cavc.nc.lab'
+            $results.siteIdentifier | Should -BeExactly '8e1c9f53-4973-4a4a-b2dd-1ebb293614d8'
+        }
+
+        It "Should return a list of devices with the '-devices' switch" {
+            $results = Get-ZertoVirtualizationSite -siteIdentifier '1234' -devices
+            $results.Count | Should -BeExactly 5
+        }
+
+        It "Should return a list of devices with the '-devices' switch and hostIdentifier provided" {
+            $results = Get-ZertoVirtualizationSite -siteIdentifier '1234' -devices -hostIdentifier '4567'
+            $results.Count | Should -BeExactly 5
+        }
+
+        It "Should return a list of hosts with the '-hosts' switch" {
+            $results = Get-ZertoVirtualizationSite -siteIdentifier '1234' -hosts
+            $results.Count | Should -BeExactly 3
+        }
+
+        It "Should return a single host with the '-hosts' switch and hostIdentifier provided" {
+            $results = Get-ZertoVirtualizationSite -siteIdentifier '1234' -hosts -hostIdentifier '4567'
+            $results.VirtualizationHostName | Should -BeExactly "caesx3.nc.lab"
+            $results.hostIdentifier | Should -BeExactly "09db6c5b-b956-430f-9589-b58876ca377a.host-18"
+        }
+
+        It "Should return a list of datastores with the '-datastores' switch" {
+            $results = Get-ZertoVirtualizationSite -siteIdentifier '1234' -datastores
+            $results.Count | Should -BeExactly 8
+        }
+
+        It "Should return a list of datastores with the '-datastoreClusters' switch" {
+            $results = Get-ZertoVirtualizationSite -siteIdentifier '1234' -datastoreClusters
+            $results.DatastoreClusterIdentifier | Should -BeExactly "09db6c5b-b956-430f-9589-b58876ca377a.group-p44"
+            $results.DatastoreClusterName | Should -BeExactly "CA_DS_Cluster"
+        }
+
+        It "Should return a list of Networks with the '-networks' switch" {
+            $results = Get-ZertoVirtualizationSite -siteIdentifier '1234' -networks
+            $results.NetworkIdentifier | Should -BeExactly "09db6c5b-b956-430f-9589-b58876ca377a.network-20"
+            $results.VirtualizationNetworkName | Should -BeExactly "VM Network"
+        }
+
+        It "Should return a list of folders with the '-folders' switch" {
+            $results = Get-ZertoVirtualizationSite -siteIdentifier '1234' -folders
+            $results.Count | Should -BeExactly 3
+        }
+
+        It "Should return a list of Host Clusters with the '-hostClusters' switch" {
+            $results = Get-ZertoVirtualizationSite -siteIdentifier '1234' -hostClusters
+            $results.ClusterIdentifier | Should -BeExactly "09db6c5b-b956-430f-9589-b58876ca377a.domain-c7"
+            $results.VirtualizationClusterName | Should -BeExactly "CA Cluster"
+        }
+
+        It "Should return a list of Resource Pools with the '-resourcePools' switch" {
+            $results = Get-ZertoVirtualizationSite -siteIdentifier '1234' -resourcePools
+            $results.ResourcePoolIdentifier | Should -BeExactly "09db6c5b-b956-430f-9589-b58876ca377a.resgroup-8"
+            $results.ResourcePoolName | Should -BeExactly "Resources"
+        }
+
+        It "Should return a list of VMs with the '-VMs' switch" {
+            $results = Get-ZertoVirtualizationSite -siteIdentifier '1234' -vms
+            $results.Count | Should -BeExactly 4
+        }
+
+        It "Should return a list of LTR Repositories with the '-repositories' switch" {
+            $results = Get-ZertoVirtualizationSite -siteIdentifier '1234' -repositories
+            $results.ConnectionType | Should -BeExactly "ServerMessageBlock"
+            $results.RepositoryIdentifier | Should -BeExactly "120355ce-fcd0-4820-a971-787d0470793b"
+            $results.RepositoryName | Should -BeExactly "Synology"
+            $results.StorageType | Should -BeExactly "NetworkShare"
+            $results.Path | Should -not -be $null
+        }
+
+        Assert-VerifiableMock
+
+        Assert-MockCalled -ModuleName ZertoApiWrapper -CommandName Invoke-ZertoRestRequest -ParameterFilter {
+            $uri -eq 'virtualizationsites'
+        } -Exactly 1
+        Assert-MockCalled -ModuleName ZertoApiWrapper -CommandName Invoke-ZertoRestRequest -ParameterFilter {
+            $uri -eq 'virtualizationsites/1234'
+        } -Exactly 1
+        Assert-MockCalled -ModuleName ZertoApiWrapper -CommandName Invoke-ZertoRestRequest -ParameterFilter {
+            $uri -eq 'virtualizationsites/1234/devices'
+        } -Exactly 1
+        Assert-MockCalled -ModuleName ZertoApiWrapper -CommandName Invoke-ZertoRestRequest -ParameterFilter {
+            $uri -eq 'virtualizationsites/1234/devices?hostIdentifier=4567'
+        } -Exactly 1
+        Assert-MockCalled -ModuleName ZertoApiWrapper -CommandName Invoke-ZertoRestRequest -ParameterFilter {
+            $uri -eq 'virtualizationsites/1234/hosts'
+        } -Exactly 1
+        Assert-MockCalled -ModuleName ZertoApiWrapper -CommandName Invoke-ZertoRestRequest -ParameterFilter {
+            $uri -eq 'virtualizationsites/1234/hosts/4567'
+        } -Exactly 1
+        Assert-MockCalled -ModuleName ZertoApiWrapper -CommandName Invoke-ZertoRestRequest -ParameterFilter {
+            $uri -eq 'virtualizationsites/1234/datastores'
+        } -Exactly 1
+        Assert-MockCalled -ModuleName ZertoApiWrapper -CommandName Invoke-ZertoRestRequest -ParameterFilter {
+            $uri -eq 'virtualizationsites/1234/datastoreclusters'
+        } -Exactly 1
+        Assert-MockCalled -ModuleName ZertoApiWrapper -CommandName Invoke-ZertoRestRequest -ParameterFilter {
+            $uri -eq 'virtualizationsites/1234/networks'
+        } -Exactly 1
+        Assert-MockCalled -ModuleName ZertoApiWrapper -CommandName Invoke-ZertoRestRequest -ParameterFilter {
+            $uri -eq 'virtualizationsites/1234/folders'
+        } -Exactly 1
+        Assert-MockCalled -ModuleName ZertoApiWrapper -CommandName Invoke-ZertoRestRequest -ParameterFilter {
+            $uri -eq 'virtualizationsites/1234/hostclusters'
+        } -Exactly 1
+        Assert-MockCalled -ModuleName ZertoApiWrapper -CommandName Invoke-ZertoRestRequest -ParameterFilter {
+            $uri -eq 'virtualizationsites/1234/resourcepools'
+        } -Exactly 1
+        Assert-MockCalled -ModuleName ZertoApiWrapper -CommandName Invoke-ZertoRestRequest -ParameterFilter {
+            $uri -eq 'virtualizationsites/1234/vms'
+        } -Exactly 1
+        Assert-MockCalled -ModuleName ZertoApiWrapper -CommandName Invoke-ZertoRestRequest -ParameterFilter {
+            $uri -eq 'virtualizationsites/1234/repositories'
+        } -Exactly 1
     }
 }
 

Tests/Public/Get-ZertoVolume.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 

Tests/Public/Get-ZertoVpg.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 

Tests/Public/Get-ZertoVpgSetting.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 

Tests/Public/Get-ZertoVra.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 

Tests/Public/Get-ZertoZorg.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 

Tests/Public/Get-ZertoZsspSession.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 

Tests/Public/Import-ZertoVmNicSetting.Tests.ps1

@@ -1,12 +1,12 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
     Context "$global:function::Parameter Unit Tests" {
-        it "$global:function should have exactly 11 parameters defined" {
+        It "$global:function should have exactly 11 parameters defined" {
-            (get-command $global:function).Parameters.Count | Should -Be 14
+            (Get-Command $global:function).Parameters.Count | Should -Be 14
         }
 
         It "Has a mandatory string array parameter for the settings file to import" {

Tests/Public/Import-ZertoVpg.Tests.ps1

@@ -1,12 +1,12 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
     Context "$global:function::Parameter Unit Tests" {
-        it "$global:function should have exactly 12 parameters defined" {
+        It "$global:function should have exactly 12 parameters defined" {
-            (get-command $global:function).Parameters.Count | Should -Be 12
+            (Get-Command $global:function).Parameters.Count | Should -Be 12
         }
 
         It "Has a mandatory string array parameter for the settings file to import" {

Tests/Public/Install-ZertoVra.Tests.ps1

@@ -1,12 +1,12 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
     Context "$global:function::Parameter Unit Tests" {
-        it "$global:function should have exactly 22 parameters defined" {
+        It "$global:function should have exactly 24 parameters defined" {
-            (get-command $global:function).Parameters.Count | Should -Be 22
+            (Get-Command $global:function).Parameters.Count | Should -Be 24
         }
 
         $ParameterTestCases = @(
@@ -17,6 +17,8 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
             @{ParameterName = 'vraIpAddress'; Type = 'String'; Mandatory = $true; Validation = 'IpAddr' }
             @{ParameterName = 'subnetMask'; Type = 'String'; Mandatory = $true; Validation = 'IpAddr' }
             @{ParameterName = 'defaultGateway'; Type = 'String'; Mandatory = $true; Validation = 'IpAddr' }
+            @{ParameterName = 'UseRootCredential'; Type = 'Switch'; Mandatory = $true; Validation = $null }
+            @{ParameterName = 'HostRootPassword'; Type = 'SecureString'; Mandatory = $true; Validation = 'NotNullOrEmpty' }
         )
 
         It "<ParameterName> parameter is of <Type> type" -TestCases $ParameterTestCases {
@@ -35,12 +37,12 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 'IpAddr' {
                     $attrs = (Get-Command $global:function).Parameters[$ParameterName].Attributes
                     $attrs.Where{ $_ -is [ValidateScript] }.Count | Should -Be 1
-                    $attrs.Where{ $_ -is [ValidateScript] }.ScriptBlock | Should -Match '^\$_ \-match \[IPAddress\]\$_'
+                    $attrs.Where{ $_ -is [ValidateScript] }.ScriptBlock | Should -Match '\$_ \-match \[IPAddress\]\$_'
                 }
 
                 $null {
                     $attrs = (Get-Command $global:function).Parameters[$ParameterName].Attributes
-                    $attrs.TypeId.Count | Should -Be 2
+                    $attrs.TypeId.Count | Should -Be 3
                 }
             }
         }

Tests/Public/Invoke-ZARestRequest.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
@@ -12,7 +12,6 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 @{ParameterName = 'uri'; Type = 'String'; Mandatory = $true; TestName = 'URI' }
                 @{ParameterName = 'method'; Type = 'String'; Mandatory = $false; TestName = 'Method' }
                 @{ParameterName = 'body'; Type = 'String'; Mandatory = $false; TestName = 'Body' }
-                @{ParameterName = 'contentType'; Type = 'String'; Mandatory = $false; TestName = 'contentType' }
             )
 
             It "Parameter present and Type test for: <TestName> " -TestCases $testCases {
@@ -29,14 +28,9 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 Get-Command $global:function | Should -HaveParameter Method -DefaultValue "GET"
             }
 
-            It "ContentType parameter default is 'application/json'" {
-                Get-Command $global:function | Should -HaveParameter contentType -DefaultValue "application/json"
-            }
-
             $NotNullOrEmptyTests = @(
                 @{ParameterName = 'uri'; TestName = 'Uri' }
                 @{ParameterName = 'body'; TestName = 'Body' }
-                @{ParameterName = 'contentType'; TestName = 'ContentType' }
             )
 
             It "<TestName> parameter does not accecpt a null or empty value" -TestCases $NotNullOrEmptyTests {
@@ -69,7 +63,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
             }
 
             It "runs when called" {
-                Invoke-ZARestRequest -uri "myuri" | Should Be "Ran Command"
+                Invoke-ZARestRequest -uri "myuri" | Should -Be "Ran Command"
             }
 
             It "throws when the last action was over 60 minutes ago" {

Tests/Public/Invoke-ZertoEvacuateVra.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 

Tests/Public/Invoke-ZertoFailover.Tests.ps1

@@ -1,12 +1,12 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
     Context "$global:function::Parameter Unit Tests" {
-        it "$global:function should have exactly 20 parameters defined" {
+        It "$global:function should have exactly 20 parameters defined" {
-            (get-command $global:function).Parameters.Count | Should -Be 20
+            (Get-Command $global:function).Parameters.Count | Should -Be 20
         }
 
         $ParameterTestCases = @(
@@ -55,7 +55,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }
@@ -82,11 +82,11 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
             (Get-Command $global:function).Parameters['shutdownPolicy'].Attributes.Where{ $_ -is [ValidateSet] }.ValidValues | Should -Contain 2
         }
 
-        it "Time to wait before shutdown in sec should have a default value of 3600" {
+        It "Time to wait before shutdown in sec should have a default value of 3600" {
             Get-Command $global:function | Should -HaveParameter timeToWaitBeforeShutdownInSec -DefaultValue 3600
         }
 
-        it "Time to wait before shutdown in sec should have a minimum value of 300 and max value of 86400" {
+        It "Time to wait before shutdown in sec should have a minimum value of 300 and max value of 86400" {
             (Get-Command $global:function).Parameters['timeToWaitBeforeShutdownInSec'].Attributes.Where{ $_ -is [ValidateRange] }.MinRange | Should -Be 300
             (Get-Command $global:function).Parameters['timeToWaitBeforeShutdownInSec'].Attributes.Where{ $_ -is [ValidateRange] }.MaxRange | Should -Be 86400
         }

Tests/Public/Invoke-ZertoFailoverCommit.Tests.ps1

@@ -1,13 +1,13 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
     Context "$global:function::Parameter Unit Tests" {
 
-        it "$global:function should have exactly 15 parameters defined" {
+        It "$global:function should have exactly 15 parameters defined" {
-            (get-command $global:function).Parameters.Count | Should -Be 15
+            (Get-Command $global:function).Parameters.Count | Should -Be 15
         }
 
         $ParameterTestCases = @(
@@ -41,7 +41,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }

Tests/Public/Invoke-ZertoFailoverRollback.Tests.ps1

@@ -1,16 +1,16 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
     Context "$global:function::Parameter Unit Tests" {
 
-        it "$global:function should have exactly 12 parameters defined" {
+        It "$global:function should have exactly 12 parameters defined" {
-            (get-command $global:function).Parameters.Count | Should -Be 12
+            (Get-Command $global:function).Parameters.Count | Should -Be 12
         }
 
-        it "has a mandatory string parameter for the vpgName" {
+        It "has a mandatory string parameter for the vpgName" {
             Get-Command $global:function | Should -HaveParameter vpgName
             Get-Command $global:function | Should -HaveParameter vpgName -Type string[]
             Get-Command $global:function | Should -HaveParameter vpgName -Mandatory

Tests/Public/Invoke-ZertoForceSync.Tests.ps1

@@ -1,16 +1,16 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
     Context "$global:function::Parameter Unit Tests" {
 
-        it "$global:function should have exactly 12 parameters defined" {
+        It "$global:function should have exactly 12 parameters defined" {
-            (get-command $global:function).Parameters.Count | Should -Be 12
+            (Get-Command $global:function).Parameters.Count | Should -Be 12
         }
 
-        it "has a mandatory string parameter for the vpgName" {
+        It "has a mandatory string parameter for the vpgName" {
             Get-Command $global:function | Should -HaveParameter vpgName
             Get-Command $global:function | Should -HaveParameter vpgName -Type string[]
             Get-Command $global:function | Should -HaveParameter vpgName -Mandatory

Tests/Public/Invoke-ZertoMove.Tests.ps1

@@ -1,21 +1,22 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
     Context "$global:function::Parameter Unit Tests" {
-        it "$global:function should have exactly 20 parameters defined" {
+        It "$global:function should have exactly 21 parameters defined" {
-            (get-command $global:function).Parameters.Count | Should -Be 20
+            (Get-Command $global:function).Parameters.Count | Should -Be 21
         }
 
         $ParameterTestCases = @(
+            @{ParameterName = 'vpgIdentifier'; Type = 'Guid[]'; Mandatory = $true; Validation = 'NotNullOrEmpty' }
             @{ParameterName = 'vpgName'; Type = 'String[]'; Mandatory = $true; Validation = 'NotNullOrEmpty' }
             @{ParameterName = 'commitPolicy'; Type = 'String'; Mandatory = $false; Validation = 'Set' }
             @{ParameterName = 'commitPolicyTimeout'; Type = 'Int'; Mandatory = $false; Validation = 'Range' }
             @{ParameterName = 'forceShutdown'; Type = 'Switch'; Mandatory = $false; Validation = $null }
-            @{ParameterName = 'disableReverseProtection'; Type = 'Switch'; Mandatory = $true; Validation = $null }
+            @{ParameterName = 'disableReverseProtection'; Type = 'Switch'; Mandatory = $false; Validation = $null }
-            @{ParameterName = 'keepSourceVms'; Type = 'Switch'; Mandatory = $true; Validation = $null }
+            @{ParameterName = 'keepSourceVms'; Type = 'Switch'; Mandatory = $false; Validation = $null }
             @{ParameterName = 'ContinueOnPreScriptFailure'; Type = 'Switch'; Mandatory = $false; Validation = $null }
             @{ParameterName = 'whatIf'; Type = 'Switch'; Mandatory = $false; Validation = 'ShouldProcess' }
         )
@@ -55,7 +56,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }
@@ -67,7 +68,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
             (Get-Command $global:function).Parameters['commitPolicy'].Attributes.Where{ $_ -is [ValidateSet] }.ValidValues | Should -Contain 'None'
         }
 
-        it "Commit Policy Timeout should have a minimum value of 300 and max value of 86400" {
+        It "Commit Policy Timeout should have a minimum value of 300 and max value of 86400" {
             (Get-Command $global:function).Parameters['commitPolicyTimeout'].Attributes.Where{ $_ -is [ValidateRange] }.MinRange | Should -Be 300
             (Get-Command $global:function).Parameters['commitPolicyTimeout'].Attributes.Where{ $_ -is [ValidateRange] }.MaxRange | Should -Be 86400
         }

Tests/Public/Invoke-ZertoMoveCommit.Tests.ps1

@@ -1,13 +1,13 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
     Context "$global:function::Parameter Unit Tests" {
 
-        it "$global:function should have exactly 16 parameters defined" {
+        It "$global:function should have exactly 16 parameters defined" {
-            (get-command $global:function).Parameters.Count | Should -Be 16
+            (Get-Command $global:function).Parameters.Count | Should -Be 16
         }
 
         $ParameterTestCases = @(
@@ -41,7 +41,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
                 }
 
                 default {
-                    $true | should be $false -Because "No Validation Selected. Review test cases"
+                    $true | Should -Be $false -Because "No Validation Selected. Review test cases"
                 }
             }
         }

Tests/Public/Invoke-ZertoMoveRollback.Tests.ps1

@@ -1,16 +1,16 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
     Context "$global:function::Parameter Unit Tests" {
 
-        it "$global:function should have exactly 14 parameters defined" {
+        It "$global:function should have exactly 14 parameters defined" {
-            (get-command $global:function).Parameters.Count | Should -Be 14
+            (Get-Command $global:function).Parameters.Count | Should -Be 14
         }
 
-        it "has a mandatory string parameter for the vpgName" {
+        It "has a mandatory string parameter for the vpgName" {
             Get-Command $global:function | Should -HaveParameter vpgName
             Get-Command $global:function | Should -HaveParameter vpgName -Type string[]
             Get-Command $global:function | Should -HaveParameter vpgName -Mandatory

Tests/Public/Invoke-ZertoRestRequest.Tests.ps1

@@ -1,6 +1,6 @@
 #Requires -Modules Pester
-$global:here = (Split-Path -Parent $MyInvocation.MyCommand.Path)
+$global:here = (Split-Path -Parent $PSCommandPath)
-$global:function = ((Split-Path -leaf $MyInvocation.MyCommand.Path).Split('.'))[0]
+$global:function = ((Split-Path -leaf $PSCommandPath).Split('.'))[0]
 
 Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
@@ -14,9 +14,7 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
             $ParameterNameTestCases = @(
                 @{ParameterName = "uri"; Type = "String"; Mandatory = $true; DefaultValue = $null; TestName = "URI" }
                 @{ParameterName = "method"; Type = "String"; Mandatory = $false; DefaultValue = 'GET'; TestName = "Method" }
-                @{ParameterName = "apiVersion"; Type = "String"; Mandatory = $false; DefaultValue = 'v1'; TestName = "API Version" }
                 @{ParameterName = "body"; Type = "String"; Mandatory = $false; DefaultValue = $null; TestName = "Body" }
-                @{ParameterName = "contentType"; Type = "String"; Mandatory = $false; DefaultValue = 'application/json'; TestName = "Content Type" }
                 @{ParameterName = "credential"; Type = "PSCredential"; Mandatory = $false; DefaultValue = $null; TestName = "Credential" }
                 @{ParameterName = "returnHeaders"; Type = "Switch"; Mandatory = $false; DefaultValue = $null; TestName = "Return Headers" }
             )
@@ -36,20 +34,18 @@ Describe $global:function -Tag 'Unit', 'Source', 'Built' {
 
             $ParameterValidationTestCases = @(
                 @{ParameterName = "URI"; TestName = "URI" }
-                @{ParameterName = "apiVersion"; TestName = "Api Version" }
                 @{ParameterName = "body"; TestName = "Body" }
-                @{ParameterName = "contentType"; TestName = "Content Type" }
             )
 
             It "<TestName> parameter cannot be null or empty" -TestCases $ParameterValidationTestCases {
                 param($ParameterName)
                 $thisParameter = $thisCommand.Parameters[$ParameterName]
-                $thisParameter.Attributes.Where{ $_ -is [ValidateNotNullOrEmpty] }.Count | Should Be 1
+                $thisParameter.Attributes.Where{ $_ -is [ValidateNotNullOrEmpty] }.Count | Should -Be 1
             }
 
             It "Method parameter can only be 'GET', 'POST', 'PUT', 'DELETE'" {
                 $thisParameter = $thisCommand.Parameters['method']
-                $thisParameter.Attributes.Where{ $_ -is [ValidateSet] }.Count | Should Be 1
+                $thisParameter.Attributes.Where{ $_ -is [ValidateSet] }.Count | Should -Be 1
                 $thisParameter.Attributes.Where{ $_ -is [ValidateSet] }.validValues -contains 'GET' | Should -BeTrue
                 $thisParameter.Attributes.Where{ $_ -is [ValidateSet] }.validValues -contains 'PUT' | Should -BeTrue
                 $thisParameter.Attributes.Where{ $_ -is [ValidateSet] }.validValues -contains 'POST' | Should -BeTrue

Tests/Public/Mocks/CopyVpgSettings.json

@@ -0,0 +1,79 @@
+{
+  "Basic": {
+    "JournalHistoryInHours": 24,
+    "Name": "Test-SQL_Copy_1",
+    "Priority": "Medium",
+    "ProtectedSiteIdentifier": "15aa0d43-69cd-400a-8b99-fe94bbac3e19",
+    "RecoverySiteIdentifier": "8e1c9f53-4973-4a4a-b2dd-1ebb293614d8",
+    "RpoInSeconds": 300,
+    "ServiceProfileIdentifier": null,
+    "TestIntervalInMinutes": 262080,
+    "UseWanCompression": true,
+    "ZorgIdentifier": null
+  },
+  "BootGroups": {
+    "BootGroups": [
+      "@{BootDelayInSeconds=0; BootGroupIdentifier=00000000-0000-0000-0000-000000000000; Name=Default}"
+    ]
+  },
+  "Journal": {
+    "DatastoreIdentifier": null,
+    "Limitation": {
+      "HardLimitInMB": 153600,
+      "HardLimitInPercent": 0,
+      "WarningThresholdInMB": 115200,
+      "WarningThresholdInPercent": 0
+    }
+  },
+  "LongTermRetention": null,
+  "Networks": {
+    "Failover": {
+      "Hypervisor": "@{DefaultNetworkIdentifier=09db6c5b-b956-430f-9589-b58876ca377a.network-20}",
+      "PublicCloud": null,
+      "VCD": null
+    },
+    "FailoverTest": {
+      "Hypervisor": "@{DefaultNetworkIdentifier=09db6c5b-b956-430f-9589-b58876ca377a.network-20}",
+      "PublicCloud": null,
+      "VCD": null
+    }
+  },
+  "Protected": {
+    "VCD": null
+  },
+  "Recovery": {
+    "DefaultDatastoreClusterIdentifier": "09db6c5b-b956-430f-9589-b58876ca377a.group-p44",
+    "DefaultDatastoreIdentifier": null,
+    "DefaultFolderIdentifier": "09db6c5b-b956-430f-9589-b58876ca377a.group-v3",
+    "DefaultHostClusterIdentifier": "09db6c5b-b956-430f-9589-b58876ca377a.domain-c7",
+    "DefaultHostIdentifier": null,
+    "PublicCloud": null,
+    "ResourcePoolIdentifier": null,
+    "VCD": null
+  },
+  "Scripting": {
+    "PostBackup": null,
+    "PostRecovery": {
+      "Command": null,
+      "Parameters": null,
+      "TimeoutInSeconds": 300
+    },
+    "PreRecovery": {
+      "Command": null,
+      "Parameters": null,
+      "TimeoutInSeconds": 300
+    }
+  },
+  "Vms": [
+    {
+      "BootGroupIdentifier": "00000000-0000-0000-0000-000000000000",
+      "Journal": "@{DatastoreIdentifier=; Limitation=}",
+      "Nics": "",
+      "Recovery": "@{DatastoreClusterIdentifier=09db6c5b-b956-430f-9589-b58876ca377a.group-p44; DatastoreIdentifier=; FolderIdentifier=09db6c5b-b956-430f-9589-b58876ca377a.group-v3; HostClusterIdentifier=09db6c5b-b956-430f-9589-b58876ca377a.domain-c7; HostIdentifier=; PublicCloud=; ResourcePoolIdentifier=; VCD=}",
+      "VmIdentifier": "d809de8e-deb7-45cc-b620-08030a1143e1.vm-87",
+      "Volumes": ""
+    }
+  ],
+  "VpgIdentifier": null,
+  "VpgSettingsIdentifier": "0be951ef-229a-401c-9e0d-bd8a5baea19a"
+}

Tests/Public/Mocks/UnprotectedVms.json

@@ -0,0 +1,18 @@
+[
+  {
+    "VmIdentifier": "d809de8e-deb7-45cc-b620-08030a1143e1.vm-87",
+    "VmName": "sql01-prod"
+  },
+  {
+    "VmIdentifier": "d809de8e-deb7-45cc-b620-08030a1143e1.vm-34",
+    "VmName": "Ubuntu01"
+  },
+  {
+    "VmIdentifier": "d809de8e-deb7-45cc-b620-08030a1143e1.vm-79",
+    "VmName": "Win2019Template"
+  },
+  {
+    "VmIdentifier": "d809de8e-deb7-45cc-b620-08030a1143e1.vm-25",
+    "VmName": "WinTemplate"
+  }
+]

Tests/Public/Mocks/VirtualSite-Folders.json

@@ -0,0 +1,14 @@
+[
+  {
+    "FolderIdentifier": "09db6c5b-b956-430f-9589-b58876ca377a.group-v3",
+    "FolderName": "/"
+  },
+  {
+    "FolderIdentifier": "09db6c5b-b956-430f-9589-b58876ca377a.group-v27",
+    "FolderName": "Templates"
+  },
+  {
+    "FolderIdentifier": "09db6c5b-b956-430f-9589-b58876ca377a.group-v9",
+    "FolderName": "Discovered virtual machine"
+  }
+]

Tests/Public/Mocks/VirtualSite-Networks.json

@@ -0,0 +1,4 @@
+{
+  "NetworkIdentifier": "09db6c5b-b956-430f-9589-b58876ca377a.network-20",
+  "VirtualizationNetworkName": "VM Network"
+}