diff --git a/Xamarin.UITest.POPSample/AppManager.cs b/Xamarin.UITest.POPSample/AppManager.cs
index ba98793..055d5f7 100644
--- a/Xamarin.UITest.POPSample/AppManager.cs
+++ b/Xamarin.UITest.POPSample/AppManager.cs
@@ -1,12 +1,12 @@
 using System;
+using System.IO;
+using System.Reflection;
 using Xamarin.UITest;
 
 namespace Xamarin.UITest.POPSample
 {
     static class AppManager
     {
-        const string ApkPath = "../../../Binaries/TaskyDroid.apk";
-        const string AppPath = "../../../Binaries/TaskyiOS.app";
         const string IpaBundleId = "com.xamarin.samples.taskytouch";
 
         static IApp app;
@@ -38,12 +38,15 @@ public static Platform Platform
 
         public static void StartApp()
         {
+            string assemblyFolder = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+            string binariesFolder = Path.Combine(assemblyFolder, "..", "..", "..", "Binaries");
+
             if (Platform == Platform.Android)
             {
                 app = ConfigureApp
                     .Android
                     // Used to run a .apk file:
-                    .ApkFile(ApkPath)
+                    .ApkFile(Path.Combine(binariesFolder, "TaskyDroid.apk"))
                     .StartApp();
             }
 
@@ -52,7 +55,7 @@ public static void StartApp()
                 app = ConfigureApp
                     .iOS
                     // Used to run a .app file on an ios simulator:
-                    .AppBundle(AppPath)
+                    .AppBundle(Path.Combine(binariesFolder, "TaskyiOS.app"))
                     // Used to run a .ipa file on a physical ios device:
                     //.InstalledApp(ipaBundleId)
                     .StartApp();
diff --git a/Xamarin.UITest.POPSample/Pages/TaskDetailsPage.cs b/Xamarin.UITest.POPSample/Pages/TaskDetailsPage.cs
index 64aac59..49bdd24 100644
--- a/Xamarin.UITest.POPSample/Pages/TaskDetailsPage.cs
+++ b/Xamarin.UITest.POPSample/Pages/TaskDetailsPage.cs
@@ -47,7 +47,9 @@ public TaskDetailsPage EnterTask(string name, string notes = null)
         {
             if (OnAndroid)
             {
-                app.EnterText(nameField, name);
+                app.Tap(nameField);
+                app.EnterText(name);
+                app.DismissKeyboard();
 
                 if (notes != null)
                     app.EnterText(notesField, notes);
diff --git a/Xamarin.UITest.POPSample/Xamarin.UITest.POPSample.csproj b/Xamarin.UITest.POPSample/Xamarin.UITest.POPSample.csproj
index ef0d173..4e27f35 100644
--- a/Xamarin.UITest.POPSample/Xamarin.UITest.POPSample.csproj
+++ b/Xamarin.UITest.POPSample/Xamarin.UITest.POPSample.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -26,12 +26,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="nunit.framework">
-      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.UITest">
-      <HintPath>..\packages\Xamarin.UITest.2.0.9\lib\Xamarin.UITest.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AppManager.cs" />
@@ -44,7 +38,15 @@
     <Compile Include="Tests\iOSOnlyTests.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <PackageReference Include="NUnit">
+      <Version>3.11.0</Version>
+    </PackageReference>
+    <PackageReference Include="NUnit3TestAdapter">
+      <Version>3.13.0</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.UITest">
+      <Version>3.0.0-dev23</Version>
+    </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Xamarin.UITest.POPSample/packages.config b/Xamarin.UITest.POPSample/packages.config
deleted file mode 100644
index 22c7c9c..0000000
--- a/Xamarin.UITest.POPSample/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NUnit" version="2.6.4" targetFramework="net45" />
-  <package id="Xamarin.UITest" version="2.0.9" targetFramework="net45" />
-</packages>
\ No newline at end of file