diff --git a/Avalara.AvaTax.RestClient.sln b/Avalara.AvaTax.RestClient.sln
index be14550..5cc2f5c 100644
--- a/Avalara.AvaTax.RestClient.sln
+++ b/Avalara.AvaTax.RestClient.sln
@@ -5,7 +5,7 @@ VisualStudioVersion = 17.10.35004.147
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalara.AvaTax.RestClient", "src\Avalara.AvaTax.RestClient.csproj", "{F0EEC671-76CD-47C3-8671-FA178139B2A9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalara.AvaTax.RestClient.Test", "tests\Avalara.AvaTax.RestClient.Test.csproj", "{88267F39-00E4-4D70-8E76-EA601E43CCA0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalara.AvaTax.RestClient.Tests", "tests\Avalara.AvaTax.RestClient.Tests.csproj", "{88267F39-00E4-4D70-8E76-EA601E43CCA0}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/Avalara.AvaTax.RestClient.csproj b/src/Avalara.AvaTax.RestClient.csproj
index 59b25ca..ef9e425 100644
--- a/src/Avalara.AvaTax.RestClient.csproj
+++ b/src/Avalara.AvaTax.RestClient.csproj
@@ -6,7 +6,9 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>Avalara.AvaTax.RestClient.snk</AssemblyOriginatorKeyFile>
 	</PropertyGroup>
+
 	
+	<!-- .NET Framework 2.0 -->
 	<PropertyGroup Condition="'$(TargetFramework)' == 'net20' AND '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
 		<DefineConstants>NETFRAMEWORK;TRACE;DEBUG;NET20</DefineConstants>
 		<GenerateDocumentationFile>false</GenerateDocumentationFile>
@@ -15,8 +17,9 @@
 		<DefineConstants>NETFRAMEWORK;TRACE;RELEASE;NET20</DefineConstants>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	</PropertyGroup>
-	
-	
+
+
+	<!-- .NET Framework 4.5 -->
 	<PropertyGroup Condition="'$(TargetFramework)' == 'net45' AND '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
 		<DefineConstants>NETFRAMEWORK;TRACE;DEBUG;PORTABLE;NET45</DefineConstants>
 		<GenerateDocumentationFile>false</GenerateDocumentationFile>
@@ -25,8 +28,9 @@
 		<DefineConstants>NETFRAMEWORK;TRACE;RELEASE;PORTABLE;NET45</DefineConstants>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	</PropertyGroup>
+
 	
-	
+	<!-- .NET Framework 4.6.1 -->
 	<PropertyGroup Condition="'$(TargetFramework)' == 'net461' AND '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
 		<DefineConstants>NETFRAMEWORK;TRACE;DEBUG;PORTABLE;NET461</DefineConstants>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -35,108 +39,85 @@
 		<DefineConstants>NETFRAMEWORK;TRACE;RELEASE;PORTABLE;NET461</DefineConstants>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	</PropertyGroup>
+
 	
-	
+	<!-- .NET Framework 4.7.2 -->
 	<PropertyGroup Condition="'$(TargetFramework)' == 'net472' AND '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
 		<DefineConstants>NETFRAMEWORK;TRACE;DEBUG;PORTABLE;NET472</DefineConstants>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	</PropertyGroup>
-	
 	<PropertyGroup Condition="'$(TargetFramework)' == 'net472' AND '$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
 		<DefineConstants>NETFRAMEWORK;TRACE;RELEASE;PORTABLE;NET472</DefineConstants>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	</PropertyGroup>
-	
+
+
+	<!-- .NET Standard 1.6 -->
 	<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.6' AND '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
 		<DefineConstants>TRACE;DEBUG;PORTABLE;NETSTANDARD1_6</DefineConstants>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	</PropertyGroup>
-	
 	<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.6' AND '$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
 		<DefineConstants>TRACE;RELEASE;PORTABLE;NETSTANDARD1_6</DefineConstants>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	</PropertyGroup>
+
 	
+	<!-- .NET Standard 2.0 -->
 	<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0' AND '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
 		<DefineConstants>TRACE;DEBUG;PORTABLE;NETSTANDARD2_0</DefineConstants>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	</PropertyGroup>
-	
 	<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0' AND '$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
 		<DefineConstants>TRACE;RELEASE;PORTABLE;NETSTANDARD2_0</DefineConstants>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	</PropertyGroup>
-	
+
+
+	<!-- .NET 6.0 -->
 	<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0' AND '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
 		<DefineConstants>TRACE;DEBUG;PORTABLE;NET6_0</DefineConstants>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	</PropertyGroup>
-	
 	<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0' AND '$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
 		<DefineConstants>TRACE;RELEASE;PORTABLE;NET6_0</DefineConstants>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	</PropertyGroup>
-	
+
+
+	<!-- .NET 8.0 -->
 	<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0' AND '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
 		<DefineConstants>TRACE;DEBUG;PORTABLE;NET8_0</DefineConstants>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	</PropertyGroup>
-	
 	<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0' AND '$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
 		<DefineConstants>TRACE;RELEASE;PORTABLE;NET8_0</DefineConstants>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	</PropertyGroup>
-
-
+	
+	
 	<ItemGroup>
 		<None Remove="**" />
 		<Folder Include="enums" />
-		<Folder Include="models" />		
-	</ItemGroup>
-	<ItemGroup Condition="'$(TargetFramework)' == 'net20'">
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<Compile Include="..\GlobalAssemblyInfo.cs">
-			<Link>Properties\GlobalAssemblyInfo.cs</Link>
-		</Compile>
-	</ItemGroup>
-	<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<Reference Include="System.Net.Http" />
-		<Compile Include="..\GlobalAssemblyInfo.cs">
-			<Link>Properties\GlobalAssemblyInfo.cs</Link>
-		</Compile>
-	</ItemGroup>
-	<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<Reference Include="System.Net.Http" />
-		<Compile Include="..\GlobalAssemblyInfo.cs">
-			<Link>Properties\GlobalAssemblyInfo.cs</Link>
-		</Compile>
-	</ItemGroup>
-	<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
+		<Folder Include="models" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="System.Net.Http" Version="4.3.4" />
-		<Compile Include="..\GlobalAssemblyInfo.cs">
-			<Link>Properties\GlobalAssemblyInfo.cs</Link>
-		</Compile>
 	</ItemGroup>
-	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.6'">
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="System.Net.Http" Version="4.3.4" />
-	</ItemGroup>
-	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="System.Net.Http" Version="4.3.4" />
-	</ItemGroup>
-	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="System.Net.Http" Version="4.3.4" />
-	</ItemGroup>
-	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="System.Net.Http" Version="4.3.4" />
-	</ItemGroup>
-	<ItemGroup>
-    
-  </ItemGroup>
+	
+	
+	<!-- .NET Framework 2.0 doesn't have a System.Net.Http package, so it can't be included-->
+	<Choose>
+		<When Condition="'$(TargetFramework)' == 'net20'">
+			<ItemGroup>
+				<Compile Include="..\GlobalAssemblyInfo.cs">
+					<Link>Properties\GlobalAssemblyInfo.cs</Link>
+				</Compile>
+			</ItemGroup>
+		</When>
+		<Otherwise>
+			<ItemGroup>
+				<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+				<PackageReference Include="System.Net.Http" Version="4.3.4" />
+			</ItemGroup>
+		</Otherwise>
+	</Choose>
 </Project>
diff --git a/tests/Avalara.AvaTax.RestClient.Test.csproj b/tests/Avalara.AvaTax.RestClient.Test.csproj
index 23a2e48..3f0176b 100644
--- a/tests/Avalara.AvaTax.RestClient.Test.csproj
+++ b/tests/Avalara.AvaTax.RestClient.Test.csproj
@@ -3,109 +3,74 @@
 		<TargetFrameworks>net451;net45;net461;net472;netcoreapp2.2.8;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(TargetFramework)' == 'net451'">
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(TargetFramework)' == 'net472'">
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.2'">
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
-	</PropertyGroup>
+	
 	<ItemGroup>
-		<Compile Remove="**\*.*" />
-		<None Remove="**" />
-	</ItemGroup>
-	<ItemGroup Condition="'$(TargetFramework)' == 'net451'">
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="Nunit" Version="3.13.3" />
 		<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-		<Reference Include="System.Net.Http" />
+		<PackageReference Include="System.Net.Http" Version="4.3.4" />
+	</ItemGroup>
+
+
+	<!-- .NET Framework 4.5.1 -->
+	<ItemGroup Condition="'$(TargetFramework)' == 'net451'">
 		<Compile Include="net20\*.cs" />
 		<ProjectReference Include="..\src\Avalara.AvaTax.RestClient.csproj">
 		  <SetTargetFramework>TargetFramework=net20</SetTargetFramework>
 		</ProjectReference>
 	</ItemGroup>
+
+	<!-- .NET Framework 4.5 -->
 	<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="Nunit" Version="3.13.3" />
-		<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
-		<Reference Include="System.Net.Http" />
 		<Compile Include="net45\*.cs" />
 		<ProjectReference Include="..\src\Avalara.AvaTax.RestClient.csproj">
 		  <SetTargetFramework>TargetFramework=net45</SetTargetFramework>
 		</ProjectReference>
 	</ItemGroup>
+
+	<!-- .NET Framework 4.6.1 -->
 	<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="Nunit" Version="3.13.3" />
-		<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
-		<Reference Include="System.Net.Http" />
 		<Compile Include="net461\*.cs" />
 		<ProjectReference Include="..\src\Avalara.AvaTax.RestClient.csproj">
 		  <SetTargetFramework>TargetFramework=net461</SetTargetFramework>
 		</ProjectReference>
 	</ItemGroup>
+	
+	<!-- .NET Framework 4.7.2 -->
 	<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="System.Net.Http" Version="4.3.4" />
-		<PackageReference Include="Nunit" Version="3.13.3" />
-		<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
 		<Compile Include="net472\*.cs" />
 		<ProjectReference Include="..\src\Avalara.AvaTax.RestClient.csproj">
 		  <SetTargetFramework>TargetFramework=net472</SetTargetFramework>
 		</ProjectReference>
 	</ItemGroup>
+
+	<!-- .NET Core 2.2.8 -->
 	<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.2.8'">
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="NUnit" Version="3.12.0" />
-		<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
-		<PackageReference Include="System.Net.Http" Version="4.3.4" />
 		<Compile Include="netstandard\*.cs" />
 		<ProjectReference Include="..\src\Avalara.AvaTax.RestClient.csproj">
 		  <SetTargetFramework>TargetFramework=netstandard1.6</SetTargetFramework>
 		</ProjectReference>
 	</ItemGroup>
+
+	<!-- .NET Core 3.1 -->
 	<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="Nunit" Version="3.13.3" />
-		<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
-		<PackageReference Include="System.Net.Http" Version="4.3.4" />
 		<Compile Include="netstandard20\*.cs" />
 		<ProjectReference Include="..\src\Avalara.AvaTax.RestClient.csproj">
 		  <SetTargetFramework>TargetFramework=netstandard2.0</SetTargetFramework>
 		</ProjectReference>
 	</ItemGroup>
+
+	<!-- .NET 6.0 -->
 	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="Nunit" Version="3.13.3" />
-		<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
-		<PackageReference Include="System.Net.Http" Version="4.3.4" />
 		<Compile Include="net6.0\*.cs" />
 		<ProjectReference Include="..\src\Avalara.AvaTax.RestClient.csproj">
 		  <SetTargetFramework>TargetFramework=net6.0</SetTargetFramework>
 		</ProjectReference>
 	</ItemGroup>
+
+	<!-- .NET 8.0 -->
 	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="Nunit" Version="3.13.3" />
-		<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
-		<PackageReference Include="System.Net.Http" Version="4.3.4" />
 		<Compile Include="net6.0\*.cs" />
 		<ProjectReference Include="..\src\Avalara.AvaTax.RestClient.csproj">
 		  <SetTargetFramework>TargetFramework=net6.0</SetTargetFramework>