Merge Conflict

Author: pragrawa

src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/Commands.AzureBackup.Test.csproj

@@ -35,9 +35,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.AzureBackup">
-      <HintPath>..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureBackup\Microsoft.Azure.Commands.AzureBackup.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\Microsoft.Azure.Common.Authentication.1.0.25-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
@@ -124,7 +121,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ScenarioTests\AzureBackupItemTestCases.cs" />
-    <Compile Include="ScenarioTests\AzureBackupTests.cs" />
+    <Compile Include="ScenarioTests\AzureBackupPolicyTests.cs" />
     <Compile Include="ScenarioTests\AzureBackupTestBase.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ScenarioTests\BackupItemTests.cs" />
@@ -164,7 +161,7 @@
     <None Include="ScenarioTests\AzureBackupItemTestCases.ps1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="ScenarioTests\AzureBackupTests.ps1">
+    <None Include="ScenarioTests\AzureBackupPolicyTests.ps1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="ScenarioTests\BackupItemTests.ps1">