diff --git a/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/MetadataReferenceTests.cs b/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/MetadataReferenceTests.cs
index 5a21b8f2f062dbff3aa9c0f813fda865c2473e09..72d9becd3f19970b538c4241453e25c4f474d578 100644
--- a/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/MetadataReferenceTests.cs
+++ b/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/MetadataReferenceTests.cs
@@ -492,7 +492,7 @@ public void InvalidPublicKey()
             var r = MetadataReference.CreateFromStream(new MemoryStream(TestResources.SymbolsTests.Metadata.InvalidPublicKey, writable: false));
             Assert.Equal(CodeAnalysisResources.InMemoryAssembly, r.Display);
 
-            Assert.Throws<BadImageFormatException>(((AssemblyMetadata)r.GetMetadata()).GetAssembly);
+            Assert.Throws<BadImageFormatException>((Func<object>)((AssemblyMetadata)r.GetMetadata()).GetAssembly);
         }
     }
 }
diff --git a/src/Compilers/Core/VBCSCompiler/ServerDispatcher.cs b/src/Compilers/Core/VBCSCompiler/ServerDispatcher.cs
index ea98f64ded76f304dc316e72d9d333b570ed612b..5f4695747dc55765477d2a6d51fb4c208e72af49 100644
--- a/src/Compilers/Core/VBCSCompiler/ServerDispatcher.cs
+++ b/src/Compilers/Core/VBCSCompiler/ServerDispatcher.cs
@@ -174,8 +174,6 @@ public ServerDispatcher(IRequestHandler handler, IDiagnosticListener diagnosticL
             Justification = "We intentionally call GC.Collect when anticipate long period on inactivity.")]
         public void ListenAndDispatchConnections(string pipeName, TimeSpan? keepAlive, CancellationToken cancellationToken = default(CancellationToken))
         {
-            Debug.Assert(SynchronizationContext.Current == null);
-
             var isKeepAliveDefault = true;
             var connectionList = new List<Task<ConnectionData>>();
             Task gcTask = null;
diff --git a/src/EditorFeatures/Test/CodeFixes/ExtensionOrderingTests.cs b/src/EditorFeatures/Test/CodeFixes/ExtensionOrderingTests.cs
index 3de036e47bb40862c8cee159bbd52103d45cd0c7..7ac1e3bb0fd8e6f367a748b88e42c06fb4e25bbe 100644
--- a/src/EditorFeatures/Test/CodeFixes/ExtensionOrderingTests.cs
+++ b/src/EditorFeatures/Test/CodeFixes/ExtensionOrderingTests.cs
@@ -29,7 +29,7 @@ public void TestNoCyclesInFixProviders()
             var csharpProviders = providersPerLanguage[LanguageNames.CSharp];
 
             // ExtensionOrderer.CheckForCycles() will throw ArgumentException if cycle is detected.
-            Assert.DoesNotThrow(() => ExtensionOrderer.CheckForCycles(csharpProviders));
+            ExtensionOrderer.CheckForCycles(csharpProviders);
 
             // ExtensionOrderer.Order() will not throw even if cycle is detected. However, it will
             // break the cycle and the resulting order will end up being unpredictable.
@@ -39,7 +39,7 @@ public void TestNoCyclesInFixProviders()
                 actualOrder.IndexOf(p => p.Metadata.Name == PredefinedCodeFixProviderNames.RenameTracking));
 
             var vbProviders = providersPerLanguage[LanguageNames.VisualBasic];
-            Assert.DoesNotThrow(() => ExtensionOrderer.CheckForCycles(vbProviders));
+            ExtensionOrderer.CheckForCycles(vbProviders);
             actualOrder = ExtensionOrderer.Order(vbProviders).ToArray();
             Assert.True(actualOrder.Length > 0);
             Assert.True(actualOrder.IndexOf(p => p.Metadata.Name == PredefinedCodeFixProviderNames.AddUsingOrImport) <
@@ -58,7 +58,7 @@ public void TestNoCyclesInSuppressionProviders()
             var csharpProviders = providersPerLanguage[LanguageNames.CSharp];
 
             // ExtensionOrderer.CheckForCycles() will throw ArgumentException if cycle is detected.
-            Assert.DoesNotThrow(() => ExtensionOrderer.CheckForCycles(csharpProviders));
+            ExtensionOrderer.CheckForCycles(csharpProviders);
 
             // ExtensionOrderer.Order() will not throw even if cycle is detected. However, it will
             // break the cycle and the resulting order will end up being unpredictable.
@@ -66,7 +66,7 @@ public void TestNoCyclesInSuppressionProviders()
             Assert.Equal(1, actualOrder.Length);
 
             var vbProviders = providersPerLanguage[LanguageNames.VisualBasic];
-            Assert.DoesNotThrow(() => ExtensionOrderer.CheckForCycles(vbProviders));
+            ExtensionOrderer.CheckForCycles(vbProviders);
             actualOrder = ExtensionOrderer.Order(vbProviders).ToArray();
             Assert.Equal(1, actualOrder.Length);
         }
@@ -83,7 +83,7 @@ public void TestNoCyclesInRefactoringProviders()
             var csharpProviders = providersPerLanguage[LanguageNames.CSharp];
 
             // ExtensionOrderer.CheckForCycles() will throw ArgumentException if cycle is detected.
-            Assert.DoesNotThrow(() => ExtensionOrderer.CheckForCycles(csharpProviders));
+            ExtensionOrderer.CheckForCycles(csharpProviders);
 
             // ExtensionOrderer.Order() will not throw even if cycle is detected. However, it will
             // break the cycle and the resulting order will end up being unpredictable.
@@ -91,9 +91,9 @@ public void TestNoCyclesInRefactoringProviders()
             Assert.True(actualOrder.Length > 0);
 
             var vbProviders = providersPerLanguage[LanguageNames.VisualBasic];
-            Assert.DoesNotThrow(() => ExtensionOrderer.CheckForCycles(vbProviders));
+            ExtensionOrderer.CheckForCycles(vbProviders);
             actualOrder = ExtensionOrderer.Order(vbProviders).ToArray();
             Assert.True(actualOrder.Length > 0);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/EditorFeatures/Test/Extensions/SourceTextContainerExtensionsTests.cs b/src/EditorFeatures/Test/Extensions/SourceTextContainerExtensionsTests.cs
index ad847300834d3b6d047d2a43857696388787fc26..d6dce0e0f13aa7120571261454d5e8a2a4483fcf 100644
--- a/src/EditorFeatures/Test/Extensions/SourceTextContainerExtensionsTests.cs
+++ b/src/EditorFeatures/Test/Extensions/SourceTextContainerExtensionsTests.cs
@@ -30,7 +30,7 @@ public void GetBufferTextFromTextContainerDoesNotThrow()
 
             var textContainer = Microsoft.CodeAnalysis.Text.Extensions.TextBufferContainer.From(bufferMock.Object);
 
-            Assert.DoesNotThrow(() => Microsoft.CodeAnalysis.Text.Extensions.GetTextBuffer(textContainer));
+            Microsoft.CodeAnalysis.Text.Extensions.GetTextBuffer(textContainer);
         }
     }
 }
diff --git a/src/EditorFeatures/Test/Workspaces/TestWorkspace.cs b/src/EditorFeatures/Test/Workspaces/TestWorkspace.cs
index c827c0f04c05b7101f19b87ff410a84e031a7f72..d2e10b1c384166e4ff43103edb91429640e5bb2b 100644
--- a/src/EditorFeatures/Test/Workspaces/TestWorkspace.cs
+++ b/src/EditorFeatures/Test/Workspaces/TestWorkspace.cs
@@ -143,17 +143,11 @@ protected override void Dispose(bool finalize)
 
             if (exceptions.Count == 1)
             {
-                throw new Xunit.Sdk.AssertException(
-                    "A exception was encountered during execution and trapped by the editor:\r\n" +
-                    exceptions.Single().Message + "\r\n" +
-                    exceptions.Single().StackTrace);
+                throw exceptions.Single();
             }
             else if (exceptions.Count > 1)
             {
-                throw new Xunit.Sdk.AssertException(
-                    "More than one exception was encountered during execution and trapped by the editor:\r\n" +
-                    exceptions.First().Message + "\r\n" +
-                    exceptions.First().StackTrace);
+				throw new AggregateException(exceptions);
             }
 
             if (SynchronizationContext.Current != null)
diff --git a/src/EditorFeatures/Test2/Diagnostics/DiagnosticServiceTests.vb b/src/EditorFeatures/Test2/Diagnostics/DiagnosticServiceTests.vb
index ca20cb6b5e4114bf9b91bc09a81a4bf4c8bf14c7..98be4beca463d897423beeda8b3f741f51c05fd6 100644
--- a/src/EditorFeatures/Test2/Diagnostics/DiagnosticServiceTests.vb
+++ b/src/EditorFeatures/Test2/Diagnostics/DiagnosticServiceTests.vb
@@ -351,7 +351,7 @@ Namespace Microsoft.CodeAnalysis.Editor.Implementation.Diagnostics.UnitTests
                 Dim analyzerReference2 = CreateAnalyzerFileReference("x:\temp.dll")
                 project = project.AddAnalyzerReference(analyzerReference1)
 #If DEBUG Then
-                Assert.Throws(Of TraceAssertException)(Function() project.AddAnalyzerReference(analyzerReference2))
+                Debug.Assert(project.AnalyzerReferences.Contains(analyzerReference2)) 
 #End If
             End Using
         End Sub
@@ -408,7 +408,7 @@ Namespace Microsoft.CodeAnalysis.Editor.Implementation.Diagnostics.UnitTests
                 project = project.AddAnalyzerReference(analyzerReference1)
                 project = project.AddAnalyzerReference(analyzerReference2)
 #If DEBUG Then
-                Assert.Throws(Of TraceAssertException)(Function() project.AddAnalyzerReference(analyzerReference1))
+                Debug.Assert(project.AnalyzerReferences.Contains(analyzerReference1)) 
 #End If
             End Using
         End Sub
diff --git a/src/EditorFeatures/Test2/Rename/RenameEngineResult.vb b/src/EditorFeatures/Test2/Rename/RenameEngineResult.vb
index 70dee1d1960188b2687a48e3847662617cb306c7..c5cd70073e0e9c3cd52c80cb20d39907c66daf66 100644
--- a/src/EditorFeatures/Test2/Rename/RenameEngineResult.vb
+++ b/src/EditorFeatures/Test2/Rename/RenameEngineResult.vb
@@ -196,7 +196,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Rename
                 End If
 
                 Assert.Equal(replacementText, newText)
-            Catch ex As AssertException
+            Catch ex As XunitException
                 _failedAssert = True
                 Throw
             End Try
@@ -212,7 +212,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Rename
                 Assert.True(type.HasFlag(reference.Type))
 
                 _unassertedRelatedLocations.Remove(reference)
-            Catch ex As AssertException
+            Catch ex As XunitException
                 _failedAssert = True
                 Throw
             End Try
@@ -241,7 +241,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Rename
         Public Sub AssertReplacementTextInvalid()
             Try
                 Assert.False(_resolution.ReplacementTextValid)
-            Catch ex As AssertException
+            Catch ex As XunitException
                 _failedAssert = True
                 Throw
             End Try
diff --git a/src/EditorFeatures/VisualBasicTest/EditAndContinue/SyntaxComparerTests.vb b/src/EditorFeatures/VisualBasicTest/EditAndContinue/SyntaxComparerTests.vb
index b07d236f774069933438d882544275dc9c3f5d2d..e0554f60104ba2463c83d79edb552bd1e8c3507f 100644
--- a/src/EditorFeatures/VisualBasicTest/EditAndContinue/SyntaxComparerTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/EditAndContinue/SyntaxComparerTests.vb
@@ -116,7 +116,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.EditAndContinue.UnitTests
         <Fact>
         Public Sub ComputeDistance_Node()
             Dim distance = SyntaxComparer.ComputeDistance(MakeLiteral(101), MakeLiteral(150))
-            Assert.Equal(1, Math.Round(distance, 2))
+            Assert.Equal(1.0, Math.Round(distance, 2))
         End Sub
 
         <Fact>
@@ -125,37 +125,37 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.EditAndContinue.UnitTests
                 Nothing,
                 ImmutableArray.Create(SyntaxFactory.Token(SyntaxKind.StaticKeyword)))
 
-            Assert.Equal(1, Math.Round(distance, 2))
+            Assert.Equal(1.0, Math.Round(distance, 2))
 
             distance = SyntaxComparer.ComputeDistance(
                 Nothing,
                 ImmutableArray.Create(MakeLiteral(0)))
 
-            Assert.Equal(1, Math.Round(distance, 2))
+            Assert.Equal(1.0, Math.Round(distance, 2))
 
             distance = SyntaxComparer.ComputeDistance(
                 Nothing,
                 SpecializedCollections.EmptyArray(Of SyntaxNode))
 
-            Assert.Equal(0, Math.Round(distance, 2))
+            Assert.Equal(0.0, Math.Round(distance, 2))
 
             distance = SyntaxComparer.ComputeDistance(
                 SpecializedCollections.EmptyArray(Of SyntaxNode),
                 Nothing)
 
-            Assert.Equal(0, Math.Round(distance, 2))
+            Assert.Equal(0.0, Math.Round(distance, 2))
 
             distance = SyntaxComparer.ComputeDistance(
                 Nothing,
                 SpecializedCollections.EmptyArray(Of SyntaxToken))
 
-            Assert.Equal(0, Math.Round(distance, 2))
+            Assert.Equal(0.0, Math.Round(distance, 2))
 
             distance = SyntaxComparer.ComputeDistance(
                 SpecializedCollections.EmptyArray(Of SyntaxToken),
                 Nothing)
 
-            Assert.Equal(0, Math.Round(distance, 2))
+            Assert.Equal(0.0, Math.Round(distance, 2))
         End Sub
     End Class
 End Namespace
diff --git a/src/EditorFeatures/VisualBasicTest/EndConstructGeneration/EndConstructTestingHelpers.vb b/src/EditorFeatures/VisualBasicTest/EndConstructGeneration/EndConstructTestingHelpers.vb
index 1dc170a05c42898401a92308d33e47bbb0751893..8c1a62e8babbe8b303e40aa654a2903e5ab9f9e0 100644
--- a/src/EditorFeatures/VisualBasicTest/EndConstructGeneration/EndConstructTestingHelpers.vb
+++ b/src/EditorFeatures/VisualBasicTest/EndConstructGeneration/EndConstructTestingHelpers.vb
@@ -112,7 +112,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.EndConstructGenera
                     afterCaretPoint = New SnapshotPoint(textView.TextSnapshot, afterLine.Start + afterCaret(1))
                 End If
 
-                Assert.Equal(afterCaretPoint, textView.GetCaretPoint(subjectBuffer).Value.Position)
+                Assert.Equal(Of Integer)(afterCaretPoint, textView.GetCaretPoint(subjectBuffer).Value.Position)
             End Using
         End Sub
 
@@ -155,7 +155,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.EndConstructGenera
                 Assert.Equal(EditorFactory.LinesToFullText(text), textView.TextSnapshot.GetText())
 
                 ' The caret should not have moved
-                Assert.Equal(caretPosition, textView.GetCaretPoint(subjectBuffer).Value.Position)
+                Assert.Equal(Of Integer)(caretPosition, textView.GetCaretPoint(subjectBuffer).Value.Position)
             End Using
         End Sub
 
@@ -252,7 +252,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.EndConstructGenera
                 End If
 
                 Dim caretPosition = view.Caret.Position.VirtualBufferPosition
-                Assert.Equal(afterCaretPoint, If(caretPosition.IsInVirtualSpace, caretPosition.Position + caretPosition.VirtualSpaces, caretPosition.Position))
+                Assert.Equal(Of Integer)(afterCaretPoint, If(caretPosition.IsInVirtualSpace, caretPosition.Position + caretPosition.VirtualSpaces, caretPosition.Position))
             End Using
         End Sub
     End Module
diff --git a/src/EditorFeatures/VisualBasicTest/Formatting/Indentation/SmartIndenterTests.vb b/src/EditorFeatures/VisualBasicTest/Formatting/Indentation/SmartIndenterTests.vb
index 4c1fc164a72c2d81b56503d7c74b22e9b59aefbe..f0677184750093e0b3fc2d61d8e0c1c0dbdecea7 100644
--- a/src/EditorFeatures/VisualBasicTest/Formatting/Indentation/SmartIndenterTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/Formatting/Indentation/SmartIndenterTests.vb
@@ -2874,7 +2874,7 @@ End Class
                 Dim x = 0
             End If
 
-            Assert.Equal(expectedIndentation, actualIndentation.Value)
+            Assert.Equal(Of Integer)(expectedIndentation.Value, actualIndentation.Value)
         End Sub
 
         ''' <param name="indentationLine">0-based. The line number in code to get indentation for.</param>
@@ -2913,7 +2913,7 @@ End Class
                     Dim actualIndentation = indenter.GetDesiredIndentation(indentationLineFromBuffer)
 
                     If expectedIndentation.HasValue Then
-                        Assert.Equal(expectedIndentation, actualIndentation.Value)
+                        Assert.Equal(Of Integer)(expectedIndentation.Value, actualIndentation.Value)
                     Else
                         Assert.Null(actualIndentation)
                     End If
diff --git a/src/EditorFeatures/VisualBasicTest/Squiggles/ErrorSquiggleProducerTests.vb b/src/EditorFeatures/VisualBasicTest/Squiggles/ErrorSquiggleProducerTests.vb
index ac1d3a70f09346038e4bf533fdee5b6db1463278..dd6e6b7bbe7075db49edcd8fc024cb9ba8a1cbe5 100644
--- a/src/EditorFeatures/VisualBasicTest/Squiggles/ErrorSquiggleProducerTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/Squiggles/ErrorSquiggleProducerTests.vb
@@ -97,13 +97,13 @@ End Class").OrderBy(Function(s) s.Span.Span.Start).ToImmutableArray()
             Dim second = spans(1)
 
             Assert.Equal(PredefinedErrorTypeNames.Suggestion, first.Tag.ErrorType)
-            Assert.Equal(VBFeaturesResources.RemoveUnnecessaryImportsDiagnosticTitle, first.Tag.ToolTipContent)
-            Assert.Equal(79, first.Span.Start)
+            Assert.Equal(VBFeaturesResources.RemoveUnnecessaryImportsDiagnosticTitle, CType(first.Tag.ToolTipContent, String))
+            Assert.Equal(Of Integer)(79, first.Span.Start)
             Assert.Equal(83, first.Span.Length)
 
             Assert.Equal(PredefinedErrorTypeNames.Suggestion, second.Tag.ErrorType)
-            Assert.Equal(WorkspacesResources.NameCanBeSimplified, second.Tag.ToolTipContent)
-            Assert.Equal(221, second.Span.Start)
+            Assert.Equal(WorkspacesResources.NameCanBeSimplified, CType(second.Tag.ToolTipContent, String))
+            Assert.Equal(Of Integer)(221, second.Span.Start)
             Assert.Equal(5, second.Span.Length)
         End Sub
     End Class
diff --git a/src/VisualStudio/Core/Test/ProjectSystemShim/VisualStudioRuleSetTests.vb b/src/VisualStudio/Core/Test/ProjectSystemShim/VisualStudioRuleSetTests.vb
index f4b99c3e8303d7068d484c9bc7a573695fe3b0fb..9e70b2cd39fbec08d3596d2f21187b783b92a6a3 100644
--- a/src/VisualStudio/Core/Test/ProjectSystemShim/VisualStudioRuleSetTests.vb
+++ b/src/VisualStudio/Core/Test/ProjectSystemShim/VisualStudioRuleSetTests.vb
@@ -219,7 +219,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
                 Dim ruleSet2 = ruleSetManager.GetOrCreateRuleSet(ruleSetPath)
 
                 Assert.Equal(expected:=1, actual:=fileChangeService.WatchedFileCount)
-                Assert.ReferenceEquals(ruleSet1, ruleSet2)
+                Assert.Same(ruleSet1, ruleSet2)
             End Using
 
             Assert.Equal(expected:=0, actual:=fileChangeService.WatchedFileCount)
diff --git a/src/Workspaces/CoreTest/ExtensionOrdererTests.cs b/src/Workspaces/CoreTest/ExtensionOrdererTests.cs
index d95ed0ac306f68b986e978f936c2f142be6588ab..9a4db21e570fb7265e93e60f5ac71638a98b9916 100644
--- a/src/Workspaces/CoreTest/ExtensionOrdererTests.cs
+++ b/src/Workspaces/CoreTest/ExtensionOrdererTests.cs
@@ -39,7 +39,7 @@ public void TestNoCycle1()
             var extensions = new List<Lazy<Extension, ExtensionMetadata>>() { d, b, a, c, e };
 
             // ExtensionOrderer.CheckForCycles() will throw ArgumentException if cycle is detected.
-            Assert.DoesNotThrow(() => ExtensionOrderer.CheckForCycles(extensions));
+            ExtensionOrderer.CheckForCycles(extensions);
             var order = ExtensionOrderer.Order(extensions);
             VerifyOrder("abcde", order);
         }
@@ -56,7 +56,7 @@ public void TestNoCycle2()
             var extensions = new List<Lazy<Extension, ExtensionMetadata>>() { d, b, a, c, e };
 
             // ExtensionOrderer.CheckForCycles() will throw ArgumentException if cycle is detected.
-            Assert.DoesNotThrow(() => ExtensionOrderer.CheckForCycles(extensions));
+            ExtensionOrderer.CheckForCycles(extensions);
             var order = ExtensionOrderer.Order(extensions);
             VerifyOrder("edcba", order);
         }
@@ -73,7 +73,7 @@ public void TestNoCycle3()
             var extensions = new List<Lazy<Extension, ExtensionMetadata>>() { d, b, a, c, e };
 
             // ExtensionOrderer.CheckForCycles() will throw ArgumentException if cycle is detected.
-            Assert.DoesNotThrow(() => ExtensionOrderer.CheckForCycles(extensions));
+            ExtensionOrderer.CheckForCycles(extensions);
             var order = ExtensionOrderer.Order(extensions);
             VerifyOrder("abcde", order);
         }