diff --git a/tests/Backup-DbaDbCertificate.Tests.ps1 b/tests/Backup-DbaDbCertificate.Tests.ps1
index 2a89fb5d41..b4274decc9 100644
--- a/tests/Backup-DbaDbCertificate.Tests.ps1
+++ b/tests/Backup-DbaDbCertificate.Tests.ps1
@@ -27,13 +27,13 @@ Describe "Backup-DbaDbCertificate" {
             $CommandUnderTest | Should -HaveParameter DecryptionPassword -Type SecureString
         }
         It "Should have Path parameter" {
-            $CommandUnderTest | Should -HaveParameter Path -Type FileInfo
+            $CommandUnderTest | Should -HaveParameter Path -Type System.IO.FileInfo
         }
         It "Should have Suffix parameter" {
             $CommandUnderTest | Should -HaveParameter Suffix -Type String
         }
         It "Should have InputObject parameter" {
-            $CommandUnderTest | Should -HaveParameter InputObject -Type Certificate[]
+            $CommandUnderTest | Should -HaveParameter InputObject -Type Microsoft.SqlServer.Management.Smo.Certificate[]
         }
         It "Should have EnableException parameter" {
             $CommandUnderTest | Should -HaveParameter EnableException -Type Switch
diff --git a/tests/Export-DbaDiagnosticQuery.Tests.ps1 b/tests/Export-DbaDiagnosticQuery.Tests.ps1
index 69708a649d..509e119fe0 100644
--- a/tests/Export-DbaDiagnosticQuery.Tests.ps1
+++ b/tests/Export-DbaDiagnosticQuery.Tests.ps1
@@ -18,7 +18,7 @@ Describe "Export-DbaDiagnosticQuery" {
             $CommandUnderTest | Should -HaveParameter ConvertTo -Type String -Mandatory:$false
         }
         It "Should have Path as a parameter" {
-            $CommandUnderTest | Should -HaveParameter Path -Type FileInfo -Mandatory:$false
+            $CommandUnderTest | Should -HaveParameter Path -Type System.IO.FileInfo -Mandatory:$false
         }
         It "Should have Suffix as a parameter" {
             $CommandUnderTest | Should -HaveParameter Suffix -Type String -Mandatory:$false
diff --git a/tests/Export-DbaLinkedServer.Tests.ps1 b/tests/Export-DbaLinkedServer.Tests.ps1
index 0743b939fb..5f2e58cd23 100644
--- a/tests/Export-DbaLinkedServer.Tests.ps1
+++ b/tests/Export-DbaLinkedServer.Tests.ps1
@@ -30,7 +30,7 @@ Describe "Export-DbaLinkedServer" {
             $CommandUnderTest | Should -HaveParameter Append -Type Switch
         }
         It "Should have InputObject as a parameter" {
-            $CommandUnderTest | Should -HaveParameter InputObject -Type LinkedServer[]
+            $CommandUnderTest | Should -HaveParameter InputObject -Type Microsoft.SqlServer.Management.Smo.LinkedServer[]
         }
         It "Should have EnableException as a switch parameter" {
             $CommandUnderTest | Should -HaveParameter EnableException -Type Switch
diff --git a/tests/Export-DbaRegServer.Tests.ps1 b/tests/Export-DbaRegServer.Tests.ps1
index 2c7b8bf310..c9221256ed 100644
--- a/tests/Export-DbaRegServer.Tests.ps1
+++ b/tests/Export-DbaRegServer.Tests.ps1
@@ -21,7 +21,7 @@ Describe "Export-DbaRegServer" {
             $CommandUnderTest | Should -HaveParameter Path -Type String
         }
         It "Should have FilePath as a parameter" {
-            $CommandUnderTest | Should -HaveParameter FilePath -Type FileInfo
+            $CommandUnderTest | Should -HaveParameter FilePath -Type System.IO.FileInfo
         }
         It "Should have CredentialPersistenceType as a parameter" {
             $CommandUnderTest | Should -HaveParameter CredentialPersistenceType -Type String
diff --git a/tests/Find-DbaInstance.Tests.ps1 b/tests/Find-DbaInstance.Tests.ps1
index c2f72c04d4..022575aaa4 100644
--- a/tests/Find-DbaInstance.Tests.ps1
+++ b/tests/Find-DbaInstance.Tests.ps1
@@ -9,7 +9,7 @@ Describe "Find-DbaInstance" {
             $CommandUnderTest | Should -HaveParameter ComputerName -Type DbaInstanceParameter[] -Mandatory:$false
         }
         It "Should have DiscoveryType as a non-mandatory parameter of type DbaInstanceDiscoveryType" {
-            $CommandUnderTest | Should -HaveParameter DiscoveryType -Type DbaInstanceDiscoveryType -Mandatory:$false
+            $CommandUnderTest | Should -HaveParameter DiscoveryType -Type Dataplat.Dbatools.Types.DbaInstanceDiscoveryType -Mandatory:$false
         }
         It "Should have Credential as a non-mandatory parameter of type PSCredential" {
             $CommandUnderTest | Should -HaveParameter Credential -Type PSCredential -Mandatory:$false
@@ -18,7 +18,7 @@ Describe "Find-DbaInstance" {
             $CommandUnderTest | Should -HaveParameter SqlCredential -Type PSCredential -Mandatory:$false
         }
         It "Should have ScanType as a non-mandatory parameter of type DbaInstanceScanType[]" {
-            $CommandUnderTest | Should -HaveParameter ScanType -Type DbaInstanceScanType[] -Mandatory:$false
+            $CommandUnderTest | Should -HaveParameter ScanType -Type Dataplat.Dbatools.Types.DbaInstanceScanType[] -Mandatory:$false
         }
         It "Should have IpAddress as a non-mandatory parameter of type String[]" {
             $CommandUnderTest | Should -HaveParameter IpAddress -Type String[] -Mandatory:$false
@@ -30,7 +30,7 @@ Describe "Find-DbaInstance" {
             $CommandUnderTest | Should -HaveParameter TCPPort -Type Int32[] -Mandatory:$false
         }
         It "Should have MinimumConfidence as a non-mandatory parameter of type DbaInstanceConfidenceLevel" {
-            $CommandUnderTest | Should -HaveParameter MinimumConfidence -Type DbaInstanceConfidenceLevel -Mandatory:$false
+            $CommandUnderTest | Should -HaveParameter MinimumConfidence -Type Dataplat.Dbatools.Types.DbaInstanceConfidenceLevel -Mandatory:$false
         }
         It "Should have EnableException as a non-mandatory switch parameter" {
             $CommandUnderTest | Should -HaveParameter EnableException -Type Switch -Mandatory:$false
diff --git a/tests/Get-DbaCmObject.Tests.ps1 b/tests/Get-DbaCmObject.Tests.ps1
index 817283dcfe..4aec6d5d5b 100644
--- a/tests/Get-DbaCmObject.Tests.ps1
+++ b/tests/Get-DbaCmObject.Tests.ps1
@@ -27,7 +27,7 @@ Describe "Get-DbaCmObject" {
             $CommandUnderTest | Should -HaveParameter Namespace -Type String -Mandatory:$false
         }
         It "Should have DoNotUse as a non-mandatory ManagementConnectionType[] parameter" {
-            $CommandUnderTest | Should -HaveParameter DoNotUse -Type ManagementConnectionType[] -Mandatory:$false
+            $CommandUnderTest | Should -HaveParameter DoNotUse -Type Dataplat.Dbatools.Connection.ManagementConnectionType[] -Mandatory:$false
         }
         It "Should have Force as a non-mandatory Switch" {
             $CommandUnderTest | Should -HaveParameter Force -Type Switch -Mandatory:$false
diff --git a/tests/Import-DbaBinaryFile.Tests.ps1 b/tests/Import-DbaBinaryFile.Tests.ps1
index 6eaaeb00b7..4a5ef15e7b 100644
--- a/tests/Import-DbaBinaryFile.Tests.ps1
+++ b/tests/Import-DbaBinaryFile.Tests.ps1
@@ -53,10 +53,10 @@ Describe "Import-DbaBinaryFile" {
             $CommandUnderTest | Should -HaveParameter InputObject -Type [Microsoft.SqlServer.Management.Smo.Table[]]
         }
         It "Should have FilePath as a parameter" {
-            $CommandUnderTest | Should -HaveParameter FilePath -Type FileInfo[]
+            $CommandUnderTest | Should -HaveParameter FilePath -Type System.IO.FileInfo[]
         }
         It "Should have Path as a parameter" {
-            $CommandUnderTest | Should -HaveParameter Path -Type FileInfo[]
+            $CommandUnderTest | Should -HaveParameter Path -Type System.IO.FileInfo[]
         }
         It "Should have EnableException as a switch parameter" {
             $CommandUnderTest | Should -HaveParameter EnableException -Type Switch
diff --git a/tests/Invoke-DbaDiagnosticQuery.Tests.ps1 b/tests/Invoke-DbaDiagnosticQuery.Tests.ps1
index 190032b659..429912e268 100644
--- a/tests/Invoke-DbaDiagnosticQuery.Tests.ps1
+++ b/tests/Invoke-DbaDiagnosticQuery.Tests.ps1
@@ -54,7 +54,7 @@ Describe "Invoke-DbaDiagnosticQuery" {
             $CommandUnderTest | Should -HaveParameter SqlCredential -Type PSCredential
         }
         It "Should have Path as a parameter" {
-            $CommandUnderTest | Should -HaveParameter Path -Type FileInfo
+            $CommandUnderTest | Should -HaveParameter Path -Type System.IO.FileInfo
         }
         It "Should have QueryName as a parameter" {
             $CommandUnderTest | Should -HaveParameter QueryName -Type String[]
diff --git a/tests/Invoke-DbatoolsRenameHelper.Tests.ps1 b/tests/Invoke-DbatoolsRenameHelper.Tests.ps1
index c701c7cbef..94bcf03dc8 100644
--- a/tests/Invoke-DbatoolsRenameHelper.Tests.ps1
+++ b/tests/Invoke-DbatoolsRenameHelper.Tests.ps1
@@ -48,7 +48,7 @@ function Get-DbaStub {
             $CommandUnderTest = Get-Command Invoke-DbatoolsRenameHelper
         }
         It "Should have InputObject as a parameter" {
-            $CommandUnderTest | Should -HaveParameter InputObject -Type FileInfo[] -Mandatory:$false
+            $CommandUnderTest | Should -HaveParameter InputObject -Type System.IO.FileInfo[] -Mandatory:$false
         }
         It "Should have Encoding as a parameter" {
             $CommandUnderTest | Should -HaveParameter Encoding -Type String -Mandatory:$false
diff --git a/tests/New-DbaCmConnection.Tests.ps1 b/tests/New-DbaCmConnection.Tests.ps1
index 37ce7d4a45..c42b956594 100644
--- a/tests/New-DbaCmConnection.Tests.ps1
+++ b/tests/New-DbaCmConnection.Tests.ps1
@@ -18,7 +18,7 @@ Describe "New-DbaCmConnection" {
             $CommandUnderTest | Should -HaveParameter OverrideExplicitCredential -Type switch
         }
         It "Should have DisabledConnectionTypes as a parameter" {
-            $CommandUnderTest | Should -HaveParameter DisabledConnectionTypes -Type ManagementConnectionType
+            $CommandUnderTest | Should -HaveParameter DisabledConnectionTypes -Type Dataplat.Dbatools.Connection.ManagementConnectionType
         }
         It "Should have DisableBadCredentialCache as a switch parameter" {
             $CommandUnderTest | Should -HaveParameter DisableBadCredentialCache -Type switch
diff --git a/tests/New-DbaLinkedServerLogin.Tests.ps1 b/tests/New-DbaLinkedServerLogin.Tests.ps1
index d80658367c..cbd8926c72 100644
--- a/tests/New-DbaLinkedServerLogin.Tests.ps1
+++ b/tests/New-DbaLinkedServerLogin.Tests.ps1
@@ -27,7 +27,7 @@ Describe "New-DbaLinkedServerLogin" {
             $CommandUnderTest | Should -HaveParameter Impersonate -Type Switch -Mandatory:$false
         }
         It "Should have InputObject parameter" {
-            $CommandUnderTest | Should -HaveParameter InputObject -Type LinkedServer[] -Mandatory:$false
+            $CommandUnderTest | Should -HaveParameter InputObject -Type Microsoft.SqlServer.Management.Smo.LinkedServer[] -Mandatory:$false
         }
         It "Should have EnableException parameter" {
             $CommandUnderTest | Should -HaveParameter EnableException -Type Switch -Mandatory:$false
diff --git a/tests/Remove-DbaDbCertificate.Tests.ps1 b/tests/Remove-DbaDbCertificate.Tests.ps1
index 2319e12aff..975f69cb0f 100644
--- a/tests/Remove-DbaDbCertificate.Tests.ps1
+++ b/tests/Remove-DbaDbCertificate.Tests.ps1
@@ -29,7 +29,7 @@ Describe "Remove-DbaDbCertificate Unit Tests" -Tag 'UnitTests' {
         }
 
         It "Should have InputObject parameter" {
-            $command | Should -HaveParameter InputObject -Type Certificate[] -Mandatory:$false
+            $command | Should -HaveParameter InputObject -Type Microsoft.SqlServer.Management.Smo.Certificate[] -Mandatory:$false
         }
 
         It "Should have EnableException parameter" {
diff --git a/tests/Save-DbaDiagnosticQueryScript.Tests.ps1 b/tests/Save-DbaDiagnosticQueryScript.Tests.ps1
index 0bf4524b34..3e24dc34b5 100644
--- a/tests/Save-DbaDiagnosticQueryScript.Tests.ps1
+++ b/tests/Save-DbaDiagnosticQueryScript.Tests.ps1
@@ -12,7 +12,7 @@ Describe "Save-DbaDiagnosticQueryScript" {
             $CommandUnderTest = Get-Command Save-DbaDiagnosticQueryScript
         }
         It "Should have Path as a non-mandatory parameter of type FileInfo" {
-            $CommandUnderTest | Should -HaveParameter Path -Type FileInfo -Mandatory:$false
+            $CommandUnderTest | Should -HaveParameter Path -Type System.IO.FileInfo -Mandatory:$false
         }
         It "Should have EnableException as a non-mandatory switch parameter" {
             $CommandUnderTest | Should -HaveParameter EnableException -Type Switch -Mandatory:$false
diff --git a/tests/Set-DbaCmConnection.Tests.ps1 b/tests/Set-DbaCmConnection.Tests.ps1
index 6cc2208eb3..37934f675e 100644
--- a/tests/Set-DbaCmConnection.Tests.ps1
+++ b/tests/Set-DbaCmConnection.Tests.ps1
@@ -21,7 +21,7 @@ Describe "Set-DbaCmConnection" {
             $CommandUnderTest | Should -HaveParameter OverrideConnectionPolicy -Type Switch -Mandatory:$false
         }
         It "Should have DisabledConnectionTypes parameter" {
-            $CommandUnderTest | Should -HaveParameter DisabledConnectionTypes -Type ManagementConnectionType -Mandatory:$false
+            $CommandUnderTest | Should -HaveParameter DisabledConnectionTypes -Type Dataplat.Dbatools.Connection.ManagementConnectionType -Mandatory:$false
         }
         It "Should have DisableBadCredentialCache parameter" {
             $CommandUnderTest | Should -HaveParameter DisableBadCredentialCache -Type Switch -Mandatory:$false
diff --git a/tests/Test-DbaCmConnection.Tests.ps1 b/tests/Test-DbaCmConnection.Tests.ps1
index e7e72a55ee..efb9992e99 100644
--- a/tests/Test-DbaCmConnection.Tests.ps1
+++ b/tests/Test-DbaCmConnection.Tests.ps1
@@ -18,7 +18,7 @@ Describe "Test-DbaCmConnection" {
             $CommandUnderTest | Should -HaveParameter Credential -Type PSCredential
         }
         It "Should have Type as a parameter" {
-            $CommandUnderTest | Should -HaveParameter Type -Type ManagementConnectionType[]
+            $CommandUnderTest | Should -HaveParameter Type -Type Dataplat.Dbatools.Connection.ManagementConnectionType[]
         }
         It "Should have Force as a switch parameter" {
             $CommandUnderTest | Should -HaveParameter Force -Type switch