2 files changed, 28 insertions, 8 deletions
diff --git a/SendGrid/Tests/Transport/TestREST.cs b/SendGrid/Tests/Transport/TestREST.cs
index ccbab48..15c31ed 100755
--- a/SendGrid/Tests/Transport/TestREST.cs
+++ b/SendGrid/Tests/Transport/TestREST.cs
@@ -1,8 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net;
 using System.Text;
+using Moq;
 using NUnit.Framework;
+using SendGridMail;
+using SendGridMail.Transport;
 
 namespace Tests.Transport
 {
@@ -10,15 +14,31 @@ namespace Tests.Transport
     class TestREST
     {
         [Test]
-        public void TestDeliver()
+        public void TestFetchFileBodies()
         {
-            
+            var test = REST.GetInstance(new NetworkCredential("foo", "bar"));
+            var message = new Mock<ISendGrid>();
+            message.SetupProperty(foo => foo.Attachments, null);
+            var result = test.FetchFileBodies(message.Object);
+            Assert.AreEqual(0, result.Count);
+
+            message.SetupProperty(foo => foo.Attachments, new string[] {"foo", "bar", "raz"});
+            result = test.FetchFileBodies(message.Object);
+            Assert.AreEqual(3, result.Count);
+        }
+
+        [Test]
+        public void TestFetchFormParams()
+        {
+            var bar = REST.GetInstance(new NetworkCredential("foo", "bar"));
+            //bar.FetchFormParams();
         }
 
         [Test]
-        public void TestConstructor()
+        public void TestInitializeTransport()
         {
-            
+            var bar = REST.GetInstance(new NetworkCredential("foo", "bar"));
+            //bar.InitializeTransport();
         }
     }
 }
diff --git a/SendGrid/Tests/Transport/TestSMTP.cs b/SendGrid/Tests/Transport/TestSMTP.cs
index e0e4fe5..3c17008 100755
--- a/SendGrid/Tests/Transport/TestSMTP.cs
+++ b/SendGrid/Tests/Transport/TestSMTP.cs
@@ -23,7 +23,7 @@ namespace Tests.Transport
             mockClient.Setup(foo => foo.Send(mime));
             var client = mockClient.Object;
             var credentials = new NetworkCredential("username", "password");
-            var test = SMTP.GenerateInstance(client, credentials);
+            var test = SMTP.GetInstance(client, credentials);
             test.Deliver(message);
 
             mockClient.Verify(foo => foo.Send(mime), Times.Once());
@@ -38,14 +38,14 @@ namespace Tests.Transport
             mock.SetupProperty(foo => foo.EnableSsl);
             var client = mock.Object;
             var credentials = new NetworkCredential("username", "password");
-            var test = SMTP.GenerateInstance(client, credentials);
+            var test = SMTP.GetInstance(client, credentials);
             mock.Verify(foo => foo.EnableSsl, Times.Never());
 
             mock = new Mock<SMTP.ISmtpClient>();
             mock.SetupProperty(foo => foo.EnableSsl);
             client = mock.Object;
             credentials = new NetworkCredential("username", "password");
-            test = SMTP.GenerateInstance(client, credentials, port:SMTP.SslPort);
+            test = SMTP.GetInstance(client, credentials, port:SMTP.SslPort);
             mock.VerifySet(foo => foo.EnableSsl = true);
 
             mock = new Mock<SMTP.ISmtpClient>();
@@ -54,7 +54,7 @@ namespace Tests.Transport
             credentials = new NetworkCredential("username", "password");
             try
             {
-                test = SMTP.GenerateInstance(client, credentials, port: SMTP.TlsPort);
+                test = SMTP.GetInstance(client, credentials, port: SMTP.TlsPort);
                 Assert.Fail("should have thrown an unsupported port exception");
             }
             catch (NotSupportedException ex)