diff --git a/tests/service/InteractiveCheckerTests.fs b/tests/service/InteractiveCheckerTests.fs
index fba9adcb639..991a4c8d476 100644
--- a/tests/service/InteractiveCheckerTests.fs
+++ b/tests/service/InteractiveCheckerTests.fs
@@ -71,7 +71,7 @@ let input =
 let ``Test ranges - namespace`` () =
     let res = parseAndExtractRanges input 
     printfn "Test ranges - namespace, res = %A" res
-    res |> shouldEqual [("N", ((4, 4), (6, 0))); ("Sample", ((4, 9), (4, 15)))]
+    res |> shouldEqual [("N", ((4, 4), (5, 4))); ("Sample", ((4, 9), (4, 15)))]
 
 let input2 =
     """
@@ -97,4 +97,4 @@ let input3 =
 let ``Test ranges - global namespace`` () =
     let res = parseAndExtractRanges input3 
     printfn "Test ranges - global namespace, res = %A" res
-    res |> shouldEqual [("", ((4, 4), (6, 0))); ("Sample", ((4, 9), (4, 15)))]
+    res |> shouldEqual [("", ((4, 4), (5, 4))); ("Sample", ((4, 9), (4, 15)))]
diff --git a/tests/service/StructureTests.fs b/tests/service/StructureTests.fs
index d87c3c18e78..16bee2c1c05 100644
--- a/tests/service/StructureTests.fs
+++ b/tests/service/StructureTests.fs
@@ -60,7 +60,7 @@ let (=>) (source: string) (expectedRanges: (Range * Range) list) =
         reraise()
 
 [<Test>]
-let ``empty file``() = "" => [ (1, 0, 2, 0), (1, 0, 2, 0) ]
+let ``empty file``() = "" => []
 
 [<Test>]
 let ``nested module``() =
diff --git a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.Completion.fs b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.Completion.fs
index a16adb7450f..ba7735a0de9 100644
--- a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.Completion.fs
+++ b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.Completion.fs
@@ -1531,8 +1531,11 @@ let x = new MyClass2(0)
     [<Test>]
     member public this.``AfterConstructor.5039_1``() =
         AssertAutoCompleteContainsNoCoffeeBreak 
-          [ "let someCall(x) = null"
-            "let xe = someCall(System.IO.StringReader()." ]
+          [
+"""
+let someCall(x) = null
+let xe = someCall(System.IO.StringReader().
+"""       ]
           "StringReader()."
           [ "ReadBlock" ] // should contain (StringReader)
           [ "LastIndexOfAny" ] // should not contain (String)
@@ -1540,8 +1543,12 @@ let x = new MyClass2(0)
     [<Test>]
     member public this.``AfterConstructor.5039_1.CoffeeBreak``() =
         AssertAutoCompleteContains
-          [ "let someCall(x) = null"
-            "let xe = someCall(System.IO.StringReader()." ]
+          [
+"""
+let someCall(x) = null
+let xe = someCall(System.IO.StringReader().
+"""
+          ]
           "StringReader()."
           [ "ReadBlock" ] // should contain (StringReader)
           [ "LastIndexOfAny" ] // should not contain (String)
@@ -4913,8 +4920,12 @@ let x = query { for bbbb in abbbbc(*D0*) do
 
     [<Test>]
     member this.``BadCompletionAfterQuicklyTyping.Bug130733.NowWorks``() =        
-        let code = [ "let someCall(x) = null"
-                     "let xe = someCall(System.IO.StringReader()  "]
+        let code = [
+"""
+let someCall(x) = null
+let xe = someCall(System.IO.StringReader()
+"""
+        ]
         let (_, _, file) = this.CreateSingleFileProject(code)
         
         TakeCoffeeBreak(this.VS)
diff --git a/vsintegration/tests/UnitTests/SignatureHelpProviderTests.fs b/vsintegration/tests/UnitTests/SignatureHelpProviderTests.fs
index ee651357715..9d39103461a 100644
--- a/vsintegration/tests/UnitTests/SignatureHelpProviderTests.fs
+++ b/vsintegration/tests/UnitTests/SignatureHelpProviderTests.fs
@@ -125,7 +125,9 @@ type foo5 = N1.T<Param1=1,ParamIgnored= >
              ("type foo5 = N1.T<Param1=1,ParamIgnored",Some ("[132..160)", 1, 2, Some "ParamIgnored"));
              ("type foo5 = N1.T<Param1=1,ParamIgnored=",Some ("[132..160)", 1, 2, Some "ParamIgnored"))])
 //Test case 5
-          ( """let _ = System.DateTime(""",
+          ( """
+let _ = System.DateTime(
+""",
             [("let _ = System.DateTime(",  Some ("[8..24)", 0, 0, None)) ])
           ]
 
diff --git a/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj b/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj
index ea8b5992d1f..28461e4c20d 100644
--- a/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj
+++ b/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj
@@ -214,6 +214,7 @@
     <PackageReference Include="Microsoft.VisualStudio.Threading" Version="$(MicrosoftVisualStudioThreadingPackageVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
     <PackageReference Include="Microsoft.VisualStudio.Validation" Version="$(MicrosoftVisualStudioValidationPackageVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
     <PackageReference Include="NUnit" Version="$(NUnitPackageVersion)" />
+    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitTestAdapterPackageVersion)" />
     <PackageReference Include="System.ValueTuple" Version="$(SystemValueTuplePackageVersion)" />
     <PackageReference Include="VSSDK.VSHelp" Version="$(VSSDKVSHelpPackageVersion)" />
     <PackageReference Include="VSSDK.VSLangProj.8" Version="$(VSSDKVSLangProj8PackageVersion)" />
@@ -242,10 +243,6 @@
     <PackageReference Include="Microsoft.VisualStudio.Utilities" Version="$(MicrosoftVisualStudioUtilitiesPackageVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
     <PackageReference Include="Microsoft.VisualStudio.Threading" Version="$(MicrosoftVisualStudioThreadingPackageVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
     <PackageReference Include="Microsoft.VisualStudio.Validation" Version="$(MicrosoftVisualStudioValidationPackageVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
-    <PackageReference Include="NUnit" Version="$(NUnitPackageVersion)" />
-    <PackageReference Include="System.ValueTuple" Version="$(SystemValueTuplePackageVersion)" />
-    <PackageReference Include="VSSDK.VSHelp" Version="$(VSSDKVSHelpPackageVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
-    <PackageReference Include="VSSDK.VSLangProj.8" Version="$(VSSDKVSLangProj8PackageVersion)" PrivateAssets="all" ExcludeAssets="contentFiles;build;analyzers;native" />
   </ItemGroup>
 
 </Project>