diff --git a/images/macos/provision/core/pypy.sh b/images/macos/provision/core/pypy.sh
index 30bde57c6..ffcbbed14 100644
--- a/images/macos/provision/core/pypy.sh
+++ b/images/macos/provision/core/pypy.sh
@@ -79,13 +79,6 @@ pypyVersions=$(curl -4 -s --compressed $uri | grep 'osx64' | awk -v uri="$uri" -
 toolsetVersions=$(get_toolset_value '.toolcache[] | select(.name | contains("PyPy")) | .versions[]')
 versionPattern="v[0-9]+\.[0-9]+\.[0-9]+-"
 
-# PyPy 7.3.2 for High Sierra is broken, use 7.3.1 instead https://foss.heptapod.net/pypy/pypy/-/issues/3311
-if is_HighSierra; then
-    versionPattern="v7.3.1-"
-    # PyPy 7.3.1 relies on system libffi.6.dylib, which is not existed in in libffi 3.3 release. As a workaround symlink can be created
-    ln -s libffi.7.dylib /usr/local/opt/libffi/lib/libffi.6.dylib
-fi
-
 for toolsetVersion in $toolsetVersions; do
     latestMajorPyPyVersion=$(echo "${pypyVersions}" | grep -E "pypy${toolsetVersion}-${versionPattern}" | head -1)
     if [[ -z "$latestMajorPyPyVersion" ]]; then
diff --git a/images/macos/tests/Android.Tests.ps1 b/images/macos/tests/Android.Tests.ps1
index 5aadd3dc6..7f8171a50 100644
--- a/images/macos/tests/Android.Tests.ps1
+++ b/images/macos/tests/Android.Tests.ps1
@@ -1,6 +1,6 @@
 Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
-Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1"
-Import-Module "$PSScriptRoot/../software-report/SoftwareReport.Android.psm1"
+Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking
+Import-Module "$PSScriptRoot/../software-report/SoftwareReport.Android.psm1" -DisableNameChecking
 
 $os = Get-OSVersion
 
diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1
index 65bc3cccd..e68ab94d7 100644
--- a/images/macos/tests/Common.Tests.ps1
+++ b/images/macos/tests/Common.Tests.ps1
@@ -1,5 +1,5 @@
 Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
-Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1"
+Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking
 
 $os = Get-OSVersion
 
diff --git a/images/macos/tests/Java.Tests.ps1 b/images/macos/tests/Java.Tests.ps1
index 1b81e2fb0..db5c7441a 100644
--- a/images/macos/tests/Java.Tests.ps1
+++ b/images/macos/tests/Java.Tests.ps1
@@ -1,5 +1,5 @@
 Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
-Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1"
+Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking
 
 function Get-NativeVersionFormat {
     param($Version)
diff --git a/images/macos/tests/Linters.Tests.ps1 b/images/macos/tests/Linters.Tests.ps1
index 31d3698cc..4a383dbd2 100644
--- a/images/macos/tests/Linters.Tests.ps1
+++ b/images/macos/tests/Linters.Tests.ps1
@@ -1,4 +1,4 @@
-Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1"
+Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking
 
 $os = Get-OSVersion
 
diff --git a/images/macos/tests/Node.Tests.ps1 b/images/macos/tests/Node.Tests.ps1
index 9a5e8c11f..667f17e9f 100644
--- a/images/macos/tests/Node.Tests.ps1
+++ b/images/macos/tests/Node.Tests.ps1
@@ -1,5 +1,5 @@
 Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
-Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1"
+Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking
 
 Describe "Node.js" {
     BeforeAll {
diff --git a/images/macos/tests/Powershell.Tests.ps1 b/images/macos/tests/Powershell.Tests.ps1
index 42db9ddab..2be58e0a1 100644
--- a/images/macos/tests/Powershell.Tests.ps1
+++ b/images/macos/tests/Powershell.Tests.ps1
@@ -1,5 +1,5 @@
 Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
-Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1"
+Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking
 
 Describe "Powershell" {
     It "Powershell is installed" {
diff --git a/images/macos/tests/Python.Tests.ps1 b/images/macos/tests/Python.Tests.ps1
index c75a7019d..6d8c98dc0 100644
--- a/images/macos/tests/Python.Tests.ps1
+++ b/images/macos/tests/Python.Tests.ps1
@@ -1,5 +1,5 @@
 Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
-Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1"
+Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking
 
 $os = Get-OSVersion
 
diff --git a/images/macos/tests/Ruby.Tests.ps1 b/images/macos/tests/Ruby.Tests.ps1
index 116f09378..222c182f2 100644
--- a/images/macos/tests/Ruby.Tests.ps1
+++ b/images/macos/tests/Ruby.Tests.ps1
@@ -1,5 +1,5 @@
 Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
-Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1"
+Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking
 
 Describe "Ruby" {
     It "Ruby is available" {
diff --git a/images/macos/tests/RunAll-Tests.ps1 b/images/macos/tests/RunAll-Tests.ps1
index a3242dc01..015491cd2 100644
--- a/images/macos/tests/RunAll-Tests.ps1
+++ b/images/macos/tests/RunAll-Tests.ps1
@@ -1,3 +1,3 @@
-Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1"
+Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking
 
 Invoke-PesterTests "*"
\ No newline at end of file
diff --git a/images/macos/tests/Toolcache.Tests.ps1 b/images/macos/tests/Toolcache.Tests.ps1
index 74ac6cfd1..5989288b5 100644
--- a/images/macos/tests/Toolcache.Tests.ps1
+++ b/images/macos/tests/Toolcache.Tests.ps1
@@ -1,22 +1,10 @@
 Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
-Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1"
+Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking
 
 $os = Get-OSVersion
 
 Describe "Toolcache" {
     $toolcacheDirectory = Join-Path $env:HOME "hostedtoolcache"
-    [array]$packages = @()
-    if ($os.IsHighSierra) {
-        [array]$packages += (Get-ToolcachePackages).PSObject.Properties | ForEach-Object {
-            $packageNameParts = $_.Name.Split("-")
-            return [PSCustomObject] @{
-                ToolName = $packageNameParts[1]
-                Arch = $packageNameParts[4]
-                Versions = $_.Value
-            }
-        }
-    }
-
     [array]$packages += Get-ToolsetValue -KeyPath "toolcache" | ForEach-Object {
         return [PSCustomObject] @{
             ToolName = ($_.name).ToLower()
diff --git a/images/macos/tests/Xamarin.Tests.ps1 b/images/macos/tests/Xamarin.Tests.ps1
index 2145f29a7..745086f91 100644
--- a/images/macos/tests/Xamarin.Tests.ps1
+++ b/images/macos/tests/Xamarin.Tests.ps1
@@ -1,5 +1,5 @@
 Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
-Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1"
+Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking
 
 $MONO_VERSIONS = Get-ToolsetValue "xamarin.mono-versions"
 $XAMARIN_IOS_VERSIONS = Get-ToolsetValue "xamarin.ios-versions"
diff --git a/images/macos/tests/XamarinNDK.Tests.ps1 b/images/macos/tests/XamarinNDK.Tests.ps1
index 3495004ff..62d45c377 100644
--- a/images/macos/tests/XamarinNDK.Tests.ps1
+++ b/images/macos/tests/XamarinNDK.Tests.ps1
@@ -1,7 +1,7 @@
 
 Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
-Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1"
-Import-Module "$PSScriptRoot/../software-report/SoftwareReport.Android.psm1"
+Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking
+Import-Module "$PSScriptRoot/../software-report/SoftwareReport.Android.psm1" -DisableNameChecking
 
 $os = Get-OSVersion
 
diff --git a/images/macos/tests/Xcode.Tests.ps1 b/images/macos/tests/Xcode.Tests.ps1
index 244b66dc8..73d86bb49 100644
--- a/images/macos/tests/Xcode.Tests.ps1
+++ b/images/macos/tests/Xcode.Tests.ps1
@@ -1,6 +1,6 @@
 Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
 Import-Module "$PSScriptRoot/../helpers/Xcode.Helpers.psm1"
-Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1"
+Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking
 
 $xcodeVersions = Get-ToolsetValue "xcode.versions"
 $defaultXcode = Get-ToolsetValue "xcode.default"
diff --git a/images/macos/toolsets/toolset-10.13.json b/images/macos/toolsets/toolset-10.13.json
index 2caacab0e..71134939a 100644
--- a/images/macos/toolsets/toolset-10.13.json
+++ b/images/macos/toolsets/toolset-10.13.json
@@ -248,8 +248,7 @@
                 "2.4.*",
                 "2.5.*",
                 "2.6.*",
-                "2.7.*",
-                "3.0.*"
+                "2.7.*"
             ]
         }
     ],