4 files changed, 35 insertions, 40 deletions
diff --git a/SendGrid/Tests/TestSendgrid.cs b/SendGrid/Tests/TestSendgrid.cs
index 29b3c7f..0c2a5ec 100644
--- a/SendGrid/Tests/TestSendgrid.cs
+++ b/SendGrid/Tests/TestSendgrid.cs
@@ -3,8 +3,8 @@ using System.Collections.Generic;
 using System.IO;
 using System.Net.Mail;
 using NUnit.Framework;
-using SendGridMail;
-using Smtpapi;
+using SendGrid.SmtpApi;
+using SendGrid;
 
 namespace Tests
 {
@@ -14,7 +14,7 @@ namespace Tests
 		[Test]
 		public void CreateMimeMessage()
 		{
-			var message = new SendGrid();
+			var message = new SendGridMessage();
 			var attachment = Path.GetTempFileName();
 			var text = "this is a test";
 			var html = "<b>This<\b> is a better test";
@@ -52,7 +52,7 @@ namespace Tests
 		public void DisableBcc()
 		{
 			var header = new Header();
-			var sendgrid = new SendGrid(header);
+			var sendgrid = new SendGridMessage(header);
 
 			sendgrid.DisableBcc();
 
@@ -64,7 +64,7 @@ namespace Tests
 		public void DisableBypassListManagement()
 		{
 			var header = new Header();
-			var sendgrid = new SendGrid(header);
+			var sendgrid = new SendGridMessage(header);
 
 			sendgrid.DisableBypassListManagement();
 
@@ -76,7 +76,7 @@ namespace Tests
 		public void DisableClickTracking()
 		{
 			var header = new Header();
-			var sendgrid = new SendGrid(header);
+			var sendgrid = new SendGridMessage(header);
 
 			sendgrid.DisableClickTracking();
 
@@ -88,7 +88,7 @@ namespace Tests
 		public void DisableFooter()
 		{
 			var header = new Header();
-			var sendgrid = new SendGrid(header);
+			var sendgrid = new SendGridMessage(header);
 
 			sendgrid.DisableFooter();
 
@@ -100,7 +100,7 @@ namespace Tests
 		public void DisableGoogleAnalytics()
 		{
 			var header = new Header();
-			var sendgrid = new SendGrid(header);
+			var sendgrid = new SendGridMessage(header);
 
 			sendgrid.DisableGoogleAnalytics();
 
@@ -112,7 +112,7 @@ namespace Tests
 		public void DisableSpamCheck()
 		{
 			var header = new Header();
-			var sendgrid = new SendGrid(header);
+			var sendgrid = new SendGridMessage(header);
 
 			sendgrid.DisableSpamCheck();
 
@@ -124,7 +124,7 @@ namespace Tests
 		public void DisableTemplate()
 		{
 			var header = new Header();
-			var sendgrid = new SendGrid(header);
+			var sendgrid = new SendGridMessage(header);
 
 			sendgrid.DisableTemplate();
 
@@ -136,7 +136,7 @@ namespace Tests
 		public void DisableUnsubscribe()
 		{
 			var header = new Header();
-			var sendgrid = new SendGrid(header);
+			var sendgrid = new SendGridMessage(header);
 
 			sendgrid.DisableUnsubscribe();
 
@@ -148,7 +148,7 @@ namespace Tests
 		public void EnableBcc()
 		{
 			var header = new Header();
-			var sendgrid = new SendGrid(header);
+			var sendgrid = new SendGridMessage(header);
 
 			var email = "somebody@someplace.com";
 			sendgrid.EnableBcc(email);
@@ -162,7 +162,7 @@ namespace Tests
 		public void EnableBypassListManagement()
 		{
 			var header = new Header();
-			var sendgrid = new SendGrid(header);
+			var sendgrid = new SendGridMessage(header);
 
 			sendgrid.EnableBypassListManagement();
 
@@ -174,7 +174,7 @@ namespace Tests
 		public void EnableClickTracking()
 		{
 			var header = new Header();
-			var sendgrid = new SendGrid(header);
+			var sendgrid = new SendGridMessage(header);
 			sendgrid.EnableClickTracking(true);
 
 			var json = header.JsonString();
@@ -186,7 +186,7 @@ namespace Tests
 		public void EnableFooter()
 		{
 			var header = new Header();
-			var sendgrid = new SendGrid(header);
+			var sendgrid = new SendGridMessage(header);
 
 			var text = "My Text";
 			var html = "<body><p>hello, <% name %></p></body>";
@@ -204,7 +204,7 @@ namespace Tests
 		public void EnableGoogleAnalytics()
 		{
 			var header = new Header();
-			var sendgrid = new SendGrid(header);
+			var sendgrid = new SendGridMessage(header);
 
 			var source = "SomeDomain.com";
 			var medium = "Email";
@@ -230,7 +230,7 @@ namespace Tests
 		public void EnableGravatar()
 		{
 			var header = new Header();
-			var sendgrid = new SendGrid(header);
+			var sendgrid = new SendGridMessage(header);
 
 			sendgrid.EnableGravatar();
 
@@ -242,7 +242,7 @@ namespace Tests
 		public void EnableOpenTracking()
 		{
 			var header = new Header();
-			var sendgrid = new SendGrid(header);
+			var sendgrid = new SendGridMessage(header);
 
 			sendgrid.EnableOpenTracking();
 
@@ -254,7 +254,7 @@ namespace Tests
 		public void EnableSpamCheck()
 		{
 			var header = new Header();
-			var sendgrid = new SendGrid(header);
+			var sendgrid = new SendGridMessage(header);
 
 			var score = 5;
 			var url = "http://www.example.com";
@@ -270,7 +270,7 @@ namespace Tests
 		public void EnableTemplate()
 		{
 			var header = new Header();
-			var sendgrid = new SendGrid(header);
+			var sendgrid = new SendGridMessage(header);
 			var html = "<% hadhdhd %>";
 
 			var escHtml = "<% hadhdhd %>";
@@ -288,7 +288,7 @@ namespace Tests
 		public void EnableUnsubscribe()
 		{
 			var header = new Header();
-			var sendgrid = new SendGrid(header);
+			var sendgrid = new SendGridMessage(header);
 
 			var text = "<% %>";
 			var html = "<% name %>";
@@ -303,7 +303,7 @@ namespace Tests
 			                jsonText + "," + jsonHtml + "}}}}", json);
 
 			header = new Header();
-			sendgrid = new SendGrid(header);
+			sendgrid = new SendGridMessage(header);
 
 			var replace = "John";
 			var jsonReplace = "\"replace\" : \"" + replace + "\"";
@@ -327,7 +327,7 @@ namespace Tests
 		public void TestDisableGravatar()
 		{
 			var header = new Header();
-			var sendgrid = new SendGrid(header);
+			var sendgrid = new SendGridMessage(header);
 
 			sendgrid.DisableGravatar();
 
@@ -339,7 +339,7 @@ namespace Tests
 		public void TestDisableOpenTracking()
 		{
 			var header = new Header();
-			var sendgrid = new SendGrid(header);
+			var sendgrid = new SendGridMessage(header);
 
 			sendgrid.DisableOpenTracking();
 
diff --git a/SendGrid/Tests/Tests.csproj b/SendGrid/Tests/Tests.csproj
index 5d52226..40872f4 100644
--- a/SendGrid/Tests/Tests.csproj
+++ b/SendGrid/Tests/Tests.csproj
@@ -57,8 +57,8 @@
     <Reference Include="pnunit.framework">
       <HintPath>..\packages\NUnit.2.5.10.11092\lib\pnunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="Smtpapi">
-      <HintPath>..\packages\smtpapi.1.0.0\lib\Smtpapi.dll</HintPath>
+    <Reference Include="SendGrid.SmtpApi">
+      <HintPath>..\packages\SendGrid.SmtpApi.1.1.3\lib\net40\SendGrid.SmtpApi.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -98,6 +98,7 @@
     <Compile Include="Transport\TestWebApi.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>
diff --git a/SendGrid/Tests/Transport/TestWebApi.cs b/SendGrid/Tests/Transport/TestWebApi.cs
index 71df619..39aa992 100644
--- a/SendGrid/Tests/Transport/TestWebApi.cs
+++ b/SendGrid/Tests/Transport/TestWebApi.cs
@@ -5,7 +5,7 @@ using System.Net;
 using System.Net.Mail;
 using Moq;
 using NUnit.Framework;
-using SendGridMail;
+using SendGrid;
 
 namespace Tests.Transport
 {
@@ -37,8 +37,6 @@ namespace Tests.Transport
 		{
 			// Test Variables
 			const string toAddress = "foobar@outlook.com";
-			const string ccAddress = "foo@outlook.com";
-			const string bccAddress = "bar@outlook.com";
 			const string fromAddress = "test@outlook.com";
 			const string subject = "Test Subject";
 			const string textBody = "Test Text Body";
@@ -47,10 +45,8 @@ namespace Tests.Transport
 			var testHeader = new Dictionary<string, string> { { headerKey, "headervalue" } };
 			const string categoryName = "Example Category";
 
-			var message = new SendGrid();
+			var message = new SendGridMessage();
 			message.AddTo(toAddress);
-			message.AddCc(ccAddress);
-			message.AddBcc(bccAddress);
 			message.From = new MailAddress(fromAddress);
 			message.Subject = subject;
 			message.Text = textBody;
@@ -63,8 +59,6 @@ namespace Tests.Transport
 			Assert.True(result.Any(r => r.Key == "api_user" && r.Value == TestUsername));
 			Assert.True(result.Any(r => r.Key == "api_key" && r.Value == TestPassword));
 			Assert.True(result.Any(r => r.Key == "to[]" && r.Value == toAddress));
-			Assert.True(result.Any(r => r.Key == "cc[]" && r.Value == ccAddress));
-			Assert.True(result.Any(r => r.Key == "bcc[]" && r.Value == bccAddress));
 			Assert.True(result.Any(r => r.Key == "from" && r.Value == fromAddress));
 			Assert.True(result.Any(r => r.Key == "subject" && r.Value == subject));
 			Assert.True(result.Any(r => r.Key == "text" && r.Value == textBody));
diff --git a/SendGrid/Tests/packages.config b/SendGrid/Tests/packages.config
index 4030718..08ac66b 100644
--- a/SendGrid/Tests/packages.config
+++ b/SendGrid/Tests/packages.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <packages>
-	<package id="Microsoft.Bcl" version="1.1.6" targetFramework="net40" />
-	<package id="Microsoft.Bcl.Async" version="1.0.165" targetFramework="net40" />
-	<package id="Microsoft.Bcl.Build" version="1.0.13" targetFramework="net40" />
-	<package id="Microsoft.Net.Http" version="2.2.18" targetFramework="net40" />
-	<package id="NUnit" version="2.5.10.11092" />
-	<package id="smtpapi" version="1.0.0" targetFramework="net40" />
+  <package id="Microsoft.Bcl" version="1.1.6" targetFramework="net40" />
+  <package id="Microsoft.Bcl.Async" version="1.0.165" targetFramework="net40" />
+  <package id="Microsoft.Bcl.Build" version="1.0.13" targetFramework="net40" />
+  <package id="Microsoft.Net.Http" version="2.2.18" targetFramework="net40" />
+  <package id="NUnit" version="2.5.10.11092" />
+  <package id="SendGrid.SmtpApi" version="1.1.3" targetFramework="net40" />
 </packages>
 \ No newline at end of file