diff --git a/AstroMath.UnitTests/AstroMath.UnitTests.csproj b/AstroMath.UnitTests/AstroMath.UnitTests.csproj
index ecf9b7d..9f778de 100644
--- a/AstroMath.UnitTests/AstroMath.UnitTests.csproj
+++ b/AstroMath.UnitTests/AstroMath.UnitTests.csproj
@@ -56,8 +56,8 @@
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Moq, Version=4.12.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.12.0\lib\net45\Moq.dll</HintPath>
+    <Reference Include="Moq, Version=4.13.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.13.0\lib\net45\Moq.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll</HintPath>
@@ -65,8 +65,8 @@
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
diff --git a/AstroMath.UnitTests/app.config b/AstroMath.UnitTests/app.config
index 8d5ec5f..319783c 100644
--- a/AstroMath.UnitTests/app.config
+++ b/AstroMath.UnitTests/app.config
@@ -6,6 +6,10 @@
         <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
diff --git a/AstroMath.UnitTests/packages.config b/AstroMath.UnitTests/packages.config
index b50b126..2b99214 100644
--- a/AstroMath.UnitTests/packages.config
+++ b/AstroMath.UnitTests/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Castle.Core" version="4.4.0" targetFramework="net472" />
-  <package id="Moq" version="4.12.0" targetFramework="net472" />
+  <package id="Moq" version="4.13.0" targetFramework="net472" />
   <package id="NUnit" version="3.12.0" targetFramework="net472" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net472" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.6.0" targetFramework="net472" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.3" targetFramework="net472" />
 </packages>
\ No newline at end of file
diff --git a/FocuserTestConsole/FocuserTestConsole.csproj b/FocuserTestConsole/FocuserTestConsole.csproj
index 34cf2fd..8818966 100644
--- a/FocuserTestConsole/FocuserTestConsole.csproj
+++ b/FocuserTestConsole/FocuserTestConsole.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ASCOM.MeadeGeneric</RootNamespace>
     <AssemblyName>ASCOM.MeadeGeneric.Test</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
@@ -54,6 +54,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="ASCOM.DeviceInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL" />
diff --git a/FocuserTestConsole/Program.cs b/FocuserTestConsole/Program.cs
index d7cfce5..0776b93 100644
--- a/FocuserTestConsole/Program.cs
+++ b/FocuserTestConsole/Program.cs
@@ -14,9 +14,9 @@ using ASCOM.DriverAccess;
 
 namespace ASCOM.MeadeGeneric
 {
-    class Program
+    public static class Program
     {
-        static void Main(string[] args)
+        public static void Main()
         {
             // Uncomment the code that's required
 #if UseChooser
diff --git a/FocuserTestConsole/app.config b/FocuserTestConsole/app.config
index e365603..c5e1dae 100644
--- a/FocuserTestConsole/app.config
+++ b/FocuserTestConsole/app.config
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/Meade.net.Focuser.UnitTests/FocuserUnitTests.cs b/Meade.net.Focuser.UnitTests/FocuserUnitTests.cs
index 1c9d18c..4e68ce4 100644
--- a/Meade.net.Focuser.UnitTests/FocuserUnitTests.cs
+++ b/Meade.net.Focuser.UnitTests/FocuserUnitTests.cs
@@ -401,13 +401,13 @@ namespace Meade.net.Focuser.UnitTests
 
             if (position < 0)
             {
-                _sharedResourcesWrapperMock.Verify( x => x.SendBlind(":F-#"), Times.AtLeastOnce);
-                _sharedResourcesWrapperMock.Verify(x => x.SendBlind(":F+#"), Times.Never);
+                _sharedResourcesWrapperMock.Verify( x => x.SendBlind("#:F-#"), Times.AtLeastOnce);
+                _sharedResourcesWrapperMock.Verify(x => x.SendBlind("#:F+#"), Times.Never);
             }
             else
             {
-                _sharedResourcesWrapperMock.Verify(x => x.SendBlind(":F-#"), Times.Never);
-                _sharedResourcesWrapperMock.Verify(x => x.SendBlind(":F+#"), Times.AtLeastOnce);
+                _sharedResourcesWrapperMock.Verify(x => x.SendBlind("#:F-#"), Times.Never);
+                _sharedResourcesWrapperMock.Verify(x => x.SendBlind("#:F+#"), Times.AtLeastOnce);
             }
 
             _sharedResourcesWrapperMock.Verify( x => x.Lock(It.IsAny<Action>()), Times.Once);
diff --git a/Meade.net.Focuser.UnitTests/Meade.net.Focuser.UnitTests.csproj b/Meade.net.Focuser.UnitTests/Meade.net.Focuser.UnitTests.csproj
index fb2522e..be4f91f 100644
--- a/Meade.net.Focuser.UnitTests/Meade.net.Focuser.UnitTests.csproj
+++ b/Meade.net.Focuser.UnitTests/Meade.net.Focuser.UnitTests.csproj
@@ -71,8 +71,8 @@
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Moq, Version=4.12.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.12.0\lib\net45\Moq.dll</HintPath>
+    <Reference Include="Moq, Version=4.13.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.13.0\lib\net45\Moq.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll</HintPath>
@@ -80,8 +80,8 @@
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
diff --git a/Meade.net.Focuser.UnitTests/app.config b/Meade.net.Focuser.UnitTests/app.config
index 8d5ec5f..319783c 100644
--- a/Meade.net.Focuser.UnitTests/app.config
+++ b/Meade.net.Focuser.UnitTests/app.config
@@ -6,6 +6,10 @@
         <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
diff --git a/Meade.net.Focuser.UnitTests/packages.config b/Meade.net.Focuser.UnitTests/packages.config
index 1330573..cad1be5 100644
--- a/Meade.net.Focuser.UnitTests/packages.config
+++ b/Meade.net.Focuser.UnitTests/packages.config
@@ -2,8 +2,8 @@
 <packages>
   <package id="ASCOM.Platform" version="6.4.2" targetFramework="net472" />
   <package id="Castle.Core" version="4.4.0" targetFramework="net472" />
-  <package id="Moq" version="4.12.0" targetFramework="net472" />
+  <package id="Moq" version="4.13.0" targetFramework="net472" />
   <package id="NUnit" version="3.12.0" targetFramework="net472" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net472" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.6.0" targetFramework="net472" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.3" targetFramework="net472" />
 </packages>
\ No newline at end of file
diff --git a/Meade.net.Setup/Product.wxs b/Meade.net.Setup/Product.wxs
index 8cf95a1..e2e47d8 100644
--- a/Meade.net.Setup/Product.wxs
+++ b/Meade.net.Setup/Product.wxs
@@ -25,9 +25,9 @@
       <![CDATA[Installed OR ASCOMPLATFORMVERSION >= "6.4.1"]]>
     </Condition>
 
-    <PropertyRef Id="NETFRAMEWORK40FULL"/>
-    <Condition Message="This application requires .NET Framework 4.0 or higher. Please install the .NET Framework then run this installer again.">
-      <![CDATA[Installed OR NETFRAMEWORK40FULL]]>
+    <PropertyRef Id="NETFRAMEWORK45"/>
+    <Condition Message="This application requires .NET Framework 4.5 or higher. Please install the .NET Framework then run this installer again.">
+      <![CDATA[Installed OR NETFRAMEWORK45]]>
     </Condition>
 
     <!-- <Condition Message="Please use the correct installer for your operating system - x86 for 32-bit, x64 for 64-bit.">
diff --git a/Meade.net.Telescope.UnitTests/Meade.net.Telescope.UnitTests.csproj b/Meade.net.Telescope.UnitTests/Meade.net.Telescope.UnitTests.csproj
index 9fcbe99..9484bd1 100644
--- a/Meade.net.Telescope.UnitTests/Meade.net.Telescope.UnitTests.csproj
+++ b/Meade.net.Telescope.UnitTests/Meade.net.Telescope.UnitTests.csproj
@@ -92,8 +92,8 @@
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Moq, Version=4.12.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.12.0\lib\net45\Moq.dll</HintPath>
+    <Reference Include="Moq, Version=4.13.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.13.0\lib\net45\Moq.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\packages\NUnit.3.12.0\lib\net40\nunit.framework.dll</HintPath>
@@ -101,8 +101,8 @@
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
diff --git a/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs b/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs
index 0d6264b..0d86815 100644
--- a/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs
+++ b/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs
@@ -42,14 +42,18 @@ namespace Meade.net.Telescope.UnitTests
             _astroUtilsMock = new Mock<IAstroUtils>();
 
             _sharedResourcesWrapperMock = new Mock<ISharedResourcesWrapper>();
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":GZ#")).Returns("DDD*MM’SS");
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:GZ#")).Returns("DDD*MM’SS");
 
             _sharedResourcesWrapperMock.Setup(x => x.ReadProfile()).Returns(() =>_profileProperties);
             _sharedResourcesWrapperMock.Setup(x => x.Lock(It.IsAny<Action>())).Callback<Action>(action => { action(); });
             _sharedResourcesWrapperMock.Setup(x => x.Lock(It.IsAny<Func<ASCOM.Meade.net.Telescope.TelescopeDateDetails>>())).Returns<Func<ASCOM.Meade.net.Telescope.TelescopeDateDetails>>( func => func());
             _sharedResourcesWrapperMock.Setup(x => x.Lock(It.IsAny<Func<AltitudeData>>())).Returns<Func<AltitudeData>>(func => func());
 
-            _connectionInfo = new ConnectionInfo {Connections = 1, SameDevice = 1};
+            _connectionInfo = new ConnectionInfo
+            {
+                //Connections = 1,
+                SameDevice = 1
+            };
 
             _sharedResourcesWrapperMock.Setup(x => x.Connect("Serial", It.IsAny<string>())).Returns( () => _connectionInfo );
 
@@ -117,36 +121,36 @@ namespace Meade.net.Telescope.UnitTests
         public void Action_Handbox_ReadDisplay()
         {
             string expectedResult = "test result string";
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":ED#")).Returns(expectedResult);
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:ED#")).Returns(expectedResult);
             _telescope.Connected = true;
 
             
 
             var actualResult = _telescope.Action("handbox", "readdisplay");
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendString(":ED#"), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendString("#:ED#"), Times.Once);
             Assert.That(actualResult, Is.EqualTo(expectedResult));
         }
 
-        [TestCase("enter", ":EK13#")]
-        [TestCase("mode", ":EK9#")]
-        [TestCase("longMode", ":EK11#")]
-        [TestCase("goto", ":EK24#")]
-        [TestCase("0", ":EK48#")]
-        [TestCase("1", ":EK49#")]
-        [TestCase("2", ":EK50#")]
-        [TestCase("3", ":EK51#")]
-        [TestCase("4", ":EK52#")]
-        [TestCase("5", ":EK53#")]
-        [TestCase("6", ":EK54#")]
-        [TestCase("7", ":EK55#")]
-        [TestCase("8", ":EK56#")]
-        [TestCase("9", ":EK57#")]
-        [TestCase("up", ":EK94#")]
-        [TestCase("down", ":EK118#")]
-        [TestCase("back", ":EK87#")]
-        [TestCase("forward", ":EK69#")]
-        [TestCase("?", ":EK63#")]
+        [TestCase("enter", "#:EK13#")]
+        [TestCase("mode", "#:EK9#")]
+        [TestCase("longMode", "#:EK11#")]
+        [TestCase("goto", "#:EK24#")]
+        [TestCase("0", "#:EK48#")]
+        [TestCase("1", "#:EK49#")]
+        [TestCase("2", "#:EK50#")]
+        [TestCase("3", "#:EK51#")]
+        [TestCase("4", "#:EK52#")]
+        [TestCase("5", "#:EK53#")]
+        [TestCase("6", "#:EK54#")]
+        [TestCase("7", "#:EK55#")]
+        [TestCase("8", "#:EK56#")]
+        [TestCase("9", "#:EK57#")]
+        [TestCase("up", "#:EK94#")]
+        [TestCase("down", "#:EK118#")]
+        [TestCase("back", "#:EK87#")]
+        [TestCase("forward", "#:EK69#")]
+        [TestCase("?", "#:EK63#")]
         public void Action_Handbox_WhenCalling_ThenSendsAppropriateBlindCommands(string action, string expectedString)
         {
             ConnectTelescope();
@@ -167,7 +171,7 @@ namespace Meade.net.Telescope.UnitTests
             string parameters = $"select {site}";
             _telescope.Action("site", parameters);
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind($":W{site}#"), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind($"#:W{site}#"), Times.Once);
         }
 
         [TestCase("0")]
@@ -182,16 +186,16 @@ namespace Meade.net.Telescope.UnitTests
             Assert.That(exception.Message, Is.EqualTo($"Site {parameters} not allowed, must be between 1 and 4"));
         }
 
-        [TestCase("1", ":GM#", "Home")]
-        [TestCase("2", ":GN#", "Club")]
-        [TestCase("3", ":GO#", "GPS")]
-        [TestCase("4", ":GP#", "Parents")]
+        [TestCase("1", "#:GM#", "Home")]
+        [TestCase("2", "#:GN#", "Club")]
+        [TestCase("3", "#:GO#", "GPS")]
+        [TestCase("4", "#:GP#", "Parents")]
         public void Action_Site_GetName_WhenCallingWithValidValues_ThenSelectsCorrectSite(string site, string telescopeCommand, string siteName)
         {
-            ConnectTelescope();
-
             _sharedResourcesWrapperMock.Setup(x => x.SendString(telescopeCommand)).Returns(siteName);
 
+            ConnectTelescope();
+
             string parameters = $"GetName {site}";
             var result = _telescope.Action("site", parameters);
 
@@ -211,16 +215,17 @@ namespace Meade.net.Telescope.UnitTests
             Assert.That(exception.Message, Is.EqualTo($"Site {parameters} not allowed, must be between 1 and 4"));
         }
 
-        [TestCase("1", ":SMHome#", "Home")]
-        [TestCase("2", ":SNClub#", "Club")]
-        [TestCase("3", ":SOGPS Site#", "GPS Site")]
-        [TestCase("4", ":SPParents#", "Parents")]
+        [TestCase("1", "#:SMHome#", "Home")]
+        [TestCase("2", "#:SNClub#", "Club")]
+        [TestCase("3", "#:SOGPS Site#", "GPS Site")]
+        [TestCase("4", "#:SPParents#", "Parents")]
         public void Action_Site_SetName_WhenCallingWithValidValues_ThenSelectsCorrectSite(string site, string telescopeCommand, string siteName)
         {
-            ConnectTelescope();
 
             _sharedResourcesWrapperMock.Setup(x => x.SendChar(telescopeCommand)).Returns("1");
 
+            ConnectTelescope();
+
             string parameters = $"SetName {site} {siteName}";
             _telescope.Action("site", parameters);
 
@@ -330,10 +335,10 @@ namespace Meade.net.Telescope.UnitTests
             string expectedMessage = "expected result message";
             string sendMessage = "test blind Message";
 
-            ConnectTelescope();
-
             _sharedResourcesWrapperMock.Setup(x => x.SendString(sendMessage)).Returns(() => expectedMessage);
 
+            ConnectTelescope();
+
             var actualMessage = _telescope.CommandString(sendMessage, true);
 
             _sharedResourcesWrapperMock.Verify(x => x.SendString(sendMessage), Times.Once);
@@ -352,8 +357,8 @@ namespace Meade.net.Telescope.UnitTests
 
             if (expectedConnected)
             {
-                _sharedResourcesWrapperMock.Verify(x => x.SendString(":GZ#"), Times.Once);
-                _sharedResourcesWrapperMock.Verify(x => x.SendBlind($":Rg{_profileProperties.GuideRateArcSecondsPerSecond:00.0}#"), Times.Never);
+                _sharedResourcesWrapperMock.Verify(x => x.SendString("#:GZ#"), Times.Once);
+                _sharedResourcesWrapperMock.Verify(x => x.SendBlind($"#:Rg{_profileProperties.GuideRateArcSecondsPerSecond:00.0}#"), Times.Never);
             }
         }
         
@@ -368,9 +373,9 @@ namespace Meade.net.Telescope.UnitTests
             _telescope.Connected = true;
 
             _sharedResourcesWrapperMock.Verify( x => x.Connect("Serial", It.IsAny<string>()), Times.Once);
-            _sharedResourcesWrapperMock.Verify(x => x.SendString(":GZ#"), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendString("#:GZ#"), Times.Once);
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind($":Rg{_profileProperties.GuideRateArcSecondsPerSecond:00.0}#"),Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind($"#:Rg{_profileProperties.GuideRateArcSecondsPerSecond:00.0}#"),Times.Once);
         }
 
         [Test]
@@ -384,8 +389,8 @@ namespace Meade.net.Telescope.UnitTests
             _telescope.Connected = true;
 
             _sharedResourcesWrapperMock.Verify(x => x.Connect("Serial", It.IsAny<string>()), Times.Once);
-            _sharedResourcesWrapperMock.Verify(x => x.SendString(":GZ#"), Times.Never);
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind($":Rg{_profileProperties.GuideRateArcSecondsPerSecond:00.0}#"), Times.Never);
+            _sharedResourcesWrapperMock.Verify(x => x.SendString("#:GZ#"), Times.Never);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind($"#:Rg{_profileProperties.GuideRateArcSecondsPerSecond:00.0}#"), Times.Never);
         }
 
 
@@ -449,37 +454,37 @@ namespace Meade.net.Telescope.UnitTests
         [Test]
         public void SetLongFormatFalse_WhenTelescopeReturnsShortFormat_ThenDoesNothing()
         {
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":GZ#")).Returns("DDD*MM");
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:GZ#")).Returns("DDD*MM");
             _telescope.SetLongFormat(false);
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(":U#"),Times.Never);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("#:U#"),Times.Never);
         }
 
         [Test]
         public void SetLongFormatFalse_WhenTelescopeReturnsLongFormat_ThenTogglesPrecision()
         {
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":GZ#")).Returns("DDD*MM’SS");
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:GZ#")).Returns("DDD*MM’SS");
             _telescope.SetLongFormat(false);
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(":U#"), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("#:U#"), Times.Once);
         }
 
         [Test]
         public void SetLongFormatTrue_WhenTelescopeReturnsLongFormat_ThenDoesNothing()
         {
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":GZ#")).Returns("DDD*MM’SS");
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:GZ#")).Returns("DDD*MM’SS");
             _telescope.SetLongFormat(true);
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(":U#"), Times.Never);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("#:U#"), Times.Never);
         }
 
         [Test]
         public void SetLongFormatTrue_WhenTelescopeReturnsShortFormat_ThenTogglesPrecision()
         {
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":GZ#")).Returns("DDD*MM");
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:GZ#")).Returns("DDD*MM");
             _telescope.SetLongFormat(true);
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(":U#"), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("#:U#"), Times.Once);
         }
 
         [Test]
@@ -521,7 +526,7 @@ namespace Meade.net.Telescope.UnitTests
 
             _telescope.SelectSite(site);
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind($":W{site}#"), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind($"#:W{site}#"), Times.Once);
         }
 
         [Test]
@@ -592,11 +597,11 @@ namespace Meade.net.Telescope.UnitTests
         [TestCase("G", AlignmentModes.algGermanPolar)]
         public void AlignmentMode_Get_WhenScopeInAltAz_ReturnsAltAz(string telescopeMode, AlignmentModes alignmentMode)
         {
-            ConnectTelescope();
-
             const char ack = (char)6;
             _sharedResourcesWrapperMock.Setup(x => x.SendChar(ack.ToString())).Returns(telescopeMode);
 
+            ConnectTelescope();
+            
             var actualResult = _telescope.AlignmentMode;
             
             Assert.That(actualResult, Is.EqualTo(alignmentMode));
@@ -621,9 +626,9 @@ namespace Meade.net.Telescope.UnitTests
             Assert.That(exception.Message, Is.EqualTo("Not connected to telescope when trying to execute: AlignmentMode Set"));
         }
 
-        [TestCase("AUTOSTAR", "43Eg", AlignmentModes.algAltAz, ":AA#")]
-        [TestCase("AUTOSTAR", "43Eg", AlignmentModes.algPolar, ":AP#")]
-        [TestCase("AUTOSTAR", "43Eg", AlignmentModes.algGermanPolar, ":AP#")]
+        [TestCase("AUTOSTAR", "43Eg", AlignmentModes.algAltAz, "#:AA#")]
+        [TestCase("AUTOSTAR", "43Eg", AlignmentModes.algPolar, "#:AP#")]
+        [TestCase("AUTOSTAR", "43Eg", AlignmentModes.algGermanPolar, "#:AP#")]
         public void AlignmentMode_Set_WhenConnected_ThenSendsExpectedCommand(string productName, string firmware, AlignmentModes alignmentMode, string expectedCommand)
         {
             _sharedResourcesWrapperMock.Setup(x => x.ProductName).Returns(productName);
@@ -791,7 +796,7 @@ namespace Meade.net.Telescope.UnitTests
         {
             _telescope.Connected = true;
 
-            _sharedResourcesWrapperMock.Verify( x => x.SendString(":P#"), Times.Never);
+            _sharedResourcesWrapperMock.Verify( x => x.SendString("#:P#"), Times.Never);
         }
 
         [TestCase("High", false, true)]
@@ -803,7 +808,7 @@ namespace Meade.net.Telescope.UnitTests
             _profileProperties.Precision = desiredPresision;
             var currentPrecision = telescopePrecision;
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar(":P#")).Returns(() =>
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar("#:P#")).Returns(() =>
             {
                 currentPrecision = !currentPrecision;
 
@@ -819,7 +824,7 @@ namespace Meade.net.Telescope.UnitTests
             _telescope.Connected = true;
 
             Assert.That(currentPrecision, Is.EqualTo(finalPrecision));
-            _sharedResourcesWrapperMock.Verify(x => x.SendChar(":P#"), Times.AtLeastOnce);
+            _sharedResourcesWrapperMock.Verify(x => x.SendChar("#:P#"), Times.AtLeastOnce);
         }
 
         [TestCase("High", false, true)]
@@ -831,11 +836,11 @@ namespace Meade.net.Telescope.UnitTests
             _profileProperties.Precision = desiredPresision;
 
             _connectionInfo.SameDevice = 2;
-            _connectionInfo.Connections = 2;
+            //_connectionInfo.Connections = 2;
 
             _telescope.Connected = true;
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendChar(":P#"), Times.Never);
+            _sharedResourcesWrapperMock.Verify(x => x.SendChar("#:P#"), Times.Never);
         }
 
         [Test]
@@ -942,15 +947,34 @@ namespace Meade.net.Telescope.UnitTests
         public void Declination_Get_WhenConnected_ThenReadsValueFromScope(string declincationString)
         {
             var expectedResult = 12.34;
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:GD#")).Returns(declincationString);
+            _utilMock.Setup(x => x.DMSToDegrees(declincationString)).Returns(expectedResult);
+
             ConnectTelescope();
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":GD#")).Returns(declincationString);
-            _utilMock.Setup(x => x.DMSToDegrees(declincationString)).Returns(expectedResult);
-            
             var actualResult = _telescope.Declination;
             Assert.That(actualResult, Is.EqualTo(expectedResult));
         }
 
+        [Test]
+        public void Declination_Get_WhenConnected_ThenReturnsExpectedResult()
+        {
+            var telescopeRaResult = "s12*34’56";
+            var dmsResult = 1.2;
+
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:GD#")).Returns(telescopeRaResult);
+            _utilMock.Setup(x => x.DMSToDegrees(telescopeRaResult)).Returns(dmsResult);
+
+            ConnectTelescope();
+
+            var result = _telescope.Declination;
+
+            _sharedResourcesWrapperMock.Verify(x => x.SendString("#:GD#"), Times.Exactly(2));
+            _utilMock.Verify(x => x.DMSToDegrees(telescopeRaResult), Times.Exactly(2));
+
+            Assert.That(result, Is.EqualTo(dmsResult));
+        }
+
         [Test]
         public void DeclinationRate_Get_ThenReturns0()
         {
@@ -1059,7 +1083,7 @@ namespace Meade.net.Telescope.UnitTests
 
             _telescope.GuideRateDeclination = newGuideRate;
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(":Rg01.2#"), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("#:Rg01.2#"), Times.Once);
 
             Assert.That(_telescope.GuideRateDeclination, Is.EqualTo(newGuideRate));
         }
@@ -1092,7 +1116,7 @@ namespace Meade.net.Telescope.UnitTests
 
             _telescope.GuideRateRightAscension = newGuideRate;
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(":Rg01.2#"), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("#:Rg01.2#"), Times.Once);
 
             Assert.That(_telescope.GuideRateDeclination, Is.EqualTo(newGuideRate));
         }
@@ -1114,23 +1138,23 @@ namespace Meade.net.Telescope.UnitTests
         }
 
         [TestCase( 0, "", TelescopeAxes.axisPrimary)]
-        [TestCase( 1, ":RG#", TelescopeAxes.axisPrimary)]
-        [TestCase(-1, ":RG#", TelescopeAxes.axisPrimary)]
-        [TestCase( 2, ":RC#", TelescopeAxes.axisPrimary)]
-        [TestCase(-2, ":RC#", TelescopeAxes.axisPrimary)]
-        [TestCase( 3, ":RM#", TelescopeAxes.axisPrimary)]
-        [TestCase(-3, ":RM#", TelescopeAxes.axisPrimary)]
-        [TestCase( 4, ":RS#", TelescopeAxes.axisPrimary)]
-        [TestCase(-4, ":RS#", TelescopeAxes.axisPrimary)]
+        [TestCase( 1, "#:RG#", TelescopeAxes.axisPrimary)]
+        [TestCase(-1, "#:RG#", TelescopeAxes.axisPrimary)]
+        [TestCase( 2, "#:RC#", TelescopeAxes.axisPrimary)]
+        [TestCase(-2, "#:RC#", TelescopeAxes.axisPrimary)]
+        [TestCase( 3, "#:RM#", TelescopeAxes.axisPrimary)]
+        [TestCase(-3, "#:RM#", TelescopeAxes.axisPrimary)]
+        [TestCase( 4, "#:RS#", TelescopeAxes.axisPrimary)]
+        [TestCase(-4, "#:RS#", TelescopeAxes.axisPrimary)]
         [TestCase(0, "", TelescopeAxes.axisSecondary)]
-        [TestCase(1, ":RG#", TelescopeAxes.axisSecondary)]
-        [TestCase(-1, ":RG#", TelescopeAxes.axisSecondary)]
-        [TestCase(2, ":RC#", TelescopeAxes.axisSecondary)]
-        [TestCase(-2, ":RC#", TelescopeAxes.axisSecondary)]
-        [TestCase(3, ":RM#", TelescopeAxes.axisSecondary)]
-        [TestCase(-3, ":RM#", TelescopeAxes.axisSecondary)]
-        [TestCase(4, ":RS#", TelescopeAxes.axisSecondary)]
-        [TestCase(-4, ":RS#", TelescopeAxes.axisSecondary)]
+        [TestCase(1, "#:RG#", TelescopeAxes.axisSecondary)]
+        [TestCase(-1, "#:RG#", TelescopeAxes.axisSecondary)]
+        [TestCase(2, "#:RC#", TelescopeAxes.axisSecondary)]
+        [TestCase(-2, "#:RC#", TelescopeAxes.axisSecondary)]
+        [TestCase(3, "#:RM#", TelescopeAxes.axisSecondary)]
+        [TestCase(-3, "#:RM#", TelescopeAxes.axisSecondary)]
+        [TestCase(4, "#:RS#", TelescopeAxes.axisSecondary)]
+        [TestCase(-4, "#:RS#", TelescopeAxes.axisSecondary)]
         public void MoveAxis_WhenConnected_ThenExecutesCorrectCommandSequence(double rate, string slewRateCommand, TelescopeAxes axis)
         {
             ConnectTelescope();
@@ -1141,42 +1165,42 @@ namespace Meade.net.Telescope.UnitTests
                 _sharedResourcesWrapperMock.Verify( x => x.SendBlind(slewRateCommand), Times.Once);
             else
             {
-                _sharedResourcesWrapperMock.Verify(x => x.SendBlind(":RG#"), Times.Never);
-                _sharedResourcesWrapperMock.Verify(x => x.SendBlind(":RC#"), Times.Never);
-                _sharedResourcesWrapperMock.Verify(x => x.SendBlind(":RM#"), Times.Never);
-                _sharedResourcesWrapperMock.Verify(x => x.SendBlind(":RS#"), Times.Never);
+                _sharedResourcesWrapperMock.Verify(x => x.SendBlind("#:RG#"), Times.Never);
+                _sharedResourcesWrapperMock.Verify(x => x.SendBlind("#:RC#"), Times.Never);
+                _sharedResourcesWrapperMock.Verify(x => x.SendBlind("#:RM#"), Times.Never);
+                _sharedResourcesWrapperMock.Verify(x => x.SendBlind("#:RS#"), Times.Never);
             }
 
             switch (axis)
             {
                 case TelescopeAxes.axisPrimary:
-                    if (rate == 0)
+                    switch (rate.Compare(0))
                     {
-                        _sharedResourcesWrapperMock.Verify(x => x.SendBlind(":Qe#"), Times.Once);
-                        _sharedResourcesWrapperMock.Verify(x => x.SendBlind(":Qw#"), Times.Once);
-                    }
-                    else if (rate > 0)
-                    {
-                        _sharedResourcesWrapperMock.Verify(x => x.SendBlind(":Me#"), Times.Once);
-                    }
-                    else
-                    {
-                        _sharedResourcesWrapperMock.Verify(x => x.SendBlind(":Mw#"), Times.Once);
+                        case ComparisonResult.Equals:
+                            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("#:Qe#"), Times.Once);
+                            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("#:Qw#"), Times.Once);
+                            break;
+                        case ComparisonResult.Greater:
+                            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("#:Me#"), Times.Once);
+                            break;
+                        case ComparisonResult.Lower:
+                            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("#:Mw#"), Times.Once);
+                            break;
                     }
                     break;
                 case TelescopeAxes.axisSecondary:
-                    if (rate == 0)
+                    switch (rate.Compare(0))
                     {
-                        _sharedResourcesWrapperMock.Verify(x => x.SendBlind(":Qn#"), Times.Once);
-                        _sharedResourcesWrapperMock.Verify(x => x.SendBlind(":Qs#"), Times.Once);
-                    }
-                    else if (rate > 0)
-                    {
-                        _sharedResourcesWrapperMock.Verify(x => x.SendBlind(":Mn#"), Times.Once);
-                    }
-                    else
-                    {
-                        _sharedResourcesWrapperMock.Verify(x => x.SendBlind(":Ms#"), Times.Once);
+                        case ComparisonResult.Equals:
+                            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("#:Qn#"), Times.Once);
+                            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("#:Qs#"), Times.Once);
+                            break;
+                        case ComparisonResult.Greater:
+                            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("#:Mn#"), Times.Once);
+                            break;
+                        case ComparisonResult.Lower:
+                            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("#:Ms#"), Times.Once);
+                            break;
                     }
                     break;
                 default:
@@ -1221,11 +1245,11 @@ namespace Meade.net.Telescope.UnitTests
         {
             ConnectTelescope();
             Assert.That(_telescope.AtPark, Is.False);
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(":hP#"), Times.Never);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("#:hP#"), Times.Never);
 
             _telescope.Park();
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(":hP#"), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("#:hP#"), Times.Once);
             Assert.That(_telescope.AtPark, Is.True);
         }
 
@@ -1236,7 +1260,7 @@ namespace Meade.net.Telescope.UnitTests
 
             _telescope.Park();
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(":hP#"), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("#:hP#"), Times.Once);
             Assert.That(_telescope.AtPark, Is.True);
 
 
@@ -1244,7 +1268,7 @@ namespace Meade.net.Telescope.UnitTests
             _telescope.Park();
 
             //no change from previous state.
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(":hP#"), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("#:hP#"), Times.Once);
             Assert.That(_telescope.AtPark, Is.True);
         }
 
@@ -1283,7 +1307,7 @@ namespace Meade.net.Telescope.UnitTests
                     break;
             }
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind($":Mg{d}{duration:0000}#"));
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind($"#:Mg{d}{duration:0000}#"));
             _utilMock.Verify( x => x.WaitForMilliseconds(duration), Times.Once);
         }
 
@@ -1317,10 +1341,10 @@ namespace Meade.net.Telescope.UnitTests
                     break;
             }
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(":RG#"));
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind($":M{d}#"));
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("#:RG#"));
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind($"#:M{d}#"));
             _utilMock.Verify(x => x.WaitForMilliseconds(duration), Times.Once);
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind($":Q{d}#"));
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind($"#:Q{d}#"));
         }
 
         [TestCase(GuideDirections.guideEast)]
@@ -1353,10 +1377,10 @@ namespace Meade.net.Telescope.UnitTests
                     break;
             }
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(":RG#"));
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind($":M{d}#"));
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("#:RG#"));
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind($"#:M{d}#"));
             _utilMock.Verify(x => x.WaitForMilliseconds(duration), Times.Once);
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind($":Q{d}#"));
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind($"#:Q{d}#"));
         }
 
         [Test]
@@ -1376,15 +1400,15 @@ namespace Meade.net.Telescope.UnitTests
             var telescopeRaResult = "HH:MM:SS";
             var hmsResult = 1.2;
 
-            ConnectTelescope();
-
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":GR#")).Returns(telescopeRaResult);
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:GR#")).Returns(telescopeRaResult);
             _utilMock.Setup(x => x.HMSToHours(telescopeRaResult)).Returns(hmsResult);
 
+            ConnectTelescope();
+            
             var result = _telescope.RightAscension;
 
-            _sharedResourcesWrapperMock.Verify( x => x.SendString(":GR#"), Times.Once);
-            _utilMock.Verify( x => x.HMSToHours(telescopeRaResult), Times.Once);
+            _sharedResourcesWrapperMock.Verify( x => x.SendString("#:GR#"), Times.Exactly(2));
+            _utilMock.Verify( x => x.HMSToHours(telescopeRaResult), Times.Exactly(2));
 
             Assert.That(result,Is.EqualTo(hmsResult));
         }
@@ -1505,13 +1529,14 @@ namespace Meade.net.Telescope.UnitTests
             var siteLatitudeString = "testLatString";
             var siteLatitudeValue = 123.45;
 
-            ConnectTelescope();
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":Gt#")).Returns(siteLatitudeString);
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:Gt#")).Returns(siteLatitudeString);
             _utilMock.Setup(x => x.DMSToDegrees(siteLatitudeString)).Returns(siteLatitudeValue);
 
+            ConnectTelescope();
+
             var result = _telescope.SiteLatitude;
             
-            _sharedResourcesWrapperMock.Verify( x => x.SendString(":Gt#"), Times.Once);
+            _sharedResourcesWrapperMock.Verify( x => x.SendString("#:Gt#"), Times.Once);
 
             Assert.That(result,Is.EqualTo(siteLatitudeValue));
         }
@@ -1545,23 +1570,23 @@ namespace Meade.net.Telescope.UnitTests
         [TestCase(20.75)]
         public void SiteLatitude_Set_WhenValueSetAndTelescopRejects_ThenExceptionThrown(double siteLatitude)
         {
-            ConnectTelescope();
-
             _sharedResourcesWrapperMock.Setup(x => x.SendChar(It.IsAny<string>())).Returns("0");
 
+            ConnectTelescope();
+
             var exception = Assert.Throws<InvalidOperationException>(() => { _telescope.SiteLatitude = siteLatitude; });
 
             Assert.That(exception.Message, Is.EqualTo("Failed to set site latitude."));
         }
 
-        [TestCase(-10.5, ":St-10*30#")]
-        [TestCase(20.75, ":St+20*45#")]
+        [TestCase(-10.5, "#:St-10*30#")]
+        [TestCase(20.75, "#:St+20*45#")]
         public void SiteLatitude_Set_WhenValidValues_ThenValueSentToTelescope(double siteLatitude, string expectedCommand)
         {
-            ConnectTelescope();
-            
             _sharedResourcesWrapperMock.Setup(x => x.SendChar(expectedCommand)).Returns("1");
 
+            ConnectTelescope();
+
             _telescope.SiteLatitude = siteLatitude;
 
             _sharedResourcesWrapperMock.Verify(x => x.SendChar(expectedCommand), Times.Once);
@@ -1588,11 +1613,11 @@ namespace Meade.net.Telescope.UnitTests
         {
             var telescopeLongitude = "testLongitude";
 
-            ConnectTelescope();
-
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":Gg#")).Returns(telescopeLongitude);
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:Gg#")).Returns(telescopeLongitude);
             _utilMock.Setup(x => x.DMSToDegrees(telescopeLongitude)).Returns(telescopeLongitudeValue);
 
+            ConnectTelescope();
+
             var result = _telescope.SiteLongitude;
 
             Assert.That(result, Is.EqualTo(expectedResult));
@@ -1626,21 +1651,22 @@ namespace Meade.net.Telescope.UnitTests
         [Test]
         public void SiteLongitude_Set_WhenConnectedAndTelescopeFails_ThenThrowsException()
         {
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(It.IsAny<string>())).Returns("0");
+
             ConnectTelescope();
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar(It.IsAny<string>())).Returns("0");
 
             var exception = Assert.Throws<InvalidOperationException>(() => { _telescope.SiteLongitude = 10; });
             Assert.That(exception.Message, Is.EqualTo("Failed to set site longitude."));
         }
 
-        [TestCase(10, ":Sg350*00#")]
+        [TestCase(10, "#:Sg350*00#")]
         public void SiteLongitude_Set_WhenConnectedAndTelescopeFails_ThenThrowsException(double longitude, string expectedCommand)
         {
-            ConnectTelescope();
-
             _sharedResourcesWrapperMock.Setup(x => x.SendChar(expectedCommand)).Returns("1");
 
+            ConnectTelescope();
+
             _telescope.SiteLongitude = longitude;
 
             _sharedResourcesWrapperMock.Verify(x => x.SendChar(expectedCommand), Times.Once);
@@ -1666,26 +1692,26 @@ namespace Meade.net.Telescope.UnitTests
         [Test]
         public void SyncToTarget_WhenSyncToTargetFails_ThenThrowsException()
         {
-            ConnectTelescope();
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:CM#")).Returns(string.Empty);
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":CM#")).Returns(string.Empty);
+            ConnectTelescope();
 
             var exception = Assert.Throws<InvalidOperationException>(() => { _telescope.SyncToTarget(); } );
 
             Assert.That(exception.Message, Is.EqualTo("Unable to perform sync"));
-            _sharedResourcesWrapperMock.Verify(x => x.SendString(":CM#"), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendString("#:CM#"), Times.Once);
         }
 
         [Test]
         public void SyncToTarget_WhenSyncToTargetWorks_ThennoExceptionThrown()
         {
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:CM#")).Returns(" M31 EX GAL MAG 3.5 SZ178.0'#");
+
             ConnectTelescope();
-
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":CM#")).Returns(" M31 EX GAL MAG 3.5 SZ178.0'#");
-
+            
             Assert.DoesNotThrow(() => { _telescope.SyncToTarget(); });
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendString(":CM#"), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendString("#:CM#"), Times.Once);
         }
 
         [Test]
@@ -1716,25 +1742,26 @@ namespace Meade.net.Telescope.UnitTests
         [Test]
         public void TargetDeclination_Set_WhenTelescopeReportsInvalidDec_ThenThrowsException()
         {
-            ConnectTelescope();
-
             _sharedResourcesWrapperMock.Setup(x => x.SendChar(It.IsAny<string>())).Returns("0");
 
+            ConnectTelescope();
+
             var exception = Assert.Throws<InvalidOperationException>(() => { _telescope.TargetDeclination = 50; });
             Assert.That(exception.Message, Is.EqualTo("Target declination invalid"));
         }
 
-        [TestCase(-30.5, "-30*30:00", ":Sd-30*30:00#")]
-        [TestCase(30.5, "30*30:00", ":Sd+30*30:00#")]
-        [TestCase(-75.25, "-75*15:00", ":Sd-75*15:00#")]
-        [TestCase(50, "50*00:00", ":Sd+50*00:00#")]
+        [TestCase(-30.5, "-30*30:00", "#:Sd-30*30:00#")]
+        [TestCase(30.5, "30*30:00", "#:Sd+30*30:00#")]
+        [TestCase(-75.25, "-75*15:00", "#:Sd-75*15:00#")]
+        [TestCase(50, "50*00:00", "#:Sd+50*00:00#")]
         public void TargetDeclination_Set_WhenValueOK_ThenSetsNewTargetDeclination( double declination,string decstring, string commandString)
         {
-            ConnectTelescope();
 
             _utilMock.Setup(x => x.DegreesToDMS(declination, "*", ":", ":", 2)).Returns(decstring);
             _sharedResourcesWrapperMock.Setup(x => x.SendChar(commandString)).Returns("1");
 
+            ConnectTelescope();
+
             _telescope.TargetDeclination = declination;
 
             _sharedResourcesWrapperMock.Verify(x => x.SendChar(commandString),Times.Once);
@@ -1753,14 +1780,14 @@ namespace Meade.net.Telescope.UnitTests
             Assert.That(exception.Message, Is.EqualTo("Target not set"));
         }
 
-        [TestCase(50, "50*00:00", ":Sd+50*00:00#")]
+        [TestCase(50, "50*00:00", "#:Sd+50*00:00#")]
         public void TargetDeclination_Get_WhenValueOK_ThenSetsNewTargetDeclination(double declination, string decstring, string commandString)
         {
-            ConnectTelescope();
-
             _utilMock.Setup(x => x.DegreesToDMS(declination, "*", ":", ":", 2)).Returns(decstring);
             _sharedResourcesWrapperMock.Setup(x => x.SendChar(commandString)).Returns("1");
 
+            ConnectTelescope();
+
             _telescope.TargetDeclination = declination;
 
             var result = _telescope.TargetDeclination;
@@ -1796,23 +1823,23 @@ namespace Meade.net.Telescope.UnitTests
         [Test]
         public void TargetRightAscension_Set_WhenTelescopeReportsInvalidRA_ThenThrowsException()
         {
-            ConnectTelescope();
-
             _sharedResourcesWrapperMock.Setup(x => x.SendChar(It.IsAny<string>())).Returns("0");
 
+            ConnectTelescope();
+
             var exception = Assert.Throws<InvalidOperationException>(() => { _telescope.TargetRightAscension = 1; });
             Assert.That(exception.Message, Is.EqualTo("Failed to set TargetRightAscension."));
         }
 
-        [TestCase(5.5, "05:30:00", ":Sr05:30:00#")]
-        [TestCase(10, "10:00:00", ":Sr10:00:00#")]
+        [TestCase(5.5, "05:30:00", "#:Sr05:30:00#")]
+        [TestCase(10, "10:00:00", "#:Sr10:00:00#")]
         public void TargetRightAscension_Set_WhenValueOK_ThenSetsNewTargetDeclination(double rightAscension, string hms, string commandString)
         {
-            ConnectTelescope();
-
             _utilMock.Setup(x => x.HoursToHMS(rightAscension, ":", ":", ":", 2)).Returns(hms);
             _sharedResourcesWrapperMock.Setup(x => x.SendChar(commandString)).Returns("1");
 
+            ConnectTelescope();
+
             _telescope.TargetRightAscension = rightAscension;
 
             _sharedResourcesWrapperMock.Verify(x => x.SendChar(commandString), Times.Once);
@@ -1831,14 +1858,14 @@ namespace Meade.net.Telescope.UnitTests
             Assert.That(exception.Message, Is.EqualTo("Target not set"));
         }
 
-        [TestCase(15, "15:00:00", ":Sr15:00:00#")]
+        [TestCase(15, "15:00:00", "#:Sr15:00:00#")]
         public void TargetRightAscension_Get_WhenValueOK_ThenSetsNewTargetDeclination(double rightAscension, string hms, string commandString)
         {
-            ConnectTelescope();
-
             _utilMock.Setup(x => x.HoursToHMS(rightAscension, ":", ":", ":", 2)).Returns(hms);
             _sharedResourcesWrapperMock.Setup(x => x.SendChar(commandString)).Returns("1");
 
+            ConnectTelescope();
+
             _telescope.TargetRightAscension = rightAscension;
 
             var result = _telescope.TargetRightAscension;
@@ -1868,8 +1895,8 @@ namespace Meade.net.Telescope.UnitTests
             Assert.That(exception.Message, Is.EqualTo("Not connected to telescope when trying to execute: TrackingRate Set"));
         }
 
-        [TestCase(DriveRates.driveSidereal, ":TQ#")]
-        [TestCase(DriveRates.driveLunar, ":TL#")]
+        [TestCase(DriveRates.driveSidereal, "#:TQ#")]
+        [TestCase(DriveRates.driveLunar, "#:TL#")]
         public void TrackingRate_Set_WhenConnected_ThenSendsCommandToTelescope(DriveRates rate, string commandString)
         {
             ConnectTelescope();
@@ -1937,11 +1964,11 @@ namespace Meade.net.Telescope.UnitTests
         public void UTCDate_Get_WhenConnected_ThenReturnsUTCDateTime(string telescopeDate, string telescopeTime,
             string telescopeUtcCorrection, int year, int month, int day, int hour, int min, int second)
         {
-            ConnectTelescope();
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:GC#")).Returns(telescopeDate);
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:GL#")).Returns(telescopeTime);
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:GG#")).Returns(telescopeUtcCorrection);
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":GC#")).Returns(telescopeDate);
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":GL#")).Returns(telescopeTime);
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":GG#")).Returns(telescopeUtcCorrection);
+            ConnectTelescope();
 
             var result = _telescope.UTCDate;
 
@@ -1972,10 +1999,10 @@ namespace Meade.net.Telescope.UnitTests
 
             var newDate = new DateTime(year, month, day, hour, min, second, DateTimeKind.Local) + utcCorrection;
 
-            ConnectTelescope();
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:GG#")).Returns(telescopeUtcCorrection);
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar($"#:SL{telescopeTime}#")).Returns("0");
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":GG#")).Returns(telescopeUtcCorrection);
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar($":SL{telescopeTime}#")).Returns("0");
+            ConnectTelescope();
 
             var exception = Assert.Throws<InvalidOperationException>(() => { _telescope.UTCDate = newDate; } );
 
@@ -1991,12 +2018,12 @@ namespace Meade.net.Telescope.UnitTests
 
             var newDate = new DateTime(year, month, day, hour, min, second, DateTimeKind.Local) + utcCorrection;
 
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:GG#")).Returns(telescopeUtcCorrection);
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar($"#:SL{telescopeTime}#")).Returns("1");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar($"#:SC{newDate:MM/dd/yy}#")).Returns("0");
+
             ConnectTelescope();
-
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":GG#")).Returns(telescopeUtcCorrection);
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar($":SL{telescopeTime}#")).Returns("1");
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar($":SC{newDate:MM/dd/yy}#")).Returns("0");
-
+            
             var exception = Assert.Throws<InvalidOperationException>(() => { _telescope.UTCDate = newDate; });
 
             Assert.That(exception.Message, Is.EqualTo("Failed to set local date"));
@@ -2013,11 +2040,11 @@ namespace Meade.net.Telescope.UnitTests
 
             var newDate = new DateTime(year, month, day, hour, min, second, DateTimeKind.Local) + utcCorrection;
 
-            ConnectTelescope();
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:GG#")).Returns(telescopeUtcCorrection);
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar($"#:SL{telescopeTime}#")).Returns("1");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar($"#:SC{telescopeDate}#")).Returns("1");
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":GG#")).Returns(telescopeUtcCorrection);
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar($":SL{telescopeTime}#")).Returns("1");
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar($":SC{telescopeDate}#")).Returns("1");
+            ConnectTelescope();
 
             _telescope.UTCDate = newDate;
 
@@ -2033,17 +2060,17 @@ namespace Meade.net.Telescope.UnitTests
             double declination = -30.5;
             string dec = "-30*30:00";
 
-            ConnectTelescope();
-
             _utilMock.Setup(x => x.HoursToHMS(rightAscension, ":", ":", ":", 2)).Returns(hms);
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar($":Sr{hms}#")).Returns("1");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar($"#:Sr{hms}#")).Returns("1");
 
             _utilMock.Setup(x => x.DegreesToDMS(declination, "*", ":", ":", 2)).Returns(dec);
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar($":Sd{dec}#")).Returns("1");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar($"#:Sd{dec}#")).Returns("1");
 
+            ConnectTelescope();
+            
             _telescope.SyncToCoordinates(rightAscension, declination);
 
-            _sharedResourcesWrapperMock.Verify( x => x.SendString(":CM#"), Times.Once);
+            _sharedResourcesWrapperMock.Verify( x => x.SendString("#:CM#"), Times.Once);
             Assert.That(_telescope.TargetRightAscension, Is.EqualTo(rightAscension));
             Assert.That(_telescope.TargetDeclination, Is.EqualTo(declination));
         }
@@ -2055,7 +2082,7 @@ namespace Meade.net.Telescope.UnitTests
 
             Assert.That(result, Is.False);
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendString(":D#"), Times.Never);
+            _sharedResourcesWrapperMock.Verify(x => x.SendString("#:D#"), Times.Never);
         }
 
         [Test]
@@ -2067,21 +2094,21 @@ namespace Meade.net.Telescope.UnitTests
 
             Assert.That(result, Is.False);
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendString(":D#"), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendString("#:D#"), Times.Once);
         }
 
         [Test]
         public void Slewing_WhenTelescopeIsSlewing_ThenReturnsTrue()
         {
-            ConnectTelescope();
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:D#")).Returns("|");
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":D#")).Returns("|");
+            ConnectTelescope();
 
             var result = _telescope.Slewing;
 
             Assert.That(result, Is.True);
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendString(":D#"),Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendString("#:D#"),Times.Once);
         }
 
         [TestCase(1, TelescopeAxes.axisPrimary)]
@@ -2097,7 +2124,7 @@ namespace Meade.net.Telescope.UnitTests
             var result = _telescope.Slewing;
 
             Assert.That(result, Is.True);
-            _sharedResourcesWrapperMock.Verify(x => x.SendString(":D#"), Times.Never);
+            _sharedResourcesWrapperMock.Verify(x => x.SendString("#:D#"), Times.Never);
         }
 
 
@@ -2145,30 +2172,30 @@ namespace Meade.net.Telescope.UnitTests
         [Test]
         public void SlewToTargetAsync_WhenTargetSetAndSlewIsPossible_ThenAttemptsSlew()
         {
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar("#:MS#")).Returns("0");
+
             ConnectTelescope();
 
             _telescope.TargetRightAscension = 2;
             _telescope.TargetDeclination = 1;
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar(":MS#")).Returns("0");
 
             _telescope.SlewToTargetAsync();
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendChar(":MS#"), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendChar("#:MS#"), Times.Once);
         }
 
         [Test]
         public void SlewToTargetAsync_WhenTargetBelowHorizon_ThenThrowsException()
         {
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar("#:MS#")).Returns("1");
+            _sharedResourcesWrapperMock.Setup(x => x.ReadTerminated()).Returns("Below horizon");
+
             ConnectTelescope();
 
             _telescope.TargetRightAscension = 2;
             _telescope.TargetDeclination = 1;
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar(":MS#")).Returns("1");
-
-            _sharedResourcesWrapperMock.Setup(x => x.ReadTerminated()).Returns("Below horizon");
-
             var exception = Assert.Throws<InvalidOperationException>(() => { _telescope.SlewToTargetAsync(); });
             Assert.That(exception.Message, Is.EqualTo("Below horizon"));
         }
@@ -2176,15 +2203,14 @@ namespace Meade.net.Telescope.UnitTests
         [Test]
         public void SlewToTargetAsync_WhenTargetBelowElevation_ThenThrowsException()
         {
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar("#:MS#")).Returns("2");
+            _sharedResourcesWrapperMock.Setup(x => x.ReadTerminated()).Returns("Above below elevation");
+
             ConnectTelescope();
 
             _telescope.TargetRightAscension = 2;
             _telescope.TargetDeclination = 1;
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar(":MS#")).Returns("2");
-
-            _sharedResourcesWrapperMock.Setup(x => x.ReadTerminated()).Returns("Above below elevation");
-
             var exception = Assert.Throws<InvalidOperationException>(() => { _telescope.SlewToTargetAsync(); });
             Assert.That(exception.Message, Is.EqualTo("Above below elevation"));
         }
@@ -2199,16 +2225,11 @@ namespace Meade.net.Telescope.UnitTests
         [Test]
         public void SlewToTarget_WhenSlewing_ThenWaitsForTheSlewToComplete()
         {
-            ConnectTelescope();
-
-            _telescope.TargetRightAscension = 2;
-            _telescope.TargetDeclination = 1;
-
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar(":MS#")).Returns("0");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar("#:MS#")).Returns("0");
 
             var slewCounter = 0;
             var iterations = 10;
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":D#")).Returns(() =>
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:D#")).Returns(() =>
             {
                 slewCounter++;
                 if (slewCounter <= iterations)
@@ -2216,6 +2237,11 @@ namespace Meade.net.Telescope.UnitTests
                 return "";
             });
 
+            ConnectTelescope();
+
+            _telescope.TargetRightAscension = 2;
+            _telescope.TargetDeclination = 1;
+
             _telescope.SlewToTarget();
 
             _utilMock.Verify( x => x.WaitForMilliseconds(It.IsAny<int>()), Times.Exactly(iterations));
@@ -2234,13 +2260,11 @@ namespace Meade.net.Telescope.UnitTests
             var rightAscension = 1;
             var declination = 2;
 
-            ConnectTelescope();
-
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar(":MS#")).Returns("0");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar("#:MS#")).Returns("0");
 
             //var slewCounter = 0;
             //var iterations = 10;
-            //_sharedResourcesWrapperMock.Setup(x => x.SendString(":D#")).Returns(() =>
+            //_sharedResourcesWrapperMock.Setup(x => x.SendString("#:D#")).Returns(() =>
             //{
             //    slewCounter++;
             //    if (slewCounter <= iterations)
@@ -2249,12 +2273,14 @@ namespace Meade.net.Telescope.UnitTests
             //        return "";
             //});
 
+            ConnectTelescope();
+
             _telescope.SlewToCoordinatesAsync(rightAscension, declination);
 
             //_utilMock.Verify(x => x.WaitForMilliseconds(It.IsAny<int>()), Times.Exactly(iterations));
             Assert.That(_telescope.TargetRightAscension, Is.EqualTo(rightAscension));
             Assert.That(_telescope.TargetDeclination, Is.EqualTo(declination));
-            _sharedResourcesWrapperMock.Verify( x => x.SendChar(":MS#"), Times.Once);
+            _sharedResourcesWrapperMock.Verify( x => x.SendChar("#:MS#"), Times.Once);
         }
 
         [Test]
@@ -2270,13 +2296,11 @@ namespace Meade.net.Telescope.UnitTests
             var rightAscension = 1;
             var declination = 2;
 
-            ConnectTelescope();
-
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar(":MS#")).Returns("0");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar("#:MS#")).Returns("0");
 
             var slewCounter = 0;
             var iterations = 10;
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":D#")).Returns(() =>
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:D#")).Returns(() =>
             {
                 slewCounter++;
                 if (slewCounter <= iterations)
@@ -2284,10 +2308,12 @@ namespace Meade.net.Telescope.UnitTests
                 return "";
             });
 
+            ConnectTelescope();
+
             _telescope.SlewToCoordinates(rightAscension, declination);
             Assert.That(_telescope.TargetRightAscension, Is.EqualTo(rightAscension));
             Assert.That(_telescope.TargetDeclination, Is.EqualTo(declination));
-            _sharedResourcesWrapperMock.Verify(x => x.SendChar(":MS#"), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendChar("#:MS#"), Times.Once);
 
             _utilMock.Verify(x => x.WaitForMilliseconds(It.IsAny<int>()), Times.Exactly(iterations));
         }
@@ -2343,23 +2369,23 @@ namespace Meade.net.Telescope.UnitTests
             var rightAscension = 20;
             var declination = 10;
 
-            ConnectTelescope();
-
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":GC#")).Returns("10/15/20");
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":GL#")).Returns("20:15:10");
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":GG#")).Returns("-1.0");
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:GC#")).Returns("10/15/20");
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:GL#")).Returns("20:15:10");
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:GG#")).Returns("-1.0");
 
             _astroMathsMock
                 .Setup(x => x.ConvertHozToEq(It.IsAny<DateTime>(), It.IsAny<double>(), It.IsAny<double>(),
                     It.IsAny<HorizonCoordinates>())).Returns(new EquatorialCoordinates { Declination = declination, RightAscension = rightAscension });
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar(":MS#")).Returns("0");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar("#:MS#")).Returns("0");
+
+            ConnectTelescope();
 
             _telescope.SlewToAltAzAsync(azimuth, altitude);
             
             Assert.That(_telescope.TargetRightAscension, Is.EqualTo(rightAscension));
             Assert.That(_telescope.TargetDeclination, Is.EqualTo(declination));
-            _sharedResourcesWrapperMock.Verify(x => x.SendChar(":MS#"), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendChar("#:MS#"), Times.Once);
         }
 
         [Test]
@@ -2377,21 +2403,19 @@ namespace Meade.net.Telescope.UnitTests
             var azimuth = 30;
             var altitude = 40;
 
-            ConnectTelescope();
-
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":GC#")).Returns("10/15/20");
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":GL#")).Returns("20:15:10");
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":GG#")).Returns("-1.0");
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:GC#")).Returns("10/15/20");
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:GL#")).Returns("20:15:10");
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:GG#")).Returns("-1.0");
 
             _astroMathsMock
                 .Setup(x => x.ConvertHozToEq(It.IsAny<DateTime>(), It.IsAny<double>(), It.IsAny<double>(),
                     It.IsAny<HorizonCoordinates>())).Returns(new EquatorialCoordinates { Declination = declination, RightAscension = rightAscension });
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar(":MS#")).Returns("0");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar("#:MS#")).Returns("0");
 
             var slewCounter = 0;
             var iterations = 10;
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":D#")).Returns(() =>
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:D#")).Returns(() =>
             {
                 slewCounter++;
                 if (slewCounter <= iterations)
@@ -2399,11 +2423,13 @@ namespace Meade.net.Telescope.UnitTests
                 return "";
             });
 
+            ConnectTelescope();
+            
             _telescope.SlewToAltAz( azimuth, altitude);
 
             Assert.That(_telescope.TargetRightAscension, Is.EqualTo(rightAscension));
             Assert.That(_telescope.TargetDeclination, Is.EqualTo(declination));
-            _sharedResourcesWrapperMock.Verify(x => x.SendChar(":MS#"), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendChar("#:MS#"), Times.Once);
             _utilMock.Verify(x => x.WaitForMilliseconds(It.IsAny<int>()), Times.Exactly(iterations));
         }
 
@@ -2431,21 +2457,21 @@ namespace Meade.net.Telescope.UnitTests
 
             var mockHourAngle = 3;
 
-            ConnectTelescope();
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:GC#")).Returns("10/15/20");
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:GL#")).Returns("20:15:10");
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:GG#")).Returns("-1.0");
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":GC#")).Returns("10/15/20");
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":GL#")).Returns("20:15:10");
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":GG#")).Returns("-1.0");
-
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":Gg#")).Returns(telescopeLongitude);
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:Gg#")).Returns(telescopeLongitude);
             _utilMock.Setup(x => x.DMSToDegrees(telescopeLongitude)).Returns(telescopeLongitudeValue);
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":GR#")).Returns(telescopeLatitude);
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:GR#")).Returns(telescopeLatitude);
             _utilMock.Setup(x => x.HMSToHours(telescopeLatitude)).Returns(telescopeLatitudeValue);
 
             _astroMathsMock.Setup(x => x.RightAscensionToHourAngle(It.IsAny<DateTime>(), It.IsAny<double>(), It.IsAny<double>())).Returns(mockHourAngle);
 
-            _astroMathsMock.Setup(x => x.ConvertEqToHoz(mockHourAngle, It.IsAny<double>(), It.IsAny<EquatorialCoordinates>())).Returns( new HorizonCoordinates{ Altitude = 45, Azimuth = expectedAzimuth });
+            _astroMathsMock.Setup(x => x.ConvertEqToHoz(mockHourAngle, It.IsAny<double>(), It.IsAny<EquatorialCoordinates>())).Returns(new HorizonCoordinates { Altitude = 45, Azimuth = expectedAzimuth });
+
+            ConnectTelescope();
 
             var result = _telescope.Azimuth;
 
@@ -2476,22 +2502,22 @@ namespace Meade.net.Telescope.UnitTests
 
             var mockHourAngle = 3;
 
-            ConnectTelescope();
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:GC#")).Returns("10/15/20");
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:GL#")).Returns("20:15:10");
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:GG#")).Returns("-1.0");
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":GC#")).Returns("10/15/20");
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":GL#")).Returns("20:15:10");
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":GG#")).Returns("-1.0");
-
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":Gg#")).Returns(telescopeLongitude);
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:Gg#")).Returns(telescopeLongitude);
             _utilMock.Setup(x => x.DMSToDegrees(telescopeLongitude)).Returns(telescopeLongitudeValue);
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(":GR#")).Returns(telescopeLatitude);
+            _sharedResourcesWrapperMock.Setup(x => x.SendString("#:GR#")).Returns(telescopeLatitude);
             _utilMock.Setup(x => x.HMSToHours(telescopeLatitude)).Returns(telescopeLatitudeValue);
 
             _astroMathsMock.Setup(x => x.RightAscensionToHourAngle(It.IsAny<DateTime>(), It.IsAny<double>(), It.IsAny<double>())).Returns(mockHourAngle);
 
             _astroMathsMock.Setup(x => x.ConvertEqToHoz(mockHourAngle, It.IsAny<double>(), It.IsAny<EquatorialCoordinates>())).Returns(new HorizonCoordinates { Altitude = expectedAltitude, Azimuth = 200 });
 
+            ConnectTelescope();
+
             var result = _telescope.Altitude;
 
             Assert.That(result, Is.EqualTo(expectedAltitude));
@@ -2511,12 +2537,12 @@ namespace Meade.net.Telescope.UnitTests
 
             _telescope.AbortSlew();
 
-            _sharedResourcesWrapperMock.Verify( x => x.SendBlind(":Q#"),Times.Once);
+            _sharedResourcesWrapperMock.Verify( x => x.SendBlind("#:Q#"),Times.Once);
 
             var isSloSlewing = _telescope.Slewing;
 
             Assert.That(isSloSlewing, Is.False);
-            _sharedResourcesWrapperMock.Verify( x => x.SendString(":D#"), Times.Once);
+            _sharedResourcesWrapperMock.Verify( x => x.SendString("#:D#"), Times.Once);
         }
     }
 }
\ No newline at end of file
diff --git a/Meade.net.Telescope.UnitTests/app.config b/Meade.net.Telescope.UnitTests/app.config
index ea6ff10..487342b 100644
--- a/Meade.net.Telescope.UnitTests/app.config
+++ b/Meade.net.Telescope.UnitTests/app.config
@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
diff --git a/Meade.net.Telescope.UnitTests/packages.config b/Meade.net.Telescope.UnitTests/packages.config
index 4c380c0..688d530 100644
--- a/Meade.net.Telescope.UnitTests/packages.config
+++ b/Meade.net.Telescope.UnitTests/packages.config
@@ -2,8 +2,8 @@
 <packages>
   <package id="ASCOM.Platform" version="6.4.2" targetFramework="net472" />
   <package id="Castle.Core" version="4.4.0" targetFramework="net45" />
-  <package id="Moq" version="4.12.0" targetFramework="net45" />
+  <package id="Moq" version="4.13.0" targetFramework="net472" />
   <package id="NUnit" version="3.12.0" targetFramework="net40" requireReinstallation="true" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net45" requireReinstallation="true" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.6.0" targetFramework="net472" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.3" targetFramework="net472" />
 </packages>
\ No newline at end of file
diff --git a/Meade.net.Telescope/AstroMaths/AstroMaths.cs b/Meade.net.Telescope/AstroMaths/AstroMaths.cs
index 9ae12d9..f8d7e77 100644
--- a/Meade.net.Telescope/AstroMaths/AstroMaths.cs
+++ b/Meade.net.Telescope/AstroMaths/AstroMaths.cs
@@ -22,7 +22,7 @@ namespace ASCOM.Meade.net.AstroMaths
             return h;
         }
 
-        public double HourAngleToRightAscension(DateTime utcDateTime, double longitude, double hourAngle )
+        private double HourAngleToRightAscension(DateTime utcDateTime, double longitude, double hourAngle )
         {
             var gst = UTtoGst(utcDateTime);
             var lst = GsTtoLst( gst, longitude);
diff --git a/Meade.net.Telescope/AstroMaths/IAstroMaths.cs b/Meade.net.Telescope/AstroMaths/IAstroMaths.cs
index dfcab3a..6cc35ee 100644
--- a/Meade.net.Telescope/AstroMaths/IAstroMaths.cs
+++ b/Meade.net.Telescope/AstroMaths/IAstroMaths.cs
@@ -5,13 +5,13 @@ namespace ASCOM.Meade.net.AstroMaths
     public interface IAstroMaths
     {
         double RightAscensionToHourAngle(DateTime utcDateTime, double longitude, double rightAscension);
-        double HourAngleToRightAscension(DateTime utcDateTime, double longitude, double hourAngle );
+        //double HourAngleToRightAscension(DateTime utcDateTime, double longitude, double hourAngle );
         EquatorialCoordinates ConvertHozToEq( DateTime utcDateTime, double latitude, double longitude, HorizonCoordinates altAz);
         HorizonCoordinates ConvertEqToHoz(double hourAngle, double latitude, EquatorialCoordinates raDec);
-        double DegreesToRadians(double degrees);
-        double RadiansToDegrees(double radians);
-        double DateTimeToDecimalHours( DateTime utcDateTime);
-        double UTtoGst(DateTime utcDateTime);
-        double GsTtoLst(double gst, double longitude);
+        //double DegreesToRadians(double degrees);
+        //double RadiansToDegrees(double radians);
+        //double DateTimeToDecimalHours( DateTime utcDateTime);
+        //double UTtoGst(DateTime utcDateTime);
+        //double GsTtoLst(double gst, double longitude);
     }
 }
\ No newline at end of file
diff --git a/Meade.net.Telescope/ComparisonResult.cs b/Meade.net.Telescope/ComparisonResult.cs
new file mode 100644
index 0000000..7997a47
--- /dev/null
+++ b/Meade.net.Telescope/ComparisonResult.cs
@@ -0,0 +1,9 @@
+namespace ASCOM.Meade.net
+{
+    public enum ComparisonResult
+    {
+        Lower,
+        Equals,
+        Greater
+    }
+}
\ No newline at end of file
diff --git a/Meade.net.Telescope/DoubleExtensions.cs b/Meade.net.Telescope/DoubleExtensions.cs
index 958400c..29ba8fa 100644
--- a/Meade.net.Telescope/DoubleExtensions.cs
+++ b/Meade.net.Telescope/DoubleExtensions.cs
@@ -10,5 +10,18 @@ namespace ASCOM.Meade.net
                 return false;
             return true;
         }
+
+        public static ComparisonResult Compare(this double value, double comparison)
+        {
+            var result = value.CompareTo(comparison);
+
+            if (result < 0)
+                return ComparisonResult.Lower;
+
+            if (result == 0)
+                return ComparisonResult.Equals;
+
+            return ComparisonResult.Greater;
+        }
     }
 }
\ No newline at end of file
diff --git a/Meade.net.Telescope/Meade.net.Telescope.csproj b/Meade.net.Telescope/Meade.net.Telescope.csproj
index 4d1c796..cc2feb8 100644
--- a/Meade.net.Telescope/Meade.net.Telescope.csproj
+++ b/Meade.net.Telescope/Meade.net.Telescope.csproj
@@ -15,7 +15,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>3.5</OldToolsVersion>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <ApplicationIcon>ASCOM.ico</ApplicationIcon>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>ASCOMDriverTemplate.snk</AssemblyOriginatorKeyFile>
@@ -62,10 +62,12 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>..\bin\Release\</OutputPath>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <OutputPath>..\bin\Debug\</OutputPath>
     <PlatformTarget>AnyCPU</PlatformTarget>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="ASCOM.Astrometry, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
@@ -118,6 +120,7 @@
     <Compile Include="AstroMaths\EquatorialCoordinates.cs" />
     <Compile Include="AstroMaths\HorizonCoordinates.cs" />
     <Compile Include="AstroMaths\IAstroMaths.cs" />
+    <Compile Include="ComparisonResult.cs" />
     <Compile Include="DoubleExtensions.cs" />
     <Compile Include="StringExtensions.cs" />
     <Compile Include="Telescope.cs" />
diff --git a/Meade.net.Telescope/Properties/Resources.Designer.cs b/Meade.net.Telescope/Properties/Resources.Designer.cs
index 4038f60..659e1a1 100644
--- a/Meade.net.Telescope/Properties/Resources.Designer.cs
+++ b/Meade.net.Telescope/Properties/Resources.Designer.cs
@@ -8,16 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-using System.CodeDom.Compiler;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Drawing;
-using System.Globalization;
-using System.Resources;
-using System.Runtime.CompilerServices;
-
 namespace ASCOM.Meade.net.Properties {
+    using System;
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -25,27 +19,27 @@ namespace ASCOM.Meade.net.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [GeneratedCode("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
-    [DebuggerNonUserCode()]
-    [CompilerGenerated()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
         
-        private static ResourceManager resourceMan;
+        private static global::System.Resources.ResourceManager resourceMan;
         
-        private static CultureInfo resourceCulture;
+        private static global::System.Globalization.CultureInfo resourceCulture;
         
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
         internal Resources() {
         }
         
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Advanced)]
-        internal static ResourceManager ResourceManager {
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
             get {
-                if (ReferenceEquals(resourceMan, null)) {
-                    ResourceManager temp = new ResourceManager("ASCOM.Meade.net.Properties.Resources", typeof(Resources).Assembly);
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ASCOM.Meade.net.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
@@ -56,8 +50,8 @@ namespace ASCOM.Meade.net.Properties {
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Advanced)]
-        internal static CultureInfo Culture {
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
             get {
                 return resourceCulture;
             }
@@ -69,20 +63,20 @@ namespace ASCOM.Meade.net.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static Bitmap ASCOM {
+        internal static System.Drawing.Bitmap ASCOM {
             get {
                 object obj = ResourceManager.GetObject("ASCOM", resourceCulture);
-                return ((Bitmap)(obj));
+                return ((System.Drawing.Bitmap)(obj));
             }
         }
         
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
         /// </summary>
-        internal static Icon DefaultIcon {
+        internal static System.Drawing.Icon DefaultIcon {
             get {
                 object obj = ResourceManager.GetObject("DefaultIcon", resourceCulture);
-                return ((Icon)(obj));
+                return ((System.Drawing.Icon)(obj));
             }
         }
         
diff --git a/Meade.net.Telescope/Properties/Settings.Designer.cs b/Meade.net.Telescope/Properties/Settings.Designer.cs
index 81d4ba1..67ea42d 100644
--- a/Meade.net.Telescope/Properties/Settings.Designer.cs
+++ b/Meade.net.Telescope/Properties/Settings.Designer.cs
@@ -8,18 +8,14 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-using System.CodeDom.Compiler;
-using System.Configuration;
-using System.Runtime.CompilerServices;
-
 namespace ASCOM.Meade.net.Properties {
     
     
-    [CompilerGenerated()]
-    [GeneratedCode("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.0.0.0")]
-    internal sealed partial class Settings : ApplicationSettingsBase {
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
-        private static Settings defaultInstance = ((Settings)(Synchronized(new Settings())));
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
         
         public static Settings Default {
             get {
diff --git a/Meade.net.Telescope/Rates.cs b/Meade.net.Telescope/Rates.cs
index 432c85a..c59641a 100644
--- a/Meade.net.Telescope/Rates.cs
+++ b/Meade.net.Telescope/Rates.cs
@@ -82,16 +82,17 @@ namespace ASCOM.Meade.net
             switch (axis)
             {
                 case TelescopeAxes.axisPrimary:
+                case TelescopeAxes.axisSecondary:
                     // TODO Initialize this array with any Primary axis rates that your driver may provide
                     // Example: m_Rates = new Rate[] { new Rate(10.5, 30.2), new Rate(54.0, 43.6) }
                     //this.rates = new Rate[0];
                     _rates = new[] { new Rate(1, 1), new Rate(2, 2), new Rate(3, 3), new Rate(4, 4) };
                     break;
-                case TelescopeAxes.axisSecondary:
-                    // TODO Initialize this array with any Secondary axis rates that your driver may provide
-                    //this.rates = new Rate[0];
-                    _rates = new[] { new Rate(1, 1), new Rate(2, 2), new Rate(3, 3), new Rate(4, 4) };
-                    break;
+                
+                    //// TODO Initialize this array with any Secondary axis rates that your driver may provide
+                    ////this.rates = new Rate[0];
+                    //_rates = new[] { new Rate(1, 1), new Rate(2, 2), new Rate(3, 3), new Rate(4, 4) };
+                    //break;
                 case TelescopeAxes.axisTertiary:
                     // TODO Initialize this array with any Tertiary axis rates that your driver may provide
                     _rates = new Rate[0];
diff --git a/Meade.net.Telescope/StringExtensions.cs b/Meade.net.Telescope/StringExtensions.cs
index 2f2c089..5c92bfc 100644
--- a/Meade.net.Telescope/StringExtensions.cs
+++ b/Meade.net.Telescope/StringExtensions.cs
@@ -7,10 +7,10 @@ namespace ASCOM.Meade.net
             return int.Parse(str);
         }
 
-        public static double ToDouble(this string str)
-        {
-            return double.Parse(str);
-        }
+        //public static double ToDouble(this string str)
+        //{
+        //    return double.Parse(str);
+        //}
 
         public static int Position(this string str, char find, int instance)
         {
diff --git a/Meade.net.Telescope/Telescope.cs b/Meade.net.Telescope/Telescope.cs
index 94bf158..c77994f 100644
--- a/Meade.net.Telescope/Telescope.cs
+++ b/Meade.net.Telescope/Telescope.cs
@@ -42,7 +42,7 @@ namespace ASCOM.Meade.net
         /// The DeviceID is used by ASCOM applications to load the driver at runtime.
         /// </summary>
         //internal static string driverID = "ASCOM.Meade.net.Telescope";
-        private static readonly string DriverId = Marshal.GenerateProgIdForType(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly string DriverId = Marshal.GenerateProgIdForType(MethodBase.GetCurrentMethod().DeclaringType ?? throw new System.InvalidOperationException());
 
         // TODO Change the descriptive string for your driver then remove this line
         /// <summary>
@@ -169,68 +169,68 @@ namespace ASCOM.Meade.net
                     {
                         //Read the screen
                         case "readdisplay":
-                            var output = _sharedResourcesWrapper.SendString(":ED#");
+                            var output = _sharedResourcesWrapper.SendString("#:ED#");
                             return output;
 
                         //top row of buttons
                         case "enter":
-                            _sharedResourcesWrapper.SendBlind(":EK13#");
+                            _sharedResourcesWrapper.SendBlind("#:EK13#");
                             break;
                         case "mode":
-                            _sharedResourcesWrapper.SendBlind(":EK9#");
+                            _sharedResourcesWrapper.SendBlind("#:EK9#");
                             break;
                         case "longmode":
-                            _sharedResourcesWrapper.SendBlind(":EK11#");
+                            _sharedResourcesWrapper.SendBlind("#:EK11#");
                             break;
                         case "goto":
-                            _sharedResourcesWrapper.SendBlind(":EK24#");
+                            _sharedResourcesWrapper.SendBlind("#:EK24#");
                             break;
 
                         case "0": //light and 0
-                            _sharedResourcesWrapper.SendBlind(":EK48#");
+                            _sharedResourcesWrapper.SendBlind("#:EK48#");
                             break;
                         case "1":
-                            _sharedResourcesWrapper.SendBlind(":EK49#");
+                            _sharedResourcesWrapper.SendBlind("#:EK49#");
                             break;
                         case "2":
-                            _sharedResourcesWrapper.SendBlind(":EK50#");
+                            _sharedResourcesWrapper.SendBlind("#:EK50#");
                             break;
                         case "3":
-                            _sharedResourcesWrapper.SendBlind(":EK51#");
+                            _sharedResourcesWrapper.SendBlind("#:EK51#");
                             break;
                         case "4":
-                            _sharedResourcesWrapper.SendBlind(":EK52#");
+                            _sharedResourcesWrapper.SendBlind("#:EK52#");
                             break;
                         case "5":
-                            _sharedResourcesWrapper.SendBlind(":EK53#");
+                            _sharedResourcesWrapper.SendBlind("#:EK53#");
                             break;
                         case "6":
-                            _sharedResourcesWrapper.SendBlind(":EK54#");
+                            _sharedResourcesWrapper.SendBlind("#:EK54#");
                             break;
                         case "7":
-                            _sharedResourcesWrapper.SendBlind(":EK55#");
+                            _sharedResourcesWrapper.SendBlind("#:EK55#");
                             break;
                         case "8":
-                            _sharedResourcesWrapper.SendBlind(":EK56#");
+                            _sharedResourcesWrapper.SendBlind("#:EK56#");
                             break;
                         case "9":
-                            _sharedResourcesWrapper.SendBlind(":EK57#");
+                            _sharedResourcesWrapper.SendBlind("#:EK57#");
                             break;
 
                         case "up":
-                            _sharedResourcesWrapper.SendBlind(":EK94#");
+                            _sharedResourcesWrapper.SendBlind("#:EK94#");
                             break;
                         case "down":
-                            _sharedResourcesWrapper.SendBlind(":EK118#");
+                            _sharedResourcesWrapper.SendBlind("#:EK118#");
                             break;
                         case "back":
-                            _sharedResourcesWrapper.SendBlind(":EK87#");
+                            _sharedResourcesWrapper.SendBlind("#:EK87#");
                             break;
                         case "forward":
-                            _sharedResourcesWrapper.SendBlind(":EK69#");
+                            _sharedResourcesWrapper.SendBlind("#:EK69#");
                             break;
                         case "?":
-                            _sharedResourcesWrapper.SendBlind(":EK63#");
+                            _sharedResourcesWrapper.SendBlind("#:EK63#");
                             break;
                         default:
                             LogMessage("", "Action {0}, parameters {1} not implemented", actionName, actionParameters);
@@ -388,6 +388,7 @@ namespace ASCOM.Meade.net
                             if (connectionInfo.SameDevice == 1)
                             {
                                 LogMessage("Connected Set", "Making first connection telescope adjustments");
+
                                 //These settings are applied only when the first device connects to the telescope.
                                 SetLongFormat(true);
 
@@ -402,6 +403,9 @@ namespace ASCOM.Meade.net
                             {
                                 LogMessage("Connected Set", $"Skipping first connection telescope adjustments (current connections: {connectionInfo.SameDevice})");
                             }
+
+                            var raAndDec = GetTelescopeRaAndDec();
+                            LogMessage("Connected Set", $"Connected OK.  Current RA = {_utilitiesExtra.HoursToHMS(raAndDec.RightAscension)} Dec = {_utilitiesExtra.DegreesToDMS(raAndDec.Declination)}");
                         }
                         catch (Exception)
                         {
@@ -488,11 +492,14 @@ namespace ASCOM.Meade.net
             IsLongFormat = false;
 
             if (!IsLongFormatSupported())
+            {
+                LogMessage("SetLongFormat", "Long coordinate format not supported for this mount");
                 return;
+            }
 
             _sharedResourcesWrapper.Lock(() =>
             {
-                var result = _sharedResourcesWrapper.SendString(":GZ#");
+                var result = _sharedResourcesWrapper.SendString("#:GZ#");
                 //:GZ# Get telescope azimuth
                 //Returns: DDD*MM# or DDD*MM’SS#
                 //The current telescope Azimuth depending on the selected precision.
@@ -502,19 +509,21 @@ namespace ASCOM.Meade.net
                 if (IsLongFormat != setLongFormat)
                 {
                     _utilities.WaitForMilliseconds(500);
-                    _sharedResourcesWrapper.SendBlind(":U#");
+                    _sharedResourcesWrapper.SendBlind("#:U#");
                     //:U# Toggle between low/hi precision positions
                     //Low - RA displays and messages HH:MM.T sDD*MM
                     //High - Dec / Az / El displays and messages HH:MM: SS sDD*MM:SS
                     //    Returns Nothing
                 }
             });
+
+            LogMessage("SetLongFormat", $"Long coordinate format: {setLongFormat} ");
         }
 
         private bool TogglePrecision()
         {
             LogMessage("TogglePrecision", "Toggling slewing precision");
-            var result = _sharedResourcesWrapper.SendChar(":P#");
+            var result = _sharedResourcesWrapper.SendChar("#:P#");
             //:P# Toggles High Precsion Pointing. When High precision pointing is enabled scope will first allow the operator to center a nearby bright star before moving to the actual target.
             //Returns: <string>
             //“HIGH PRECISION” Current setting after this command.
@@ -552,33 +561,35 @@ namespace ASCOM.Meade.net
 
         public void SelectSite(int site)
         {
-            CheckConnected("SelectSite");
+            CheckConnectedAndValidateSite(site, "SelectSite");
 
-            if (site < 1)
-                throw new ArgumentOutOfRangeException(nameof(site),site,Resources.Telescope_SelectSite_Site_cannot_be_lower_than_1);
-            if (site > 4)
-                throw new ArgumentOutOfRangeException(nameof(site), site, Resources.Telescope_SelectSite_Site_cannot_be_higher_than_4);
-
-            _sharedResourcesWrapper.SendBlind($":W{site}#");
+            _sharedResourcesWrapper.SendBlind($"#:W{site}#");
             //:W<n>#
             //Set current site to<n>, an ASCII digit in the range 1..4
             //Returns: Nothing
         }
 
-        private void SetSiteName(int site, string sitename)
+        private void CheckConnectedAndValidateSite(int site, string message)
         {
-            CheckConnected("SetSiteName");
+            CheckConnected(message);
 
             if (site < 1)
-                throw new ArgumentOutOfRangeException(nameof(site), site, Resources.Telescope_SelectSite_Site_cannot_be_lower_than_1);
+                throw new ArgumentOutOfRangeException(nameof(site), site,
+                    Resources.Telescope_SelectSite_Site_cannot_be_lower_than_1);
             if (site > 4)
-                throw new ArgumentOutOfRangeException(nameof(site), site, Resources.Telescope_SelectSite_Site_cannot_be_higher_than_4);
+                throw new ArgumentOutOfRangeException(nameof(site), site,
+                    Resources.Telescope_SelectSite_Site_cannot_be_higher_than_4);
+        }
 
-            string command = String.Empty;
+        private void SetSiteName(int site, string sitename)
+        {
+            CheckConnectedAndValidateSite(site, "SetSiteName");
+
+            string command;
             switch (site)
             {
                 case 1:
-                    command = $":SM{sitename}#";
+                    command = $"#:SM{sitename}#";
                     //:SM<string>#
                     //Set site 1’s name to be<string>.LX200s only accept 3 character strings. Other scopes accept up to 15 characters.
                     //    Returns:
@@ -586,7 +597,7 @@ namespace ASCOM.Meade.net
                     //1 - Valid
                     break;
                 case 2:
-                    command = $":SN{sitename}#";
+                    command = $"#:SN{sitename}#";
                     //:SN<string>#
                     //Set site 2’s name to be<string>.LX200s only accept 3 character strings. Other scopes accept up to 15 characters.
                     //    Returns:
@@ -594,7 +605,7 @@ namespace ASCOM.Meade.net
                     //1 - Valid
                     break;
                 case 3:
-                    command = $":SO{sitename}#";
+                    command = $"#:SO{sitename}#";
                     //:SO<string>#
                     //Set site 3’s name to be<string>.LX200s only accept 3 character strings. Other scopes accept up to 15 characters.
                     //    Returns:
@@ -602,14 +613,15 @@ namespace ASCOM.Meade.net
                     //1 - Valid
                     break;
                 case 4:
-                    command = $":SP{sitename}#";
+                    command = $"#:SP{sitename}#";
                     //:SP<string>#
                     //Set site 4’s name to be<string>.LX200s only accept 3 character strings. Other scopes accept up to 15 characters.
                     //    Returns:
                     //0 – Invalid
                     //1 - Valid
                     break;
-
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(site), site, Resources.Telescope_GetSiteName_Site_out_of_range);
             }
 
             var result = _sharedResourcesWrapper.SendChar(command);
@@ -621,38 +633,33 @@ namespace ASCOM.Meade.net
 
         private string GetSiteName(int site)
         {
-            CheckConnected("GetSiteName");
-
-            if (site < 1)
-                throw new ArgumentOutOfRangeException(nameof(site), site, Resources.Telescope_SelectSite_Site_cannot_be_lower_than_1);
-            if (site > 4)
-                throw new ArgumentOutOfRangeException(nameof(site), site, Resources.Telescope_SelectSite_Site_cannot_be_higher_than_4);
+            CheckConnectedAndValidateSite(site, "GetSiteName");
 
             switch (site)
             {
                 case 1:
-                    return _sharedResourcesWrapper.SendString(":GM#");
+                    return _sharedResourcesWrapper.SendString("#:GM#");
                     //:GM# Get Site 1 Name
                     //Returns: <string>#
                     //A ‘#’ terminated string with the name of the requested site.
                 case 2:
-                    return _sharedResourcesWrapper.SendString(":GN#");
+                    return _sharedResourcesWrapper.SendString("#:GN#");
                     //:GN# Get Site 2 Name
                     //Returns: <string>#
                     //A ‘#’ terminated string with the name of the requested site.
                 case 3:
-                    return _sharedResourcesWrapper.SendString(":GO#");
+                    return _sharedResourcesWrapper.SendString("#:GO#");
                     //:GO# Get Site 3 Name
                     //Returns: <string>#
                     //A ‘#’ terminated string with the name of the requested site.
                 case 4:
-                    return _sharedResourcesWrapper.SendString(":GP#");
+                    return _sharedResourcesWrapper.SendString("#:GP#");
                     //:GP# Get Site 4 Name
                     //Returns: <string>#
                     //A ‘#’ terminated string with the name of the requested site.
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(site), site, Resources.Telescope_GetSiteName_Site_out_of_range);
             }
-
-            throw new ArgumentOutOfRangeException(nameof(site), site, Resources.Telescope_GetSiteName_Site_out_of_range);
         }
 
         public string Description
@@ -703,11 +710,11 @@ namespace ASCOM.Meade.net
             {
                 //string name = "Short driver name - please customise";
 
-                //var telescopeProduceName = _sharedResourcesWrapper.SendString(":GVP#");
+                //var telescopeProduceName = _sharedResourcesWrapper.SendString("#:GVP#");
                 ////:GVP# Get Telescope Product Name
                 ////Returns: <string>#
 
-                //var firmwareVersion = _sharedResourcesWrapper.SendString(":GVN#");
+                //var firmwareVersion = _sharedResourcesWrapper.SendString("#:GVN#");
                 ////:GVN# Get Telescope Firmware Number
                 ////Returns: dd.d#
 
@@ -727,7 +734,7 @@ namespace ASCOM.Meade.net
             CheckConnected("AbortSlew");
 
             LogMessage("AbortSlew", "Aborting slew");
-            _sharedResourcesWrapper.SendBlind(":Q#");
+            _sharedResourcesWrapper.SendBlind("#:Q#");
             //:Q# Halt all current slewing
             //Returns:Nothing
 
@@ -756,7 +763,7 @@ namespace ASCOM.Meade.net
                 //todo implement GW Command - Supported in Autostar 43Eg and above
                 //if FirmwareIsGreaterThan(TelescopeList.Autostar497_43EG)
                 //{
-                    //var alignmentString = SerialPort.CommandTerminated(":GW#", "#");
+                    //var alignmentString = SerialPort.CommandTerminated("#:GW#", "#");
                     //:GW# Get Scope Alignment Status
                     //Returns: <mount><tracking><alignment>#
                     //    where:
@@ -798,13 +805,13 @@ namespace ASCOM.Meade.net
                     switch (value)
                 {
                     case AlignmentModes.algAltAz:
-                        _sharedResourcesWrapper.SendBlind(":AA#");
+                        _sharedResourcesWrapper.SendBlind("#:AA#");
                         //:AA# Sets telescope the AltAz alignment mode
                         //Returns: nothing
                         break;
                     case AlignmentModes.algPolar:
                     case AlignmentModes.algGermanPolar:
-                        _sharedResourcesWrapper.SendBlind(":AP#");
+                        _sharedResourcesWrapper.SendBlind("#:AP#");
                         //:AP# Sets telescope to Polar alignment mode
                         //Returns: nothing
                         break;
@@ -828,7 +835,7 @@ namespace ASCOM.Meade.net
                 return altAz.Altitude;
 
                 ////todo firmware bug in 44Eg, :GA# is returning the dec, not the altitude!
-                //var result = _sharedResourcesWrapper.SendString(":GA#");
+                //var result = _sharedResourcesWrapper.SendString("#:GA#");
                 ////:GA# Get Telescope Altitude
                 ////Returns: sDD* MM# or sDD*MM’SS#
                 ////The current scope altitude. The returned format depending on the current precision setting.
@@ -849,11 +856,7 @@ namespace ASCOM.Meade.net
                 UtcDateTime = UTCDate,
                 SiteLongitude = SiteLongitude,
                 SiteLatitude = SiteLatitude,
-                EquatorialCoordinates = new EquatorialCoordinates
-                {
-                    RightAscension = RightAscension,
-                    Declination = Declination
-                }
+                EquatorialCoordinates = GetTelescopeRaAndDec()
             });
 
             double hourAngle = _astroMaths.RightAscensionToHourAngle(altitudeData.UtcDateTime, altitudeData.SiteLongitude,
@@ -862,6 +865,15 @@ namespace ASCOM.Meade.net
             return altAz;
         }
 
+        private EquatorialCoordinates GetTelescopeRaAndDec()
+        {
+            return new EquatorialCoordinates
+            {
+                RightAscension = RightAscension,
+                Declination = Declination
+            };
+        }
+
         public double ApertureArea
         {
             get
@@ -913,7 +925,7 @@ namespace ASCOM.Meade.net
             {
                 CheckConnected("Azimuth Get");
 
-                //var result = _sharedResourcesWrapper.SendString(":GZ#");
+                //var result = _sharedResourcesWrapper.SendString("#:GZ#");
                 //:GZ# Get telescope azimuth
                 //Returns: DDD*MM#T or DDD*MM’SS#
                 //The current telescope Azimuth depending on the selected precision.
@@ -1095,7 +1107,7 @@ namespace ASCOM.Meade.net
             {
                 CheckConnected("Declination Get");
 
-                var result = _sharedResourcesWrapper.SendString(":GD#");
+                var result = _sharedResourcesWrapper.SendString("#:GD#");
                 //:GD# Get Telescope Declination.
                 //Returns: sDD*MM# or sDD*MM’SS#
                 //Depending upon the current precision setting for the telescope.
@@ -1183,7 +1195,7 @@ namespace ASCOM.Meade.net
             }
 
             LogMessage($"{propertyName} Set", $"Setting new guiderate {value.ToString(CultureInfo.CurrentCulture)} arc seconds/second ({value.ToString(CultureInfo.CurrentCulture)} degrees/second)");
-            _sharedResourcesWrapper.SendBlind($":Rg{value:00.0}#");
+            _sharedResourcesWrapper.SendBlind($"#:Rg{value:00.0}#");
             //:RgSS.S#
             //Set guide rate to +/ -SS.S to arc seconds per second.This rate is added to or subtracted from the current tracking
             //Rates when the CCD guider or handbox guider buttons are pressed when the guide rate is selected.Rate shall not exceed
@@ -1264,22 +1276,22 @@ namespace ASCOM.Meade.net
                     //do nothing, it's ok this time as we're halting the slew.
                     break;
                 case 1:
-                    _sharedResourcesWrapper.SendBlind(":RG#");
+                    _sharedResourcesWrapper.SendBlind("#:RG#");
                     //:RG# Set Slew rate to Guiding Rate (slowest)
                     //Returns: Nothing
                     break;
                 case 2:
-                    _sharedResourcesWrapper.SendBlind(":RC#");
+                    _sharedResourcesWrapper.SendBlind("#:RC#");
                     //:RC# Set Slew rate to Centering rate (2nd slowest)
                     //Returns: Nothing
                     break;
                 case 3:
-                    _sharedResourcesWrapper.SendBlind(":RM#");
+                    _sharedResourcesWrapper.SendBlind("#:RM#");
                     //:RM# Set Slew rate to Find Rate (2nd Fastest)
                     //Returns: Nothing
                     break;
                 case 4:
-                    _sharedResourcesWrapper.SendBlind(":RS#");
+                    _sharedResourcesWrapper.SendBlind("#:RS#");
                     //:RS# Set Slew rate to max (fastest)
                     //Returns: Nothing
                     break;
@@ -1290,56 +1302,57 @@ namespace ASCOM.Meade.net
             switch (axis)
             {
                 case TelescopeAxes.axisPrimary:
-                    if (rate == 0)
+                    switch (rate.Compare(0))
                     {
-                        _movingPrimary = false;
-                        _sharedResourcesWrapper.SendBlind(":Qe#");
-                        //:Qe# Halt eastward Slews
-                        //Returns: Nothing
-                        _sharedResourcesWrapper.SendBlind(":Qw#");
-                        //:Qw# Halt westward Slews
-                        //Returns: Nothing
-                    }
-                    else if (rate > 0)
-                    {
-                        _sharedResourcesWrapper.SendBlind(":Me#");
-                        //:Me# Move Telescope East at current slew rate
-                        //Returns: Nothing
-                        _movingPrimary = true;
-                    }
-                    else
-                    {
-                        _sharedResourcesWrapper.SendBlind(":Mw#");
-                        //:Mw# Move Telescope West at current slew rate
-                        //Returns: Nothing
-                        _movingPrimary = true;
-                    }
+                        case ComparisonResult.Equals:
+                            _movingPrimary = false;
+                            _sharedResourcesWrapper.SendBlind("#:Qe#");
+                            //:Qe# Halt eastward Slews
+                            //Returns: Nothing
+                            _sharedResourcesWrapper.SendBlind("#:Qw#");
+                            //:Qw# Halt westward Slews
+                            //Returns: Nothing
+                            break;
+                        case ComparisonResult.Greater:
 
+                            _sharedResourcesWrapper.SendBlind("#:Me#");
+                            //:Me# Move Telescope East at current slew rate
+                            //Returns: Nothing
+                            _movingPrimary = true;
+                            break;
+                        case ComparisonResult.Lower:
+                            _sharedResourcesWrapper.SendBlind("#:Mw#");
+                            //:Mw# Move Telescope West at current slew rate
+                            //Returns: Nothing
+                            _movingPrimary = true;
+                            break;
+                    }
                     break;
                 case TelescopeAxes.axisSecondary:
-                    if (rate == 0)
+                    switch (rate.Compare(0))
                     {
-                        _movingSecondary = false;
-                        _sharedResourcesWrapper.SendBlind(":Qn#");
-                        //:Qn# Halt northward Slews
-                        //Returns: Nothing
-                        _sharedResourcesWrapper.SendBlind(":Qs#");
-                        //:Qs# Halt southward Slews
-                        //Returns: Nothing
-                    }
-                    else if (rate > 0)
-                    {
-                        _sharedResourcesWrapper.SendBlind(":Mn#");
-                        //:Mn# Move Telescope North at current slew rate
-                        //Returns: Nothing
-                        _movingSecondary = true;
-                    }
-                    else
-                    {
-                        _sharedResourcesWrapper.SendBlind(":Ms#");
-                        //:Ms# Move Telescope South at current slew rate
-                        //Returns: Nothing
-                        _movingSecondary = true;
+                        case ComparisonResult.Equals:
+                            _movingSecondary = false;
+                            _sharedResourcesWrapper.SendBlind("#:Qn#");
+                            //:Qn# Halt northward Slews
+                            //Returns: Nothing
+                            _sharedResourcesWrapper.SendBlind("#:Qs#");
+                            //:Qs# Halt southward Slews
+                            //Returns: Nothing
+                            break;
+                        case ComparisonResult.Greater:
+                            _sharedResourcesWrapper.SendBlind("#:Mn#");
+                            //:Mn# Move Telescope North at current slew rate
+                            //Returns: Nothing
+                            _movingSecondary = true;
+                            break;
+                        case ComparisonResult.Lower:
+                            _sharedResourcesWrapper.SendBlind("#:Ms#");
+                            //:Ms# Move Telescope South at current slew rate
+                            //Returns: Nothing
+                            _movingSecondary = true;
+                            break;
+
                     }
 
                     break;
@@ -1356,7 +1369,7 @@ namespace ASCOM.Meade.net
             if (AtPark)
                 return;
 
-            _sharedResourcesWrapper.SendBlind(":hP#");
+            _sharedResourcesWrapper.SendBlind("#:hP#");
             //:hP# Autostar, Autostar II and LX 16”Slew to Park Position
             //Returns: Nothing
             AtPark = true;
@@ -1369,27 +1382,29 @@ namespace ASCOM.Meade.net
             LogMessage("PulseGuide", $"pulse guide direction {direction} duration {duration}");
             CheckConnected("PulseGuide");
 
-            string d = string.Empty;
-            switch (direction)
-            {
-                case GuideDirections.guideEast:
-                    d = "e";
-                    break;
-                case GuideDirections.guideNorth:
-                    d = "n";
-                    break;
-                case GuideDirections.guideSouth:
-                    d = "s";
-                    break;
-                case GuideDirections.guideWest:
-                    d = "w";
-                    break;
-            }
+            var coordinatesBeforeMove = GetTelescopeRaAndDec();
 
             if (_userNewerPulseGuiding && duration < 10000)
             {
+                string d = string.Empty;
+                switch (direction)
+                {
+                    case GuideDirections.guideEast:
+                        d = "e";
+                        break;
+                    case GuideDirections.guideNorth:
+                        d = "n";
+                        break;
+                    case GuideDirections.guideSouth:
+                        d = "s";
+                        break;
+                    case GuideDirections.guideWest:
+                        d = "w";
+                        break;
+                }
+
                 LogMessage("PulseGuide", "Using new pulse guiding technique");
-                _sharedResourcesWrapper.SendBlind($":Mg{d}{duration:0000}#");
+                _sharedResourcesWrapper.SendBlind($"#:Mg{d}{duration:0000}#");
                 //:MgnDDDD#
                 //:MgsDDDD#
                 //:MgeDDDD#
@@ -1402,33 +1417,35 @@ namespace ASCOM.Meade.net
             }
             else
             {
-                LogMessage("PulseGuide", "Using old pulse guiding technique");
-                _sharedResourcesWrapper.Lock(() =>
+                switch (direction)
                 {
-                    _sharedResourcesWrapper.SendBlind(":RG#"); //Make sure we are at guide rate
-                    //:RG# Set Slew rate to Guiding Rate (slowest)
-                    //Returns: Nothing
-                    _sharedResourcesWrapper.SendBlind($":M{d}#");
-                    //:Me# Move Telescope East at current slew rate
-                    //Returns: Nothing
-                    //:Mn# Move Telescope North at current slew rate
-                    //Returns: Nothing
-                    //:Ms# Move Telescope South at current slew rate
-                    //Returns: Nothing
-                    //:Mw# Move Telescope West at current slew rate
-                    //Returns: Nothing
-                    _utilities.WaitForMilliseconds(duration);
-                    _sharedResourcesWrapper.SendBlind($":Q{d}#");
-                    //:Qe# Halt eastward Slews
-                    //Returns: Nothing
-                    //:Qn# Halt northward Slews
-                    //Returns: Nothing
-                    //:Qs# Halt southward Slews
-                    //Returns: Nothing
-                    //:Qw# Halt westward Slews
-                    //Returns: Nothing
-                });
+                    case GuideDirections.guideEast:
+                        MoveAxis(TelescopeAxes.axisPrimary, 1);
+                        _utilities.WaitForMilliseconds(duration);
+                        MoveAxis(TelescopeAxes.axisPrimary, 0);
+                        break;
+                    case GuideDirections.guideNorth:
+                        MoveAxis(TelescopeAxes.axisSecondary, 1);
+                        _utilities.WaitForMilliseconds(duration);
+                        MoveAxis(TelescopeAxes.axisSecondary, 0);
+                        break;
+                    case GuideDirections.guideSouth:
+                        MoveAxis(TelescopeAxes.axisSecondary, -1);
+                        _utilities.WaitForMilliseconds(duration);
+                        MoveAxis(TelescopeAxes.axisSecondary, 0);
+                        break;
+                    case GuideDirections.guideWest:
+                        MoveAxis(TelescopeAxes.axisPrimary, -1);
+                        _utilities.WaitForMilliseconds(duration);
+                        MoveAxis(TelescopeAxes.axisPrimary, 0);
+                        break;
+                }
             }
+
+            var coordinatesAfterMove = GetTelescopeRaAndDec();
+
+            LogMessage("PulseGuide", $"Complete Before RA: {_utilitiesExtra.HoursToHMS(coordinatesBeforeMove.RightAscension)} Dec:{_utilitiesExtra.DegreesToDMS(coordinatesBeforeMove.Declination)}");
+            LogMessage("PulseGuide", $"Complete Before RA: {_utilitiesExtra.HoursToHMS(coordinatesAfterMove.RightAscension)} Dec:{_utilitiesExtra.DegreesToDMS(coordinatesAfterMove.Declination)}");
         }
 
         public double RightAscension
@@ -1436,9 +1453,9 @@ namespace ASCOM.Meade.net
             get
             {
                 CheckConnected("RightAscension Get");
-                var result = _sharedResourcesWrapper.SendString(":GR#");
+                var result = _sharedResourcesWrapper.SendString("#:GR#");
                 //:GR# Get Telescope RA
-                //Returns: HH: MM.T# or HH:MM:SS#
+                //Returns: HH:MM.T# or HH:MM:SS#
                 //Depending which precision is set for the telescope
 
                 double rightAscension = _utilities.HMSToHours(result);
@@ -1532,7 +1549,7 @@ namespace ASCOM.Meade.net
             {
                 CheckConnected("SiteLatitude Get");
 
-                var latitude = _sharedResourcesWrapper.SendString(":Gt#");
+                var latitude = _sharedResourcesWrapper.SendString("#:Gt#");
                 //:Gt# Get Current Site Latitude
                 //Returns: sDD* MM#
                 //The latitude of the current site. Positive inplies North latitude.
@@ -1558,7 +1575,7 @@ namespace ASCOM.Meade.net
                 var absValue = Math.Abs(value);
                 int d = Convert.ToInt32(Math.Floor(absValue));
                 int m = Convert.ToInt32(60 * (absValue - d));
-                var commandString = $":St{sign}{d:00}*{m:00}#";
+                var commandString = $"#:St{sign}{d:00}*{m:00}#";
 
                 var result = _sharedResourcesWrapper.SendChar(commandString);
                 //:StsDD*MM#
@@ -1577,7 +1594,7 @@ namespace ASCOM.Meade.net
             {
                 CheckConnected("SiteLongitude Get");
 
-                var longitude = _sharedResourcesWrapper.SendString(":Gg#");
+                var longitude = _sharedResourcesWrapper.SendString("#:Gg#");
                 //:Gg# Get Current Site Longitude
                 //Returns: sDDD*MM#
                 //The current site Longitude. East Longitudes are expressed as negative
@@ -1613,7 +1630,7 @@ namespace ASCOM.Meade.net
                 int d = Convert.ToInt32(Math.Floor(newLongitude));
                 int m = Convert.ToInt32(60 * (newLongitude - d));
 
-                var commandstring = $":Sg{d:000}*{m:00}#";
+                var commandstring = $"#:Sg{d:000}*{m:00}#";
 
                 var result = _sharedResourcesWrapper.SendChar(commandstring);
                 //:SgDDD*MM#
@@ -1671,7 +1688,7 @@ namespace ASCOM.Meade.net
         //        var dms = _utilities.DegreesToDMS(value, "*", "'", "",0);
         //        var s = value < 0 ? string.Empty : "+";
 
-        //        var result = _sharedResourcesWrapper.SendChar($":Sa{s}{dms}#");
+        //        var result = _sharedResourcesWrapper.SendChar($"#:Sa{s}{dms}#");
         //        //:SasDD*MM#
         //        //Set target object altitude to sDD*MM# or sDD*MM’SS# [LX 16”, Autostar, Autostar II]
         //        //Returns:
@@ -1699,7 +1716,7 @@ namespace ASCOM.Meade.net
 
         //        var dms = _utilitiesExtra.DegreesToDM(value, "*" );
 
-        //        var result = _sharedResourcesWrapper.SendChar($":Sz{dms}#");
+        //        var result = _sharedResourcesWrapper.SendChar($"#:Sz{dms}#");
         //        //:SzDDD*MM#
         //        //Sets the target Object Azimuth[LX 16” and Autostar II only]
         //        //Returns:
@@ -1761,7 +1778,7 @@ namespace ASCOM.Meade.net
                 switch (polar)
                 {
                     case true:
-                        var response = _sharedResourcesWrapper.SendChar(":MS#");
+                        var response = _sharedResourcesWrapper.SendChar("#:MS#");
                         //:MS# Slew to Target Object
                         //Returns:
                         //0 Slew is Possible
@@ -1792,7 +1809,7 @@ namespace ASCOM.Meade.net
 
                         break;
                     case false:
-                        var maResponse = _sharedResourcesWrapper.SendChar(":MA#");
+                        var maResponse = _sharedResourcesWrapper.SendChar("#:MA#");
                         //:MA# Autostar, LX 16”, Autostar II – Slew to target Alt and Az
                         //Returns:
                         //0 - No fault
@@ -1857,7 +1874,7 @@ namespace ASCOM.Meade.net
         {
             CheckConnected("SlewToTargetAsync");
 
-            if (TargetDeclination == InvalidParameter || TargetRightAscension == InvalidParameter)
+            if (TargetDeclination.Equals(InvalidParameter) || TargetRightAscension.Equals(InvalidParameter))
                 throw new InvalidOperationException("No target selected to slew to.");
 
             DoSlewAsync(true);
@@ -1880,7 +1897,7 @@ namespace ASCOM.Meade.net
 
                 CheckConnected("Slewing Get");
 
-                var result = _sharedResourcesWrapper.SendString(":D#");
+                var result = _sharedResourcesWrapper.SendString("#:D#");
                 //:D# Requests a string of bars indicating the distance to the current target location.
                 //Returns:
                 //LX200's – a string of bar characters indicating the distance.
@@ -1923,7 +1940,7 @@ namespace ASCOM.Meade.net
             LogMessage("SyncToTarget", "Executing");
             CheckConnected("SyncToTarget");
 
-            var result = _sharedResourcesWrapper.SendString(":CM#");
+            var result = _sharedResourcesWrapper.SendString("#:CM#");
             //:CM# Synchronizes the telescope's position with the currently selected database object's coordinates.
             //Returns:
             //LX200's - a "#" terminated string with the name of the object that was synced.
@@ -1938,10 +1955,10 @@ namespace ASCOM.Meade.net
         {
             get
             {
-                if (_targetDeclination == InvalidParameter)
+                if (_targetDeclination.Equals(InvalidParameter))
                     throw new InvalidOperationException("Target not set");
 
-                //var result = SerialPort.CommandTerminated(":Gd#", "#");
+                //var result = SerialPort.CommandTerminated("#:Gd#", "#");
                 ////:Gd# Get Currently Selected Object/Target Declination
                 ////Returns: sDD* MM# or sDD*MM’SS#
                 ////Depending upon the current precision setting for the telescope.
@@ -1969,7 +1986,7 @@ namespace ASCOM.Meade.net
                 var dms = _utilities.DegreesToDMS(value, "*", ":", ":", 2);
                 var s = value < 0 ? string.Empty : "+";
 
-                var command = $":Sd{s}{dms}#";
+                var command = $"#:Sd{s}{dms}#";
 
                 LogMessage("TargetDeclination Set", $"{command}");
                 var result = _sharedResourcesWrapper.SendChar(command);
@@ -1993,10 +2010,10 @@ namespace ASCOM.Meade.net
         {
             get
             {
-                if (_targetRightAscension == InvalidParameter)
+                if (_targetRightAscension.Equals(InvalidParameter))
                     throw new InvalidOperationException("Target not set");
 
-                //var result = SerialPort.CommandTerminated(":Gr#", "#");
+                //var result = SerialPort.CommandTerminated("#:Gr#", "#");
                 ////:Gr# Get current/target object RA
                 ////Returns: HH: MM.T# or HH:MM:SS
                 ////Depending upon which precision is set for the telescope
@@ -2020,7 +2037,7 @@ namespace ASCOM.Meade.net
                 //todo implement the low precision version
 
                 var hms = _utilities.HoursToHMS(value, ":", ":", ":", 2);
-                var response = _sharedResourcesWrapper.SendChar($":Sr{hms}#");
+                var response = _sharedResourcesWrapper.SendChar($"#:Sr{hms}#");
                 //:SrHH:MM.T#
                 //:SrHH:MM:SS#
                 //Set target object RA to HH:MM.T or HH: MM: SS depending on the current precision setting.
@@ -2058,7 +2075,7 @@ namespace ASCOM.Meade.net
             get
             {
                 //todo implement this with the GW command
-                //var result = SerialPort.CommandTerminated(":GT#", "#");
+                //var result = SerialPort.CommandTerminated("#:GT#", "#");
 
                 //double rate = double.Parse(result);
 
@@ -2080,17 +2097,17 @@ namespace ASCOM.Meade.net
                 switch (value)
                 {
                     case DriveRates.driveSidereal:
-                        _sharedResourcesWrapper.SendBlind(":TQ#");
+                        _sharedResourcesWrapper.SendBlind("#:TQ#");
                         //:TQ# Selects sidereal tracking rate
                         //Returns: Nothing
                         break;
                     case DriveRates.driveLunar:
-                        _sharedResourcesWrapper.SendBlind(":TL#");
+                        _sharedResourcesWrapper.SendBlind("#:TL#");
                         //:TL# Set Lunar Tracking Rage
                         //Returns: Nothing
                         break;
                     //case DriveRates.driveSolar:
-                    //    SerialPort.Command(":TS#");
+                    //    SerialPort.Command("#:TS#");
                     //    //:TS# Select Solar tracking rate. [LS Only]
                     //    //Returns: Nothing
                     //    break;
@@ -2122,7 +2139,7 @@ namespace ASCOM.Meade.net
 
         private TimeSpan GetUtcCorrection()
         {
-            string utcOffSet = _sharedResourcesWrapper.SendString(":GG#");
+            string utcOffSet = _sharedResourcesWrapper.SendString("#:GG#");
             //:GG# Get UTC offset time
             //Returns: sHH# or sHH.H#
             //The number of decimal hours to add to local time to convert it to UTC. If the number is a whole number the
@@ -2151,11 +2168,11 @@ namespace ASCOM.Meade.net
                 {
                     var tdd = new TelescopeDateDetails
                     {
-                        TelescopeDate = _sharedResourcesWrapper.SendString(":GC#"),
+                        TelescopeDate = _sharedResourcesWrapper.SendString("#:GC#"),
                         //:GC# Get current date.
                         //Returns: MM/DD/YY#
                         //The current local calendar date for the telescope.
-                        TelescopeTime = _sharedResourcesWrapper.SendString(":GL#"),
+                        TelescopeTime = _sharedResourcesWrapper.SendString("#:GL#"),
                         //:GL# Get Local Time in 24 hour format
                         //Returns: HH:MM:SS#
                         //The Local Time in 24 - hour Format
@@ -2196,7 +2213,7 @@ namespace ASCOM.Meade.net
                     var utcCorrection = GetUtcCorrection();
                     var localDateTime = value - utcCorrection;
 
-                    string localStingCommand = $":SL{localDateTime:HH:mm:ss}#";
+                    string localStingCommand = $"#:SL{localDateTime:HH:mm:ss}#";
                     var timeResult = _sharedResourcesWrapper.SendChar(localStingCommand);
                     //:SLHH:MM:SS#
                     //Set the local Time
@@ -2208,7 +2225,7 @@ namespace ASCOM.Meade.net
                         throw new InvalidOperationException("Failed to set local time");
                     }
 
-                    string localDateCommand = $":SC{localDateTime:MM/dd/yy}#";
+                    string localDateCommand = $"#:SC{localDateTime:MM/dd/yy}#";
                     var dateResult = _sharedResourcesWrapper.SendChar(localDateCommand);
                     //:SCMM/DD/YY#
                     //Change Handbox Date to MM/DD/YY
@@ -2242,6 +2259,13 @@ namespace ASCOM.Meade.net
 
         #region ASCOM Registration
 
+        private static IProfileFactory _profileFactory;
+        public static IProfileFactory ProfileFactory
+        {
+            get => _profileFactory ?? (_profileFactory = new ProfileFactory());
+            set => _profileFactory = value;
+        }
+
         // Register or unregister driver for ASCOM. This is harmless if already
         // registered or unregistered. 
         //
@@ -2252,7 +2276,7 @@ namespace ASCOM.Meade.net
         /// <param name="bRegister">If <c>true</c>, registers the driver, otherwise unregisters it.</param>
         private static void RegUnregAscom(bool bRegister)
         {
-            using (var p = new Profile())
+            using (IProfileWrapper p = ProfileFactory.Create())
             {
                 p.DeviceType = "Telescope";
                 if (bRegister)
diff --git a/Meade.net.Telescope/app.config b/Meade.net.Telescope/app.config
index 762f9a3..66e0395 100644
--- a/Meade.net.Telescope/app.config
+++ b/Meade.net.Telescope/app.config
@@ -5,4 +5,4 @@
             <section name="ASCOM.DeviceName.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
         </sectionGroup>
     </configSections>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/Meade.net.UnitTests/BootstrapAscomProfileStore.ps1 b/Meade.net.UnitTests/BootstrapAscomProfileStore.ps1
new file mode 100644
index 0000000..213c64d
--- /dev/null
+++ b/Meade.net.UnitTests/BootstrapAscomProfileStore.ps1
@@ -0,0 +1,36 @@
+<#
+This script initializes a bare minimum set of registry entries required for ASCOM.Utilities.Profile to work
+without throwing any exceptions. When building on a build server, or on a computer without the ASCOM Platform installed,
+it may be useful to execute this script as a build step prior to running any unit tests, or calling any code that relies on
+ASCOM.Utilities.Profile. The alternative is to install the ASCOM Platform on the build agent.
+
+NOTE: This script equires elevated permissions because it creates registry keys in the LocalMachine hive.
+#>
+
+$wow = Test-Path HKLM:\SOFTWARE\Wow6432Node
+if ($wow)
+    {
+    $root = "HKLM:\SOFTWARE\Wow6432Node"
+    }
+else
+    {
+    $root = "HKLM:\SOFTWARE"
+    }
+$ascomRoot = $root + "\ASCOM"
+
+if (Test-Path $ascomRoot) 
+    {
+    <# Don't upset an already-existing ASCOM registry #>
+    exit
+    }
+
+<# Create the ASCOM root key and set it's ACL to allow all users read/write access #>
+New-Item -Path $root -Name ASCOM –Force
+$ascomAcl = Get-Acl $ascomRoot
+$aclRule = New-Object System.Security.AccessControl.RegistryAccessRule ("Users","FullControl","Allow")
+$ascomAcl.SetAccessRule($aclRule)
+$ascomAcl | Set-Acl -Path $ascomRoot
+
+<# Now create the bare minimum keys required so that ASCOM.Utilities.Profile doesn't crash and burn #>
+New-ItemProperty -Path $ascomRoot -Name PlatformVersion -Value "6.1" -PropertyType String –Force
+New-ItemProperty -Path $ascomRoot -Name SerTraceFile -Value "C:\SerialTraceAuto.txt" -PropertyType String –Force
diff --git a/Meade.net.UnitTests/Meade.net.UnitTests.csproj b/Meade.net.UnitTests/Meade.net.UnitTests.csproj
new file mode 100644
index 0000000..1889ad4
--- /dev/null
+++ b/Meade.net.UnitTests/Meade.net.UnitTests.csproj
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" />
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{21EF28B4-D574-4A2D-A61D-5DF96AF46AB2}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Meade.net.UnitTests</RootNamespace>
+    <AssemblyName>Meade.net.UnitTests</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <Deterministic>true</Deterministic>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="ASCOM.Astrometry, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
+      <HintPath>..\packages\ASCOM.Platform.6.4.2\lib\net40\ASCOM.Astrometry.dll</HintPath>
+    </Reference>
+    <Reference Include="ASCOM.Attributes, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
+      <HintPath>..\packages\ASCOM.Platform.6.4.2\lib\net40\ASCOM.Attributes.dll</HintPath>
+    </Reference>
+    <Reference Include="ASCOM.Cache, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
+      <HintPath>..\packages\ASCOM.Platform.6.4.2\lib\net40\ASCOM.Cache.dll</HintPath>
+    </Reference>
+    <Reference Include="ASCOM.Controls, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
+      <HintPath>..\packages\ASCOM.Platform.6.4.2\lib\net40\ASCOM.Controls.dll</HintPath>
+    </Reference>
+    <Reference Include="ASCOM.DeviceInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
+      <HintPath>..\packages\ASCOM.Platform.6.4.2\lib\net40\ASCOM.DeviceInterfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="ASCOM.DriverAccess, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
+      <HintPath>..\packages\ASCOM.Platform.6.4.2\lib\net40\ASCOM.DriverAccess.dll</HintPath>
+    </Reference>
+    <Reference Include="ASCOM.Exceptions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
+      <HintPath>..\packages\ASCOM.Platform.6.4.2\lib\net40\ASCOM.Exceptions.dll</HintPath>
+    </Reference>
+    <Reference Include="ASCOM.Internal.Extensions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
+      <HintPath>..\packages\ASCOM.Platform.6.4.2\lib\net40\ASCOM.Internal.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="ASCOM.SettingsProvider, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
+      <HintPath>..\packages\ASCOM.Platform.6.4.2\lib\net40\ASCOM.SettingsProvider.dll</HintPath>
+    </Reference>
+    <Reference Include="ASCOM.Utilities, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
+      <HintPath>..\packages\ASCOM.Platform.6.4.2\lib\net40\ASCOM.Utilities.dll</HintPath>
+    </Reference>
+    <Reference Include="ASCOM.Utilities.Video, Version=6.1.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
+      <HintPath>..\packages\ASCOM.Platform.6.4.2\lib\net40\ASCOM.Utilities.Video.dll</HintPath>
+    </Reference>
+    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Moq, Version=4.13.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.13.0\lib\net45\Moq.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="SharedResourcesUnitTests.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Meade.net\Meade.net.csproj">
+      <Project>{3689a2cb-94c5-4012-a5cf-7e7d1dd27143}</Project>
+      <Name>Meade.net</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="BootstrapAscomProfileStore.ps1" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.props'))" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/Meade.net.UnitTests/Properties/AssemblyInfo.cs b/Meade.net.UnitTests/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..b8cda0e
--- /dev/null
+++ b/Meade.net.UnitTests/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Meade.net.UnitTests")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Meade.net.UnitTests")]
+[assembly: AssemblyCopyright("Copyright ©  2019")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("21ef28b4-d574-4a2d-a61d-5df96af46ab2")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Meade.net.UnitTests/SharedResourcesUnitTests.cs b/Meade.net.UnitTests/SharedResourcesUnitTests.cs
new file mode 100644
index 0000000..1551ad2
--- /dev/null
+++ b/Meade.net.UnitTests/SharedResourcesUnitTests.cs
@@ -0,0 +1,302 @@
+
+using System;
+using System.Globalization;
+using ASCOM.Meade.net;
+using ASCOM.Meade.net.Wrapper;
+using ASCOM.Utilities.Interfaces;
+using Moq;
+using NUnit.Framework;
+
+namespace Meade.net.UnitTests
+{
+    [TestFixture]
+    public class SharedResourcesUnitTests
+    {
+        private Mock<ISerial> _serialMock;
+
+        [SetUp]
+        public void Setup()
+        {
+            _serialMock = new Mock<ISerial>();
+            _serialMock.SetupAllProperties();
+
+            SharedResources.SharedSerial = _serialMock.Object;
+        }
+
+        [Test]
+        public void CheckThatSerialPortIsSetToUseMock()
+        {
+            Assert.That(SharedResources.SharedSerial,Is.EqualTo(_serialMock.Object));
+        }
+
+        [Test]
+        public void SendBlind_WhenCalled_Then_ClearsBuffersAndSendsMessage()
+        {
+            var expectedMessage = "Test";
+
+            SharedResources.SendBlind(expectedMessage);
+
+            _serialMock.Verify(x=> x.ClearBuffers(), Times.Once);
+            _serialMock.Verify(x=>x.Transmit(expectedMessage), Times.Once);
+        }
+
+        [Test]
+        public void SendChar_WhenCalled_ThenSendsMessageAndReadsExpectedNumberOfCharacters()
+        {
+            var expectedMessage = "Test";
+            var expectedResult = "A";
+
+            _serialMock.Setup(x => x.ReceiveCounted(1)).Returns(expectedResult);
+
+            var result = SharedResources.SendChar(expectedMessage);
+
+            _serialMock.Verify(x => x.ClearBuffers(), Times.Once);
+            _serialMock.Verify(x => x.Transmit(expectedMessage), Times.Once);
+            _serialMock.Verify(x => x.ReceiveCounted(1), Times.Once);
+            Assert.That(result, Is.EqualTo(expectedResult));
+        }
+
+        [Test]
+        public void SendString_WhenCalled_ThenSendsMessageAndReadsResultUntilTerminatorFound()
+        {
+            var expectedMessage = "Test";
+            var expectedResult = "TestMessage#";
+
+            _serialMock.Setup(x => x.ReceiveTerminated("#")).Returns(expectedResult);
+
+            var result = SharedResources.SendString(expectedMessage);
+
+            _serialMock.Verify(x => x.ClearBuffers(), Times.Once);
+            _serialMock.Verify(x => x.Transmit(expectedMessage), Times.Once);
+            _serialMock.Verify(x => x.ReceiveTerminated("#"), Times.Once);
+            Assert.That(result, Is.EqualTo(expectedResult.TrimEnd('#')));
+        }
+
+        [Test]
+        public void ReadTerminated_WhenCalled_ThenReadsResultUntilTerminatorFound()
+        {
+            var expectedResult = "TestMessage#";
+
+            _serialMock.Setup(x => x.ReceiveTerminated("#")).Returns(expectedResult);
+
+            var result = SharedResources.ReadTerminated();
+
+            _serialMock.Verify(x => x.ReceiveTerminated("#"), Times.Once);
+            Assert.That(result, Is.EqualTo(expectedResult));
+        }
+
+        [Test]
+        public void ReadCharacters_WhenCalled_ThenReadsSpecificNumberOfCharacters()
+        {
+            var numberOfCharacters = 5;
+
+            SharedResources.ReadCharacters(numberOfCharacters);
+
+            _serialMock.Verify(x => x.ReceiveCounted(numberOfCharacters), Times.Once);
+        }
+
+        [Test]
+        public void WriteProfile_WhenCalled_WritesExpectedProfileSettings()
+        {
+            string DriverId = "ASCOM.MeadeGeneric.Telescope";
+
+            Mock<IProfileWrapper> profileWrapperMock = new Mock<IProfileWrapper>();
+            profileWrapperMock.SetupAllProperties();
+
+            IProfileWrapper profeWrapper = profileWrapperMock.Object;
+
+            Mock<IProfileFactory> profileFactoryMock = new Mock<IProfileFactory>();
+            profileFactoryMock.Setup(x => x.Create()).Returns(profileWrapperMock.Object);
+
+            SharedResources.ProfileFactory = profileFactoryMock.Object;
+
+            var profileProperties = new ProfileProperties
+            {
+                TraceLogger = false,
+                ComPort = "TestComPort"
+            };
+
+            SharedResources.WriteProfile(profileProperties);
+
+            Assert.That(profeWrapper.DeviceType, Is.EqualTo("Telescope"));
+            profileWrapperMock.Verify( x => x.WriteValue(DriverId, "Trace Level", profileProperties.TraceLogger.ToString()), Times.Once);
+            profileWrapperMock.Verify(x => x.WriteValue(DriverId, "COM Port", profileProperties.ComPort), Times.Once);
+            profileWrapperMock.Verify(x => x.WriteValue(DriverId, "Guide Rate Arc Seconds Per Second", profileProperties.GuideRateArcSecondsPerSecond.ToString(CultureInfo.CurrentCulture)), Times.Once);
+            profileWrapperMock.Verify(x => x.WriteValue(DriverId, "Precision", profileProperties.Precision), Times.Once);
+        }
+
+        [Test]
+        public void ReadProfile_WhenCalled_ReturnsExpectedDefaultValues()
+        {
+            string DriverId = "ASCOM.MeadeGeneric.Telescope";
+
+            string ComPortDefault = "COM1";
+            string TraceStateDefault = "false";
+            string GuideRateProfileNameDefault = "10.077939"; //67% of sidereal rate
+            string PrecisionDefault = "Unchanged";
+
+            Mock<IProfileWrapper> profileWrapperMock = new Mock<IProfileWrapper>();
+            profileWrapperMock.SetupAllProperties();
+
+            profileWrapperMock.Setup(x => x.GetValue(DriverId, "Trace Level", string.Empty, TraceStateDefault))
+                .Returns(TraceStateDefault);
+            profileWrapperMock.Setup(x => x.GetValue(DriverId, "COM Port", string.Empty, ComPortDefault))
+                .Returns(ComPortDefault);
+            profileWrapperMock
+                .Setup(x => x.GetValue(DriverId, "Guide Rate Arc Seconds Per Second", string.Empty,
+                    GuideRateProfileNameDefault)).Returns(GuideRateProfileNameDefault);
+            profileWrapperMock.Setup(x => x.GetValue(DriverId, "Precision", string.Empty, PrecisionDefault))
+                .Returns(PrecisionDefault);
+
+            IProfileWrapper profeWrapper = profileWrapperMock.Object;
+
+            Mock<IProfileFactory> profileFactoryMock = new Mock<IProfileFactory>();
+            profileFactoryMock.Setup(x => x.Create()).Returns(profileWrapperMock.Object);
+
+            SharedResources.ProfileFactory = profileFactoryMock.Object;
+
+            var profileProperties = SharedResources.ReadProfile();
+
+            Assert.That(profeWrapper.DeviceType, Is.EqualTo("Telescope"));
+            Assert.That(profileProperties.ComPort, Is.EqualTo(ComPortDefault));
+            Assert.That(profileProperties.GuideRateArcSecondsPerSecond,
+                Is.EqualTo(double.Parse(GuideRateProfileNameDefault)));
+            Assert.That(profileProperties.TraceLogger, Is.EqualTo(bool.Parse(TraceStateDefault)));
+            Assert.That(profileProperties.Precision, Is.EqualTo(PrecisionDefault));
+        }
+
+        [TestCase("TCP")]
+        [TestCase("Carrier Pigeon")]
+        public void Connect_WhenDeviceIdIsNotSerial_ThenThrowsException( string deviceId)
+        {
+            var result = Assert.Throws<ArgumentException>( () => { SharedResources.Connect(deviceId, string.Empty); } );
+
+            Assert.That( result.Message, Is.EqualTo($"deviceId {deviceId} not currently supported") );
+        }
+
+        [Test]
+        public void Connect_WhenDeviceIdIsSerialButGVPEchos_ThenThrowsException()
+        {
+            string deviceId = "Serial";
+
+            string driverDriverId = "ASCOM.MeadeGeneric.Telescope";
+
+            string ComPortDefault = "COM1";
+            string TraceStateDefault = "false";
+            string GuideRateProfileNameDefault = "10.077939"; //67% of sidereal rate
+            string PrecisionDefault = "Unchanged";
+
+            Mock<IProfileWrapper> profileWrapperMock = new Mock<IProfileWrapper>();
+            profileWrapperMock.SetupAllProperties();
+
+            profileWrapperMock.Setup(x => x.GetValue(driverDriverId, "Trace Level", string.Empty, TraceStateDefault))
+                .Returns(TraceStateDefault);
+            profileWrapperMock.Setup(x => x.GetValue(driverDriverId, "COM Port", string.Empty, ComPortDefault))
+                .Returns(ComPortDefault);
+            profileWrapperMock
+                .Setup(x => x.GetValue(driverDriverId, "Guide Rate Arc Seconds Per Second", string.Empty,
+                    GuideRateProfileNameDefault)).Returns(GuideRateProfileNameDefault);
+            profileWrapperMock.Setup(x => x.GetValue(driverDriverId, "Precision", string.Empty, PrecisionDefault))
+                .Returns(PrecisionDefault);
+
+            Mock<IProfileFactory> profileFactoryMock = new Mock<IProfileFactory>();
+            profileFactoryMock.Setup(x => x.Create()).Returns(profileWrapperMock.Object);
+
+            SharedResources.ProfileFactory = profileFactoryMock.Object;
+
+            string serialPortReturn = string.Empty;
+
+            _serialMock.Setup(x => x.Transmit(":GVP#")).Callback(() => { serialPortReturn = ":GVP#"; });
+            _serialMock.Setup(x => x.ReceiveTerminated("#")).Returns( () => serialPortReturn);
+
+            var result = Assert.Throws<Exception>(() => { SharedResources.Connect(deviceId, string.Empty); });
+            Assert.That(result.Message, Is.EqualTo("Serial port is looping back data, something is wrong with the hardware."));
+        }
+
+        [Test]
+        public void Connect_WhenDeviceIdIsSerialButGVPNotSupported_ThenConnectsAndSetsProductToLX200Classic()
+        {
+            string deviceId = "Serial";
+
+            string driverDriverId = "ASCOM.MeadeGeneric.Telescope";
+
+            string ComPortDefault = "COM1";
+            string TraceStateDefault = "false";
+            string GuideRateProfileNameDefault = "10.077939"; //67% of sidereal rate
+            string PrecisionDefault = "Unchanged";
+
+            Mock<IProfileWrapper> profileWrapperMock = new Mock<IProfileWrapper>();
+            profileWrapperMock.SetupAllProperties();
+
+            profileWrapperMock.Setup(x => x.GetValue(driverDriverId, "Trace Level", string.Empty, TraceStateDefault))
+                .Returns(TraceStateDefault);
+            profileWrapperMock.Setup(x => x.GetValue(driverDriverId, "COM Port", string.Empty, ComPortDefault))
+                .Returns(ComPortDefault);
+            profileWrapperMock
+                .Setup(x => x.GetValue(driverDriverId, "Guide Rate Arc Seconds Per Second", string.Empty,
+                    GuideRateProfileNameDefault)).Returns(GuideRateProfileNameDefault);
+            profileWrapperMock.Setup(x => x.GetValue(driverDriverId, "Precision", string.Empty, PrecisionDefault))
+                .Returns(PrecisionDefault);
+
+            Mock<IProfileFactory> profileFactoryMock = new Mock<IProfileFactory>();
+            profileFactoryMock.Setup(x => x.Create()).Returns(profileWrapperMock.Object);
+
+            SharedResources.ProfileFactory = profileFactoryMock.Object;
+
+            _serialMock.Setup(x => x.Transmit(":GVP#")).Callback(() => {  });
+            _serialMock.Setup(x => x.ReceiveTerminated("#")).Returns(() => throw new Exception("Testerror"));
+
+            var connectionResult = SharedResources.Connect(deviceId, string.Empty);
+            
+            Assert.That(connectionResult.SameDevice, Is.EqualTo(1));
+            Assert.That(SharedResources.ProductName, Is.EqualTo(TelescopeList.LX200CLASSIC));
+
+            SharedResources.Disconnect(deviceId, String.Empty);
+        }
+
+        [Test]
+        public void Connect_WhenDeviceIdIsSerialButGVPIsAutostar_ThenConnectsAndSetsProductToAutostarAndFirmware()
+        {
+            string deviceId = "Serial";
+
+            string driverDriverId = "ASCOM.MeadeGeneric.Telescope";
+
+            string ComPortDefault = "COM1";
+            string TraceStateDefault = "false";
+            string GuideRateProfileNameDefault = "10.077939"; //67% of sidereal rate
+            string PrecisionDefault = "Unchanged";
+
+            Mock<IProfileWrapper> profileWrapperMock = new Mock<IProfileWrapper>();
+            profileWrapperMock.SetupAllProperties();
+
+            profileWrapperMock.Setup(x => x.GetValue(driverDriverId, "Trace Level", string.Empty, TraceStateDefault))
+                .Returns(TraceStateDefault);
+            profileWrapperMock.Setup(x => x.GetValue(driverDriverId, "COM Port", string.Empty, ComPortDefault))
+                .Returns(ComPortDefault);
+            profileWrapperMock
+                .Setup(x => x.GetValue(driverDriverId, "Guide Rate Arc Seconds Per Second", string.Empty,
+                    GuideRateProfileNameDefault)).Returns(GuideRateProfileNameDefault);
+            profileWrapperMock.Setup(x => x.GetValue(driverDriverId, "Precision", string.Empty, PrecisionDefault))
+                .Returns(PrecisionDefault);
+
+            Mock<IProfileFactory> profileFactoryMock = new Mock<IProfileFactory>();
+            profileFactoryMock.Setup(x => x.Create()).Returns(profileWrapperMock.Object);
+
+            SharedResources.ProfileFactory = profileFactoryMock.Object;
+
+            string serialPortReturn = string.Empty;
+
+            _serialMock.Setup(x => x.Transmit(":GVP#")).Callback(() => { serialPortReturn = TelescopeList.Autostar497; });
+            _serialMock.Setup(x => x.Transmit(":GVN#")).Callback(() => { serialPortReturn = TelescopeList.Autostar497_43Eg; });
+            _serialMock.Setup(x => x.ReceiveTerminated("#")).Returns(() => serialPortReturn);
+
+            var connectionResult = SharedResources.Connect(deviceId, string.Empty);
+
+            Assert.That(connectionResult.SameDevice, Is.EqualTo(1));
+            Assert.That(SharedResources.ProductName, Is.EqualTo(TelescopeList.Autostar497));
+            Assert.That(SharedResources.FirmwareVersion, Is.EqualTo(TelescopeList.Autostar497_43Eg));
+
+            SharedResources.Disconnect(deviceId, String.Empty);
+        }
+    }
+}
diff --git a/Meade.net.UnitTests/app.config b/Meade.net.UnitTests/app.config
new file mode 100644
index 0000000..319783c
--- /dev/null
+++ b/Meade.net.UnitTests/app.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/Meade.net.UnitTests/packages.config b/Meade.net.UnitTests/packages.config
new file mode 100644
index 0000000..cad1be5
--- /dev/null
+++ b/Meade.net.UnitTests/packages.config
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="ASCOM.Platform" version="6.4.2" targetFramework="net472" />
+  <package id="Castle.Core" version="4.4.0" targetFramework="net472" />
+  <package id="Moq" version="4.13.0" targetFramework="net472" />
+  <package id="NUnit" version="3.12.0" targetFramework="net472" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.6.0" targetFramework="net472" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.3" targetFramework="net472" />
+</packages>
\ No newline at end of file
diff --git a/Meade.net.focuser/Focuser.cs b/Meade.net.focuser/Focuser.cs
index e61be5d..51787bf 100644
--- a/Meade.net.focuser/Focuser.cs
+++ b/Meade.net.focuser/Focuser.cs
@@ -365,7 +365,7 @@ namespace ASCOM.Meade.net
         {
             _sharedResourcesWrapper.Lock(() =>
             {
-                //_sharedResourcesWrapper.SendBlind(":FF#");
+                //_sharedResourcesWrapper.SendBlind("#:FF#");
                 //:FF# Set Focus speed to fastest setting
                 //Returns: Nothing
 
@@ -382,7 +382,7 @@ namespace ASCOM.Meade.net
                 Stopwatch stopwatch = Stopwatch.StartNew();
                 while (stopwatch.ElapsedMilliseconds < steps)
                 {
-                    _sharedResourcesWrapper.SendBlind(directionOut ? ":F+#" : ":F-#");
+                    _sharedResourcesWrapper.SendBlind(directionOut ? "#:F+#" : "#:F-#");
                     //:F+# Start Focuser moving inward (toward objective)
                     //Returns: None
 
@@ -451,6 +451,13 @@ namespace ASCOM.Meade.net
 
         #region ASCOM Registration
 
+        private static IProfileFactory _profileFactory;
+        public static IProfileFactory ProfileFactory
+        {
+            get => _profileFactory ?? (_profileFactory = new ProfileFactory());
+            set => _profileFactory = value;
+        }
+
         // Register or unregister driver for ASCOM. This is harmless if already
         // registered or unregistered. 
         //
@@ -461,7 +468,7 @@ namespace ASCOM.Meade.net
         /// <param name="bRegister">If <c>true</c>, registers the driver, otherwise unregisters it.</param>
         private static void RegUnregAscom(bool bRegister)
         {
-            using (var p = new Profile())
+            using (IProfileWrapper p = ProfileFactory.Create())
             {
                 p.DeviceType = "Focuser";
                 if (bRegister)
diff --git a/Meade.net.focuser/Meade.net.focuser.csproj b/Meade.net.focuser/Meade.net.focuser.csproj
index 55eeca3..1074681 100644
--- a/Meade.net.focuser/Meade.net.focuser.csproj
+++ b/Meade.net.focuser/Meade.net.focuser.csproj
@@ -15,7 +15,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>3.5</OldToolsVersion>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <ApplicationIcon>ASCOM.ico</ApplicationIcon>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>ASCOMDriverTemplate.snk</AssemblyOriginatorKeyFile>
@@ -69,6 +69,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>..\bin\Release\</OutputPath>
@@ -78,6 +79,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="ASCOM.Astrometry, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
diff --git a/Meade.net.focuser/Properties/Resources.Designer.cs b/Meade.net.focuser/Properties/Resources.Designer.cs
index 80e9977..7df2b0c 100644
--- a/Meade.net.focuser/Properties/Resources.Designer.cs
+++ b/Meade.net.focuser/Properties/Resources.Designer.cs
@@ -8,16 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-using System.CodeDom.Compiler;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Drawing;
-using System.Globalization;
-using System.Resources;
-using System.Runtime.CompilerServices;
-
 namespace ASCOM.Meade.net.Properties {
+    using System;
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -25,27 +19,27 @@ namespace ASCOM.Meade.net.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [GeneratedCode("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
-    [DebuggerNonUserCode()]
-    [CompilerGenerated()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
         
-        private static ResourceManager resourceMan;
+        private static global::System.Resources.ResourceManager resourceMan;
         
-        private static CultureInfo resourceCulture;
+        private static global::System.Globalization.CultureInfo resourceCulture;
         
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
         internal Resources() {
         }
         
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Advanced)]
-        internal static ResourceManager ResourceManager {
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
             get {
-                if (ReferenceEquals(resourceMan, null)) {
-                    ResourceManager temp = new ResourceManager("ASCOM.Meade.net.Properties.Resources", typeof(Resources).Assembly);
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ASCOM.Meade.net.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
@@ -56,8 +50,8 @@ namespace ASCOM.Meade.net.Properties {
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Advanced)]
-        internal static CultureInfo Culture {
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
             get {
                 return resourceCulture;
             }
@@ -69,20 +63,20 @@ namespace ASCOM.Meade.net.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static Bitmap ASCOM {
+        internal static System.Drawing.Bitmap ASCOM {
             get {
                 object obj = ResourceManager.GetObject("ASCOM", resourceCulture);
-                return ((Bitmap)(obj));
+                return ((System.Drawing.Bitmap)(obj));
             }
         }
         
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
         /// </summary>
-        internal static Icon DefaultIcon {
+        internal static System.Drawing.Icon DefaultIcon {
             get {
                 object obj = ResourceManager.GetObject("DefaultIcon", resourceCulture);
-                return ((Icon)(obj));
+                return ((System.Drawing.Icon)(obj));
             }
         }
     }
diff --git a/Meade.net.focuser/Properties/Settings.Designer.cs b/Meade.net.focuser/Properties/Settings.Designer.cs
index 81d4ba1..67ea42d 100644
--- a/Meade.net.focuser/Properties/Settings.Designer.cs
+++ b/Meade.net.focuser/Properties/Settings.Designer.cs
@@ -8,18 +8,14 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-using System.CodeDom.Compiler;
-using System.Configuration;
-using System.Runtime.CompilerServices;
-
 namespace ASCOM.Meade.net.Properties {
     
     
-    [CompilerGenerated()]
-    [GeneratedCode("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.0.0.0")]
-    internal sealed partial class Settings : ApplicationSettingsBase {
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
-        private static Settings defaultInstance = ((Settings)(Synchronized(new Settings())));
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
         
         public static Settings Default {
             get {
diff --git a/Meade.net.focuser/app.config b/Meade.net.focuser/app.config
index 762f9a3..66e0395 100644
--- a/Meade.net.focuser/app.config
+++ b/Meade.net.focuser/app.config
@@ -5,4 +5,4 @@
             <section name="ASCOM.DeviceName.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
         </sectionGroup>
     </configSections>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/Meade.net.sln b/Meade.net.sln
index 7cf5f7f..25d344c 100644
--- a/Meade.net.sln
+++ b/Meade.net.sln
@@ -25,6 +25,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Meade.net.Telescope.UnitTes
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Meade.net.Focuser.UnitTests", "Meade.net.Focuser.UnitTests\Meade.net.Focuser.UnitTests.csproj", "{A3991FA7-23C3-405A-96F9-5AB03AC58F30}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Meade.net.UnitTests", "Meade.net.UnitTests\Meade.net.UnitTests.csproj", "{21EF28B4-D574-4A2D-A61D-5DF96AF46AB2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -137,6 +139,18 @@ Global
 		{A3991FA7-23C3-405A-96F9-5AB03AC58F30}.Release|x64.Build.0 = Release|Any CPU
 		{A3991FA7-23C3-405A-96F9-5AB03AC58F30}.Release|x86.ActiveCfg = Release|Any CPU
 		{A3991FA7-23C3-405A-96F9-5AB03AC58F30}.Release|x86.Build.0 = Release|Any CPU
+		{21EF28B4-D574-4A2D-A61D-5DF96AF46AB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{21EF28B4-D574-4A2D-A61D-5DF96AF46AB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21EF28B4-D574-4A2D-A61D-5DF96AF46AB2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{21EF28B4-D574-4A2D-A61D-5DF96AF46AB2}.Debug|x64.Build.0 = Debug|Any CPU
+		{21EF28B4-D574-4A2D-A61D-5DF96AF46AB2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{21EF28B4-D574-4A2D-A61D-5DF96AF46AB2}.Debug|x86.Build.0 = Debug|Any CPU
+		{21EF28B4-D574-4A2D-A61D-5DF96AF46AB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{21EF28B4-D574-4A2D-A61D-5DF96AF46AB2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{21EF28B4-D574-4A2D-A61D-5DF96AF46AB2}.Release|x64.ActiveCfg = Release|Any CPU
+		{21EF28B4-D574-4A2D-A61D-5DF96AF46AB2}.Release|x64.Build.0 = Release|Any CPU
+		{21EF28B4-D574-4A2D-A61D-5DF96AF46AB2}.Release|x86.ActiveCfg = Release|Any CPU
+		{21EF28B4-D574-4A2D-A61D-5DF96AF46AB2}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -147,6 +161,7 @@ Global
 		{AD4959DD-33D7-4C3F-8DB0-7361D8E74A95} = {0958D817-269C-44BE-BEFB-F3E6A409DE91}
 		{B7EEEEFD-5BFF-443D-981C-7B8AB5DFDE33} = {0958D817-269C-44BE-BEFB-F3E6A409DE91}
 		{A3991FA7-23C3-405A-96F9-5AB03AC58F30} = {0958D817-269C-44BE-BEFB-F3E6A409DE91}
+		{21EF28B4-D574-4A2D-A61D-5DF96AF46AB2} = {0958D817-269C-44BE-BEFB-F3E6A409DE91}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3C0509DC-C7F5-48DC-920D-DCFD9C879BD2}
diff --git a/Meade.net.v3.ncrunchsolution b/Meade.net.v3.ncrunchsolution
index e4047c2..c8975a7 100644
--- a/Meade.net.v3.ncrunchsolution
+++ b/Meade.net.v3.ncrunchsolution
@@ -2,6 +2,10 @@
   <Settings>
     <AllowParallelTestExecution>True</AllowParallelTestExecution>
     <CopyReferencedAssembliesToWorkspace>True</CopyReferencedAssembliesToWorkspace>
+    <MetricsExclusionList>
+      <Value>FocuserTestConsole\FocuserTestConsole.csproj</Value>
+      <Value>TelescopeTestConsole\TelescopeTestConsole.csproj</Value>
+    </MetricsExclusionList>
     <SolutionConfigured>True</SolutionConfigured>
   </Settings>
 </SolutionConfiguration>
\ No newline at end of file
diff --git a/Meade.net.v3.ncrunchsolution.user b/Meade.net.v3.ncrunchsolution.user
index 24ce899..cd10274 100644
--- a/Meade.net.v3.ncrunchsolution.user
+++ b/Meade.net.v3.ncrunchsolution.user
@@ -11,6 +11,6 @@
       <ShowUnexecutedTestsMenuOption>true</ShowUnexecutedTestsMenuOption>
       <ShowIgnoredTestsMenuOption>false</ShowIgnoredTestsMenuOption>
     </TestsWindowMenuOptions>
-    <TestsWindowSplitterDistance>451</TestsWindowSplitterDistance>
+    <TestsWindowSplitterDistance>544</TestsWindowSplitterDistance>
   </Settings>
 </SolutionConfiguration>
\ No newline at end of file
diff --git a/Meade.net/ConnectionInfo.cs b/Meade.net/ConnectionInfo.cs
index 4da4c7f..3a4bcec 100644
--- a/Meade.net/ConnectionInfo.cs
+++ b/Meade.net/ConnectionInfo.cs
@@ -2,7 +2,7 @@ namespace ASCOM.Meade.net
 {
     public class ConnectionInfo
     {
-        public int Connections { get; set; }
+        //public int Connections { get; set; }
         public int SameDevice { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Meade.net/LocalServer.cs b/Meade.net/LocalServer.cs
index 0c70f53..e0916f4 100644
--- a/Meade.net/LocalServer.cs
+++ b/Meade.net/LocalServer.cs
@@ -173,8 +173,10 @@ namespace ASCOM.Meade.net
             _sComObjectTypes = new ArrayList();
 
             // put everything into one folder, the same as the server.
-            string assyPath = Assembly.GetEntryAssembly().Location;
+            string assyPath = Assembly.GetEntryAssembly()?.Location;
             assyPath = Path.GetDirectoryName(assyPath);
+            if (assyPath == null)
+                throw new System.InvalidOperationException();
 
             DirectoryInfo d = new DirectoryInfo(assyPath);
             foreach (FileInfo fi in d.GetFiles("*.dll"))
@@ -295,9 +297,9 @@ namespace ASCOM.Meade.net
                 //
                 using (RegistryKey key = Registry.ClassesRoot.CreateSubKey("APPID\\" + _sAppId))
                 {
-                    key.SetValue(null, assyDescription);
-                    key.SetValue("AppID", _sAppId);
-                    key.SetValue("AuthenticationLevel", 1, RegistryValueKind.DWord);
+                    key?.SetValue(null, assyDescription);
+                    key?.SetValue("AppID", _sAppId);
+                    key?.SetValue("AuthenticationLevel", 1, RegistryValueKind.DWord);
                 }
                 //
                 // HKCR\APPID\exename.ext
@@ -305,7 +307,7 @@ namespace ASCOM.Meade.net
                 using (RegistryKey key = Registry.ClassesRoot.CreateSubKey(
                     $"APPID\\{Application.ExecutablePath.Substring(Application.ExecutablePath.LastIndexOf('\\') + 1)}"))
                 {
-                    key.SetValue("AppID", _sAppId);
+                    key?.SetValue("AppID", _sAppId);
                 }
             }
             catch (Exception ex)
@@ -333,20 +335,20 @@ namespace ASCOM.Meade.net
 
                     using (RegistryKey key = Registry.ClassesRoot.CreateSubKey($"CLSID\\{clsid}"))
                     {
-                        key.SetValue(null, progid);						// Could be assyTitle/Desc??, but .NET components show ProgId here
-                        key.SetValue("AppId", _sAppId);
+                        key?.SetValue(null, progid);						// Could be assyTitle/Desc??, but .NET components show ProgId here
+                        key?.SetValue("AppId", _sAppId);
                         using (RegistryKey key2 = key.CreateSubKey("Implemented Categories"))
                         {
-                            key2.CreateSubKey("{62C8FE65-4EBB-45e7-B440-6E39B2CDBF29}");
+                            key2?.CreateSubKey("{62C8FE65-4EBB-45e7-B440-6E39B2CDBF29}");
                         }
                         using (RegistryKey key2 = key.CreateSubKey("ProgId"))
                         {
-                            key2.SetValue(null, progid);
+                            key2?.SetValue(null, progid);
                         }
                         key.CreateSubKey("Programmable");
                         using (RegistryKey key2 = key.CreateSubKey("LocalServer32"))
                         {
-                            key2.SetValue(null, Application.ExecutablePath);
+                            key2?.SetValue(null, Application.ExecutablePath);
                         }
                     }
                     //
@@ -354,10 +356,10 @@ namespace ASCOM.Meade.net
                     //
                     using (RegistryKey key = Registry.ClassesRoot.CreateSubKey(progid))
                     {
-                        key.SetValue(null, assyTitle);
+                        key?.SetValue(null, assyTitle);
                         using (RegistryKey key2 = key.CreateSubKey("CLSID"))
                         {
-                            key2.SetValue(null, clsid);
+                            key2?.SetValue(null, clsid);
                         }
                     }
                     //
diff --git a/Meade.net/Meade.net.csproj b/Meade.net/Meade.net.csproj
index 8156cd2..dbc67d3 100644
--- a/Meade.net/Meade.net.csproj
+++ b/Meade.net/Meade.net.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ASCOM.Meade.net</RootNamespace>
     <AssemblyName>ASCOM.Meade.net.Server</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>2.0</OldToolsVersion>
@@ -82,6 +82,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="ASCOM.Astrometry, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
@@ -133,10 +134,12 @@
     </Compile>
     <Compile Include="GarbageCollection.cs" />
     <Compile Include="LocalServer.cs" />
+    <Compile Include="ProfileFactory.cs" />
     <Compile Include="ProfileProperties.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TelescopeList.cs" />
     <Compile Include="Win32Utilities.cs" />
+    <Compile Include="Wrapper\IProfileWrapper.cs" />
     <Compile Include="Wrapper\SharedResourcesWrapper.cs" />
     <EmbeddedResource Include="frmMain.resx">
       <SubType>Designer</SubType>
diff --git a/Meade.net/ProfileFactory.cs b/Meade.net/ProfileFactory.cs
new file mode 100644
index 0000000..8302324
--- /dev/null
+++ b/Meade.net/ProfileFactory.cs
@@ -0,0 +1,17 @@
+using ASCOM.Meade.net.Wrapper;
+
+namespace ASCOM.Meade.net
+{
+    public interface IProfileFactory
+    {
+        IProfileWrapper Create();
+    }
+
+    public class ProfileFactory : IProfileFactory
+    {
+        public IProfileWrapper Create()
+        {
+            return new ProfileWrapper();
+        }
+    }
+}
diff --git a/Meade.net/SetupDialogForm.cs b/Meade.net/SetupDialogForm.cs
index 4067b83..0a26df9 100644
--- a/Meade.net/SetupDialogForm.cs
+++ b/Meade.net/SetupDialogForm.cs
@@ -3,6 +3,7 @@ using System.ComponentModel;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO.Ports;
+using System.Linq;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 using ASCOM.Meade.net.Properties;
@@ -54,8 +55,7 @@ namespace ASCOM.Meade.net
             chkTrace.Checked = profileProperties.TraceLogger;
             // set the list of com ports to those that are currently available
             comboBoxComPort.Items.Clear();
-            comboBoxComPort.Items.AddRange(SerialPort
-                .GetPortNames()); // use System.IO because it's static
+            comboBoxComPort.Items.AddRange(SerialPort.GetPortNames().ToArray<object>()); // use System.IO because it's static
             // select the current port if possible
             if (comboBoxComPort.Items.Contains(profileProperties.ComPort))
             {
diff --git a/Meade.net/SharedResources.cs b/Meade.net/SharedResources.cs
index d54274e..21ae49c 100644
--- a/Meade.net/SharedResources.cs
+++ b/Meade.net/SharedResources.cs
@@ -18,7 +18,9 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Windows.Forms;
+using ASCOM.Meade.net.Wrapper;
 using ASCOM.Utilities;
+using ASCOM.Utilities.Interfaces;
 
 namespace ASCOM.Meade.net
 {
@@ -36,7 +38,7 @@ namespace ASCOM.Meade.net
         private static readonly object LockObject = new object();
 
         // Shared serial port. This will allow multiple drivers to use one single serial port.
-        private static Serial _sSharedSerial; // Shared serial port
+        private static ISerial _sSharedSerial; // Shared serial port
 
         //
         // Public access to shared resources
@@ -59,9 +61,19 @@ namespace ASCOM.Meade.net
         //
 
         /// <summary>
-        /// Shared serial port
+        /// Shared serial port. Do not directly access this method.
         /// </summary>
-        private static Serial SharedSerial => _sSharedSerial ?? (_sSharedSerial = new Serial());
+        public static ISerial SharedSerial
+        {
+            get => _sSharedSerial ?? (_sSharedSerial = new Serial());
+            set => _sSharedSerial = value;
+        }
+
+        public static IProfileFactory ProfileFactory
+        {
+            get => _profileFactory ?? ( _profileFactory = new ProfileFactory());
+            set => _profileFactory = value;
+        }
 
         public static void SendBlind(string message)
         {
@@ -127,12 +139,12 @@ namespace ASCOM.Meade.net
         private const string TraceStateProfileName = "Trace Level";
         private const string GuideRateProfileName = "Guide Rate Arc Seconds Per Second";
         private const string PrecisionProfileName = "Precision";
-
+         
         public static void WriteProfile(ProfileProperties profileProperties)
         {
             lock (LockObject)
             {
-                using (Profile driverProfile = new Profile())
+                using (IProfileWrapper driverProfile = ProfileFactory.Create())
                 {
                     driverProfile.DeviceType = "Telescope";
                     driverProfile.WriteValue(DriverId, TraceStateProfileName, profileProperties.TraceLogger.ToString());
@@ -153,7 +165,7 @@ namespace ASCOM.Meade.net
             lock (LockObject)
             {
                 ProfileProperties profileProperties = new ProfileProperties();
-                using (Profile driverProfile = new Profile())
+                using (IProfileWrapper driverProfile = ProfileFactory.Create())
                 {
                     driverProfile.DeviceType = "Telescope";
                     profileProperties.ComPort = driverProfile.GetValue(DriverId, ComPortProfileName, string.Empty, ComPortDefault);
@@ -217,6 +229,7 @@ namespace ASCOM.Meade.net
         private static readonly Dictionary<string, DeviceHardware> ConnectedDevices = new Dictionary<string, DeviceHardware>();
 
         private static readonly Dictionary<string, DeviceHardware> ConnectedDeviceIds = new Dictionary<string, DeviceHardware>();
+        private static IProfileFactory _profileFactory ;
 
 
         /// <summary>
@@ -231,15 +244,13 @@ namespace ASCOM.Meade.net
             {
                 if (!ConnectedDevices.ContainsKey(deviceId))
                     ConnectedDevices.Add(deviceId, new DeviceHardware());
-                ConnectedDevices[deviceId].Count++; // increment the value
-
+                
                 if (!ConnectedDeviceIds.ContainsKey(driverId))
                     ConnectedDeviceIds.Add(driverId, new DeviceHardware());
-                ConnectedDeviceIds[driverId].Count++; // increment the value
 
                 if (deviceId == "Serial")
                 {
-                    if (ConnectedDevices[deviceId].Count == 1)
+                    if (ConnectedDevices[deviceId].Count == 0)
                     {
                         var profileProperties = ReadProfile();
                         SharedSerial.PortName = profileProperties.ComPort;
@@ -252,14 +263,35 @@ namespace ASCOM.Meade.net
                         SharedSerial.Handshake = SerialHandshake.None;
                         SharedSerial.Connected = true;
 
-                        ProductName = SendString(":GVP#");
-                        FirmwareVersion = SendString(":GVN#");
+                        try
+                        {
+                            ProductName = SendString(":GVP#");
+                            FirmwareVersion = SendString(":GVN#");
+                        }
+                        catch (Exception)
+                        {
+                            ProductName = TelescopeList.LX200CLASSIC;
+                            FirmwareVersion = "Unknown";
+                        }
+
+                        if (ProductName == ":GVP")
+                        {
+                            //This means that the serial port is looping back what's been sent, something is very wrong.
+                            SharedSerial.Connected = false;
+
+                            throw new Exception("Serial port is looping back data, something is wrong with the hardware.");
+                        }
                     }
                 }
+                else
+                    throw new ArgumentException($"deviceId {deviceId} not currently supported");
+
+                ConnectedDevices[deviceId].Count++; // increment the value
+                ConnectedDeviceIds[driverId].Count++; // increment the value
 
                 return new ConnectionInfo
                 {
-                    Connections = ConnectedDevices[deviceId].Count,
+                    //Connections = ConnectedDevices[deviceId].Count,
                     SameDevice = ConnectedDeviceIds[driverId].Count
                 };
             }
diff --git a/Meade.net/TelescopeList.cs b/Meade.net/TelescopeList.cs
index 5995983..61e4293 100644
--- a/Meade.net/TelescopeList.cs
+++ b/Meade.net/TelescopeList.cs
@@ -27,7 +27,7 @@
 
         #region LX200EMC
         // ReSharper disable once InconsistentNaming
-        public static readonly string LX200CLASSIC = ":GVP"; //GVP command is not supported!
+        public static readonly string LX200CLASSIC = "LX200 Classic"; //GVP command is not supported!
         #endregion
     }
 }
diff --git a/Meade.net/Wrapper/IProfileWrapper.cs b/Meade.net/Wrapper/IProfileWrapper.cs
new file mode 100644
index 0000000..ae9d434
--- /dev/null
+++ b/Meade.net/Wrapper/IProfileWrapper.cs
@@ -0,0 +1,139 @@
+using System;
+using System.Collections;
+using ASCOM.Utilities;
+using ASCOM.Utilities.Interfaces;
+
+namespace ASCOM.Meade.net.Wrapper
+{
+    public interface IProfileWrapper : IProfile, IProfileExtra, IDisposable
+    {
+
+    }
+
+    public class ProfileWrapper : IProfileWrapper
+    {
+        private readonly Profile _profile = new Profile();
+
+        public ArrayList RegisteredDevices(string deviceType)
+        {
+            return _profile.RegisteredDevices(deviceType);
+        }
+
+        public bool IsRegistered(string driverId)
+        {
+            return _profile.IsRegistered(driverId);
+        }
+
+        public void Register(string driverId, string descriptiveName)
+        {
+            _profile.Register(driverId, descriptiveName);
+        }
+
+        public void Unregister(string driverId)
+        {
+            _profile.Unregister(driverId);
+        }
+
+        public string GetValue(string driverId, string name, string subKey, string defaultValue)
+        {
+            return _profile.GetValue(driverId, name, subKey, defaultValue);
+        }
+
+        public void WriteValue(string driverId, string name, string value, string subKey)
+        {
+            _profile.WriteValue(driverId, name, value);
+        }
+
+        public ArrayList Values(string driverId, string subKey)
+        {
+            return _profile.Values(driverId, subKey);
+        }
+
+        public void DeleteValue(string driverId, string name, string subKey)
+        {
+            _profile.DeleteValue(driverId, name, subKey);
+        }
+
+        public void CreateSubKey(string driverId, string subKey)
+        {
+            _profile.CreateSubKey(driverId, subKey);
+        }
+
+        public ArrayList SubKeys(string driverId, string subKey)
+        {
+            return _profile.SubKeys(driverId, subKey);
+        }
+
+        public void DeleteSubKey(string driverId, string subKey)
+        {
+            _profile.DeleteSubKey(driverId, subKey);
+        }
+
+        public string GetProfileXML(string deviceId)
+        {
+            return _profile.GetProfileXML(deviceId);
+        }
+
+        public void SetProfileXML(string deviceId, string xml)
+        {
+            _profile.SetProfileXML(deviceId, xml);
+        }
+
+        public string DeviceType
+        {
+            get => _profile.DeviceType;
+            set => _profile.DeviceType = value;
+        }
+        public ArrayList RegisteredDeviceTypes => _profile.RegisteredDeviceTypes;
+
+        public void MigrateProfile(string currentPlatformVersion)
+        {
+            _profile.MigrateProfile(currentPlatformVersion);
+        }
+
+        public void DeleteValue(string driverId, string name)
+        {
+            _profile.DeleteValue(driverId, name);
+        }
+
+        public string GetValue(string driverId, string name)
+        {
+            return _profile.GetValue(driverId, name);
+        }
+
+        public string GetValue(string driverId, string name, string subKey)
+        {
+            return _profile.GetValue(driverId, name, subKey);
+        }
+
+        public ArrayList SubKeys(string driverId)
+        {
+            return _profile.SubKeys(driverId);
+        }
+
+        public ArrayList Values(string driverId)
+        {
+            return _profile.Values(driverId);
+        }
+
+        public void WriteValue(string driverId, string name, string value)
+        {
+            _profile.WriteValue(driverId, name, value);
+        }
+
+        public ASCOMProfile GetProfile(string driverId)
+        {
+            return _profile.GetProfile(driverId);
+        }
+
+        public void SetProfile(string driverId, ASCOMProfile xmlProfileKey)
+        {
+            _profile.SetProfile(driverId, xmlProfileKey);
+        }
+
+        public void Dispose()
+        {
+            _profile.Dispose();
+        }
+    }
+}
diff --git a/Meade.net/app.config b/Meade.net/app.config
index e365603..c5e1dae 100644
--- a/Meade.net/app.config
+++ b/Meade.net/app.config
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/TelescopeTestConsole/Program.cs b/TelescopeTestConsole/Program.cs
index 4ad640d..be621ea 100644
--- a/TelescopeTestConsole/Program.cs
+++ b/TelescopeTestConsole/Program.cs
@@ -9,26 +9,29 @@
 #define UseChooser
 
 using System;
+using System.Linq;
+using System.Threading;
+using ASCOM.DeviceInterface;
 using ASCOM.DriverAccess;
 
 namespace ASCOM.Meade.net
 {
-    class Program
+    public static class Program
     {
-        static void Main(string[] args)
+        public static void Main()
         {
             // Uncomment the code that's required
-#if UseChooser
+//#if UseChooser
             // choose the device
-            string id = Telescope.Choose("ASCOM.MeadeGeneric.Telescope");
+            string id = Telescope.Choose("ASCOM.Meade.net.Telescope");
             if (string.IsNullOrEmpty(id))
                 return;
             // create this device
             Telescope device = new Telescope(id);
-#else
+//#else
             // this can be replaced by this code, it avoids the chooser and creates the driver class directly.
-            ASCOM.DriverAccess.Telescope device = new ASCOM.DriverAccess.Telescope("ASCOM.Meade.net.Telescope");
-#endif
+            //ASCOM.DriverAccess.Telescope device = new ASCOM.DriverAccess.Telescope("ASCOM.Meade.net.Telescope");
+//#endif
             // now run some tests, adding code to your driver so that the tests will pass.
             // these first tests are common to all drivers.
 
@@ -50,9 +53,46 @@ namespace ASCOM.Meade.net
             //Console.WriteLine($"Ra {device.RightAscension}");
             //Console.WriteLine($"Dec {device.Declination}");
 
-            Console.WriteLine($"Altitude {device.Altitude}");
-            Console.WriteLine($"Azimuth {device.Azimuth}");
-            
+            //Console.WriteLine($"Altitude {device.Altitude}");
+            //Console.WriteLine($"Azimuth {device.Azimuth}");
+
+            var seconds = 10;
+
+            Console.WriteLine("Slewing tests 10 second in each direction");
+            Console.WriteLine("test 1");
+            device.MoveAxis(TelescopeAxes.axisPrimary, 4);
+            Thread.Sleep(seconds * 1000);
+            device.MoveAxis(TelescopeAxes.axisPrimary, 0);
+            Console.WriteLine("test 2");
+            device.MoveAxis(TelescopeAxes.axisPrimary, -4);
+            Thread.Sleep(seconds * 1000);
+            device.MoveAxis(TelescopeAxes.axisPrimary, 0);
+
+            Console.WriteLine("test 3");
+            device.MoveAxis(TelescopeAxes.axisSecondary, 4);
+            Thread.Sleep(seconds * 1000);
+            device.MoveAxis(TelescopeAxes.axisSecondary, 0);
+
+            Console.WriteLine("test 4");
+            device.MoveAxis(TelescopeAxes.axisSecondary, -4);
+            Thread.Sleep(seconds * 1000);
+            device.MoveAxis(TelescopeAxes.axisSecondary, 0);
+            Console.WriteLine("Slewing tests complete");
+
+
+            seconds = 120;
+
+            Console.WriteLine($"Guiding for {seconds} seconds!");
+
+            foreach( var direction in Enum.GetValues(typeof(GuideDirections)).Cast<GuideDirections>())
+            { 
+                Console.WriteLine($"{direction.ToString()}");
+                device.PulseGuide(direction, seconds* 1000);
+            }
+            Console.WriteLine("Guiding Finished");
+
+
+
             device.Connected = false;
             Console.WriteLine("Press Enter to finish");
             Console.ReadLine();
diff --git a/TelescopeTestConsole/TelescopeTestConsole.csproj b/TelescopeTestConsole/TelescopeTestConsole.csproj
index e0115a5..9ecfa82 100644
--- a/TelescopeTestConsole/TelescopeTestConsole.csproj
+++ b/TelescopeTestConsole/TelescopeTestConsole.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ASCOM.Meade.net</RootNamespace>
     <AssemblyName>ASCOM.Meade.net.Test</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
@@ -54,6 +54,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="ASCOM.DeviceInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL" />
diff --git a/TelescopeTestConsole/app.config b/TelescopeTestConsole/app.config
index e365603..c5e1dae 100644
--- a/TelescopeTestConsole/app.config
+++ b/TelescopeTestConsole/app.config
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>