diff --git a/Octokit.Tests/Exceptions/ApiValidationExceptionTests.cs b/Octokit.Tests/Exceptions/ApiValidationExceptionTests.cs
index a6b532ac..114f8482 100644
--- a/Octokit.Tests/Exceptions/ApiValidationExceptionTests.cs
+++ b/Octokit.Tests/Exceptions/ApiValidationExceptionTests.cs
@@ -39,6 +39,7 @@ namespace Octokit.Tests.Exceptions
                 Assert.Equal(responseContent, exception.ApiValidationError.Message);
             }
 
+#if !NETFX_CORE
             [Fact]
             public void CanPopulateObjectFromSerializedData()
             {
@@ -58,6 +59,7 @@ namespace Octokit.Tests.Exceptions
                     Assert.Equal("key is already in use", exception.ApiValidationError.Errors.First().Message);
                 }
             }
+#endif
         }
     }
 }
\ No newline at end of file
diff --git a/Octokit.Tests/OctokitRT.Tests.csproj b/Octokit.Tests/OctokitRT.Tests.csproj
index 153458e7..fcf5d4f5 100644
--- a/Octokit.Tests/OctokitRT.Tests.csproj
+++ b/Octokit.Tests/OctokitRT.Tests.csproj
@@ -7,8 +7,8 @@
     <ProjectGuid>{3F4686DA-8774-4940-823E-9138F4B42060}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Octokit.Tests</RootNamespace>
-    <AssemblyName>Octokit.Tests</AssemblyName>
+    <RootNamespace>OctokitRT.Tests</RootNamespace>
+    <AssemblyName>OctokitRT.Tests</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
@@ -52,6 +52,7 @@
   <ItemGroup>
     <Compile Include="Authentication\CredentialsTests.cs" />
     <Compile Include="Clients\SshKeysClientTests.cs" />
+    <Compile Include="Exceptions\ApiValidationExceptionTests.cs" />
     <Compile Include="Helpers\UriExtensionsTests.cs" />
     <Compile Include="Http\ApiConnectionTests.cs" />
     <Compile Include="Clients\AuthorizationsClientTests.cs" />
diff --git a/Octokit.Tests/Queryable/AggregateQueryTests.cs b/Octokit.Tests/Queryable/AggregateQueryTests.cs
deleted file mode 100644
index bcaa7acb..00000000
--- a/Octokit.Tests/Queryable/AggregateQueryTests.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Xunit;
-using FluentAssertions;
-using Xunit.Extensions;
-using Moq;
-using Burr.Http;
-using Burr.Tests.TestHelpers;
-
-namespace Burr.Tests
-{
-    public class AggregateQueryTests
-    {
-        public class FakeObject
-        {
-            public string Name { get; set; }
-        }
-
-        public class TheGetEnumeratorMethod
-        {
-            //[Fact(Skip="Just playing")]
-            [Fact]
-            public void CanEnumerate()
-            {
-                var q = new AggregateQuery<FakeObject>();
-
-                q.Take(5).ToList();
-            }
-        }
-    }
-}
diff --git a/Octokit/Properties/AssemblyInfo.cs b/Octokit/Properties/AssemblyInfo.cs
index bf3551bc..126716e9 100644
--- a/Octokit/Properties/AssemblyInfo.cs
+++ b/Octokit/Properties/AssemblyInfo.cs
@@ -15,6 +15,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: InternalsVisibleTo("Octokit.Tests")]
+[assembly: InternalsVisibleTo("OctokitRT.Tests")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from