From c7138e22d249c22477a4f78b66055a51862492d5 Mon Sep 17 00:00:00 2001
From: Hassan Uraizee <hauraize@microsoft.com>
Date: Fri, 12 Apr 2019 18:13:56 -0700
Subject: [PATCH] Updated Calculator WinAppDriver project from initial PR
 review feedback.

---
 src/Calculator.sln                            | 64 ++++++++++++----
 .../CalculatorSession.cs                      | 23 +-----
 .../CalculatorUITests.csproj}                 | 44 +++--------
 .../Properties/AssemblyInfo.cs                |  0
 .../ScenarioStandard.cs                       | 75 ++++---------------
 .../TestSettings1.runsettings                 |  0
 src/CalculatorWADTests/CalculatorTest.sln     | 31 --------
 src/CalculatorWADTests/README.md              | 33 --------
 src/CalculatorWADTests/packages.config        | 10 ---
 9 files changed, 76 insertions(+), 204 deletions(-)
 rename src/{CalculatorWADTests => CalculatorUITests}/CalculatorSession.cs (62%)
 rename src/{CalculatorWADTests/CalculatorTest.csproj => CalculatorUITests/CalculatorUITests.csproj} (57%)
 rename src/{CalculatorWADTests => CalculatorUITests}/Properties/AssemblyInfo.cs (100%)
 rename src/{CalculatorWADTests => CalculatorUITests}/ScenarioStandard.cs (55%)
 rename src/{CalculatorWADTests => CalculatorUITests}/TestSettings1.runsettings (100%)
 delete mode 100644 src/CalculatorWADTests/CalculatorTest.sln
 delete mode 100644 src/CalculatorWADTests/README.md
 delete mode 100644 src/CalculatorWADTests/packages.config

diff --git a/src/Calculator.sln b/src/Calculator.sln
index 2d36a93f..72b6fcd0 100644
--- a/src/Calculator.sln
+++ b/src/Calculator.sln
@@ -16,34 +16,23 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CalcViewModel", "CalcViewMo
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CalculatorUnitTests", "CalculatorUnitTests\CalculatorUnitTests.vcxproj", "{D3BAED2C-4B07-4E1D-8807-9D6499450349}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CalculatorUITests", "CalculatorUITests\CalculatorUITests.csproj", "{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
 		Debug|ARM = Debug|ARM
 		Debug|ARM64 = Debug|ARM64
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
 		Release|ARM = Release|ARM
 		Release|ARM64 = Release|ARM64
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{311E866D-8B93-4609-A691-265941FEE101}.Debug|ARM.ActiveCfg = Debug|ARM
-		{311E866D-8B93-4609-A691-265941FEE101}.Debug|ARM.Build.0 = Debug|ARM
-		{311E866D-8B93-4609-A691-265941FEE101}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{311E866D-8B93-4609-A691-265941FEE101}.Debug|ARM64.Build.0 = Debug|ARM64
-		{311E866D-8B93-4609-A691-265941FEE101}.Debug|x64.ActiveCfg = Debug|x64
-		{311E866D-8B93-4609-A691-265941FEE101}.Debug|x64.Build.0 = Debug|x64
-		{311E866D-8B93-4609-A691-265941FEE101}.Debug|x86.ActiveCfg = Debug|Win32
-		{311E866D-8B93-4609-A691-265941FEE101}.Debug|x86.Build.0 = Debug|Win32
-		{311E866D-8B93-4609-A691-265941FEE101}.Release|ARM.ActiveCfg = Release|ARM
-		{311E866D-8B93-4609-A691-265941FEE101}.Release|ARM.Build.0 = Release|ARM
-		{311E866D-8B93-4609-A691-265941FEE101}.Release|ARM64.ActiveCfg = Release|ARM64
-		{311E866D-8B93-4609-A691-265941FEE101}.Release|ARM64.Build.0 = Release|ARM64
-		{311E866D-8B93-4609-A691-265941FEE101}.Release|x64.ActiveCfg = Release|x64
-		{311E866D-8B93-4609-A691-265941FEE101}.Release|x64.Build.0 = Release|x64
-		{311E866D-8B93-4609-A691-265941FEE101}.Release|x86.ActiveCfg = Release|Win32
-		{311E866D-8B93-4609-A691-265941FEE101}.Release|x86.Build.0 = Release|Win32
+		{9447424A-0E05-4911-BEB8-E0354405F39A}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{9447424A-0E05-4911-BEB8-E0354405F39A}.Debug|ARM.ActiveCfg = Debug|ARM
 		{9447424A-0E05-4911-BEB8-E0354405F39A}.Debug|ARM.Build.0 = Debug|ARM
 		{9447424A-0E05-4911-BEB8-E0354405F39A}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -56,6 +45,7 @@ Global
 		{9447424A-0E05-4911-BEB8-E0354405F39A}.Debug|x86.ActiveCfg = Debug|Win32
 		{9447424A-0E05-4911-BEB8-E0354405F39A}.Debug|x86.Build.0 = Debug|Win32
 		{9447424A-0E05-4911-BEB8-E0354405F39A}.Debug|x86.Deploy.0 = Debug|Win32
+		{9447424A-0E05-4911-BEB8-E0354405F39A}.Release|Any CPU.ActiveCfg = Release|Win32
 		{9447424A-0E05-4911-BEB8-E0354405F39A}.Release|ARM.ActiveCfg = Release|ARM
 		{9447424A-0E05-4911-BEB8-E0354405F39A}.Release|ARM.Build.0 = Release|ARM
 		{9447424A-0E05-4911-BEB8-E0354405F39A}.Release|ARM.Deploy.0 = Release|ARM
@@ -68,6 +58,25 @@ Global
 		{9447424A-0E05-4911-BEB8-E0354405F39A}.Release|x86.ActiveCfg = Release|Win32
 		{9447424A-0E05-4911-BEB8-E0354405F39A}.Release|x86.Build.0 = Release|Win32
 		{9447424A-0E05-4911-BEB8-E0354405F39A}.Release|x86.Deploy.0 = Release|Win32
+		{311E866D-8B93-4609-A691-265941FEE101}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{311E866D-8B93-4609-A691-265941FEE101}.Debug|ARM.ActiveCfg = Debug|ARM
+		{311E866D-8B93-4609-A691-265941FEE101}.Debug|ARM.Build.0 = Debug|ARM
+		{311E866D-8B93-4609-A691-265941FEE101}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{311E866D-8B93-4609-A691-265941FEE101}.Debug|ARM64.Build.0 = Debug|ARM64
+		{311E866D-8B93-4609-A691-265941FEE101}.Debug|x64.ActiveCfg = Debug|x64
+		{311E866D-8B93-4609-A691-265941FEE101}.Debug|x64.Build.0 = Debug|x64
+		{311E866D-8B93-4609-A691-265941FEE101}.Debug|x86.ActiveCfg = Debug|Win32
+		{311E866D-8B93-4609-A691-265941FEE101}.Debug|x86.Build.0 = Debug|Win32
+		{311E866D-8B93-4609-A691-265941FEE101}.Release|Any CPU.ActiveCfg = Release|Win32
+		{311E866D-8B93-4609-A691-265941FEE101}.Release|ARM.ActiveCfg = Release|ARM
+		{311E866D-8B93-4609-A691-265941FEE101}.Release|ARM.Build.0 = Release|ARM
+		{311E866D-8B93-4609-A691-265941FEE101}.Release|ARM64.ActiveCfg = Release|ARM64
+		{311E866D-8B93-4609-A691-265941FEE101}.Release|ARM64.Build.0 = Release|ARM64
+		{311E866D-8B93-4609-A691-265941FEE101}.Release|x64.ActiveCfg = Release|x64
+		{311E866D-8B93-4609-A691-265941FEE101}.Release|x64.Build.0 = Release|x64
+		{311E866D-8B93-4609-A691-265941FEE101}.Release|x86.ActiveCfg = Release|Win32
+		{311E866D-8B93-4609-A691-265941FEE101}.Release|x86.Build.0 = Release|Win32
+		{90E9761D-9262-4773-942D-CAEAE75D7140}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{90E9761D-9262-4773-942D-CAEAE75D7140}.Debug|ARM.ActiveCfg = Debug|ARM
 		{90E9761D-9262-4773-942D-CAEAE75D7140}.Debug|ARM.Build.0 = Debug|ARM
 		{90E9761D-9262-4773-942D-CAEAE75D7140}.Debug|ARM64.ActiveCfg = Debug|ARM64
@@ -76,6 +85,7 @@ Global
 		{90E9761D-9262-4773-942D-CAEAE75D7140}.Debug|x64.Build.0 = Debug|x64
 		{90E9761D-9262-4773-942D-CAEAE75D7140}.Debug|x86.ActiveCfg = Debug|Win32
 		{90E9761D-9262-4773-942D-CAEAE75D7140}.Debug|x86.Build.0 = Debug|Win32
+		{90E9761D-9262-4773-942D-CAEAE75D7140}.Release|Any CPU.ActiveCfg = Release|Win32
 		{90E9761D-9262-4773-942D-CAEAE75D7140}.Release|ARM.ActiveCfg = Release|ARM
 		{90E9761D-9262-4773-942D-CAEAE75D7140}.Release|ARM.Build.0 = Release|ARM
 		{90E9761D-9262-4773-942D-CAEAE75D7140}.Release|ARM64.ActiveCfg = Release|ARM64
@@ -84,6 +94,7 @@ Global
 		{90E9761D-9262-4773-942D-CAEAE75D7140}.Release|x64.Build.0 = Release|x64
 		{90E9761D-9262-4773-942D-CAEAE75D7140}.Release|x86.ActiveCfg = Release|Win32
 		{90E9761D-9262-4773-942D-CAEAE75D7140}.Release|x86.Build.0 = Release|Win32
+		{D3BAED2C-4B07-4E1D-8807-9D6499450349}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{D3BAED2C-4B07-4E1D-8807-9D6499450349}.Debug|ARM.ActiveCfg = Debug|ARM
 		{D3BAED2C-4B07-4E1D-8807-9D6499450349}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{D3BAED2C-4B07-4E1D-8807-9D6499450349}.Debug|x64.ActiveCfg = Debug|x64
@@ -92,6 +103,7 @@ Global
 		{D3BAED2C-4B07-4E1D-8807-9D6499450349}.Debug|x86.ActiveCfg = Debug|Win32
 		{D3BAED2C-4B07-4E1D-8807-9D6499450349}.Debug|x86.Build.0 = Debug|Win32
 		{D3BAED2C-4B07-4E1D-8807-9D6499450349}.Debug|x86.Deploy.0 = Debug|Win32
+		{D3BAED2C-4B07-4E1D-8807-9D6499450349}.Release|Any CPU.ActiveCfg = Release|Win32
 		{D3BAED2C-4B07-4E1D-8807-9D6499450349}.Release|ARM.ActiveCfg = Release|ARM
 		{D3BAED2C-4B07-4E1D-8807-9D6499450349}.Release|ARM64.ActiveCfg = Release|ARM64
 		{D3BAED2C-4B07-4E1D-8807-9D6499450349}.Release|x64.ActiveCfg = Release|x64
@@ -100,6 +112,26 @@ Global
 		{D3BAED2C-4B07-4E1D-8807-9D6499450349}.Release|x86.ActiveCfg = Release|Win32
 		{D3BAED2C-4B07-4E1D-8807-9D6499450349}.Release|x86.Build.0 = Release|Win32
 		{D3BAED2C-4B07-4E1D-8807-9D6499450349}.Release|x86.Deploy.0 = Release|Win32
+		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Debug|ARM.Build.0 = Debug|Any CPU
+		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Debug|x64.Build.0 = Debug|Any CPU
+		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Debug|x86.Build.0 = Debug|Any CPU
+		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Release|ARM.ActiveCfg = Release|Any CPU
+		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Release|ARM.Build.0 = Release|Any CPU
+		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Release|ARM64.Build.0 = Release|Any CPU
+		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Release|x64.ActiveCfg = Release|Any CPU
+		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Release|x64.Build.0 = Release|Any CPU
+		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Release|x86.ActiveCfg = Release|Any CPU
+		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/CalculatorWADTests/CalculatorSession.cs b/src/CalculatorUITests/CalculatorSession.cs
similarity index 62%
rename from src/CalculatorWADTests/CalculatorSession.cs
rename to src/CalculatorUITests/CalculatorSession.cs
index 59c0257d..024e408a 100644
--- a/src/CalculatorWADTests/CalculatorSession.cs
+++ b/src/CalculatorUITests/CalculatorSession.cs
@@ -1,18 +1,5 @@
-//******************************************************************************
-//
-// Copyright (c) 2017 Microsoft Corporation. All rights reserved.
-//
-// This code is licensed under the MIT License (MIT).
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//******************************************************************************
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenQA.Selenium.Appium.Windows;
@@ -20,7 +7,7 @@ using OpenQA.Selenium.Remote;
 using System;
 using System.Threading;
 
-namespace CalculatorTest
+namespace CalculatorUITests
 {
     public class CalculatorSession
     {
@@ -40,10 +27,8 @@ namespace CalculatorTest
                 appCapabilities.SetCapability("app", CalculatorAppId);
                 appCapabilities.SetCapability("deviceName", "WindowsPC");
                 session = new WindowsDriver<WindowsElement>(new Uri(WindowsApplicationDriverUrl), appCapabilities);
-                Thread.Sleep(120000);
+                session.Manage().Timeouts().ImplicitWait = TimeSpan.FromSeconds(180);
                 Assert.IsNotNull(session);
-                // Set implicit timeout to 5 seconds to make element search to retry every 500 ms for at most three times
-                session.Manage().Timeouts().ImplicitWait = TimeSpan.FromSeconds(1.5);
             }
         }
 
diff --git a/src/CalculatorWADTests/CalculatorTest.csproj b/src/CalculatorUITests/CalculatorUITests.csproj
similarity index 57%
rename from src/CalculatorWADTests/CalculatorTest.csproj
rename to src/CalculatorUITests/CalculatorUITests.csproj
index 0405c801..fba16068 100644
--- a/src/CalculatorWADTests/CalculatorTest.csproj
+++ b/src/CalculatorUITests/CalculatorUITests.csproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\MSTest.TestAdapter.2.0.0-beta2\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\..\packages\MSTest.TestAdapter.2.0.0-beta2\build\net45\MSTest.TestAdapter.props')" />
   <Import Project="packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props" Condition="Exists('packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -8,8 +7,8 @@
     <ProjectGuid>{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>CalculatorTest</RootNamespace>
-    <AssemblyName>CalculatorTest</AssemblyName>
+    <RootNamespace>CalculatorUITests</RootNamespace>
+    <AssemblyName>CalculatorUITests</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -39,30 +38,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="appium-dotnet-driver, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.WinAppDriver.Appium.WebDriver.1.0.1-Preview\lib\net45\appium-dotnet-driver.dll</HintPath>
-    </Reference>
-    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\MSTest.TestFramework.2.0.0-beta2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\MSTest.TestFramework.2.0.0-beta2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Drawing" />
-    <Reference Include="WebDriver, Version=3.8.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Selenium.WebDriver.3.8.0\lib\net45\WebDriver.dll</HintPath>
-    </Reference>
-    <Reference Include="WebDriver.Support, Version=3.8.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Selenium.Support.3.8.0\lib\net45\WebDriver.Support.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <Choose>
     <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
@@ -78,7 +56,15 @@
     <Compile Include="CalculatorSession.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <PackageReference Include="Microsoft.WinAppDriver.Appium.WebDriver">
+      <Version>1.0.1-Preview</Version>
+    </PackageReference>
+    <PackageReference Include="MSTest.TestAdapter">
+      <Version>2.0.0-beta2</Version>
+    </PackageReference>
+    <PackageReference Include="MSTest.TestFramework">
+      <Version>2.0.0-beta2</Version>
+    </PackageReference>
   </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
@@ -100,14 +86,6 @@
   </Choose>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\MSTest.TestAdapter.2.0.0-beta2\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\MSTest.TestAdapter.2.0.0-beta2\build\net45\MSTest.TestAdapter.props'))" />
-    <Error Condition="!Exists('..\..\packages\MSTest.TestAdapter.2.0.0-beta2\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\MSTest.TestAdapter.2.0.0-beta2\build\net45\MSTest.TestAdapter.targets'))" />
-  </Target>
-  <Import Project="..\..\packages\MSTest.TestAdapter.2.0.0-beta2\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\..\packages\MSTest.TestAdapter.2.0.0-beta2\build\net45\MSTest.TestAdapter.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/CalculatorWADTests/Properties/AssemblyInfo.cs b/src/CalculatorUITests/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/CalculatorWADTests/Properties/AssemblyInfo.cs
rename to src/CalculatorUITests/Properties/AssemblyInfo.cs
diff --git a/src/CalculatorWADTests/ScenarioStandard.cs b/src/CalculatorUITests/ScenarioStandard.cs
similarity index 55%
rename from src/CalculatorWADTests/ScenarioStandard.cs
rename to src/CalculatorUITests/ScenarioStandard.cs
index 5c78614c..4f29c481 100644
--- a/src/CalculatorWADTests/ScenarioStandard.cs
+++ b/src/CalculatorUITests/ScenarioStandard.cs
@@ -1,28 +1,15 @@
-//******************************************************************************
-//
-// Copyright (c) 2017 Microsoft Corporation. All rights reserved.
-//
-// This code is licensed under the MIT License (MIT).
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//******************************************************************************
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenQA.Selenium.Appium.Windows;
 using System.Threading;
 using System;
 
-namespace CalculatorTest
+namespace CalculatorUITests
 {
     [TestClass]
-    public class ScenarioStandard : CalculatorSession
+    public class StandardModeTests : CalculatorSession
     {
         private static WindowsElement header;
         private static WindowsElement calculatorResult;
@@ -30,7 +17,6 @@ namespace CalculatorTest
         [TestMethod]
         public void Addition()
         {
-            Thread.Sleep(5000);
             // Find the buttons by their names and click them in sequence to peform 1 + 7 = 8
             session.FindElementByName("One").Click();
             session.FindElementByName("Plus").Click();
@@ -42,7 +28,6 @@ namespace CalculatorTest
         [TestMethod]
         public void Division()
         {
-            Thread.Sleep(5000);
             // Find the buttons by their accessibility ids and click them in sequence to perform 88 / 11 = 8
             session.FindElementByAccessibilityId("num8Button").Click();
             session.FindElementByAccessibilityId("num8Button").Click();
@@ -56,59 +41,30 @@ namespace CalculatorTest
         [TestMethod]
         public void Multiplication()
         {
-            Thread.Sleep(5000);
-            // Find the buttons by their names using XPath and click them in sequence to perform 9 x 9 = 81
-            session.FindElementByXPath("//Button[@Name='Nine']").Click();
-            session.FindElementByXPath("//Button[@Name='Multiply by']").Click();
-            session.FindElementByXPath("//Button[@Name='Nine']").Click();
-            session.FindElementByXPath("//Button[@Name='Equals']").Click();
+            session.FindElementByAccessibilityId("num9Button").Click();
+            session.FindElementByAccessibilityId("multiplyButton").Click();
+            session.FindElementByAccessibilityId("num9Button").Click();
+            session.FindElementByAccessibilityId("equalButton").Click();
             Assert.AreEqual("81", GetCalculatorResultText());
         }
 
         [TestMethod]
         public void Subtraction()
         {
-            Thread.Sleep(5000);
             // Find the buttons by their accessibility ids using XPath and click them in sequence to perform 9 - 1 = 8
-            session.FindElementByXPath("//Button[@AutomationId=\"num9Button\"]").Click();
-            session.FindElementByXPath("//Button[@AutomationId=\"minusButton\"]").Click();
-            session.FindElementByXPath("//Button[@AutomationId=\"num1Button\"]").Click();
-            session.FindElementByXPath("//Button[@AutomationId=\"equalButton\"]").Click();
+            session.FindElementByAccessibilityId("num9Button").Click();
+            session.FindElementByAccessibilityId("minusButton").Click();
+            session.FindElementByAccessibilityId("num1Button").Click();
+            session.FindElementByAccessibilityId("equalButton").Click();
             Assert.AreEqual("8", GetCalculatorResultText());
         }
 
-        /*
-        [TestMethod]
-        public void Templatized()
-        {
-            Templatized("One", "Plus", "Seven", "8");
-            Templatized("Nine", "Minus", "One", "8");
-            Templatized("Eight", "Divide by", "Eight", "1");
-        }
-        */
-        [TestMethod]
-        [DataRow("One", "Plus", "Seven", "8")]
-        [DataRow("Nine", "Minus", "One", "8")]
-        [DataRow("Eight", "Divide by", "Eight", "1")]
-        public void Templatized(string input1, string operation, string input2, string expectedResult)
-        {
-            Thread.Sleep(5000);
-            // Run sequence of button presses specified above and validate the results
-            session.FindElementByName(input1).Click();
-            session.FindElementByName(operation).Click();
-            session.FindElementByName(input2).Click();
-            session.FindElementByName("Equals").Click();
-            Assert.AreEqual(expectedResult, GetCalculatorResultText());
-        }
-        
+
         [ClassInitialize]
         public static void ClassInitialize(TestContext context)
         {
             // Create session to launch a Calculator window
             Setup(context);
-
-            Thread.Sleep(5000);
-
             // Identify calculator mode by locating the header
             try
             {
@@ -129,9 +85,6 @@ namespace CalculatorTest
                 Thread.Sleep(TimeSpan.FromSeconds(1));
                 Assert.IsTrue(header.Text.Equals("Standard", StringComparison.OrdinalIgnoreCase));
             }
-
-            Thread.Sleep(5000);
-
             // Locate the calculatorResult element
             calculatorResult = session.FindElementByAccessibilityId("CalculatorResults");
             Assert.IsNotNull(calculatorResult);
@@ -146,10 +99,8 @@ namespace CalculatorTest
         [TestInitialize]
         public void Clear()
         {
-            Thread.Sleep(5000);
             session.FindElementByName("Clear").Click();
             Assert.AreEqual("0", GetCalculatorResultText());
-            Thread.Sleep(10000);
         }
 
         private string GetCalculatorResultText()
diff --git a/src/CalculatorWADTests/TestSettings1.runsettings b/src/CalculatorUITests/TestSettings1.runsettings
similarity index 100%
rename from src/CalculatorWADTests/TestSettings1.runsettings
rename to src/CalculatorUITests/TestSettings1.runsettings
diff --git a/src/CalculatorWADTests/CalculatorTest.sln b/src/CalculatorWADTests/CalculatorTest.sln
deleted file mode 100644
index 807e2150..00000000
--- a/src/CalculatorWADTests/CalculatorTest.sln
+++ /dev/null
@@ -1,31 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28010.2036
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CalculatorTest", "CalculatorTest.csproj", "{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{EF2AC85C-90D3-43B4-AEAC-66911DF8208F}"
-	ProjectSection(SolutionItems) = preProject
-		TestSettings1.runsettings = TestSettings1.runsettings
-		TestSettings1.testsettings = TestSettings1.testsettings
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B2C5ADFF-D6B5-48C1-BB8C-571BFD583D7F}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {9F92CA6B-460C-4D04-A522-8A92BC33B686}
-	EndGlobalSection
-EndGlobal
diff --git a/src/CalculatorWADTests/README.md b/src/CalculatorWADTests/README.md
deleted file mode 100644
index b35a93d1..00000000
--- a/src/CalculatorWADTests/README.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# CalculatorTest
-
-CalculatorTest is a sample test project that runs and validates basic UI scenarios on the **Microsoft Open Sourced Calculator** application. This sample is created as the most basic test project to quickly try out Windows Application Driver.
-
-This test project highlights the following basic interactions to demonstrate how UI testing using Windows Application Driver work.
-- Creating a modern UWP app session
-- Finding element using name
-- Finding element using accessibility id
-- Finding element using XPath
-- Sending click action to an element
-- Retrieving element value
-- Navigating using SplitViewPane
-
-
-## Requirements
-
-- Windows 10 PC with the latest Windows 10 version (Version 1809 or later)
-- Microsoft Visual Studio 2017 or later
-
-
-## Getting Started
-
-1. [Run](../../../README.md#installing-and-running-windows-application-driver) `WinAppDriver.exe` on the test device
-2. Open `CalculatorTest.sln` in Visual Studio
-3. Select **Build** > **Rebuild Solution**
-4. Select **Test** > **Windows** > **Test Explorer**
-5. Select **Run All** on the test pane or through menu **Test** > **Run** > **All Tests**
-
-> Once the project is successfully built, you can use the **TestExplorer** to pick and choose the test scenario(s) to run
-
-> If Visual Studio fail to discover and run the test scenarios:
-> 1. Select **Tools** > **Options...** > **Test**
-> 2. Under *Active Solution*, uncheck *For improved performance, only use test adapters in test assembly folder or as specified in runsettings file*
diff --git a/src/CalculatorWADTests/packages.config b/src/CalculatorWADTests/packages.config
deleted file mode 100644
index 34d7a6f2..00000000
--- a/src/CalculatorWADTests/packages.config
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Castle.Core" version="4.2.1" targetFramework="net45" />
-  <package id="Microsoft.WinAppDriver.Appium.WebDriver" version="1.0.1-Preview" targetFramework="net45" />
-  <package id="MSTest.TestAdapter" version="2.0.0-beta2" targetFramework="net45" />
-  <package id="MSTest.TestFramework" version="2.0.0-beta2" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
-  <package id="Selenium.Support" version="3.8.0" targetFramework="net45" />
-  <package id="Selenium.WebDriver" version="3.8.0" targetFramework="net45" />
-</packages>
\ No newline at end of file