diff --git a/images/win/scripts/ImageHelpers/VisualStudioHelpers.ps1 b/images/win/scripts/ImageHelpers/VisualStudioHelpers.ps1
index 8be653f42..7c1b7a1cb 100644
--- a/images/win/scripts/ImageHelpers/VisualStudioHelpers.ps1
+++ b/images/win/scripts/ImageHelpers/VisualStudioHelpers.ps1
@@ -60,9 +60,12 @@ Function Install-VisualStudio
     }
 }
 
+function Get-VisualStudioInstancePath {
+    return "C:\ProgramData\Microsoft\VisualStudio\Packages\_Instances\" + (Get-VisualStudioProduct -ProductType "VisualStudio").InstanceId
+}
+
 function Get-VsCatalogJsonPath {
-    $instanceFolder = "C:\ProgramData\Microsoft\VisualStudio\Packages\_Instances\" + (Get-VisualStudioProduct -ProductType "VisualStudio").InstanceId
-    return Join-Path $instanceFolder "catalog.json"
+    return Join-Path (Get-VisualStudioInstancePath) "catalog.json"
 }
 
 function Get-VisualStudioProduct {
@@ -81,7 +84,7 @@ function Get-VisualStudioProduct {
     {
         $VSSelectionType = "*Build*"
     }
-    return Get-VSSetupInstance | Select-VSSetupInstance -Product * | Where-Object -Property DisplayName -like $VSSelectionType
+    return Get-VSSetupInstance | Where-Object -Property DisplayName -like $VSSelectionType
 }
 
 function Get-VisualStudioComponents {
@@ -103,8 +106,7 @@ function Get-VSExtensionVersion
         [string] $packageName
     )
 
-    $instanceFolders = "C:\ProgramData\Microsoft\VisualStudio\Packages\_Instances\" + (Get-VisualStudioProduct -ProductType "VisualStudio").InstanceId
-    $state = Get-Content -Path (Join-Path $instanceFolders '\state.packages.json') | ConvertFrom-Json
+    $state = Get-Content -Path (Join-Path (Get-VisualStudioInstancePath) '\state.packages.json') | ConvertFrom-Json
     $packageVersion = ($state.packages | Where-Object { $_.id -eq $packageName }).version
 
     if (-not $packageVersion)
diff --git a/images/win/scripts/Tests/VisualStudio.Tests.ps1 b/images/win/scripts/Tests/VisualStudio.Tests.ps1
index 34c59e2d9..56869cc91 100644
--- a/images/win/scripts/Tests/VisualStudio.Tests.ps1
+++ b/images/win/scripts/Tests/VisualStudio.Tests.ps1
@@ -12,8 +12,7 @@ Describe "Visual Studio" {
     }
 
     Context "Visual Studio components" {
-        $expectedComponents = Get-ToolsetContent | Select-Object -ExpandProperty visualStudio | Select-Object -ExpandProperty workloads
-        $testCases = $expectedComponents | ForEach-Object { @{ComponentName = $_} }
+        $testCases = (Get-ToolsetContent).visualStudio.workloads | ForEach-Object { @{ComponentName = $_} }
         BeforeAll {
             $installedComponents = Get-VisualStudioComponents -ProductType "VisualStudio" | Select-Object -ExpandProperty Package
         }
@@ -24,8 +23,7 @@ Describe "Visual Studio" {
     }
 
     Context "Visual Studio Build Tools components" {
-        $expectedComponents = Get-ToolsetContent | Select-Object -ExpandProperty visualStudio | Select-Object -ExpandProperty buildtools_workloads
-        $testCases = $expectedComponents | ForEach-Object { @{ComponentName = $_} }
+        $testCases = (Get-ToolsetContent).visualStudio.buildtools_workloads | ForEach-Object { @{ComponentName = $_} }
         BeforeAll {
             $installedComponents = Get-VisualStudioComponents -ProductType "BuildTools" | Select-Object -ExpandProperty Package
         }