diff --git a/Build/MQTTnet.AspNetCore.nuspec b/Build/MQTTnet.AspNetCore.nuspec
index df0b9a4f..9cf4005e 100644
--- a/Build/MQTTnet.AspNetCore.nuspec
+++ b/Build/MQTTnet.AspNetCore.nuspec
@@ -13,7 +13,7 @@
     <releaseNotes>initial version
     </releaseNotes>
     <copyright>Copyright Christian Kratky 2016-2017</copyright>
-    <tags>MQTT Message Queue Telemetry Transport MQTTClient MQTTServer Server MQTTBroker Broker NETStandard IoT InternetOfThings Messaging Hardware Arduino Sensor Actuator M2M ESP Smart Home Cities Automation</tags> 
+    <tags>MQTT Message Queue Telemetry Transport MQTTClient MQTTServer Server MQTTBroker Broker NETStandard IoT InternetOfThings Messaging Hardware Arduino Sensor Actuator M2M ESP Smart Home Cities Automation Xamarin</tags> 
     <dependencies>
       <group targetFramework="netstandard2.0">
         <dependency id="MQTTnet" version="2.5" />
diff --git a/Build/MQTTnet.nuspec b/Build/MQTTnet.nuspec
index e8169020..4631f247 100644
--- a/Build/MQTTnet.nuspec
+++ b/Build/MQTTnet.nuspec
@@ -28,7 +28,7 @@
 * [Server] Added support for a custom subscription interceptor which allows denying of subscriptions and closing the connection
     </releaseNotes>
     <copyright>Copyright Christian Kratky 2016-2017</copyright>
-    <tags>MQTT Message Queue Telemetry Transport MQTTClient MQTTServer Server MQTTBroker Broker NETStandard IoT InternetOfThings Messaging Hardware Arduino Sensor Actuator M2M ESP Smart Home Cities Automation</tags> 
+    <tags>MQTT Message Queue Telemetry Transport MQTTClient MQTTServer Server MQTTBroker Broker NETStandard IoT InternetOfThings Messaging Hardware Arduino Sensor Actuator M2M ESP Smart Home Cities Automation Xamarin</tags> 
     <dependencies>
 
       <group targetFramework="netstandard1.3">
diff --git a/Tests/MQTTnet.Core.Tests/MqttPacketReaderTests.cs b/Tests/MQTTnet.Core.Tests/MqttPacketReaderTests.cs
new file mode 100644
index 00000000..6800e6ce
--- /dev/null
+++ b/Tests/MQTTnet.Core.Tests/MqttPacketReaderTests.cs
@@ -0,0 +1,20 @@
+using System.IO;
+using System.Threading;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using MQTTnet.Core.Serializer;
+
+namespace MQTTnet.Core.Tests
+{
+    [TestClass]
+    public class MqttPacketReaderTests
+    {
+        [TestMethod]
+        public void MqttPacketReader_EmptyStream()
+        {
+            var memStream = new MemoryStream();
+            var header = MqttPacketReader.ReadHeaderFromSource(memStream, CancellationToken.None);
+
+            Assert.IsNull(header);
+        }
+    }
+}
diff --git a/Tests/MQTTnet.Core.Tests/MqttServerTests.cs b/Tests/MQTTnet.Core.Tests/MqttServerTests.cs
index 3f5b4cf6..106eca6e 100644
--- a/Tests/MQTTnet.Core.Tests/MqttServerTests.cs
+++ b/Tests/MQTTnet.Core.Tests/MqttServerTests.cs
@@ -274,8 +274,8 @@ namespace MQTTnet.Core.Tests
         public async Task MqttServer_PersistRetainedMessage()
         {
             var storage = new TestStorage();
-
             var serverAdapter = new TestMqttServerAdapter();
+
             var services = new ServiceCollection()
                 .AddLogging()
                 .AddMqttServer()
@@ -297,7 +297,7 @@ namespace MQTTnet.Core.Tests
                 await s.StopAsync();
             }
 
-            s = services.GetRequiredService<IMqttServer>();
+            s = new MqttFactory(services).CreateMqttServer(options => options.Storage = storage);
 
             var receivedMessagesCount = 0;
             try