diff --git a/GitVersionConfig.yaml b/GitVersionConfig.yaml
index 3156c744..95673f6f 100644
--- a/GitVersionConfig.yaml
+++ b/GitVersionConfig.yaml
@@ -1,4 +1,4 @@
-next-version: 2.0
+next-version: 2.1
 branches:
   feature[/-]:
     mode: ContinuousDeployment
diff --git a/src/app/SharpRaven.Nancy/SharpRaven.Nancy.csproj b/src/app/SharpRaven.Nancy/SharpRaven.Nancy.csproj
index 069242e2..1e965520 100644
--- a/src/app/SharpRaven.Nancy/SharpRaven.Nancy.csproj
+++ b/src/app/SharpRaven.Nancy/SharpRaven.Nancy.csproj
@@ -13,7 +13,7 @@
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>05c78a3e</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>ec5b9b6c</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug 4.0|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -102,11 +102,11 @@
     <None Include="SharpRaven.Nancy.nuspec" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\packages\GitVersionTask.3.3.0\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets" Condition="Exists('..\..\packages\GitVersionTask.3.3.0\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets') And '$(OS)' != 'Unix'" />
+  <Import Project="..\..\packages\GitVersionTask.3.4.1\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets" Condition="Exists('..\..\packages\GitVersionTask.3.4.1\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets') And '$(OS)' != 'Unix'" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\GitVersionTask.3.3.0\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\GitVersionTask.3.3.0\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets'))" />
+    <Error Condition="!Exists('..\..\packages\GitVersionTask.3.4.1\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\GitVersionTask.3.4.1\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/src/app/SharpRaven.Nancy/packages.config b/src/app/SharpRaven.Nancy/packages.config
index adf4268e..9019375f 100644
--- a/src/app/SharpRaven.Nancy/packages.config
+++ b/src/app/SharpRaven.Nancy/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="GitVersionTask" version="3.3.0" targetFramework="net45" developmentDependency="true" />
+  <package id="GitVersionTask" version="3.4.1" targetFramework="net45" developmentDependency="true" />
   <package id="Nancy" version="1.4.3" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/src/app/SharpRaven/Data/ExceptionData.cs b/src/app/SharpRaven/Data/ExceptionData.cs
index 309ee18e..687f8319 100644
--- a/src/app/SharpRaven/Data/ExceptionData.cs
+++ b/src/app/SharpRaven/Data/ExceptionData.cs
@@ -70,6 +70,12 @@ public ExceptionData(Exception exception)
                 return;
 
             var exceptionData = new ExceptionData(exception.InnerException);
+
+            if (exceptionData.Count == 0)
+            {
+                return;
+            }
+
             exceptionData.AddTo(this);
         }
 
diff --git a/src/app/SharpRaven/Data/IJsonPacketFactory.cs b/src/app/SharpRaven/Data/IJsonPacketFactory.cs
index ead5e2a7..647a40c6 100644
--- a/src/app/SharpRaven/Data/IJsonPacketFactory.cs
+++ b/src/app/SharpRaven/Data/IJsonPacketFactory.cs
@@ -53,6 +53,7 @@ public interface IJsonPacketFactory
         /// <returns>
         /// A new instance of <see cref="JsonPacket" /> for the specified <paramref name="project" />.
         /// </returns>
+        [Obsolete("Use Create(string, SentryEvent) instead.")]
         JsonPacket Create(string project,
                           SentryMessage message,
                           ErrorLevel level = ErrorLevel.Info,
@@ -76,6 +77,7 @@ JsonPacket Create(string project,
         /// A new instance of <see cref="JsonPacket" /> for the specified
         /// <paramref name="project" />, with the given <paramref name="exception" />.
         /// </returns>
+        [Obsolete("Use Create(string, SentryEvent) instead.")]
         JsonPacket Create(string project,
                           Exception exception,
                           SentryMessage message = null,
diff --git a/src/app/SharpRaven/Data/JsonPacket.cs b/src/app/SharpRaven/Data/JsonPacket.cs
index 94bbc090..28ca31a7 100644
--- a/src/app/SharpRaven/Data/JsonPacket.cs
+++ b/src/app/SharpRaven/Data/JsonPacket.cs
@@ -30,9 +30,11 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Reflection;
 
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 using SharpRaven.Serialization;
 using SharpRaven.Utilities;
@@ -72,10 +74,64 @@ public JsonPacket(string project, SentryEvent @event)
                 Initialize(@event.Exception);
 
             Message = @event.Message != null ? @event.Message.ToString() : null;
+            Level = @event.Level;
+            Extra = Merge(@event);
+            Tags = @event.Tags;
+            Fingerprint = @event.Fingerprint.ToArray();
             MessageObject = @event.Message;
         }
 
 
+        private static object Merge(SentryEvent @event)
+        {
+            var exception = @event.Exception;
+            var extra = @event.Extra;
+
+            if (exception == null && extra == null)
+                return null;
+
+            if (extra != null && exception == null)
+                return extra;
+
+            var exceptionData = new ExceptionData(exception);
+
+            if (extra == null)
+                return exceptionData;
+
+            JObject result;
+
+            if (extra.GetType().IsArray)
+            {
+                result = new JObject();
+                var array = JArray.FromObject(extra);
+
+                foreach (var o in array)
+                {
+                    var jo = o as JObject;
+                    JProperty[] properties;
+
+                    if (jo == null || (properties = jo.Properties().ToArray()).Length != 2 || properties[0].Name != "Key"
+                        || properties[1].Name != "Value")
+                    {
+                        result.Merge(o);
+                        continue;
+                    }
+
+                    var key = properties[0].Value.ToString();
+                    var value = properties[1].Value;
+                    result.Add(key, value);
+                }
+            }
+            else
+                result = JObject.FromObject(extra);
+
+            var jExceptionData = JObject.FromObject(exceptionData);
+            result.Merge(jExceptionData);
+
+            return result;
+        }
+
+
         /// <summary>
         /// Initializes a new instance of the <see cref="JsonPacket"/> class.
         /// </summary>
diff --git a/src/app/SharpRaven/Data/JsonPacketFactory.cs b/src/app/SharpRaven/Data/JsonPacketFactory.cs
index 95e1e3c0..042457a4 100644
--- a/src/app/SharpRaven/Data/JsonPacketFactory.cs
+++ b/src/app/SharpRaven/Data/JsonPacketFactory.cs
@@ -32,8 +32,6 @@
 using System.Collections.Generic;
 using System.Linq;
 
-using Newtonsoft.Json.Linq;
-
 namespace SharpRaven.Data
 {
     /// <summary>
@@ -56,6 +54,7 @@ public class JsonPacketFactory : IJsonPacketFactory
         /// <returns>
         /// A new instance of <see cref="JsonPacket" /> for the specified <paramref name="project" />.
         /// </returns>
+        [Obsolete("Use Create(string, SentryEvent) instead.")]
         public JsonPacket Create(string project,
                                  SentryMessage message,
                                  ErrorLevel level = ErrorLevel.Info,
@@ -63,17 +62,15 @@ public JsonPacket Create(string project,
                                  string[] fingerprint = null,
                                  object extra = null)
         {
-            var json = new JsonPacket(project)
+            var @event = new SentryEvent(message)
             {
-                Message = message != null ? message.ToString() : null,
-                MessageObject = message,
                 Level = level,
+                Extra = extra,
                 Tags = tags,
-                Fingerprint = fingerprint,
-                Extra = Merge(extra)
+                Fingerprint = fingerprint
             };
 
-            return OnCreate(json);
+            return Create(project, @event);
         }
 
 
@@ -98,6 +95,7 @@ public JsonPacket Create(string project,
         /// given
         /// <paramref name="exception" />.
         /// </returns>
+        [Obsolete("Use Create(string, SentryEvent) instead.")]
         public JsonPacket Create(string project,
                                  Exception exception,
                                  SentryMessage message = null,
@@ -106,17 +104,16 @@ public JsonPacket Create(string project,
                                  string[] fingerprint = null,
                                  object extra = null)
         {
-            var json = new JsonPacket(project, exception)
+            var @event = new SentryEvent(exception)
             {
-                Message = message != null ? message.ToString() : exception.Message,
-                MessageObject = message,
+                Message = message,
                 Level = level,
+                Extra = extra,
                 Tags = tags,
                 Fingerprint = fingerprint,
-                Extra = Merge(extra, exception)
             };
 
-            return OnCreate(json);
+            return Create(project, @event);
         }
 
 
@@ -149,52 +146,5 @@ protected virtual JsonPacket OnCreate(JsonPacket jsonPacket)
         {
             return jsonPacket;
         }
-
-
-        private static object Merge(object extra, Exception exception = null)
-        {
-            if (exception == null && extra == null)
-                return null;
-
-            if (extra != null && exception == null)
-                return extra;
-
-            var exceptionData = new ExceptionData(exception);
-
-            if (extra == null)
-                return exceptionData;
-
-            JObject result;
-
-            if (extra.GetType().IsArray)
-            {
-                result = new JObject();
-                var array = JArray.FromObject(extra);
-
-                foreach (var o in array)
-                {
-                    var jo = o as JObject;
-                    JProperty[] properties;
-
-                    if (jo == null || (properties = jo.Properties().ToArray()).Length != 2 || properties[0].Name != "Key"
-                        || properties[1].Name != "Value")
-                    {
-                        result.Merge(o);
-                        continue;
-                    }
-
-                    var key = properties[0].Value.ToString();
-                    var value = properties[1].Value;
-                    result.Add(key, value);
-                }
-            }
-            else
-                result = JObject.FromObject(extra);
-
-            var jExceptionData = JObject.FromObject(exceptionData);
-            result.Merge(jExceptionData);
-
-            return result;
-        }
     }
 }
\ No newline at end of file
diff --git a/src/app/SharpRaven/Data/SentryEvent.cs b/src/app/SharpRaven/Data/SentryEvent.cs
index c63ae4d0..542a593c 100644
--- a/src/app/SharpRaven/Data/SentryEvent.cs
+++ b/src/app/SharpRaven/Data/SentryEvent.cs
@@ -39,8 +39,9 @@ namespace SharpRaven.Data
     public class SentryEvent
     {
         private readonly Exception exception;
-        private readonly IList<string> fingerprint;
-        private readonly IDictionary<string, string> tags;
+        private IList<string> fingerprint;
+        private SentryMessage message;
+        private IDictionary<string, string> tags;
 
 
         /// <summary>Initializes a new instance of the <see cref="SentryEvent" /> class.</summary>
@@ -65,8 +66,8 @@ public SentryEvent(SentryMessage message)
         /// <summary>Prevents a default instance of the <see cref="SentryEvent"/> class from being created.</summary>
         private SentryEvent()
         {
-            this.tags = new Dictionary<string, string>();
-            this.fingerprint = new List<string>();
+            Tags = new Dictionary<string, string>();
+            Fingerprint = new List<string>();
         }
 
 
@@ -92,6 +93,7 @@ public Exception Exception
         public IList<string> Fingerprint
         {
             get { return this.fingerprint; }
+            internal set { this.fingerprint = value ?? new List<string>(); }
         }
 
         /// <summary>
@@ -108,7 +110,11 @@ public IList<string> Fingerprint
         /// <value>
         /// The optional message to capture instead of the default <see cref="T:Exception.Message" />.
         /// </value>
-        public SentryMessage Message { get; set; }
+        public SentryMessage Message
+        {
+            get { return this.message ?? (Exception != null ? Exception.Message : null); }
+            set { this.message = value; }
+        }
 
         /// <summary>Gets the tags to annotate the captured <see name="Exception" /> or <see cref="Message" /> with.</summary>
         /// <value>
@@ -117,6 +123,7 @@ public IList<string> Fingerprint
         public IDictionary<string, string> Tags
         {
             get { return this.tags; }
+            internal set { this.tags = value ?? new Dictionary<string, string>(); }
         }
     }
 }
\ No newline at end of file
diff --git a/src/app/SharpRaven/Data/SentryRequestFactory.cs b/src/app/SharpRaven/Data/SentryRequestFactory.cs
index 76ded509..f46fdc04 100644
--- a/src/app/SharpRaven/Data/SentryRequestFactory.cs
+++ b/src/app/SharpRaven/Data/SentryRequestFactory.cs
@@ -31,6 +31,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.ComponentModel;
 using System.Linq;
 using System.Reflection;
 
@@ -50,6 +51,9 @@ internal static bool HasHttpContext
             get { return HttpContext != null; }
         }
 
+        [JsonIgnore]
+        internal static bool CheckedForHttpContext { get; set; }
+
         /// <summary>
         /// Gets or sets the HTTP context.
         /// </summary>
@@ -59,6 +63,20 @@ internal static bool HasHttpContext
         internal static dynamic HttpContext { get; set; }
 
 
+        /// <summary>
+        /// Gets or sets the CurrentHttpContextProperty
+        /// </summary>
+        /// <value>
+        /// The current httpcontext property
+        /// </value>
+        internal static dynamic CurrentHttpContextProperty { get; set; }
+
+        [JsonIgnore]
+        internal static bool HasCurrentHttpContextProperty
+        {
+            get { return CurrentHttpContextProperty != null; }
+        }
+
         /// <summary>
         /// Creates a new instance of <see cref="SentryRequest"/>
         /// for the current packet.
@@ -157,7 +175,7 @@ private static IDictionary<string, string> Convert(Func<dynamic, NameObjectColle
         }
 
 
-        private static void GetHttpContext()
+        private static void TryGetHttpContextPropertyFromAppDomain()
         {
             if (HasHttpContext)
                 return;
@@ -168,26 +186,49 @@ private static void GetHttpContext()
                     .GetAssemblies()
                     .FirstOrDefault(assembly => assembly.FullName.StartsWith("System.Web,"));
 
-                if (HasHttpContext || systemWeb == null)
+                if (systemWeb == null)
                     return;
 
                 var httpContextType = systemWeb.GetExportedTypes()
                     .FirstOrDefault(type => type.Name == "HttpContext");
 
-                if (HasHttpContext || httpContextType == null)
+                if (httpContextType == null)
                     return;
 
                 var currentHttpContextProperty = httpContextType.GetProperty("Current",
                                                                              BindingFlags.Static | BindingFlags.Public);
 
-                if (HasHttpContext || currentHttpContextProperty == null)
+                if (currentHttpContextProperty == null)
                     return;
 
-                HttpContext = currentHttpContextProperty.GetValue(null, null);
+                CurrentHttpContextProperty = currentHttpContextProperty;
+            }
+            catch (Exception exception)
+            {
+                Console.WriteLine("An error occurred while retrieving the HTTP contextproperty: {0}", exception);
+            }
+        }
+
+        private static void GetHttpContext()
+        {
+            // [Meilu] Since reflection is performance heavy, check if we have the httpcontext only once.
+            if (!CheckedForHttpContext)
+            {
+                TryGetHttpContextPropertyFromAppDomain();
+                CheckedForHttpContext = true;
+            }
+
+            // [Meilu] If the currentHttpcontext property is not available we couldnt retrieve it, dont continue
+            if (!HasCurrentHttpContextProperty)
+                return;
+
+            try
+            {
+                HttpContext = CurrentHttpContextProperty.GetValue(null, null);
             }
             catch (Exception exception)
             {
-                Console.WriteLine("An error occurred while retrieving the HTTP context: {0}", exception);
+                Console.WriteLine("An error occurred while retrieving the current HTTP context: {0}", exception);
             }
         }
     }
diff --git a/src/app/SharpRaven/RavenClient.Net45.cs b/src/app/SharpRaven/RavenClient.Net45.cs
index c2fa5c71..ae73e3dd 100644
--- a/src/app/SharpRaven/RavenClient.Net45.cs
+++ b/src/app/SharpRaven/RavenClient.Net45.cs
@@ -55,6 +55,7 @@ public partial class RavenClient
         /// </returns>
         public async Task<string> CaptureAsync(SentryEvent @event)
         {
+            @event.Tags = MergeTags(@event.Tags);
             var packet = this.jsonPacketFactory.Create(CurrentDsn.ProjectID, @event);
             return await SendAsync(packet);
         }
@@ -84,21 +85,11 @@ public async Task<string> CaptureExceptionAsync(Exception exception,
             {
                 Message = message,
                 Level = level,
-                Extra = extra
+                Extra = extra,
+                Tags = tags,
+                Fingerprint = fingerprint
             };
 
-            if (tags != null)
-            {
-                foreach (var tag in tags)
-                    @event.Tags.Add(tag.Key, tag.Value);
-            }
-
-            if (fingerprint != null)
-            {
-                foreach (var f in fingerprint)
-                    @event.Fingerprint.Add(f);
-            }
-
             return await CaptureAsync(@event);
         }
 
@@ -124,21 +115,11 @@ public async Task<string> CaptureMessageAsync(SentryMessage message,
             var @event = new SentryEvent(message)
             {
                 Level = level,
-                Extra = extra
+                Extra = extra,
+                Tags = tags,
+                Fingerprint = fingerprint
             };
 
-            if (tags != null)
-            {
-                foreach (var tag in tags)
-                    @event.Tags.Add(tag.Key, tag.Value);
-            }
-
-            if (fingerprint != null)
-            {
-                foreach (var f in fingerprint)
-                    @event.Fingerprint.Add(f);
-            }
-
             return await CaptureAsync(@event);
         }
 
diff --git a/src/app/SharpRaven/RavenClient.cs b/src/app/SharpRaven/RavenClient.cs
index bef4c211..a7a4aa45 100644
--- a/src/app/SharpRaven/RavenClient.cs
+++ b/src/app/SharpRaven/RavenClient.cs
@@ -177,6 +177,10 @@ public IDictionary<string, string> Tags
         /// </returns>
         public string Capture(SentryEvent @event)
         {
+            if (@event == null)
+                throw new ArgumentNullException("event");
+
+            @event.Tags = MergeTags(@event.Tags);
             var packet = this.jsonPacketFactory.Create(CurrentDsn.ProjectID, @event);
             return Send(packet);
         }
@@ -227,15 +231,16 @@ public string CaptureException(Exception exception,
                                        string[] fingerprint = null,
                                        object extra = null)
         {
-            var finalTags = MergeTags(tags);
-            var packet = this.jsonPacketFactory.Create(CurrentDsn.ProjectID,
-                                                              exception,
-                                                              message,
-                                                              level,
-                                                              finalTags,
-                                                              fingerprint,
-                                                              extra);
-            return Send(packet);
+            var @event = new SentryEvent(exception)
+            {
+                Message = message,
+                Level = level,
+                Extra = extra,
+                Tags = MergeTags(tags),
+                Fingerprint = fingerprint
+            };
+
+            return Capture(@event);
         }
 
 
@@ -257,14 +262,15 @@ public string CaptureMessage(SentryMessage message,
                                      string[] fingerprint = null,
                                      object extra = null)
         {
-            var finalTags = MergeTags(tags);
-            var packet = this.jsonPacketFactory.Create(CurrentDsn.ProjectID,
-                                                              message,
-                                                              level,
-                                                              finalTags,
-                                                              fingerprint,
-                                                              extra);
-            return Send(packet);
+            var @event = new SentryEvent(message)
+            {
+                Level = level,
+                Extra = extra,
+                Tags = MergeTags(tags),
+                Fingerprint = fingerprint
+            };
+
+            return Capture(@event);
         }
 
 
diff --git a/src/app/SharpRaven/SharpRaven.csproj b/src/app/SharpRaven/SharpRaven.csproj
index 9c98c455..c6d39ba9 100644
--- a/src/app/SharpRaven/SharpRaven.csproj
+++ b/src/app/SharpRaven/SharpRaven.csproj
@@ -13,7 +13,7 @@
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>51b56455</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>7a5c1353</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug 4.0|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -117,11 +117,11 @@
     <None Include="SharpRaven.nuspec" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\packages\GitVersionTask.3.3.0\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets" Condition="Exists('..\..\packages\GitVersionTask.3.3.0\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets') And '$(OS)' != 'Unix'" />
+  <Import Project="..\..\packages\GitVersionTask.3.4.1\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets" Condition="Exists('..\..\packages\GitVersionTask.3.4.1\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets') And '$(OS)' != 'Unix'" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\GitVersionTask.3.3.0\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\GitVersionTask.3.3.0\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets'))" />
+    <Error Condition="!Exists('..\..\packages\GitVersionTask.3.4.1\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\GitVersionTask.3.4.1\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/src/app/SharpRaven/packages.config b/src/app/SharpRaven/packages.config
index ffddf1af..e7c24c6a 100644
--- a/src/app/SharpRaven/packages.config
+++ b/src/app/SharpRaven/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="GitVersionTask" version="3.3.0" targetFramework="net45" developmentDependency="true" />
+  <package id="GitVersionTask" version="3.4.1" targetFramework="net45" developmentDependency="true" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net40" />
 </packages>
diff --git a/src/tests/SharpRaven.Nancy.UnitTests/SharpRaven.Nancy.UnitTests.csproj b/src/tests/SharpRaven.Nancy.UnitTests/SharpRaven.Nancy.UnitTests.csproj
index 747be04a..20904037 100644
--- a/src/tests/SharpRaven.Nancy.UnitTests/SharpRaven.Nancy.UnitTests.csproj
+++ b/src/tests/SharpRaven.Nancy.UnitTests/SharpRaven.Nancy.UnitTests.csproj
@@ -13,7 +13,7 @@
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>c36e810a</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>a120c3a0</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release 4.0|AnyCPU'">
     <OutputPath>bin\Release\net40\</OutputPath>
@@ -122,12 +122,12 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\packages\GitVersionTask.3.3.0\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets" Condition="Exists('..\..\packages\GitVersionTask.3.3.0\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets') And '$(OS)' != 'Unix'" />
+  <Import Project="..\..\packages\GitVersionTask.3.4.1\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets" Condition="Exists('..\..\packages\GitVersionTask.3.4.1\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets') And '$(OS)' != 'Unix'" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\GitVersionTask.3.3.0\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\GitVersionTask.3.3.0\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets'))" />
+    <Error Condition="!Exists('..\..\packages\GitVersionTask.3.4.1\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\GitVersionTask.3.4.1\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/tests/SharpRaven.Nancy.UnitTests/packages.config b/src/tests/SharpRaven.Nancy.UnitTests/packages.config
index bda68477..c8a1e0d1 100644
--- a/src/tests/SharpRaven.Nancy.UnitTests/packages.config
+++ b/src/tests/SharpRaven.Nancy.UnitTests/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CsQuery" version="1.3.4" targetFramework="net45" />
-  <package id="GitVersionTask" version="3.3.0" targetFramework="net45" developmentDependency="true" />
+  <package id="GitVersionTask" version="3.4.1" targetFramework="net45" developmentDependency="true" />
   <package id="Nancy" version="1.4.3" targetFramework="net45" />
   <package id="Nancy.Hosting.Self" version="1.4.1" targetFramework="net45" />
   <package id="Nancy.Testing" version="1.4.1" targetFramework="net45" />
diff --git a/src/tests/SharpRaven.UnitTests/RavenClientTests.Net45.cs b/src/tests/SharpRaven.UnitTests/RavenClientTests.Net45.cs
new file mode 100644
index 00000000..0835f841
--- /dev/null
+++ b/src/tests/SharpRaven.UnitTests/RavenClientTests.Net45.cs
@@ -0,0 +1,208 @@
+#region License
+
+// Copyright (c) 2014 The Sentry Team and individual contributors.
+// All rights reserved.
+// 
+// Redistribution and use in source and binary forms, with or without modification, are permitted
+// provided that the following conditions are met:
+// 
+//     1. Redistributions of source code must retain the above copyright notice, this list of
+//        conditions and the following disclaimer.
+// 
+//     2. Redistributions in binary form must reproduce the above copyright notice, this list of
+//        conditions and the following disclaimer in the documentation and/or other materials
+//        provided with the distribution.
+// 
+//     3. Neither the name of the Sentry nor the names of its contributors may be used to
+//        endorse or promote products derived from this software without specific prior written
+//        permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#endregion
+
+#if (!net40)
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+using NSubstitute;
+
+using NUnit.Framework;
+
+using SharpRaven.Data;
+using SharpRaven.Logging;
+using SharpRaven.UnitTests.Utilities;
+
+namespace SharpRaven.UnitTests
+{
+    [TestFixture]
+    public partial class RavenClientTests
+    {
+        [Test]
+        public async Task CaptureMessageAsync_ClientEnvironmentIsIgnored()
+        {
+            var jsonPacketFactory = new TestableJsonPacketFactory(environment : "keep-me");
+            var client = new TestableRavenClient(dsnUri, jsonPacketFactory) { Environment = "foobar" };
+            await client.CaptureMessageAsync("Test");
+
+            var lastEvent = client.LastPacket;
+
+            Assert.That(lastEvent.Environment, Is.EqualTo("keep-me"));
+        }
+
+
+        [Test]
+        public async Task CaptureMessageAsync_ClientLoggerIsIgnored()
+        {
+            var jsonPacketFactory = new TestableJsonPacketFactory(logger : "keep-me");
+            var client = new TestableRavenClient(dsnUri, jsonPacketFactory) { Logger = "foobar" };
+            await client.CaptureMessageAsync("Test");
+
+            var lastEvent = client.LastPacket;
+
+            Assert.That(lastEvent.Logger, Is.EqualTo("keep-me"));
+        }
+
+
+        [Test]
+        public async Task CaptureMessageAsync_ClientReleaseIsIgnored()
+        {
+            var jsonPacketFactory = new TestableJsonPacketFactory(release : "keep-me");
+            var client = new TestableRavenClient(dsnUri, jsonPacketFactory) { Release = "foobar" };
+            await client.CaptureMessageAsync("Test");
+
+            var lastEvent = client.LastPacket;
+
+            Assert.That(lastEvent.Release, Is.EqualTo("keep-me"));
+        }
+
+
+        [Test]
+        public async Task CaptureMessageAsync_InvokesSend_AndJsonPacketFactoryOnCreate()
+        {
+            var project = Guid.NewGuid().ToString();
+            var jsonPacketFactory = new TestableJsonPacketFactory(project);
+            var client = new TestableRavenClient(dsnUri, jsonPacketFactory);
+            var result = await client.CaptureMessageAsync("Test");
+
+            Assert.That(result, Is.EqualTo(project));
+        }
+
+
+        [Test]
+        public async Task CaptureMessageAsync_OnlyDefaultTags()
+        {
+            var client = new TestableRavenClient(dsnUri);
+            client.Tags.Add("key", "value");
+            client.Tags.Add("foo", "bar");
+            // client.Tags = defaultTags;
+            await client.CaptureMessageAsync("Test", ErrorLevel.Info);
+
+            var lastEvent = client.LastPacket;
+
+            Assert.That(lastEvent.Tags["key"], Is.EqualTo("value"));
+            Assert.That(lastEvent.Tags["foo"], Is.EqualTo("bar"));
+        }
+
+
+        [Test]
+        public async Task CaptureMessageAsync_OnlyMessageTags()
+        {
+            var messageTags = new Dictionary<string, string> { { "key", "value" }, { "foo", "bar" } };
+
+            var client = new TestableRavenClient(dsnUri);
+            await client.CaptureMessageAsync("Test", ErrorLevel.Info, messageTags);
+
+            var lastEvent = client.LastPacket;
+
+            Assert.That(lastEvent.Tags["key"], Is.EqualTo("value"));
+            Assert.That(lastEvent.Tags["foo"], Is.EqualTo("bar"));
+        }
+
+
+        [Test]
+        public async Task CaptureMessageAsync_ScrubberIsInvoked()
+        {
+            string message = Guid.NewGuid().ToString("n");
+
+            var client = new RavenClient(TestHelper.DsnUri);
+            client.LogScrubber = Substitute.For<IScrubber>();
+            client.LogScrubber.Scrub(Arg.Any<string>())
+                .Returns(c =>
+                {
+                    string json = c.Arg<string>();
+                    Assert.That(json, Is.StringContaining(message));
+                    return json;
+                });
+
+            await client.CaptureMessageAsync(message);
+
+            // Verify that we actually received a Scrub() call:
+            client.LogScrubber.Received().Scrub(Arg.Any<string>());
+        }
+
+
+        [Test]
+        public async Task CaptureMessageAsync_SendsEnvironment()
+        {
+            var client = new TestableRavenClient(dsnUri) { Environment = "foobar" };
+            await client.CaptureMessageAsync("Test");
+
+            var lastEvent = client.LastPacket;
+
+            Assert.That(lastEvent.Environment, Is.EqualTo("foobar"));
+        }
+
+
+        [Test]
+        public async Task CaptureMessageAsync_SendsLogger()
+        {
+            var client = new TestableRavenClient(dsnUri) { Logger = "foobar" };
+            await client.CaptureMessageAsync("Test");
+
+            var lastEvent = client.LastPacket;
+
+            Assert.That(lastEvent.Logger, Is.EqualTo("foobar"));
+        }
+
+
+        [Test]
+        public async Task CaptureMessageAsync_SendsRelease()
+        {
+            var client = new TestableRavenClient(dsnUri) { Release = "foobar" };
+            await client.CaptureMessageAsync("Test");
+
+            var lastEvent = client.LastPacket;
+
+            Assert.That(lastEvent.Release, Is.EqualTo("foobar"));
+        }
+
+
+        [Test]
+        public async Task CaptureMessageAsync_TagHandling()
+        {
+            var messageTags = new Dictionary<string, string> { { "key", "another value" } };
+
+            var client = new TestableRavenClient(dsnUri);
+            client.Tags.Add("key", "value");
+            client.Tags.Add("foo", "bar");
+            await client.CaptureMessageAsync("Test", ErrorLevel.Info, messageTags);
+
+            var lastEvent = client.LastPacket;
+
+            Assert.That(lastEvent.Tags["key"], Is.EqualTo("another value"));
+            Assert.That(lastEvent.Tags["foo"], Is.EqualTo("bar"));
+        }
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/src/tests/SharpRaven.UnitTests/RavenClientTests/CaptureAsyncTests.cs b/src/tests/SharpRaven.UnitTests/RavenClientTests/CaptureAsyncTests.cs
new file mode 100644
index 00000000..5dda714e
--- /dev/null
+++ b/src/tests/SharpRaven.UnitTests/RavenClientTests/CaptureAsyncTests.cs
@@ -0,0 +1,155 @@
+#region License
+
+// Copyright (c) 2014 The Sentry Team and individual contributors.
+// All rights reserved.
+// 
+// Redistribution and use in source and binary forms, with or without modification, are permitted
+// provided that the following conditions are met:
+// 
+//     1. Redistributions of source code must retain the above copyright notice, this list of
+//        conditions and the following disclaimer.
+// 
+//     2. Redistributions in binary form must reproduce the above copyright notice, this list of
+//        conditions and the following disclaimer in the documentation and/or other materials
+//        provided with the distribution.
+// 
+//     3. Neither the name of the Sentry nor the names of its contributors may be used to
+//        endorse or promote products derived from this software without specific prior written
+//        permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#endregion
+
+#if (!net40)
+
+using System;
+using System.Threading.Tasks;
+
+using NUnit.Framework;
+
+using SharpRaven.Data;
+
+namespace SharpRaven.UnitTests.RavenClientTests
+{
+    [TestFixture]
+    public class CaptureAsyncTests
+    {
+        #region SetUp/Teardown
+
+        [SetUp]
+        public void SetUp()
+        {
+            this.tester = new CaptureTester();
+        }
+
+        #endregion
+
+        [Test]
+        public void ClientEnvironmentIsIgnored()
+        {
+            this.tester.ClientEnvironmentIsIgnored(client => client.CaptureAsync(new SentryEvent("Test")));
+        }
+
+
+        [Test]
+        public void ClientLoggerIsIgnored()
+        {
+            this.tester.ClientLoggerIsIgnored(async client => await client.CaptureAsync(new SentryEvent("Test")));
+        }
+
+
+        [Test]
+        public void ClientReleaseIsIgnored()
+        {
+            this.tester.ClientReleaseIsIgnored(async client => await client.CaptureAsync(new SentryEvent("Test")));
+        }
+
+
+        [Test]
+        public void ErrorLevelIsDebug()
+        {
+            this.tester.ErrorLevelIsDebug(async client => await client.CaptureAsync(new SentryEvent("Test") { Level = ErrorLevel.Debug }));
+        }
+
+
+        [Test]
+        public async Task InvokesSendAndJsonPacketFactoryOnCreate()
+        {
+            var project = Guid.NewGuid().ToString();
+            var client = this.tester.GetTestableRavenClient(project);
+            var result = await client.CaptureAsync(new SentryEvent("Test"));
+
+            Assert.That(result, Is.EqualTo(project));
+        }
+
+
+        [Test]
+        public void OnlyDefaultTags()
+        {
+            this.tester.OnlyDefaultTags(async client => await client.CaptureAsync(new SentryEvent("Test")));
+        }
+
+
+        [Test]
+        public void OnlyMessageTags()
+        {
+            this.tester.OnlyMessageTags(async (client, tags) => await client.CaptureAsync(new SentryEvent("Test")
+            {
+                Level = ErrorLevel.Info,
+                Tags = tags
+            }));
+        }
+
+
+        [Test]
+        public void ScrubberIsInvoked()
+        {
+            this.tester.ScrubberIsInvoked(async (client, message) => await client.CaptureAsync(new SentryEvent(message)));
+        }
+
+
+        [Test]
+        public void SendsEnvironment()
+        {
+            this.tester.SendsEnvironment(async client => await client.CaptureAsync(new SentryEvent("Test")));
+        }
+
+
+        [Test]
+        public void SendsLogger()
+        {
+            this.tester.SendsLogger(async client => await client.CaptureAsync(new SentryEvent("Test")));
+        }
+
+
+        [Test]
+        public void SendsRelease()
+        {
+            this.tester.SendsRelease(async client => await client.CaptureAsync(new SentryEvent("Test")));
+        }
+
+
+        [Test]
+        public void TagHandling()
+        {
+            this.tester.TagHandling(async (client, tags) => await client.CaptureAsync(new SentryEvent("Test")
+            {
+                Level = ErrorLevel.Info,
+                Tags = tags
+            }));
+        }
+
+
+        private CaptureTester tester;
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/src/tests/SharpRaven.UnitTests/RavenClientTests/CaptureExceptionAsyncTests.cs b/src/tests/SharpRaven.UnitTests/RavenClientTests/CaptureExceptionAsyncTests.cs
new file mode 100644
index 00000000..9f8191af
--- /dev/null
+++ b/src/tests/SharpRaven.UnitTests/RavenClientTests/CaptureExceptionAsyncTests.cs
@@ -0,0 +1,150 @@
+#region License
+
+// Copyright (c) 2014 The Sentry Team and individual contributors.
+// All rights reserved.
+// 
+// Redistribution and use in source and binary forms, with or without modification, are permitted
+// provided that the following conditions are met:
+// 
+//     1. Redistributions of source code must retain the above copyright notice, this list of
+//        conditions and the following disclaimer.
+// 
+//     2. Redistributions in binary form must reproduce the above copyright notice, this list of
+//        conditions and the following disclaimer in the documentation and/or other materials
+//        provided with the distribution.
+// 
+//     3. Neither the name of the Sentry nor the names of its contributors may be used to
+//        endorse or promote products derived from this software without specific prior written
+//        permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#endregion
+
+#if (!net40)
+
+using System;
+using System.Threading.Tasks;
+
+using NUnit.Framework;
+
+using SharpRaven.Data;
+
+namespace SharpRaven.UnitTests.RavenClientTests
+{
+    [TestFixture]
+    public class CaptureExceptionAsyncTests
+    {
+        #region SetUp/Teardown
+
+        [SetUp]
+        public void SetUp()
+        {
+            this.tester = new CaptureTester();
+        }
+
+        #endregion
+
+        [Test]
+        public void ClientEnvironmentIsIgnored()
+        {
+            this.tester.ClientEnvironmentIsIgnored(async client => await client.CaptureExceptionAsync(new Exception("Test")));
+        }
+
+
+        [Test]
+        public void ClientLoggerIsIgnored()
+        {
+            this.tester.ClientLoggerIsIgnored(async client => await client.CaptureExceptionAsync(new Exception("Test")));
+        }
+
+
+        [Test]
+        public void ClientReleaseIsIgnored()
+        {
+            this.tester.ClientReleaseIsIgnored(async client => await client.CaptureExceptionAsync(new Exception("Test")));
+        }
+
+
+        [Test]
+        public void ErrorLevelIsDebug()
+        {
+            this.tester.ErrorLevelIsDebug(
+                async client => await client.CaptureExceptionAsync(new Exception("Test"), level : ErrorLevel.Debug));
+        }
+
+
+        [Test]
+        public async Task InvokesSendAndJsonPacketFactoryOnCreate()
+        {
+            var project = Guid.NewGuid().ToString();
+            var client = this.tester.GetTestableRavenClient(project);
+            var result = await client.CaptureExceptionAsync(new Exception("Test"));
+
+            Assert.That(result, Is.EqualTo(project));
+        }
+
+
+        [Test]
+        public void OnlyDefaultTags()
+        {
+            this.tester.OnlyDefaultTags(async client => await client.CaptureExceptionAsync(new Exception("Test")));
+        }
+
+
+        [Test]
+        public void OnlyMessageTags()
+        {
+            this.tester.OnlyMessageTags(
+                async (client, tags) => await client.CaptureExceptionAsync(new Exception("Test"), level : ErrorLevel.Info, tags : tags));
+        }
+
+
+        [Test]
+        public void ScrubberIsInvoked()
+        {
+            this.tester.ScrubberIsInvoked(async (client, message) => await client.CaptureExceptionAsync(new Exception(message)));
+        }
+
+
+        [Test]
+        public void SendsEnvironment()
+        {
+            this.tester.SendsEnvironment(async client => await client.CaptureExceptionAsync(new Exception("Test")));
+        }
+
+
+        [Test]
+        public void SendsLogger()
+        {
+            this.tester.SendsLogger(async client => await client.CaptureExceptionAsync(new Exception("Test")));
+        }
+
+
+        [Test]
+        public void SendsRelease()
+        {
+            this.tester.SendsRelease(async client => await client.CaptureExceptionAsync(new Exception("Test")));
+        }
+
+
+        [Test]
+        public void TagHandling()
+        {
+            this.tester.TagHandling(
+                async (client, tags) => await client.CaptureExceptionAsync(new Exception("Test"), level : ErrorLevel.Info, tags : tags));
+        }
+
+
+        private CaptureTester tester;
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/src/tests/SharpRaven.UnitTests/RavenClientTests/CaptureExceptionTests .cs b/src/tests/SharpRaven.UnitTests/RavenClientTests/CaptureExceptionTests .cs
new file mode 100644
index 00000000..7558557f
--- /dev/null
+++ b/src/tests/SharpRaven.UnitTests/RavenClientTests/CaptureExceptionTests .cs	
@@ -0,0 +1,139 @@
+#region License
+
+// Copyright (c) 2014 The Sentry Team and individual contributors.
+// All rights reserved.
+// 
+// Redistribution and use in source and binary forms, with or without modification, are permitted
+// provided that the following conditions are met:
+// 
+//     1. Redistributions of source code must retain the above copyright notice, this list of
+//        conditions and the following disclaimer.
+// 
+//     2. Redistributions in binary form must reproduce the above copyright notice, this list of
+//        conditions and the following disclaimer in the documentation and/or other materials
+//        provided with the distribution.
+// 
+//     3. Neither the name of the Sentry nor the names of its contributors may be used to
+//        endorse or promote products derived from this software without specific prior written
+//        permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#endregion
+
+using System;
+
+using NUnit.Framework;
+
+using SharpRaven.Data;
+
+namespace SharpRaven.UnitTests.RavenClientTests
+{
+    [TestFixture]
+    public class CaptureExceptionTests
+    {
+        #region SetUp/Teardown
+
+        [SetUp]
+        public void SetUp()
+        {
+            this.tester = new CaptureTester();
+        }
+
+        #endregion
+
+        [Test]
+        public void ClientEnvironmentIsIgnored()
+        {
+            this.tester.ClientEnvironmentIsIgnored(client => client.CaptureException(new Exception("Test")));
+        }
+
+
+        [Test]
+        public void ClientLoggerIsIgnored()
+        {
+            this.tester.ClientLoggerIsIgnored(client => client.CaptureException(new Exception("Test")));
+        }
+
+
+        [Test]
+        public void ClientReleaseIsIgnored()
+        {
+            this.tester.ClientReleaseIsIgnored(client => client.CaptureException(new Exception("Test")));
+        }
+
+
+        [Test]
+        public void ErrorLevelIsDebug()
+        {
+            this.tester.ErrorLevelIsDebug(client => client.CaptureException(new Exception("Test"), level : ErrorLevel.Debug));
+        }
+
+
+        [Test]
+        public void InvokesSendAndJsonPacketFactoryOnCreate()
+        {
+            this.tester.InvokesSendAndJsonPacketFactoryOnCreate(client => client.CaptureException(new Exception("Test")));
+        }
+
+
+        [Test]
+        public void OnlyDefaultTags()
+        {
+            this.tester.OnlyDefaultTags(client => client.CaptureException(new Exception("Test")));
+        }
+
+
+        [Test]
+        public void OnlyMessageTags()
+        {
+            this.tester.OnlyMessageTags(
+                (client, tags) => client.CaptureException(new Exception("Test"), level : ErrorLevel.Info, tags : tags));
+        }
+
+
+        [Test]
+        public void ScrubberIsInvoked()
+        {
+            this.tester.ScrubberIsInvoked((client, message) => client.CaptureException(new Exception(message)));
+        }
+
+
+        [Test]
+        public void SendsEnvironment()
+        {
+            this.tester.SendsEnvironment(client => client.CaptureException(new Exception("Test")));
+        }
+
+
+        [Test]
+        public void SendsLogger()
+        {
+            this.tester.SendsLogger(client => client.CaptureException(new Exception("Test")));
+        }
+
+
+        [Test]
+        public void SendsRelease()
+        {
+            this.tester.SendsRelease(client => client.CaptureException(new Exception("Test")));
+        }
+
+
+        [Test]
+        public void TagHandling()
+        {
+            this.tester.TagHandling((client, tags) => client.CaptureException(new Exception("Test"), level : ErrorLevel.Info, tags : tags));
+        }
+
+
+        private CaptureTester tester;
+    }
+}
\ No newline at end of file
diff --git a/src/tests/SharpRaven.UnitTests/RavenClientTests/CaptureMessageAsyncTests.cs b/src/tests/SharpRaven.UnitTests/RavenClientTests/CaptureMessageAsyncTests.cs
new file mode 100644
index 00000000..a430eea3
--- /dev/null
+++ b/src/tests/SharpRaven.UnitTests/RavenClientTests/CaptureMessageAsyncTests.cs
@@ -0,0 +1,147 @@
+#region License
+
+// Copyright (c) 2014 The Sentry Team and individual contributors.
+// All rights reserved.
+// 
+// Redistribution and use in source and binary forms, with or without modification, are permitted
+// provided that the following conditions are met:
+// 
+//     1. Redistributions of source code must retain the above copyright notice, this list of
+//        conditions and the following disclaimer.
+// 
+//     2. Redistributions in binary form must reproduce the above copyright notice, this list of
+//        conditions and the following disclaimer in the documentation and/or other materials
+//        provided with the distribution.
+// 
+//     3. Neither the name of the Sentry nor the names of its contributors may be used to
+//        endorse or promote products derived from this software without specific prior written
+//        permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#endregion
+
+#if (!net40)
+
+using System;
+using System.Threading.Tasks;
+
+using NUnit.Framework;
+
+using SharpRaven.Data;
+
+namespace SharpRaven.UnitTests.RavenClientTests
+{
+    [TestFixture]
+    public class CaptureMessageAsyncTests
+    {
+        #region SetUp/Teardown
+
+        [SetUp]
+        public void SetUp()
+        {
+            this.tester = new CaptureTester();
+        }
+
+        #endregion
+
+        [Test]
+        public void ClientEnvironmentIsIgnored()
+        {
+            this.tester.ClientEnvironmentIsIgnored(async client => await client.CaptureMessageAsync("Test"));
+        }
+
+
+        [Test]
+        public void ClientLoggerIsIgnored()
+        {
+            this.tester.ClientLoggerIsIgnored(async client => await client.CaptureMessageAsync("Test"));
+        }
+
+
+        [Test]
+        public void ClientReleaseIsIgnored()
+        {
+            this.tester.ClientReleaseIsIgnored(async client => await client.CaptureMessageAsync("Test"));
+        }
+
+
+        [Test]
+        public void ErrorLevelIsDebug()
+        {
+            this.tester.ErrorLevelIsDebug(async client => await client.CaptureMessageAsync("Test", ErrorLevel.Debug));
+        }
+
+
+        [Test]
+        public async Task InvokesSendAndJsonPacketFactoryOnCreate()
+        {
+            var project = Guid.NewGuid().ToString();
+            var client = this.tester.GetTestableRavenClient(project);
+            var result = await client.CaptureMessageAsync("Test");
+
+            Assert.That(result, Is.EqualTo(project));
+        }
+
+
+        [Test]
+        public void OnlyDefaultTags()
+        {
+            this.tester.OnlyDefaultTags(async client => await client.CaptureMessageAsync("Test"));
+        }
+
+
+        [Test]
+        public void OnlyMessageTags()
+        {
+            this.tester.OnlyMessageTags(async (client, tags) => await client.CaptureMessageAsync("Test", ErrorLevel.Info, tags));
+        }
+
+
+        [Test]
+        public void ScrubberIsInvoked()
+        {
+            this.tester.ScrubberIsInvoked(async (client, message) => await client.CaptureMessageAsync(message));
+        }
+
+
+        [Test]
+        public void SendsEnvironment()
+        {
+            this.tester.SendsEnvironment(async client => await client.CaptureMessageAsync("Test"));
+        }
+
+
+        [Test]
+        public void SendsLogger()
+        {
+            this.tester.SendsLogger(async client => await client.CaptureMessageAsync("Test"));
+        }
+
+
+        [Test]
+        public void SendsRelease()
+        {
+            this.tester.SendsRelease(async client => await client.CaptureMessageAsync("Test"));
+        }
+
+
+        [Test]
+        public void TagHandling()
+        {
+            this.tester.TagHandling(async (client, tags) => await client.CaptureMessageAsync("Test", ErrorLevel.Info, tags));
+        }
+
+
+        private CaptureTester tester;
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/src/tests/SharpRaven.UnitTests/RavenClientTests/CaptureMessageTests.cs b/src/tests/SharpRaven.UnitTests/RavenClientTests/CaptureMessageTests.cs
new file mode 100644
index 00000000..18dcee86
--- /dev/null
+++ b/src/tests/SharpRaven.UnitTests/RavenClientTests/CaptureMessageTests.cs
@@ -0,0 +1,136 @@
+#region License
+
+// Copyright (c) 2014 The Sentry Team and individual contributors.
+// All rights reserved.
+// 
+// Redistribution and use in source and binary forms, with or without modification, are permitted
+// provided that the following conditions are met:
+// 
+//     1. Redistributions of source code must retain the above copyright notice, this list of
+//        conditions and the following disclaimer.
+// 
+//     2. Redistributions in binary form must reproduce the above copyright notice, this list of
+//        conditions and the following disclaimer in the documentation and/or other materials
+//        provided with the distribution.
+// 
+//     3. Neither the name of the Sentry nor the names of its contributors may be used to
+//        endorse or promote products derived from this software without specific prior written
+//        permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#endregion
+
+using NUnit.Framework;
+
+using SharpRaven.Data;
+
+namespace SharpRaven.UnitTests.RavenClientTests
+{
+    [TestFixture]
+    public class CaptureMessageTests
+    {
+        #region SetUp/Teardown
+
+        [SetUp]
+        public void SetUp()
+        {
+            this.tester = new CaptureTester();
+        }
+
+        #endregion
+
+        [Test]
+        public void ClientEnvironmentIsIgnored()
+        {
+            this.tester.ClientEnvironmentIsIgnored(client => client.CaptureMessage("Test"));
+        }
+
+
+        [Test]
+        public void ClientLoggerIsIgnored()
+        {
+            this.tester.ClientLoggerIsIgnored(client => client.CaptureMessage("Test"));
+        }
+
+
+        [Test]
+        public void ClientReleaseIsIgnored()
+        {
+            this.tester.ClientReleaseIsIgnored(client => client.CaptureMessage("Test"));
+        }
+
+
+        [Test]
+        public void ErrorLevelIsDebug()
+        {
+            this.tester.ErrorLevelIsDebug(client => client.CaptureMessage("Test", ErrorLevel.Debug));
+        }
+
+
+        [Test]
+        public void InvokesSendAndJsonPacketFactoryOnCreate()
+        {
+            this.tester.InvokesSendAndJsonPacketFactoryOnCreate(client => client.CaptureMessage("Test"));
+        }
+
+
+        [Test]
+        public void OnlyDefaultTags()
+        {
+            this.tester.OnlyDefaultTags(client => client.CaptureMessage("Test"));
+        }
+
+
+        [Test]
+        public void OnlyMessageTags()
+        {
+            this.tester.OnlyMessageTags((client, tags) => client.CaptureMessage("Test", ErrorLevel.Info, tags));
+        }
+
+
+        [Test]
+        public void ScrubberIsInvoked()
+        {
+            this.tester.ScrubberIsInvoked((client, message) => client.CaptureMessage(message));
+        }
+
+
+        [Test]
+        public void SendsEnvironment()
+        {
+            this.tester.SendsEnvironment(client => client.CaptureMessage("Test"));
+        }
+
+
+        [Test]
+        public void SendsLogger()
+        {
+            this.tester.SendsLogger(client => client.CaptureMessage("Test"));
+        }
+
+
+        [Test]
+        public void SendsRelease()
+        {
+            this.tester.SendsRelease(client => client.CaptureMessage("Test"));
+        }
+
+
+        [Test]
+        public void TagHandling()
+        {
+            this.tester.TagHandling((client, tags) => client.CaptureMessage("Test", ErrorLevel.Info, tags));
+        }
+
+
+        private CaptureTester tester;
+    }
+}
\ No newline at end of file
diff --git a/src/tests/SharpRaven.UnitTests/RavenClientTests.cs b/src/tests/SharpRaven.UnitTests/RavenClientTests/CaptureTester.cs
similarity index 66%
rename from src/tests/SharpRaven.UnitTests/RavenClientTests.cs
rename to src/tests/SharpRaven.UnitTests/RavenClientTests/CaptureTester.cs
index f41bcdbb..3bfe609a 100644
--- a/src/tests/SharpRaven.UnitTests/RavenClientTests.cs
+++ b/src/tests/SharpRaven.UnitTests/RavenClientTests/CaptureTester.cs
@@ -30,6 +30,9 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
 
 using NSubstitute;
 
@@ -43,17 +46,63 @@
 
 #endif
 
-namespace SharpRaven.UnitTests
+namespace SharpRaven.UnitTests.RavenClientTests
 {
     [TestFixture]
-    public class RavenClientTests
+    public class CaptureTester
     {
         [Test]
-        public void CaptureMessage_ClientEnvironmentIsIgnored()
+        public void AllMethodsAreTested()
+        {
+            var testerMethods = GetType()
+                .GetMethods(BindingFlags.DeclaredOnly)
+                .Where(m => !m.GetCustomAttributes(typeof(TestAttribute), false).Any())
+                .Where(m => !m.GetCustomAttributes(typeof(IgnoreAttribute), false).Any())
+                .ToList();
+
+            var ravenClientTests = new[]
+            {
+#if (!net40)
+                typeof(CaptureAsyncTests),
+                typeof(CaptureExceptionAsyncTests),
+                typeof(CaptureMessageAsyncTests),
+#endif
+                typeof(CaptureExceptionTests),
+                typeof(CaptureMessageTests),
+                typeof(CaptureTests)
+            };
+
+            var sb = new StringBuilder();
+
+            foreach (var ravenClientTestType in ravenClientTests)
+            {
+                var testMethods = ravenClientTestType
+                    .GetMethods()
+                    .Where(m => m.GetCustomAttributes(typeof(TestAttribute), false).Any())
+                    .ToList();
+
+                foreach (var testerMethod in testerMethods.Where(testerMethod => testMethods.All(m => m.Name != testerMethod.Name)))
+                {
+                    sb.AppendFormat("{0}.{1} is missing or not properly decorated with a [Test] attribute.", ravenClientTestType.FullName,
+                                    testerMethod.Name);
+                    sb.AppendLine();
+                }
+            }
+
+            if (sb.Length > 0)
+                Assert.Fail(sb.ToString());
+        }
+
+
+        private const string dsnUri =
+            "http://7d6466e66155431495bdb4036ba9a04b:4c1cfeab7ebd4c1cb9e18008173a3630@app.getsentry.com/3739";
+
+
+        public void ClientEnvironmentIsIgnored(Action<IRavenClient> capture)
         {
             var jsonPacketFactory = new TestableJsonPacketFactory(environment : "keep-me");
             var client = new TestableRavenClient(dsnUri, jsonPacketFactory) { Environment = "foobar" };
-            client.CaptureMessage("Test");
+            capture.Invoke(client);
 
             var lastEvent = client.LastPacket;
 
@@ -61,52 +110,64 @@ public void CaptureMessage_ClientEnvironmentIsIgnored()
         }
 
 
-        [Test]
-        public void CaptureMessage_ClientLoggerIsIgnored()
+        public void ClientLoggerIsIgnored(Action<IRavenClient> capture)
         {
             var jsonPacketFactory = new TestableJsonPacketFactory(logger : "keep-me");
             var client = new TestableRavenClient(dsnUri, jsonPacketFactory) { Logger = "foobar" };
-            client.CaptureMessage("Test");
-
+            capture.Invoke(client);
             var lastEvent = client.LastPacket;
 
             Assert.That(lastEvent.Logger, Is.EqualTo("keep-me"));
         }
 
 
-        [Test]
-        public void CaptureMessage_ClientReleaseIsIgnored()
+        public void ClientReleaseIsIgnored(Action<IRavenClient> capture)
         {
             var jsonPacketFactory = new TestableJsonPacketFactory(release : "keep-me");
             var client = new TestableRavenClient(dsnUri, jsonPacketFactory) { Release = "foobar" };
-            client.CaptureMessage("Test");
-
+            capture.Invoke(client);
             var lastEvent = client.LastPacket;
 
             Assert.That(lastEvent.Release, Is.EqualTo("keep-me"));
         }
 
 
-        [Test]
-        public void CaptureMessage_InvokesSend_AndJsonPacketFactoryOnCreate()
+        public void ErrorLevelIsDebug(Action<IRavenClient> capture)
+        {
+            var client = new TestableRavenClient(dsnUri);
+            capture.Invoke(client);
+
+            var lastEvent = client.LastPacket;
+
+            Assert.That(lastEvent.Level, Is.EqualTo(ErrorLevel.Debug));
+        }
+
+
+        [Ignore]
+        public IRavenClient GetTestableRavenClient(string project)
         {
-            var project = Guid.NewGuid().ToString();
             var jsonPacketFactory = new TestableJsonPacketFactory(project);
-            var client = new TestableRavenClient(dsnUri, jsonPacketFactory);
-            var result = client.CaptureMessage("Test");
+            return new TestableRavenClient(dsnUri, jsonPacketFactory);
+        }
+
+
+        public void InvokesSendAndJsonPacketFactoryOnCreate(Func<IRavenClient, string> capture)
+        {
+            var project = Guid.NewGuid().ToString();
+            var client = GetTestableRavenClient(project);
+            var result = capture.Invoke(client);
 
             Assert.That(result, Is.EqualTo(project));
         }
 
 
-        [Test]
-        public void CaptureMessage_OnlyDefaultTags()
+
+        public void OnlyDefaultTags(Action<IRavenClient> capture)
         {
             var client = new TestableRavenClient(dsnUri);
             client.Tags.Add("key", "value");
             client.Tags.Add("foo", "bar");
-            // client.Tags = defaultTags;
-            client.CaptureMessage("Test", ErrorLevel.Info);
+            capture.Invoke(client);
 
             var lastEvent = client.LastPacket;
 
@@ -115,14 +176,11 @@ public void CaptureMessage_OnlyDefaultTags()
         }
 
 
-        [Test]
-        public void CaptureMessage_OnlyMessageTags()
+        public void OnlyMessageTags(Action<IRavenClient, IDictionary<string, string>> capture)
         {
             var messageTags = new Dictionary<string, string> { { "key", "value" }, { "foo", "bar" } };
-
             var client = new TestableRavenClient(dsnUri);
-            client.CaptureMessage("Test", ErrorLevel.Info, messageTags);
-
+            capture.Invoke(client, messageTags);
             var lastEvent = client.LastPacket;
 
             Assert.That(lastEvent.Tags["key"], Is.EqualTo("value"));
@@ -130,45 +188,42 @@ public void CaptureMessage_OnlyMessageTags()
         }
 
 
-        [Test]
-        public void CaptureMessage_ScrubberIsInvoked()
+        public void ScrubberIsInvoked(Action<IRavenClient, string> capture)
         {
-            string message = Guid.NewGuid().ToString("n");
-
-            IRavenClient ravenClient = new RavenClient(TestHelper.DsnUri);
-            ravenClient.LogScrubber = Substitute.For<IScrubber>();
+            var message = Guid.NewGuid().ToString("n");
+            var ravenClient = new RavenClient(TestHelper.DsnUri)
+            {
+                LogScrubber = Substitute.For<IScrubber>()
+            };
             ravenClient.LogScrubber.Scrub(Arg.Any<string>())
                 .Returns(c =>
                 {
-                    string json = c.Arg<string>();
+                    var json = c.Arg<string>();
                     Assert.That(json, Is.StringContaining(message));
                     return json;
                 });
 
-            ravenClient.CaptureMessage(message);
+            capture.Invoke(ravenClient, message);
 
             // Verify that we actually received a Scrub() call:
             ravenClient.LogScrubber.Received().Scrub(Arg.Any<string>());
         }
 
 
-        [Test]
-        public void CaptureMessage_SendsEnvironment()
+        public void SendsEnvironment(Action<IRavenClient> capture)
         {
             var client = new TestableRavenClient(dsnUri) { Environment = "foobar" };
-            client.CaptureMessage("Test");
-
+            capture.Invoke(client);
             var lastEvent = client.LastPacket;
 
             Assert.That(lastEvent.Environment, Is.EqualTo("foobar"));
         }
 
 
-        [Test]
-        public void CaptureMessage_SendsLogger()
+        public void SendsLogger(Action<IRavenClient> capture)
         {
             var client = new TestableRavenClient(dsnUri) { Logger = "foobar" };
-            client.CaptureMessage("Test");
+            capture.Invoke(client);
 
             var lastEvent = client.LastPacket;
 
@@ -176,11 +231,10 @@ public void CaptureMessage_SendsLogger()
         }
 
 
-        [Test]
-        public void CaptureMessage_SendsRelease()
+        public void SendsRelease(Action<IRavenClient> capture)
         {
             var client = new TestableRavenClient(dsnUri) { Release = "foobar" };
-            client.CaptureMessage("Test");
+            capture.Invoke(client);
 
             var lastEvent = client.LastPacket;
 
@@ -188,15 +242,14 @@ public void CaptureMessage_SendsRelease()
         }
 
 
-        [Test]
-        public void CaptureMessage_TagHandling()
+        public void TagHandling(Action<IRavenClient, IDictionary<string, string>> capture)
         {
             var messageTags = new Dictionary<string, string> { { "key", "another value" } };
 
             var client = new TestableRavenClient(dsnUri);
             client.Tags.Add("key", "value");
             client.Tags.Add("foo", "bar");
-            client.CaptureMessage("Test", ErrorLevel.Info, messageTags);
+            capture.Invoke(client, messageTags);
 
             var lastEvent = client.LastPacket;
 
@@ -205,66 +258,6 @@ public void CaptureMessage_TagHandling()
         }
 
 
-#if (!net40)
-        [Test]
-        public async Task CaptureMessageAsync_InvokesSend_AndJsonPacketFactoryOnCreate()
-        {
-            const string dsnUri =
-                "http://7d6466e66155431495bdb4036ba9a04b:4c1cfeab7ebd4c1cb9e18008173a3630@app.getsentry.com/3739";
-            var project = Guid.NewGuid().ToString();
-            var jsonPacketFactory = new TestableJsonPacketFactory(project);
-            var client = new TestableRavenClient(dsnUri, jsonPacketFactory);
-            var result = await client.CaptureMessageAsync("Test");
-
-            Assert.That(result, Is.EqualTo(project));
-        }
-#endif
-
-
-        [Test]
-        public void Constructor_NullDsn_ThrowsArgumentNullException()
-        {
-            var exception = Assert.Throws<ArgumentNullException>(() => new RavenClient((Dsn)null));
-            Assert.That(exception.ParamName, Is.EqualTo("dsn"));
-        }
-
-
-        [Test]
-        public void Constructor_NullDsnString_ThrowsArgumentNullException()
-        {
-            var exception = Assert.Throws<ArgumentNullException>(() => new RavenClient((string)null));
-            Assert.That(exception.ParamName, Is.EqualTo("dsn"));
-        }
-
-
-        [Test]
-        public void Constructor_StringDsn_CurrentDsnEqualsDsn()
-        {
-            IRavenClient ravenClient = new RavenClient(TestHelper.DsnUri);
-            Assert.That(ravenClient.CurrentDsn.ToString(), Is.EqualTo(TestHelper.DsnUri));
-        }
-
-
-        [Test]
-        public void Logger_IsRoot()
-        {
-            IRavenClient ravenClient = new RavenClient(TestHelper.DsnUri);
-            Assert.That(ravenClient.Logger, Is.EqualTo("root"));
-        }
-
-
-        [Test]
-        public void Release_IsNullByDefault()
-        {
-            IRavenClient ravenClient = new RavenClient(TestHelper.DsnUri);
-
-            Assert.That(ravenClient.Release, Is.Null);
-        }
-
-
-        private const string dsnUri =
-            "http://7d6466e66155431495bdb4036ba9a04b:4c1cfeab7ebd4c1cb9e18008173a3630@app.getsentry.com/3739";
-
         private class TestableJsonPacketFactory : JsonPacketFactory
         {
             private readonly string environment;
@@ -315,6 +308,8 @@ protected override string Send(JsonPacket packet)
 #if(!net40)
             protected override Task<string> SendAsync(JsonPacket packet)
             {
+                packet = PreparePacket(packet);
+                LastPacket = packet;
                 return Task.FromResult(packet.Project);
             }
 #endif
diff --git a/src/tests/SharpRaven.UnitTests/RavenClientTests/CaptureTests.cs b/src/tests/SharpRaven.UnitTests/RavenClientTests/CaptureTests.cs
new file mode 100644
index 00000000..48358caa
--- /dev/null
+++ b/src/tests/SharpRaven.UnitTests/RavenClientTests/CaptureTests.cs
@@ -0,0 +1,150 @@
+#region License
+
+// Copyright (c) 2014 The Sentry Team and individual contributors.
+// All rights reserved.
+// 
+// Redistribution and use in source and binary forms, with or without modification, are permitted
+// provided that the following conditions are met:
+// 
+//     1. Redistributions of source code must retain the above copyright notice, this list of
+//        conditions and the following disclaimer.
+// 
+//     2. Redistributions in binary form must reproduce the above copyright notice, this list of
+//        conditions and the following disclaimer in the documentation and/or other materials
+//        provided with the distribution.
+// 
+//     3. Neither the name of the Sentry nor the names of its contributors may be used to
+//        endorse or promote products derived from this software without specific prior written
+//        permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#endregion
+
+using System;
+
+using NUnit.Framework;
+
+using SharpRaven.Data;
+
+namespace SharpRaven.UnitTests.RavenClientTests
+{
+    [TestFixture]
+    public class CaptureTests
+    {
+        #region SetUp/Teardown
+
+        [SetUp]
+        public void SetUp()
+        {
+            this.tester = new CaptureTester();
+        }
+
+        #endregion
+
+        [Test]
+        public void ClientEnvironmentIsIgnored()
+        {
+            this.tester.ClientEnvironmentIsIgnored(client => client.Capture(new SentryEvent("Test")));
+        }
+
+
+        [Test]
+        public void ClientLoggerIsIgnored()
+        {
+            this.tester.ClientLoggerIsIgnored(client => client.Capture(new SentryEvent("Test")));
+        }
+
+
+        [Test]
+        public void ClientReleaseIsIgnored()
+        {
+            this.tester.ClientReleaseIsIgnored(client => client.Capture(new SentryEvent("Test")));
+        }
+
+
+        [Test]
+        public void ErrorLevelIsDebug()
+        {
+            this.tester.ErrorLevelIsDebug(client => client.Capture(new SentryEvent("Test") { Level = ErrorLevel.Debug }));
+        }
+
+
+        [Test]
+        public void InvokesSendAndJsonPacketFactoryOnCreate()
+        {
+            var project = Guid.NewGuid().ToString();
+            var client = this.tester.GetTestableRavenClient(project);
+            var result = client.Capture(new SentryEvent("Test"));
+
+            Assert.That(result, Is.EqualTo(project));
+        }
+
+
+        [Test]
+        public void OnlyDefaultTags()
+        {
+            this.tester.OnlyDefaultTags(client => client.Capture(new SentryEvent("Test")));
+        }
+
+
+        [Test]
+        public void OnlyMessageTags()
+        {
+            this.tester.OnlyMessageTags((client, tags) => client.Capture(new SentryEvent("Test")
+            {
+                Level = ErrorLevel.Info,
+                Tags = tags
+            }));
+        }
+
+
+        [Test]
+        public void ScrubberIsInvoked()
+        {
+            this.tester.ScrubberIsInvoked((client, message) => client.Capture(new SentryEvent(message)));
+        }
+
+
+        [Test]
+        public void SendsEnvironment()
+        {
+            this.tester.SendsEnvironment(client => client.Capture(new SentryEvent("Test")));
+        }
+
+
+        [Test]
+        public void SendsLogger()
+        {
+            this.tester.SendsLogger(client => client.Capture(new SentryEvent("Test")));
+        }
+
+
+        [Test]
+        public void SendsRelease()
+        {
+            this.tester.SendsRelease(client => client.Capture(new SentryEvent("Test")));
+        }
+
+
+        [Test]
+        public void TagHandling()
+        {
+            this.tester.TagHandling((client, tags) => client.Capture(new SentryEvent("Test")
+            {
+                Level = ErrorLevel.Info,
+                Tags = tags
+            }));
+        }
+
+
+        private CaptureTester tester;
+    }
+}
\ No newline at end of file
diff --git a/src/tests/SharpRaven.UnitTests/RavenClientTests/RavenClientTests.cs b/src/tests/SharpRaven.UnitTests/RavenClientTests/RavenClientTests.cs
new file mode 100644
index 00000000..456939fb
--- /dev/null
+++ b/src/tests/SharpRaven.UnitTests/RavenClientTests/RavenClientTests.cs
@@ -0,0 +1,82 @@
+#region License
+
+// Copyright (c) 2014 The Sentry Team and individual contributors.
+// All rights reserved.
+// 
+// Redistribution and use in source and binary forms, with or without modification, are permitted
+// provided that the following conditions are met:
+// 
+//     1. Redistributions of source code must retain the above copyright notice, this list of
+//        conditions and the following disclaimer.
+// 
+//     2. Redistributions in binary form must reproduce the above copyright notice, this list of
+//        conditions and the following disclaimer in the documentation and/or other materials
+//        provided with the distribution.
+// 
+//     3. Neither the name of the Sentry nor the names of its contributors may be used to
+//        endorse or promote products derived from this software without specific prior written
+//        permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#endregion
+
+using System;
+
+using NUnit.Framework;
+
+using SharpRaven.UnitTests.Utilities;
+
+namespace SharpRaven.UnitTests.RavenClientTests
+{
+    [TestFixture]
+    public class RavenClientTests
+    {
+        [Test]
+        public void Constructor_NullDsn_ThrowsArgumentNullException()
+        {
+            var exception = Assert.Throws<ArgumentNullException>(() => new RavenClient((Dsn)null));
+            Assert.That(exception.ParamName, Is.EqualTo("dsn"));
+        }
+
+
+        [Test]
+        public void Constructor_NullDsnString_ThrowsArgumentNullException()
+        {
+            var exception = Assert.Throws<ArgumentNullException>(() => new RavenClient((string)null));
+            Assert.That(exception.ParamName, Is.EqualTo("dsn"));
+        }
+
+
+        [Test]
+        public void Constructor_StringDsn_CurrentDsnEqualsDsn()
+        {
+            IRavenClient ravenClient = new RavenClient(TestHelper.DsnUri);
+            Assert.That(ravenClient.CurrentDsn.ToString(), Is.EqualTo(TestHelper.DsnUri));
+        }
+
+
+        [Test]
+        public void Logger_IsRoot()
+        {
+            IRavenClient ravenClient = new RavenClient(TestHelper.DsnUri);
+            Assert.That(ravenClient.Logger, Is.EqualTo("root"));
+        }
+
+
+        [Test]
+        public void Release_IsNullByDefault()
+        {
+            IRavenClient ravenClient = new RavenClient(TestHelper.DsnUri);
+
+            Assert.That(ravenClient.Release, Is.Null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/tests/SharpRaven.UnitTests/SharpRaven.UnitTests.csproj b/src/tests/SharpRaven.UnitTests/SharpRaven.UnitTests.csproj
index 784595c8..a4d251cd 100644
--- a/src/tests/SharpRaven.UnitTests/SharpRaven.UnitTests.csproj
+++ b/src/tests/SharpRaven.UnitTests/SharpRaven.UnitTests.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -13,7 +13,7 @@
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>b8dabe28</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>69e16cb9</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug 4.0|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -90,7 +90,14 @@
     <Compile Include="Helper.cs" />
     <Compile Include="Logging\LogScrubberTests.cs" />
     <Compile Include="Integration\CaptureTests.cs" />
-    <Compile Include="RavenClientTests.cs" />
+    <Compile Include="RavenClientTests\CaptureExceptionTests .cs" />
+    <Compile Include="RavenClientTests\CaptureExceptionAsyncTests.cs" />
+    <Compile Include="RavenClientTests\CaptureTests.cs" />
+    <Compile Include="RavenClientTests\CaptureAsyncTests.cs" />
+    <Compile Include="RavenClientTests\CaptureMessageAsyncTests.cs" />
+    <Compile Include="RavenClientTests\CaptureMessageTests.cs" />
+    <Compile Include="RavenClientTests\CaptureTester.cs" />
+    <Compile Include="RavenClientTests\RavenClientTests.cs" />
     <Compile Include="Utilities\HttpSimulator.cs" />
     <Compile Include="Utilities\PacketBuilderTests.cs" />
     <Compile Include="Utilities\ReflectionHelper.cs" />
@@ -118,12 +125,12 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\packages\GitVersionTask.3.3.0\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets" Condition="Exists('..\..\packages\GitVersionTask.3.3.0\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets') And '$(OS)' != 'Unix'" />
+  <Import Project="..\..\packages\GitVersionTask.3.4.1\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets" Condition="Exists('..\..\packages\GitVersionTask.3.4.1\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets') And '$(OS)' != 'Unix'" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\GitVersionTask.3.3.0\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\GitVersionTask.3.3.0\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets'))" />
+    <Error Condition="!Exists('..\..\packages\GitVersionTask.3.4.1\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\GitVersionTask.3.4.1\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
@@ -132,4 +139,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/tests/SharpRaven.UnitTests/packages.config b/src/tests/SharpRaven.UnitTests/packages.config
index 30972413..3f24fbf5 100644
--- a/src/tests/SharpRaven.UnitTests/packages.config
+++ b/src/tests/SharpRaven.UnitTests/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="GitVersionTask" version="3.3.0" targetFramework="net45" developmentDependency="true" />
+  <package id="GitVersionTask" version="3.4.1" targetFramework="net45" developmentDependency="true" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net40" />
   <package id="NSubstitute" version="1.8.0.0" targetFramework="net40" />
   <package id="NUnit" version="2.6.4" targetFramework="net45" />
diff --git a/src/tests/SharpRaven.WebTest/SharpRaven.WebTest.csproj b/src/tests/SharpRaven.WebTest/SharpRaven.WebTest.csproj
index 9681dcb9..471cec0c 100644
--- a/src/tests/SharpRaven.WebTest/SharpRaven.WebTest.csproj
+++ b/src/tests/SharpRaven.WebTest/SharpRaven.WebTest.csproj
@@ -20,7 +20,7 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>32ad67ca</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>22972567</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug 4.0|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -117,12 +117,12 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-  <Import Project="..\..\packages\GitVersionTask.3.3.0\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets" Condition="Exists('..\..\packages\GitVersionTask.3.3.0\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets') And '$(OS)' != 'Unix'" />
+  <Import Project="..\..\packages\GitVersionTask.3.4.1\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets" Condition="Exists('..\..\packages\GitVersionTask.3.4.1\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets') And '$(OS)' != 'Unix'" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\GitVersionTask.3.3.0\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\GitVersionTask.3.3.0\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets'))" />
+    <Error Condition="!Exists('..\..\packages\GitVersionTask.3.4.1\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\GitVersionTask.3.4.1\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/tests/SharpRaven.WebTest/packages.config b/src/tests/SharpRaven.WebTest/packages.config
index 5db6f12a..67680ed3 100644
--- a/src/tests/SharpRaven.WebTest/packages.config
+++ b/src/tests/SharpRaven.WebTest/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="GitVersionTask" version="3.3.0" targetFramework="net45" developmentDependency="true" />
+  <package id="GitVersionTask" version="3.4.1" targetFramework="net45" developmentDependency="true" />
 </packages>
\ No newline at end of file