diff --git a/devops/pack/contents/LogoFX.Client.Testing.EndToEnd.SpecFlow.nuspec b/devops/pack/contents/LogoFX.Client.Testing.EndToEnd.SpecFlow.nuspec
index 8e43e23..bcddc3d 100644
--- a/devops/pack/contents/LogoFX.Client.Testing.EndToEnd.SpecFlow.nuspec
+++ b/devops/pack/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.0-rc2</version>
+    <version>2.2.0-rc3</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>Updated dependent packages</releaseNotes>
     <dependencies>
-      <dependency id="Attest.Testing.Contracts" version="2.1.1" />
-      <dependency id="Attest.Tests.Core" version="2.1.1" />
-      <dependency id="Attest.Tests.SpecFlow" version="2.1.1" />
+      <dependency id="Attest.Testing.Contracts" version="2.3.2" />
+      <dependency id="Attest.Tests.Core" version="2.3.2" />
+      <dependency id="Attest.Tests.SpecFlow" version="2.3.2" />
     </dependencies>
   </metadata>
 </package>
\ No newline at end of file
diff --git a/devops/publish/publish.bat b/devops/publish/publish.bat
index 9e2c78b..6a54ab6 100644
--- a/devops/publish/publish.bat
+++ b/devops/publish/publish.bat
@@ -1,5 +1,5 @@
 SET package_name=LogoFX.Client.Testing.EndToEnd.SpecFlow
-SET package_version=2.2.0-rc2
+SET package_version=2.2.0-rc3
 cd ../../src
 nuget restore
 cd ../devops/build
diff --git a/src/LogoFX.Client.Testing.EndToEnd.SpecFlow/EndToEndTestsBase.cs b/src/LogoFX.Client.Testing.EndToEnd.SpecFlow/EndToEndTestsBase.cs
index 2bdc059..ffc207c 100644
--- a/src/LogoFX.Client.Testing.EndToEnd.SpecFlow/EndToEndTestsBase.cs
+++ b/src/LogoFX.Client.Testing.EndToEnd.SpecFlow/EndToEndTestsBase.cs
@@ -1,8 +1,8 @@
 using Attest.Fake.Data;
 using Attest.Testing.Contracts;
-using Attest.Testing.Core.FakeData;
+using Attest.Testing.Core;
 using Attest.Testing.EndToEnd;
-using Attest.Testing.SpecFlow;
+using Attest.Testing.FakeData;
 using TechTalk.SpecFlow;
 
 namespace LogoFX.Client.Testing.EndToEnd.SpecFlow
@@ -11,10 +11,9 @@ namespace LogoFX.Client.Testing.EndToEnd.SpecFlow
     /// Base class for SpecFlow bridge.
     /// </summary>    
     public abstract class EndToEndTestsBase :
-        Attest.Testing.SpecFlow.EndToEndTestsBase
+        Attest.Testing.EndToEnd.SpecFlow.EndToEndTestsBase
     {
         private readonly IApplicationFacade _applicationFacade;
-        private readonly ScenarioHelper _scenarioHelper;
 
         /// <summary>
         /// Base class for client End-To-End tests which use fake data providers.
@@ -27,13 +26,16 @@ public abstract class WithFakeProviders : EndToEndTestsBase
             /// </summary>
             protected WithFakeProviders(
                 IApplicationFacade applicationFacade, 
+                EndToEndScenarioDataStore endToEndScenarioDataStore,
                 ScenarioHelper scenarioHelper, 
                 ScenarioContext scenarioContext,
                 BuildersCollectionContext buildersCollectionContext) 
                 : base(applicationFacade, scenarioHelper, scenarioContext)
             {
-                scenarioHelper.Add(new StartApplicationService.WithFakeProviders(applicationFacade, buildersCollectionContext), typeof(IStartApplicationService));
-                scenarioHelper.Add(new BuilderRegistrationService(buildersCollectionContext), typeof(IBuilderRegistrationService));
+                endToEndScenarioDataStore.StartApplicationService =
+                    new StartApplicationService.WithFakeProviders(applicationFacade, buildersCollectionContext);
+                endToEndScenarioDataStore.BuilderRegistrationService =
+                    new BuilderRegistrationService(buildersCollectionContext);
                 RegisterScreenObjectsCore();
             }
         }
@@ -47,10 +49,15 @@ public abstract class WithRealProviders : EndToEndTestsBase
             /// <summary>
             /// Initializes a new instance of the <see cref="EndToEndTestsBase.WithRealProviders"/> class.
             /// </summary>
-            protected WithRealProviders(IApplicationFacade applicationFacade, ScenarioHelper scenarioHelper,  ScenarioContext scenarioContext) :
+            protected WithRealProviders(
+                IApplicationFacade applicationFacade, 
+                EndToEndScenarioDataStore endToEndScenarioDataStore,
+                ScenarioHelper scenarioHelper,  
+                ScenarioContext scenarioContext) :
                 base(applicationFacade, scenarioHelper, scenarioContext)
             {
-                scenarioHelper.Add(new StartApplicationService.WithRealProviders(applicationFacade), typeof(IStartApplicationService));
+                endToEndScenarioDataStore.StartApplicationService =
+                    new StartApplicationService.WithRealProviders(applicationFacade);
                 RegisterScreenObjectsCore();
             }
         }
@@ -61,11 +68,13 @@ protected WithRealProviders(IApplicationFacade applicationFacade, ScenarioHelper
         /// <param name="applicationFacade">The application facade.</param>
         /// <param name="scenarioHelper">The scenario helper.</param>
         /// <param name="scenarioContext">The scenario context.</param>
-        protected EndToEndTestsBase(IApplicationFacade applicationFacade, ScenarioHelper scenarioHelper, ScenarioContext scenarioContext)
-        :base(scenarioContext)
+        protected EndToEndTestsBase(
+            IApplicationFacade applicationFacade, 
+            ScenarioHelper scenarioHelper, 
+            ScenarioContext scenarioContext)
+            :base(scenarioContext)
         {
             _applicationFacade = applicationFacade;
-            _scenarioHelper = scenarioHelper;
         }
 
         /// <summary>
@@ -86,7 +95,7 @@ protected override void OnAfterTeardown()
         {
             base.OnAfterTeardown();
             _applicationFacade.Stop();
-            _scenarioHelper.Clear();
+            //_scenarioHelper.Clear();
         }
     }
 }
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 c80566e..2bebb72 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
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
@@ -12,8 +12,9 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Attest.Testing.Contracts" Version="2.1.1" />
-    <PackageReference Include="Attest.Tests.Core" Version="2.1.1" />
-    <PackageReference Include="Attest.Tests.SpecFlow" Version="2.1.1" />
+    <PackageReference Include="Attest.Fake.Data" Version="2.3.2" />
+    <PackageReference Include="Attest.Testing.Contracts" Version="2.3.2" />
+    <PackageReference Include="Attest.Tests.Core" Version="2.3.2" />
+    <PackageReference Include="Attest.Tests.SpecFlow" Version="2.3.2" />
   </ItemGroup>
 </Project>
\ No newline at end of file