diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/LocationBasedReservedIPTests.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/LocationBasedReservedIPTests.cs
index 504b6afd1f5a..55cdc4ccc843 100644
--- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/LocationBasedReservedIPTests.cs
+++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/LocationBasedReservedIPTests.cs
@@ -68,16 +68,14 @@ public void CreateReservedIPThenPaaSVM()
         {
             try
             {
-                string reservedIpName1 = "ResrvdIP1";
-                string reservedIpName2 = "ResrvdIP2";
+                string reservedIpName1 = Utilities.GetUniqueShortName("ResrvdIP1"); ;
+                string reservedIpName2 = Utilities.GetUniqueShortName("ResrvdIP2"); ;
                 string reservedIpLabel1 = Utilities.GetUniqueShortName("ResrvdIPLbl", 5);
                 string reservedIpLabel2 = Utilities.GetUniqueShortName("ResrvdIPLbl", 5);
                 string dnsName = Utilities.GetUniqueShortName("Dns");
-                //string vmName = Utilities.GetUniqueShortName(vmNamePrefix);
                 string deploymentName = Utilities.GetUniqueShortName("Depl");
                 var input1 = new ReservedIPContext()
                 {
-                    //Address = string.Empty,
                     DeploymentName = string.Empty,
                     Label = reservedIpLabel1,
                     InUse = false,
@@ -88,7 +86,6 @@ public void CreateReservedIPThenPaaSVM()
 
                 var input2 = new ReservedIPContext()
                 {
-                    //Address = string.Empty,
                     DeploymentName = string.Empty,
                     Label = reservedIpLabel2,
                     InUse = false,
@@ -164,7 +161,6 @@ public void CreateReservedIPThenWindowsVM()
                 string deploymentName = Utilities.GetUniqueShortName("Depl");
                 var input = new ReservedIPContext()
                 {
-                    //Address = string.Empty,
                     DeploymentName = string.Empty,
                     Label = reservedIpLabel,
                     InUse = false,
@@ -212,7 +208,6 @@ public void CreatePaaSDeploymentAssociateAndDisassociateReservedIp()
 
                 var input = new ReservedIPContext()
                 {
-                    //Address = string.Empty,
                     DeploymentName = string.Empty,
                     Label = reservedIpLabel,
                     InUse = false,
@@ -279,7 +274,6 @@ public void CreateWindowsVMThenAssociateReservedIP()
                 string vmName = Utilities.GetUniqueShortName(vmNamePrefix);
                 var input = new ReservedIPContext()
                 {
-                    //Address = string.Empty,
                     DeploymentName = string.Empty,
                     Label = reservedIpLabel,
                     InUse = false,
@@ -330,7 +324,6 @@ public void TestAssociateReservedIPToStageSlotIaaSFails()
                 string vmName = Utilities.GetUniqueShortName(vmNamePrefix);
                 var input = new ReservedIPContext()
                 {
-                    //Address = string.Empty,
                     DeploymentName = string.Empty,
                     Label = reservedIpLabel,
                     InUse = false,
@@ -375,7 +368,6 @@ public void CreateWindowsVMWithReservedIPThenDisassociateReservedIP()
                 string vmName = Utilities.GetUniqueShortName(vmNamePrefix);
                 var input = new ReservedIPContext()
                 {
-                    //Address = string.Empty,
                     DeploymentName = string.Empty,
                     Label = reservedIpLabel,
                     InUse = false,
@@ -427,7 +419,6 @@ public void CreateWindowsVMThenReservedExistingIP()
                 string deploymentName = Utilities.GetUniqueShortName("Depl");
                 var input = new ReservedIPContext()
                 {
-                    //Address = string.Empty,
                     DeploymentName = string.Empty,
                     Label = reservedIpLabel,
                     InUse = false,
@@ -479,7 +470,6 @@ public void CreateReservedIPThenLinuxVM()
                 string affinityGroup = Utilities.GetUniqueShortName("AffGrp");
                 var input = new ReservedIPContext()
                 {
-                    //Address = string.Empty,
                     DeploymentName = string.Empty,
                     Label = reservedIpLabel,
                     InUse = false,
@@ -534,7 +524,6 @@ public void CreateReservedIPThenWindowsQuickVM()
                 string affinityGroup = Utilities.GetUniqueShortName("AffGrp");
                 var input = new ReservedIPContext()
                 {
-                    //Address = string.Empty,
                     DeploymentName = string.Empty,
                     Label = reservedIpLabel,
                     InUse = false,
@@ -581,7 +570,6 @@ public void CreateReservedIPThenLinuxQuickVM()
                 string affinityGroup = Utilities.GetUniqueShortName("AffGrp");
                 var input = new ReservedIPContext()
                 {
-                    //Address = string.Empty,
                     DeploymentName = string.Empty,
                     Label = reservedIpLabel,
                     InUse = false,
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Resources/ServiceConfiguration.cscfg b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Resources/ServiceConfiguration.cscfg
index af8f6673167d..72585e8e7a5c 100644
--- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Resources/ServiceConfiguration.cscfg
+++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Resources/ServiceConfiguration.cscfg
@@ -2,7 +2,7 @@
 <ServiceConfiguration xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" serviceName="HelloWorld" osFamily="2" osVersion="*" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceConfiguration">
 	<Role name="HelloWorld_WebRole">
 		<ConfigurationSettings>
-			<Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.ConnectionString" value="DefaultEndpointsProtocol=https;AccountName=samplesa;AccountKey=1VtQsFrdpGyY8bKCC2WF74B1lV9fBpPtxZbBj6apwFNLCm/sYTlsrCmps9TgBMykw5NiGGGwngYUzhvpECUXUQ==" />
+			<Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.ConnectionString" value="DefaultEndpointsProtocol=https;AccountName=test;AccountKey=test" />
 		</ConfigurationSettings>
 		<Instances count="1" />
 	</Role>