diff --git a/appveyor.yml b/appveyor.yml
index e8735b2..d8db4c9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 2.2.3.{build}
+version: 2.2.4.{build}
 configuration: Release
 before_build:
 - cd src
@@ -16,4 +16,3 @@ artifacts:
 - name: Packages
   path: .\output\*.nupkg
 ...
-
diff --git a/devops/deploy/LogoFX.Client.Testing.Shared.csproj b/devops/deploy/LogoFX.Client.Testing.Shared.csproj
new file mode 100644
index 0000000..a4d68d2
--- /dev/null
+++ b/devops/deploy/LogoFX.Client.Testing.Shared.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <Version>2.2.4</Version>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <OutputPath>..\Bin\netstandard\Release</OutputPath>
+    <DocumentationFile>..\Bin\netstandard\Release\LogoFX.Client.Testing.Shared.xml</DocumentationFile>
+    <EmbedAllSources>True</EmbedAllSources>
+    <DebugType>embedded</DebugType>
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="LogoFX.Client.Core.Core" Version="2.2.4" />
+    <PackageReference Include="Solid.Practices.Scheduling" Version="2.3.2" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\LogoFX.Client.Testing.Infra\LogoFX.Client.Testing.Infra.csproj" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/devops/deploy/deploy-all.bat b/devops/deploy/deploy-all.bat
index 6dcd73c..21f1784 100644
--- a/devops/deploy/deploy-all.bat
+++ b/devops/deploy/deploy-all.bat
@@ -1,5 +1,5 @@
 rem TODO: Use common source for all version instances
-SET version=2.2.3
+SET version=2.2.4
 rem TODO: Refactor using loop and automatic discovery
 call deploy-single.bat LogoFX.Client.Tests.Contracts %version% 
 call deploy-single.bat LogoFX.Client.Tests.Shared %version%
diff --git a/devops/deploy/publish-all.bat b/devops/deploy/publish-all.bat
new file mode 100644
index 0000000..6a9cd01
--- /dev/null
+++ b/devops/deploy/publish-all.bat
@@ -0,0 +1,12 @@
+cd ../../src
+nuget restore
+cd ../devops/publish
+PowerShell -NoProfile -ExecutionPolicy Bypass -Command "& '../build/build-all.ps1'"
+SET package_version=2.2.4
+cd ../pack
+call pack-all
+cd ../publish
+call copy-all %package_version%
+cd ../install
+call uninstall-global-all.bat %package_version%
+cd ..
\ No newline at end of file
diff --git a/devops/pack/LogoFX.Client.Testing.EndToEnd.FlaUI/contents/LogoFX.Client.Testing.EndToEnd.FlaUI.nuspec b/devops/pack/LogoFX.Client.Testing.EndToEnd.FlaUI/contents/LogoFX.Client.Testing.EndToEnd.FlaUI.nuspec
index 97d3f34..1d74061 100644
--- a/devops/pack/LogoFX.Client.Testing.EndToEnd.FlaUI/contents/LogoFX.Client.Testing.EndToEnd.FlaUI.nuspec
+++ b/devops/pack/LogoFX.Client.Testing.EndToEnd.FlaUI/contents/LogoFX.Client.Testing.EndToEnd.FlaUI.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>LogoFX.Client.Testing.EndToEnd.FlaUI</id>
-    <version>2.2.3</version>
+    <version>2.2.4</version>
     <title>LogoFX.Client.Testing.EndToEnd.FlaUI</title>
     <authors>Gennady Verdel</authors>
     <owners>Gennady Verdel</owners>
@@ -14,7 +14,7 @@
     <summary>LogoFX Client Testing EndToEnd FlaUI containing implementation of Application Facade using FlaUI.</summary>
     <releaseNotes>Initial release</releaseNotes>
     <dependencies>
-      <dependency id="Attest.Testing.Contracts" version="2.4.1" />
+      <dependency id="Attest.Testing.Contracts" version="2.4.2" />
       <dependency id="FlaUI.Core" version="3.0.0" />
     </dependencies>
     <tags>framework logofx dotnet</tags>
diff --git a/devops/pack/LogoFX.Client.Testing.EndToEnd.SpecFlow/contents/LogoFX.Client.Testing.EndToEnd.SpecFlow.nuspec b/devops/pack/LogoFX.Client.Testing.EndToEnd.SpecFlow/contents/LogoFX.Client.Testing.EndToEnd.SpecFlow.nuspec
index 8a2f4ec..12540de 100644
--- a/devops/pack/LogoFX.Client.Testing.EndToEnd.SpecFlow/contents/LogoFX.Client.Testing.EndToEnd.SpecFlow.nuspec
+++ b/devops/pack/LogoFX.Client.Testing.EndToEnd.SpecFlow/contents/LogoFX.Client.Testing.EndToEnd.SpecFlow.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>LogoFX.Client.Testing.EndToEnd.SpecFlow</id>
-    <version>2.2.3</version>
+    <version>2.2.4</version>
     <title>LogoFX.Client.Testing.EndToEnd.SpecFlow</title>
     <authors>Gennady Verdel</authors>
     <owners>Gennady Verdel</owners>
@@ -14,9 +14,9 @@
     <summary>LogoFX Client Tests SpecFlow containing base class for SpecFlow bridge.</summary>
     <releaseNotes>Added support for scenario data store.</releaseNotes>
     <dependencies>
-      <dependency id="Attest.Testing.Contracts" version="2.4.1" />
-      <dependency id="Attest.Tests.Core" version="2.4.1" />
-      <dependency id="Attest.Tests.SpecFlow" version="2.4.1" />
+      <dependency id="Attest.Testing.Contracts" version="2.4.2" />
+      <dependency id="Attest.Tests.Core" version="2.4.2" />
+      <dependency id="Attest.Tests.SpecFlow" version="2.4.2" />
     </dependencies>
     <tags>framework logofx dotnet</tags>
     <repository type="Open Source" url="https://github.com/LogoFX/testing" />
diff --git a/devops/pack/LogoFX.Client.Testing.EndToEnd.White/contents/LogoFX.Client.Testing.EndToEnd.White.nuspec b/devops/pack/LogoFX.Client.Testing.EndToEnd.White/contents/LogoFX.Client.Testing.EndToEnd.White.nuspec
index 6ff6c02..ffbb39b 100644
--- a/devops/pack/LogoFX.Client.Testing.EndToEnd.White/contents/LogoFX.Client.Testing.EndToEnd.White.nuspec
+++ b/devops/pack/LogoFX.Client.Testing.EndToEnd.White/contents/LogoFX.Client.Testing.EndToEnd.White.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>LogoFX.Client.Testing.EndToEnd.White</id>
-    <version>2.2.3</version>
+    <version>2.2.4</version>
     <title>LogoFX.Client.Testing.EndToEnd.White</title>
     <authors>Gennady Verdel</authors>
     <owners>Gennady Verdel</owners>
@@ -15,7 +15,7 @@
     <releaseNotes>
     </releaseNotes>
     <dependencies>
-      <dependency id="Attest.Testing.Contracts" version="2.4.1" />
+      <dependency id="Attest.Testing.Contracts" version="2.4.2" />
       <dependency id="TestStack.White" version="0.13.3" />
     </dependencies>
     <tags>framework logofx dotnet</tags>
diff --git a/devops/pack/LogoFX.Client.Testing.Integration.xUnit/contents/LogoFX.Client.Testing.Integration.xUnit.nuspec b/devops/pack/LogoFX.Client.Testing.Integration.xUnit/contents/LogoFX.Client.Testing.Integration.xUnit.nuspec
index 3a62334..f703e5c 100644
--- a/devops/pack/LogoFX.Client.Testing.Integration.xUnit/contents/LogoFX.Client.Testing.Integration.xUnit.nuspec
+++ b/devops/pack/LogoFX.Client.Testing.Integration.xUnit/contents/LogoFX.Client.Testing.Integration.xUnit.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>LogoFX.Client.Testing.Integration.xUnit</id>
-    <version>2.2.3</version>
+    <version>2.2.4</version>
     <title>LogoFX.Client.Testing.Integration.xUnit</title>
     <authors>Gennady Verdel</authors>
     <owners>Gennady Verdel</owners>
@@ -18,10 +18,10 @@ and base class for unit and integration tests.</summary>
     <dependencies>
       <dependency id="Solid.Core" version="2.3.2" />
       <dependency id="Solid.Patterns.Builder" version="2.3.2" />
-      <dependency id="Attest.Testing.Contracts" version="2.4.1" />
-      <dependency id="Attest.Tests.Core" version="2.4.1" />
-      <dependency id="Attest.Tests.xUnit" version="2.4.1" />
-      <dependency id="LogoFX.Client.Tests.Shared" version="2.2.3" />
+      <dependency id="Attest.Testing.Contracts" version="2.4.2" />
+      <dependency id="Attest.Tests.Core" version="2.4.2" />
+      <dependency id="Attest.Tests.xUnit" version="2.4.2" />
+      <dependency id="LogoFX.Client.Tests.Shared" version="2.2.4" />
     </dependencies>
     <tags>framework logofx dotnet</tags>
     <repository type="Open Source" url="https://github.com/LogoFX/testing" />
diff --git a/devops/pack/LogoFX.Client.Tests.Contracts/contents/LogoFX.Client.Tests.Contracts.nuspec b/devops/pack/LogoFX.Client.Tests.Contracts/contents/LogoFX.Client.Tests.Contracts.nuspec
index 4f0622b..08e8d5a 100644
--- a/devops/pack/LogoFX.Client.Tests.Contracts/contents/LogoFX.Client.Tests.Contracts.nuspec
+++ b/devops/pack/LogoFX.Client.Tests.Contracts/contents/LogoFX.Client.Tests.Contracts.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>LogoFX.Client.Tests.Contracts</id>
-    <version>2.2.3</version>
+    <version>2.2.4</version>
     <title>LogoFX.Client.Testing.Contracts</title>
     <authors>Gennady Verdel</authors>
     <owners>Gennady Verdel</owners>
diff --git a/devops/pack/LogoFX.Client.Tests.EndToEnd/contents/LogoFX.Client.Tests.EndToEnd.nuspec b/devops/pack/LogoFX.Client.Tests.EndToEnd/contents/LogoFX.Client.Tests.EndToEnd.nuspec
index d2aecbb..b4fe669 100644
--- a/devops/pack/LogoFX.Client.Tests.EndToEnd/contents/LogoFX.Client.Tests.EndToEnd.nuspec
+++ b/devops/pack/LogoFX.Client.Tests.EndToEnd/contents/LogoFX.Client.Tests.EndToEnd.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>LogoFX.Client.Tests.EndToEnd</id>
-    <version>2.2.3</version>
+    <version>2.2.4</version>
     <title>LogoFX.Client.Testing.EndToEnd</title>
     <authors>Gennady Verdel</authors>
     <owners>Gennady Verdel</owners>
@@ -15,8 +15,8 @@
     <releaseNotes>
     </releaseNotes>
     <dependencies>
-      <dependency id="Attest.Testing.Contracts" version="2.4.1" />
-      <dependency id="LogoFX.Client.Tests.Contracts" version="2.2.3" />
+      <dependency id="Attest.Testing.Contracts" version="2.4.2" />
+      <dependency id="LogoFX.Client.Tests.Contracts" version="2.2.4" />
     </dependencies>
     <tags>framework logofx dotnet</tags>
     <repository type="Open Source" url="https://github.com/LogoFX/testing" />
diff --git a/devops/pack/LogoFX.Client.Tests.Integration.NUnit/contents/LogoFX.Client.Tests.Integration.NUnit.nuspec b/devops/pack/LogoFX.Client.Tests.Integration.NUnit/contents/LogoFX.Client.Tests.Integration.NUnit.nuspec
index f03b059..b6dc6c8 100644
--- a/devops/pack/LogoFX.Client.Tests.Integration.NUnit/contents/LogoFX.Client.Tests.Integration.NUnit.nuspec
+++ b/devops/pack/LogoFX.Client.Tests.Integration.NUnit/contents/LogoFX.Client.Tests.Integration.NUnit.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>LogoFX.Client.Tests.Integration.NUnit</id>
-    <version>2.2.3</version>
+    <version>2.2.4</version>
     <title>LogoFX.Client.Testing.Integration.NUnit</title>
     <authors>Gennady Verdel</authors>
     <owners>Gennady Verdel</owners>
@@ -16,10 +16,10 @@
     <dependencies>
       <dependency id="Solid.Core" version="2.3.2" />
       <dependency id="Solid.Patterns.Builder" version="2.3.2" />
-      <dependency id="Attest.Testing.Contracts" version="2.4.1" />
-      <dependency id="Attest.Tests.Core" version="2.4.1" />
-      <dependency id="Attest.Tests.NUnit" version="2.4.1" />
-      <dependency id="LogoFX.Client.Tests.Shared" version="2.2.3" />
+      <dependency id="Attest.Testing.Contracts" version="2.4.2" />
+      <dependency id="Attest.Tests.Core" version="2.4.2" />
+      <dependency id="Attest.Tests.NUnit" version="2.4.2" />
+      <dependency id="LogoFX.Client.Tests.Shared" version="2.2.4" />
     </dependencies>
     <tags>framework logofx dotnet</tags>
     <repository type="Open Source" url="https://github.com/LogoFX/testing" />
diff --git a/devops/pack/LogoFX.Client.Tests.Integration.SpecFlow/contents/LogoFX.Client.Tests.Integration.SpecFlow.nuspec b/devops/pack/LogoFX.Client.Tests.Integration.SpecFlow/contents/LogoFX.Client.Tests.Integration.SpecFlow.nuspec
index aa6019d..9c376a0 100644
--- a/devops/pack/LogoFX.Client.Tests.Integration.SpecFlow/contents/LogoFX.Client.Tests.Integration.SpecFlow.nuspec
+++ b/devops/pack/LogoFX.Client.Tests.Integration.SpecFlow/contents/LogoFX.Client.Tests.Integration.SpecFlow.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>LogoFX.Client.Tests.Integration.SpecFlow</id>
-    <version>2.2.3</version>
+    <version>2.2.4</version>
     <title>LogoFX.Client.Testing.Integration.SpecFlow</title>
     <authors>Gennady Verdel</authors>
     <owners>Gennady Verdel</owners>
@@ -17,10 +17,10 @@
       <dependency id="Solid.Practices.IoC" version="2.3.2" />
       <dependency id="Solid.Patterns.Builder" version="2.3.2" />
       <dependency id="Solid.Core" version="2.3.2" />
-      <dependency id="Attest.Testing.Contracts" version="2.4.1" />
-      <dependency id="Attest.Tests.Core" version="2.4.1" />
-      <dependency id="Attest.Tests.SpecFlow" version="2.4.1" />
-      <dependency id="LogoFX.Client.Tests.Shared" version="2.2.3" />
+      <dependency id="Attest.Testing.Contracts" version="2.4.2" />
+      <dependency id="Attest.Tests.Core" version="2.4.2" />
+      <dependency id="Attest.Tests.SpecFlow" version="2.4.2" />
+      <dependency id="LogoFX.Client.Tests.Shared" version="2.2.4" />
     </dependencies>
     <tags>framework logofx dotnet</tags>
     <repository type="Open Source" url="https://github.com/LogoFX/testing" />
diff --git a/devops/pack/LogoFX.Client.Tests.Integration/contents/LogoFX.Client.Tests.Integration.nuspec b/devops/pack/LogoFX.Client.Tests.Integration/contents/LogoFX.Client.Tests.Integration.nuspec
index 1e0c487..ca49e07 100644
--- a/devops/pack/LogoFX.Client.Tests.Integration/contents/LogoFX.Client.Tests.Integration.nuspec
+++ b/devops/pack/LogoFX.Client.Tests.Integration/contents/LogoFX.Client.Tests.Integration.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>LogoFX.Client.Tests.Integration</id>
-    <version>2.2.3</version>
+    <version>2.2.4</version>
     <title>LogoFX.Client.Testing.Integration</title>
     <authors>Gennady Verdel</authors>
     <owners>Gennady Verdel</owners>
@@ -15,8 +15,8 @@
     <releaseNotes>
     </releaseNotes>
     <dependencies>
-      <dependency id="Attest.Testing.Contracts" version="2.4.1" />
-      <dependency id="LogoFX.Client.Tests.Contracts" version="2.2.3" />
+      <dependency id="Attest.Testing.Contracts" version="2.4.2" />
+      <dependency id="LogoFX.Client.Tests.Contracts" version="2.2.4" />
     </dependencies>
     <tags>framework logofx dotnet</tags>
     <repository type="Open Source" url="https://github.com/LogoFX/testing" />
diff --git a/devops/pack/LogoFX.Client.Tests.Shared.Caliburn.Micro/contents/LogoFX.Client.Tests.Shared.Caliburn.Micro.nuspec b/devops/pack/LogoFX.Client.Tests.Shared.Caliburn.Micro/contents/LogoFX.Client.Tests.Shared.Caliburn.Micro.nuspec
index 90a9456..28afbef 100644
--- a/devops/pack/LogoFX.Client.Tests.Shared.Caliburn.Micro/contents/LogoFX.Client.Tests.Shared.Caliburn.Micro.nuspec
+++ b/devops/pack/LogoFX.Client.Tests.Shared.Caliburn.Micro/contents/LogoFX.Client.Tests.Shared.Caliburn.Micro.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>LogoFX.Client.Tests.Shared.Caliburn.Micro</id>
-    <version>2.2.3</version>
+    <version>2.2.4</version>
     <title>LogoFX.Client.Testing.Shared.Caliburn.Micro</title>
     <authors>Gennady Verdel</authors>
     <owners>Gennady Verdel</owners>
diff --git a/devops/pack/LogoFX.Client.Tests.Shared/contents/LogoFX.Client.Tests.Shared.nuspec b/devops/pack/LogoFX.Client.Tests.Shared/contents/LogoFX.Client.Tests.Shared.nuspec
index d1bf427..065015c 100644
--- a/devops/pack/LogoFX.Client.Tests.Shared/contents/LogoFX.Client.Tests.Shared.nuspec
+++ b/devops/pack/LogoFX.Client.Tests.Shared/contents/LogoFX.Client.Tests.Shared.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>LogoFX.Client.Tests.Shared</id>
-    <version>2.2.3</version>
+    <version>2.2.4</version>
     <title>LogoFX.Client.Testing.Shared</title>
     <authors>Gennady Verdel</authors>
     <owners>Gennady Verdel</owners>
@@ -16,7 +16,7 @@
     </releaseNotes>
     <dependencies>
       <dependency id="Solid.Practices.Scheduling" version="2.3.2" />
-      <dependency id="LogoFX.Client.Core.Core" version="2.2.3" />
+      <dependency id="LogoFX.Client.Core.Core" version="2.2.4" />
     </dependencies>
     <tags>framework logofx dotnet</tags>
     <repository type="Open Source" url="https://github.com/LogoFX/testing" />
diff --git a/devops/publish/publish-all.bat b/devops/publish/publish-all.bat
index ee23cee..6a9cd01 100644
--- a/devops/publish/publish-all.bat
+++ b/devops/publish/publish-all.bat
@@ -2,7 +2,7 @@ cd ../../src
 nuget restore
 cd ../devops/publish
 PowerShell -NoProfile -ExecutionPolicy Bypass -Command "& '../build/build-all.ps1'"
-SET package_version=2.2.3
+SET package_version=2.2.4
 cd ../pack
 call pack-all
 cd ../publish
diff --git a/devops/publish/publish-single.bat b/devops/publish/publish-single.bat
index 8f539cd..66e2280 100644
--- a/devops/publish/publish-single.bat
+++ b/devops/publish/publish-single.bat
@@ -1,5 +1,5 @@
 SET package_name=%1
-SET package_version=2.2.3
+SET package_version=2.2.4
 SET target=../../../../packages/Tests-All
 cd ../build
 call build-all
diff --git a/src/LogoFX.Client.Testing.Contracts/LogoFX.Client.Testing.Contracts.csproj b/src/LogoFX.Client.Testing.Contracts/LogoFX.Client.Testing.Contracts.csproj
index 9298cf1..6cba59b 100644
--- a/src/LogoFX.Client.Testing.Contracts/LogoFX.Client.Testing.Contracts.csproj
+++ b/src/LogoFX.Client.Testing.Contracts/LogoFX.Client.Testing.Contracts.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <Version>2.2.3</Version>
+    <Version>2.2.4</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\Bin\netstandard\Release</OutputPath>
diff --git a/src/LogoFX.Client.Testing.EndToEnd.FlaUI/LogoFX.Client.Testing.EndToEnd.FlaUI.csproj b/src/LogoFX.Client.Testing.EndToEnd.FlaUI/LogoFX.Client.Testing.EndToEnd.FlaUI.csproj
index ea900bb..62e1736 100644
--- a/src/LogoFX.Client.Testing.EndToEnd.FlaUI/LogoFX.Client.Testing.EndToEnd.FlaUI.csproj
+++ b/src/LogoFX.Client.Testing.EndToEnd.FlaUI/LogoFX.Client.Testing.EndToEnd.FlaUI.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <Version>2.2.3</Version>
+    <Version>2.2.4</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <OutputPath>../bin/debug</OutputPath>
@@ -15,7 +15,7 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Attest.Testing.Contracts" Version="2.4.1" />
+    <PackageReference Include="Attest.Testing.Contracts" Version="2.4.2" />
     <PackageReference Include="FlaUI.Core" Version="3.2.0" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/LogoFX.Client.Testing.EndToEnd.SpecFlow/LogoFX.Client.Testing.EndToEnd.SpecFlow.csproj b/src/LogoFX.Client.Testing.EndToEnd.SpecFlow/LogoFX.Client.Testing.EndToEnd.SpecFlow.csproj
index ca19949..c996e8b 100644
--- a/src/LogoFX.Client.Testing.EndToEnd.SpecFlow/LogoFX.Client.Testing.EndToEnd.SpecFlow.csproj
+++ b/src/LogoFX.Client.Testing.EndToEnd.SpecFlow/LogoFX.Client.Testing.EndToEnd.SpecFlow.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <Version>2.2.3</Version>
+    <Version>2.2.4</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\Bin\netstandard\Release</OutputPath>
@@ -12,9 +12,9 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Attest.Fake.Data" Version="2.4.1" />
-    <PackageReference Include="Attest.Testing.Contracts" Version="2.4.1" />
-    <PackageReference Include="Attest.Tests.Core" Version="2.4.1" />
-    <PackageReference Include="Attest.Tests.SpecFlow" Version="2.4.1" />
+    <PackageReference Include="Attest.Fake.Data" Version="2.4.2" />
+    <PackageReference Include="Attest.Testing.Contracts" Version="2.4.2" />
+    <PackageReference Include="Attest.Tests.Core" Version="2.4.2" />
+    <PackageReference Include="Attest.Tests.SpecFlow" Version="2.4.2" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/LogoFX.Client.Testing.EndToEnd.White/net/LogoFX.Client.Testing.EndToEnd.White.NET.csproj b/src/LogoFX.Client.Testing.EndToEnd.White/net/LogoFX.Client.Testing.EndToEnd.White.NET.csproj
index 86318c8..59e5bb3 100644
--- a/src/LogoFX.Client.Testing.EndToEnd.White/net/LogoFX.Client.Testing.EndToEnd.White.NET.csproj
+++ b/src/LogoFX.Client.Testing.EndToEnd.White/net/LogoFX.Client.Testing.EndToEnd.White.NET.csproj
@@ -4,7 +4,7 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AssemblyName>LogoFX.Client.Testing.EndToEnd.White</AssemblyName>
     <RootNamespace>LogoFX.Client.Testing.EndToEnd.White</RootNamespace>
-    <Version>2.2.3</Version>
+    <Version>2.2.4</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\..\bin\net\Release\</OutputPath>
@@ -19,7 +19,7 @@
     <Compile Include="..\src\TeardownService.cs" Link="TeardownService.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Attest.Testing.Contracts" Version="2.4.1" />
+    <PackageReference Include="Attest.Testing.Contracts" Version="2.4.2" />
     <PackageReference Include="TestStack.White" Version="0.13.3" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/LogoFX.Client.Testing.EndToEnd.White/netcore/LogoFX.Client.Testing.EndToEnd.White.NETCore.csproj b/src/LogoFX.Client.Testing.EndToEnd.White/netcore/LogoFX.Client.Testing.EndToEnd.White.NETCore.csproj
index 86f6462..644ef84 100644
--- a/src/LogoFX.Client.Testing.EndToEnd.White/netcore/LogoFX.Client.Testing.EndToEnd.White.NETCore.csproj
+++ b/src/LogoFX.Client.Testing.EndToEnd.White/netcore/LogoFX.Client.Testing.EndToEnd.White.NETCore.csproj
@@ -4,7 +4,7 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AssemblyName>LogoFX.Client.Testing.EndToEnd.White</AssemblyName>
     <RootNamespace>LogoFX.Client.Testing.EndToEnd.White</RootNamespace>
-    <Version>2.2.3</Version>
+    <Version>2.2.4</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\..\bin\netcore\Release\</OutputPath>
@@ -19,7 +19,7 @@
     <Compile Include="..\src\TeardownService.cs" Link="TeardownService.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Attest.Testing.Contracts" Version="2.4.1" />
+    <PackageReference Include="Attest.Testing.Contracts" Version="2.4.2" />
     <PackageReference Include="TestStack.White" Version="0.13.3" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/LogoFX.Client.Testing.EndToEnd.White/netframework/LogoFX.Client.Testing.EndToEnd.White.NETFramework.csproj b/src/LogoFX.Client.Testing.EndToEnd.White/netframework/LogoFX.Client.Testing.EndToEnd.White.NETFramework.csproj
index 4dfff12..51e334e 100644
--- a/src/LogoFX.Client.Testing.EndToEnd.White/netframework/LogoFX.Client.Testing.EndToEnd.White.NETFramework.csproj
+++ b/src/LogoFX.Client.Testing.EndToEnd.White/netframework/LogoFX.Client.Testing.EndToEnd.White.NETFramework.csproj
@@ -61,7 +61,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Attest.Testing.Contracts">
-      <Version>2.4.1</Version>
+      <Version>2.4.2</Version>
     </PackageReference>
     <PackageReference Include="TestStack.White">
       <Version>0.13.3</Version>
diff --git a/src/LogoFX.Client.Testing.EndToEnd.White/netframework/Properties/AssemblyInfo.cs b/src/LogoFX.Client.Testing.EndToEnd.White/netframework/Properties/AssemblyInfo.cs
index 90ba329..e81002b 100644
--- a/src/LogoFX.Client.Testing.EndToEnd.White/netframework/Properties/AssemblyInfo.cs
+++ b/src/LogoFX.Client.Testing.EndToEnd.White/netframework/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.2.3")]
-[assembly: AssemblyFileVersion("2.2.3")]
+[assembly: AssemblyVersion("2.2.4")]
+[assembly: AssemblyFileVersion("2.2.4")]
diff --git a/src/LogoFX.Client.Testing.EndToEnd/LogoFX.Client.Testing.EndToEnd.csproj b/src/LogoFX.Client.Testing.EndToEnd/LogoFX.Client.Testing.EndToEnd.csproj
index 8c7b21b..773cb9c 100644
--- a/src/LogoFX.Client.Testing.EndToEnd/LogoFX.Client.Testing.EndToEnd.csproj
+++ b/src/LogoFX.Client.Testing.EndToEnd/LogoFX.Client.Testing.EndToEnd.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <Version>2.2.3</Version>
+    <Version>2.2.4</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\Bin\netstandard\Release</OutputPath>
@@ -12,7 +12,7 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Attest.Testing.Contracts" Version="2.4.1" />
+    <PackageReference Include="Attest.Testing.Contracts" Version="2.4.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\LogoFX.Client.Testing.Contracts\LogoFX.Client.Testing.Contracts.csproj" />
diff --git a/src/LogoFX.Client.Testing.Infra/LogoFX.Client.Testing.Infra.csproj b/src/LogoFX.Client.Testing.Infra/LogoFX.Client.Testing.Infra.csproj
index c2d9b0e..6ecb197 100644
--- a/src/LogoFX.Client.Testing.Infra/LogoFX.Client.Testing.Infra.csproj
+++ b/src/LogoFX.Client.Testing.Infra/LogoFX.Client.Testing.Infra.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <Version>2.2.3</Version>
+    <Version>2.2.4</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\Bin\netstandard\Release</OutputPath>
@@ -12,6 +12,6 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="LogoFX.Client.Core.Core" Version="2.2.3" />
+    <PackageReference Include="LogoFX.Client.Core.Core" Version="2.2.4" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/LogoFX.Client.Testing.Integration.NUnit/LogoFX.Client.Testing.Integration.NUnit.csproj b/src/LogoFX.Client.Testing.Integration.NUnit/LogoFX.Client.Testing.Integration.NUnit.csproj
index 83267a7..ec8184d 100644
--- a/src/LogoFX.Client.Testing.Integration.NUnit/LogoFX.Client.Testing.Integration.NUnit.csproj
+++ b/src/LogoFX.Client.Testing.Integration.NUnit/LogoFX.Client.Testing.Integration.NUnit.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <Version>2.2.3</Version>
+    <Version>2.2.4</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\Bin\netstandard\Release\</OutputPath>
@@ -12,9 +12,9 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Attest.Testing.Contracts" Version="2.4.1" />
-    <PackageReference Include="Attest.Tests.Core" Version="2.4.1" />
-    <PackageReference Include="Attest.Tests.NUnit" Version="2.4.1" />
+    <PackageReference Include="Attest.Testing.Contracts" Version="2.4.2" />
+    <PackageReference Include="Attest.Tests.Core" Version="2.4.2" />
+    <PackageReference Include="Attest.Tests.NUnit" Version="2.4.2" />
     <PackageReference Include="Solid.Core" Version="2.3.2" />
     <PackageReference Include="Solid.Patterns.Builder" Version="2.3.2" />
   </ItemGroup>
diff --git a/src/LogoFX.Client.Testing.Integration.SpecFlow/LogoFX.Client.Testing.Integration.SpecFlow.csproj b/src/LogoFX.Client.Testing.Integration.SpecFlow/LogoFX.Client.Testing.Integration.SpecFlow.csproj
index 96f2c3f..29777ea 100644
--- a/src/LogoFX.Client.Testing.Integration.SpecFlow/LogoFX.Client.Testing.Integration.SpecFlow.csproj
+++ b/src/LogoFX.Client.Testing.Integration.SpecFlow/LogoFX.Client.Testing.Integration.SpecFlow.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <Version>2.2.3</Version>
+    <Version>2.2.4</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\Bin\netstandard\Release</OutputPath>
@@ -12,9 +12,9 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Attest.Testing.Contracts" Version="2.4.1" />
-    <PackageReference Include="Attest.Tests.Core" Version="2.4.1" />
-    <PackageReference Include="Attest.Tests.SpecFlow" Version="2.4.1" />
+    <PackageReference Include="Attest.Testing.Contracts" Version="2.4.2" />
+    <PackageReference Include="Attest.Tests.Core" Version="2.4.2" />
+    <PackageReference Include="Attest.Tests.SpecFlow" Version="2.4.2" />
     <PackageReference Include="Solid.Core" Version="2.3.2" />
     <PackageReference Include="Solid.Patterns.Builder" Version="2.3.2" />
   </ItemGroup>
diff --git a/src/LogoFX.Client.Testing.Integration.xUnit/LogoFX.Client.Testing.Integration.xUnit.csproj b/src/LogoFX.Client.Testing.Integration.xUnit/LogoFX.Client.Testing.Integration.xUnit.csproj
index 32281c8..b50287b 100644
--- a/src/LogoFX.Client.Testing.Integration.xUnit/LogoFX.Client.Testing.Integration.xUnit.csproj
+++ b/src/LogoFX.Client.Testing.Integration.xUnit/LogoFX.Client.Testing.Integration.xUnit.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <Version>2.2.3</Version>
+    <Version>2.2.4</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\Bin\netstandard\Release</OutputPath>
@@ -12,9 +12,9 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Attest.Testing.Contracts" Version="2.4.1" />
-    <PackageReference Include="Attest.Tests.Core" Version="2.4.1" />
-    <PackageReference Include="Attest.Tests.xUnit" Version="2.4.1" />
+    <PackageReference Include="Attest.Testing.Contracts" Version="2.4.2" />
+    <PackageReference Include="Attest.Tests.Core" Version="2.4.2" />
+    <PackageReference Include="Attest.Tests.xUnit" Version="2.4.2" />
     <PackageReference Include="Solid.Core" Version="2.3.2" />
     <PackageReference Include="Solid.Patterns.Builder" Version="2.3.2" />
   </ItemGroup>
diff --git a/src/LogoFX.Client.Testing.Integration/LogoFX.Client.Testing.Integration.csproj b/src/LogoFX.Client.Testing.Integration/LogoFX.Client.Testing.Integration.csproj
index 2d7ab4d..eb60b86 100644
--- a/src/LogoFX.Client.Testing.Integration/LogoFX.Client.Testing.Integration.csproj
+++ b/src/LogoFX.Client.Testing.Integration/LogoFX.Client.Testing.Integration.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <Version>2.2.3</Version>
+    <Version>2.2.4</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\Bin\netstandard\Release</OutputPath>
@@ -12,7 +12,7 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Attest.Testing.Contracts" Version="2.4.1" />
+    <PackageReference Include="Attest.Testing.Contracts" Version="2.4.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\LogoFX.Client.Testing.Contracts\LogoFX.Client.Testing.Contracts.csproj" />
diff --git a/src/LogoFX.Client.Testing.Shared.Caliburn.Micro.Platform/net/LogoFX.Client.Testing.Shared.Caliburn.Micro.Platform.NET.csproj b/src/LogoFX.Client.Testing.Shared.Caliburn.Micro.Platform/net/LogoFX.Client.Testing.Shared.Caliburn.Micro.Platform.NET.csproj
index c827410..8c6c2be 100644
--- a/src/LogoFX.Client.Testing.Shared.Caliburn.Micro.Platform/net/LogoFX.Client.Testing.Shared.Caliburn.Micro.Platform.NET.csproj
+++ b/src/LogoFX.Client.Testing.Shared.Caliburn.Micro.Platform/net/LogoFX.Client.Testing.Shared.Caliburn.Micro.Platform.NET.csproj
@@ -5,7 +5,7 @@
     <UseWPF>true</UseWPF>
     <AssemblyName>LogoFX.Client.Testing.Shared.Caliburn.Micro.Platform</AssemblyName>
     <RootNamespace>LogoFX.Client.Testing.Shared.Caliburn.Micro</RootNamespace>
-    <Version>2.2.3</Version>
+    <Version>2.2.4</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DefineConstants>TRACE;NETCORE</DefineConstants>
diff --git a/src/LogoFX.Client.Testing.Shared.Caliburn.Micro.Platform/netcore/LogoFX.Client.Testing.Shared.Caliburn.Micro.Platform.NETCore.csproj b/src/LogoFX.Client.Testing.Shared.Caliburn.Micro.Platform/netcore/LogoFX.Client.Testing.Shared.Caliburn.Micro.Platform.NETCore.csproj
index aa72beb..6a653c1 100644
--- a/src/LogoFX.Client.Testing.Shared.Caliburn.Micro.Platform/netcore/LogoFX.Client.Testing.Shared.Caliburn.Micro.Platform.NETCore.csproj
+++ b/src/LogoFX.Client.Testing.Shared.Caliburn.Micro.Platform/netcore/LogoFX.Client.Testing.Shared.Caliburn.Micro.Platform.NETCore.csproj
@@ -5,7 +5,7 @@
     <UseWPF>true</UseWPF>
     <AssemblyName>LogoFX.Client.Testing.Shared.Caliburn.Micro.Platform</AssemblyName>
     <RootNamespace>LogoFX.Client.Testing.Shared.Caliburn.Micro</RootNamespace>
-    <Version>2.2.3</Version>
+    <Version>2.2.4</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DefineConstants>TRACE;NETCORE</DefineConstants>
diff --git a/src/LogoFX.Client.Testing.Shared.Caliburn.Micro.Platform/netframework/Properties/AssemblyInfo.cs b/src/LogoFX.Client.Testing.Shared.Caliburn.Micro.Platform/netframework/Properties/AssemblyInfo.cs
index f913c5c..24cdc5d 100644
--- a/src/LogoFX.Client.Testing.Shared.Caliburn.Micro.Platform/netframework/Properties/AssemblyInfo.cs
+++ b/src/LogoFX.Client.Testing.Shared.Caliburn.Micro.Platform/netframework/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.2.3")]
-[assembly: AssemblyFileVersion("2.2.3")]
+[assembly: AssemblyVersion("2.2.4")]
+[assembly: AssemblyFileVersion("2.2.4")]
diff --git a/src/LogoFX.Client.Testing.Shared.Caliburn.Micro.Platform/uwp/LogoFX.Client.Testing.Shared.Caliburn.Micro.Platform.UWP.csproj b/src/LogoFX.Client.Testing.Shared.Caliburn.Micro.Platform/uwp/LogoFX.Client.Testing.Shared.Caliburn.Micro.Platform.UWP.csproj
index 54989dc..1e4682c 100644
--- a/src/LogoFX.Client.Testing.Shared.Caliburn.Micro.Platform/uwp/LogoFX.Client.Testing.Shared.Caliburn.Micro.Platform.UWP.csproj
+++ b/src/LogoFX.Client.Testing.Shared.Caliburn.Micro.Platform/uwp/LogoFX.Client.Testing.Shared.Caliburn.Micro.Platform.UWP.csproj
@@ -115,7 +115,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.12</Version>
+      <Version>6.2.13</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/LogoFX.Client.Testing.Shared.Caliburn.Micro.Platform/uwp/Properties/AssemblyInfo.cs b/src/LogoFX.Client.Testing.Shared.Caliburn.Micro.Platform/uwp/Properties/AssemblyInfo.cs
index 873a832..1a5625f 100644
--- a/src/LogoFX.Client.Testing.Shared.Caliburn.Micro.Platform/uwp/Properties/AssemblyInfo.cs
+++ b/src/LogoFX.Client.Testing.Shared.Caliburn.Micro.Platform/uwp/Properties/AssemblyInfo.cs
@@ -20,6 +20,6 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.2.3")]
-[assembly: AssemblyFileVersion("2.2.3")]
+[assembly: AssemblyVersion("2.2.4")]
+[assembly: AssemblyFileVersion("2.2.4")]
 [assembly: ComVisible(false)]
diff --git a/src/LogoFX.Client.Testing.Shared/LogoFX.Client.Testing.Shared.csproj b/src/LogoFX.Client.Testing.Shared/LogoFX.Client.Testing.Shared.csproj
index ade3497..a4d68d2 100644
--- a/src/LogoFX.Client.Testing.Shared/LogoFX.Client.Testing.Shared.csproj
+++ b/src/LogoFX.Client.Testing.Shared/LogoFX.Client.Testing.Shared.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <Version>2.2.3</Version>
+    <Version>2.2.4</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\Bin\netstandard\Release</OutputPath>
@@ -12,7 +12,7 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="LogoFX.Client.Core.Core" Version="2.2.3" />
+    <PackageReference Include="LogoFX.Client.Core.Core" Version="2.2.4" />
     <PackageReference Include="Solid.Practices.Scheduling" Version="2.3.2" />
   </ItemGroup>
   <ItemGroup>