diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe
index 9ca6659..e42e6d8 100644
Binary files a/.nuget/NuGet.exe and b/.nuget/NuGet.exe differ
diff --git a/HealthMonitoring.AcceptanceTests/App.config b/HealthMonitoring.AcceptanceTests/App.config
index 4f57e72..062624b 100644
--- a/HealthMonitoring.AcceptanceTests/App.config
+++ b/HealthMonitoring.AcceptanceTests/App.config
@@ -1,17 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-    <section name="lightbdd" type="LightBDD.Configuration.LightBDDConfiguration, LightBDD" />
     <section name="accessConfiguration" type="System.Configuration.NameValueSectionHandler" />
   </configSections>
-  <lightbdd>
-    <summaryWriters>
-      <clear />
-      <add formatter="LightBDD.Results.Formatters.XmlResultFormatter, LightBDD" output="Reports\FeaturesSummary.xml" />
-      <add formatter="LightBDD.Results.Formatters.PlainTextResultFormatter, LightBDD" output="Reports\FeaturesSummary.txt" />
-      <add formatter="LightBDD.Results.Formatters.HtmlResultFormatter, LightBDD" output="Reports\FeaturesSummary.html" />
-    </summaryWriters>
-  </lightbdd>
   <appSettings>
     <add key="WebDriver" value="Chrome" />
     <add key="BaseUrl" value="http://localhost:19000/" />
diff --git a/HealthMonitoring.AcceptanceTests/HealthMonitoring.AcceptanceTests.csproj b/HealthMonitoring.AcceptanceTests/HealthMonitoring.AcceptanceTests.csproj
index 6ab894a..70910c7 100644
--- a/HealthMonitoring.AcceptanceTests/HealthMonitoring.AcceptanceTests.csproj
+++ b/HealthMonitoring.AcceptanceTests/HealthMonitoring.AcceptanceTests.csproj
@@ -37,12 +37,16 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="LightBDD, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\LightBDD.Core.1.7.2.0\lib\net40\LightBDD.dll</HintPath>
+    <Reference Include="LightBDD.Core, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LightBDD.Core.2.1.0.0\lib\net45\LightBDD.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="LightBDD.XUnit, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\LightBDD.XUnit.1.7.2.0\lib\net451\LightBDD.XUnit.dll</HintPath>
+    <Reference Include="LightBDD.Framework, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LightBDD.Framework.2.1.0.0\lib\net46\LightBDD.Framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="LightBDD.XUnit2, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LightBDD.XUnit2.2.1.0.0\lib\net46\LightBDD.XUnit2.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="MySql.Data, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
@@ -102,19 +106,19 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
+      <HintPath>..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
+    <Reference Include="xunit.assert, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
+    <Reference Include="xunit.core, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.core.2.2.0\lib\netstandard1.1\xunit.core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
+    <Reference Include="xunit.execution.desktop, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.execution.2.2.0\lib\net452\xunit.execution.desktop.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -142,7 +146,6 @@
     <Compile Include="Helpers\EndpointStatus.cs" />
     <Compile Include="Helpers\Entities\EndpointEntity.cs" />
     <Compile Include="Helpers\Entities\ErrorEntity.cs" />
-    <Compile Include="Helpers\FormatCollectionAttribute.cs" />
     <Compile Include="Helpers\MonitorTypes.cs" />
     <Compile Include="Helpers\Timeouts.cs" />
     <Compile Include="Scenarios\Endpoint_statistics.cs" />
diff --git a/HealthMonitoring.AcceptanceTests/Helpers/AppDomainExecutor.cs b/HealthMonitoring.AcceptanceTests/Helpers/AppDomainExecutor.cs
index 07e74f9..b5d7c61 100644
--- a/HealthMonitoring.AcceptanceTests/Helpers/AppDomainExecutor.cs
+++ b/HealthMonitoring.AcceptanceTests/Helpers/AppDomainExecutor.cs
@@ -6,14 +6,9 @@ namespace HealthMonitoring.AcceptanceTests.Helpers
 {
     public class AppDomainExecutor
     {
-        private static string _assemblyPath;
-
         public static Tuple<Thread, AppDomain> StartAssembly(string exeRelativePath)
         {
-            if (_assemblyPath == null)
-                throw new InvalidOperationException("AppDomainExecutor not initialized");
-
-            var exePath = Path.GetDirectoryName(_assemblyPath) + "\\" + exeRelativePath;
+            var exePath = AppContext.BaseDirectory + "\\" + exeRelativePath;
 
             var setup = new AppDomainSetup
             {
@@ -40,10 +35,5 @@ public static void KillAppDomain(Tuple<Thread, AppDomain> process)
             }
             catch { }
         }
-
-        public static void Initialize(string assemblyPath)
-        {
-            _assemblyPath = assemblyPath;
-        }
     }
 }
\ No newline at end of file
diff --git a/HealthMonitoring.AcceptanceTests/Helpers/FormatCollectionAttribute.cs b/HealthMonitoring.AcceptanceTests/Helpers/FormatCollectionAttribute.cs
deleted file mode 100644
index 379a53a..0000000
--- a/HealthMonitoring.AcceptanceTests/Helpers/FormatCollectionAttribute.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Collections;
-using System.Linq;
-using LightBDD.Formatting.Parameters;
-
-namespace HealthMonitoring.AcceptanceTests.Helpers
-{
-    class FormatCollectionAttribute : ParameterFormatterAttribute 
-    {
-        public override string Format(object parameter)
-        {
-            var collection=(IEnumerable) parameter;
-            return string.Join(", ", collection.Cast<object>());
-        }
-    }
-}
\ No newline at end of file
diff --git a/HealthMonitoring.AcceptanceTests/Properties/AssemblyInfo.cs b/HealthMonitoring.AcceptanceTests/Properties/AssemblyInfo.cs
index 241823c..8cd0836 100644
--- a/HealthMonitoring.AcceptanceTests/Properties/AssemblyInfo.cs
+++ b/HealthMonitoring.AcceptanceTests/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
-using System.Diagnostics;
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("HealthMonitoring.AcceptanceTests")]
@@ -14,6 +13,3 @@
 [assembly: Guid("8d2cfa8a-f44f-4de2-98bc-b19eb496f003")]
 [assembly: AssemblyVersion("3.9.0.0")]
 [assembly: AssemblyFileVersion("3.9.0.0")]
-
-// Allows to display scenario names properly in Release mode
-[assembly: Debuggable(true, true)]
diff --git a/HealthMonitoring.AcceptanceTests/Scenarios/Endpoint_monitoring_with_specific_monitor_process.Steps.cs b/HealthMonitoring.AcceptanceTests/Scenarios/Endpoint_monitoring_with_specific_monitor_process.Steps.cs
index 6b9761c..16b8839 100644
--- a/HealthMonitoring.AcceptanceTests/Scenarios/Endpoint_monitoring_with_specific_monitor_process.Steps.cs
+++ b/HealthMonitoring.AcceptanceTests/Scenarios/Endpoint_monitoring_with_specific_monitor_process.Steps.cs
@@ -2,10 +2,8 @@
 using System.Net;
 using System.Threading;
 using HealthMonitoring.AcceptanceTests.Helpers;
-using HealthMonitoring.AcceptanceTests.Helpers.Entities;
 using HealthMonitoring.AcceptanceTests.Helpers.Http;
-using HealthMonitoring.AcceptanceTests.Xunit;
-using LightBDD;
+using LightBDD.XUnit2;
 using RestSharp;
 using Xunit.Abstractions;
 
diff --git a/HealthMonitoring.AcceptanceTests/Scenarios/Endpoint_monitoring_with_specific_monitor_process.cs b/HealthMonitoring.AcceptanceTests/Scenarios/Endpoint_monitoring_with_specific_monitor_process.cs
index 7c1f5a5..b154abf 100644
--- a/HealthMonitoring.AcceptanceTests/Scenarios/Endpoint_monitoring_with_specific_monitor_process.cs
+++ b/HealthMonitoring.AcceptanceTests/Scenarios/Endpoint_monitoring_with_specific_monitor_process.cs
@@ -1,5 +1,7 @@
 using HealthMonitoring.AcceptanceTests.Helpers;
-using LightBDD;
+using LightBDD.Framework;
+using LightBDD.Framework.Scenarios.Extended;
+using LightBDD.XUnit2;
 
 namespace HealthMonitoring.AcceptanceTests.Scenarios
 {
diff --git a/HealthMonitoring.AcceptanceTests/Scenarios/Endpoint_registration.Steps.cs b/HealthMonitoring.AcceptanceTests/Scenarios/Endpoint_registration.Steps.cs
index ff10b36..bdcee0d 100644
--- a/HealthMonitoring.AcceptanceTests/Scenarios/Endpoint_registration.Steps.cs
+++ b/HealthMonitoring.AcceptanceTests/Scenarios/Endpoint_registration.Steps.cs
@@ -5,7 +5,8 @@
 using HealthMonitoring.AcceptanceTests.Helpers;
 using HealthMonitoring.AcceptanceTests.Helpers.Entities;
 using HealthMonitoring.AcceptanceTests.Helpers.Http;
-using LightBDD;
+using LightBDD.Framework.Formatting;
+using LightBDD.XUnit2;
 using Newtonsoft.Json;
 using RestSharp;
 using Xunit;
diff --git a/HealthMonitoring.AcceptanceTests/Scenarios/Endpoint_registration.cs b/HealthMonitoring.AcceptanceTests/Scenarios/Endpoint_registration.cs
index 5566390..ea0bde4 100644
--- a/HealthMonitoring.AcceptanceTests/Scenarios/Endpoint_registration.cs
+++ b/HealthMonitoring.AcceptanceTests/Scenarios/Endpoint_registration.cs
@@ -1,6 +1,8 @@
 using System.Net;
 using HealthMonitoring.AcceptanceTests.Helpers;
-using LightBDD;
+using LightBDD.Framework;
+using LightBDD.Framework.Scenarios.Extended;
+using LightBDD.XUnit2;
 
 namespace HealthMonitoring.AcceptanceTests.Scenarios
 {
diff --git a/HealthMonitoring.AcceptanceTests/Scenarios/Endpoint_statistics.Steps.cs b/HealthMonitoring.AcceptanceTests/Scenarios/Endpoint_statistics.Steps.cs
index 270fb7b..af79e22 100644
--- a/HealthMonitoring.AcceptanceTests/Scenarios/Endpoint_statistics.Steps.cs
+++ b/HealthMonitoring.AcceptanceTests/Scenarios/Endpoint_statistics.Steps.cs
@@ -4,7 +4,7 @@
 using System.Threading;
 using HealthMonitoring.AcceptanceTests.Helpers;
 using HealthMonitoring.AcceptanceTests.Helpers.Http;
-using LightBDD;
+using LightBDD.XUnit2;
 using RestSharp;
 using Xunit;
 using Xunit.Abstractions;
diff --git a/HealthMonitoring.AcceptanceTests/Scenarios/Endpoint_statistics.cs b/HealthMonitoring.AcceptanceTests/Scenarios/Endpoint_statistics.cs
index e15e8e0..0eae7ee 100644
--- a/HealthMonitoring.AcceptanceTests/Scenarios/Endpoint_statistics.cs
+++ b/HealthMonitoring.AcceptanceTests/Scenarios/Endpoint_statistics.cs
@@ -1,4 +1,6 @@
-using LightBDD;
+using LightBDD.Framework;
+using LightBDD.Framework.Scenarios.Extended;
+using LightBDD.XUnit2;
 
 namespace HealthMonitoring.AcceptanceTests.Scenarios
 {
diff --git a/HealthMonitoring.AcceptanceTests/Scenarios/Http_endpoint_monitoring.Steps.cs b/HealthMonitoring.AcceptanceTests/Scenarios/Http_endpoint_monitoring.Steps.cs
index 3b13763..862395a 100644
--- a/HealthMonitoring.AcceptanceTests/Scenarios/Http_endpoint_monitoring.Steps.cs
+++ b/HealthMonitoring.AcceptanceTests/Scenarios/Http_endpoint_monitoring.Steps.cs
@@ -3,7 +3,7 @@
 using HealthMonitoring.AcceptanceTests.Helpers;
 using HealthMonitoring.AcceptanceTests.Helpers.Entities;
 using HealthMonitoring.AcceptanceTests.Helpers.Http;
-using LightBDD;
+using LightBDD.XUnit2;
 using RestSharp;
 using Xunit;
 using Xunit.Abstractions;
diff --git a/HealthMonitoring.AcceptanceTests/Scenarios/Http_endpoint_monitoring.cs b/HealthMonitoring.AcceptanceTests/Scenarios/Http_endpoint_monitoring.cs
index 3078708..54745c4 100644
--- a/HealthMonitoring.AcceptanceTests/Scenarios/Http_endpoint_monitoring.cs
+++ b/HealthMonitoring.AcceptanceTests/Scenarios/Http_endpoint_monitoring.cs
@@ -1,5 +1,7 @@
 using HealthMonitoring.AcceptanceTests.Helpers;
-using LightBDD;
+using LightBDD.Framework;
+using LightBDD.Framework.Scenarios.Extended;
+using LightBDD.XUnit2;
 
 namespace HealthMonitoring.AcceptanceTests.Scenarios
 {
diff --git a/HealthMonitoring.AcceptanceTests/Scenarios/Monitors_configuration.Steps.cs b/HealthMonitoring.AcceptanceTests/Scenarios/Monitors_configuration.Steps.cs
index be3f83e..906b91e 100644
--- a/HealthMonitoring.AcceptanceTests/Scenarios/Monitors_configuration.Steps.cs
+++ b/HealthMonitoring.AcceptanceTests/Scenarios/Monitors_configuration.Steps.cs
@@ -1,5 +1,6 @@
 using HealthMonitoring.AcceptanceTests.Helpers;
-using LightBDD;
+using LightBDD.Framework.Formatting;
+using LightBDD.XUnit2;
 using Newtonsoft.Json;
 using RestSharp;
 using Xunit;
diff --git a/HealthMonitoring.AcceptanceTests/Scenarios/Monitors_configuration.cs b/HealthMonitoring.AcceptanceTests/Scenarios/Monitors_configuration.cs
index c8c127c..67a1d86 100644
--- a/HealthMonitoring.AcceptanceTests/Scenarios/Monitors_configuration.cs
+++ b/HealthMonitoring.AcceptanceTests/Scenarios/Monitors_configuration.cs
@@ -1,4 +1,6 @@
-using LightBDD;
+using LightBDD.Framework;
+using LightBDD.Framework.Scenarios.Extended;
+using LightBDD.XUnit2;
 
 namespace HealthMonitoring.AcceptanceTests.Scenarios
 {
diff --git a/HealthMonitoring.AcceptanceTests/Scenarios/Nsb5_Msmq_endpoint_monitoring.Steps.cs b/HealthMonitoring.AcceptanceTests/Scenarios/Nsb5_Msmq_endpoint_monitoring.Steps.cs
index 32eacfa..e519cfe 100644
--- a/HealthMonitoring.AcceptanceTests/Scenarios/Nsb5_Msmq_endpoint_monitoring.Steps.cs
+++ b/HealthMonitoring.AcceptanceTests/Scenarios/Nsb5_Msmq_endpoint_monitoring.Steps.cs
@@ -6,7 +6,7 @@
 using System.Threading;
 using HealthMonitoring.AcceptanceTests.Helpers;
 using HealthMonitoring.AcceptanceTests.Helpers.Entities;
-using LightBDD;
+using LightBDD.XUnit2;
 using RestSharp;
 using Xunit;
 using Xunit.Abstractions;
diff --git a/HealthMonitoring.AcceptanceTests/Scenarios/Nsb5_Msmq_endpoint_monitoring.cs b/HealthMonitoring.AcceptanceTests/Scenarios/Nsb5_Msmq_endpoint_monitoring.cs
index 047d322..6afea15 100644
--- a/HealthMonitoring.AcceptanceTests/Scenarios/Nsb5_Msmq_endpoint_monitoring.cs
+++ b/HealthMonitoring.AcceptanceTests/Scenarios/Nsb5_Msmq_endpoint_monitoring.cs
@@ -1,5 +1,7 @@
 using HealthMonitoring.AcceptanceTests.Helpers;
-using LightBDD;
+using LightBDD.Framework;
+using LightBDD.Framework.Scenarios.Extended;
+using LightBDD.XUnit2;
 
 namespace HealthMonitoring.AcceptanceTests.Scenarios
 {
diff --git a/HealthMonitoring.AcceptanceTests/Scenarios/Nsb5_Rabbitmq_endpoint_monitoring.Steps.cs b/HealthMonitoring.AcceptanceTests/Scenarios/Nsb5_Rabbitmq_endpoint_monitoring.Steps.cs
index 95b2bac..3599fdd 100644
--- a/HealthMonitoring.AcceptanceTests/Scenarios/Nsb5_Rabbitmq_endpoint_monitoring.Steps.cs
+++ b/HealthMonitoring.AcceptanceTests/Scenarios/Nsb5_Rabbitmq_endpoint_monitoring.Steps.cs
@@ -5,7 +5,7 @@
 using System.Threading;
 using HealthMonitoring.AcceptanceTests.Helpers;
 using HealthMonitoring.AcceptanceTests.Helpers.Entities;
-using LightBDD;
+using LightBDD.XUnit2;
 using RabbitMQ.Client;
 using RestSharp;
 using Xunit;
diff --git a/HealthMonitoring.AcceptanceTests/Scenarios/Nsb5_Rabbitmq_endpoint_monitoring.cs b/HealthMonitoring.AcceptanceTests/Scenarios/Nsb5_Rabbitmq_endpoint_monitoring.cs
index cb0074f..a48ced2 100644
--- a/HealthMonitoring.AcceptanceTests/Scenarios/Nsb5_Rabbitmq_endpoint_monitoring.cs
+++ b/HealthMonitoring.AcceptanceTests/Scenarios/Nsb5_Rabbitmq_endpoint_monitoring.cs
@@ -1,5 +1,7 @@
 using HealthMonitoring.AcceptanceTests.Helpers;
-using LightBDD;
+using LightBDD.Framework;
+using LightBDD.Framework.Scenarios.Extended;
+using LightBDD.XUnit2;
 
 namespace HealthMonitoring.AcceptanceTests.Scenarios
 {
diff --git a/HealthMonitoring.AcceptanceTests/Scenarios/Nsb6_RabbitMq_endpoint_monitoring.Steps.cs b/HealthMonitoring.AcceptanceTests/Scenarios/Nsb6_RabbitMq_endpoint_monitoring.Steps.cs
index df132c5..e930369 100644
--- a/HealthMonitoring.AcceptanceTests/Scenarios/Nsb6_RabbitMq_endpoint_monitoring.Steps.cs
+++ b/HealthMonitoring.AcceptanceTests/Scenarios/Nsb6_RabbitMq_endpoint_monitoring.Steps.cs
@@ -1,14 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Net;
 using System.Text.RegularExpressions;
 using System.Threading;
 using HealthMonitoring.AcceptanceTests.Helpers;
 using HealthMonitoring.AcceptanceTests.Helpers.Entities;
-using LightBDD;
-using Newtonsoft.Json;
+using LightBDD.XUnit2;
 using RabbitMQ.Client;
 using RestSharp;
 using Xunit;
diff --git a/HealthMonitoring.AcceptanceTests/Scenarios/Nsb6_RabbitMq_endpoint_monitoring.cs b/HealthMonitoring.AcceptanceTests/Scenarios/Nsb6_RabbitMq_endpoint_monitoring.cs
index e2c71ce..32fdd30 100644
--- a/HealthMonitoring.AcceptanceTests/Scenarios/Nsb6_RabbitMq_endpoint_monitoring.cs
+++ b/HealthMonitoring.AcceptanceTests/Scenarios/Nsb6_RabbitMq_endpoint_monitoring.cs
@@ -1,5 +1,7 @@
 using HealthMonitoring.AcceptanceTests.Helpers;
-using LightBDD;
+using LightBDD.Framework;
+using LightBDD.Framework.Scenarios.Extended;
+using LightBDD.XUnit2;
 
 namespace HealthMonitoring.AcceptanceTests.Scenarios
 {
diff --git a/HealthMonitoring.AcceptanceTests/Scenarios/Nsb_endpoint_monitoring.Steps.cs b/HealthMonitoring.AcceptanceTests/Scenarios/Nsb_endpoint_monitoring.Steps.cs
index c94474c..ccabc89 100644
--- a/HealthMonitoring.AcceptanceTests/Scenarios/Nsb_endpoint_monitoring.Steps.cs
+++ b/HealthMonitoring.AcceptanceTests/Scenarios/Nsb_endpoint_monitoring.Steps.cs
@@ -6,7 +6,7 @@
 using System.Threading;
 using HealthMonitoring.AcceptanceTests.Helpers;
 using HealthMonitoring.AcceptanceTests.Helpers.Entities;
-using LightBDD;
+using LightBDD.XUnit2;
 using RestSharp;
 using Xunit;
 using Xunit.Abstractions;
diff --git a/HealthMonitoring.AcceptanceTests/Scenarios/Nsb_endpoint_monitoring.cs b/HealthMonitoring.AcceptanceTests/Scenarios/Nsb_endpoint_monitoring.cs
index 0ad191d..14b1d8a 100644
--- a/HealthMonitoring.AcceptanceTests/Scenarios/Nsb_endpoint_monitoring.cs
+++ b/HealthMonitoring.AcceptanceTests/Scenarios/Nsb_endpoint_monitoring.cs
@@ -1,5 +1,7 @@
 using HealthMonitoring.AcceptanceTests.Helpers;
-using LightBDD;
+using LightBDD.Framework;
+using LightBDD.Framework.Scenarios.Extended;
+using LightBDD.XUnit2;
 
 namespace HealthMonitoring.AcceptanceTests.Scenarios
 {
diff --git a/HealthMonitoring.AcceptanceTests/Scenarios/Push_endpoint_monitoring.Steps.cs b/HealthMonitoring.AcceptanceTests/Scenarios/Push_endpoint_monitoring.Steps.cs
index c3eb927..9e53069 100644
--- a/HealthMonitoring.AcceptanceTests/Scenarios/Push_endpoint_monitoring.Steps.cs
+++ b/HealthMonitoring.AcceptanceTests/Scenarios/Push_endpoint_monitoring.Steps.cs
@@ -8,7 +8,7 @@
 using HealthMonitoring.AcceptanceTests.Helpers.Entities;
 using HealthMonitoring.Integration.PushClient;
 using HealthMonitoring.Integration.PushClient.Monitoring;
-using LightBDD;
+using LightBDD.XUnit2;
 using RestSharp;
 using Xunit;
 using Xunit.Abstractions;
diff --git a/HealthMonitoring.AcceptanceTests/Scenarios/Push_endpoint_monitoring.cs b/HealthMonitoring.AcceptanceTests/Scenarios/Push_endpoint_monitoring.cs
index d363352..9af106d 100644
--- a/HealthMonitoring.AcceptanceTests/Scenarios/Push_endpoint_monitoring.cs
+++ b/HealthMonitoring.AcceptanceTests/Scenarios/Push_endpoint_monitoring.cs
@@ -1,5 +1,7 @@
 using HealthMonitoring.AcceptanceTests.Helpers;
-using LightBDD;
+using LightBDD.Framework;
+using LightBDD.Framework.Scenarios.Extended;
+using LightBDD.XUnit2;
 
 namespace HealthMonitoring.AcceptanceTests.Scenarios
 {
diff --git a/HealthMonitoring.AcceptanceTests/Scenarios/Rest_endpoint_monitoring.Steps.cs b/HealthMonitoring.AcceptanceTests/Scenarios/Rest_endpoint_monitoring.Steps.cs
index 79eeaf3..987cdf8 100644
--- a/HealthMonitoring.AcceptanceTests/Scenarios/Rest_endpoint_monitoring.Steps.cs
+++ b/HealthMonitoring.AcceptanceTests/Scenarios/Rest_endpoint_monitoring.Steps.cs
@@ -4,7 +4,7 @@
 using HealthMonitoring.AcceptanceTests.Helpers;
 using HealthMonitoring.AcceptanceTests.Helpers.Entities;
 using HealthMonitoring.AcceptanceTests.Helpers.Http;
-using LightBDD;
+using LightBDD.XUnit2;
 using RestSharp;
 using Xunit;
 using Xunit.Abstractions;
diff --git a/HealthMonitoring.AcceptanceTests/Scenarios/Rest_endpoint_monitoring.cs b/HealthMonitoring.AcceptanceTests/Scenarios/Rest_endpoint_monitoring.cs
index f4cc2a4..5a48bb6 100644
--- a/HealthMonitoring.AcceptanceTests/Scenarios/Rest_endpoint_monitoring.cs
+++ b/HealthMonitoring.AcceptanceTests/Scenarios/Rest_endpoint_monitoring.cs
@@ -1,5 +1,7 @@
 using HealthMonitoring.AcceptanceTests.Helpers;
-using LightBDD;
+using LightBDD.Framework;
+using LightBDD.Framework.Scenarios.Extended;
+using LightBDD.XUnit2;
 
 namespace HealthMonitoring.AcceptanceTests.Scenarios
 {
diff --git a/HealthMonitoring.AcceptanceTests/Scenarios/Selenium/Dashboard_page.Steps.cs b/HealthMonitoring.AcceptanceTests/Scenarios/Selenium/Dashboard_page.Steps.cs
index fedb585..0d0b76f 100644
--- a/HealthMonitoring.AcceptanceTests/Scenarios/Selenium/Dashboard_page.Steps.cs
+++ b/HealthMonitoring.AcceptanceTests/Scenarios/Selenium/Dashboard_page.Steps.cs
@@ -3,9 +3,8 @@
 using System.Linq;
 using HealthMonitoring.AcceptanceTests.Helpers;
 using HealthMonitoring.AcceptanceTests.Helpers.Selenium;
-using LightBDD;
+using LightBDD.XUnit2;
 using OpenQA.Selenium;
-using OpenQA.Selenium.Support.UI;
 using RestSharp;
 using Xunit;
 using Xunit.Abstractions;
diff --git a/HealthMonitoring.AcceptanceTests/Scenarios/Selenium/Dashboard_page.cs b/HealthMonitoring.AcceptanceTests/Scenarios/Selenium/Dashboard_page.cs
index 453dbc7..eb41037 100644
--- a/HealthMonitoring.AcceptanceTests/Scenarios/Selenium/Dashboard_page.cs
+++ b/HealthMonitoring.AcceptanceTests/Scenarios/Selenium/Dashboard_page.cs
@@ -1,4 +1,6 @@
-using LightBDD;
+using LightBDD.Framework;
+using LightBDD.Framework.Scenarios.Extended;
+using LightBDD.XUnit2;
 
 namespace HealthMonitoring.AcceptanceTests.Scenarios.Selenium
 {
diff --git a/HealthMonitoring.AcceptanceTests/Scenarios/Selenium/Details_page.Steps.cs b/HealthMonitoring.AcceptanceTests/Scenarios/Selenium/Details_page.Steps.cs
index b02adff..34b9304 100644
--- a/HealthMonitoring.AcceptanceTests/Scenarios/Selenium/Details_page.Steps.cs
+++ b/HealthMonitoring.AcceptanceTests/Scenarios/Selenium/Details_page.Steps.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using HealthMonitoring.AcceptanceTests.Helpers;
 using HealthMonitoring.AcceptanceTests.Helpers.Selenium;
-using LightBDD;
+using LightBDD.XUnit2;
 using OpenQA.Selenium;
 using RestSharp;
 using Xunit;
diff --git a/HealthMonitoring.AcceptanceTests/Scenarios/Selenium/Details_page.cs b/HealthMonitoring.AcceptanceTests/Scenarios/Selenium/Details_page.cs
index 1f6a66e..dc408ad 100644
--- a/HealthMonitoring.AcceptanceTests/Scenarios/Selenium/Details_page.cs
+++ b/HealthMonitoring.AcceptanceTests/Scenarios/Selenium/Details_page.cs
@@ -1,4 +1,6 @@
-using LightBDD;
+using LightBDD.Framework;
+using LightBDD.Framework.Scenarios.Extended;
+using LightBDD.XUnit2;
 
 namespace HealthMonitoring.AcceptanceTests.Scenarios.Selenium
 {
diff --git a/HealthMonitoring.AcceptanceTests/Scenarios/Selenium/Home_page.Steps.cs b/HealthMonitoring.AcceptanceTests/Scenarios/Selenium/Home_page.Steps.cs
index 7e0ed4f..fa4f1d3 100644
--- a/HealthMonitoring.AcceptanceTests/Scenarios/Selenium/Home_page.Steps.cs
+++ b/HealthMonitoring.AcceptanceTests/Scenarios/Selenium/Home_page.Steps.cs
@@ -4,7 +4,7 @@
 using HealthMonitoring.AcceptanceTests.Helpers;
 using HealthMonitoring.AcceptanceTests.Helpers.Selenium;
 using HealthMonitoring.TestUtils;
-using LightBDD;
+using LightBDD.XUnit2;
 using OpenQA.Selenium;
 using RestSharp;
 using Xunit;
diff --git a/HealthMonitoring.AcceptanceTests/Scenarios/Selenium/Home_page.cs b/HealthMonitoring.AcceptanceTests/Scenarios/Selenium/Home_page.cs
index 7c35c84..a6b1fce 100644
--- a/HealthMonitoring.AcceptanceTests/Scenarios/Selenium/Home_page.cs
+++ b/HealthMonitoring.AcceptanceTests/Scenarios/Selenium/Home_page.cs
@@ -1,5 +1,7 @@
 using System;
-using LightBDD;
+using LightBDD.Framework;
+using LightBDD.Framework.Scenarios.Extended;
+using LightBDD.XUnit2;
 
 namespace HealthMonitoring.AcceptanceTests.Scenarios.Selenium
 {
diff --git a/HealthMonitoring.AcceptanceTests/Scenarios/Selenium/Swagger_page.Steps.cs b/HealthMonitoring.AcceptanceTests/Scenarios/Selenium/Swagger_page.Steps.cs
index bbf8d36..0ea9dd5 100644
--- a/HealthMonitoring.AcceptanceTests/Scenarios/Selenium/Swagger_page.Steps.cs
+++ b/HealthMonitoring.AcceptanceTests/Scenarios/Selenium/Swagger_page.Steps.cs
@@ -3,7 +3,7 @@
 using System.Net;
 using HealthMonitoring.AcceptanceTests.Helpers;
 using HealthMonitoring.AcceptanceTests.Helpers.Selenium;
-using LightBDD;
+using LightBDD.XUnit2;
 using Newtonsoft.Json;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Support.UI;
diff --git a/HealthMonitoring.AcceptanceTests/Scenarios/Selenium/Swagger_page.cs b/HealthMonitoring.AcceptanceTests/Scenarios/Selenium/Swagger_page.cs
index e7eb802..d959b0f 100644
--- a/HealthMonitoring.AcceptanceTests/Scenarios/Selenium/Swagger_page.cs
+++ b/HealthMonitoring.AcceptanceTests/Scenarios/Selenium/Swagger_page.cs
@@ -1,6 +1,8 @@
 using System.Net;
 using HealthMonitoring.AcceptanceTests.Helpers;
-using LightBDD;
+using LightBDD.Framework;
+using LightBDD.Framework.Scenarios.Extended;
+using LightBDD.XUnit2;
 
 namespace HealthMonitoring.AcceptanceTests.Scenarios.Selenium
 {
diff --git a/HealthMonitoring.AcceptanceTests/Scenarios/Selenium/WebDriverContext.cs b/HealthMonitoring.AcceptanceTests/Scenarios/Selenium/WebDriverContext.cs
index 2e2c20c..9dfbf3f 100644
--- a/HealthMonitoring.AcceptanceTests/Scenarios/Selenium/WebDriverContext.cs
+++ b/HealthMonitoring.AcceptanceTests/Scenarios/Selenium/WebDriverContext.cs
@@ -1,5 +1,4 @@
 using System;
-using HealthMonitoring.AcceptanceTests.Helpers;
 using HealthMonitoring.AcceptanceTests.Helpers.Selenium;
 using OpenQA.Selenium;
 
diff --git a/HealthMonitoring.AcceptanceTests/Scenarios/Swagger_documentation.Steps.cs b/HealthMonitoring.AcceptanceTests/Scenarios/Swagger_documentation.Steps.cs
index 294595a..a0d6ea0 100644
--- a/HealthMonitoring.AcceptanceTests/Scenarios/Swagger_documentation.Steps.cs
+++ b/HealthMonitoring.AcceptanceTests/Scenarios/Swagger_documentation.Steps.cs
@@ -1,6 +1,6 @@
 using System.Net;
 using HealthMonitoring.AcceptanceTests.Helpers;
-using LightBDD;
+using LightBDD.XUnit2;
 using RestSharp;
 using Xunit;
 using Xunit.Abstractions;
diff --git a/HealthMonitoring.AcceptanceTests/Scenarios/Swagger_documentation.cs b/HealthMonitoring.AcceptanceTests/Scenarios/Swagger_documentation.cs
index df69999..0adedeb 100644
--- a/HealthMonitoring.AcceptanceTests/Scenarios/Swagger_documentation.cs
+++ b/HealthMonitoring.AcceptanceTests/Scenarios/Swagger_documentation.cs
@@ -1,4 +1,6 @@
-using LightBDD;
+using LightBDD.Framework;
+using LightBDD.Framework.Scenarios.Extended;
+using LightBDD.XUnit2;
 
 namespace HealthMonitoring.AcceptanceTests.Scenarios
 {
diff --git a/HealthMonitoring.AcceptanceTests/Scenarios/UI_pages.Steps.cs b/HealthMonitoring.AcceptanceTests/Scenarios/UI_pages.Steps.cs
index 5b38e62..14b0ecf 100644
--- a/HealthMonitoring.AcceptanceTests/Scenarios/UI_pages.Steps.cs
+++ b/HealthMonitoring.AcceptanceTests/Scenarios/UI_pages.Steps.cs
@@ -1,7 +1,7 @@
 using System;
 using HealthMonitoring.AcceptanceTests.Helpers;
 using HealthMonitoring.AcceptanceTests.Helpers.Http;
-using LightBDD;
+using LightBDD.XUnit2;
 using RestSharp;
 using Xunit;
 using Xunit.Abstractions;
diff --git a/HealthMonitoring.AcceptanceTests/Scenarios/UI_pages.cs b/HealthMonitoring.AcceptanceTests/Scenarios/UI_pages.cs
index 0bea359..3e372b0 100644
--- a/HealthMonitoring.AcceptanceTests/Scenarios/UI_pages.cs
+++ b/HealthMonitoring.AcceptanceTests/Scenarios/UI_pages.cs
@@ -1,4 +1,6 @@
-using LightBDD;
+using LightBDD.Framework;
+using LightBDD.Framework.Scenarios.Extended;
+using LightBDD.XUnit2;
 
 namespace HealthMonitoring.AcceptanceTests.Scenarios
 {
diff --git a/HealthMonitoring.AcceptanceTests/Xunit/TestInitialization.cs b/HealthMonitoring.AcceptanceTests/Xunit/TestInitialization.cs
index b202daa..9d0d9bf 100644
--- a/HealthMonitoring.AcceptanceTests/Xunit/TestInitialization.cs
+++ b/HealthMonitoring.AcceptanceTests/Xunit/TestInitialization.cs
@@ -1,31 +1,53 @@
 using System;
-using System.Collections.Generic;
 using System.Configuration;
 using System.Data;
 using System.Linq;
 using System.Net;
-using System.Reflection;
 using System.Threading;
 using HealthMonitoring.AcceptanceTests.Helpers;
+using HealthMonitoring.AcceptanceTests.Xunit;
+using LightBDD.Core.Configuration;
+using LightBDD.Framework.Reporting.Configuration;
+using LightBDD.Framework.Reporting.Formatters;
+using LightBDD.XUnit2;
 using MySql.Data.MySqlClient;
 using Newtonsoft.Json;
 using RestSharp;
-using Xunit;
-using Xunit.Abstractions;
-using Xunit.Sdk;
 
-[assembly: TestFramework("HealthMonitoring.AcceptanceTests.Xunit.TestFramework", "HealthMonitoring.AcceptanceTests")]
+[assembly: ConfiguredLightBddScope]
+
 namespace HealthMonitoring.AcceptanceTests.Xunit
 {
+    class ConfiguredLightBddScopeAttribute : LightBddScopeAttribute
+    {
+        protected override void OnSetUp()
+        {
+            TestInitalization.Initialize();
+        }
+
+        protected override void OnTearDown()
+        {
+            TestInitalization.Terminate();
+        }
+
+        protected override void OnConfigure(LightBddConfiguration configuration)
+        {
+            configuration.ReportWritersConfiguration()
+                .Clear()
+                .AddFileWriter<XmlReportFormatter>(@"~\Reports\FeaturesSummary.xml")
+                .AddFileWriter<HtmlReportFormatter>(@"~\Reports\FeaturesSummary.html")
+                .AddFileWriter<PlainTextReportFormatter>(@"~\Reports\FeaturesSummary.txt");
+        }
+    }
+
     public class TestInitalization
     {
         private static Tuple<Thread, AppDomain> _api;
         private static Tuple<Thread, AppDomain> _monitor;
         private static Tuple<Thread, AppDomain> _nsb6Monitor;
 
-        public static void Initialize(string assemblyPath)
+        public static void Initialize()
         {
-            AppDomainExecutor.Initialize(assemblyPath);
             DeleteDatabase();
 
             _monitor = AppDomainExecutor.StartAssembly("monitor\\HealthMonitoring.Monitors.SelfHost.exe");
@@ -75,41 +97,4 @@ public static void Terminate()
             AppDomainExecutor.KillAppDomain(_nsb6Monitor);
         }
     }
-
-    public class TestFramework : XunitTestFramework
-    {
-        public TestFramework(IMessageSink messageSink)
-            : base(messageSink)
-        {
-        }
-
-        protected override ITestFrameworkExecutor CreateExecutor(AssemblyName assemblyName)
-        {
-            return new ApplicationTestFrameworkExecutor(assemblyName, SourceInformationProvider, DiagnosticMessageSink);
-        }
-    }
-
-    public class ApplicationTestFrameworkExecutor : XunitTestFrameworkExecutor
-    {
-        public ApplicationTestFrameworkExecutor(AssemblyName assemblyName, ISourceInformationProvider sourceInformationProvider, IMessageSink diagnosticMessageSink)
-            : base(assemblyName, sourceInformationProvider, diagnosticMessageSink)
-        {
-        }
-
-        protected override async void RunTestCases(IEnumerable<IXunitTestCase> testCases, IMessageSink executionMessageSink, ITestFrameworkExecutionOptions executionOptions)
-        {
-            TestInitalization.Initialize(TestAssembly.Assembly.AssemblyPath);
-            try
-            {
-                using (XunitTestAssemblyRunner testAssemblyRunner = new XunitTestAssemblyRunner(TestAssembly, testCases, DiagnosticMessageSink, executionMessageSink, executionOptions))
-                {
-                    RunSummary runSummary = await testAssemblyRunner.RunAsync();
-                }
-            }
-            finally
-            {
-                TestInitalization.Terminate();
-            }
-        }
-    }
 }
diff --git a/HealthMonitoring.AcceptanceTests/packages.config b/HealthMonitoring.AcceptanceTests/packages.config
index 63036c3..cea87a2 100644
--- a/HealthMonitoring.AcceptanceTests/packages.config
+++ b/HealthMonitoring.AcceptanceTests/packages.config
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="LightBDD.Core" version="1.7.2.0" targetFramework="net451" />
-  <package id="LightBDD.XUnit" version="1.7.2.0" targetFramework="net451" />
+  <package id="LightBDD.Core" version="2.1.0.0" targetFramework="net46" />
+  <package id="LightBDD.Framework" version="2.1.0.0" targetFramework="net46" />
+  <package id="LightBDD.XUnit2" version="2.1.0.0" targetFramework="net46" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net451" />
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net451" />
   <package id="Microsoft.AspNet.WebApi.SelfHost" version="5.2.3" targetFramework="net451" />
@@ -11,16 +12,16 @@
   <package id="MySql.Data" version="6.9.9" targetFramework="net451" />
   <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />
   <package id="RabbitMQ.Client" version="3.6.3" targetFramework="net451" />
-  <package id="RestSharp" version="105.2.3" targetFramework="net451" />
+  <package id="RestSharp" version="105.2.3" targetFramework="net46" />
   <package id="Selenium.Support" version="3.3.0" targetFramework="net451" />
   <package id="Selenium.WebDriver" version="3.3.0" targetFramework="net451" />
   <package id="Selenium.WebDriver.ChromeDriver" version="2.28.0" targetFramework="net451" />
   <package id="Selenium.WebDriver.IEDriver" version="3.3.0" targetFramework="net451" />
   <package id="SimpleHttpMock" version="1.0.19.0" targetFramework="net451" />
-  <package id="xunit" version="2.1.0" targetFramework="net451" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net451" />
-  <package id="xunit.assert" version="2.1.0" targetFramework="net451" />
-  <package id="xunit.core" version="2.1.0" targetFramework="net451" />
-  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net451" />
-  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net451" />
+  <package id="xunit" version="2.2.0" targetFramework="net46" />
+  <package id="xunit.abstractions" version="2.0.1" targetFramework="net46" />
+  <package id="xunit.assert" version="2.2.0" targetFramework="net46" />
+  <package id="xunit.core" version="2.2.0" targetFramework="net46" />
+  <package id="xunit.extensibility.core" version="2.2.0" targetFramework="net46" />
+  <package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/HealthMonitoring.Api.UnitTests/HealthMonitoring.Api.UnitTests.csproj b/HealthMonitoring.Api.UnitTests/HealthMonitoring.Api.UnitTests.csproj
index 506971f..d98beb5 100644
--- a/HealthMonitoring.Api.UnitTests/HealthMonitoring.Api.UnitTests.csproj
+++ b/HealthMonitoring.Api.UnitTests/HealthMonitoring.Api.UnitTests.csproj
@@ -65,19 +65,19 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
     <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
+      <HintPath>..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
+    <Reference Include="xunit.assert, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
+    <Reference Include="xunit.core, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.core.2.2.0\lib\netstandard1.1\xunit.core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
+    <Reference Include="xunit.execution.desktop, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.execution.2.2.0\lib\net452\xunit.execution.desktop.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
diff --git a/HealthMonitoring.Api.UnitTests/packages.config b/HealthMonitoring.Api.UnitTests/packages.config
index 96ea169..844c46e 100644
--- a/HealthMonitoring.Api.UnitTests/packages.config
+++ b/HealthMonitoring.Api.UnitTests/packages.config
@@ -6,10 +6,10 @@
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net451" />
   <package id="Moq" version="4.5.21" targetFramework="net451" />
   <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />
-  <package id="xunit" version="2.1.0" targetFramework="net451" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net451" />
-  <package id="xunit.assert" version="2.1.0" targetFramework="net451" />
-  <package id="xunit.core" version="2.1.0" targetFramework="net451" />
-  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net451" />
-  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net451" />
+  <package id="xunit" version="2.2.0" targetFramework="net46" />
+  <package id="xunit.abstractions" version="2.0.1" targetFramework="net46" />
+  <package id="xunit.assert" version="2.2.0" targetFramework="net46" />
+  <package id="xunit.core" version="2.2.0" targetFramework="net46" />
+  <package id="xunit.extensibility.core" version="2.2.0" targetFramework="net46" />
+  <package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/HealthMonitoring.Integration.PushClient.UnitTests/HealthMonitoring.Integration.PushClient.UnitTests.csproj b/HealthMonitoring.Integration.PushClient.UnitTests/HealthMonitoring.Integration.PushClient.UnitTests.csproj
index f72f6e1..8d21ae9 100644
--- a/HealthMonitoring.Integration.PushClient.UnitTests/HealthMonitoring.Integration.PushClient.UnitTests.csproj
+++ b/HealthMonitoring.Integration.PushClient.UnitTests/HealthMonitoring.Integration.PushClient.UnitTests.csproj
@@ -48,19 +48,19 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
     <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
+      <HintPath>..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
+    <Reference Include="xunit.assert, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
+    <Reference Include="xunit.core, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.core.2.2.0\lib\netstandard1.1\xunit.core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
+    <Reference Include="xunit.execution.desktop, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.execution.2.2.0\lib\net452\xunit.execution.desktop.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
diff --git a/HealthMonitoring.Integration.PushClient.UnitTests/packages.config b/HealthMonitoring.Integration.PushClient.UnitTests/packages.config
index 7d7f87e..0aa8f52 100644
--- a/HealthMonitoring.Integration.PushClient.UnitTests/packages.config
+++ b/HealthMonitoring.Integration.PushClient.UnitTests/packages.config
@@ -2,10 +2,10 @@
 <packages>
   <package id="Castle.Core" version="3.3.3" targetFramework="net451" />
   <package id="Moq" version="4.5.21" targetFramework="net451" />
-  <package id="xunit" version="2.1.0" targetFramework="net451" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net451" />
-  <package id="xunit.assert" version="2.1.0" targetFramework="net451" />
-  <package id="xunit.core" version="2.1.0" targetFramework="net451" />
-  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net451" />
-  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net451" />
+  <package id="xunit" version="2.2.0" targetFramework="net46" />
+  <package id="xunit.abstractions" version="2.0.1" targetFramework="net46" />
+  <package id="xunit.assert" version="2.2.0" targetFramework="net46" />
+  <package id="xunit.core" version="2.2.0" targetFramework="net46" />
+  <package id="xunit.extensibility.core" version="2.2.0" targetFramework="net46" />
+  <package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/HealthMonitoring.Management.Core.UnitTests/HealthMonitoring.Management.Core.UnitTests.csproj b/HealthMonitoring.Management.Core.UnitTests/HealthMonitoring.Management.Core.UnitTests.csproj
index fc91295..3df4c93 100644
--- a/HealthMonitoring.Management.Core.UnitTests/HealthMonitoring.Management.Core.UnitTests.csproj
+++ b/HealthMonitoring.Management.Core.UnitTests/HealthMonitoring.Management.Core.UnitTests.csproj
@@ -48,19 +48,19 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
     <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
+      <HintPath>..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
+    <Reference Include="xunit.assert, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
+    <Reference Include="xunit.core, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.core.2.2.0\lib\netstandard1.1\xunit.core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
+    <Reference Include="xunit.execution.desktop, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.execution.2.2.0\lib\net452\xunit.execution.desktop.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
diff --git a/HealthMonitoring.Management.Core.UnitTests/packages.config b/HealthMonitoring.Management.Core.UnitTests/packages.config
index 7d7f87e..0aa8f52 100644
--- a/HealthMonitoring.Management.Core.UnitTests/packages.config
+++ b/HealthMonitoring.Management.Core.UnitTests/packages.config
@@ -2,10 +2,10 @@
 <packages>
   <package id="Castle.Core" version="3.3.3" targetFramework="net451" />
   <package id="Moq" version="4.5.21" targetFramework="net451" />
-  <package id="xunit" version="2.1.0" targetFramework="net451" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net451" />
-  <package id="xunit.assert" version="2.1.0" targetFramework="net451" />
-  <package id="xunit.core" version="2.1.0" targetFramework="net451" />
-  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net451" />
-  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net451" />
+  <package id="xunit" version="2.2.0" targetFramework="net46" />
+  <package id="xunit.abstractions" version="2.0.1" targetFramework="net46" />
+  <package id="xunit.assert" version="2.2.0" targetFramework="net46" />
+  <package id="xunit.core" version="2.2.0" targetFramework="net46" />
+  <package id="xunit.extensibility.core" version="2.2.0" targetFramework="net46" />
+  <package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/HealthMonitoring.Monitors.Core.UnitTests/HealthMonitoring.Monitors.Core.UnitTests.csproj b/HealthMonitoring.Monitors.Core.UnitTests/HealthMonitoring.Monitors.Core.UnitTests.csproj
index 7b5085b..bfab8c8 100644
--- a/HealthMonitoring.Monitors.Core.UnitTests/HealthMonitoring.Monitors.Core.UnitTests.csproj
+++ b/HealthMonitoring.Monitors.Core.UnitTests/HealthMonitoring.Monitors.Core.UnitTests.csproj
@@ -43,19 +43,19 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Net.Http" />
     <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
+      <HintPath>..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
+    <Reference Include="xunit.assert, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
+    <Reference Include="xunit.core, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.core.2.2.0\lib\netstandard1.1\xunit.core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
+    <Reference Include="xunit.execution.desktop, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.execution.2.2.0\lib\net452\xunit.execution.desktop.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
diff --git a/HealthMonitoring.Monitors.Core.UnitTests/packages.config b/HealthMonitoring.Monitors.Core.UnitTests/packages.config
index 7d7f87e..0aa8f52 100644
--- a/HealthMonitoring.Monitors.Core.UnitTests/packages.config
+++ b/HealthMonitoring.Monitors.Core.UnitTests/packages.config
@@ -2,10 +2,10 @@
 <packages>
   <package id="Castle.Core" version="3.3.3" targetFramework="net451" />
   <package id="Moq" version="4.5.21" targetFramework="net451" />
-  <package id="xunit" version="2.1.0" targetFramework="net451" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net451" />
-  <package id="xunit.assert" version="2.1.0" targetFramework="net451" />
-  <package id="xunit.core" version="2.1.0" targetFramework="net451" />
-  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net451" />
-  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net451" />
+  <package id="xunit" version="2.2.0" targetFramework="net46" />
+  <package id="xunit.abstractions" version="2.0.1" targetFramework="net46" />
+  <package id="xunit.assert" version="2.2.0" targetFramework="net46" />
+  <package id="xunit.core" version="2.2.0" targetFramework="net46" />
+  <package id="xunit.extensibility.core" version="2.2.0" targetFramework="net46" />
+  <package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/HealthMonitoring.TestUtils/HealthMonitoring.TestUtils.csproj b/HealthMonitoring.TestUtils/HealthMonitoring.TestUtils.csproj
index bc8c0b7..57508c2 100644
--- a/HealthMonitoring.TestUtils/HealthMonitoring.TestUtils.csproj
+++ b/HealthMonitoring.TestUtils/HealthMonitoring.TestUtils.csproj
@@ -42,8 +42,8 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
+    <Reference Include="xunit.assert, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
diff --git a/HealthMonitoring.TestUtils/packages.config b/HealthMonitoring.TestUtils/packages.config
index 37a4d25..35385b2 100644
--- a/HealthMonitoring.TestUtils/packages.config
+++ b/HealthMonitoring.TestUtils/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="xunit.assert" version="2.1.0" targetFramework="net451" />
+  <package id="xunit.assert" version="2.2.0" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/HealthMonitoring.UnitTests/HealthMonitoring.UnitTests.csproj b/HealthMonitoring.UnitTests/HealthMonitoring.UnitTests.csproj
index d7d857e..32be61f 100644
--- a/HealthMonitoring.UnitTests/HealthMonitoring.UnitTests.csproj
+++ b/HealthMonitoring.UnitTests/HealthMonitoring.UnitTests.csproj
@@ -48,19 +48,19 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
     <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
+      <HintPath>..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
+    <Reference Include="xunit.assert, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
+    <Reference Include="xunit.core, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.core.2.2.0\lib\netstandard1.1\xunit.core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
+    <Reference Include="xunit.execution.desktop, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.execution.2.2.0\lib\net452\xunit.execution.desktop.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
diff --git a/HealthMonitoring.UnitTests/packages.config b/HealthMonitoring.UnitTests/packages.config
index 7d7f87e..0aa8f52 100644
--- a/HealthMonitoring.UnitTests/packages.config
+++ b/HealthMonitoring.UnitTests/packages.config
@@ -2,10 +2,10 @@
 <packages>
   <package id="Castle.Core" version="3.3.3" targetFramework="net451" />
   <package id="Moq" version="4.5.21" targetFramework="net451" />
-  <package id="xunit" version="2.1.0" targetFramework="net451" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net451" />
-  <package id="xunit.assert" version="2.1.0" targetFramework="net451" />
-  <package id="xunit.core" version="2.1.0" targetFramework="net451" />
-  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net451" />
-  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net451" />
+  <package id="xunit" version="2.2.0" targetFramework="net46" />
+  <package id="xunit.abstractions" version="2.0.1" targetFramework="net46" />
+  <package id="xunit.assert" version="2.2.0" targetFramework="net46" />
+  <package id="xunit.core" version="2.2.0" targetFramework="net46" />
+  <package id="xunit.extensibility.core" version="2.2.0" targetFramework="net46" />
+  <package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net46" />
 </packages>
\ No newline at end of file