diff --git a/Documentation/docs-mobile/building-apps/build-process.md b/Documentation/docs-mobile/building-apps/build-process.md
index 8804a58a4e4..f7ef750cae0 100644
--- a/Documentation/docs-mobile/building-apps/build-process.md
+++ b/Documentation/docs-mobile/building-apps/build-process.md
@@ -186,29 +186,3 @@ performance, especially if they run on every build. It is
 highly recommended that you read the MSBuild [documentation](/visualstudio/msbuild/msbuild)
 before implementing such extensions.
 
-## Target definitions
-
-The .NET for Android-specific parts of the build process are defined in
-`$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets`,
-but normal language-specific targets such as *Microsoft.CSharp.targets*
-are also required to build the assembly.
-
-The following build properties must be set before importing any language
-targets:
-
-```xml
-<PropertyGroup>
-  <TargetFrameworkIdentifier>MonoDroid</TargetFrameworkIdentifier>
-  <MonoDroidVersion>v1.0</MonoDroidVersion>
-  <TargetFrameworkVersion>v2.2</TargetFrameworkVersion>
-</PropertyGroup>
-```
-
-All of these targets and properties can be included for C# by
-importing *Xamarin.Android.CSharp.targets*:
-
-```xml
-<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-```
-
-This file can easily be adapted for other languages.
diff --git a/Documentation/project-docs/ExploringSources.md b/Documentation/project-docs/ExploringSources.md
index f35f40f7783..858b6c7d66f 100644
--- a/Documentation/project-docs/ExploringSources.md
+++ b/Documentation/project-docs/ExploringSources.md
@@ -15,7 +15,6 @@ is used within many of the output directories which are created.
           * `bin`: Programs that are intended to be installed into `$(prefix)/bin`,
 	    for Unix-style installable files.
           * `packs\Microsoft.Android.Sdk.$(HostOS)\$(AndroidPackVersion)\tools`: MSBuild project integrations.
-            This is where `Xamarin.Android.CSharp.targets` lives.
           * `lib\xamarin.android\xbuild-frameworks\MonoAndroid\v1.0`:
             Xamarin.Android BCL assemblies
           * `lib\xamarin.android\xbuild-frameworks\MonoAndroid\*`: Xamarin.Android
diff --git a/Documentation/workflow/UnitTests.md b/Documentation/workflow/UnitTests.md
index 51b8f62b5a6..283000ac362 100644
--- a/Documentation/workflow/UnitTests.md
+++ b/Documentation/workflow/UnitTests.md
@@ -399,8 +399,6 @@ These tests are generally found in:
 
   * [`tests/Mono.Android-Tests`](../../tests/Mono.Android-Tests)
   * [`tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests`](../../tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests)
-  * [`tests/EmbeddedDSOs/EmbeddedDSO`](../../tests/EmbeddedDSOs/EmbeddedDSO)
-  * [`tests/locales/Xamarin.Android.Locale-Tests`](../../tests/locales/Xamarin.Android.Locale-Tests)
 
 The main runtime test project is:
 
diff --git a/Xamarin.Android-Tests.sln b/Xamarin.Android-Tests.sln
index edfbdc41a4a..32722a8c8aa 100644
--- a/Xamarin.Android-Tests.sln
+++ b/Xamarin.Android-Tests.sln
@@ -12,12 +12,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{43A4
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{EFBC4DC0-DBFF-4DAA-B0B8-6D0CB02A25F5}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Locales", "Locales", "{D6BFEDF6-2F48-44B2-9553-F2F6F92531BD}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibraryResources", "tests\locales\LibraryResources\LibraryResources.csproj", "{05768F39-7BAF-43E6-971E-712F5771E88E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Locale-Tests", "tests\locales\Xamarin.Android.Locale-Tests\Xamarin.Android.Locale-Tests.csproj", "{9D5C83B5-70D5-4CC2-9DB7-78B23DC8F255}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CodeGen-Binding", "CodeGen-Binding", "{2EFFECF5-1CCA-4005-AE62-1D6F01C88DF4}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.McwGen-Tests", "tests\CodeGen-Binding\Xamarin.Android.McwGen-Tests\Xamarin.Android.McwGen-Tests.csproj", "{EF798EB3-D639-4E09-9DB0-233E67F727B0}"
@@ -32,18 +26,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.FixJavaAbst
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.JcwGen-Tests", "tests\CodeGen-Binding\Xamarin.Android.JcwGen-Tests\Xamarin.Android.JcwGen-Tests.csproj", "{9479B71F-19FE-48F9-AB3F-AE764D76038A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ResolveImports", "ResolveImports", "{E49089E4-4CE0-475E-BE9C-0AB4E4D56EE9}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.BindingResolveImportLib1", "tests\ResolveImports\Xamarin.Android.BindingResolveImportLib1\Xamarin.Android.BindingResolveImportLib1.csproj", "{2A0519DF-0DDA-45F7-AC3C-E2992748D364}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.BindingResolveImportLib2", "tests\ResolveImports\Xamarin.Android.BindingResolveImportLib2\Xamarin.Android.BindingResolveImportLib2.csproj", "{DD4E2A49-730C-41FD-B6D4-AFB73F94271F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.BindingResolveImportLib3", "tests\ResolveImports\Xamarin.Android.BindingResolveImportLib3\Xamarin.Android.BindingResolveImportLib3.csproj", "{9802CB35-0BC0-4EE1-9A81-BB40BD97945A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.BindingResolveImportLib4", "tests\ResolveImports\Xamarin.Android.BindingResolveImportLib4\Xamarin.Android.BindingResolveImportLib4.csproj", "{5BDCEF07-E3D7-4E73-B025-6E43A5A7D7F1}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.BindingResolveImports-Tests", "tests\ResolveImports\Xamarin.Android.BindingResolveImports-Tests\Xamarin.Android.BindingResolveImports-Tests.csproj", "{B297008B-C313-455E-B230-E119589D2D79}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Performance.Integration", "tests\Xamarin.Forms-Performance-Integration\Xamarin.Forms.Performance.Integration.csproj", "{195BE9C2-1F91-40DC-BD6D-DE860BF083FB}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Performance.Integration.Droid", "tests\Xamarin.Forms-Performance-Integration\Droid\Xamarin.Forms.Performance.Integration.Droid.csproj", "{576312CC-83FF-48B1-A473-488CDC7121AD}"
@@ -62,8 +44,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Performance-Tests", "Perfor
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "timing", "build-tools\timing\timing.csproj", "{37CAA28C-40BE-4253-BA68-CC5D7316A617}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EmbeddedDSO", "tests\EmbeddedDSOs\EmbeddedDSO\EmbeddedDSO.csproj", "{056ED976-618F-4A3E-910E-AA25230C2296}"
-EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Mono.Android-Test.Shared", "tests\Mono.Android-Tests\Mono.Android-Test.Shared.shproj", "{0AB4956E-6FB9-4DA0-9D49-AB65A3FF403A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Android-Test.Library", "tests\Mono.Android-Tests\Mono.Android-Test.Library\Mono.Android-Test.Library.csproj", "{8CB5FF58-FF95-43B9-9064-9ACE9525866F}"
@@ -128,30 +108,6 @@ Global
 		{6BE66B30-9346-4DA6-B09A-0CDC1DFE33C2}.Release|x64.Build.0 = Release|Any CPU
 		{6BE66B30-9346-4DA6-B09A-0CDC1DFE33C2}.Release|x86.ActiveCfg = Release|Any CPU
 		{6BE66B30-9346-4DA6-B09A-0CDC1DFE33C2}.Release|x86.Build.0 = Release|Any CPU
-		{05768F39-7BAF-43E6-971E-712F5771E88E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{05768F39-7BAF-43E6-971E-712F5771E88E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{05768F39-7BAF-43E6-971E-712F5771E88E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{05768F39-7BAF-43E6-971E-712F5771E88E}.Debug|x64.Build.0 = Debug|Any CPU
-		{05768F39-7BAF-43E6-971E-712F5771E88E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{05768F39-7BAF-43E6-971E-712F5771E88E}.Debug|x86.Build.0 = Debug|Any CPU
-		{05768F39-7BAF-43E6-971E-712F5771E88E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{05768F39-7BAF-43E6-971E-712F5771E88E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{05768F39-7BAF-43E6-971E-712F5771E88E}.Release|x64.ActiveCfg = Release|Any CPU
-		{05768F39-7BAF-43E6-971E-712F5771E88E}.Release|x64.Build.0 = Release|Any CPU
-		{05768F39-7BAF-43E6-971E-712F5771E88E}.Release|x86.ActiveCfg = Release|Any CPU
-		{05768F39-7BAF-43E6-971E-712F5771E88E}.Release|x86.Build.0 = Release|Any CPU
-		{9D5C83B5-70D5-4CC2-9DB7-78B23DC8F255}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9D5C83B5-70D5-4CC2-9DB7-78B23DC8F255}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9D5C83B5-70D5-4CC2-9DB7-78B23DC8F255}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9D5C83B5-70D5-4CC2-9DB7-78B23DC8F255}.Debug|x64.Build.0 = Debug|Any CPU
-		{9D5C83B5-70D5-4CC2-9DB7-78B23DC8F255}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9D5C83B5-70D5-4CC2-9DB7-78B23DC8F255}.Debug|x86.Build.0 = Debug|Any CPU
-		{9D5C83B5-70D5-4CC2-9DB7-78B23DC8F255}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9D5C83B5-70D5-4CC2-9DB7-78B23DC8F255}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9D5C83B5-70D5-4CC2-9DB7-78B23DC8F255}.Release|x64.ActiveCfg = Release|Any CPU
-		{9D5C83B5-70D5-4CC2-9DB7-78B23DC8F255}.Release|x64.Build.0 = Release|Any CPU
-		{9D5C83B5-70D5-4CC2-9DB7-78B23DC8F255}.Release|x86.ActiveCfg = Release|Any CPU
-		{9D5C83B5-70D5-4CC2-9DB7-78B23DC8F255}.Release|x86.Build.0 = Release|Any CPU
 		{EF798EB3-D639-4E09-9DB0-233E67F727B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EF798EB3-D639-4E09-9DB0-233E67F727B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EF798EB3-D639-4E09-9DB0-233E67F727B0}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -224,66 +180,6 @@ Global
 		{9479B71F-19FE-48F9-AB3F-AE764D76038A}.Release|x64.Build.0 = Release|Any CPU
 		{9479B71F-19FE-48F9-AB3F-AE764D76038A}.Release|x86.ActiveCfg = Release|Any CPU
 		{9479B71F-19FE-48F9-AB3F-AE764D76038A}.Release|x86.Build.0 = Release|Any CPU
-		{2A0519DF-0DDA-45F7-AC3C-E2992748D364}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2A0519DF-0DDA-45F7-AC3C-E2992748D364}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2A0519DF-0DDA-45F7-AC3C-E2992748D364}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2A0519DF-0DDA-45F7-AC3C-E2992748D364}.Debug|x64.Build.0 = Debug|Any CPU
-		{2A0519DF-0DDA-45F7-AC3C-E2992748D364}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2A0519DF-0DDA-45F7-AC3C-E2992748D364}.Debug|x86.Build.0 = Debug|Any CPU
-		{2A0519DF-0DDA-45F7-AC3C-E2992748D364}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2A0519DF-0DDA-45F7-AC3C-E2992748D364}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2A0519DF-0DDA-45F7-AC3C-E2992748D364}.Release|x64.ActiveCfg = Release|Any CPU
-		{2A0519DF-0DDA-45F7-AC3C-E2992748D364}.Release|x64.Build.0 = Release|Any CPU
-		{2A0519DF-0DDA-45F7-AC3C-E2992748D364}.Release|x86.ActiveCfg = Release|Any CPU
-		{2A0519DF-0DDA-45F7-AC3C-E2992748D364}.Release|x86.Build.0 = Release|Any CPU
-		{DD4E2A49-730C-41FD-B6D4-AFB73F94271F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DD4E2A49-730C-41FD-B6D4-AFB73F94271F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DD4E2A49-730C-41FD-B6D4-AFB73F94271F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DD4E2A49-730C-41FD-B6D4-AFB73F94271F}.Debug|x64.Build.0 = Debug|Any CPU
-		{DD4E2A49-730C-41FD-B6D4-AFB73F94271F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DD4E2A49-730C-41FD-B6D4-AFB73F94271F}.Debug|x86.Build.0 = Debug|Any CPU
-		{DD4E2A49-730C-41FD-B6D4-AFB73F94271F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DD4E2A49-730C-41FD-B6D4-AFB73F94271F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DD4E2A49-730C-41FD-B6D4-AFB73F94271F}.Release|x64.ActiveCfg = Release|Any CPU
-		{DD4E2A49-730C-41FD-B6D4-AFB73F94271F}.Release|x64.Build.0 = Release|Any CPU
-		{DD4E2A49-730C-41FD-B6D4-AFB73F94271F}.Release|x86.ActiveCfg = Release|Any CPU
-		{DD4E2A49-730C-41FD-B6D4-AFB73F94271F}.Release|x86.Build.0 = Release|Any CPU
-		{9802CB35-0BC0-4EE1-9A81-BB40BD97945A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9802CB35-0BC0-4EE1-9A81-BB40BD97945A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9802CB35-0BC0-4EE1-9A81-BB40BD97945A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9802CB35-0BC0-4EE1-9A81-BB40BD97945A}.Debug|x64.Build.0 = Debug|Any CPU
-		{9802CB35-0BC0-4EE1-9A81-BB40BD97945A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9802CB35-0BC0-4EE1-9A81-BB40BD97945A}.Debug|x86.Build.0 = Debug|Any CPU
-		{9802CB35-0BC0-4EE1-9A81-BB40BD97945A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9802CB35-0BC0-4EE1-9A81-BB40BD97945A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9802CB35-0BC0-4EE1-9A81-BB40BD97945A}.Release|x64.ActiveCfg = Release|Any CPU
-		{9802CB35-0BC0-4EE1-9A81-BB40BD97945A}.Release|x64.Build.0 = Release|Any CPU
-		{9802CB35-0BC0-4EE1-9A81-BB40BD97945A}.Release|x86.ActiveCfg = Release|Any CPU
-		{9802CB35-0BC0-4EE1-9A81-BB40BD97945A}.Release|x86.Build.0 = Release|Any CPU
-		{5BDCEF07-E3D7-4E73-B025-6E43A5A7D7F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5BDCEF07-E3D7-4E73-B025-6E43A5A7D7F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5BDCEF07-E3D7-4E73-B025-6E43A5A7D7F1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5BDCEF07-E3D7-4E73-B025-6E43A5A7D7F1}.Debug|x64.Build.0 = Debug|Any CPU
-		{5BDCEF07-E3D7-4E73-B025-6E43A5A7D7F1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5BDCEF07-E3D7-4E73-B025-6E43A5A7D7F1}.Debug|x86.Build.0 = Debug|Any CPU
-		{5BDCEF07-E3D7-4E73-B025-6E43A5A7D7F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5BDCEF07-E3D7-4E73-B025-6E43A5A7D7F1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5BDCEF07-E3D7-4E73-B025-6E43A5A7D7F1}.Release|x64.ActiveCfg = Release|Any CPU
-		{5BDCEF07-E3D7-4E73-B025-6E43A5A7D7F1}.Release|x64.Build.0 = Release|Any CPU
-		{5BDCEF07-E3D7-4E73-B025-6E43A5A7D7F1}.Release|x86.ActiveCfg = Release|Any CPU
-		{5BDCEF07-E3D7-4E73-B025-6E43A5A7D7F1}.Release|x86.Build.0 = Release|Any CPU
-		{B297008B-C313-455E-B230-E119589D2D79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B297008B-C313-455E-B230-E119589D2D79}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B297008B-C313-455E-B230-E119589D2D79}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B297008B-C313-455E-B230-E119589D2D79}.Debug|x64.Build.0 = Debug|Any CPU
-		{B297008B-C313-455E-B230-E119589D2D79}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B297008B-C313-455E-B230-E119589D2D79}.Debug|x86.Build.0 = Debug|Any CPU
-		{B297008B-C313-455E-B230-E119589D2D79}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B297008B-C313-455E-B230-E119589D2D79}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B297008B-C313-455E-B230-E119589D2D79}.Release|x64.ActiveCfg = Release|Any CPU
-		{B297008B-C313-455E-B230-E119589D2D79}.Release|x64.Build.0 = Release|Any CPU
-		{B297008B-C313-455E-B230-E119589D2D79}.Release|x86.ActiveCfg = Release|Any CPU
-		{B297008B-C313-455E-B230-E119589D2D79}.Release|x86.Build.0 = Release|Any CPU
 		{195BE9C2-1F91-40DC-BD6D-DE860BF083FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{195BE9C2-1F91-40DC-BD6D-DE860BF083FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{195BE9C2-1F91-40DC-BD6D-DE860BF083FB}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -368,18 +264,6 @@ Global
 		{37CAA28C-40BE-4253-BA68-CC5D7316A617}.Release|x64.Build.0 = Release|Any CPU
 		{37CAA28C-40BE-4253-BA68-CC5D7316A617}.Release|x86.ActiveCfg = Release|Any CPU
 		{37CAA28C-40BE-4253-BA68-CC5D7316A617}.Release|x86.Build.0 = Release|Any CPU
-		{056ED976-618F-4A3E-910E-AA25230C2296}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{056ED976-618F-4A3E-910E-AA25230C2296}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{056ED976-618F-4A3E-910E-AA25230C2296}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{056ED976-618F-4A3E-910E-AA25230C2296}.Debug|x64.Build.0 = Debug|Any CPU
-		{056ED976-618F-4A3E-910E-AA25230C2296}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{056ED976-618F-4A3E-910E-AA25230C2296}.Debug|x86.Build.0 = Debug|Any CPU
-		{056ED976-618F-4A3E-910E-AA25230C2296}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{056ED976-618F-4A3E-910E-AA25230C2296}.Release|Any CPU.Build.0 = Release|Any CPU
-		{056ED976-618F-4A3E-910E-AA25230C2296}.Release|x64.ActiveCfg = Release|Any CPU
-		{056ED976-618F-4A3E-910E-AA25230C2296}.Release|x64.Build.0 = Release|Any CPU
-		{056ED976-618F-4A3E-910E-AA25230C2296}.Release|x86.ActiveCfg = Release|Any CPU
-		{056ED976-618F-4A3E-910E-AA25230C2296}.Release|x86.Build.0 = Release|Any CPU
 		{8CB5FF58-FF95-43B9-9064-9ACE9525866F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8CB5FF58-FF95-43B9-9064-9ACE9525866F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8CB5FF58-FF95-43B9-9064-9ACE9525866F}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -462,19 +346,12 @@ Global
 		{40EAD437-216B-4DF4-8258-3F47E1672C3A} = {EFBC4DC0-DBFF-4DAA-B0B8-6D0CB02A25F5}
 		{2305B00D-DE81-4744-B0DA-357835CAFE5A} = {43A4FB09-279A-4138-8027-EC1E1CED2E8A}
 		{6BE66B30-9346-4DA6-B09A-0CDC1DFE33C2} = {43A4FB09-279A-4138-8027-EC1E1CED2E8A}
-		{05768F39-7BAF-43E6-971E-712F5771E88E} = {D6BFEDF6-2F48-44B2-9553-F2F6F92531BD}
-		{9D5C83B5-70D5-4CC2-9DB7-78B23DC8F255} = {D6BFEDF6-2F48-44B2-9553-F2F6F92531BD}
 		{EF798EB3-D639-4E09-9DB0-233E67F727B0} = {2EFFECF5-1CCA-4005-AE62-1D6F01C88DF4}
 		{9553ED9D-92EA-411B-ADFF-21C5608CCD16} = {2EFFECF5-1CCA-4005-AE62-1D6F01C88DF4}
 		{91105023-9421-4E56-A87B-64BC62525D55} = {2EFFECF5-1CCA-4005-AE62-1D6F01C88DF4}
 		{7B9D9F32-973F-49CF-A8F8-05BDFC75556C} = {2EFFECF5-1CCA-4005-AE62-1D6F01C88DF4}
 		{B7476528-C166-40BF-931F-EAEB02247879} = {2EFFECF5-1CCA-4005-AE62-1D6F01C88DF4}
 		{9479B71F-19FE-48F9-AB3F-AE764D76038A} = {2EFFECF5-1CCA-4005-AE62-1D6F01C88DF4}
-		{2A0519DF-0DDA-45F7-AC3C-E2992748D364} = {E49089E4-4CE0-475E-BE9C-0AB4E4D56EE9}
-		{DD4E2A49-730C-41FD-B6D4-AFB73F94271F} = {E49089E4-4CE0-475E-BE9C-0AB4E4D56EE9}
-		{9802CB35-0BC0-4EE1-9A81-BB40BD97945A} = {E49089E4-4CE0-475E-BE9C-0AB4E4D56EE9}
-		{5BDCEF07-E3D7-4E73-B025-6E43A5A7D7F1} = {E49089E4-4CE0-475E-BE9C-0AB4E4D56EE9}
-		{B297008B-C313-455E-B230-E119589D2D79} = {E49089E4-4CE0-475E-BE9C-0AB4E4D56EE9}
 		{3CC4E384-4985-4D93-A34C-73F69A379FA7} = {EFBC4DC0-DBFF-4DAA-B0B8-6D0CB02A25F5}
 		{95012FA9-ED51-4004-8F36-91DB361C892B} = {9B63992C-2201-4BB0-BD00-D637B481A995}
 		{7A5FB23C-6B26-461A-8BBD-02392DCE3C11} = {9B63992C-2201-4BB0-BD00-D637B481A995}
diff --git a/tests/EmbeddedDSOs/EmbeddedDSO/Assets/AboutAssets.txt b/tests/EmbeddedDSOs/EmbeddedDSO/Assets/AboutAssets.txt
deleted file mode 100644
index a9b0638eb1b..00000000000
--- a/tests/EmbeddedDSOs/EmbeddedDSO/Assets/AboutAssets.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Any raw assets you want to be deployed with your application can be placed in
-this directory (and child directories) and given a Build Action of "AndroidAsset".
-
-These files will be deployed with your package and will be accessible using Android's
-AssetManager, like this:
-
-public class ReadAsset : Activity
-{
-	protected override void OnCreate (Bundle bundle)
-	{
-		base.OnCreate (bundle);
-
-		InputStream input = Assets.Open ("my_asset.txt");
-	}
-}
-
-Additionally, some Android functions will automatically load asset files:
-
-Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf");
diff --git a/tests/EmbeddedDSOs/EmbeddedDSO/EmbeddedDSO.csproj b/tests/EmbeddedDSOs/EmbeddedDSO/EmbeddedDSO.csproj
deleted file mode 100644
index 7593d18a13f..00000000000
--- a/tests/EmbeddedDSOs/EmbeddedDSO/EmbeddedDSO.csproj
+++ /dev/null
@@ -1,119 +0,0 @@
-<?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>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{056ED976-618F-4A3E-910E-AA25230C2296}</ProjectGuid>
-    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <RootNamespace>EmbeddedDSO</RootNamespace>
-    <AssemblyName>Xamarin.Android.EmbeddedDSO_Test</AssemblyName>
-    <AndroidApplication>True</AndroidApplication>
-    <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
-    <AndroidResgenClass>Resource</AndroidResgenClass>
-    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
-    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
-    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <AppendTargetFrameworkToIntermediateOutputPath>false</AppendTargetFrameworkToIntermediateOutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(UnitTestsMode)' == 'true' ">
-    <!--Set when running on Azure Pipelines https://docs.microsoft.com/en-us/azure/devops/pipelines/build/variables -->
-    <RelativeRootPath Condition=" '$(BUILD_SOURCESDIRECTORY)' != '' ">$(BUILD_SOURCESDIRECTORY)</RelativeRootPath>
-    <RelativeRootPath Condition=" !Exists('$(RelativeRootPath)') ">..\..\..\..\..\..\..</RelativeRootPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(UnitTestsMode)' != 'true' ">
-    <RelativeRootPath>..\..\..</RelativeRootPath>
-  </PropertyGroup>
-
-  <Import Project="$(RelativeRootPath)\Configuration.props" />
-  <PropertyGroup>
-    <TargetFrameworkVersion>$(AndroidFrameworkVersion)</TargetFrameworkVersion>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <!-- We have to limit the supported abis to the currently enabled set, since the PR builders don't build all architectures but,
-         eventually, we have to build for all the ABIs unconditionally here -->
-    <AndroidSupportedAbis>$(AndroidSupportedTargetJitAbisSplit)</AndroidSupportedAbis>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <Optimize>false</Optimize>
-    <OutputPath Condition=" '$(UnitTestsMode)' != 'true' ">$(RelativeRootPath)\bin\TestDebug</OutputPath>
-    <OutputPath Condition=" '$(UnitTestsMode)' == 'true' ">bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidLinkMode>None</AndroidLinkMode>
-    <JavaMaximumHeapSize></JavaMaximumHeapSize>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <Optimize>true</Optimize>
-    <OutputPath Condition=" '$(UnitTestsMode)' != 'true' ">$(RelativeRootPath)\bin\TestRelease</OutputPath>
-    <OutputPath Condition=" '$(UnitTestsMode)' == 'true' ">bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidManagedSymbols>true</AndroidManagedSymbols>
-    <JavaMaximumHeapSize></JavaMaximumHeapSize>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="Mono.Android" />
-    <Reference Include="Xamarin.Android.NUnitLite" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="MainActivity.cs" />
-    <Compile Include="NUnitInstrumentation.cs" />
-    <Compile Include="Tests.cs" />
-    <Compile Include="Resources\Resource.designer.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\AboutResources.txt" />
-    <None Include="Properties\AndroidManifest.xml" />
-    <None Include="Assets\AboutAssets.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\layout\Main.axml" />
-    <AndroidResource Include="Resources\values\Strings.xml" />
-    <AndroidResource Include="Resources\mipmap-hdpi\Icon.png" />
-    <AndroidResource Include="Resources\mipmap-mdpi\Icon.png" />
-    <AndroidResource Include="Resources\mipmap-xhdpi\Icon.png" />
-    <AndroidResource Include="Resources\mipmap-xxhdpi\Icon.png" />
-    <AndroidResource Include="Resources\mipmap-xxxhdpi\Icon.png" />
-    <AndroidEnvironment Include="Environment.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="$(RelativeRootPath)\tests\TestRunner.Core\TestRunner.Core.csproj">
-      <Project>{3CC4E384-4985-4D93-A34C-73F69A379FA7}</Project>
-      <Name>TestRunner.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="$(RelativeRootPath)\tests\TestRunner.NUnit\TestRunner.NUnit.csproj">
-      <Project>{CB2335CB-0050-4020-8A05-E9614EDAA05E}</Project>
-      <Name>TestRunner.NUnit</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Resources\drawable\" />
-  </ItemGroup>
-
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-  <Import Project="EmbeddedDSO.projitems" />
-  <Import Project="$(RelativeRootPath)\build-tools\scripts\TestApks.targets" Condition=" '$(UnitTestsMode)' != 'true' " />
-
-  <Target Name="_GrantPermissions">
-    <Exec Command="&quot;$(AdbToolPath)adb&quot; $(AdbTarget) shell pm grant %(TestApkPermission.Package) android.permission.%(TestApkPermission.Identity)" />
-  </Target>
-
-  <PropertyGroup>
-    <InstallDependsOnTargets>
-       $(InstallDependsOnTargets);
-       _GrantPermissions
-    </InstallDependsOnTargets>
-  </PropertyGroup>
-</Project>
diff --git a/tests/EmbeddedDSOs/EmbeddedDSO/EmbeddedDSO.projitems b/tests/EmbeddedDSOs/EmbeddedDSO/EmbeddedDSO.projitems
deleted file mode 100644
index f8c3205813f..00000000000
--- a/tests/EmbeddedDSOs/EmbeddedDSO/EmbeddedDSO.projitems
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-   <_PackageName>Xamarin.Android.EmbeddedDSO_Test</_PackageName>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <TestApk Include="$(OutputPath)Xamarin.Android.EmbeddedDSO_Test-Signed.apk">
-      <Package>Xamarin.Android.EmbeddedDSO_Test</Package>
-      <InstrumentationType>xamarin.android.embeddeddso_test.NUnitInstrumentation</InstrumentationType>
-      <TimingDefinitionsFilename>$(MSBuildThisFileDirectory)..\..\..\build-tools\scripts\TimingDefinitions.txt</TimingDefinitionsFilename>
-      <TimingResultsFilename>$(MSBuildThisFileDirectory)..\..\..\TestResult-Xamarin.Android.EmbeddedDSO_Test-times.csv</TimingResultsFilename>
-    </TestApk>
-  </ItemGroup>
-
-  <ItemGroup>
-    <TestApkInstrumentation Include="xamarin.android.embeddeddso_test.NUnitInstrumentation">
-      <Package>Xamarin.Android.EmbeddedDSO_Test</Package>
-      <ResultsPath>$(OutputPath)TestResult-Xamarin.Android.EmbeddedDSO_Test.nunit.xml</ResultsPath>
-    </TestApkInstrumentation>
-
-    <TestApkPermission Include="READ_EXTERNAL_STORAGE">
-      <Package>Xamarin.Android.EmbeddedDSO_Test</Package>
-    </TestApkPermission>
-
-    <TestApkPermission Include="WRITE_EXTERNAL_STORAGE">
-      <Package>Xamarin.Android.EmbeddedDSO_Test</Package>
-    </TestApkPermission>
-
-    <TestApkPermission Include="READ_PHONE_STATE">
-      <Package>Xamarin.Android.EmbeddedDSO_Test</Package>
-    </TestApkPermission>
-  </ItemGroup>
-</Project>
diff --git a/tests/EmbeddedDSOs/EmbeddedDSO/Environment.txt b/tests/EmbeddedDSOs/EmbeddedDSO/Environment.txt
deleted file mode 100644
index ba117b60829..00000000000
--- a/tests/EmbeddedDSOs/EmbeddedDSO/Environment.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-debug.mono.debug=1
-MONO_LOG_LEVEL=debug
-MONO_LOG_MASK=asm
-MONO_XDEBUG=1
diff --git a/tests/EmbeddedDSOs/EmbeddedDSO/MainActivity.cs b/tests/EmbeddedDSOs/EmbeddedDSO/MainActivity.cs
deleted file mode 100644
index 74538f5fa87..00000000000
--- a/tests/EmbeddedDSOs/EmbeddedDSO/MainActivity.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Android.App;
-using Android.Widget;
-using Android.OS;
-
-namespace EmbeddedDSO {
-	[Activity (Label = "EmbeddedDSO", MainLauncher = true, Icon = "@mipmap/icon")]
-	public class MainActivity : Activity {
-		int count = 1;
-
-		protected override void OnCreate (Bundle savedInstanceState)
-		{
-			base.OnCreate (savedInstanceState);
-
-			// Set our view from the "main" layout resource
-			SetContentView (Resource.Layout.Main);
-
-			// Get our button from the layout resource,
-			// and attach an event to it
-			Button button = FindViewById<Button> (Resource.Id.myButton);
-
-			button.Click += delegate { button.Text = $"{count++} clicks!"; };
-		}
-	}
-}
-
diff --git a/tests/EmbeddedDSOs/EmbeddedDSO/NUnitInstrumentation.cs b/tests/EmbeddedDSOs/EmbeddedDSO/NUnitInstrumentation.cs
deleted file mode 100644
index 255ec42d0e4..00000000000
--- a/tests/EmbeddedDSOs/EmbeddedDSO/NUnitInstrumentation.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
-using System.Text;
-
-using Android.App;
-using Android.OS;
-using Android.Runtime;
-
-using Xamarin.Android.UnitTests;
-using Xamarin.Android.UnitTests.NUnit;
-
-namespace EmbeddedDSO
-{
-	[Instrumentation (Name = "xamarin.android.embeddeddso_test.NUnitInstrumentation")]
-	public class NUnitInstrumentation : NUnitTestInstrumentation
-	{
-		const string DefaultLogTag = "EmbeddedDSO";
-
-		string logTag = DefaultLogTag;
-
-		protected override string LogTag { 
-			get { return logTag; } 
-			set { logTag = value ?? DefaultLogTag; }
-		}
-
-		protected NUnitInstrumentation (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer)
-		{
-			CommonInit ();
-		}
-
-		public NUnitInstrumentation ()
-		{
-			CommonInit ();
-		}
-
-		void CommonInit ()
-		{
-			EmbeddedDSOApp.DataDir = Context?.DataDir?.AbsolutePath;
-			EmbeddedDSOApp.ApiLevel = (int)Build.VERSION.SdkInt;
-		}
-
-		protected override IList<TestAssemblyInfo> GetTestAssemblies()
-		{
-			IList<TestAssemblyInfo> ret = base.GetTestAssemblies();
-
-			if (ret == null)
-				ret = new List<TestAssemblyInfo> ();
-
-			Assembly asm = GetType ().Assembly;
-			ret.Add (new TestAssemblyInfo (asm, asm.Location ?? String.Empty));
-
-			return ret;
-		}
-	}
-}
diff --git a/tests/EmbeddedDSOs/EmbeddedDSO/Properties/AndroidManifest.xml b/tests/EmbeddedDSOs/EmbeddedDSO/Properties/AndroidManifest.xml
deleted file mode 100644
index 78abbbd92a6..00000000000
--- a/tests/EmbeddedDSOs/EmbeddedDSO/Properties/AndroidManifest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="Xamarin.Android.EmbeddedDSO_Test">
-    <uses-sdk android:minSdkVersion="23" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <application android:allowBackup="true" android:icon="@mipmap/icon" android:label="@string/app_name" android:theme="@android:style/Theme.Material" android:extractNativeLibs="false" android:directBootAware="true">
-    </application>
-</manifest>
diff --git a/tests/EmbeddedDSOs/EmbeddedDSO/Properties/AssemblyInfo.cs b/tests/EmbeddedDSOs/EmbeddedDSO/Properties/AssemblyInfo.cs
deleted file mode 100644
index c2463e345a8..00000000000
--- a/tests/EmbeddedDSOs/EmbeddedDSO/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using Android.App;
-
-// Information about this assembly is defined by the following attributes. 
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle ("EmbeddedDSO")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("")]
-[assembly: AssemblyCopyright ("Marek Habersack")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion ("1.0.0")]
-
-// The following attributes are used to specify the signing key for the assembly, 
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
diff --git a/tests/EmbeddedDSOs/EmbeddedDSO/Resources/AboutResources.txt b/tests/EmbeddedDSOs/EmbeddedDSO/Resources/AboutResources.txt
deleted file mode 100644
index 10f52d46021..00000000000
--- a/tests/EmbeddedDSOs/EmbeddedDSO/Resources/AboutResources.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-Images, layout descriptions, binary blobs and string dictionaries can be included 
-in your application as resource files.  Various Android APIs are designed to 
-operate on the resource IDs instead of dealing with images, strings or binary blobs 
-directly.
-
-For example, a sample Android app that contains a user interface layout (main.axml),
-an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png) 
-would keep its resources in the "Resources" directory of the application:
-
-Resources/
-    drawable/
-        icon.png
-
-    layout/
-        main.axml
-
-    values/
-        strings.xml
-
-In order to get the build system to recognize Android resources, set the build action to
-"AndroidResource".  The native Android APIs do not operate directly with filenames, but 
-instead operate on resource IDs.  When you compile an Android application that uses resources, 
-the build system will package the resources for distribution and generate a class called "R" 
-(this is an Android convention) that contains the tokens for each one of the resources 
-included. For example, for the above Resources layout, this is what the R class would expose:
-
-public class R {
-    public class drawable {
-        public const int icon = 0x123;
-    }
-
-    public class layout {
-        public const int main = 0x456;
-    }
-
-    public class strings {
-        public const int first_string = 0xabc;
-        public const int second_string = 0xbcd;
-    }
-}
-
-You would then use R.drawable.icon to reference the drawable/icon.png file, or R.layout.main 
-to reference the layout/main.axml file, or R.strings.first_string to reference the first 
-string in the dictionary file values/strings.xml.
diff --git a/tests/EmbeddedDSOs/EmbeddedDSO/Resources/layout/Main.axml b/tests/EmbeddedDSOs/EmbeddedDSO/Resources/layout/Main.axml
deleted file mode 100644
index 8cb72282b94..00000000000
--- a/tests/EmbeddedDSOs/EmbeddedDSO/Resources/layout/Main.axml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent">
-    <Button android:id="@+id/myButton" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hello" />
-</LinearLayout>
diff --git a/tests/EmbeddedDSOs/EmbeddedDSO/Resources/mipmap-hdpi/Icon.png b/tests/EmbeddedDSOs/EmbeddedDSO/Resources/mipmap-hdpi/Icon.png
deleted file mode 100644
index f4c804644c5..00000000000
Binary files a/tests/EmbeddedDSOs/EmbeddedDSO/Resources/mipmap-hdpi/Icon.png and /dev/null differ
diff --git a/tests/EmbeddedDSOs/EmbeddedDSO/Resources/mipmap-mdpi/Icon.png b/tests/EmbeddedDSOs/EmbeddedDSO/Resources/mipmap-mdpi/Icon.png
deleted file mode 100644
index ef1e1ee7dc3..00000000000
Binary files a/tests/EmbeddedDSOs/EmbeddedDSO/Resources/mipmap-mdpi/Icon.png and /dev/null differ
diff --git a/tests/EmbeddedDSOs/EmbeddedDSO/Resources/mipmap-xhdpi/Icon.png b/tests/EmbeddedDSOs/EmbeddedDSO/Resources/mipmap-xhdpi/Icon.png
deleted file mode 100644
index b7e2e57aa90..00000000000
Binary files a/tests/EmbeddedDSOs/EmbeddedDSO/Resources/mipmap-xhdpi/Icon.png and /dev/null differ
diff --git a/tests/EmbeddedDSOs/EmbeddedDSO/Resources/mipmap-xxhdpi/Icon.png b/tests/EmbeddedDSOs/EmbeddedDSO/Resources/mipmap-xxhdpi/Icon.png
deleted file mode 100644
index 8d20a38d178..00000000000
Binary files a/tests/EmbeddedDSOs/EmbeddedDSO/Resources/mipmap-xxhdpi/Icon.png and /dev/null differ
diff --git a/tests/EmbeddedDSOs/EmbeddedDSO/Resources/mipmap-xxxhdpi/Icon.png b/tests/EmbeddedDSOs/EmbeddedDSO/Resources/mipmap-xxxhdpi/Icon.png
deleted file mode 100644
index 6d9919c41a3..00000000000
Binary files a/tests/EmbeddedDSOs/EmbeddedDSO/Resources/mipmap-xxxhdpi/Icon.png and /dev/null differ
diff --git a/tests/EmbeddedDSOs/EmbeddedDSO/Resources/values/Strings.xml b/tests/EmbeddedDSOs/EmbeddedDSO/Resources/values/Strings.xml
deleted file mode 100644
index cf301753001..00000000000
--- a/tests/EmbeddedDSOs/EmbeddedDSO/Resources/values/Strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="hello">Hello World, Click Me!</string>
-    <string name="app_name">EmbeddedDSO</string>
-</resources>
diff --git a/tests/EmbeddedDSOs/EmbeddedDSO/Tests.cs b/tests/EmbeddedDSOs/EmbeddedDSO/Tests.cs
deleted file mode 100644
index 3df62a53a49..00000000000
--- a/tests/EmbeddedDSOs/EmbeddedDSO/Tests.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-
-using NUnit.Framework;
-
-namespace EmbeddedDSO
-{
-	[TestFixture]
-	public class EmbeddedDSOApp
-	{
-		public static string DataDir;
-		public static int ApiLevel;
-
-		[Test]
-		public void TestApplicationActuallyRan ()
-		{
-			if (ApiLevel < 23) {
-				Assert.Pass ();
-				return;
-			}
-
-			Assert.That (String.IsNullOrEmpty (DataDir), Is.False, "Data directory unknown");
-			string libDir = Path.Combine (DataDir, "lib");
-			if (!Directory.Exists (libDir)) {
-				Assert.Pass ();
-				return;
-			}
-
-			Assert.That (Directory.EnumerateFiles (libDir, "*.so", SearchOption.AllDirectories).Any (), Is.False, $"Directory {libDir} should not contain any .so files");
-		}
-	}
-}
diff --git a/tests/ResolveImports/.gitignore b/tests/ResolveImports/.gitignore
deleted file mode 100644
index 156858355da..00000000000
--- a/tests/ResolveImports/.gitignore
+++ /dev/null
@@ -1,15 +0,0 @@
-Xamarin.Android.BindingResolveImportLib1/Jars/com/xamarin/android/test/binding/resolveimport/Lib1.class
-Xamarin.Android.BindingResolveImportLib1/Jars/lib1.jar
-Xamarin.Android.BindingResolveImportLib1/Jars/lib1.zip
-Xamarin.Android.BindingResolveImportLib1/Jars/zipped/
-Xamarin.Android.BindingResolveImportLib2/Jars/lib2.jar
-Xamarin.Android.BindingResolveImportLib2/Jars/com/xamarin/android/test/binding/resolveimport/Lib2.class
-Xamarin.Android.BindingResolveImportLib2/libs/
-Xamarin.Android.BindingResolveImportLib3/Jars/com/xamarin/android/test/binding/resolveimport/Lib3.class
-Xamarin.Android.BindingResolveImportLib3/Jars/lib3.jar
-Xamarin.Android.BindingResolveImportLib3/Jars/lib3.zip
-Xamarin.Android.BindingResolveImportLib3/Jars/zipped/
-Xamarin.Android.BindingResolveImportLib4/Jars/com/xamarin/android/test/binding/resolveimport/Lib4.class
-Xamarin.Android.BindingResolveImportLib4/Jars/lib4.jar
-Xamarin.Android.BindingResolveImportLib4/libs/
-
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib1/Additions/AboutAdditions.txt b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib1/Additions/AboutAdditions.txt
deleted file mode 100644
index c511f1d4ee1..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib1/Additions/AboutAdditions.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-Additions allow you to add arbitrary C# to the generated classes
-before they are compiled.  This can be helpful for providing convenience
-methods or adding pure C# classes.
-
-== Adding Methods to Generated Classes ==
-
-Let's say the library being bound has a Rectangle class with a constructor
-that takes an x and y position, and a width and length size.  It will look like
-this:
-
-public partial class Rectangle
-{
-    public Rectangle (int x, int y, int width, int height)
-	{
-	    // JNI bindings
-	}
-}
-
-Imagine we want to add a constructor to this class that takes a Point and
-Size structure instead of 4 ints.  We can add a new file called Rectangle.cs
-with a partial class containing our new method:
-
-public partial class Rectangle
-{
-    public Rectangle (Point location, Size size) :
-	    this (location.X, location.Y, size.Width, size.Height)
-	{
-	}
-}
-
-At compile time, the additions class will be added to the generated class
-and the final assembly will a Rectangle class with both constructors.
-
-
-== Adding C# Classes ==
-
-Another thing that can be done is adding fully C# managed classes to the
-generated library.  In the above example, let's assume that there isn't a
-Point class available in Java or our library.  The one we create doesn't need
-to interact with Java, so we'll create it like a normal class in C#.
-
-By adding a Point.cs file with this class, it will end up in the binding library:
-
-public class Point
-{
-    public int X { get; set; }
-	public int Y { get; set; }
-}
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib1/Jars/AboutJars.txt b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib1/Jars/AboutJars.txt
deleted file mode 100644
index 320a154bed4..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib1/Jars/AboutJars.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-This directory is for Android .jars.
-
-There are 4 types of jars that are supported:
-
-== Input Jar and Embedded Jar ==
-
-This is the jar that bindings should be generated for.
-
-For example, if you were binding the Google Maps library, this would
-be Google's "maps.jar".
-
-The difference between EmbeddedJar and InputJar is, EmbeddedJar is to be
-embedded in the resulting dll as EmbeddedResource, while InputJar is not.
-There are couple of reasons you wouldn't like to embed the target jar
-in your dll (the ones that could be internally loaded by <uses-library>
-feature e.g. maps.jar, or you cannot embed jars that are under some
-proprietary license).
-
-Set the build action for these jars in the properties page to "InputJar".
-
-
-== Reference Jar and Embedded Reference Jar ==
-
-These are jars that are referenced by the input jar.  C# bindings will
-not be created for these jars.  These jars will be used to resolve
-types used by the input jar.
-
-NOTE: Do not add "android.jar" as a reference jar.  It will be added automatically
-based on the Target Framework selected.
-
-Set the build action for these jars in the properties page to "ReferenceJar".
-
-"EmbeddedJar" works like "ReferenceJar", but like "EmbeddedJar", it is
-embedded in your dll. But at application build time, they are not included
-in the final apk, like ReferenceJar files.
-
-
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib1/Jars/com/xamarin/android/test/binding/resolveimport/Lib1.java b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib1/Jars/com/xamarin/android/test/binding/resolveimport/Lib1.java
deleted file mode 100644
index 88cbab35e2c..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib1/Jars/com/xamarin/android/test/binding/resolveimport/Lib1.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.xamarin.android.test.binding.resolveimport;
-
-public class Lib1
-{
-	public String field1;
-
-	public void foo () {}
-}
-
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib1/Jars/res/drawable/lib1image.png b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib1/Jars/res/drawable/lib1image.png
deleted file mode 100644
index a07c69fa5a0..00000000000
Binary files a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib1/Jars/res/drawable/lib1image.png and /dev/null differ
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib1/Properties/AndroidManifest.xml b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib1/Properties/AndroidManifest.xml
deleted file mode 100644
index f9f98fe1992..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib1/Properties/AndroidManifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="Xamarin.Android.BindingResolveImportLib1">
-	<uses-sdk />
-</manifest>
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib1/Properties/AssemblyInfo.cs b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib1/Properties/AssemblyInfo.cs
deleted file mode 100644
index 406d861b77a..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib1/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using Android.App;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle ("Xamarin.Android.BindingResolveImportLib1")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("")]
-[assembly: AssemblyCopyright ("atsushi")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion ("1.0.0")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib1/Resources/drawable/lib1image.png b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib1/Resources/drawable/lib1image.png
deleted file mode 100644
index a07c69fa5a0..00000000000
Binary files a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib1/Resources/drawable/lib1image.png and /dev/null differ
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib1/Transforms/EnumFields.xml b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib1/Transforms/EnumFields.xml
deleted file mode 100644
index b54de1ae166..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib1/Transforms/EnumFields.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<enum-field-mappings>
-	<!--
-  This example converts the constants Fragment_id, Fragment_name,
-  and Fragment_tag from android.support.v4.app.FragmentActivity.FragmentTag
-  to an enum called Android.Support.V4.App.FragmentTagType with values
-  Id, Name, and Tag.
-  
-  <mapping clr-enum-type="Android.Support.V4.App.FragmentTagType" jni-class="android/support/v4/app/FragmentActivity$FragmentTag">
-    <field clr-name="Id" jni-name="Fragment_id" value="1" />
-    <field clr-name="Name" jni-name="Fragment_name" value="0" />
-    <field clr-name="Tag" jni-name="Fragment_tag" value="2" />
-  </mapping>
-
-  Notes:
-  - An optional "bitfield" attribute marks the enum type with [Flags].
-  - For Java interfaces, use "jni-interface" attribute instead of "jni-class" attribute.
-  -->
-</enum-field-mappings>
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib1/Transforms/EnumMethods.xml b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib1/Transforms/EnumMethods.xml
deleted file mode 100644
index 2efa8146714..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib1/Transforms/EnumMethods.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<enum-method-mappings>
-	<!--
-  This example changes the Java method:
-    android.support.v4.app.Fragment.SavedState.writeToParcel (int flags)
-  to be:
-    android.support.v4.app.Fragment.SavedState.writeToParcel (Android.OS.ParcelableWriteFlags flags)
-  when bound in C#.
-
-  <mapping jni-class="android/support/v4/app/Fragment.SavedState">
-    <method jni-name="writeToParcel" parameter="flags" clr-enum-type="Android.OS.ParcelableWriteFlags" />
-  </mapping>
-
-  Notes:
-  - For Java interfaces, use "jni-interface" attribute instead of "jni-class" attribute.
-  - To change the type of the return value, use "return" as the parameter name.
-  - The parameter names will be p0, p1, ... unless you provide JavaDoc file in the project.
-  -->
-</enum-method-mappings>
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib1/Transforms/Metadata.xml b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib1/Transforms/Metadata.xml
deleted file mode 100644
index 68cddb00971..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib1/Transforms/Metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<metadata>
-	<!--
-  This sample removes the class: android.support.v4.content.AsyncTaskLoader.LoadTask:
-  <remove-node path="/api/package[@name='android.support.v4.content']/class[@name='AsyncTaskLoader.LoadTask']" />
-  
-  This sample removes the method: android.support.v4.content.CursorLoader.loadInBackground:
-  <remove-node path="/api/package[@name='android.support.v4.content']/class[@name='CursorLoader']/method[@name='loadInBackground']" />
-  -->
-</metadata>
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib1/Xamarin.Android.BindingResolveImportLib1.csproj b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib1/Xamarin.Android.BindingResolveImportLib1.csproj
deleted file mode 100644
index 75a51625037..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib1/Xamarin.Android.BindingResolveImportLib1.csproj
+++ /dev/null
@@ -1,80 +0,0 @@
-<?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>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>{2A0519DF-0DDA-45F7-AC3C-E2992748D364}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AssemblyName>Xamarin.Android.BindingResolveImportLib1</AssemblyName>
-    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
-    <RootNamespace>Xamarin.Android.BindingResolveImportLib1</RootNamespace>
-    <AndroidApplication>True</AndroidApplication>
-    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
-    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
-    <AndroidClassParser>class-parse</AndroidClassParser>
-  </PropertyGroup>
-  <Import Project="..\..\..\Configuration.props" />
-  <PropertyGroup>
-    <TargetFrameworkVersion>$(AndroidFrameworkVersion)</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidLinkMode>None</AndroidLinkMode>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Include="Properties\AndroidManifest.xml" />
-    <None Include="Additions\AboutAdditions.txt" />
-    <None Include="Jars\AboutJars.txt" />
-    <TestJarEntry Include="Jars\com\xamarin\android\test\binding\resolveimport\Lib1.java">
-      <Link>Jars\com\xamarin\android\test\binding\resolveimport\Lib1.java</Link>
-      <OutputFile>Jars/lib1.jar</OutputFile>
-    </TestJarEntry>
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
-  <Import Project="..\..\..\build-tools\scripts\Jar.targets" />
-  <Import Project="Xamarin.Android.BindingResolveImportLib1.targets" />
-  <PropertyGroup>
-    <BuildDependsOn>
-      BuildTestJarFile;
-      _BuildLibraryProjectZips;
-      $(BuildDependsOn)
-    </BuildDependsOn>
-    <CleanDependsOn>
-      CleanTestJarFile;
-      _CleanLibraryProjectZips;
-      $(CleanDependsOn)
-    </CleanDependsOn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="Mono.Android" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <TransformFile Include="Transforms\EnumFields.xml" />
-    <TransformFile Include="Transforms\EnumMethods.xml" />
-    <TransformFile Include="Transforms\Metadata.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <LibraryProjectZip Include="Jars\zipped\lib1.zip" />
-  </ItemGroup>
-</Project>
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib1/Xamarin.Android.BindingResolveImportLib1.targets b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib1/Xamarin.Android.BindingResolveImportLib1.targets
deleted file mode 100644
index e34d72359d8..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib1/Xamarin.Android.BindingResolveImportLib1.targets
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="_BuildLibraryProjectZips"
-      Inputs="Jars\lib1.jar"
-      Outputs="Jars\zipped\lib1.zip">
-    <MakeDir Directories="Jars\zipped;Jars\zipped\bin" />
-    <Copy
-        SourceFiles="Jars\lib1.jar;Properties\AndroidManifest.xml"
-        DestinationFiles="Jars\zipped\bin\lib1.jar;Jars\zipped\bin\AndroidManifest.xml"
-    />
-    <Exec
-        Command="&quot;$(JarPath)&quot; cf lib1.zip bin"
-        WorkingDirectory="Jars\zipped"
-    />
-    <Copy
-        SourceFiles="Jars\zipped\lib1.zip"
-        DestinationFiles="Jars\lib1.zip"
-    />
-  </Target>
-  <Target Name="_CleanLibraryProjectZips">
-    <Delete Files="Jars\zipped\lib1.zip" />
-  </Target>
-</Project>
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/Additions/AboutAdditions.txt b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/Additions/AboutAdditions.txt
deleted file mode 100644
index c511f1d4ee1..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/Additions/AboutAdditions.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-Additions allow you to add arbitrary C# to the generated classes
-before they are compiled.  This can be helpful for providing convenience
-methods or adding pure C# classes.
-
-== Adding Methods to Generated Classes ==
-
-Let's say the library being bound has a Rectangle class with a constructor
-that takes an x and y position, and a width and length size.  It will look like
-this:
-
-public partial class Rectangle
-{
-    public Rectangle (int x, int y, int width, int height)
-	{
-	    // JNI bindings
-	}
-}
-
-Imagine we want to add a constructor to this class that takes a Point and
-Size structure instead of 4 ints.  We can add a new file called Rectangle.cs
-with a partial class containing our new method:
-
-public partial class Rectangle
-{
-    public Rectangle (Point location, Size size) :
-	    this (location.X, location.Y, size.Width, size.Height)
-	{
-	}
-}
-
-At compile time, the additions class will be added to the generated class
-and the final assembly will a Rectangle class with both constructors.
-
-
-== Adding C# Classes ==
-
-Another thing that can be done is adding fully C# managed classes to the
-generated library.  In the above example, let's assume that there isn't a
-Point class available in Java or our library.  The one we create doesn't need
-to interact with Java, so we'll create it like a normal class in C#.
-
-By adding a Point.cs file with this class, it will end up in the binding library:
-
-public class Point
-{
-    public int X { get; set; }
-	public int Y { get; set; }
-}
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/Additions/Addition.cs b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/Additions/Addition.cs
deleted file mode 100644
index 1059e911b60..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/Additions/Addition.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-
-namespace Xamarin.Android.BindingResolveImportLib2
-{
-	public class Addition
-	{
-		public Addition ()
-		{
-			new Com.Xamarin.Android.Test.Binding.Resolveimport.Lib1 ();
-		}
-	}
-}
-
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/Jars/AboutJars.txt b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/Jars/AboutJars.txt
deleted file mode 100644
index 320a154bed4..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/Jars/AboutJars.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-This directory is for Android .jars.
-
-There are 4 types of jars that are supported:
-
-== Input Jar and Embedded Jar ==
-
-This is the jar that bindings should be generated for.
-
-For example, if you were binding the Google Maps library, this would
-be Google's "maps.jar".
-
-The difference between EmbeddedJar and InputJar is, EmbeddedJar is to be
-embedded in the resulting dll as EmbeddedResource, while InputJar is not.
-There are couple of reasons you wouldn't like to embed the target jar
-in your dll (the ones that could be internally loaded by <uses-library>
-feature e.g. maps.jar, or you cannot embed jars that are under some
-proprietary license).
-
-Set the build action for these jars in the properties page to "InputJar".
-
-
-== Reference Jar and Embedded Reference Jar ==
-
-These are jars that are referenced by the input jar.  C# bindings will
-not be created for these jars.  These jars will be used to resolve
-types used by the input jar.
-
-NOTE: Do not add "android.jar" as a reference jar.  It will be added automatically
-based on the Target Framework selected.
-
-Set the build action for these jars in the properties page to "ReferenceJar".
-
-"EmbeddedJar" works like "ReferenceJar", but like "EmbeddedJar", it is
-embedded in your dll. But at application build time, they are not included
-in the final apk, like ReferenceJar files.
-
-
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/Jars/com/xamarin/android/test/binding/resolveimport/Lib2.java b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/Jars/com/xamarin/android/test/binding/resolveimport/Lib2.java
deleted file mode 100644
index 86b70c50b34..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/Jars/com/xamarin/android/test/binding/resolveimport/Lib2.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.xamarin.android.test.binding.resolveimport;
-
-public class Lib2
-{
-	public String field1;
-
-	public void foo () {}
-}
-
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/Properties/AssemblyInfo.cs b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/Properties/AssemblyInfo.cs
deleted file mode 100644
index 594e1b386aa..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using Android.App;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle ("Xamarin.Android.BindingResolveImportsLib2")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("")]
-[assembly: AssemblyCopyright ("atsushi")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion ("1.0.0")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/Transforms/EnumFields.xml b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/Transforms/EnumFields.xml
deleted file mode 100644
index b54de1ae166..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/Transforms/EnumFields.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<enum-field-mappings>
-	<!--
-  This example converts the constants Fragment_id, Fragment_name,
-  and Fragment_tag from android.support.v4.app.FragmentActivity.FragmentTag
-  to an enum called Android.Support.V4.App.FragmentTagType with values
-  Id, Name, and Tag.
-  
-  <mapping clr-enum-type="Android.Support.V4.App.FragmentTagType" jni-class="android/support/v4/app/FragmentActivity$FragmentTag">
-    <field clr-name="Id" jni-name="Fragment_id" value="1" />
-    <field clr-name="Name" jni-name="Fragment_name" value="0" />
-    <field clr-name="Tag" jni-name="Fragment_tag" value="2" />
-  </mapping>
-
-  Notes:
-  - An optional "bitfield" attribute marks the enum type with [Flags].
-  - For Java interfaces, use "jni-interface" attribute instead of "jni-class" attribute.
-  -->
-</enum-field-mappings>
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/Transforms/EnumMethods.xml b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/Transforms/EnumMethods.xml
deleted file mode 100644
index 2efa8146714..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/Transforms/EnumMethods.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<enum-method-mappings>
-	<!--
-  This example changes the Java method:
-    android.support.v4.app.Fragment.SavedState.writeToParcel (int flags)
-  to be:
-    android.support.v4.app.Fragment.SavedState.writeToParcel (Android.OS.ParcelableWriteFlags flags)
-  when bound in C#.
-
-  <mapping jni-class="android/support/v4/app/Fragment.SavedState">
-    <method jni-name="writeToParcel" parameter="flags" clr-enum-type="Android.OS.ParcelableWriteFlags" />
-  </mapping>
-
-  Notes:
-  - For Java interfaces, use "jni-interface" attribute instead of "jni-class" attribute.
-  - To change the type of the return value, use "return" as the parameter name.
-  - The parameter names will be p0, p1, ... unless you provide JavaDoc file in the project.
-  -->
-</enum-method-mappings>
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/Transforms/Metadata.xml b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/Transforms/Metadata.xml
deleted file mode 100644
index 68cddb00971..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/Transforms/Metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<metadata>
-	<!--
-  This sample removes the class: android.support.v4.content.AsyncTaskLoader.LoadTask:
-  <remove-node path="/api/package[@name='android.support.v4.content']/class[@name='AsyncTaskLoader.LoadTask']" />
-  
-  This sample removes the method: android.support.v4.content.CursorLoader.loadInBackground:
-  <remove-node path="/api/package[@name='android.support.v4.content']/class[@name='CursorLoader']/method[@name='loadInBackground']" />
-  -->
-</metadata>
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/Xamarin.Android.BindingResolveImportLib2.csproj b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/Xamarin.Android.BindingResolveImportLib2.csproj
deleted file mode 100644
index 65db5a18ba2..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/Xamarin.Android.BindingResolveImportLib2.csproj
+++ /dev/null
@@ -1,88 +0,0 @@
-<?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>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>{DD4E2A49-730C-41FD-B6D4-AFB73F94271F}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Xamarin.Android.BindingResolveImportLib2</RootNamespace>
-    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
-    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
-    <AssemblyName>Xamarin.Android.BindingResolveImportLib2</AssemblyName>
-    <AndroidClassParser>class-parse</AndroidClassParser>
-  </PropertyGroup>
-  <Import Project="..\..\..\Configuration.props" />
-  <PropertyGroup>
-    <TargetFrameworkVersion>$(AndroidFrameworkVersion)</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidLinkMode>None</AndroidLinkMode>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="Mono.Android" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Additions\Addition.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Additions\AboutAdditions.txt" />
-    <None Include="Jars\AboutJars.txt" />
-    <TestJarEntry Include="Jars\com\xamarin\android\test\binding\resolveimport\Lib2.java">
-      <Link>Jars\com\xamarin\android\test\binding\resolveimport\Lib2.java</Link>
-      <OutputFile>Jars/lib2.jar</OutputFile>
-    </TestJarEntry>
-  </ItemGroup>
-  <ItemGroup>
-    <TransformFile Include="Transforms\EnumFields.xml" />
-    <TransformFile Include="Transforms\EnumMethods.xml" />
-    <TransformFile Include="Transforms\Metadata.xml" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
-  <Import Project="..\..\..\build-tools\scripts\Jar.targets" />
-  <Import Project="Xamarin.Android.BindingResolveImportLib2.targets" />
-  <ItemGroup>
-    <EmbeddedJar Include="Jars\lib2.jar" />
-  </ItemGroup>
-  <PropertyGroup>
-    <BuildDependsOn>
-      BuildTestJarFile;
-      BuildNativeLibs;
-      $(BuildDependsOn)
-    </BuildDependsOn>
-    <CleanDependsOn>
-      CleanTestJarFile;
-      CleanNativeLibs;
-      $(CleanDependsOn)
-    </CleanDependsOn>
-  </PropertyGroup>
-  <ItemGroup>
-    <EmbeddedNativeLibrary Include="libs\armeabi-v7a\libtiming2.so" />
-    <EmbeddedNativeLibrary Include="libs\x86\libtiming2.so" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Xamarin.Android.BindingResolveImportLib1\Xamarin.Android.BindingResolveImportLib1.csproj">
-      <Project>{2A0519DF-0DDA-45F7-AC3C-E2992748D364}</Project>
-      <Name>Xamarin.Android.BindingResolveImportLib1</Name>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/Xamarin.Android.BindingResolveImportLib2.targets b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/Xamarin.Android.BindingResolveImportLib2.targets
deleted file mode 100644
index 082ee8706d8..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/Xamarin.Android.BindingResolveImportLib2.targets
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="BuildNativeLibs"
-      DependsOnTargets="AndroidPrepareForBuild"
-      Inputs="jni\timing.c;jni\Android.mk"
-      Outputs="@(EmbeddedNativeLibrary)">
-    <Error
-        Condition="!Exists ('$(NdkBuildPath)')"
-        Text="Could not locate Android NDK."
-    />
-    <Exec Command="&quot;$(NdkBuildPath)&quot;" />
-  </Target>
-  <Target Name="CleanNativeLibs">
-    <RemoveDir Directories="obj\local;libs" />
-  </Target>
-</Project>
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/jni/Android.mk b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/jni/Android.mk
deleted file mode 100644
index bdcd9d2bc56..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/jni/Android.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_CFLAGS    := -g
-LOCAL_LDLIBS    := -llog
-LOCAL_MODULE    := timing2
-LOCAL_SRC_FILES := timing.c
-
-include $(BUILD_SHARED_LIBRARY)
-
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/jni/Application.mk b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/jni/Application.mk
deleted file mode 100644
index 729645b114c..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/jni/Application.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Build both ARMv5TE and ARMv7-A machine code.
-APP_ABI := arm64-v8a armeabi-v7a x86 x86_64
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/jni/timing.c b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/jni/timing.c
deleted file mode 100644
index 6db2ffd9757..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/jni/timing.c
+++ /dev/null
@@ -1,334 +0,0 @@
-#include <android/log.h>
-#include <sys/time.h>
-#include <jni.h>
-
-void
-foo_void_timing (void)
-{
-}
-
-int
-foo_int_timing (void)
-{
-	return 0;
-}
-
-void*
-foo_ptr_timing (void)
-{
-	return 0;
-}
-
-void
-foo_void_a1_timing (void *obj1)
-{
-}
-
-void
-foo_void_a2_timing (void *obj1, void *obj2)
-{
-}
-
-void
-foo_void_a3_timing (void *obj1, void *obj2, void *obj3)
-{
-}
-
-void
-foo_void_ai1_timing (int i1)
-{
-}
-
-void
-foo_void_ai2_timing (int i1, int i2)
-{
-}
-
-void
-foo_void_ai3_timing (int i1, int i2, int i3)
-{
-}
-
-struct FooMethods {
-	void  (*instance_void)(void);
-	int   (*instance_int)(void);
-	void* (*instance_ptr)(void);
-
-	void  (*void_1_args)(void *);
-	void  (*void_2_args)(void *, void *);
-	void  (*void_3_args)(void *, void *, void *);
-
-	void  (*void_1_iargs)(int);
-	void  (*void_2_iargs)(int, int);
-	void  (*void_3_iargs)(int, int, int);
-};
-
-void
-foo_get_methods (struct FooMethods* methods)
-{
-	methods->instance_void = foo_void_timing;
-	methods->instance_int  = foo_int_timing;
-	methods->instance_ptr  = foo_ptr_timing;
-
-	methods->void_1_args   = foo_void_a1_timing;
-	methods->void_2_args   = foo_void_a2_timing;
-	methods->void_3_args   = foo_void_a3_timing;
-
-	methods->void_1_iargs   = foo_void_ai1_timing;
-	methods->void_2_iargs   = foo_void_ai2_timing;
-	methods->void_3_iargs   = foo_void_ai3_timing;
-}
-
-static jmethodID Timing_StaticVoidMethod;
-static jmethodID Timing_StaticIntMethod;
-static jmethodID Timing_StaticObjectMethod;
-
-static jmethodID Timing_VirtualVoidMethod;
-static jmethodID Timing_VirtualIntMethod;
-static jmethodID Timing_VirtualObjectMethod;
-
-static jmethodID Timing_FinalVoidMethod;
-static jmethodID Timing_FinalIntMethod;
-static jmethodID Timing_FinalObjectMethod;
-
-static jmethodID Timing_StaticVoidMethod1Args;
-static jmethodID Timing_StaticVoidMethod2Args;
-static jmethodID Timing_StaticVoidMethod3Args;
-
-static jmethodID Timing_StaticVoidMethod1IArgs;
-static jmethodID Timing_StaticVoidMethod2IArgs;
-static jmethodID Timing_StaticVoidMethod3IArgs;
-
-static jclass Object_class;
-static jmethodID Object_init;
-
-static void    (*CallStaticVoidMethod)(JNIEnv*, jclass, jmethodID, ...);
-static int     (*CallStaticIntMethod)(JNIEnv*, jclass, jmethodID, ...);
-static jobject (*CallStaticObjectMethod)(JNIEnv*, jclass, jmethodID, ...);
-
-static void    (*CallVoidMethod)(JNIEnv*, jobject, jmethodID, ...);
-static int     (*CallIntMethod)(JNIEnv*, jobject, jmethodID, ...);
-static jobject (*CallObjectMethod)(JNIEnv*, jobject, jmethodID, ...);
-
-static void    (*CallNonvirtualVoidMethod)(JNIEnv*, jobject, jclass, jmethodID, ...);
-static int     (*CallNonvirtualIntMethod)(JNIEnv*, jobject, jclass, jmethodID, ...);
-static jobject (*CallNonvirtualObjectMethod)(JNIEnv*, jobject, jclass, jmethodID, ...);
-
-void
-foo_init (JNIEnv *env)
-{
-	jclass Timing, Object;
-
-	__android_log_print (ANDROID_LOG_INFO, "*jonp*", "foo_init; env=%p", env);
-
-	/* libbar.so loading test */
-	if (!env)
-		return;
-
-	Timing = (*env)->FindClass (env, "com/xamarin/android/Timing");
-	if (!Timing)
-		return;
-
-	Object = (*env)->FindClass (env, "java/lang/Object");
-	if (!Object)
-		return;
-	Object_class = (*env)->NewGlobalRef (env, Object);
-	(*env)->DeleteLocalRef (env, Object);
-
-	Object_init = (*env)->GetMethodID (env, Object_class, "<init>", "()V");
-
-	CallStaticVoidMethod    = (*env)->CallStaticVoidMethod;
-	CallStaticIntMethod     = (*env)->CallStaticIntMethod;
-	CallStaticObjectMethod  = (*env)->CallStaticObjectMethod;
-
-	CallVoidMethod    = (*env)->CallVoidMethod;
-	CallIntMethod     = (*env)->CallIntMethod;
-	CallObjectMethod  = (*env)->CallObjectMethod;
-
-	CallNonvirtualVoidMethod    = (*env)->CallNonvirtualVoidMethod;
-	CallNonvirtualIntMethod     = (*env)->CallNonvirtualIntMethod;
-	CallNonvirtualObjectMethod  = (*env)->CallNonvirtualObjectMethod;
-
-	Timing_StaticVoidMethod = (*env)->GetStaticMethodID (env, Timing,
-			"StaticVoidMethod", "()V");
-	Timing_StaticIntMethod = (*env)->GetStaticMethodID (env, Timing,
-			"StaticIntMethod", "()I");
-	Timing_StaticObjectMethod = (*env)->GetStaticMethodID (env, Timing,
-			"StaticObjectMethod", "()Ljava/lang/Object;");
-
-	Timing_VirtualVoidMethod = (*env)->GetMethodID (env, Timing,
-			"VirtualVoidMethod", "()V");
-	Timing_VirtualIntMethod = (*env)->GetMethodID (env, Timing,
-			"VirtualIntMethod", "()I");
-	Timing_VirtualObjectMethod = (*env)->GetMethodID (env, Timing,
-			"VirtualObjectMethod", "()Ljava/lang/Object;");
-
-	Timing_FinalVoidMethod = (*env)->GetMethodID (env, Timing,
-			"FinalVoidMethod", "()V");
-	Timing_FinalIntMethod = (*env)->GetMethodID (env, Timing,
-			"FinalIntMethod", "()I");
-	Timing_FinalObjectMethod = (*env)->GetMethodID (env, Timing,
-			"FinalObjectMethod", "()Ljava/lang/Object;");
-
-	Timing_StaticVoidMethod1Args = (*env)->GetStaticMethodID (env, Timing,
-			"StaticVoidMethod1Args", "(Ljava/lang/Object;)V");
-	Timing_StaticVoidMethod2Args = (*env)->GetStaticMethodID (env, Timing,
-			"StaticVoidMethod2Args", "(Ljava/lang/Object;Ljava/lang/Object;)V");
-	Timing_StaticVoidMethod3Args = (*env)->GetStaticMethodID (env, Timing,
-			"StaticVoidMethod3Args", "(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V");
-
-	Timing_StaticVoidMethod1IArgs = (*env)->GetStaticMethodID (env, Timing,
-			"StaticVoidMethod1IArgs", "(I)V");
-	Timing_StaticVoidMethod2IArgs = (*env)->GetStaticMethodID (env, Timing,
-			"StaticVoidMethod2IArgs", "(II)V");
-	Timing_StaticVoidMethod3IArgs = (*env)->GetStaticMethodID (env, Timing,
-			"StaticVoidMethod3IArgs", "(III)V");
-
-	(*env)->DeleteLocalRef (env, Timing);
-}
-
-static long long
-current_time_millis (void)
-{
-	struct timeval tv;
-
-	gettimeofday(&tv, (struct timezone *) NULL);
-	long long when = tv.tv_sec * 1000LL + tv.tv_usec / 1000;
-	return when;
-}
-
-void
-foo_get_native_jni_timings (JNIEnv *env, int count, jclass klass, jobject self, long long *jniTimes)
-{
-	int i;
-	long long start, end;
-
-	jobject obj1 = (*env)->NewObject(env, Object_class, Object_init),
-		obj2 = (*env)->NewObject(env, Object_class, Object_init),
-		obj3 = (*env)->NewObject(env, Object_class, Object_init);
-
-	start = current_time_millis ();
-	for (i = 0; i < count; i++)
-		CallStaticVoidMethod (env, klass, Timing_StaticVoidMethod);
-	end = current_time_millis ();
-
-	jniTimes [0] = end - start;
-	__android_log_print (ANDROID_LOG_INFO, "*jonp*", "foo/timing: static void    method invoke: %lli ms", jniTimes [0]);
-
-	start = current_time_millis ();
-	for (i = 0; i < count; i++)
-		CallStaticIntMethod (env, klass, Timing_StaticIntMethod);
-	end = current_time_millis ();
-
-	jniTimes [1] = end - start;
-	__android_log_print (ANDROID_LOG_INFO, "*jonp*", "foo/timing: static int     method invoke: %lli ms", jniTimes [1]);
-
-	start = current_time_millis ();
-	for (i = 0; i < count; i++)
-		CallStaticObjectMethod (env, klass, Timing_StaticObjectMethod);
-	end = current_time_millis ();
-
-	jniTimes [2] = end - start;
-	__android_log_print (ANDROID_LOG_INFO, "*jonp*", "foo/timing: static Object  method invoke: %lli ms", jniTimes [2]);
-
-	start = current_time_millis ();
-	for (i = 0; i < count; i++)
-		CallVoidMethod (env, self, Timing_VirtualVoidMethod);
-	end = current_time_millis ();
-
-	jniTimes [3] = end - start;
-	__android_log_print (ANDROID_LOG_INFO, "*jonp*", "foo/timing: virtual void   method invoke: %lli ms", jniTimes [3]);
-
-	start = current_time_millis ();
-	for (i = 0; i < count; i++)
-		CallIntMethod (env, self, Timing_VirtualIntMethod);
-	end = current_time_millis ();
-
-	jniTimes [4] = end - start;
-	__android_log_print (ANDROID_LOG_INFO, "*jonp*", "foo/timing: virtual int    method invoke: %lli ms", jniTimes [4]);
-
-	start = current_time_millis ();
-	for (i = 0; i < count; i++)
-		CallObjectMethod (env, self, Timing_VirtualObjectMethod);
-	end = current_time_millis ();
-
-	jniTimes [5] = end - start;
-	__android_log_print (ANDROID_LOG_INFO, "*jonp*", "foo/timing: virtual Object method invoke: %lli ms", jniTimes [5]);
-
-	start = current_time_millis ();
-	for (i = 0; i < count; i++)
-		CallNonvirtualVoidMethod (env, self, klass, Timing_FinalVoidMethod);
-	end = current_time_millis ();
-
-	jniTimes [6] = end - start;
-	__android_log_print (ANDROID_LOG_INFO, "*jonp*", "foo/timing: final void     method invoke: %lli ms", jniTimes [6]);
-
-	start = current_time_millis ();
-	for (i = 0; i < count; i++)
-		CallNonvirtualIntMethod (env, self, klass, Timing_FinalIntMethod);
-	end = current_time_millis ();
-
-	jniTimes [7] = end - start;
-	__android_log_print (ANDROID_LOG_INFO, "*jonp*", "foo/timing: final int      method invoke: %lli ms", jniTimes [7]);
-
-	start = current_time_millis ();
-	for (i = 0; i < count; i++)
-		CallNonvirtualObjectMethod (env, self, klass, Timing_FinalObjectMethod);
-	end = current_time_millis ();
-
-	jniTimes [8] = end - start;
-	__android_log_print (ANDROID_LOG_INFO, "*jonp*", "foo/timing: final Object   method invoke: %lli ms", jniTimes [8]);
-
-
-
-	start = current_time_millis ();
-	for (i = 0; i < count; i++)
-		CallStaticVoidMethod (env, klass, Timing_StaticVoidMethod1Args, obj1);
-	end = current_time_millis ();
-
-	jniTimes [9] = end - start;
-	__android_log_print (ANDROID_LOG_INFO, "*alexrp*", "foo/timing: static void o1 method invoke: %lli ms", jniTimes [9]);
-
-	start = current_time_millis ();
-	for (i = 0; i < count; i++)
-		CallStaticVoidMethod (env, klass, Timing_StaticVoidMethod2Args, obj1, obj2);
-	end = current_time_millis ();
-
-	jniTimes [10] = end - start;
-	__android_log_print (ANDROID_LOG_INFO, "*alexrp*", "foo/timing: static void o2 method invoke: %lli ms", jniTimes [10]);
-
-	start = current_time_millis ();
-	for (i = 0; i < count; i++)
-		CallStaticVoidMethod (env, klass, Timing_StaticVoidMethod3Args, obj1, obj2, obj3);
-	end = current_time_millis ();
-
-	jniTimes [11] = end - start;
-	__android_log_print (ANDROID_LOG_INFO, "*alexrp*", "foo/timing: static void o3 method invoke: %lli ms", jniTimes [11]);
-
-
-
-	start = current_time_millis ();
-	for (i = 0; i < count; i++)
-		CallStaticVoidMethod (env, klass, Timing_StaticVoidMethod1IArgs, 42);
-	end = current_time_millis ();
-
-	jniTimes [12] = end - start;
-	__android_log_print (ANDROID_LOG_INFO, "*alexrp*", "foo/timing: static void i1 method invoke: %lli ms", jniTimes [12]);
-
-	start = current_time_millis ();
-	for (i = 0; i < count; i++)
-		CallStaticVoidMethod (env, klass, Timing_StaticVoidMethod2IArgs, 42, 42);
-	end = current_time_millis ();
-
-	jniTimes [13] = end - start;
-	__android_log_print (ANDROID_LOG_INFO, "*alexrp*", "foo/timing: static void i2 method invoke: %lli ms", jniTimes [13]);
-
-	start = current_time_millis ();
-	for (i = 0; i < count; i++)
-		CallStaticVoidMethod (env, klass, Timing_StaticVoidMethod3IArgs, 42, 42, 42);
-	end = current_time_millis ();
-
-	jniTimes [14] = end - start;
-	__android_log_print (ANDROID_LOG_INFO, "*alexrp*", "foo/timing: static void i3 method invoke: %lli ms", jniTimes [14]);
-}
-
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib3/Additions/AboutAdditions.txt b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib3/Additions/AboutAdditions.txt
deleted file mode 100644
index c511f1d4ee1..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib3/Additions/AboutAdditions.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-Additions allow you to add arbitrary C# to the generated classes
-before they are compiled.  This can be helpful for providing convenience
-methods or adding pure C# classes.
-
-== Adding Methods to Generated Classes ==
-
-Let's say the library being bound has a Rectangle class with a constructor
-that takes an x and y position, and a width and length size.  It will look like
-this:
-
-public partial class Rectangle
-{
-    public Rectangle (int x, int y, int width, int height)
-	{
-	    // JNI bindings
-	}
-}
-
-Imagine we want to add a constructor to this class that takes a Point and
-Size structure instead of 4 ints.  We can add a new file called Rectangle.cs
-with a partial class containing our new method:
-
-public partial class Rectangle
-{
-    public Rectangle (Point location, Size size) :
-	    this (location.X, location.Y, size.Width, size.Height)
-	{
-	}
-}
-
-At compile time, the additions class will be added to the generated class
-and the final assembly will a Rectangle class with both constructors.
-
-
-== Adding C# Classes ==
-
-Another thing that can be done is adding fully C# managed classes to the
-generated library.  In the above example, let's assume that there isn't a
-Point class available in Java or our library.  The one we create doesn't need
-to interact with Java, so we'll create it like a normal class in C#.
-
-By adding a Point.cs file with this class, it will end up in the binding library:
-
-public class Point
-{
-    public int X { get; set; }
-	public int Y { get; set; }
-}
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib3/Jars/AboutJars.txt b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib3/Jars/AboutJars.txt
deleted file mode 100644
index 320a154bed4..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib3/Jars/AboutJars.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-This directory is for Android .jars.
-
-There are 4 types of jars that are supported:
-
-== Input Jar and Embedded Jar ==
-
-This is the jar that bindings should be generated for.
-
-For example, if you were binding the Google Maps library, this would
-be Google's "maps.jar".
-
-The difference between EmbeddedJar and InputJar is, EmbeddedJar is to be
-embedded in the resulting dll as EmbeddedResource, while InputJar is not.
-There are couple of reasons you wouldn't like to embed the target jar
-in your dll (the ones that could be internally loaded by <uses-library>
-feature e.g. maps.jar, or you cannot embed jars that are under some
-proprietary license).
-
-Set the build action for these jars in the properties page to "InputJar".
-
-
-== Reference Jar and Embedded Reference Jar ==
-
-These are jars that are referenced by the input jar.  C# bindings will
-not be created for these jars.  These jars will be used to resolve
-types used by the input jar.
-
-NOTE: Do not add "android.jar" as a reference jar.  It will be added automatically
-based on the Target Framework selected.
-
-Set the build action for these jars in the properties page to "ReferenceJar".
-
-"EmbeddedJar" works like "ReferenceJar", but like "EmbeddedJar", it is
-embedded in your dll. But at application build time, they are not included
-in the final apk, like ReferenceJar files.
-
-
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib3/Jars/com/xamarin/android/test/binding/resolveimport/Lib3.java b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib3/Jars/com/xamarin/android/test/binding/resolveimport/Lib3.java
deleted file mode 100644
index 8505e4fd8df..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib3/Jars/com/xamarin/android/test/binding/resolveimport/Lib3.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.xamarin.android.test.binding.resolveimport;
-
-public class Lib3
-{
-	public String field1;
-
-	public void foo () {}
-}
-
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib3/Properties/AndroidManifest.xml b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib3/Properties/AndroidManifest.xml
deleted file mode 100644
index f9f98fe1992..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib3/Properties/AndroidManifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="Xamarin.Android.BindingResolveImportLib1">
-	<uses-sdk />
-</manifest>
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib3/Properties/AssemblyInfo.cs b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib3/Properties/AssemblyInfo.cs
deleted file mode 100644
index 406d861b77a..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib3/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using Android.App;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle ("Xamarin.Android.BindingResolveImportLib1")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("")]
-[assembly: AssemblyCopyright ("atsushi")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion ("1.0.0")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib3/Transforms/EnumFields.xml b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib3/Transforms/EnumFields.xml
deleted file mode 100644
index b54de1ae166..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib3/Transforms/EnumFields.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<enum-field-mappings>
-	<!--
-  This example converts the constants Fragment_id, Fragment_name,
-  and Fragment_tag from android.support.v4.app.FragmentActivity.FragmentTag
-  to an enum called Android.Support.V4.App.FragmentTagType with values
-  Id, Name, and Tag.
-  
-  <mapping clr-enum-type="Android.Support.V4.App.FragmentTagType" jni-class="android/support/v4/app/FragmentActivity$FragmentTag">
-    <field clr-name="Id" jni-name="Fragment_id" value="1" />
-    <field clr-name="Name" jni-name="Fragment_name" value="0" />
-    <field clr-name="Tag" jni-name="Fragment_tag" value="2" />
-  </mapping>
-
-  Notes:
-  - An optional "bitfield" attribute marks the enum type with [Flags].
-  - For Java interfaces, use "jni-interface" attribute instead of "jni-class" attribute.
-  -->
-</enum-field-mappings>
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib3/Transforms/EnumMethods.xml b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib3/Transforms/EnumMethods.xml
deleted file mode 100644
index 2efa8146714..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib3/Transforms/EnumMethods.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<enum-method-mappings>
-	<!--
-  This example changes the Java method:
-    android.support.v4.app.Fragment.SavedState.writeToParcel (int flags)
-  to be:
-    android.support.v4.app.Fragment.SavedState.writeToParcel (Android.OS.ParcelableWriteFlags flags)
-  when bound in C#.
-
-  <mapping jni-class="android/support/v4/app/Fragment.SavedState">
-    <method jni-name="writeToParcel" parameter="flags" clr-enum-type="Android.OS.ParcelableWriteFlags" />
-  </mapping>
-
-  Notes:
-  - For Java interfaces, use "jni-interface" attribute instead of "jni-class" attribute.
-  - To change the type of the return value, use "return" as the parameter name.
-  - The parameter names will be p0, p1, ... unless you provide JavaDoc file in the project.
-  -->
-</enum-method-mappings>
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib3/Transforms/Metadata.xml b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib3/Transforms/Metadata.xml
deleted file mode 100644
index 68cddb00971..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib3/Transforms/Metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<metadata>
-	<!--
-  This sample removes the class: android.support.v4.content.AsyncTaskLoader.LoadTask:
-  <remove-node path="/api/package[@name='android.support.v4.content']/class[@name='AsyncTaskLoader.LoadTask']" />
-  
-  This sample removes the method: android.support.v4.content.CursorLoader.loadInBackground:
-  <remove-node path="/api/package[@name='android.support.v4.content']/class[@name='CursorLoader']/method[@name='loadInBackground']" />
-  -->
-</metadata>
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib3/Xamarin.Android.BindingResolveImportLib3.csproj b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib3/Xamarin.Android.BindingResolveImportLib3.csproj
deleted file mode 100644
index 267df2641e9..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib3/Xamarin.Android.BindingResolveImportLib3.csproj
+++ /dev/null
@@ -1,80 +0,0 @@
-<?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>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>{9802CB35-0BC0-4EE1-9A81-BB40BD97945A}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Xamarin.Android.BindingResolveImportLib3</RootNamespace>
-    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
-    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
-    <AssemblyName>Xamarin.Android.BindingResolveImportLib3</AssemblyName>
-    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
-    <AndroidApplication>True</AndroidApplication>
-    <AndroidClassParser>class-parse</AndroidClassParser>
-  </PropertyGroup>
-  <Import Project="..\..\..\Configuration.props" />
-  <PropertyGroup>
-    <TargetFrameworkVersion>$(AndroidFrameworkVersion)</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidLinkMode>None</AndroidLinkMode>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="Mono.Android" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Additions\AboutAdditions.txt" />
-    <None Include="Jars\AboutJars.txt" />
-    <TestJarEntry Include="Jars\com\xamarin\android\test\binding\resolveimport\Lib3.java">
-      <Link>Jars\com\xamarin\android\test\binding\resolveimport\Lib3.java</Link>
-      <OutputFile>Jars/lib3.jar</OutputFile>
-    </TestJarEntry>
-    <None Include="Properties\AndroidManifest.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <TransformFile Include="Transforms\EnumFields.xml" />
-    <TransformFile Include="Transforms\EnumMethods.xml" />
-    <TransformFile Include="Transforms\Metadata.xml" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
-  <Import Project="..\..\..\build-tools\scripts\Jar.targets" />
-  <Import Project="Xamarin.Android.BindingResolveImportLib3.targets" />
-  <ItemGroup>
-    <LibraryProjectZip Include="Jars\zipped\lib3.zip" />
-  </ItemGroup>
-  <PropertyGroup>
-    <BuildDependsOn>
-      BuildTestJarFile;
-      _BuildLibraryProjectZips;
-      $(BuildDependsOn)
-    </BuildDependsOn>
-    <CleanDependsOn>
-      CleanTestJarFile;
-      _CleanLibraryProjectZips;
-      $(CleanDependsOn)
-    </CleanDependsOn>
-  </PropertyGroup>
-</Project>
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib3/Xamarin.Android.BindingResolveImportLib3.targets b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib3/Xamarin.Android.BindingResolveImportLib3.targets
deleted file mode 100644
index f29dd536a88..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib3/Xamarin.Android.BindingResolveImportLib3.targets
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="_BuildLibraryProjectZips"
-      Inputs="Jars\lib3.jar"
-      Outputs="Jars\zipped\lib3.zip">
-    <MakeDir Directories="Jars\zipped;Jars\zipped\bin" />
-    <Copy
-        SourceFiles="Jars\lib3.jar;Properties\AndroidManifest.xml"
-        DestinationFiles="Jars\zipped\bin\lib3.jar;Jars\zipped\bin\AndroidManifest.xml"
-    />
-    <Exec
-        Command="&quot;$(JarPath)&quot; cf lib3.zip bin"
-        WorkingDirectory="Jars\zipped"
-    />
-    <Copy
-        SourceFiles="Jars\zipped\lib3.zip"
-        DestinationFiles="Jars\lib3.zip"
-    />
-  </Target>
-  <Target Name="_CleanLibraryProjectZips">
-    <Delete Files="Jars\zipped\lib3.zip" />
-  </Target>
-</Project>
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/Additions/AboutAdditions.txt b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/Additions/AboutAdditions.txt
deleted file mode 100644
index c511f1d4ee1..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/Additions/AboutAdditions.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-Additions allow you to add arbitrary C# to the generated classes
-before they are compiled.  This can be helpful for providing convenience
-methods or adding pure C# classes.
-
-== Adding Methods to Generated Classes ==
-
-Let's say the library being bound has a Rectangle class with a constructor
-that takes an x and y position, and a width and length size.  It will look like
-this:
-
-public partial class Rectangle
-{
-    public Rectangle (int x, int y, int width, int height)
-	{
-	    // JNI bindings
-	}
-}
-
-Imagine we want to add a constructor to this class that takes a Point and
-Size structure instead of 4 ints.  We can add a new file called Rectangle.cs
-with a partial class containing our new method:
-
-public partial class Rectangle
-{
-    public Rectangle (Point location, Size size) :
-	    this (location.X, location.Y, size.Width, size.Height)
-	{
-	}
-}
-
-At compile time, the additions class will be added to the generated class
-and the final assembly will a Rectangle class with both constructors.
-
-
-== Adding C# Classes ==
-
-Another thing that can be done is adding fully C# managed classes to the
-generated library.  In the above example, let's assume that there isn't a
-Point class available in Java or our library.  The one we create doesn't need
-to interact with Java, so we'll create it like a normal class in C#.
-
-By adding a Point.cs file with this class, it will end up in the binding library:
-
-public class Point
-{
-    public int X { get; set; }
-	public int Y { get; set; }
-}
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/Jars/AboutJars.txt b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/Jars/AboutJars.txt
deleted file mode 100644
index 320a154bed4..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/Jars/AboutJars.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-This directory is for Android .jars.
-
-There are 4 types of jars that are supported:
-
-== Input Jar and Embedded Jar ==
-
-This is the jar that bindings should be generated for.
-
-For example, if you were binding the Google Maps library, this would
-be Google's "maps.jar".
-
-The difference between EmbeddedJar and InputJar is, EmbeddedJar is to be
-embedded in the resulting dll as EmbeddedResource, while InputJar is not.
-There are couple of reasons you wouldn't like to embed the target jar
-in your dll (the ones that could be internally loaded by <uses-library>
-feature e.g. maps.jar, or you cannot embed jars that are under some
-proprietary license).
-
-Set the build action for these jars in the properties page to "InputJar".
-
-
-== Reference Jar and Embedded Reference Jar ==
-
-These are jars that are referenced by the input jar.  C# bindings will
-not be created for these jars.  These jars will be used to resolve
-types used by the input jar.
-
-NOTE: Do not add "android.jar" as a reference jar.  It will be added automatically
-based on the Target Framework selected.
-
-Set the build action for these jars in the properties page to "ReferenceJar".
-
-"EmbeddedJar" works like "ReferenceJar", but like "EmbeddedJar", it is
-embedded in your dll. But at application build time, they are not included
-in the final apk, like ReferenceJar files.
-
-
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/Jars/com/xamarin/android/test/binding/resolveimport/Lib4.java b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/Jars/com/xamarin/android/test/binding/resolveimport/Lib4.java
deleted file mode 100644
index 9956214962c..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/Jars/com/xamarin/android/test/binding/resolveimport/Lib4.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.xamarin.android.test.binding.resolveimport;
-
-public class Lib4
-{
-	public String field1;
-
-	public void foo () {}
-}
-
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/Properties/AssemblyInfo.cs b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/Properties/AssemblyInfo.cs
deleted file mode 100644
index 50a5c090a66..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using Android.App;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle ("Xamarin.Android.BindingResolveImportsLib4")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("")]
-[assembly: AssemblyCopyright ("atsushi")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion ("1.0.0")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/Transforms/EnumFields.xml b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/Transforms/EnumFields.xml
deleted file mode 100644
index b54de1ae166..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/Transforms/EnumFields.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<enum-field-mappings>
-	<!--
-  This example converts the constants Fragment_id, Fragment_name,
-  and Fragment_tag from android.support.v4.app.FragmentActivity.FragmentTag
-  to an enum called Android.Support.V4.App.FragmentTagType with values
-  Id, Name, and Tag.
-  
-  <mapping clr-enum-type="Android.Support.V4.App.FragmentTagType" jni-class="android/support/v4/app/FragmentActivity$FragmentTag">
-    <field clr-name="Id" jni-name="Fragment_id" value="1" />
-    <field clr-name="Name" jni-name="Fragment_name" value="0" />
-    <field clr-name="Tag" jni-name="Fragment_tag" value="2" />
-  </mapping>
-
-  Notes:
-  - An optional "bitfield" attribute marks the enum type with [Flags].
-  - For Java interfaces, use "jni-interface" attribute instead of "jni-class" attribute.
-  -->
-</enum-field-mappings>
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/Transforms/EnumMethods.xml b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/Transforms/EnumMethods.xml
deleted file mode 100644
index 2efa8146714..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/Transforms/EnumMethods.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<enum-method-mappings>
-	<!--
-  This example changes the Java method:
-    android.support.v4.app.Fragment.SavedState.writeToParcel (int flags)
-  to be:
-    android.support.v4.app.Fragment.SavedState.writeToParcel (Android.OS.ParcelableWriteFlags flags)
-  when bound in C#.
-
-  <mapping jni-class="android/support/v4/app/Fragment.SavedState">
-    <method jni-name="writeToParcel" parameter="flags" clr-enum-type="Android.OS.ParcelableWriteFlags" />
-  </mapping>
-
-  Notes:
-  - For Java interfaces, use "jni-interface" attribute instead of "jni-class" attribute.
-  - To change the type of the return value, use "return" as the parameter name.
-  - The parameter names will be p0, p1, ... unless you provide JavaDoc file in the project.
-  -->
-</enum-method-mappings>
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/Transforms/Metadata.xml b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/Transforms/Metadata.xml
deleted file mode 100644
index 68cddb00971..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/Transforms/Metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<metadata>
-	<!--
-  This sample removes the class: android.support.v4.content.AsyncTaskLoader.LoadTask:
-  <remove-node path="/api/package[@name='android.support.v4.content']/class[@name='AsyncTaskLoader.LoadTask']" />
-  
-  This sample removes the method: android.support.v4.content.CursorLoader.loadInBackground:
-  <remove-node path="/api/package[@name='android.support.v4.content']/class[@name='CursorLoader']/method[@name='loadInBackground']" />
-  -->
-</metadata>
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/Xamarin.Android.BindingResolveImportLib4.csproj b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/Xamarin.Android.BindingResolveImportLib4.csproj
deleted file mode 100644
index 46b9a1cbc8a..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/Xamarin.Android.BindingResolveImportLib4.csproj
+++ /dev/null
@@ -1,81 +0,0 @@
-<?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>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>{5BDCEF07-E3D7-4E73-B025-6E43A5A7D7F1}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Xamarin.Android.BindingResolveImportLib4</RootNamespace>
-    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
-    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
-    <AssemblyName>Xamarin.Android.BindingResolveImportLib4</AssemblyName>
-    <AndroidClassParser>class-parse</AndroidClassParser>
-  </PropertyGroup>
-  <Import Project="..\..\..\Configuration.props" />
-  <PropertyGroup>
-    <TargetFrameworkVersion>$(AndroidFrameworkVersion)</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidLinkMode>None</AndroidLinkMode>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="Mono.Android" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Additions\AboutAdditions.txt" />
-    <None Include="Jars\AboutJars.txt" />
-    <TestJarEntry Include="Jars\com\xamarin\android\test\binding\resolveimport\Lib4.java">
-      <Link>Jars\com\xamarin\android\test\binding\resolveimport\Lib4.java</Link>
-      <OutputFile>Jars/lib4.jar</OutputFile>
-    </TestJarEntry>
-  </ItemGroup>
-  <ItemGroup>
-    <TransformFile Include="Transforms\EnumFields.xml" />
-    <TransformFile Include="Transforms\EnumMethods.xml" />
-    <TransformFile Include="Transforms\Metadata.xml" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
-  <Import Project="..\..\..\build-tools\scripts\Jar.targets" />
-  <Import Project="Xamarin.Android.BindingResolveImportLib4.targets" />
-  <ItemGroup>
-    <EmbeddedJar Include="Jars\lib4.jar" />
-  </ItemGroup>
-  <PropertyGroup>
-    <BuildDependsOn>
-      BuildTestJarFile;
-      BuildNativeLibs;
-      $(BuildDependsOn)
-    </BuildDependsOn>
-    <CleanDependsOn>
-      CleanTestJarFile;
-      CleanNativeLibs;
-      $(CleanDependsOn)
-    </CleanDependsOn>
-  </PropertyGroup>
-  <ItemGroup>
-    <EmbeddedNativeLibrary Include="libs\armeabi-v7a\libtiming4.so" />
-    <EmbeddedNativeLibrary Include="libs\x86\libtiming4.so" />
-  </ItemGroup>
-</Project>
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/Xamarin.Android.BindingResolveImportLib4.targets b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/Xamarin.Android.BindingResolveImportLib4.targets
deleted file mode 100644
index 082ee8706d8..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/Xamarin.Android.BindingResolveImportLib4.targets
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="BuildNativeLibs"
-      DependsOnTargets="AndroidPrepareForBuild"
-      Inputs="jni\timing.c;jni\Android.mk"
-      Outputs="@(EmbeddedNativeLibrary)">
-    <Error
-        Condition="!Exists ('$(NdkBuildPath)')"
-        Text="Could not locate Android NDK."
-    />
-    <Exec Command="&quot;$(NdkBuildPath)&quot;" />
-  </Target>
-  <Target Name="CleanNativeLibs">
-    <RemoveDir Directories="obj\local;libs" />
-  </Target>
-</Project>
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/jni/Android.mk b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/jni/Android.mk
deleted file mode 100644
index 52b848ccdd5..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/jni/Android.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_CFLAGS    := -g
-LOCAL_LDLIBS    := -llog
-LOCAL_MODULE    := timing4
-LOCAL_SRC_FILES := timing.c
-
-include $(BUILD_SHARED_LIBRARY)
-
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/jni/Application.mk b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/jni/Application.mk
deleted file mode 100644
index 729645b114c..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/jni/Application.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Build both ARMv5TE and ARMv7-A machine code.
-APP_ABI := arm64-v8a armeabi-v7a x86 x86_64
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/jni/timing.c b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/jni/timing.c
deleted file mode 100644
index 6db2ffd9757..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/jni/timing.c
+++ /dev/null
@@ -1,334 +0,0 @@
-#include <android/log.h>
-#include <sys/time.h>
-#include <jni.h>
-
-void
-foo_void_timing (void)
-{
-}
-
-int
-foo_int_timing (void)
-{
-	return 0;
-}
-
-void*
-foo_ptr_timing (void)
-{
-	return 0;
-}
-
-void
-foo_void_a1_timing (void *obj1)
-{
-}
-
-void
-foo_void_a2_timing (void *obj1, void *obj2)
-{
-}
-
-void
-foo_void_a3_timing (void *obj1, void *obj2, void *obj3)
-{
-}
-
-void
-foo_void_ai1_timing (int i1)
-{
-}
-
-void
-foo_void_ai2_timing (int i1, int i2)
-{
-}
-
-void
-foo_void_ai3_timing (int i1, int i2, int i3)
-{
-}
-
-struct FooMethods {
-	void  (*instance_void)(void);
-	int   (*instance_int)(void);
-	void* (*instance_ptr)(void);
-
-	void  (*void_1_args)(void *);
-	void  (*void_2_args)(void *, void *);
-	void  (*void_3_args)(void *, void *, void *);
-
-	void  (*void_1_iargs)(int);
-	void  (*void_2_iargs)(int, int);
-	void  (*void_3_iargs)(int, int, int);
-};
-
-void
-foo_get_methods (struct FooMethods* methods)
-{
-	methods->instance_void = foo_void_timing;
-	methods->instance_int  = foo_int_timing;
-	methods->instance_ptr  = foo_ptr_timing;
-
-	methods->void_1_args   = foo_void_a1_timing;
-	methods->void_2_args   = foo_void_a2_timing;
-	methods->void_3_args   = foo_void_a3_timing;
-
-	methods->void_1_iargs   = foo_void_ai1_timing;
-	methods->void_2_iargs   = foo_void_ai2_timing;
-	methods->void_3_iargs   = foo_void_ai3_timing;
-}
-
-static jmethodID Timing_StaticVoidMethod;
-static jmethodID Timing_StaticIntMethod;
-static jmethodID Timing_StaticObjectMethod;
-
-static jmethodID Timing_VirtualVoidMethod;
-static jmethodID Timing_VirtualIntMethod;
-static jmethodID Timing_VirtualObjectMethod;
-
-static jmethodID Timing_FinalVoidMethod;
-static jmethodID Timing_FinalIntMethod;
-static jmethodID Timing_FinalObjectMethod;
-
-static jmethodID Timing_StaticVoidMethod1Args;
-static jmethodID Timing_StaticVoidMethod2Args;
-static jmethodID Timing_StaticVoidMethod3Args;
-
-static jmethodID Timing_StaticVoidMethod1IArgs;
-static jmethodID Timing_StaticVoidMethod2IArgs;
-static jmethodID Timing_StaticVoidMethod3IArgs;
-
-static jclass Object_class;
-static jmethodID Object_init;
-
-static void    (*CallStaticVoidMethod)(JNIEnv*, jclass, jmethodID, ...);
-static int     (*CallStaticIntMethod)(JNIEnv*, jclass, jmethodID, ...);
-static jobject (*CallStaticObjectMethod)(JNIEnv*, jclass, jmethodID, ...);
-
-static void    (*CallVoidMethod)(JNIEnv*, jobject, jmethodID, ...);
-static int     (*CallIntMethod)(JNIEnv*, jobject, jmethodID, ...);
-static jobject (*CallObjectMethod)(JNIEnv*, jobject, jmethodID, ...);
-
-static void    (*CallNonvirtualVoidMethod)(JNIEnv*, jobject, jclass, jmethodID, ...);
-static int     (*CallNonvirtualIntMethod)(JNIEnv*, jobject, jclass, jmethodID, ...);
-static jobject (*CallNonvirtualObjectMethod)(JNIEnv*, jobject, jclass, jmethodID, ...);
-
-void
-foo_init (JNIEnv *env)
-{
-	jclass Timing, Object;
-
-	__android_log_print (ANDROID_LOG_INFO, "*jonp*", "foo_init; env=%p", env);
-
-	/* libbar.so loading test */
-	if (!env)
-		return;
-
-	Timing = (*env)->FindClass (env, "com/xamarin/android/Timing");
-	if (!Timing)
-		return;
-
-	Object = (*env)->FindClass (env, "java/lang/Object");
-	if (!Object)
-		return;
-	Object_class = (*env)->NewGlobalRef (env, Object);
-	(*env)->DeleteLocalRef (env, Object);
-
-	Object_init = (*env)->GetMethodID (env, Object_class, "<init>", "()V");
-
-	CallStaticVoidMethod    = (*env)->CallStaticVoidMethod;
-	CallStaticIntMethod     = (*env)->CallStaticIntMethod;
-	CallStaticObjectMethod  = (*env)->CallStaticObjectMethod;
-
-	CallVoidMethod    = (*env)->CallVoidMethod;
-	CallIntMethod     = (*env)->CallIntMethod;
-	CallObjectMethod  = (*env)->CallObjectMethod;
-
-	CallNonvirtualVoidMethod    = (*env)->CallNonvirtualVoidMethod;
-	CallNonvirtualIntMethod     = (*env)->CallNonvirtualIntMethod;
-	CallNonvirtualObjectMethod  = (*env)->CallNonvirtualObjectMethod;
-
-	Timing_StaticVoidMethod = (*env)->GetStaticMethodID (env, Timing,
-			"StaticVoidMethod", "()V");
-	Timing_StaticIntMethod = (*env)->GetStaticMethodID (env, Timing,
-			"StaticIntMethod", "()I");
-	Timing_StaticObjectMethod = (*env)->GetStaticMethodID (env, Timing,
-			"StaticObjectMethod", "()Ljava/lang/Object;");
-
-	Timing_VirtualVoidMethod = (*env)->GetMethodID (env, Timing,
-			"VirtualVoidMethod", "()V");
-	Timing_VirtualIntMethod = (*env)->GetMethodID (env, Timing,
-			"VirtualIntMethod", "()I");
-	Timing_VirtualObjectMethod = (*env)->GetMethodID (env, Timing,
-			"VirtualObjectMethod", "()Ljava/lang/Object;");
-
-	Timing_FinalVoidMethod = (*env)->GetMethodID (env, Timing,
-			"FinalVoidMethod", "()V");
-	Timing_FinalIntMethod = (*env)->GetMethodID (env, Timing,
-			"FinalIntMethod", "()I");
-	Timing_FinalObjectMethod = (*env)->GetMethodID (env, Timing,
-			"FinalObjectMethod", "()Ljava/lang/Object;");
-
-	Timing_StaticVoidMethod1Args = (*env)->GetStaticMethodID (env, Timing,
-			"StaticVoidMethod1Args", "(Ljava/lang/Object;)V");
-	Timing_StaticVoidMethod2Args = (*env)->GetStaticMethodID (env, Timing,
-			"StaticVoidMethod2Args", "(Ljava/lang/Object;Ljava/lang/Object;)V");
-	Timing_StaticVoidMethod3Args = (*env)->GetStaticMethodID (env, Timing,
-			"StaticVoidMethod3Args", "(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V");
-
-	Timing_StaticVoidMethod1IArgs = (*env)->GetStaticMethodID (env, Timing,
-			"StaticVoidMethod1IArgs", "(I)V");
-	Timing_StaticVoidMethod2IArgs = (*env)->GetStaticMethodID (env, Timing,
-			"StaticVoidMethod2IArgs", "(II)V");
-	Timing_StaticVoidMethod3IArgs = (*env)->GetStaticMethodID (env, Timing,
-			"StaticVoidMethod3IArgs", "(III)V");
-
-	(*env)->DeleteLocalRef (env, Timing);
-}
-
-static long long
-current_time_millis (void)
-{
-	struct timeval tv;
-
-	gettimeofday(&tv, (struct timezone *) NULL);
-	long long when = tv.tv_sec * 1000LL + tv.tv_usec / 1000;
-	return when;
-}
-
-void
-foo_get_native_jni_timings (JNIEnv *env, int count, jclass klass, jobject self, long long *jniTimes)
-{
-	int i;
-	long long start, end;
-
-	jobject obj1 = (*env)->NewObject(env, Object_class, Object_init),
-		obj2 = (*env)->NewObject(env, Object_class, Object_init),
-		obj3 = (*env)->NewObject(env, Object_class, Object_init);
-
-	start = current_time_millis ();
-	for (i = 0; i < count; i++)
-		CallStaticVoidMethod (env, klass, Timing_StaticVoidMethod);
-	end = current_time_millis ();
-
-	jniTimes [0] = end - start;
-	__android_log_print (ANDROID_LOG_INFO, "*jonp*", "foo/timing: static void    method invoke: %lli ms", jniTimes [0]);
-
-	start = current_time_millis ();
-	for (i = 0; i < count; i++)
-		CallStaticIntMethod (env, klass, Timing_StaticIntMethod);
-	end = current_time_millis ();
-
-	jniTimes [1] = end - start;
-	__android_log_print (ANDROID_LOG_INFO, "*jonp*", "foo/timing: static int     method invoke: %lli ms", jniTimes [1]);
-
-	start = current_time_millis ();
-	for (i = 0; i < count; i++)
-		CallStaticObjectMethod (env, klass, Timing_StaticObjectMethod);
-	end = current_time_millis ();
-
-	jniTimes [2] = end - start;
-	__android_log_print (ANDROID_LOG_INFO, "*jonp*", "foo/timing: static Object  method invoke: %lli ms", jniTimes [2]);
-
-	start = current_time_millis ();
-	for (i = 0; i < count; i++)
-		CallVoidMethod (env, self, Timing_VirtualVoidMethod);
-	end = current_time_millis ();
-
-	jniTimes [3] = end - start;
-	__android_log_print (ANDROID_LOG_INFO, "*jonp*", "foo/timing: virtual void   method invoke: %lli ms", jniTimes [3]);
-
-	start = current_time_millis ();
-	for (i = 0; i < count; i++)
-		CallIntMethod (env, self, Timing_VirtualIntMethod);
-	end = current_time_millis ();
-
-	jniTimes [4] = end - start;
-	__android_log_print (ANDROID_LOG_INFO, "*jonp*", "foo/timing: virtual int    method invoke: %lli ms", jniTimes [4]);
-
-	start = current_time_millis ();
-	for (i = 0; i < count; i++)
-		CallObjectMethod (env, self, Timing_VirtualObjectMethod);
-	end = current_time_millis ();
-
-	jniTimes [5] = end - start;
-	__android_log_print (ANDROID_LOG_INFO, "*jonp*", "foo/timing: virtual Object method invoke: %lli ms", jniTimes [5]);
-
-	start = current_time_millis ();
-	for (i = 0; i < count; i++)
-		CallNonvirtualVoidMethod (env, self, klass, Timing_FinalVoidMethod);
-	end = current_time_millis ();
-
-	jniTimes [6] = end - start;
-	__android_log_print (ANDROID_LOG_INFO, "*jonp*", "foo/timing: final void     method invoke: %lli ms", jniTimes [6]);
-
-	start = current_time_millis ();
-	for (i = 0; i < count; i++)
-		CallNonvirtualIntMethod (env, self, klass, Timing_FinalIntMethod);
-	end = current_time_millis ();
-
-	jniTimes [7] = end - start;
-	__android_log_print (ANDROID_LOG_INFO, "*jonp*", "foo/timing: final int      method invoke: %lli ms", jniTimes [7]);
-
-	start = current_time_millis ();
-	for (i = 0; i < count; i++)
-		CallNonvirtualObjectMethod (env, self, klass, Timing_FinalObjectMethod);
-	end = current_time_millis ();
-
-	jniTimes [8] = end - start;
-	__android_log_print (ANDROID_LOG_INFO, "*jonp*", "foo/timing: final Object   method invoke: %lli ms", jniTimes [8]);
-
-
-
-	start = current_time_millis ();
-	for (i = 0; i < count; i++)
-		CallStaticVoidMethod (env, klass, Timing_StaticVoidMethod1Args, obj1);
-	end = current_time_millis ();
-
-	jniTimes [9] = end - start;
-	__android_log_print (ANDROID_LOG_INFO, "*alexrp*", "foo/timing: static void o1 method invoke: %lli ms", jniTimes [9]);
-
-	start = current_time_millis ();
-	for (i = 0; i < count; i++)
-		CallStaticVoidMethod (env, klass, Timing_StaticVoidMethod2Args, obj1, obj2);
-	end = current_time_millis ();
-
-	jniTimes [10] = end - start;
-	__android_log_print (ANDROID_LOG_INFO, "*alexrp*", "foo/timing: static void o2 method invoke: %lli ms", jniTimes [10]);
-
-	start = current_time_millis ();
-	for (i = 0; i < count; i++)
-		CallStaticVoidMethod (env, klass, Timing_StaticVoidMethod3Args, obj1, obj2, obj3);
-	end = current_time_millis ();
-
-	jniTimes [11] = end - start;
-	__android_log_print (ANDROID_LOG_INFO, "*alexrp*", "foo/timing: static void o3 method invoke: %lli ms", jniTimes [11]);
-
-
-
-	start = current_time_millis ();
-	for (i = 0; i < count; i++)
-		CallStaticVoidMethod (env, klass, Timing_StaticVoidMethod1IArgs, 42);
-	end = current_time_millis ();
-
-	jniTimes [12] = end - start;
-	__android_log_print (ANDROID_LOG_INFO, "*alexrp*", "foo/timing: static void i1 method invoke: %lli ms", jniTimes [12]);
-
-	start = current_time_millis ();
-	for (i = 0; i < count; i++)
-		CallStaticVoidMethod (env, klass, Timing_StaticVoidMethod2IArgs, 42, 42);
-	end = current_time_millis ();
-
-	jniTimes [13] = end - start;
-	__android_log_print (ANDROID_LOG_INFO, "*alexrp*", "foo/timing: static void i2 method invoke: %lli ms", jniTimes [13]);
-
-	start = current_time_millis ();
-	for (i = 0; i < count; i++)
-		CallStaticVoidMethod (env, klass, Timing_StaticVoidMethod3IArgs, 42, 42, 42);
-	end = current_time_millis ();
-
-	jniTimes [14] = end - start;
-	__android_log_print (ANDROID_LOG_INFO, "*alexrp*", "foo/timing: static void i3 method invoke: %lli ms", jniTimes [14]);
-}
-
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImports-Tests/Assets/AboutAssets.txt b/tests/ResolveImports/Xamarin.Android.BindingResolveImports-Tests/Assets/AboutAssets.txt
deleted file mode 100644
index a9b0638eb1b..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImports-Tests/Assets/AboutAssets.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Any raw assets you want to be deployed with your application can be placed in
-this directory (and child directories) and given a Build Action of "AndroidAsset".
-
-These files will be deployed with your package and will be accessible using Android's
-AssetManager, like this:
-
-public class ReadAsset : Activity
-{
-	protected override void OnCreate (Bundle bundle)
-	{
-		base.OnCreate (bundle);
-
-		InputStream input = Assets.Open ("my_asset.txt");
-	}
-}
-
-Additionally, some Android functions will automatically load asset files:
-
-Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf");
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImports-Tests/MainActivity.cs b/tests/ResolveImports/Xamarin.Android.BindingResolveImports-Tests/MainActivity.cs
deleted file mode 100644
index 0bd4205069c..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImports-Tests/MainActivity.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-
-using Android.App;
-using Android.Content;
-using Android.Runtime;
-using Android.Views;
-using Android.Widget;
-using Android.OS;
-
-namespace Xamarin.Android.BindingResolveImportsTests
-{
-	[Activity (Label = "Xamarin.Android.BindingResolveImports-Tests", MainLauncher = true, Icon = "@drawable/icon")]
-	public class MainActivity : Activity
-	{
-		int count = 1;
-
-		protected override void OnCreate (Bundle bundle)
-		{
-			base.OnCreate (bundle);
-
-			// Set our view from the "main" layout resource
-			SetContentView (Resource.Layout.Main);
-
-			// Get our button from the layout resource,
-			// and attach an event to it
-			Button button = FindViewById<Button> (Resource.Id.myButton);
-			
-			button.Click += delegate {
-				new Com.Xamarin.Android.Test.Binding.Resolveimport.Lib1 ().Field1 = "test";
-				new Xamarin.Android.BindingResolveImportLib2.Addition ();
-				new Com.Xamarin.Android.Test.Binding.Resolveimport.Lib3 ().Field1 = "test";
-				new Com.Xamarin.Android.Test.Binding.Resolveimport.Lib4 ().Field1 = "test";
-				button.Text = string.Format ("{0} clicks!", count++);
-			};
-		}
-	}
-}
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImports-Tests/Properties/AndroidManifest.xml b/tests/ResolveImports/Xamarin.Android.BindingResolveImports-Tests/Properties/AndroidManifest.xml
deleted file mode 100644
index c6626b68e25..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImports-Tests/Properties/AndroidManifest.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="Xamarin.Android.BindingResolveImports_Tests">
-	<uses-sdk />
-	<application android:label="Xamarin.Android.BindingResolveImports-Tests">
-	</application>
-</manifest>
\ No newline at end of file
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImports-Tests/Properties/AssemblyInfo.cs b/tests/ResolveImports/Xamarin.Android.BindingResolveImports-Tests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 2cc1cebdbe9..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImports-Tests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using Android.App;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle ("Xamarin.Android.BindingResolveImports-Tests")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("")]
-[assembly: AssemblyCopyright ("atsushi")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion ("1.0.0")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImports-Tests/Resources/AboutResources.txt b/tests/ResolveImports/Xamarin.Android.BindingResolveImports-Tests/Resources/AboutResources.txt
deleted file mode 100644
index 10f52d46021..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImports-Tests/Resources/AboutResources.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-Images, layout descriptions, binary blobs and string dictionaries can be included 
-in your application as resource files.  Various Android APIs are designed to 
-operate on the resource IDs instead of dealing with images, strings or binary blobs 
-directly.
-
-For example, a sample Android app that contains a user interface layout (main.axml),
-an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png) 
-would keep its resources in the "Resources" directory of the application:
-
-Resources/
-    drawable/
-        icon.png
-
-    layout/
-        main.axml
-
-    values/
-        strings.xml
-
-In order to get the build system to recognize Android resources, set the build action to
-"AndroidResource".  The native Android APIs do not operate directly with filenames, but 
-instead operate on resource IDs.  When you compile an Android application that uses resources, 
-the build system will package the resources for distribution and generate a class called "R" 
-(this is an Android convention) that contains the tokens for each one of the resources 
-included. For example, for the above Resources layout, this is what the R class would expose:
-
-public class R {
-    public class drawable {
-        public const int icon = 0x123;
-    }
-
-    public class layout {
-        public const int main = 0x456;
-    }
-
-    public class strings {
-        public const int first_string = 0xabc;
-        public const int second_string = 0xbcd;
-    }
-}
-
-You would then use R.drawable.icon to reference the drawable/icon.png file, or R.layout.main 
-to reference the layout/main.axml file, or R.strings.first_string to reference the first 
-string in the dictionary file values/strings.xml.
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImports-Tests/Resources/drawable/Icon.png b/tests/ResolveImports/Xamarin.Android.BindingResolveImports-Tests/Resources/drawable/Icon.png
deleted file mode 100644
index a07c69fa5a0..00000000000
Binary files a/tests/ResolveImports/Xamarin.Android.BindingResolveImports-Tests/Resources/drawable/Icon.png and /dev/null differ
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImports-Tests/Resources/layout/Main.axml b/tests/ResolveImports/Xamarin.Android.BindingResolveImports-Tests/Resources/layout/Main.axml
deleted file mode 100644
index bd890ffb7d4..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImports-Tests/Resources/layout/Main.axml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    >
-<Button  
-    android:id="@+id/myButton"
-    android:layout_width="fill_parent" 
-    android:layout_height="wrap_content" 
-    android:text="@string/hello"
-    />
-</LinearLayout>
-
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImports-Tests/Resources/values/Strings.xml b/tests/ResolveImports/Xamarin.Android.BindingResolveImports-Tests/Resources/values/Strings.xml
deleted file mode 100644
index 27bbb0a67db..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImports-Tests/Resources/values/Strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<string name="hello">Hello World, Click Me!</string>
-	<string name="app_name">Xamarin.Android.BindingResolveImports-Tests</string>
-</resources>
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImports-Tests/Xamarin.Android.BindingResolveImports-Tests.csproj b/tests/ResolveImports/Xamarin.Android.BindingResolveImports-Tests/Xamarin.Android.BindingResolveImports-Tests.csproj
deleted file mode 100644
index 16b7f5303dc..00000000000
--- a/tests/ResolveImports/Xamarin.Android.BindingResolveImports-Tests/Xamarin.Android.BindingResolveImports-Tests.csproj
+++ /dev/null
@@ -1,79 +0,0 @@
-<?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>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>{B297008B-C313-455E-B230-E119589D2D79}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AssemblyName>Xamarin.Android.BindingResolveImports-Tests</AssemblyName>
-    <AndroidApplication>True</AndroidApplication>
-    <RootNamespace>Xamarin.Android.BindingResolveImportsTests</RootNamespace>
-    <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
-    <AndroidResgenClass>Resource</AndroidResgenClass>
-    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
-    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
-    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
-    <AndroidSupportedAbis>armeabi-v7a;x86</AndroidSupportedAbis>
-  </PropertyGroup>
-  <Import Project="..\..\..\Configuration.props" />
-  <PropertyGroup>
-    <TargetFrameworkVersion>$(AndroidFrameworkVersion)</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <WarningLevel>4</WarningLevel>
-    <AndroidLinkMode>None</AndroidLinkMode>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Include="Assets\AboutAssets.txt" />
-    <None Include="Resources\AboutResources.txt" />
-    <None Include="Properties\AndroidManifest.xml" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-  <ItemGroup>
-    <Compile Include="MainActivity.cs" />
-    <Compile Include="Resources\Resource.designer.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="Mono.Android" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\layout\Main.axml" />
-    <AndroidResource Include="Resources\values\Strings.xml" />
-    <AndroidResource Include="Resources\drawable\Icon.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Xamarin.Android.BindingResolveImportLib1\Xamarin.Android.BindingResolveImportLib1.csproj">
-      <Project>{2A0519DF-0DDA-45F7-AC3C-E2992748D364}</Project>
-      <Name>Xamarin.Android.BindingResolveImportLib1</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xamarin.Android.BindingResolveImportLib2\Xamarin.Android.BindingResolveImportLib2.csproj">
-      <Project>{DD4E2A49-730C-41FD-B6D4-AFB73F94271F}</Project>
-      <Name>Xamarin.Android.BindingResolveImportLib2</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xamarin.Android.BindingResolveImportLib3\Xamarin.Android.BindingResolveImportLib3.csproj">
-      <Project>{9802CB35-0BC0-4EE1-9A81-BB40BD97945A}</Project>
-      <Name>Xamarin.Android.BindingResolveImportLib3</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xamarin.Android.BindingResolveImportLib4\Xamarin.Android.BindingResolveImportLib4.csproj">
-      <Project>{5BDCEF07-E3D7-4E73-B025-6E43A5A7D7F1}</Project>
-      <Name>Xamarin.Android.BindingResolveImportLib4</Name>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
diff --git a/tests/locales/LibraryResources/Environment.txt b/tests/locales/LibraryResources/Environment.txt
deleted file mode 100644
index 4259a506aab..00000000000
--- a/tests/locales/LibraryResources/Environment.txt
+++ /dev/null
@@ -1 +0,0 @@
-THIS_IS_MY_ENVIRONMENT=Well, hello there!
diff --git a/tests/locales/LibraryResources/LibraryResources.csproj b/tests/locales/LibraryResources/LibraryResources.csproj
deleted file mode 100644
index 2b3069e9ad4..00000000000
--- a/tests/locales/LibraryResources/LibraryResources.csproj
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>10.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{05768F39-7BAF-43E6-971E-712F5771E88E}</ProjectGuid>
-    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <RootNamespace>LibraryResources</RootNamespace>
-    <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
-    <AndroidResgenClass>Resource</AndroidResgenClass>
-    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
-    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <AssemblyName>LibraryResources</AssemblyName>
-  </PropertyGroup>
-  <Import Project="..\..\..\Configuration.props" />
-  <PropertyGroup>
-    <TargetFrameworkVersion>$(AndroidFrameworkVersion)</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\bin\TestDebug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidLinkMode>None</AndroidLinkMode>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\bin\TestRelease</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="Mono.Android" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Resources\Resource.designer.cs" />
-    <Compile Include="SatelliteResources.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\AboutResources.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\values\Strings.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidEnvironment Include="Environment.txt" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-  <ItemGroup>
-    <EmbeddedResource Include="strings.de-DE.resx" />
-    <EmbeddedResource Include="strings.resx" />
-    <EmbeddedResource Include="strings.fr-FR.resx" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/tests/locales/LibraryResources/Resources/AboutResources.txt b/tests/locales/LibraryResources/Resources/AboutResources.txt
deleted file mode 100644
index 10f52d46021..00000000000
--- a/tests/locales/LibraryResources/Resources/AboutResources.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-Images, layout descriptions, binary blobs and string dictionaries can be included 
-in your application as resource files.  Various Android APIs are designed to 
-operate on the resource IDs instead of dealing with images, strings or binary blobs 
-directly.
-
-For example, a sample Android app that contains a user interface layout (main.axml),
-an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png) 
-would keep its resources in the "Resources" directory of the application:
-
-Resources/
-    drawable/
-        icon.png
-
-    layout/
-        main.axml
-
-    values/
-        strings.xml
-
-In order to get the build system to recognize Android resources, set the build action to
-"AndroidResource".  The native Android APIs do not operate directly with filenames, but 
-instead operate on resource IDs.  When you compile an Android application that uses resources, 
-the build system will package the resources for distribution and generate a class called "R" 
-(this is an Android convention) that contains the tokens for each one of the resources 
-included. For example, for the above Resources layout, this is what the R class would expose:
-
-public class R {
-    public class drawable {
-        public const int icon = 0x123;
-    }
-
-    public class layout {
-        public const int main = 0x456;
-    }
-
-    public class strings {
-        public const int first_string = 0xabc;
-        public const int second_string = 0xbcd;
-    }
-}
-
-You would then use R.drawable.icon to reference the drawable/icon.png file, or R.layout.main 
-to reference the layout/main.axml file, or R.strings.first_string to reference the first 
-string in the dictionary file values/strings.xml.
diff --git a/tests/locales/LibraryResources/Resources/values/Strings.xml b/tests/locales/LibraryResources/Resources/values/Strings.xml
deleted file mode 100644
index 8f776bb42f6..00000000000
--- a/tests/locales/LibraryResources/Resources/values/Strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<string name="library_name">LibraryResources</string>
-</resources>
diff --git a/tests/locales/LibraryResources/SatelliteResources.cs b/tests/locales/LibraryResources/SatelliteResources.cs
deleted file mode 100644
index f13318234cb..00000000000
--- a/tests/locales/LibraryResources/SatelliteResources.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Globalization;
-using System.Resources;
-
-namespace LibraryResources {
-
-	public static class SatelliteResources {
-
-		static readonly ResourceManager Resources = new ResourceManager ("LibraryResources.strings", typeof (SatelliteResources).Assembly);
-
-		public static string GetString (string resourceName, CultureInfo culture = null)
-		{
-			return Resources.GetString (resourceName, culture);
-		}
-	}
-}
-
diff --git a/tests/locales/LibraryResources/strings.de-DE.resx b/tests/locales/LibraryResources/strings.de-DE.resx
deleted file mode 100644
index f87a1af8ca2..00000000000
--- a/tests/locales/LibraryResources/strings.de-DE.resx
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="LibString" xml:space="preserve">
-    <value>Lib German</value>
-    <comment>GERMAN</comment>
-  </data>
-</root>
diff --git a/tests/locales/LibraryResources/strings.fr-FR.resx b/tests/locales/LibraryResources/strings.fr-FR.resx
deleted file mode 100644
index f27471219ea..00000000000
--- a/tests/locales/LibraryResources/strings.fr-FR.resx
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="LibString" xml:space="preserve">
-    <value>Lib French</value>
-    <comment>FRENCH</comment>
-  </data>
-</root>
diff --git a/tests/locales/LibraryResources/strings.resx b/tests/locales/LibraryResources/strings.resx
deleted file mode 100644
index 53d2655c782..00000000000
--- a/tests/locales/LibraryResources/strings.resx
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="LibString" xml:space="preserve">
-    <value>Lib English</value>
-    <comment>ENGLISH</comment>
-  </data>
-</root>
diff --git a/tests/locales/Xamarin.Android.Locale-Tests/Assets/AboutAssets.txt b/tests/locales/Xamarin.Android.Locale-Tests/Assets/AboutAssets.txt
deleted file mode 100644
index a9b0638eb1b..00000000000
--- a/tests/locales/Xamarin.Android.Locale-Tests/Assets/AboutAssets.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Any raw assets you want to be deployed with your application can be placed in
-this directory (and child directories) and given a Build Action of "AndroidAsset".
-
-These files will be deployed with your package and will be accessible using Android's
-AssetManager, like this:
-
-public class ReadAsset : Activity
-{
-	protected override void OnCreate (Bundle bundle)
-	{
-		base.OnCreate (bundle);
-
-		InputStream input = Assets.Open ("my_asset.txt");
-	}
-}
-
-Additionally, some Android functions will automatically load asset files:
-
-Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf");
diff --git a/tests/locales/Xamarin.Android.Locale-Tests/Environment.txt b/tests/locales/Xamarin.Android.Locale-Tests/Environment.txt
deleted file mode 100644
index 0ebab922566..00000000000
--- a/tests/locales/Xamarin.Android.Locale-Tests/Environment.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-debug.mono.debug=1
-debug.mono.log=default,timing=bare
-MONO_LOG_LEVEL=debug
-MONO_LOG_MASK=asm
-MONO_XDEBUG=1
-
-# Force runtime to use fr-FR locale instead of default locale.
-LANG=fr-FR
-__XA_USE_JAVA_DEFAULT_TIMEZONE_ID__=true
diff --git a/tests/locales/Xamarin.Android.Locale-Tests/EnvironmentTests.cs b/tests/locales/Xamarin.Android.Locale-Tests/EnvironmentTests.cs
deleted file mode 100644
index 2c970f56956..00000000000
--- a/tests/locales/Xamarin.Android.Locale-Tests/EnvironmentTests.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Reflection;
-
-using NUnit.Framework;
-
-namespace Xamarin.Android.LocaleTests
-{
-	[TestFixture]
-	public class EnvironmentTests
-	{
-		[Test (Description="https://bugzilla.xamarin.com/show_bug.cgi?id=58673")]
-		public void EnvironmentVariablesFromLibraryProjectsAreMerged ()
-		{
-			var v = Environment.GetEnvironmentVariable ("THIS_IS_MY_ENVIRONMENT");
-			Assert.AreEqual ("Well, hello there!", v);
-		}
-	}
-}
-
diff --git a/tests/locales/Xamarin.Android.Locale-Tests/GlobalizationTests.cs b/tests/locales/Xamarin.Android.Locale-Tests/GlobalizationTests.cs
deleted file mode 100644
index 33004f78acd..00000000000
--- a/tests/locales/Xamarin.Android.Locale-Tests/GlobalizationTests.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Globalization;
-
-using NUnit.Framework;
-
-namespace Xamarin.Android.LocaleTests {
-
-	[TestFixture]
-	public class GlobalizationTests {
-
-		[Test]
-		public void CultureInfo_CurrentCultureIsFrench ()
-		{
-			// CultureInfo.CurrentCulture should be French because
-			// Environment.txt sets LANG=fr-FR.
-			Assert.IsNotNull (CultureInfo.CurrentCulture);
-			Assert.AreEqual ("French (France)", CultureInfo.CurrentCulture.DisplayName);
-		}
-
-		[Test]
-		public void CultureInfo_CurrentUICultureIsFrench ()
-		{
-			// CultureInfo.CurrentCulture should be French because
-			// Environment.txt sets LANG=fr-FR.
-			Assert.IsNotNull (CultureInfo.CurrentUICulture);
-			Assert.AreEqual ("French (France)", CultureInfo.CurrentUICulture.DisplayName);
-		}
-	}
-}
-
diff --git a/tests/locales/Xamarin.Android.Locale-Tests/MainActivity.cs b/tests/locales/Xamarin.Android.Locale-Tests/MainActivity.cs
deleted file mode 100644
index 4979b33ca72..00000000000
--- a/tests/locales/Xamarin.Android.Locale-Tests/MainActivity.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Reflection;
-using Android.App;
-using Android.OS;
-using Xamarin.Android.NUnitLite;
-
-namespace Xamarin.Android.LocaleTests
-{
-	[Activity (Label = "Xamarin.Android.Locale-Tests", MainLauncher = true)]
-	public class MainActivity : TestSuiteActivity
-	{
-		protected override void OnCreate (Bundle bundle)
-		{
-			// tests can be inside the main assembly
-			AddTest (Assembly.GetExecutingAssembly ());
-			// or in any reference assemblies
-			// AddTest (typeof (Your.Library.TestClass).Assembly);
-
-			// Once you called base.OnCreate(), you cannot add more assemblies.
-			base.OnCreate (bundle);
-		}
-	}
-}
-
diff --git a/tests/locales/Xamarin.Android.Locale-Tests/Properties/AndroidManifest.xml b/tests/locales/Xamarin.Android.Locale-Tests/Properties/AndroidManifest.xml
deleted file mode 100644
index e2639050764..00000000000
--- a/tests/locales/Xamarin.Android.Locale-Tests/Properties/AndroidManifest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="Xamarin.Android.Locale_Tests">
-	<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="22" />
-	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-	<application android:label="Xamarin.Android.Locale-Tests">
-	</application>
-</manifest>
\ No newline at end of file
diff --git a/tests/locales/Xamarin.Android.Locale-Tests/Properties/AssemblyInfo.cs b/tests/locales/Xamarin.Android.Locale-Tests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 582048780f3..00000000000
--- a/tests/locales/Xamarin.Android.Locale-Tests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using Android.App;
-
-// Information about this assembly is defined by the following attributes. 
-// Change them to the values specific to your project.
-[assembly: AssemblyTitle ("Xamarin.Android.Locale-Tests")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("Xamarin Inc.")]
-[assembly: AssemblyProduct ("")]
-[assembly: AssemblyCopyright ("Xamarin Inc.")]
-[assembly: AssemblyTrademark ("Xamarin")]
-[assembly: AssemblyCulture ("")]
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-[assembly: AssemblyVersion ("1.0.0")]
-// The following attributes are used to specify the signing key for the assembly, 
-// if desired. See the Mono documentation for more information about signing.
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-
diff --git a/tests/locales/Xamarin.Android.Locale-Tests/Resources/AboutResources.txt b/tests/locales/Xamarin.Android.Locale-Tests/Resources/AboutResources.txt
deleted file mode 100644
index 10f52d46021..00000000000
--- a/tests/locales/Xamarin.Android.Locale-Tests/Resources/AboutResources.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-Images, layout descriptions, binary blobs and string dictionaries can be included 
-in your application as resource files.  Various Android APIs are designed to 
-operate on the resource IDs instead of dealing with images, strings or binary blobs 
-directly.
-
-For example, a sample Android app that contains a user interface layout (main.axml),
-an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png) 
-would keep its resources in the "Resources" directory of the application:
-
-Resources/
-    drawable/
-        icon.png
-
-    layout/
-        main.axml
-
-    values/
-        strings.xml
-
-In order to get the build system to recognize Android resources, set the build action to
-"AndroidResource".  The native Android APIs do not operate directly with filenames, but 
-instead operate on resource IDs.  When you compile an Android application that uses resources, 
-the build system will package the resources for distribution and generate a class called "R" 
-(this is an Android convention) that contains the tokens for each one of the resources 
-included. For example, for the above Resources layout, this is what the R class would expose:
-
-public class R {
-    public class drawable {
-        public const int icon = 0x123;
-    }
-
-    public class layout {
-        public const int main = 0x456;
-    }
-
-    public class strings {
-        public const int first_string = 0xabc;
-        public const int second_string = 0xbcd;
-    }
-}
-
-You would then use R.drawable.icon to reference the drawable/icon.png file, or R.layout.main 
-to reference the layout/main.axml file, or R.strings.first_string to reference the first 
-string in the dictionary file values/strings.xml.
diff --git a/tests/locales/Xamarin.Android.Locale-Tests/Resources/drawable/Icon.png b/tests/locales/Xamarin.Android.Locale-Tests/Resources/drawable/Icon.png
deleted file mode 100644
index a07c69fa5a0..00000000000
Binary files a/tests/locales/Xamarin.Android.Locale-Tests/Resources/drawable/Icon.png and /dev/null differ
diff --git a/tests/locales/Xamarin.Android.Locale-Tests/SatelliteAssemblyTests.cs b/tests/locales/Xamarin.Android.Locale-Tests/SatelliteAssemblyTests.cs
deleted file mode 100644
index 264752fb490..00000000000
--- a/tests/locales/Xamarin.Android.Locale-Tests/SatelliteAssemblyTests.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.Globalization;
-
-using NUnit.Framework;
-
-namespace Xamarin.Android.LocaleTests {
-
-	[TestFixture]
-	public class SatelliteAssemblyTests {
-
-		[Test]
-		public void SatelliteAssemblyValues ()
-		{
-			var en  = CultureInfo.GetCultureInfo ("en-US");	// fallback values
-			var de  = CultureInfo.GetCultureInfo ("de-DE");
-			var fr  = CultureInfo.GetCultureInfo ("fr-FR");
-
-			var app = new System.Resources.ResourceManager ("Xamarin.Android.LocaleTests.strings", this.GetType ().Assembly);
-
-			CheckSatelliteString ("AppString", en, "App English", app.GetString);
-			CheckSatelliteString ("AppString", de, "App German",  app.GetString);
-			CheckSatelliteString ("AppString", fr, "App French",  app.GetString);
-
-			CheckSatelliteString ("LibString", en, "Lib English", LibraryResources.SatelliteResources.GetString);
-			CheckSatelliteString ("LibString", de, "Lib German",  LibraryResources.SatelliteResources.GetString);
-			CheckSatelliteString ("LibString", fr, "Lib French",  LibraryResources.SatelliteResources.GetString);
-		}
-
-		static void CheckSatelliteString (string resourceName, CultureInfo culture, string expected, Func<string, CultureInfo, string> getString)
-		{
-			var actual = getString (resourceName, culture);
-			if (actual != expected)
-				throw new InvalidOperationException (
-					string.Format ("Satellite assembly resource lookup failed for resource '{0}' from culture '{1}'.\n" +
-				               "Expected='{2}'\n" +
-				               "  Actual='{3}'",
-				               resourceName, culture.Name, expected, actual));
-		}
-	}
-}
-
diff --git a/tests/locales/Xamarin.Android.Locale-Tests/TestInstrumentation.cs b/tests/locales/Xamarin.Android.Locale-Tests/TestInstrumentation.cs
deleted file mode 100644
index 7fcc4ab8cdb..00000000000
--- a/tests/locales/Xamarin.Android.Locale-Tests/TestInstrumentation.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using System.Reflection;
-
-using Android.App;
-using Android.Content;
-using Android.Runtime;
-
-using Xamarin.Android.NUnitLite;
-
-namespace Xamarin.Android.LocaleTests {
-
-	[Instrumentation (Name="xamarin.android.localetests.TestInstrumentation")]
-	public class TestInstrumentation : TestSuiteInstrumentation {
-
-		public TestInstrumentation (IntPtr handle, JniHandleOwnership transfer)
-			: base (handle, transfer)
-		{
-		}
-
-		protected override void AddTests ()
-		{
-			AddTest (Assembly.GetExecutingAssembly ());
-		}
-	}
-}
-
diff --git a/tests/locales/Xamarin.Android.Locale-Tests/TimeZoneTests.cs b/tests/locales/Xamarin.Android.Locale-Tests/TimeZoneTests.cs
deleted file mode 100644
index 6900d4f56af..00000000000
--- a/tests/locales/Xamarin.Android.Locale-Tests/TimeZoneTests.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Reflection;
-
-using NUnit.Framework;
-
-namespace Xamarin.Android.LocaleTests
-{
-	[TestFixture]
-	public class TimeZoneTests
-	{
-		[Test (Description="Test for xambug #4902")]
-		public void GetDefaultTimeZone_NoPersistSysTimeZone ()
-		{
-			Assert.AreEqual (TimeZoneInfo.Local.DisplayName, Java.Util.TimeZone.Default.ID, "#1");
-		}
-	}
-}
-
diff --git a/tests/locales/Xamarin.Android.Locale-Tests/Xamarin.Android.Locale-Tests.csproj b/tests/locales/Xamarin.Android.Locale-Tests/Xamarin.Android.Locale-Tests.csproj
deleted file mode 100644
index 3507d21518e..00000000000
--- a/tests/locales/Xamarin.Android.Locale-Tests/Xamarin.Android.Locale-Tests.csproj
+++ /dev/null
@@ -1,84 +0,0 @@
-<?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>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{9D5C83B5-70D5-4CC2-9DB7-78B23DC8F255}</ProjectGuid>
-    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Xamarin.Android.LocaleTests</RootNamespace>
-    <AndroidApplication>True</AndroidApplication>
-    <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
-    <AndroidResgenClass>Resource</AndroidResgenClass>
-    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
-    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <AssemblyName>Xamarin.Android.Locale-Tests</AssemblyName>
-    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
-    <AndroidSupportedAbis>armeabi-v7a;x86</AndroidSupportedAbis>
-  </PropertyGroup>
-  <Import Project="..\..\..\Configuration.props" />
-  <PropertyGroup>
-    <TargetFrameworkVersion>$(AndroidFrameworkVersion)</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\bin\TestDebug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidLinkMode>None</AndroidLinkMode>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\bin\TestRelease</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="Mono.Android" />
-    <Reference Include="Xamarin.Android.NUnitLite" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="EnvironmentTests.cs" />
-    <Compile Include="MainActivity.cs" />
-    <Compile Include="Resources\Resource.designer.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TestInstrumentation.cs" />
-    <Compile Include="SatelliteAssemblyTests.cs" />
-    <Compile Include="GlobalizationTests.cs" />
-    <Compile Include="TimeZoneTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\AboutResources.txt" />
-    <None Include="Assets\AboutAssets.txt" />
-    <None Include="Properties\AndroidManifest.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\Icon.png" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-  <Import Project="Xamarin.Android.Locale-Tests.projitems" />
-  <Import Project="..\..\..\build-tools\scripts\TestApks.targets" />
-  <ItemGroup>
-    <EmbeddedResource Include="strings.de-DE.resx" />
-    <EmbeddedResource Include="strings.fr-FR.resx" />
-    <EmbeddedResource Include="strings.resx" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidEnvironment Include="Environment.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\LibraryResources\LibraryResources.csproj">
-      <Project>{05768F39-7BAF-43E6-971E-712F5771E88E}</Project>
-      <Name>LibraryResources</Name>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
diff --git a/tests/locales/Xamarin.Android.Locale-Tests/Xamarin.Android.Locale-Tests.projitems b/tests/locales/Xamarin.Android.Locale-Tests/Xamarin.Android.Locale-Tests.projitems
deleted file mode 100644
index 0443219f7e9..00000000000
--- a/tests/locales/Xamarin.Android.Locale-Tests/Xamarin.Android.Locale-Tests.projitems
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <TestApk Include="$(OutputPath)Xamarin.Android.Locale_Tests-Signed.apk">
-      <Package>Xamarin.Android.Locale_Tests</Package>
-      <TimingDefinitionsFilename>$(MSBuildThisFileDirectory)..\..\..\build-tools\scripts\TimingDefinitions.txt</TimingDefinitionsFilename>
-      <TimingResultsFilename>$(MSBuildThisFileDirectory)..\..\..\TestResult-Xamarin.Android.Locale_Tests-times.csv</TimingResultsFilename>
-    </TestApk>
-    <TestApkInstrumentation Include="xamarin.android.localetests.TestInstrumentation">
-      <Package>Xamarin.Android.Locale_Tests</Package>
-      <ResultsPath>$(OutputPath)TestResult-Xamarin.Android.Locale_Tests.xml</ResultsPath>
-    </TestApkInstrumentation>
-
-    <TestApkPermission Include="READ_EXTERNAL_STORAGE">
-      <Package>Xamarin.Android.Locale_Tests</Package>
-    </TestApkPermission>
-
-    <TestApkPermission Include="WRITE_EXTERNAL_STORAGE">
-      <Package>Xamarin.Android.Locale_Tests</Package>
-    </TestApkPermission>
-  </ItemGroup>
-</Project>
diff --git a/tests/locales/Xamarin.Android.Locale-Tests/strings.de-DE.resx b/tests/locales/Xamarin.Android.Locale-Tests/strings.de-DE.resx
deleted file mode 100644
index 3e65dcd4d08..00000000000
--- a/tests/locales/Xamarin.Android.Locale-Tests/strings.de-DE.resx
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="AppString" xml:space="preserve">
-    <value>App German</value>
-    <comment>GERMAN</comment>
-  </data>
-</root>
diff --git a/tests/locales/Xamarin.Android.Locale-Tests/strings.fr-FR.resx b/tests/locales/Xamarin.Android.Locale-Tests/strings.fr-FR.resx
deleted file mode 100644
index b71ab3fd964..00000000000
--- a/tests/locales/Xamarin.Android.Locale-Tests/strings.fr-FR.resx
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="AppString" xml:space="preserve">
-    <value>App French</value>
-    <comment>FRENCH</comment>
-  </data>
-</root>
diff --git a/tests/locales/Xamarin.Android.Locale-Tests/strings.resx b/tests/locales/Xamarin.Android.Locale-Tests/strings.resx
deleted file mode 100644
index 7f3e2e7fd7a..00000000000
--- a/tests/locales/Xamarin.Android.Locale-Tests/strings.resx
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="AppString" xml:space="preserve">
-    <value>App English</value>
-    <comment>ENGLISH</comment>
-  </data>
-</root>