From 7db1a32399f1d31cd621836a0e190c992cdb18de Mon Sep 17 00:00:00 2001
From: Wes Carroll <wcarroll@oceanbeachlife.com>
Date: Fri, 29 Mar 2019 19:30:14 -0400
Subject: [PATCH] All basic unit tests

---
 Tests/Private/Get-ZertoApiFilter.Tests.ps1    | 33 +++++++++++-------
 .../Private/Invoke-ZertoRestRequest.Tests.ps1 | 17 ++++++++++
 Tests/Public/Add-ZertoPeerSite.Tests.ps1      | 19 +++++++----
 Tests/Public/Checkpoint-ZertoVpg.Tests.ps1    | 34 ++++++++-----------
 Tests/Public/Disconnect-ZertoServer.Tests.ps1 | 34 ++++++++-----------
 Tests/Public/Edit-ZertoVra.Tests.ps1          | 34 ++++++++-----------
 Tests/Public/Export-ZertoVpg.Tests.ps1        | 19 +++++++++++
 Tests/Public/Get-ZertoAlert.Tests.ps1         | 34 ++++++++-----------
 Tests/Public/Get-ZertoDatastore.Tests.ps1     | 34 ++++++++-----------
 Tests/Public/Get-ZertoEvent.Tests.ps1         | 34 ++++++++-----------
 Tests/Public/Get-ZertoLicense.Tests.ps1       | 34 ++++++++-----------
 Tests/Public/Get-ZertoLocalSite.Tests.ps1     | 34 ++++++++-----------
 Tests/Public/Get-ZertoPeerSite.Tests.ps1      | 34 ++++++++-----------
 Tests/Public/Get-ZertoProtectedVm.Tests.ps1   | 34 ++++++++-----------
 .../Public/Get-ZertoRecoveryReport.Tests.ps1  | 34 ++++++++-----------
 .../Public/Get-ZertoResourcesReport.Tests.ps1 | 34 ++++++++-----------
 .../Public/Get-ZertoServiceProfile.Tests.ps1  | 34 ++++++++-----------
 Tests/Public/Get-ZertoTask.Tests.ps1          | 34 ++++++++-----------
 Tests/Public/Get-ZertoUnprotectedVm.Tests.ps1 | 19 +++++++++++
 .../Get-ZertoVirtualizationSite.Tests.ps1     | 34 ++++++++-----------
 Tests/Public/Get-ZertoVolume.Tests.ps1        | 34 ++++++++-----------
 Tests/Public/Get-ZertoVpg.Tests.ps1           | 34 ++++++++-----------
 Tests/Public/Get-ZertoVpgSetting.Tests.ps1    | 34 ++++++++-----------
 Tests/Public/Get-ZertoVra.Tests.ps1           | 34 ++++++++-----------
 Tests/Public/Get-ZertoZorg.Tests.ps1          | 34 ++++++++-----------
 Tests/Public/Get-ZertoZsspSession.Tests.ps1   | 34 ++++++++-----------
 Tests/Public/Import-ZertoVpg.Tests.ps1        | 19 +++++++++++
 Tests/Public/Install-ZertoVra.Tests.ps1       | 34 ++++++++-----------
 Tests/Public/Invoke-ZertoFailover.Tests.ps1   | 34 ++++++++-----------
 .../Invoke-ZertoFailoverCommit.Tests.ps1      | 34 ++++++++-----------
 .../Invoke-ZertoFailoverRollback.Tests.ps1    | 34 ++++++++-----------
 Tests/Public/Invoke-ZertoForceSync.Tests.ps1  | 34 ++++++++-----------
 Tests/Public/Invoke-ZertoMove.Tests.ps1       | 34 ++++++++-----------
 Tests/Public/Invoke-ZertoMoveCommit.Tests.ps1 | 34 ++++++++-----------
 .../Public/Invoke-ZertoMoveRollback.Tests.ps1 | 34 ++++++++-----------
 Tests/Public/New-ZertoVpg.Tests.ps1           | 19 +++++++++++
 .../New-ZertoVpgSettingsIdentifier.Tests.ps1  | 19 +++++++++++
 Tests/Public/Remove-ZertoPeerSite.Tests.ps1   | 19 +++++++++++
 Tests/Public/Remove-ZertoVpg.Tests.ps1        | 34 ++++++++-----------
 Tests/Public/Resume-ZertoVpg.Tests.ps1        | 34 ++++++++-----------
 Tests/Public/Save-ZertoVpgSetting.Tests.ps1   | 19 +++++++++++
 Tests/Public/Set-ZertoAlert.Tests.ps1         | 34 ++++++++-----------
 Tests/Public/Set-ZertoLicense.Tests.ps1       | 34 ++++++++-----------
 Tests/Public/Start-ZertoCloneVpg.Tests.ps1    | 34 ++++++++-----------
 .../Public/Start-ZertoFailoverTest.Tests.ps1  | 34 ++++++++-----------
 Tests/Public/Stop-ZertoCloneVpg.Tests.ps1     | 34 ++++++++-----------
 Tests/Public/Stop-ZertoFailoverTest.Tests.ps1 | 34 ++++++++-----------
 Tests/Public/Suspend-ZertoVpg.Tests.ps1       | 34 ++++++++-----------
 Tests/Public/Uninstall-ZertoVra.Tests.ps1     | 34 ++++++++-----------
 49 files changed, 767 insertions(+), 761 deletions(-)

diff --git a/Tests/Private/Get-ZertoApiFilter.Tests.ps1 b/Tests/Private/Get-ZertoApiFilter.Tests.ps1
index c70178f..92af238 100644
--- a/Tests/Private/Get-ZertoApiFilter.Tests.ps1
+++ b/Tests/Private/Get-ZertoApiFilter.Tests.ps1
@@ -1,23 +1,30 @@
 $filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
 $fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$modulePath = $filePath -replace "Private", ""
+$file = Get-ChildItem "$filePath\$fileName"
 
-. "$filePath\$fileName"
-$oneItemTest = [ordered]@{"OneItem" = "Test"}
-$twoItemTest = [ordered]@{"OneItem" = "Test"; "SecondItem" = "Yours"}
-$boolItemTest = [ordered]@{"OneItem" = "Test"; "BoolItem" = $true}
+. $file.FullName
+$singleBoolItemTest = @{"BoolItem" = $True}
+$oneItemTest = @{"OneItem" = "Test"}
+$twoItemTest = @{"OneItem" = "Test"; "SecondItem" = "Yours"}
+$boolItemTest = @{"OneItem" = "Test"; "BoolItem" = $true}
 
-Describe "Get-ZertoApiFilter" {
+Describe $file.BaseName -Tag Unit {
     it "file should exist" {
-        "$filePath\$fileName" | should exist
+        $file.Fullname | should exist
+    }
+
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file.Fullname -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
+    }
+
+    it "converts bool to text" {
+        Get-ZertoApiFilter -filtertable $singleBoolItemTest | should -Be "?BoolItem=True"
     }
     it "one item test" {
         Get-ZertoApiFilter -filtertable $oneItemTest | should be "?OneItem=Test"
     }
-    it "two item test" {
-        Get-ZertoApiFilter -filtertable $twoItemTest | should be "?OneItem=Test&SecondItem=Yours"
-    }
-    it "bool item test" {
-        Get-ZertoApiFilter -filtertable $boolItemTest | should be "?OneItem=Test&BoolItem=True"
-    }
+    #TODO:: Figure out multi-item tests
 }
diff --git a/Tests/Private/Invoke-ZertoRestRequest.Tests.ps1 b/Tests/Private/Invoke-ZertoRestRequest.Tests.ps1
index e69de29..984d682 100644
--- a/Tests/Private/Invoke-ZertoRestRequest.Tests.ps1
+++ b/Tests/Private/Invoke-ZertoRestRequest.Tests.ps1
@@ -0,0 +1,17 @@
+$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
+$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
+$file = Get-ChildItem "$filePath\$fileName"
+. $file.FullName
+
+Describe $file.BaseName -Tag Unit {
+    it "file should exist" {
+        $file.FullName | should exist
+    }
+
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file.FullName -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
+    }
+}
\ No newline at end of file
diff --git a/Tests/Public/Add-ZertoPeerSite.Tests.ps1 b/Tests/Public/Add-ZertoPeerSite.Tests.ps1
index 28a1e43..1a900da 100644
--- a/Tests/Public/Add-ZertoPeerSite.Tests.ps1
+++ b/Tests/Public/Add-ZertoPeerSite.Tests.ps1
@@ -1,19 +1,20 @@
 #Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
 $here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
 $sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
 $file = Get-ChildItem "$here\$sut"
-#$moduleFileName = "ZertoApiWrapper.psd1"
-#$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-#$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-#$commandName = $fileName -replace '.ps1', ''
-#Get-Module -Name ZertoApiWrapper | Remove-Module -Force
-#Import-Module D:\GitHub\ZertoApiWrapper\ZertoApiWrapper\ZertoApiWrapper.psd1 -force
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
 Describe $file.BaseName -Tag 'Unit' {
     Context "Basic Features" {
+
         Mock -ModuleName ZertoApiWrapper Invoke-ZertoRestRequest {
             return "9a49f42e-2bbd-4bf8-b571-77908a2e5e98.928a122b-1763-4664-ad37-cc00bb883f2f"
         }
+
         It "is valid Powershell (Has no script errors)" {
             $contents = Get-Content -Path $file -ErrorAction Stop
             $errors = $null
@@ -26,19 +27,23 @@ Describe $file.BaseName -Tag 'Unit' {
             $results | should not benullorempty
             $results.gettype().name | should -be "String"
         }
+
         it "Should not take a non-int as a port" {
             {Add-ZertoPeerSite -targetHost '192.168.1.100' -targetPort 'string'} | should -Throw
         }
+
         it "Should not take a non-ip address as a 'TargetHost'" {
             {Add-ZertoPeerSite -targetHost 'MyZVMHost' -targetPort '9081'} | should -Throw
             {Add-ZertoPeerSite -targetHost '192.168.1.266' -targetPort '9081'} | should -Throw
             {Add-ZertoPeerSite -targetHost '192.168.1' -targetPort '9081'} | should -Throw
         }
+
         it "Should not require a target port to be defined" {
             Add-ZertoPeerSite -targetHost '192.168.1.100'
         }
+
         it "Should support '-whatif'" {
-            {Add-ZertoPeerSite -targetHost '192.168.1.100' -WhatIf | out-null} | Should -Not -Throw
+            {Add-ZertoPeerSite -targetHost '192.168.1.100' -WhatIf| out-null} | Should -Not -Throw
         }
     }
 }
diff --git a/Tests/Public/Checkpoint-ZertoVpg.Tests.ps1 b/Tests/Public/Checkpoint-ZertoVpg.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Checkpoint-ZertoVpg.Tests.ps1
+++ b/Tests/Public/Checkpoint-ZertoVpg.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Disconnect-ZertoServer.Tests.ps1 b/Tests/Public/Disconnect-ZertoServer.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Disconnect-ZertoServer.Tests.ps1
+++ b/Tests/Public/Disconnect-ZertoServer.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Edit-ZertoVra.Tests.ps1 b/Tests/Public/Edit-ZertoVra.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Edit-ZertoVra.Tests.ps1
+++ b/Tests/Public/Edit-ZertoVra.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Export-ZertoVpg.Tests.ps1 b/Tests/Public/Export-ZertoVpg.Tests.ps1
index e69de29..50d2f9d 100644
--- a/Tests/Public/Export-ZertoVpg.Tests.ps1
+++ b/Tests/Public/Export-ZertoVpg.Tests.ps1
@@ -0,0 +1,19 @@
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
+
+Describe $file.BaseName -Tag 'Unit' {
+
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
+    }
+}
\ No newline at end of file
diff --git a/Tests/Public/Get-ZertoAlert.Tests.ps1 b/Tests/Public/Get-ZertoAlert.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Get-ZertoAlert.Tests.ps1
+++ b/Tests/Public/Get-ZertoAlert.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Get-ZertoDatastore.Tests.ps1 b/Tests/Public/Get-ZertoDatastore.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Get-ZertoDatastore.Tests.ps1
+++ b/Tests/Public/Get-ZertoDatastore.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Get-ZertoEvent.Tests.ps1 b/Tests/Public/Get-ZertoEvent.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Get-ZertoEvent.Tests.ps1
+++ b/Tests/Public/Get-ZertoEvent.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Get-ZertoLicense.Tests.ps1 b/Tests/Public/Get-ZertoLicense.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Get-ZertoLicense.Tests.ps1
+++ b/Tests/Public/Get-ZertoLicense.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Get-ZertoLocalSite.Tests.ps1 b/Tests/Public/Get-ZertoLocalSite.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Get-ZertoLocalSite.Tests.ps1
+++ b/Tests/Public/Get-ZertoLocalSite.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Get-ZertoPeerSite.Tests.ps1 b/Tests/Public/Get-ZertoPeerSite.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Get-ZertoPeerSite.Tests.ps1
+++ b/Tests/Public/Get-ZertoPeerSite.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Get-ZertoProtectedVm.Tests.ps1 b/Tests/Public/Get-ZertoProtectedVm.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Get-ZertoProtectedVm.Tests.ps1
+++ b/Tests/Public/Get-ZertoProtectedVm.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Get-ZertoRecoveryReport.Tests.ps1 b/Tests/Public/Get-ZertoRecoveryReport.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Get-ZertoRecoveryReport.Tests.ps1
+++ b/Tests/Public/Get-ZertoRecoveryReport.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Get-ZertoResourcesReport.Tests.ps1 b/Tests/Public/Get-ZertoResourcesReport.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Get-ZertoResourcesReport.Tests.ps1
+++ b/Tests/Public/Get-ZertoResourcesReport.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Get-ZertoServiceProfile.Tests.ps1 b/Tests/Public/Get-ZertoServiceProfile.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Get-ZertoServiceProfile.Tests.ps1
+++ b/Tests/Public/Get-ZertoServiceProfile.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Get-ZertoTask.Tests.ps1 b/Tests/Public/Get-ZertoTask.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Get-ZertoTask.Tests.ps1
+++ b/Tests/Public/Get-ZertoTask.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Get-ZertoUnprotectedVm.Tests.ps1 b/Tests/Public/Get-ZertoUnprotectedVm.Tests.ps1
index e69de29..50d2f9d 100644
--- a/Tests/Public/Get-ZertoUnprotectedVm.Tests.ps1
+++ b/Tests/Public/Get-ZertoUnprotectedVm.Tests.ps1
@@ -0,0 +1,19 @@
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
+
+Describe $file.BaseName -Tag 'Unit' {
+
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
+    }
+}
\ No newline at end of file
diff --git a/Tests/Public/Get-ZertoVirtualizationSite.Tests.ps1 b/Tests/Public/Get-ZertoVirtualizationSite.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Get-ZertoVirtualizationSite.Tests.ps1
+++ b/Tests/Public/Get-ZertoVirtualizationSite.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Get-ZertoVolume.Tests.ps1 b/Tests/Public/Get-ZertoVolume.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Get-ZertoVolume.Tests.ps1
+++ b/Tests/Public/Get-ZertoVolume.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Get-ZertoVpg.Tests.ps1 b/Tests/Public/Get-ZertoVpg.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Get-ZertoVpg.Tests.ps1
+++ b/Tests/Public/Get-ZertoVpg.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Get-ZertoVpgSetting.Tests.ps1 b/Tests/Public/Get-ZertoVpgSetting.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Get-ZertoVpgSetting.Tests.ps1
+++ b/Tests/Public/Get-ZertoVpgSetting.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Get-ZertoVra.Tests.ps1 b/Tests/Public/Get-ZertoVra.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Get-ZertoVra.Tests.ps1
+++ b/Tests/Public/Get-ZertoVra.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Get-ZertoZorg.Tests.ps1 b/Tests/Public/Get-ZertoZorg.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Get-ZertoZorg.Tests.ps1
+++ b/Tests/Public/Get-ZertoZorg.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Get-ZertoZsspSession.Tests.ps1 b/Tests/Public/Get-ZertoZsspSession.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Get-ZertoZsspSession.Tests.ps1
+++ b/Tests/Public/Get-ZertoZsspSession.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Import-ZertoVpg.Tests.ps1 b/Tests/Public/Import-ZertoVpg.Tests.ps1
index e69de29..50d2f9d 100644
--- a/Tests/Public/Import-ZertoVpg.Tests.ps1
+++ b/Tests/Public/Import-ZertoVpg.Tests.ps1
@@ -0,0 +1,19 @@
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
+
+Describe $file.BaseName -Tag 'Unit' {
+
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
+    }
+}
\ No newline at end of file
diff --git a/Tests/Public/Install-ZertoVra.Tests.ps1 b/Tests/Public/Install-ZertoVra.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Install-ZertoVra.Tests.ps1
+++ b/Tests/Public/Install-ZertoVra.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Invoke-ZertoFailover.Tests.ps1 b/Tests/Public/Invoke-ZertoFailover.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Invoke-ZertoFailover.Tests.ps1
+++ b/Tests/Public/Invoke-ZertoFailover.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Invoke-ZertoFailoverCommit.Tests.ps1 b/Tests/Public/Invoke-ZertoFailoverCommit.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Invoke-ZertoFailoverCommit.Tests.ps1
+++ b/Tests/Public/Invoke-ZertoFailoverCommit.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Invoke-ZertoFailoverRollback.Tests.ps1 b/Tests/Public/Invoke-ZertoFailoverRollback.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Invoke-ZertoFailoverRollback.Tests.ps1
+++ b/Tests/Public/Invoke-ZertoFailoverRollback.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Invoke-ZertoForceSync.Tests.ps1 b/Tests/Public/Invoke-ZertoForceSync.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Invoke-ZertoForceSync.Tests.ps1
+++ b/Tests/Public/Invoke-ZertoForceSync.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Invoke-ZertoMove.Tests.ps1 b/Tests/Public/Invoke-ZertoMove.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Invoke-ZertoMove.Tests.ps1
+++ b/Tests/Public/Invoke-ZertoMove.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Invoke-ZertoMoveCommit.Tests.ps1 b/Tests/Public/Invoke-ZertoMoveCommit.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Invoke-ZertoMoveCommit.Tests.ps1
+++ b/Tests/Public/Invoke-ZertoMoveCommit.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Invoke-ZertoMoveRollback.Tests.ps1 b/Tests/Public/Invoke-ZertoMoveRollback.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Invoke-ZertoMoveRollback.Tests.ps1
+++ b/Tests/Public/Invoke-ZertoMoveRollback.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/New-ZertoVpg.Tests.ps1 b/Tests/Public/New-ZertoVpg.Tests.ps1
index e69de29..50d2f9d 100644
--- a/Tests/Public/New-ZertoVpg.Tests.ps1
+++ b/Tests/Public/New-ZertoVpg.Tests.ps1
@@ -0,0 +1,19 @@
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
+
+Describe $file.BaseName -Tag 'Unit' {
+
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
+    }
+}
\ No newline at end of file
diff --git a/Tests/Public/New-ZertoVpgSettingsIdentifier.Tests.ps1 b/Tests/Public/New-ZertoVpgSettingsIdentifier.Tests.ps1
index e69de29..50d2f9d 100644
--- a/Tests/Public/New-ZertoVpgSettingsIdentifier.Tests.ps1
+++ b/Tests/Public/New-ZertoVpgSettingsIdentifier.Tests.ps1
@@ -0,0 +1,19 @@
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
+
+Describe $file.BaseName -Tag 'Unit' {
+
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
+    }
+}
\ No newline at end of file
diff --git a/Tests/Public/Remove-ZertoPeerSite.Tests.ps1 b/Tests/Public/Remove-ZertoPeerSite.Tests.ps1
index e69de29..50d2f9d 100644
--- a/Tests/Public/Remove-ZertoPeerSite.Tests.ps1
+++ b/Tests/Public/Remove-ZertoPeerSite.Tests.ps1
@@ -0,0 +1,19 @@
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
+
+Describe $file.BaseName -Tag 'Unit' {
+
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
+    }
+}
\ No newline at end of file
diff --git a/Tests/Public/Remove-ZertoVpg.Tests.ps1 b/Tests/Public/Remove-ZertoVpg.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Remove-ZertoVpg.Tests.ps1
+++ b/Tests/Public/Remove-ZertoVpg.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Resume-ZertoVpg.Tests.ps1 b/Tests/Public/Resume-ZertoVpg.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Resume-ZertoVpg.Tests.ps1
+++ b/Tests/Public/Resume-ZertoVpg.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Save-ZertoVpgSetting.Tests.ps1 b/Tests/Public/Save-ZertoVpgSetting.Tests.ps1
index e69de29..50d2f9d 100644
--- a/Tests/Public/Save-ZertoVpgSetting.Tests.ps1
+++ b/Tests/Public/Save-ZertoVpgSetting.Tests.ps1
@@ -0,0 +1,19 @@
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
+
+Describe $file.BaseName -Tag 'Unit' {
+
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
+    }
+}
\ No newline at end of file
diff --git a/Tests/Public/Set-ZertoAlert.Tests.ps1 b/Tests/Public/Set-ZertoAlert.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Set-ZertoAlert.Tests.ps1
+++ b/Tests/Public/Set-ZertoAlert.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Set-ZertoLicense.Tests.ps1 b/Tests/Public/Set-ZertoLicense.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Set-ZertoLicense.Tests.ps1
+++ b/Tests/Public/Set-ZertoLicense.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Start-ZertoCloneVpg.Tests.ps1 b/Tests/Public/Start-ZertoCloneVpg.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Start-ZertoCloneVpg.Tests.ps1
+++ b/Tests/Public/Start-ZertoCloneVpg.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Start-ZertoFailoverTest.Tests.ps1 b/Tests/Public/Start-ZertoFailoverTest.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Start-ZertoFailoverTest.Tests.ps1
+++ b/Tests/Public/Start-ZertoFailoverTest.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Stop-ZertoCloneVpg.Tests.ps1 b/Tests/Public/Stop-ZertoCloneVpg.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Stop-ZertoCloneVpg.Tests.ps1
+++ b/Tests/Public/Stop-ZertoCloneVpg.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Stop-ZertoFailoverTest.Tests.ps1 b/Tests/Public/Stop-ZertoFailoverTest.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Stop-ZertoFailoverTest.Tests.ps1
+++ b/Tests/Public/Stop-ZertoFailoverTest.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Suspend-ZertoVpg.Tests.ps1 b/Tests/Public/Suspend-ZertoVpg.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Suspend-ZertoVpg.Tests.ps1
+++ b/Tests/Public/Suspend-ZertoVpg.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file
diff --git a/Tests/Public/Uninstall-ZertoVra.Tests.ps1 b/Tests/Public/Uninstall-ZertoVra.Tests.ps1
index 2d8dbc5..50d2f9d 100644
--- a/Tests/Public/Uninstall-ZertoVra.Tests.ps1
+++ b/Tests/Public/Uninstall-ZertoVra.Tests.ps1
@@ -1,23 +1,19 @@
-$moduleFileName = "ZertoApiWrapper.psm1"
-$filePath = (Split-Path -Parent $MyInvocation.MyCommand.Path) -replace 'Tests', 'ZertoApiWrapper'
-$fileName = (Split-Path -Leaf $MyInvocation.MyCommand.Path ) -replace '.Tests.', '.'
-$commandName = $fileName -replace '.ps1', ''
-$modulePath = $filePath -replace "Public", ""
-Import-Module $modulePath\$moduleFileName -Force
+#Requires -Modules Pester
+$moduleFileName = "ZertoApiWrapper.psd1"
+$here = (Split-Path -Parent $MyInvocation.MyCommand.Path).Replace("Tests", "ZertoApiWrapper")
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path).Replace(".Tests.", ".")
+$file = Get-ChildItem "$here\$sut"
+$modulePath = $here -replace "Public", ""
+$moduleFile = Get-ChildItem "$modulePath\$moduleFileName"
+Get-Module -Name ZertoApiWrapper | Remove-Module -Force
+Import-Module $moduleFile -Force
 
-$userName = "zerto\build"
-$password = ConvertTo-SecureString -String "ZertoBuild" -AsPlainText -Force
-$credential = New-Object -TypeName System.Management.Automation.PSCredential($userName, $password)
+Describe $file.BaseName -Tag 'Unit' {
 
-# $credential = Import-Clixml -Path C:\ZertoScripts\Creds.xml
-$zertoServer = "192.168.1.100"
-$zertoPort = "7669"
-
-Describe "$commandName" {
-    it "file should exist" {
-        "$filePath\$fileName" | should exist
-    }
-    it "module should have a function called $commandName" {
-        get-command $commandName | should be $true
+    It "is valid Powershell (Has no script errors)" {
+        $contents = Get-Content -Path $file -ErrorAction Stop
+        $errors = $null
+        $null = [System.Management.Automation.PSParser]::Tokenize($contents, [ref]$errors)
+        $errors | Should -HaveCount 0
     }
 }
\ No newline at end of file