diff --git a/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistry.Tests.ps1 b/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistry.Tests.ps1
index 6c3efc7b..12a294ee 100644
--- a/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistry.Tests.ps1
+++ b/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistry.Tests.ps1
@@ -1,6 +1,6 @@
-$loadEnvPath = Join-Path $PSScriptRoot 'loadEnv.ps1'
+$loadEnvPath = Join-Path $PSScriptRoot 'loadEnvJson.ps1'
 if (-Not (Test-Path -Path $loadEnvPath)) {
-    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnv.ps1'
+    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnvJson.ps1'
 }
 . ($loadEnvPath)
 $TestRecordingFile = Join-Path $PSScriptRoot 'Get-AzsContainerRegistry.Recording.json'
diff --git a/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistryCapacity.Tests.ps1 b/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistryCapacity.Tests.ps1
index a89cc119..b0920802 100644
--- a/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistryCapacity.Tests.ps1
+++ b/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistryCapacity.Tests.ps1
@@ -1,6 +1,6 @@
-$loadEnvPath = Join-Path $PSScriptRoot 'loadEnv.ps1'
+$loadEnvPath = Join-Path $PSScriptRoot 'loadEnvJson.ps1'
 if (-Not (Test-Path -Path $loadEnvPath)) {
-    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnv.ps1'
+    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnvJson.ps1'
 }
 . ($loadEnvPath)
 $TestRecordingFile = Join-Path $PSScriptRoot 'Get-AzsContainerRegistryCapacity.Recording.json'
diff --git a/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistryConfiguration.Tests.ps1 b/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistryConfiguration.Tests.ps1
index e02ab919..15014c11 100644
--- a/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistryConfiguration.Tests.ps1
+++ b/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistryConfiguration.Tests.ps1
@@ -1,6 +1,6 @@
-$loadEnvPath = Join-Path $PSScriptRoot 'loadEnv.ps1'
+$loadEnvPath = Join-Path $PSScriptRoot 'loadEnvJson.ps1'
 if (-Not (Test-Path -Path $loadEnvPath)) {
-    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnv.ps1'
+    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnvJson.ps1'
 }
 . ($loadEnvPath)
 $TestRecordingFile = Join-Path $PSScriptRoot 'Get-AzsContainerRegistryConfiguration.Recording.json'
diff --git a/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistryQuota.Tests.ps1 b/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistryQuota.Tests.ps1
index c3704b3a..a6db9d72 100644
--- a/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistryQuota.Tests.ps1
+++ b/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistryQuota.Tests.ps1
@@ -1,6 +1,6 @@
-$loadEnvPath = Join-Path $PSScriptRoot 'loadEnv.ps1'
+$loadEnvPath = Join-Path $PSScriptRoot 'loadEnvJson.ps1'
 if (-Not (Test-Path -Path $loadEnvPath)) {
-    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnv.ps1'
+    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnvJson.ps1'
 }
 . ($loadEnvPath)
 $TestRecordingFile = Join-Path $PSScriptRoot 'Get-AzsContainerRegistryQuota.Recording.json'
diff --git a/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistrySetupStatus.Tests.ps1 b/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistrySetupStatus.Tests.ps1
index 04c50441..0e77dcd3 100644
--- a/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistrySetupStatus.Tests.ps1
+++ b/src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistrySetupStatus.Tests.ps1
@@ -1,6 +1,6 @@
-$loadEnvPath = Join-Path $PSScriptRoot 'loadEnv.ps1'
+$loadEnvPath = Join-Path $PSScriptRoot 'loadEnvJson.ps1'
 if (-Not (Test-Path -Path $loadEnvPath)) {
-    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnv.ps1'
+    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnvJson.ps1'
 }
 . ($loadEnvPath)
 $TestRecordingFile = Join-Path $PSScriptRoot 'Get-AzsContainerRegistrySetupStatus.Recording.json'
diff --git a/src/Azs.ContainerRegistry.Admin/test/New-AzsContainerRegistryQuota.Tests.ps1 b/src/Azs.ContainerRegistry.Admin/test/New-AzsContainerRegistryQuota.Tests.ps1
index 93872b84..c533e683 100644
--- a/src/Azs.ContainerRegistry.Admin/test/New-AzsContainerRegistryQuota.Tests.ps1
+++ b/src/Azs.ContainerRegistry.Admin/test/New-AzsContainerRegistryQuota.Tests.ps1
@@ -1,6 +1,6 @@
-$loadEnvPath = Join-Path $PSScriptRoot 'loadEnv.ps1'
+$loadEnvPath = Join-Path $PSScriptRoot 'loadEnvJson.ps1'
 if (-Not (Test-Path -Path $loadEnvPath)) {
-    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnv.ps1'
+    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnvJson.ps1'
 }
 . ($loadEnvPath)
 $TestRecordingFile = Join-Path $PSScriptRoot 'New-AzsContainerRegistryQuota.Recording.json'
diff --git a/src/Azs.ContainerRegistry.Admin/test/Remove-AzsContainerRegistryConfiguration.Tests.ps1 b/src/Azs.ContainerRegistry.Admin/test/Remove-AzsContainerRegistryConfiguration.Tests.ps1
index 2ea2616d..553780be 100644
--- a/src/Azs.ContainerRegistry.Admin/test/Remove-AzsContainerRegistryConfiguration.Tests.ps1
+++ b/src/Azs.ContainerRegistry.Admin/test/Remove-AzsContainerRegistryConfiguration.Tests.ps1
@@ -1,6 +1,6 @@
-$loadEnvPath = Join-Path $PSScriptRoot 'loadEnv.ps1'
+$loadEnvPath = Join-Path $PSScriptRoot 'loadEnvJson.ps1'
 if (-Not (Test-Path -Path $loadEnvPath)) {
-    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnv.ps1'
+    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnvJson.ps1'
 }
 . ($loadEnvPath)
 $TestRecordingFile = Join-Path $PSScriptRoot 'Remove-AzsContainerRegistryConfiguration.Recording.json'
diff --git a/src/Azs.ContainerRegistry.Admin/test/Remove-AzsContainerRegistryQuota.Tests.ps1 b/src/Azs.ContainerRegistry.Admin/test/Remove-AzsContainerRegistryQuota.Tests.ps1
index 2d24276f..ae7b6c9a 100644
--- a/src/Azs.ContainerRegistry.Admin/test/Remove-AzsContainerRegistryQuota.Tests.ps1
+++ b/src/Azs.ContainerRegistry.Admin/test/Remove-AzsContainerRegistryQuota.Tests.ps1
@@ -1,6 +1,6 @@
-$loadEnvPath = Join-Path $PSScriptRoot 'loadEnv.ps1'
+$loadEnvPath = Join-Path $PSScriptRoot 'loadEnvJson.ps1'
 if (-Not (Test-Path -Path $loadEnvPath)) {
-    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnv.ps1'
+    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnvJson.ps1'
 }
 . ($loadEnvPath)
 $TestRecordingFile = Join-Path $PSScriptRoot 'Remove-AzsContainerRegistryQuota.Recording.json'
diff --git a/src/Azs.ContainerRegistry.Admin/test/Set-AzsContainerRegistryConfiguration.Tests.ps1 b/src/Azs.ContainerRegistry.Admin/test/Set-AzsContainerRegistryConfiguration.Tests.ps1
index 1baf125d..42aeb4ff 100644
--- a/src/Azs.ContainerRegistry.Admin/test/Set-AzsContainerRegistryConfiguration.Tests.ps1
+++ b/src/Azs.ContainerRegistry.Admin/test/Set-AzsContainerRegistryConfiguration.Tests.ps1
@@ -1,6 +1,6 @@
-$loadEnvPath = Join-Path $PSScriptRoot 'loadEnv.ps1'
+$loadEnvPath = Join-Path $PSScriptRoot 'loadEnvJson.ps1'
 if (-Not (Test-Path -Path $loadEnvPath)) {
-    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnv.ps1'
+    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnvJson.ps1'
 }
 . ($loadEnvPath)
 $TestRecordingFile = Join-Path $PSScriptRoot 'Set-AzsContainerRegistryConfiguration.Recording.json'
diff --git a/src/Azs.ContainerRegistry.Admin/test/Set-AzsContainerRegistryQuota.Tests.ps1 b/src/Azs.ContainerRegistry.Admin/test/Set-AzsContainerRegistryQuota.Tests.ps1
index b37583e4..71a8d358 100644
--- a/src/Azs.ContainerRegistry.Admin/test/Set-AzsContainerRegistryQuota.Tests.ps1
+++ b/src/Azs.ContainerRegistry.Admin/test/Set-AzsContainerRegistryQuota.Tests.ps1
@@ -1,6 +1,6 @@
-$loadEnvPath = Join-Path $PSScriptRoot 'loadEnv.ps1'
+$loadEnvPath = Join-Path $PSScriptRoot 'loadEnvJson.ps1'
 if (-Not (Test-Path -Path $loadEnvPath)) {
-    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnv.ps1'
+    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnvJson.ps1'
 }
 . ($loadEnvPath)
 $TestRecordingFile = Join-Path $PSScriptRoot 'Set-AzsContainerRegistryQuota.Recording.json'
diff --git a/src/Azs.ContainerRegistry.Admin/test/Start-AzsContainerRegistrySetup.Recording.json b/src/Azs.ContainerRegistry.Admin/test/Start-AzsContainerRegistrySetup.Recording.json
index 32798c7d..98acfc11 100644
--- a/src/Azs.ContainerRegistry.Admin/test/Start-AzsContainerRegistrySetup.Recording.json
+++ b/src/Azs.ContainerRegistry.Admin/test/Start-AzsContainerRegistrySetup.Recording.json
@@ -13,7 +13,7 @@
       }
     },
     "Response": {
-      "StatusCode": 409,
+      "StatusCode": 201,
       "Headers": {
         "Cache-Control": [ "no-cache" ],
         "Pragma": [ "no-cache" ],
@@ -31,7 +31,7 @@
         "Content-Type": [ "application/json; charset=utf-8" ],
         "Expires": [ "-1" ]
       },
-      "Content": "{\"error\":{\"code\":\"AcrAlreadyDeployed\",\"message\":\"Container registry deployment has already been successfully completed. It is not allowed to repeat deployment\"}}",
+      "Content": "{\"id\":\"/subscriptions/7e41090c-4aa7-40bc-856a-a993f8fbd215/providers/Microsoft.ContainerRegistry.Setup/locations/redmond/setup/value\",\"name\":\"redmond/value\",\"type\":\"Microsoft.ContainerRegistry.Setup/locations/setup\",\"properties\":{\"statusUri\":\"https://adminmanagement.redmond.ext-v.masd.stbtest.microsoft.com/subscriptions/731e84f5-d31e-4c6a-aa1d-546d6bfb2789/providers/Microsoft.ContainerRegistry.Setup/locations/local/setup?api-version=2019-11-01-preview\"}}",
       "isContentBase64": false
     }
   }
diff --git a/src/Azs.ContainerRegistry.Admin/test/Start-AzsContainerRegistrySetup.Tests.ps1 b/src/Azs.ContainerRegistry.Admin/test/Start-AzsContainerRegistrySetup.Tests.ps1
index fc85a04b..7b536228 100644
--- a/src/Azs.ContainerRegistry.Admin/test/Start-AzsContainerRegistrySetup.Tests.ps1
+++ b/src/Azs.ContainerRegistry.Admin/test/Start-AzsContainerRegistrySetup.Tests.ps1
@@ -1,6 +1,6 @@
-$loadEnvPath = Join-Path $PSScriptRoot 'loadEnv.ps1'
+$loadEnvPath = Join-Path $PSScriptRoot 'loadEnvJson.ps1'
 if (-Not (Test-Path -Path $loadEnvPath)) {
-    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnv.ps1'
+    $loadEnvPath = Join-Path $PSScriptRoot '..\loadEnvJson.ps1'
 }
 . ($loadEnvPath)
 $TestRecordingFile = Join-Path $PSScriptRoot 'Start-AzsContainerRegistrySetup.Recording.json'
diff --git a/src/Azs.ContainerRegistry.Admin/test/loadEnv.ps1 b/src/Azs.ContainerRegistry.Admin/test/loadEnvJson.ps1
similarity index 97%
rename from src/Azs.ContainerRegistry.Admin/test/loadEnv.ps1
rename to src/Azs.ContainerRegistry.Admin/test/loadEnvJson.ps1
index b64982f9..073159ad 100644
--- a/src/Azs.ContainerRegistry.Admin/test/loadEnv.ps1
+++ b/src/Azs.ContainerRegistry.Admin/test/loadEnvJson.ps1
@@ -12,7 +12,6 @@
 # limitations under the License.
 # ----------------------------------------------------------------------------------
 $envFile = 'env.json'
-Write-Host "Loading env.json"
 if ($TestMode -eq 'live') {
     $envFile = 'localEnv.json'
 }