diff --git a/.gitignore b/.gitignore
index a7e9552..f59271d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,4 +34,4 @@ packages/
 *.nupkg
 */.idea/*
 *.zip
-*.nupkg
+*.lock
diff --git a/Abc.MoqComplete/Abc.MoqComplete.Tests/ContextAction/ContextActionBypassIsAvailable.cs b/Abc.MoqComplete/Abc.MoqComplete.Tests/ContextAction/ContextActionBypassIsAvailable.cs
index 7996f43..3e8b789 100644
--- a/Abc.MoqComplete/Abc.MoqComplete.Tests/ContextAction/ContextActionBypassIsAvailable.cs
+++ b/Abc.MoqComplete/Abc.MoqComplete.Tests/ContextAction/ContextActionBypassIsAvailable.cs
@@ -24,7 +24,7 @@ protected override void ProcessAction(Lifetime lifetime, Func<ITextControl, TAct
             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 textControl = OpenTextControl(lifetime, project, caretPosition);
+            var textControl = OpenTextControl(lifetime, caretPosition);
             var name = InitTextControl(textControl);
             var contextAction = actionCreator(textControl);
             ExecuteWithGold(textControl.Document, sw =>
diff --git a/Abc.MoqComplete/Abc.MoqComplete.Tests/app.config b/Abc.MoqComplete/Abc.MoqComplete.Tests/app.config
deleted file mode 100644
index 9cb4679..0000000
--- a/Abc.MoqComplete/Abc.MoqComplete.Tests/app.config
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Security.Cryptography.Algorithms" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
\ No newline at end of file
diff --git a/Abc.MoqComplete/Abc.MoqComplete/CompletionProvider/Returns/BaseReturnsMethodProvider.cs b/Abc.MoqComplete/Abc.MoqComplete/CompletionProvider/Returns/BaseReturnsMethodProvider.cs
index 53c75c6..96ef567 100644
--- a/Abc.MoqComplete/Abc.MoqComplete/CompletionProvider/Returns/BaseReturnsMethodProvider.cs
+++ b/Abc.MoqComplete/Abc.MoqComplete/CompletionProvider/Returns/BaseReturnsMethodProvider.cs
@@ -1,16 +1,12 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 using Abc.MoqComplete.Extensions;
 using Abc.MoqComplete.Services;
 using Abc.MoqComplete.Services.MethodProvider;
 using JetBrains.ProjectModel;
 using JetBrains.ReSharper.Feature.Services.CodeCompletion;
 using JetBrains.ReSharper.Feature.Services.CodeCompletion.Infrastructure;
-using JetBrains.ReSharper.Feature.Services.CodeCompletion.Infrastructure.AspectLookupItems.BaseInfrastructure;
-using JetBrains.ReSharper.Feature.Services.CodeCompletion.Infrastructure.AspectLookupItems.Info;
 using JetBrains.ReSharper.Feature.Services.CodeCompletion.Infrastructure.LookupItems;
 using JetBrains.ReSharper.Feature.Services.CSharp.CodeCompletion.Infrastructure;
 using JetBrains.ReSharper.Features.Intellisense.CodeCompletion.CSharp;
@@ -89,7 +85,7 @@ protected override bool AddLookupItems(CSharpCodeCompletionContext context, IIte
 
         private static void AddProposedCallback(CSharpCodeCompletionContext context, IItemsCollector collector, string proposedCallback)
         {
-            LookupItem<TextualInfo> item = CSharpLookupItemFactory.Instance.CreateKeywordLookupItem(context,
+            var item = CSharpLookupItemFactory.Instance.CreateKeywordLookupItem(context,
                 proposedCallback,
                 TailType.None,
                 PsiSymbolsThemedIcons.Method.Id);
diff --git a/Abc.MoqComplete/Abc.MoqComplete/Resources/plugin.xml b/Abc.MoqComplete/Abc.MoqComplete/Resources/plugin.xml
index 5e42e70..b01ffd4 100644
--- a/Abc.MoqComplete/Abc.MoqComplete/Resources/plugin.xml
+++ b/Abc.MoqComplete/Abc.MoqComplete/Resources/plugin.xml
@@ -1,13 +1,13 @@
 <idea-plugin require-restart="true">
   <depends>com.intellij.modules.rider</depends>
-  <idea-version since-build="232.5150" />
+  <idea-version since-build="233.11799" />
   <id>Abc.MoqComplete.Rider</id>
   <name>MoqComplete</name>
-  <version>2023.2.0.1</version>
+  <version>2023.3.0.0</version>
   <vendor url="https://github.com/Abc-Arbitrage/Abc.MoqComplete">ABC Arbitrage Asset Management</vendor>
   <description><![CDATA[
 <p>Code completion for Moq: Provide completion for It.IsAny, Callback, suggest mock in constructor</p>
 ]]></description>
   <change-notes>
   </change-notes>
-</idea-plugin>
\ No newline at end of file
+</idea-plugin>
diff --git a/Abc.MoqComplete/Directory.Build.props b/Abc.MoqComplete/Directory.Build.props
index aa22cfa..40d372d 100644
--- a/Abc.MoqComplete/Directory.Build.props
+++ b/Abc.MoqComplete/Directory.Build.props
@@ -17,14 +17,12 @@
   <Import Project="Plugin.props" />
 
   <PropertyGroup>
-<!--    <WaveVersionBase>2$(SdkVersion.Substring(2,2))</WaveVersionBase>-->
-<!--    <WaveVersion>$(WaveVersionBase).0.0</WaveVersion>-->
-    <WaveVersion>232.0.0.0</WaveVersion>
+    <WaveVersion>233.0.0.0</WaveVersion>
   </PropertyGroup>
   
   <PropertyGroup>
     <!-- The version of the MoqComplete plugin -->
-    <Version>2023.2.0.1</Version>
+    <Version>2023.3.0.0</Version>
   </PropertyGroup>
   
 </Project>
diff --git a/Abc.MoqComplete/Plugin.props b/Abc.MoqComplete/Plugin.props
index 5f1b17a..26e0ae6 100644
--- a/Abc.MoqComplete/Plugin.props
+++ b/Abc.MoqComplete/Plugin.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <!-- The used sdk version -->
-    <SdkVersion>2023.2.0-eap02</SdkVersion>
+    <SdkVersion>2023.3.0</SdkVersion>
     <Title>MoqComplete</Title>
     <Description>Code completion for Moq</Description>
     <Authors>ABC Arbitrage Asset Management</Authors>
@@ -11,4 +11,4 @@
     <PackageLicenseUrl>https://opensource.org/licenses/MIT</PackageLicenseUrl>
     <PackageIconUrl>https://raw.githubusercontent.com/Abc-Arbitrage/Abc.MoqComplete/master/Abc.MoqComplete/Deployment/icon.png</PackageIconUrl>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>