diff --git a/BCDRTests/Test 01 - 1 input - 2 jobs - 1 output/01-provision.ps1 b/BCDRTests/Test 01 - 1 input - 2 jobs - 1 output/01-provision.ps1
index 9db09cc..7176f25 100644
--- a/BCDRTests/Test 01 - 1 input - 2 jobs - 1 output/01-provision.ps1	
+++ b/BCDRTests/Test 01 - 1 input - 2 jobs - 1 output/01-provision.ps1	
@@ -18,13 +18,13 @@ $ehAuthorizationRuleName = "eh-asa-bcdr-$runId"
 $ehConsumerGroupName1 = "cg1"
 $ehConsumerGroupName2 = "cg2"
 
-New-AzEventHubNamespace -ResourceGroupName $rgName -NamespaceName $ehNamespace -Location $location -SkuName $ehNamespaceSku -SkuCapacity $ehNamespaceCapacity
+New-AzEventHubNamespace -ResourceGroupName $rgName -Name $ehNamespace -Location $location -SkuName $ehNamespaceSku -SkuCapacity $ehNamespaceCapacity
 New-AzEventHubAuthorizationRule -ResourceGroupName $rgName -NamespaceName $ehNamespace -AuthorizationRuleName $ehAuthorizationRuleName -Rights @("Listen","Send")
 $ehKey = Get-AzEventHubKey -ResourceGroupName $rgName -Namespace $ehNamespace -AuthorizationRuleName $ehAuthorizationRuleName
 
 New-AzEventHub -ResourceGroupName $rgName -NamespaceName $ehNamespace -Name $ehName -PartitionCount $ehPartitionCount
-New-AzEventHubConsumerGroup -ResourceGroupName $rgName -Namespace $ehNamespace -EventHub $ehName -Name $ehConsumerGroupName1
-New-AzEventHubConsumerGroup -ResourceGroupName $rgName -Namespace $ehNamespace -EventHub $ehName -Name $ehConsumerGroupName2
+New-AzEventHubConsumerGroup -ResourceGroupName $rgName -NamespaceName $ehNamespace -EventHubName $ehName -Name $ehConsumerGroupName1
+New-AzEventHubConsumerGroup -ResourceGroupName $rgName -NamespaceName $ehNamespace -EventHubName $ehName -Name $ehConsumerGroupName2
 
 ######################################################################
 # Cosmos DB
diff --git a/BCDRTests/Test 01 - 1 input - 2 jobs - 1 output/02-run.ps1 b/BCDRTests/Test 01 - 1 input - 2 jobs - 1 output/02-run.ps1
index dc34228..676a4c2 100644
--- a/BCDRTests/Test 01 - 1 input - 2 jobs - 1 output/02-run.ps1	
+++ b/BCDRTests/Test 01 - 1 input - 2 jobs - 1 output/02-run.ps1	
@@ -15,7 +15,6 @@ Write-Host "`
 `$cosmosDBDatabaseName = `"$cosmosDBDatabaseName`"`
 `$cosmosDBContainerName = `"$cosmosDBContainerName`""
 
-
 ######################################################################
 #Starting jobs
 Start-AzStreamAnalyticsJob -ResourceGroupName $rgName -Name $asaJobName1
diff --git a/BCDRTests/Test 02 - 2 inputs - 2 jobs - 2 outputs/01-provision.ps1 b/BCDRTests/Test 02 - 2 inputs - 2 jobs - 2 outputs/01-provision.ps1
index eb648f3..af07ab4 100644
--- a/BCDRTests/Test 02 - 2 inputs - 2 jobs - 2 outputs/01-provision.ps1	
+++ b/BCDRTests/Test 02 - 2 inputs - 2 jobs - 2 outputs/01-provision.ps1	
@@ -20,7 +20,7 @@ $ehPartitionCount = 2
 $ehAuthorizationRuleName = "eh-asa-bcdr2-$runId"
 $ehConsumerGroupName = "cg"
 
-New-AzEventHubNamespace -ResourceGroupName $rgName -NamespaceName $ehNamespace -Location $location -SkuName $ehNamespaceSku -SkuCapacity $ehNamespaceCapacity
+New-AzEventHubNamespace -ResourceGroupName $rgName -Name $ehNamespace -Location $location -SkuName $ehNamespaceSku -SkuCapacity $ehNamespaceCapacity
 New-AzEventHubAuthorizationRule -ResourceGroupName $rgName -NamespaceName $ehNamespace -AuthorizationRuleName $ehAuthorizationRuleName -Rights @("Listen","Send","Manage")
 $ehKey = Get-AzEventHubKey -ResourceGroupName $rgName -Namespace $ehNamespace -AuthorizationRuleName $ehAuthorizationRuleName
 
@@ -28,10 +28,10 @@ New-AzEventHub -ResourceGroupName $rgName -NamespaceName $ehNamespace -Name $ehN
 New-AzEventHub -ResourceGroupName $rgName -NamespaceName $ehNamespace -Name $ehName2in -PartitionCount $ehPartitionCount
 New-AzEventHub -ResourceGroupName $rgName -NamespaceName $ehNamespace -Name $ehName1out -PartitionCount $ehPartitionCount
 New-AzEventHub -ResourceGroupName $rgName -NamespaceName $ehNamespace -Name $ehName2out -PartitionCount $ehPartitionCount
-New-AzEventHubConsumerGroup -ResourceGroupName $rgName -Namespace $ehNamespace -EventHub $ehName1in -Name $ehConsumerGroupName
-New-AzEventHubConsumerGroup -ResourceGroupName $rgName -Namespace $ehNamespace -EventHub $ehName2in -Name $ehConsumerGroupName
-New-AzEventHubConsumerGroup -ResourceGroupName $rgName -Namespace $ehNamespace -EventHub $ehName1out -Name $ehConsumerGroupName
-New-AzEventHubConsumerGroup -ResourceGroupName $rgName -Namespace $ehNamespace -EventHub $ehName2out -Name $ehConsumerGroupName
+New-AzEventHubConsumerGroup -ResourceGroupName $rgName -NamespaceName $ehNamespace -EventHubName $ehName1in -Name $ehConsumerGroupName
+New-AzEventHubConsumerGroup -ResourceGroupName $rgName -NamespaceName $ehNamespace -EventHubName $ehName2in -Name $ehConsumerGroupName
+New-AzEventHubConsumerGroup -ResourceGroupName $rgName -NamespaceName $ehNamespace -EventHubName $ehName1out -Name $ehConsumerGroupName
+New-AzEventHubConsumerGroup -ResourceGroupName $rgName -NamespaceName $ehNamespace -EventHubName $ehName2out -Name $ehConsumerGroupName
 
 ######################################################################
 # Stream Analytics Jobs 1 and 2
diff --git a/BCDRTests/Test 02 - 2 inputs - 2 jobs - 2 outputs/02-run.ps1 b/BCDRTests/Test 02 - 2 inputs - 2 jobs - 2 outputs/02-run.ps1
index 634e023..166ccdf 100644
--- a/BCDRTests/Test 02 - 2 inputs - 2 jobs - 2 outputs/02-run.ps1	
+++ b/BCDRTests/Test 02 - 2 inputs - 2 jobs - 2 outputs/02-run.ps1	
@@ -60,4 +60,4 @@ while ($True) {
 
 ######################################################################
 #Stopping one job
-
+#Stop-AzStreamAnalyticsJob -ResourceGroupName $rgName -Name $asaJobName1
diff --git a/BCDRTests/Test 03 - 1 input - 2 jobs - 1 output -2 regions/01-provision.ps1 b/BCDRTests/Test 03 - 1 input - 2 jobs - 1 output -2 regions/01-provision.ps1
index db0c200..6faa835 100644
--- a/BCDRTests/Test 03 - 1 input - 2 jobs - 1 output -2 regions/01-provision.ps1	
+++ b/BCDRTests/Test 03 - 1 input - 2 jobs - 1 output -2 regions/01-provision.ps1	
@@ -20,19 +20,19 @@ $ehPartitionCount = 2
 $ehAuthorizationRuleName = "eh-asa-bcdr3-$runId"
 $ehConsumerGroupName = "cg"
 
-New-AzEventHubNamespace -ResourceGroupName $rgName -NamespaceName $ehNamespace1 -Location $location1 -SkuName $ehNamespaceSku -SkuCapacity $ehNamespaceCapacity
+New-AzEventHubNamespace -ResourceGroupName $rgName -Name $ehNamespace1 -Location $location1 -SkuName $ehNamespaceSku -SkuCapacity $ehNamespaceCapacity
 New-AzEventHubAuthorizationRule -ResourceGroupName $rgName -NamespaceName $ehNamespace1 -AuthorizationRuleName $ehAuthorizationRuleName -Rights @("Listen","Send","Manage")
 $ehKey1 = Get-AzEventHubKey -ResourceGroupName $rgName -Namespace $ehNamespace1 -AuthorizationRuleName $ehAuthorizationRuleName
 
 New-AzEventHub -ResourceGroupName $rgName -NamespaceName $ehNamespace1 -Name $ehName1in -PartitionCount $ehPartitionCount
 
-New-AzEventHubNamespace -ResourceGroupName $rgName -NamespaceName $ehNamespace2 -Location $location2 -SkuName $ehNamespaceSku -SkuCapacity $ehNamespaceCapacity
+New-AzEventHubNamespace -ResourceGroupName $rgName -Name $ehNamespace2 -Location $location2 -SkuName $ehNamespaceSku -SkuCapacity $ehNamespaceCapacity
 New-AzEventHubAuthorizationRule -ResourceGroupName $rgName -NamespaceName $ehNamespace2 -AuthorizationRuleName $ehAuthorizationRuleName -Rights @("Listen","Send","Manage")
 $ehKey2 = Get-AzEventHubKey -ResourceGroupName $rgName -Namespace $ehNamespace2 -AuthorizationRuleName $ehAuthorizationRuleName
 New-AzEventHub -ResourceGroupName $rgName -NamespaceName $ehNamespace2 -Name $ehName2in -PartitionCount $ehPartitionCount
 
-New-AzEventHubConsumerGroup -ResourceGroupName $rgName -Namespace $ehNamespace1 -EventHub $ehName1in -Name $ehConsumerGroupName
-New-AzEventHubConsumerGroup -ResourceGroupName $rgName -Namespace $ehNamespace2 -EventHub $ehName2in -Name $ehConsumerGroupName
+New-AzEventHubConsumerGroup -ResourceGroupName $rgName -NamespaceName $ehNamespace1 -EventHubName $ehName1in -Name $ehConsumerGroupName
+New-AzEventHubConsumerGroup -ResourceGroupName $rgName -NamespaceName $ehNamespace2 -EventHubName $ehName2in -Name $ehConsumerGroupName
 
 ######################################################################
 # Cosmos DB
diff --git a/BCDRTests/Test 03 - 1 input - 2 jobs - 1 output -2 regions/02-run-part1.ps1 b/BCDRTests/Test 03 - 1 input - 2 jobs - 1 output -2 regions/02-run-part1.ps1
index e35a32c..a617f3b 100644
--- a/BCDRTests/Test 03 - 1 input - 2 jobs - 1 output -2 regions/02-run-part1.ps1	
+++ b/BCDRTests/Test 03 - 1 input - 2 jobs - 1 output -2 regions/02-run-part1.ps1	
@@ -20,7 +20,6 @@ Write-Host "`
 `$cosmosDBDatabaseName = `"$cosmosDBDatabaseName`"`
 `$cosmosDBContainerName = `"$cosmosDBContainerName`""
 
-
 ######################################################################
 #Starting jobs
 Start-AzStreamAnalyticsJob -ResourceGroupName $rgName -Name $asaJobName1
diff --git a/BCDRTests/Test 03 - 1 input - 2 jobs - 1 output -2 regions/02-run-part2.ps1 b/BCDRTests/Test 03 - 1 input - 2 jobs - 1 output -2 regions/02-run-part2.ps1
index 7d6286a..5e093ba 100644
--- a/BCDRTests/Test 03 - 1 input - 2 jobs - 1 output -2 regions/02-run-part2.ps1	
+++ b/BCDRTests/Test 03 - 1 input - 2 jobs - 1 output -2 regions/02-run-part2.ps1	
@@ -2,6 +2,24 @@ Import-Module -Name CosmosDB
 ######################################################################
 #Observing records in Cosmos DB
 
+Write-Host "`
+`$rgName = `"$rgName`"`
+`$asaJobName1 = `"$asaJobName1`"`
+`$asaJobName2 = `"$asaJobName2`"`
+`$ehNamespace1 = `"$ehNamespace1`"`
+`$ehNamespace2 = `"$ehNamespace2`"`
+`$ehName1in = `"$ehName1in`"`
+`$ehName2in = `"$ehName2in`"`
+`$ehAuthorizationRuleName = `"$ehAuthorizationRuleName`"`
+`$ehKey1 = `"$($ehKey1.PrimaryKey)`"`
+`$ehConnectionString1 = `"$($ehKey1.PrimaryConnectionString)`"`
+`$ehKey2 = `"$($ehKey2.PrimaryKey)`"`
+`$ehConnectionString2 = `"$($ehKey2.PrimaryConnectionString)`"`
+`$cosmosDBAccountKey = `"$($cosmosDBAccountKey.PrimaryMasterKey)`"`
+`$cosmosDBAccountName = `"$cosmosDBAccountName`"`
+`$cosmosDBDatabaseName = `"$cosmosDBDatabaseName`"`
+`$cosmosDBContainerName = `"$cosmosDBContainerName`""
+
 ##in a new terminal
 ##if necessary, install https://www.powershellgallery.com/packages/CosmosDB/