diff --git a/directory.packages.props b/directory.packages.props
index dbe716f32..e908747a5 100644
--- a/directory.packages.props
+++ b/directory.packages.props
@@ -11,7 +11,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageVersion Include="stylecop.analyzers" Version="1.2.0-beta.435" PrivateAssets="all" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.2" PrivateAssets="all" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0" PrivateAssets="all" />
     <PackageVersion Include="Roslynator.Analyzers" Version="4.2.0" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/directory.build.props b/src/directory.build.props
index 6a39fceb6..70e0b3f0b 100644
--- a/src/directory.build.props
+++ b/src/directory.build.props
@@ -5,7 +5,7 @@
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="stylecop.analyzers" />
-        <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" />
+        <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" />
         <PackageReference Include="Roslynator.Analyzers" />
     </ItemGroup>
     <ItemGroup>
diff --git a/test/Airframe.Tests/BaseExceptionHandlerStub.cs b/test/Airframe.Tests/BaseExceptionHandlerStub.cs
index 3f2ccd455..e0926889e 100644
--- a/test/Airframe.Tests/BaseExceptionHandlerStub.cs
+++ b/test/Airframe.Tests/BaseExceptionHandlerStub.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Airframe.Tests
+namespace Rocket.Surgery.Airframe.Tests
 {
     internal sealed class BaseExceptionHandlerStub : IObserver<Exception>
     {
diff --git a/test/Airframe.Tests/SchedulerProviderFixture.cs b/test/Airframe.Tests/SchedulerProviderFixture.cs
index a84b8b71e..6820d507c 100644
--- a/test/Airframe.Tests/SchedulerProviderFixture.cs
+++ b/test/Airframe.Tests/SchedulerProviderFixture.cs
@@ -1,9 +1,9 @@
-using System.Reactive.Concurrency;
 using Microsoft.Reactive.Testing;
 using Rocket.Surgery.Airframe.Forms;
 using Rocket.Surgery.Extensions.Testing.Fixtures;
+using System.Reactive.Concurrency;
 
-namespace Airframe.Tests
+namespace Rocket.Surgery.Airframe.Tests
 {
     public class SchedulerProviderFixture : ITestFixtureBuilder
     {
diff --git a/test/Airframe.Tests/TestBase.cs b/test/Airframe.Tests/TestBase.cs
index 7cf649bfe..f9db7e5c4 100644
--- a/test/Airframe.Tests/TestBase.cs
+++ b/test/Airframe.Tests/TestBase.cs
@@ -1,6 +1,6 @@
 using ReactiveUI;
 
-namespace Airframe.Tests
+namespace Rocket.Surgery.Airframe.Tests
 {
     public abstract class TestBase
     {
diff --git a/test/Composition.Tests/DryIocModuleTests.cs b/test/Composition.Tests/DryIocModuleTests.cs
index 7aa0566a8..148e22d1b 100644
--- a/test/Composition.Tests/DryIocModuleTests.cs
+++ b/test/Composition.Tests/DryIocModuleTests.cs
@@ -18,6 +18,7 @@ public void Should_Resolve_Module()
 
             result.Resolve<TestModule>().Should().NotBeNull();
         }
+
         [Fact]
         public void Should_Resolve_Module_Registrations()
         {
diff --git a/test/Timers.Tests/DecrementTimerFixture.cs b/test/Timers.Tests/DecrementTimerFixture.cs
index 238e28366..00ea79457 100644
--- a/test/Timers.Tests/DecrementTimerFixture.cs
+++ b/test/Timers.Tests/DecrementTimerFixture.cs
@@ -1,5 +1,5 @@
-using Airframe.Tests;
 using Rocket.Surgery.Airframe.Forms;
+using Rocket.Surgery.Airframe.Tests;
 using Rocket.Surgery.Airframe.Timers;
 using Rocket.Surgery.Extensions.Testing.Fixtures;
 
diff --git a/test/Timers.Tests/DecrementTimerTests.cs b/test/Timers.Tests/DecrementTimerTests.cs
index 7b03fec1c..f55a9b744 100644
--- a/test/Timers.Tests/DecrementTimerTests.cs
+++ b/test/Timers.Tests/DecrementTimerTests.cs
@@ -1,8 +1,8 @@
-using Airframe.Tests;
 using FluentAssertions;
 using Microsoft.Reactive.Testing;
 using ReactiveUI.Testing;
 using Rocket.Surgery.Airframe.Forms;
+using Rocket.Surgery.Airframe.Tests;
 using Rocket.Surgery.Airframe.Timers;
 using System;
 using Xunit;
diff --git a/test/Timers.Tests/DivisibleTimerFixture.cs b/test/Timers.Tests/DivisibleTimerFixture.cs
index 8f0d34247..db63fb9ce 100644
--- a/test/Timers.Tests/DivisibleTimerFixture.cs
+++ b/test/Timers.Tests/DivisibleTimerFixture.cs
@@ -1,5 +1,5 @@
-using Airframe.Tests;
 using Rocket.Surgery.Airframe.Forms;
+using Rocket.Surgery.Airframe.Tests;
 using Rocket.Surgery.Airframe.Timers;
 using Rocket.Surgery.Extensions.Testing.Fixtures;
 
diff --git a/test/Timers.Tests/DivisibleTimerTests.cs b/test/Timers.Tests/DivisibleTimerTests.cs
index 05054bb32..3fb3203cf 100644
--- a/test/Timers.Tests/DivisibleTimerTests.cs
+++ b/test/Timers.Tests/DivisibleTimerTests.cs
@@ -1,6 +1,6 @@
-using Airframe.Tests;
 using FluentAssertions;
 using Microsoft.Reactive.Testing;
+using Rocket.Surgery.Airframe.Tests;
 using Rocket.Surgery.Airframe.Timers;
 using System;
 using System.Reactive.Linq;
diff --git a/test/Timers.Tests/IncrementTimerFixture.cs b/test/Timers.Tests/IncrementTimerFixture.cs
index 1d51130f1..85c4cf36f 100644
--- a/test/Timers.Tests/IncrementTimerFixture.cs
+++ b/test/Timers.Tests/IncrementTimerFixture.cs
@@ -1,5 +1,5 @@
-using Airframe.Tests;
 using Rocket.Surgery.Airframe.Forms;
+using Rocket.Surgery.Airframe.Tests;
 using Rocket.Surgery.Airframe.Timers;
 using Rocket.Surgery.Extensions.Testing.Fixtures;
 
diff --git a/test/Timers.Tests/IncrementTimerTests.cs b/test/Timers.Tests/IncrementTimerTests.cs
index 6ceda573e..b49770d69 100644
--- a/test/Timers.Tests/IncrementTimerTests.cs
+++ b/test/Timers.Tests/IncrementTimerTests.cs
@@ -1,8 +1,8 @@
-using Airframe.Tests;
 using FluentAssertions;
 using Microsoft.Reactive.Testing;
 using ReactiveUI.Testing;
 using Rocket.Surgery.Airframe.Forms;
+using Rocket.Surgery.Airframe.Tests;
 using Rocket.Surgery.Airframe.Timers;
 using System;
 using Xunit;
diff --git a/test/ViewModels.Tests/NavigableViewModelTests.cs b/test/ViewModels.Tests/NavigableViewModelTests.cs
index adc4a78aa..485271a3a 100644
--- a/test/ViewModels.Tests/NavigableViewModelTests.cs
+++ b/test/ViewModels.Tests/NavigableViewModelTests.cs
@@ -1,10 +1,10 @@
-using Airframe.Tests;
 using FluentAssertions;
+using Rocket.Surgery.Airframe.Tests;
 using Sextant;
 using System;
 using Xunit;
 
-namespace Airframe.ViewModels.Tests
+namespace Rocket.Surgery.Airframe.ViewModels.Tests
 {
     public class NavigableViewModelTests : TestBase
     {
@@ -14,13 +14,13 @@ public class TheNavigatedToProperty
             public void Should_Have_Parameter()
             {
                 // Given
-                TestNavigationViewModel sut = new TestNavigationViewModelFixture();
+                var sut = new TestNavigationViewModelFixture().AsInterface<INavigated>();
 
                 // When
-                ( (INavigated)sut ).WhenNavigatedTo(new NavigationParameter()).Subscribe();
+                using var disposable = sut.WhenNavigatedTo(new NavigationParameter()).Subscribe();
 
                 // Then
-                sut.NavigatedToParameter.Should().BeAssignableTo<INavigationParameter>();
+                sut.As<TestNavigationViewModel>().NavigatedToParameter.Should().BeAssignableTo<INavigationParameter>();
             }
         }
 
@@ -30,13 +30,13 @@ public class TheNavigatedFromProperty
             public void Should_Have_Parameter()
             {
                 // Given
-                TestNavigationViewModel sut = new TestNavigationViewModelFixture();
+                var sut = new TestNavigationViewModelFixture().AsInterface<INavigated>();
 
                 // When
-                ( (INavigated)sut ).WhenNavigatedFrom(new NavigationParameter()).Subscribe();
+                using var disposable = sut.WhenNavigatedFrom(new NavigationParameter()).Subscribe();
 
                 // Then
-                sut.NavigatedFromParameter.Should().BeAssignableTo<INavigationParameter>();
+                sut.As<TestNavigationViewModel>().NavigatedFromParameter.Should().BeAssignableTo<INavigationParameter>();
             }
         }
 
@@ -46,13 +46,13 @@ public class TheNavigatingToProperty
             public void Should_Have_Parameter()
             {
                 // Given
-                TestNavigationViewModel sut = new TestNavigationViewModelFixture();
+                var sut = new TestNavigationViewModelFixture().AsInterface<INavigating>();
 
                 // When
-                ( (INavigating)sut ).WhenNavigatingTo(new NavigationParameter()).Subscribe();
+                using var disposable = sut.WhenNavigatingTo(new NavigationParameter()).Subscribe();
 
                 // Then
-                sut.NavigatingToParameter.Should().BeAssignableTo<INavigationParameter>();
+                sut.As<TestNavigationViewModel>().NavigatingToParameter.Should().BeAssignableTo<INavigationParameter>();
             }
         }
 
@@ -65,7 +65,7 @@ public void Should_Execute_Template()
                 TestNavigationViewModel sut = new TestNavigationViewModelFixture();
 
                 // When
-                sut.Initialize.Execute().Subscribe();
+                using var disposable = sut.Initialize.Execute().Subscribe();
 
                 // Then
                 sut.Overriden.Should().BeTrue();
diff --git a/test/ViewModels.Tests/TestNavigationViewModel.cs b/test/ViewModels.Tests/TestNavigationViewModel.cs
index c50215cc3..40e7bb66f 100644
--- a/test/ViewModels.Tests/TestNavigationViewModel.cs
+++ b/test/ViewModels.Tests/TestNavigationViewModel.cs
@@ -1,11 +1,10 @@
 using ReactiveUI;
-using Rocket.Surgery.Airframe.ViewModels;
 using Sextant;
 using System;
 using System.Reactive;
 using System.Reactive.Disposables;
 
-namespace Airframe.ViewModels.Tests
+namespace Rocket.Surgery.Airframe.ViewModels.Tests
 {
     internal class TestNavigationViewModel : NavigableViewModelBase
     {
diff --git a/test/ViewModels.Tests/TestNavigationViewModelFixture.cs b/test/ViewModels.Tests/TestNavigationViewModelFixture.cs
index 86cab872a..8b68e9232 100644
--- a/test/ViewModels.Tests/TestNavigationViewModelFixture.cs
+++ b/test/ViewModels.Tests/TestNavigationViewModelFixture.cs
@@ -1,9 +1,12 @@
-namespace Airframe.ViewModels.Tests
+using FluentAssertions;
+
+namespace Rocket.Surgery.Airframe.ViewModels.Tests
 {
     internal class TestNavigationViewModelFixture
     {
         public static implicit operator TestNavigationViewModel(TestNavigationViewModelFixture fixture) => fixture.Build();
 
+        public T AsInterface<T>() => Build().As<T>();
         private TestNavigationViewModel Build() => new TestNavigationViewModel();
     }
 }
\ No newline at end of file
diff --git a/test/ViewModels.Tests/TestViewModel.cs b/test/ViewModels.Tests/TestViewModel.cs
index 0d4a9901d..c34cd6452 100644
--- a/test/ViewModels.Tests/TestViewModel.cs
+++ b/test/ViewModels.Tests/TestViewModel.cs
@@ -1,6 +1,4 @@
-using Rocket.Surgery.Airframe.ViewModels;
-
-namespace Airframe.ViewModels.Tests
+namespace Rocket.Surgery.Airframe.ViewModels.Tests
 {
     internal class TestViewModel : ViewModelBase
     {
diff --git a/test/ViewModels.Tests/TestViewModelFixture.cs b/test/ViewModels.Tests/TestViewModelFixture.cs
index 61df423c9..f6a3e045c 100644
--- a/test/ViewModels.Tests/TestViewModelFixture.cs
+++ b/test/ViewModels.Tests/TestViewModelFixture.cs
@@ -1,6 +1,6 @@
 using Rocket.Surgery.Extensions.Testing.Fixtures;
 
-namespace Airframe.ViewModels.Tests
+namespace Rocket.Surgery.Airframe.ViewModels.Tests
 {
     internal class TestViewModelFixture : ITestFixtureBuilder
     {
diff --git a/test/ViewModels.Tests/ViewModelTests.cs b/test/ViewModels.Tests/ViewModelTests.cs
index cb657ff2f..2080b7d1a 100644
--- a/test/ViewModels.Tests/ViewModelTests.cs
+++ b/test/ViewModels.Tests/ViewModelTests.cs
@@ -1,7 +1,7 @@
 using FluentAssertions;
 using Xunit;
 
-namespace Airframe.ViewModels.Tests
+namespace Rocket.Surgery.Airframe.ViewModels.Tests
 {
     public sealed class ViewModelTests
     {