diff --git a/SAP1EMU.Engine-CLI/Program.cs b/SAP1EMU.Engine-CLI/Program.cs
index bfcb0bf0..2b19ee54 100644
--- a/SAP1EMU.Engine-CLI/Program.cs
+++ b/SAP1EMU.Engine-CLI/Program.cs
@@ -46,7 +46,7 @@ public class Options
 
             // TODO - Figure out why default isnt working here
             // Default should be "std"
-            [Option('O', "FOframe", SetName = "FOframe", Required = false, HelpText = "Include Snapshots of the Output Register in the output file.\nParameters:\n  std\t\tOutputs with formatting\n  no-format\tOutputs wil no formatting")]
+            [Option('O', "FOfragitme", SetName = "FOframe", Required = false, HelpText = "Include Snapshots of the Output Register in the output file.\nParameters:\n  std\t\tOutputs with formatting\n  no-format\tOutputs wil no formatting")]
             public string FOframe { get; set; }
             // ********************************************
 
diff --git a/SAP1EMU.Lib.Test/AssemblerTest.cs b/SAP1EMU.Lib.Test/AssemblerTest.cs
index 56841ee2..839d0f9c 100644
--- a/SAP1EMU.Lib.Test/AssemblerTest.cs
+++ b/SAP1EMU.Lib.Test/AssemblerTest.cs
@@ -419,7 +419,7 @@ public void TestParseList_Invalid_Code_3()
         #endregion
 
 
-        // Malvino Op Code Loop Detection Test **************************************
+        // Malvino Op Code Test *****************************************************
         [TestMethod]
         public void Test_MalvinoCodes_1()
         {
@@ -460,7 +460,7 @@ public void Test_MalvinoCodes_2()
                 Assemble.Parse(asm, "Malvino");
                 Assert.Fail();
             }
-            catch (Exception e)
+            catch (Exception)
             {
         
             }
diff --git a/SAP1EMU.Lib.Test/InstructionSetTests/InstructionTests.cs b/SAP1EMU.Lib.Test/InstructionSetTests/InstructionTests.cs
new file mode 100644
index 00000000..ac857163
--- /dev/null
+++ b/SAP1EMU.Lib.Test/InstructionSetTests/InstructionTests.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using NuGet.Frameworks;
+
+namespace SAP1EMU.Lib.Test.InstructionSetTests
+{
+    [TestClass]
+    public class InstructionTests
+    {
+
+        [TestMethod]
+        public void TestInstruction()
+        {
+            try
+            {
+                Instruction i = new Instruction();
+            }
+            catch (Exception e)
+            {
+                Assert.Fail(e.ToString());
+            }
+        }
+
+        [TestMethod]
+        public void TestInstructionSet()
+        {
+            try
+            {
+                InstructionSet i = new InstructionSet();
+            }
+            catch (Exception e)
+            {
+                Assert.Fail(e.ToString());
+            }
+        }
+        [TestMethod]
+        public void TestopCodeLoader()
+        {
+            try
+            {
+                OpCodeLoader.GetSet("SAP1Emu");
+                OpCodeLoader.GetSet("Malvino");
+                OpCodeLoader.GetSet("BenEater");
+            }
+            catch(Exception e)
+            {
+                Assert.Fail(e.ToString());
+            }
+        }
+    }
+}
\ No newline at end of file