diff --git a/Abc.MoqComplete/Abc.MoqComplete.Tests/Abc.MoqComplete.Tests.csproj b/Abc.MoqComplete/Abc.MoqComplete.Tests/Abc.MoqComplete.Tests.csproj
index 5b18289..fd08c00 100644
--- a/Abc.MoqComplete/Abc.MoqComplete.Tests/Abc.MoqComplete.Tests.csproj
+++ b/Abc.MoqComplete/Abc.MoqComplete.Tests/Abc.MoqComplete.Tests.csproj
@@ -12,10 +12,10 @@
 
   <ItemGroup>
     <PackageReference Include="JetBrains.ReSharper.SDK.Tests" Version="$(SdkVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="Moq" Version="4.13.1" />
     <PackageReference Include="Moq.AutoMock" Version="2.0.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Abc.MoqComplete/Abc.MoqComplete.Tests/ContextAction/ContextActionBypassIsAvailable.cs b/Abc.MoqComplete/Abc.MoqComplete.Tests/ContextAction/ContextActionBypassIsAvailable.cs
index 3e8b789..306149e 100644
--- a/Abc.MoqComplete/Abc.MoqComplete.Tests/ContextAction/ContextActionBypassIsAvailable.cs
+++ b/Abc.MoqComplete/Abc.MoqComplete.Tests/ContextAction/ContextActionBypassIsAvailable.cs
@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using JetBrains.Application.Components;
 using JetBrains.Diagnostics;
 using JetBrains.DocumentManagers;
 using JetBrains.Lifetimes;
@@ -10,8 +8,6 @@
 using JetBrains.ReSharper.Feature.Services.LiveTemplates.Hotspots;
 using JetBrains.ReSharper.FeaturesTestFramework.Intentions;
 using JetBrains.ReSharper.Psi;
-using JetBrains.ReSharper.TestFramework;
-using JetBrains.TextControl;
 using NUnit.Framework;
 
 namespace Abc.MoqComplete.Tests.ContextAction
@@ -19,14 +15,14 @@ namespace Abc.MoqComplete.Tests.ContextAction
     public abstract class ContextActionBypassIsAvailable<TAction> : ContextActionExecuteTestBase<TAction>
         where TAction : ContextActionBase
     {
-        protected override void ProcessAction(Lifetime lifetime, Func<ITextControl, TAction> actionCreator, IProject project)
+        protected override void ProcessAction(Lifetime lifetime, IProject project)
         {
             var solution = project.GetSolution();
             var documentManager = solution.GetComponent<DocumentManager>();
-            var caretPosition = GetCaretPosition() ?? CaretPositionsProcessor.PositionNames.SelectMany(_ => CaretPositionsProcessor.Positions(_) as IEnumerable<CaretPosition>).First("Caret position is not set. Please add {caret} or {selstart} to a test file.");
+            var caretPosition = GetCaretPosition() ?? CaretPositionsProcessor.PositionNames.SelectMany(i => CaretPositionsProcessor.Positions(i)).First("Caret position is not set. Please add {caret} or {selstart} to a test file.");
             var textControl = OpenTextControl(lifetime, caretPosition);
             var name = InitTextControl(textControl);
-            var contextAction = actionCreator(textControl);
+            var contextAction = CreateContextActionCheckAvailability(textControl);
             ExecuteWithGold(textControl.Document, sw =>
             {
                 Assert.NotNull(contextAction);
@@ -48,12 +44,12 @@ protected override void ProcessAction(Lifetime lifetime, Func<ITextControl, TAct
                     {
                         var document = textControl.Document;
                         ExecuteItem(textControl, bulbAction1, solution);
-                        var currentSession = ShellInstance.GetComponent<HotspotSessionExecutor>().CurrentSession;
+                        var currentSession = HotspotSessionExecutor.Instance.CurrentSession;
                         if (currentSession != null)
                         {
                             while (!currentSession.HotspotSession.IsFinished)
                             {
-                                ProcessHotspot(textControl, currentSession.HotspotSession.CurrentHotspot.NotNull());
+                                ProcessHotspot(textControl);
                                 currentSession.HotspotSession.GoToNextHotspotSync();
                             }
                         }
diff --git a/Abc.MoqComplete/Abc.MoqComplete/Resources/plugin.xml b/Abc.MoqComplete/Abc.MoqComplete/Resources/plugin.xml
index 9813532..fef99b3 100644
--- a/Abc.MoqComplete/Abc.MoqComplete/Resources/plugin.xml
+++ b/Abc.MoqComplete/Abc.MoqComplete/Resources/plugin.xml
@@ -1,9 +1,9 @@
 <idea-plugin require-restart="true">
   <depends>com.intellij.modules.rider</depends>
-  <idea-version since-build="241.14494" />
+  <idea-version since-build="242.20224.401" />
   <id>Abc.MoqComplete.Rider</id>
   <name>MoqComplete</name>
-  <version>2024.1.1.1</version>
+  <version>2024.2.0.1</version>
   <vendor url="https://github.com/Abc-Arbitrage/Abc.MoqComplete">abc-arbitrage</vendor>
   <description><![CDATA[
 <p>Code completion for Moq: Provide completion for It.IsAny, Callback, suggest mock in constructor</p>
diff --git a/Abc.MoqComplete/Directory.Build.props b/Abc.MoqComplete/Directory.Build.props
index edd625b..7c11066 100644
--- a/Abc.MoqComplete/Directory.Build.props
+++ b/Abc.MoqComplete/Directory.Build.props
@@ -18,12 +18,12 @@
   <Import Project="Plugin.props" />
 
   <PropertyGroup>
-    <WaveVersion>241.0.0.0</WaveVersion>
+    <WaveVersion>242.0.0.0</WaveVersion>
   </PropertyGroup>
 
   <PropertyGroup>
     <!-- The version of the MoqComplete plugin -->
-    <Version>2024.1.1.1</Version>
+    <Version>2024.2.0.1</Version>
   </PropertyGroup>
 
 </Project>
diff --git a/Abc.MoqComplete/Plugin.props b/Abc.MoqComplete/Plugin.props
index a002f14..8523d0b 100644
--- a/Abc.MoqComplete/Plugin.props
+++ b/Abc.MoqComplete/Plugin.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <!-- The used sdk version -->
-    <SdkVersion>2024.1.2</SdkVersion>
+    <SdkVersion>2024.2.0</SdkVersion>
     <Title>MoqComplete</Title>
     <Description>Code completion for Moq</Description>
     <Authors>ABC Arbitrage Asset Management</Authors>