diff --git a/SabreTools.RedumpLib.Legacy/SabreTools.RedumpLib.Legacy.csproj b/SabreTools.RedumpLib.Legacy/SabreTools.RedumpLib.Legacy.csproj
index 12d1b08..c5d1ffb 100644
--- a/SabreTools.RedumpLib.Legacy/SabreTools.RedumpLib.Legacy.csproj
+++ b/SabreTools.RedumpLib.Legacy/SabreTools.RedumpLib.Legacy.csproj
@@ -22,10 +22,6 @@
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
     </PropertyGroup>
 
-    <ItemGroup>
-        <InternalsVisibleTo Include="SabreTools.RedumpLib.Test" />
-    </ItemGroup>
-
     <ItemGroup>
         <None Include="README.md" Pack="true" PackagePath="" />
     </ItemGroup>
diff --git a/SabreTools.RedumpLib.Test/RedumpOrg/UrlBuilderTests.cs b/SabreTools.RedumpLib.Test/RedumpOrg/UrlBuilderTests.cs
deleted file mode 100644
index 4ccb38b..0000000
--- a/SabreTools.RedumpLib.Test/RedumpOrg/UrlBuilderTests.cs
+++ /dev/null
@@ -1,212 +0,0 @@
-using System;
-using SabreTools.RedumpLib.Legacy.Data;
-using SabreTools.RedumpLib.Legacy.Web;
-using Xunit;
-
-namespace SabreTools.RedumpLib.Test.RedumpOrg
-{
-    public class UrlBuilderTests
-    {
-        #region BuildDiscUrl
-
-        [Theory]
-        [InlineData(1, 1)]
-        [InlineData(-1, 1)]
-        public void BuildDiscUrl_AlwaysPositive(int id, int expected)
-        {
-            string actual = UrlBuilder.BuildDiscUrl(id);
-            Assert.Equal($"http://redump.org/disc/{expected}/", actual);
-        }
-
-        [Theory]
-        [InlineData(DiscSubpath.Changes, "http://redump.org/disc/1/changes/")]
-        [InlineData(DiscSubpath.Cuesheet, "http://redump.org/disc/1/cue/")]
-        [InlineData(DiscSubpath.Edit, "http://redump.org/disc/1/edit/")]
-        [InlineData(DiscSubpath.GDI, "http://redump.org/disc/1/gdi/")]
-        [InlineData(DiscSubpath.Key, "http://redump.org/disc/1/key/")]
-        [InlineData(DiscSubpath.LSD, "http://redump.org/disc/1/lsd/")]
-        [InlineData(DiscSubpath.MD5, "http://redump.org/disc/1/md5/")]
-        [InlineData(DiscSubpath.SBI, "http://redump.org/disc/1/sbi/")]
-        [InlineData(DiscSubpath.SFV, "http://redump.org/disc/1/sfv/")]
-        [InlineData(DiscSubpath.SHA1, "http://redump.org/disc/1/sha1/")]
-        [InlineData(null, "http://redump.org/disc/1/")]
-        public void BuildDiscUrl_Subpath_Builds(DiscSubpath? subpath, string expected)
-        {
-            string actual = UrlBuilder.BuildDiscUrl(1, subpath);
-            Assert.Equal(expected, actual);
-        }
-
-        #endregion
-
-        #region BuildDiscsUrl
-
-        [Fact]
-        public void BuildDiscsUrl_DumperWithPages_Builds()
-        {
-            string actual = UrlBuilder.BuildDiscsUrl(dumper: "user", page: 3);
-            Assert.Equal("http://redump.org/discs/dumper/user/?page=3", actual);
-        }
-
-        [Fact]
-        public void BuildDiscsUrl_DumperLastModifiedWithPages_Builds()
-        {
-            string actual = UrlBuilder.BuildDiscsUrl(dumper: "user", sort: SortCategory.Modified, sortDir: SortDirection.Descending, page: 3);
-            Assert.Equal("http://redump.org/discs/dumper/user/sort/modified/dir/desc/?page=3", actual);
-        }
-
-        [Fact]
-        public void BuildDiscsUrl_LastModifiedWithPages_Builds()
-        {
-            string actual = UrlBuilder.BuildDiscsUrl(sort: SortCategory.Modified, sortDir: SortDirection.Descending, page: 3);
-            Assert.Equal("http://redump.org/discs/sort/modified/dir/desc/?page=3", actual);
-        }
-
-        [Theory]
-        [InlineData(true, true, true, "http://redump.org/discs/comments/only/")]
-        [InlineData(false, true, true, "http://redump.org/discs/contents/only/")]
-        [InlineData(false, false, true, "http://redump.org/discs/protection/only/")]
-        [InlineData(false, false, false, "http://redump.org/discs/")]
-        public void BuildDiscsUrl_SingleOnlyFilterAllowedAtMost(bool comments, bool contents, bool protection, string expected)
-        {
-            string actual = UrlBuilder.BuildDiscsUrl(comments: comments, contents: contents, protection: protection);
-            Assert.Equal(expected, actual);
-        }
-
-        [Theory]
-        [InlineData("", "http://redump.org/discs/quicksearch//?page=3")]
-        [InlineData("simple", "http://redump.org/discs/quicksearch/simple/?page=3")]
-        [InlineData("search-format", "http://redump.org/discs/quicksearch/search-format/?page=3")]
-        [InlineData("invalid format", "http://redump.org/discs/quicksearch/invalid format/?page=3")]
-        [InlineData("extra/path", "http://redump.org/discs/quicksearch/extra/path/?page=3")]
-        public void BuildDiscsUrl_QuicksearchWithPages_Builds(string query, string expected)
-        {
-            string actual = UrlBuilder.BuildDiscsUrl(quicksearch: query, page: 3);
-            Assert.Equal(expected, actual);
-        }
-
-        // TODO: Implement more extensive tests
-
-        #endregion
-
-        #region BuildDiscsWipUrl
-
-        [Fact]
-        public void BuildDiscsWipUrl_Constant()
-        {
-            string actual = UrlBuilder.BuildDiscsWipUrl();
-            Assert.Equal("http://redump.org/discs-wip/", actual);
-        }
-
-        #endregion
-
-        #region BuildDownloadsUrl
-
-        [Fact]
-        public void BuildDownloadsUrl_Constant()
-        {
-            string actual = UrlBuilder.BuildDownloadsUrl();
-            Assert.Equal("http://redump.org/downloads/", actual);
-        }
-
-        #endregion
-
-        #region BuildListUrl
-
-        [Theory]
-        [InlineData(true, "http://redump.org/list/have/user/arch/")]
-        [InlineData(false, "http://redump.org/list/miss/user/arch/")]
-        [InlineData(null, "http://redump.org/list/user/arch/")]
-        public void BuildListUrl_HaveMissSet(bool? have, string expected)
-        {
-            string actual = UrlBuilder.BuildListUrl("user", have, system: PhysicalSystem.AcornArchimedesAndRiscPC);
-            Assert.Equal(expected, actual);
-        }
-
-        [Fact]
-        public void BuildListUrl_InvalidUsername_Builds()
-        {
-            string actual = UrlBuilder.BuildListUrl(string.Empty, have: true, system: PhysicalSystem.AcornArchimedesAndRiscPC);
-            Assert.Equal("http://redump.org/list/have//arch/", actual);
-        }
-
-        [Theory]
-        [InlineData(PhysicalSystem.MarkerArcadeEnd)]
-        [InlineData(PhysicalSystem.MarkerComputerEnd)]
-        [InlineData(PhysicalSystem.MarkerDiscBasedConsoleEnd)]
-        [InlineData(PhysicalSystem.MarkerOtherEnd)]
-        public void BuildListUrl_InvalidSystem_Builds(PhysicalSystem? system)
-        {
-            string actual = UrlBuilder.BuildListUrl("user", have: true, system: system);
-            Assert.Equal("http://redump.org/list/have/user/", actual);
-        }
-
-        #endregion
-
-        #region BuildMemberPromotionUrl
-
-        [Fact]
-        public void BuildMemberPromotionUrl_Constant()
-        {
-            string actual = UrlBuilder.BuildMemberPromotionUrl();
-            Assert.Equal("http://redump.org/member2dumper/", actual);
-        }
-
-        #endregion
-
-        #region BuildNewDiscUrl
-
-        [Theory]
-        [InlineData(1, 1)]
-        [InlineData(-1, 1)]
-        public void BuildNewDiscUrl_AlwaysPositive(int id, int expected)
-        {
-            string actual = UrlBuilder.BuildNewDiscUrl(id);
-            Assert.Equal($"http://redump.org/newdisc/{expected}/", actual);
-        }
-
-        #endregion
-
-        #region BuildPackUrl
-
-        [Theory]
-        [InlineData(PackType.Cuesheets, "http://redump.org/cues/arch/")]
-        [InlineData(PackType.Datfile, "http://redump.org/datfile/arch/")]
-        [InlineData(PackType.DecryptedKeys, "http://redump.org/dkeys/arch/")]
-        [InlineData(PackType.Gdis, "http://redump.org/gdi/arch/")]
-        [InlineData(PackType.Keys, "http://redump.org/keys/arch/")]
-        [InlineData(PackType.Lsds, "http://redump.org/lsd/arch/")]
-        [InlineData(PackType.Sbis, "http://redump.org/sbi/arch/")]
-        public void BuildPackUrl_ValidPackType_ValidSystem_Builds(PackType packType, string expected)
-        {
-            string actual = UrlBuilder.BuildPackUrl(packType, PhysicalSystem.AcornArchimedesAndRiscPC);
-            Assert.Equal(expected, actual);
-        }
-
-        [Fact]
-        public void BuildPackUrl_InvalidPackType_Throws()
-        {
-            Assert.Throws<ArgumentOutOfRangeException>(() => UrlBuilder.BuildPackUrl((PackType)int.MaxValue, PhysicalSystem.AcornArchimedesAndRiscPC));
-        }
-
-        [Fact]
-        public void BuildPackUrl_InvalidSystem_Builds()
-        {
-            string actual = UrlBuilder.BuildPackUrl(PackType.Datfile, PhysicalSystem.MarkerOtherEnd);
-            Assert.Equal("http://redump.org/datfile//", actual);
-        }
-
-        #endregion
-
-        #region BuildStatisticsUrl
-
-        [Fact]
-        public void BuildStatisticsUrl_Constant()
-        {
-            string actual = UrlBuilder.BuildStatisticsUrl();
-            Assert.Equal("http://redump.org/statistics/", actual);
-        }
-
-        #endregion
-
-    }
-}
diff --git a/SabreTools.RedumpLib.Test/SabreTools.RedumpLib.Test.csproj b/SabreTools.RedumpLib.Test/SabreTools.RedumpLib.Test.csproj
index bfc5038..3b7ff09 100644
--- a/SabreTools.RedumpLib.Test/SabreTools.RedumpLib.Test.csproj
+++ b/SabreTools.RedumpLib.Test/SabreTools.RedumpLib.Test.csproj
@@ -11,7 +11,6 @@
 
     <ItemGroup>
         <ProjectReference Include="..\SabreTools.RedumpLib\SabreTools.RedumpLib.csproj" />
-        <ProjectReference Include="..\SabreTools.RedumpLib.Legacy\SabreTools.RedumpLib.Legacy.csproj" />
     </ItemGroup>
 
     <ItemGroup>