From 12053fd0767373841724f7f17cac3ba7d1fb2f9d Mon Sep 17 00:00:00 2001
From: Adrian Conlon <98398945+AdrianConlon@users.noreply.github.com>
Date: Mon, 12 May 2025 21:39:42 +0100
Subject: [PATCH] Tidy 6809 tests namespace

---
 MC6809/MC6809.UnitTest/AbxTests.cs |  7 ++-----
 MC6809/MC6809.UnitTest/AdcTests.cs |  7 +++----
 MC6809/MC6809.UnitTest/AddTests.cs |  4 +---
 MC6809/MC6809.UnitTest/AndTests.cs |  4 +---
 MC6809/MC6809.UnitTest/AslTests.cs |  4 +---
 MC6809/MC6809.UnitTest/AsrTests.cs |  4 +---
 MC6809/MC6809.UnitTest/BgtTests.cs |  4 +---
 MC6809/MC6809.UnitTest/BhiTests.cs |  4 +---
 MC6809/MC6809.UnitTest/BitTests.cs |  4 +---
 MC6809/MC6809.UnitTest/BleTests.cs |  4 +---
 MC6809/MC6809.UnitTest/Board.cs    | 13 ++++++-------
 MC6809/MC6809.UnitTest/ClrTests.cs |  4 +---
 MC6809/MC6809.UnitTest/CmpTests.cs |  4 +---
 MC6809/MC6809.UnitTest/ComTests.cs |  4 +---
 MC6809/MC6809.UnitTest/DaaTests.cs |  4 +---
 MC6809/MC6809.UnitTest/DecTests.cs |  4 +---
 MC6809/MC6809.UnitTest/EorTests.cs |  4 +---
 MC6809/MC6809.UnitTest/ExgTests.cs |  4 +---
 MC6809/MC6809.UnitTest/IncTests.cs |  4 +---
 MC6809/MC6809.UnitTest/JsrTests.cs |  4 +---
 MC6809/MC6809.UnitTest/LdTests.cs  |  4 +---
 MC6809/MC6809.UnitTest/LeaTests.cs |  4 +---
 MC6809/MC6809.UnitTest/LsrTests.cs | 15 +++++++--------
 MC6809/MC6809.UnitTest/MulTests.cs |  9 ++++-----
 MC6809/MC6809.UnitTest/NegTests.cs |  4 +---
 MC6809/MC6809.UnitTest/OrTests.cs  |  4 +---
 MC6809/MC6809.UnitTest/PshTests.cs |  4 +---
 MC6809/MC6809.UnitTest/PulTests.cs |  4 +---
 MC6809/MC6809.UnitTest/RolTests.cs |  4 +---
 MC6809/MC6809.UnitTest/RorTests.cs |  7 +++----
 MC6809/MC6809.UnitTest/RtsTests.cs |  4 +---
 MC6809/MC6809.UnitTest/SbcTests.cs |  4 +---
 MC6809/MC6809.UnitTest/SexTests.cs |  4 +---
 MC6809/MC6809.UnitTest/SubTests.cs |  4 +---
 MC6809/MC6809.UnitTest/TfrTests.cs |  4 +---
 MC6809/MC6809.UnitTest/TstTests.cs |  4 +---
 36 files changed, 55 insertions(+), 123 deletions(-)

diff --git a/MC6809/MC6809.UnitTest/AbxTests.cs b/MC6809/MC6809.UnitTest/AbxTests.cs
index 436b70f..5974f37 100644
--- a/MC6809/MC6809.UnitTest/AbxTests.cs
+++ b/MC6809/MC6809.UnitTest/AbxTests.cs
@@ -1,22 +1,19 @@
 // <copyright file="AbxTests.cs" company="Adrian Conlon">
 // Copyright (c) Adrian Conlon. All rights reserved.
 // </copyright>
-
-namespace EightBit
+namespace MC6809.UnitTest
 {
-    using MC6809;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]
     public class AbxTests
     {
-        private readonly Board board = new Board();
+        private readonly Board board = new();
         private readonly MC6809 cpu;
 
         public AbxTests()
         {
             this.cpu = this.board.CPU;
-
             this.board.Poke(0, 0x3a);
         }
 
diff --git a/MC6809/MC6809.UnitTest/AdcTests.cs b/MC6809/MC6809.UnitTest/AdcTests.cs
index 5b89e8f..aca7005 100644
--- a/MC6809/MC6809.UnitTest/AdcTests.cs
+++ b/MC6809/MC6809.UnitTest/AdcTests.cs
@@ -1,10 +1,9 @@
 // <copyright file="AdcTests.cs" company="Adrian Conlon">
 // Copyright (c) Adrian Conlon. All rights reserved.
 // </copyright>
-
-namespace EightBit
+namespace MC6809.UnitTest
 {
-    using MC6809;
+    using EightBit;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]
@@ -30,7 +29,7 @@ namespace EightBit
         {
             this.board.Poke(0, 0x89);
             this.board.Poke(1, 0x7c);
-            this.cpu.CC = EightBit.Chip.SetBit(this.cpu.CC, (byte)StatusBits.CF);
+            this.cpu.CC = Chip.SetBit(this.cpu.CC, (byte)StatusBits.CF);
             this.cpu.A = 0x3a;
             this.cpu.Step();
             Assert.AreEqual(0xb7, this.cpu.A);
diff --git a/MC6809/MC6809.UnitTest/AddTests.cs b/MC6809/MC6809.UnitTest/AddTests.cs
index e9771e3..f87f16c 100644
--- a/MC6809/MC6809.UnitTest/AddTests.cs
+++ b/MC6809/MC6809.UnitTest/AddTests.cs
@@ -1,10 +1,8 @@
 // <copyright file="AddTests.cs" company="Adrian Conlon">
 // Copyright (c) Adrian Conlon. All rights reserved.
 // </copyright>
-
-namespace EightBit
+namespace MC6809.UnitTest
 {
-    using MC6809;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]
diff --git a/MC6809/MC6809.UnitTest/AndTests.cs b/MC6809/MC6809.UnitTest/AndTests.cs
index a794c9b..5b17e60 100644
--- a/MC6809/MC6809.UnitTest/AndTests.cs
+++ b/MC6809/MC6809.UnitTest/AndTests.cs
@@ -1,10 +1,8 @@
 // <copyright file="AndTests.cs" company="Adrian Conlon">
 // Copyright (c) Adrian Conlon. All rights reserved.
 // </copyright>
-
-namespace EightBit
+namespace MC6809.UnitTest
 {
-    using MC6809;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]
diff --git a/MC6809/MC6809.UnitTest/AslTests.cs b/MC6809/MC6809.UnitTest/AslTests.cs
index ef868c8..56173d4 100644
--- a/MC6809/MC6809.UnitTest/AslTests.cs
+++ b/MC6809/MC6809.UnitTest/AslTests.cs
@@ -1,10 +1,8 @@
 // <copyright file="AslTests.cs" company="Adrian Conlon">
 // Copyright (c) Adrian Conlon. All rights reserved.
 // </copyright>
-
-namespace EightBit
+namespace MC6809.UnitTest
 {
-    using MC6809;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]
diff --git a/MC6809/MC6809.UnitTest/AsrTests.cs b/MC6809/MC6809.UnitTest/AsrTests.cs
index 2f16f8d..8e9c042 100644
--- a/MC6809/MC6809.UnitTest/AsrTests.cs
+++ b/MC6809/MC6809.UnitTest/AsrTests.cs
@@ -1,10 +1,8 @@
 // <copyright file="AsrTests.cs" company="Adrian Conlon">
 // Copyright (c) Adrian Conlon. All rights reserved.
 // </copyright>
-
-namespace EightBit
+namespace MC6809.UnitTest
 {
-    using MC6809;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]
diff --git a/MC6809/MC6809.UnitTest/BgtTests.cs b/MC6809/MC6809.UnitTest/BgtTests.cs
index 24b73fc..5334f24 100644
--- a/MC6809/MC6809.UnitTest/BgtTests.cs
+++ b/MC6809/MC6809.UnitTest/BgtTests.cs
@@ -1,10 +1,8 @@
 // <copyright file="BgtTests.cs" company="Adrian Conlon">
 // Copyright (c) Adrian Conlon. All rights reserved.
 // </copyright>
-
-namespace EightBit
+namespace MC6809.UnitTest
 {
-    using MC6809;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]
diff --git a/MC6809/MC6809.UnitTest/BhiTests.cs b/MC6809/MC6809.UnitTest/BhiTests.cs
index 563e708..8aaed5e 100644
--- a/MC6809/MC6809.UnitTest/BhiTests.cs
+++ b/MC6809/MC6809.UnitTest/BhiTests.cs
@@ -1,10 +1,8 @@
 // <copyright file="BhiTests.cs" company="Adrian Conlon">
 // Copyright (c) Adrian Conlon. All rights reserved.
 // </copyright>
-
-namespace EightBit
+namespace MC6809.UnitTest
 {
-    using MC6809;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]
diff --git a/MC6809/MC6809.UnitTest/BitTests.cs b/MC6809/MC6809.UnitTest/BitTests.cs
index 78c4d05..9a459fe 100644
--- a/MC6809/MC6809.UnitTest/BitTests.cs
+++ b/MC6809/MC6809.UnitTest/BitTests.cs
@@ -1,10 +1,8 @@
 // <copyright file="BitTests.cs" company="Adrian Conlon">
 // Copyright (c) Adrian Conlon. All rights reserved.
 // </copyright>
-
-namespace EightBit
+namespace MC6809.UnitTest
 {
-    using MC6809;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]
diff --git a/MC6809/MC6809.UnitTest/BleTests.cs b/MC6809/MC6809.UnitTest/BleTests.cs
index 5bbfb8c..48ad8ab 100644
--- a/MC6809/MC6809.UnitTest/BleTests.cs
+++ b/MC6809/MC6809.UnitTest/BleTests.cs
@@ -1,10 +1,8 @@
 // <copyright file="BleTests.cs" company="Adrian Conlon">
 // Copyright (c) Adrian Conlon. All rights reserved.
 // </copyright>
-
-namespace EightBit
+namespace MC6809.UnitTest
 {
-    using MC6809;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]
diff --git a/MC6809/MC6809.UnitTest/Board.cs b/MC6809/MC6809.UnitTest/Board.cs
index 1da6556..5bd87b5 100644
--- a/MC6809/MC6809.UnitTest/Board.cs
+++ b/MC6809/MC6809.UnitTest/Board.cs
@@ -1,20 +1,19 @@
 // <copyright file="Board.cs" company="Adrian Conlon">
 // Copyright (c) Adrian Conlon. All rights reserved.
 // </copyright>
-
-namespace EightBit
+namespace MC6809.UnitTest
 {
-    using MC6809;
+    using EightBit;
 
-    public sealed class Board : EightBit.Bus
+    public sealed class Board : Bus
     {
-        private readonly Ram ram = new Ram(0x10000);  // 0000 - FFFF, 64K RAM
+        private readonly Ram ram = new(0x10000);  // 0000 - FFFF, 64K RAM
         private readonly MemoryMapping mapping;
 
         public Board()
         {
-            this.CPU = new MC6809(this);
-            this.mapping = new MemoryMapping(this.ram, 0x0000, 0xffff, EightBit.AccessLevel.ReadWrite);
+            this.CPU = new(this);
+            this.mapping = new(this.ram, 0x0000, 0xffff, AccessLevel.ReadWrite);
         }
 
         public MC6809 CPU { get; }
diff --git a/MC6809/MC6809.UnitTest/ClrTests.cs b/MC6809/MC6809.UnitTest/ClrTests.cs
index 3ce082b..e3a829a 100644
--- a/MC6809/MC6809.UnitTest/ClrTests.cs
+++ b/MC6809/MC6809.UnitTest/ClrTests.cs
@@ -1,10 +1,8 @@
 // <copyright file="ClrTests.cs" company="Adrian Conlon">
 // Copyright (c) Adrian Conlon. All rights reserved.
 // </copyright>
-
-namespace EightBit
+namespace MC6809.UnitTest
 {
-    using MC6809;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]
diff --git a/MC6809/MC6809.UnitTest/CmpTests.cs b/MC6809/MC6809.UnitTest/CmpTests.cs
index 4d97ccb..28bef47 100644
--- a/MC6809/MC6809.UnitTest/CmpTests.cs
+++ b/MC6809/MC6809.UnitTest/CmpTests.cs
@@ -1,10 +1,8 @@
 // <copyright file="CmpTests.cs" company="Adrian Conlon">
 // Copyright (c) Adrian Conlon. All rights reserved.
 // </copyright>
-
-namespace EightBit
+namespace MC6809.UnitTest
 {
-    using MC6809;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]
diff --git a/MC6809/MC6809.UnitTest/ComTests.cs b/MC6809/MC6809.UnitTest/ComTests.cs
index 530412f..28a0e3f 100644
--- a/MC6809/MC6809.UnitTest/ComTests.cs
+++ b/MC6809/MC6809.UnitTest/ComTests.cs
@@ -1,10 +1,8 @@
 // <copyright file="ComTests.cs" company="Adrian Conlon">
 // Copyright (c) Adrian Conlon. All rights reserved.
 // </copyright>
-
-namespace EightBit
+namespace MC6809.UnitTest
 {
-    using MC6809;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]
diff --git a/MC6809/MC6809.UnitTest/DaaTests.cs b/MC6809/MC6809.UnitTest/DaaTests.cs
index b2c7419..ae88d20 100644
--- a/MC6809/MC6809.UnitTest/DaaTests.cs
+++ b/MC6809/MC6809.UnitTest/DaaTests.cs
@@ -1,10 +1,8 @@
 // <copyright file="DaaTests.cs" company="Adrian Conlon">
 // Copyright (c) Adrian Conlon. All rights reserved.
 // </copyright>
-
-namespace EightBit
+namespace MC6809.UnitTest
 {
-    using MC6809;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]
diff --git a/MC6809/MC6809.UnitTest/DecTests.cs b/MC6809/MC6809.UnitTest/DecTests.cs
index 2e57d72..1a5b233 100644
--- a/MC6809/MC6809.UnitTest/DecTests.cs
+++ b/MC6809/MC6809.UnitTest/DecTests.cs
@@ -1,10 +1,8 @@
 // <copyright file="DecTests.cs" company="Adrian Conlon">
 // Copyright (c) Adrian Conlon. All rights reserved.
 // </copyright>
-
-namespace EightBit
+namespace MC6809.UnitTest
 {
-    using MC6809;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]
diff --git a/MC6809/MC6809.UnitTest/EorTests.cs b/MC6809/MC6809.UnitTest/EorTests.cs
index 7f2c251..0bf8876 100644
--- a/MC6809/MC6809.UnitTest/EorTests.cs
+++ b/MC6809/MC6809.UnitTest/EorTests.cs
@@ -1,10 +1,8 @@
 // <copyright file="EorTests.cs" company="Adrian Conlon">
 // Copyright (c) Adrian Conlon. All rights reserved.
 // </copyright>
-
-namespace EightBit
+namespace MC6809.UnitTest
 {
-    using MC6809;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]
diff --git a/MC6809/MC6809.UnitTest/ExgTests.cs b/MC6809/MC6809.UnitTest/ExgTests.cs
index 3ef61a6..3aa8329 100644
--- a/MC6809/MC6809.UnitTest/ExgTests.cs
+++ b/MC6809/MC6809.UnitTest/ExgTests.cs
@@ -1,10 +1,8 @@
 // <copyright file="ExgTests.cs" company="Adrian Conlon">
 // Copyright (c) Adrian Conlon. All rights reserved.
 // </copyright>
-
-namespace EightBit
+namespace MC6809.UnitTest
 {
-    using MC6809;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]
diff --git a/MC6809/MC6809.UnitTest/IncTests.cs b/MC6809/MC6809.UnitTest/IncTests.cs
index 411fe3f..54ad1fb 100644
--- a/MC6809/MC6809.UnitTest/IncTests.cs
+++ b/MC6809/MC6809.UnitTest/IncTests.cs
@@ -1,10 +1,8 @@
 // <copyright file="IncTests.cs" company="Adrian Conlon">
 // Copyright (c) Adrian Conlon. All rights reserved.
 // </copyright>
-
-namespace EightBit
+namespace MC6809.UnitTest
 {
-    using MC6809;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]
diff --git a/MC6809/MC6809.UnitTest/JsrTests.cs b/MC6809/MC6809.UnitTest/JsrTests.cs
index 73535b5..5b16c0e 100644
--- a/MC6809/MC6809.UnitTest/JsrTests.cs
+++ b/MC6809/MC6809.UnitTest/JsrTests.cs
@@ -1,10 +1,8 @@
 // <copyright file="JsrTests.cs" company="Adrian Conlon">
 // Copyright (c) Adrian Conlon. All rights reserved.
 // </copyright>
-
-namespace EightBit
+namespace MC6809.UnitTest
 {
-    using MC6809;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     // https://github.com/sorenroug/osnine-java/blob/master/core/src/test/java/org/roug/osnine/BranchAndJumpTest.java
diff --git a/MC6809/MC6809.UnitTest/LdTests.cs b/MC6809/MC6809.UnitTest/LdTests.cs
index 120d468..0cf892b 100644
--- a/MC6809/MC6809.UnitTest/LdTests.cs
+++ b/MC6809/MC6809.UnitTest/LdTests.cs
@@ -1,10 +1,8 @@
 // <copyright file="LdTests.cs" company="Adrian Conlon">
 // Copyright (c) Adrian Conlon. All rights reserved.
 // </copyright>
-
-namespace EightBit
+namespace MC6809.UnitTest
 {
-    using MC6809;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]
diff --git a/MC6809/MC6809.UnitTest/LeaTests.cs b/MC6809/MC6809.UnitTest/LeaTests.cs
index 5b5c6e4..a371410 100644
--- a/MC6809/MC6809.UnitTest/LeaTests.cs
+++ b/MC6809/MC6809.UnitTest/LeaTests.cs
@@ -1,10 +1,8 @@
 // <copyright file="LeaTests.cs" company="Adrian Conlon">
 // Copyright (c) Adrian Conlon. All rights reserved.
 // </copyright>
-
-namespace EightBit
+namespace MC6809.UnitTest
 {
-    using MC6809;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]
diff --git a/MC6809/MC6809.UnitTest/LsrTests.cs b/MC6809/MC6809.UnitTest/LsrTests.cs
index 802ab24..be126a2 100644
--- a/MC6809/MC6809.UnitTest/LsrTests.cs
+++ b/MC6809/MC6809.UnitTest/LsrTests.cs
@@ -1,10 +1,9 @@
 // <copyright file="LsrTests.cs" company="Adrian Conlon">
 // Copyright (c) Adrian Conlon. All rights reserved.
 // </copyright>
-
-namespace EightBit
+namespace MC6809.UnitTest
 {
-    using MC6809;
+    using EightBit;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]
@@ -47,9 +46,9 @@ namespace EightBit
         public void TestLSR_a_two()
         {
             this.board.Poke(0xb00, 0x44);
-            this.cpu.CC = MC6809.ClearBit(this.cpu.CC, (byte)StatusBits.CF);
-            this.cpu.CC = MC6809.SetBit(this.cpu.CC, (byte)StatusBits.VF);
-            this.cpu.CC = MC6809.SetBit(this.cpu.CC, (byte)StatusBits.NF);
+            this.cpu.CC = Chip.ClearBit(this.cpu.CC, (byte)StatusBits.CF);
+            this.cpu.CC = Chip.SetBit(this.cpu.CC, (byte)StatusBits.VF);
+            this.cpu.CC = Chip.SetBit(this.cpu.CC, (byte)StatusBits.NF);
             this.cpu.A = 1;
             this.cpu.PC.Word = 0xb00;
 
@@ -66,8 +65,8 @@ namespace EightBit
         public void TestLSR_a_three()
         {
             this.board.Poke(0xb00, 0x44);
-            this.cpu.CC = MC6809.ClearBit(this.cpu.CC, (byte)StatusBits.CF);
-            this.cpu.CC = MC6809.ClearBit(this.cpu.CC, (byte)StatusBits.VF);
+            this.cpu.CC = Chip.ClearBit(this.cpu.CC, (byte)StatusBits.CF);
+            this.cpu.CC = Chip.ClearBit(this.cpu.CC, (byte)StatusBits.VF);
             this.cpu.A = 0xb8;
             this.cpu.PC.Word = 0xb00;
 
diff --git a/MC6809/MC6809.UnitTest/MulTests.cs b/MC6809/MC6809.UnitTest/MulTests.cs
index 6261d47..8aea246 100644
--- a/MC6809/MC6809.UnitTest/MulTests.cs
+++ b/MC6809/MC6809.UnitTest/MulTests.cs
@@ -1,10 +1,9 @@
 // <copyright file="MulTests.cs" company="Adrian Conlon">
 // Copyright (c) Adrian Conlon. All rights reserved.
 // </copyright>
-
-namespace EightBit
+namespace MC6809.UnitTest
 {
-    using MC6809;
+    using EightBit;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]
@@ -55,8 +54,8 @@ namespace EightBit
         {
             this.board.Poke(0xb00, 0x3d);
             this.cpu.CC = 0;
-            this.cpu.CC = MC6809.ClearBit(this.cpu.CC, (byte)StatusBits.CF);
-            this.cpu.CC = MC6809.SetBit(this.cpu.CC, (byte)StatusBits.ZF);
+            this.cpu.CC = Chip.ClearBit(this.cpu.CC, (byte)StatusBits.CF);
+            this.cpu.CC = Chip.SetBit(this.cpu.CC, (byte)StatusBits.ZF);
             this.cpu.A = 0xc;
             this.cpu.B = 0x00;
             this.cpu.PC.Word = 0xb00;
diff --git a/MC6809/MC6809.UnitTest/NegTests.cs b/MC6809/MC6809.UnitTest/NegTests.cs
index 119d04c..81a1f7c 100644
--- a/MC6809/MC6809.UnitTest/NegTests.cs
+++ b/MC6809/MC6809.UnitTest/NegTests.cs
@@ -1,10 +1,8 @@
 // <copyright file="NegTests.cs" company="Adrian Conlon">
 // Copyright (c) Adrian Conlon. All rights reserved.
 // </copyright>
-
-namespace EightBit
+namespace MC6809.UnitTest
 {
-    using MC6809;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]
diff --git a/MC6809/MC6809.UnitTest/OrTests.cs b/MC6809/MC6809.UnitTest/OrTests.cs
index a38b69e..91d6975 100644
--- a/MC6809/MC6809.UnitTest/OrTests.cs
+++ b/MC6809/MC6809.UnitTest/OrTests.cs
@@ -1,10 +1,8 @@
 // <copyright file="OrTests.cs" company="Adrian Conlon">
 // Copyright (c) Adrian Conlon. All rights reserved.
 // </copyright>
-
-namespace EightBit
+namespace MC6809.UnitTest
 {
-    using MC6809;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]
diff --git a/MC6809/MC6809.UnitTest/PshTests.cs b/MC6809/MC6809.UnitTest/PshTests.cs
index 04c1a5c..3ea8e69 100644
--- a/MC6809/MC6809.UnitTest/PshTests.cs
+++ b/MC6809/MC6809.UnitTest/PshTests.cs
@@ -1,10 +1,8 @@
 // <copyright file="PshTests.cs" company="Adrian Conlon">
 // Copyright (c) Adrian Conlon. All rights reserved.
 // </copyright>
-
-namespace EightBit
+namespace MC6809.UnitTest
 {
-    using MC6809;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]
diff --git a/MC6809/MC6809.UnitTest/PulTests.cs b/MC6809/MC6809.UnitTest/PulTests.cs
index 2fd86e9..7a35917 100644
--- a/MC6809/MC6809.UnitTest/PulTests.cs
+++ b/MC6809/MC6809.UnitTest/PulTests.cs
@@ -1,10 +1,8 @@
 // <copyright file="PulTests.cs" company="Adrian Conlon">
 // Copyright (c) Adrian Conlon. All rights reserved.
 // </copyright>
-
-namespace EightBit
+namespace MC6809.UnitTest
 {
-    using MC6809;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]
diff --git a/MC6809/MC6809.UnitTest/RolTests.cs b/MC6809/MC6809.UnitTest/RolTests.cs
index ba91e16..cf2635c 100644
--- a/MC6809/MC6809.UnitTest/RolTests.cs
+++ b/MC6809/MC6809.UnitTest/RolTests.cs
@@ -1,10 +1,8 @@
 // <copyright file="RolTests.cs" company="Adrian Conlon">
 // Copyright (c) Adrian Conlon. All rights reserved.
 // </copyright>
-
-namespace EightBit
+namespace MC6809.UnitTest
 {
-    using MC6809;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]
diff --git a/MC6809/MC6809.UnitTest/RorTests.cs b/MC6809/MC6809.UnitTest/RorTests.cs
index 04bb54f..a77e24f 100644
--- a/MC6809/MC6809.UnitTest/RorTests.cs
+++ b/MC6809/MC6809.UnitTest/RorTests.cs
@@ -1,10 +1,9 @@
 // <copyright file="RorTests.cs" company="Adrian Conlon">
 // Copyright (c) Adrian Conlon. All rights reserved.
 // </copyright>
-
-namespace EightBit
+namespace MC6809.UnitTest
 {
-    using MC6809;
+    using EightBit;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]
@@ -48,7 +47,7 @@ namespace EightBit
             this.board.Poke(0xb00, 0x56);
             this.cpu.B = 0x89;
             this.cpu.CC = 0;
-            this.cpu.CC = MC6809.ClearBit(this.cpu.CC, (byte)StatusBits.CF);
+            this.cpu.CC = Chip.ClearBit(this.cpu.CC, (byte)StatusBits.CF);
             this.cpu.PC.Word = 0xb00;
 
             this.cpu.Step();
diff --git a/MC6809/MC6809.UnitTest/RtsTests.cs b/MC6809/MC6809.UnitTest/RtsTests.cs
index 223f72a..7f3c3c2 100644
--- a/MC6809/MC6809.UnitTest/RtsTests.cs
+++ b/MC6809/MC6809.UnitTest/RtsTests.cs
@@ -1,10 +1,8 @@
 // <copyright file="RtsTests.cs" company="Adrian Conlon">
 // Copyright (c) Adrian Conlon. All rights reserved.
 // </copyright>
-
-namespace EightBit
+namespace MC6809.UnitTest
 {
-    using MC6809;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     // https://github.com/sorenroug/osnine-java/blob/master/core/src/test/java/org/roug/osnine/BranchAndJumpTest.java
diff --git a/MC6809/MC6809.UnitTest/SbcTests.cs b/MC6809/MC6809.UnitTest/SbcTests.cs
index 1d8b0ba..e895d54 100644
--- a/MC6809/MC6809.UnitTest/SbcTests.cs
+++ b/MC6809/MC6809.UnitTest/SbcTests.cs
@@ -1,10 +1,8 @@
 // <copyright file="SbcTests.cs" company="Adrian Conlon">
 // Copyright (c) Adrian Conlon. All rights reserved.
 // </copyright>
-
-namespace EightBit
+namespace MC6809.UnitTest
 {
-    using MC6809;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]
diff --git a/MC6809/MC6809.UnitTest/SexTests.cs b/MC6809/MC6809.UnitTest/SexTests.cs
index 5911b8c..1c22d87 100644
--- a/MC6809/MC6809.UnitTest/SexTests.cs
+++ b/MC6809/MC6809.UnitTest/SexTests.cs
@@ -1,10 +1,8 @@
 // <copyright file="SexTests.cs" company="Adrian Conlon">
 // Copyright (c) Adrian Conlon. All rights reserved.
 // </copyright>
-
-namespace EightBit
+namespace MC6809.UnitTest
 {
-    using MC6809;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]
diff --git a/MC6809/MC6809.UnitTest/SubTests.cs b/MC6809/MC6809.UnitTest/SubTests.cs
index 2ba8e1b..ebb2d11 100644
--- a/MC6809/MC6809.UnitTest/SubTests.cs
+++ b/MC6809/MC6809.UnitTest/SubTests.cs
@@ -1,10 +1,8 @@
 // <copyright file="SubTests.cs" company="Adrian Conlon">
 // Copyright (c) Adrian Conlon. All rights reserved.
 // </copyright>
-
-namespace EightBit
+namespace MC6809.UnitTest
 {
-    using MC6809;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]
diff --git a/MC6809/MC6809.UnitTest/TfrTests.cs b/MC6809/MC6809.UnitTest/TfrTests.cs
index a0b295a..d98f90b 100644
--- a/MC6809/MC6809.UnitTest/TfrTests.cs
+++ b/MC6809/MC6809.UnitTest/TfrTests.cs
@@ -1,10 +1,8 @@
 // <copyright file="TfrTests.cs" company="Adrian Conlon">
 // Copyright (c) Adrian Conlon. All rights reserved.
 // </copyright>
-
-namespace EightBit
+namespace MC6809.UnitTest
 {
-    using MC6809;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]
diff --git a/MC6809/MC6809.UnitTest/TstTests.cs b/MC6809/MC6809.UnitTest/TstTests.cs
index 9231bcd..e06d67c 100644
--- a/MC6809/MC6809.UnitTest/TstTests.cs
+++ b/MC6809/MC6809.UnitTest/TstTests.cs
@@ -1,10 +1,8 @@
 // <copyright file="TstTests.cs" company="Adrian Conlon">
 // Copyright (c) Adrian Conlon. All rights reserved.
 // </copyright>
-
-namespace EightBit
+namespace MC6809.UnitTest
 {
-    using MC6809;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]