diff --git a/Sharpcaster.Test/ChromecastApplicationTester.cs b/Sharpcaster.Test/ChromecastApplicationTester.cs
index 063e9d9..dc870ff 100644
--- a/Sharpcaster.Test/ChromecastApplicationTester.cs
+++ b/Sharpcaster.Test/ChromecastApplicationTester.cs
@@ -21,16 +21,20 @@ public ChromecastApplicationTester(ITestOutputHelper outputHelper, ChromecastDev
         [MemberData(nameof(ChromecastReceiversFilter.GetAll), MemberType = typeof(ChromecastReceiversFilter))]
         public async Task ConnectToChromecastAndLaunchApplication(ChromecastReceiver receiver)
         {
+            var TestHelper = new TestHelper();
             var client = await TestHelper.CreateAndConnectClient(output, receiver);
             var status = await client.LaunchApplicationAsync("B3419EF5");
 
             Assert.Equal("B3419EF5", status.Applications[0].AppId);
+
+            await client.DisconnectAsync();
         }
 
         [Theory]
         [MemberData(nameof(ChromecastReceiversFilter.GetAll), MemberType = typeof(ChromecastReceiversFilter))]
         public async Task ConnectToChromecastAndLaunchApplicationTwice(ChromecastReceiver receiver)
         {
+            var TestHelper = new TestHelper();
             var client = await TestHelper.CreateAndConnectClient(output, receiver);
             var status = await client.LaunchApplicationAsync("B3419EF5");
 
@@ -44,10 +48,11 @@ public async Task ConnectToChromecastAndLaunchApplicationTwice(ChromecastReceive
         }
 
 
-        [Theory]
+        [Theory(Skip = "This does not pass any more. Now my JBL reacts as the other device - not changing the Transport ID !?")]
         [MemberData(nameof(ChromecastReceiversFilter.GetJblSpeaker), MemberType = typeof(ChromecastReceiversFilter))]
         public async Task ConnectToChromecastAndLaunchApplicationTwiceWithoutJoining1(ChromecastReceiver receiver)
         {
+            var TestHelper = new TestHelper();
             var client = await TestHelper.CreateAndConnectClient(output, receiver);
             var status = await client.LaunchApplicationAsync("B3419EF5");
 
@@ -65,6 +70,7 @@ public async Task ConnectToChromecastAndLaunchApplicationTwiceWithoutJoining1(Ch
         [Theory]
         [MemberData(nameof(ChromecastReceiversFilter.GetDefaultDevice), MemberType = typeof(ChromecastReceiversFilter))]
         public async Task ConnectToChromecastAndLaunchApplicationTwiceWithoutJoining2(ChromecastReceiver receiver) {
+            var TestHelper = new TestHelper();
             var client = await TestHelper.CreateAndConnectClient(output, receiver);
             var status = await client.LaunchApplicationAsync("B3419EF5");
 
@@ -83,6 +89,7 @@ public async Task ConnectToChromecastAndLaunchApplicationTwiceWithoutJoining2(Ch
         [MemberData(nameof(ChromecastReceiversFilter.GetAll), MemberType = typeof(ChromecastReceiversFilter))]
         public async Task ConnectToChromecastAndLaunchApplicationAThenLaunchApplicationB(ChromecastReceiver receiver)
         {
+            var TestHelper = new TestHelper();
             var client = await TestHelper.CreateAndConnectClient(output, receiver);
             var status = await client.LaunchApplicationAsync("A9BCCB7C");           //Youtube
 
@@ -99,6 +106,7 @@ public async Task ConnectToChromecastAndLaunchApplicationAThenLaunchApplicationB
         [MemberData(nameof(ChromecastReceiversFilter.GetAll), MemberType = typeof(ChromecastReceiversFilter))]
         public async Task ConnectToChromecastAndLaunchApplicationOnceAndJoinIt(ChromecastReceiver receiver)
         {
+            var TestHelper = new TestHelper();
             var client = await TestHelper.CreateAndConnectClient(output, receiver);
             var status = await client.LaunchApplicationAsync("B3419EF5");
 
@@ -113,6 +121,7 @@ public async Task ConnectToChromecastAndLaunchApplicationOnceAndJoinIt(Chromecas
         [Fact(Skip = "Seems like this isn't really working anymore and just loading a white screen")]
         public async Task ConnectToChromecastAndLaunchWebPage()
         {
+            var TestHelper = new TestHelper();
             var client = await TestHelper.CreateConnectAndLoadAppClient(output, "5CB45E5A");
 
             var req = new WebMessage
diff --git a/Sharpcaster.Test/ChromecastConnectionTester.cs b/Sharpcaster.Test/ChromecastConnectionTester.cs
index 1d4aca5..85e82b8 100644
--- a/Sharpcaster.Test/ChromecastConnectionTester.cs
+++ b/Sharpcaster.Test/ChromecastConnectionTester.cs
@@ -29,15 +29,18 @@ public ChromecastConnectionTester(ITestOutputHelper outputHelper, ChromecastDevi
         //[MemberData(nameof(CCDevices.GetAny), MemberType = typeof(CCDevices))]
         public async Task SearchChromecastsAndConnectToIt(ChromecastReceiver receiver)
         {
+            var TestHelper = new TestHelper();
             var status = await TestHelper.CreateAndConnectClient(output, receiver);
             Assert.NotNull(status);
         }
 
         [Theory(Skip = "Test needs manuell interactions -> skipped for autotestings")]
+        //[Theory()]
         //[MemberData(nameof(CCDevices.GetAny), MemberType = typeof(CCDevices))]
-        [MemberData(nameof(ChromecastReceiversFilter.GetJblSpeaker), MemberType = typeof(ChromecastReceiversFilter))]
+        [MemberData(nameof(ChromecastReceiversFilter.GetAny), MemberType = typeof(ChromecastReceiversFilter))]
         public async Task SearchChromecastsAndConnectToItThenWaitForItToShutdown(ChromecastReceiver receiver)
         {
+            var TestHelper = new TestHelper();
             var client = await TestHelper.CreateConnectAndLoadAppClient(output, receiver);
 
             Assert.NotNull(client.GetChromecastStatus());
@@ -56,11 +59,12 @@ public async Task SearchChromecastsAndConnectToItThenWaitForItToShutdown(Chromec
         }
 
         [Theory]
-        [MemberData(nameof(ChromecastReceiversFilter.GetChromecastUltra), MemberType = typeof(ChromecastReceiversFilter))]
-        //[MemberData(nameof(CCDevices.GetJblSpeaker), MemberType = typeof(CCDevices))]
-        //[MemberData(nameof(CCDevices.GetAny), MemberType = typeof(CCDevices))]
+        //[MemberData(nameof(ChromecastReceiversFilter.GetChromecastUltra), MemberType = typeof(ChromecastReceiversFilter))]
+        //[MemberData(nameof(ChromecastReceiversFilter.GetJblSpeaker), MemberType = typeof(ChromecastReceiversFilter))]
+        [MemberData(nameof(ChromecastReceiversFilter.GetAny), MemberType = typeof(ChromecastReceiversFilter))]
         public async Task TestingHeartBeat(ChromecastReceiver receiver)
         {
+            var TestHelper = new TestHelper();
             ChromecastClient client = await TestHelper.CreateConnectAndLoadAppClient(output, receiver);
             AutoResetEvent _autoResetEvent = new AutoResetEvent(false);
 
diff --git a/Sharpcaster.Test/LoggingTester.cs b/Sharpcaster.Test/LoggingTester.cs
index e60d503..62c257a 100644
--- a/Sharpcaster.Test/LoggingTester.cs
+++ b/Sharpcaster.Test/LoggingTester.cs
@@ -28,13 +28,14 @@ public LoggingTester(ITestOutputHelper outputHelper) {
 
         [Fact]
         public void TestLogging() {
+            var TestHelper = new TestHelper();
             List<string> logLines = new List<string>();
             var client = TestHelper.GetClientWithTestOutput(output, assertableLog: logLines);
 
             //var loggerFactory = TestHelper.CreateMockedLoggerFactory(logLines);
 
             //var client = new ChromecastClient(loggerFactory: loggerFactory);
-            Assert.Equal("[RECEIVER_STATUS,QUEUE_CHANGE,QUEUE_ITEM_IDS,QUEUE_ITEMS,INVALID_REQUEST,LOAD_CANCELLED,LOAD_FAILED,MEDIA_STATUS,PING,CLOSE]", logLines[0]);
+            Assert.Equal("[LAUNCH_ERROR,RECEIVER_STATUS,QUEUE_CHANGE,QUEUE_ITEM_IDS,QUEUE_ITEMS,INVALID_REQUEST,LOAD_CANCELLED,LOAD_FAILED,MEDIA_STATUS,PING,CLOSE]", logLines[0]);
         }
 
         [Theory]
diff --git a/Sharpcaster.Test/MediaChannelTester.cs b/Sharpcaster.Test/MediaChannelTester.cs
index feff3b2..67521fd 100644
--- a/Sharpcaster.Test/MediaChannelTester.cs
+++ b/Sharpcaster.Test/MediaChannelTester.cs
@@ -28,7 +28,7 @@ public MediaChannelTester(ITestOutputHelper outputHelper, ChromecastDevicesFixtu
         [Theory(Skip ="Skipped for autotesting because manuell intervention on device is needed for this test!")]
         [MemberData(nameof(ChromecastReceiversFilter.GetJblSpeaker), MemberType = typeof(ChromecastReceiversFilter))]
         public async Task TestWaitForDeviceStopDuringPlayback(ChromecastReceiver receiver) {
-          
+
             //   To get this test Passing, you have to manually operate the used Chromecast device!
             //   I use it with a JBL speaker device. This device has 5 buttons. (ON/OFF, Vol-, Vol+, Play/Pause, (and WLAN-Connect))
             //   Vol+/- and Play/Pause do operate and trigger 'unasked' MediaStatusChanged events which work as designed.
@@ -40,6 +40,7 @@ public async Task TestWaitForDeviceStopDuringPlayback(ChromecastReceiver receive
             // 
             //   after the test media starts playing you have 20 seconds to press the device stop button. Then this should pass as green!
             //
+            var TestHelper = new TestHelper();
             ChromecastClient client = await TestHelper.CreateConnectAndLoadAppClient(output, receiver);
             if (receiver.Model == "JBL Playlist") {
 
@@ -78,12 +79,15 @@ public async Task TestWaitForDeviceStopDuringPlayback(ChromecastReceiver receive
             } else {
                 Assert.Fail("This test only runs with a 'JBL Playlist' device and also needs manual operations!");
             }
+            await client.DisconnectAsync();
         }
 
      
         [Theory]
-        [MemberData(nameof(ChromecastReceiversFilter.GetAll), MemberType = typeof(ChromecastReceiversFilter))]
+        [MemberData(nameof(ChromecastReceiversFilter.GetDefaultDevice), MemberType = typeof(ChromecastReceiversFilter))]
         public async Task TestLoadingMediaQueueAndNavigateNextPrev(ChromecastReceiver receiver) {
+
+            var TestHelper = new TestHelper();
             ChromecastClient client = await TestHelper.CreateConnectAndLoadAppClient(output, receiver);
 
             AutoResetEvent _autoResetEvent = new AutoResetEvent(false);
@@ -143,15 +147,16 @@ public async Task TestLoadingMediaQueueAndNavigateNextPrev(ChromecastReceiver re
 
             //This keeps the test running untill all eventhandler sequence steps are finished. If something goes wrong we get a very slow timeout here.
             Assert.True(_autoResetEvent.WaitOne(20000));
-
+            await client.DisconnectAsync();
         }
 
         [Theory]
         //[MemberData(nameof(ChromecastReceiversFilter.GetAll), MemberType = typeof(ChromecastReceiversFilter))]  // This sometimes give a INVALID_MEDIA_SESSION_ID on my Chromecast Audio ....
         [MemberData(nameof(ChromecastReceiversFilter.GetAny), MemberType = typeof(ChromecastReceiversFilter))]
         public async Task TestLoadMediaQueueAndCheckContent(ChromecastReceiver receiver) {
+            var TestHelper = new TestHelper();
             ChromecastClient client = await TestHelper.CreateConnectAndLoadAppClient(output, receiver);
-
+            
             QueueItem[] MyCd = TestHelper.CreateTestCd();
 
             MediaStatus status = await client.GetChannel<IMediaChannel>().QueueLoadAsync(MyCd);
@@ -173,7 +178,7 @@ public async Task TestLoadMediaQueueAndCheckContent(ChromecastReceiver receiver)
 
             QueueItem[] items2 = await client.GetChannel<IMediaChannel>().QueueGetItemsAsync(status.MediaSessionId, ids);
             Assert.Equal(4, items2.Length);
-            
+            await client.DisconnectAsync();
         }
 
 
@@ -181,6 +186,7 @@ public async Task TestLoadMediaQueueAndCheckContent(ChromecastReceiver receiver)
         [Theory]
         [MemberData(nameof(ChromecastReceiversFilter.GetAll), MemberType = typeof(ChromecastReceiversFilter))]
         public async Task TestLoadingMediaQueue(ChromecastReceiver receiver) {
+            var TestHelper = new TestHelper();
             ChromecastClient client = await TestHelper.CreateConnectAndLoadAppClient(output, receiver);
 
             QueueItem[] MyCd = TestHelper.CreateTestCd();
@@ -190,13 +196,14 @@ public async Task TestLoadingMediaQueue(ChromecastReceiver receiver) {
             Assert.Equal(PlayerStateType.Playing, status.PlayerState);
             Assert.Equal(2, status.Items.Count());           // The status message only contains the next (and if available Prev) Track/QueueItem!
             Assert.Equal(status.CurrentItemId, status.Items[0].ItemId);
-          
+            await client.DisconnectAsync();
         }
 
         [Theory]
         [MemberData(nameof(ChromecastReceiversFilter.GetAny), MemberType = typeof(ChromecastReceiversFilter))]
         public async Task TestLoadingMedia(ChromecastReceiver receiver)
         {
+            var TestHelper = new TestHelper();
             ChromecastClient client = await TestHelper.CreateConnectAndLoadAppClient(output, receiver);
 
             var media = new Media
@@ -209,32 +216,16 @@ public async Task TestLoadingMedia(ChromecastReceiver receiver)
             Assert.Equal(PlayerStateType.Playing, status.PlayerState);
             Assert.Single(status.Items);
             Assert.Equal(status.CurrentItemId, status.Items[0].ItemId);
-          
+            await client.DisconnectAsync();
         }
 
-        //[Theory]
-        //[MemberData(nameof(ChromecastReceiversFilter.GetAll), MemberType = typeof(ChromecastReceiversFilter))]
-        //public async Task TestLoadingMediaWithoutLogging(ChromecastReceiver receiver) {
-        //    ChromecastClient client = await TestHelper.CreateConnectAndLoadAppClient(receiver);     // No output -> No LoggingFactory mocked
-
-        //    var media = new Media {
-        //        ContentUrl = "https://commondatastorage.googleapis.com/gtv-videos-bucket/CastVideos/mp4/DesigningForGoogleCast.mp4"
-        //    };
-
-        //    MediaStatus status = await client.GetChannel<IMediaChannel>().LoadAsync(media);
-
-        //    Assert.Equal(PlayerStateType.Playing, status.PlayerState);
-        //    Assert.Single(status.Items);
-        //    Assert.Equal(status.CurrentItemId, status.Items[0].ItemId);
-
-        //}
-
 
         [Theory]
         [MemberData(nameof(ChromecastReceiversFilter.GetAll), MemberType = typeof(ChromecastReceiversFilter))]
         public async Task StartApplicationAThenStartBAndLoadMedia(ChromecastReceiver receiver)
         {
-            var client = await TestHelper.CreateAndConnectClient(output, receiver);
+            var th = new TestHelper();
+            var client = await th.CreateAndConnectClient(output, receiver);
 
             _ = await client.LaunchApplicationAsync("A9BCCB7C", false);
 
@@ -246,12 +237,14 @@ public async Task StartApplicationAThenStartBAndLoadMedia(ChromecastReceiver rec
                 ContentUrl = "https://commondatastorage.googleapis.com/gtv-videos-bucket/CastVideos/mp4/DesigningForGoogleCast.mp4"
             };
             _ = await client.GetChannel<IMediaChannel>().LoadAsync(media);
+            await client.DisconnectAsync();
         }
 
         [Theory]
-        [MemberData(nameof(ChromecastReceiversFilter.GetChromecastUltra), MemberType = typeof(ChromecastReceiversFilter))]
+        [MemberData(nameof(ChromecastReceiversFilter.GetAny), MemberType = typeof(ChromecastReceiversFilter))]
         public async Task TestLoadingAndPausingMedia(ChromecastReceiver receiver)
         {
+            var TestHelper = new TestHelper();
             ChromecastClient client = await TestHelper.CreateConnectAndLoadAppClient(output, receiver);
             AutoResetEvent _autoResetEvent = new AutoResetEvent(false);
 
@@ -289,12 +282,14 @@ public async Task TestLoadingAndPausingMedia(ChromecastReceiver receiver)
             Assert.True(_autoResetEvent.WaitOne(5000));
             runSequence += "3";
             Assert.Equal("R1p2P3", runSequence);
+            await client.DisconnectAsync();
         }
 
         [Theory]
         [MemberData(nameof(ChromecastReceiversFilter.GetAll), MemberType = typeof(ChromecastReceiversFilter))]
         public async Task TestLoadingAndStoppingMedia(ChromecastReceiver receiver)
         {
+            var TestHelper = new TestHelper();
             ChromecastClient client = await TestHelper.CreateConnectAndLoadAppClient(output, receiver);
             AutoResetEvent _autoResetEvent = new AutoResetEvent(false);
 
@@ -326,14 +321,16 @@ public async Task TestLoadingAndStoppingMedia(ChromecastReceiver receiver)
             mediaStatus = await client.GetChannel<IMediaChannel>().LoadAsync(media);
 
             //This checks that within 5000 ms we have loaded video and were able to pause it
-            Assert.True(_autoResetEvent.WaitOne(5000));
+            Assert.True(_autoResetEvent.WaitOne(10000));
 
+            await client.DisconnectAsync();
         }
 
         [Theory]
-        [MemberData(nameof(ChromecastReceiversFilter.GetChromecastUltra), MemberType = typeof(ChromecastReceiversFilter))]
+        [MemberData(nameof(ChromecastReceiversFilter.GetAny), MemberType = typeof(ChromecastReceiversFilter))]
         public async Task TestFailingLoadMedia(ChromecastReceiver receiver)
         {
+            var TestHelper = new TestHelper();
             ChromecastClient client = await TestHelper.CreateConnectAndLoadAppClient(output, receiver);
             AutoResetEvent _autoResetEvent = new AutoResetEvent(false);
 
diff --git a/Sharpcaster.Test/ReceiverChannelTester.cs b/Sharpcaster.Test/ReceiverChannelTester.cs
index e273403..19fdf07 100644
--- a/Sharpcaster.Test/ReceiverChannelTester.cs
+++ b/Sharpcaster.Test/ReceiverChannelTester.cs
@@ -19,8 +19,8 @@ public ReceiverChannelTester(ITestOutputHelper outputHelper, ChromecastDevicesFi
 
         [Theory]
         [MemberData(nameof(ChromecastReceiversFilter.GetAll), MemberType = typeof(ChromecastReceiversFilter))]
-        public async Task TestMute(ChromecastReceiver receiver)
-        {
+        public async Task TestMute(ChromecastReceiver receiver) {
+            var TestHelper = new TestHelper();
             var client = await TestHelper.CreateAndConnectClient(output, receiver);
 
             var status = await client.GetChannel<ReceiverChannel>().SetMute(true);
@@ -30,8 +30,8 @@ public async Task TestMute(ChromecastReceiver receiver)
 
         [Theory]
         [MemberData(nameof(ChromecastReceiversFilter.GetAll), MemberType = typeof(ChromecastReceiversFilter))]
-        public async Task TestUnMute(ChromecastReceiver receiver)
-        {
+        public async Task TestUnMute(ChromecastReceiver receiver) {
+            var TestHelper = new TestHelper();
             var client = await TestHelper.CreateAndConnectClient(output, receiver);
 
             var status = await client.GetChannel<ReceiverChannel>().SetMute(false);
@@ -40,8 +40,8 @@ public async Task TestUnMute(ChromecastReceiver receiver)
 
         [Theory]
         [MemberData(nameof(ChromecastReceiversFilter.GetAll), MemberType = typeof(ChromecastReceiversFilter))]
-        public async Task TestVolume(ChromecastReceiver receiver)
-        {
+        public async Task TestVolume(ChromecastReceiver receiver) {
+            var TestHelper = new TestHelper();
             var client = await TestHelper.CreateAndConnectClient(output, receiver);
            
             var status = await client.GetChannel<ReceiverChannel>().SetVolume(0.1);
@@ -57,8 +57,8 @@ public async Task TestVolume(ChromecastReceiver receiver)
 
         [Theory]
         [MemberData(nameof(ChromecastReceiversFilter.GetAll), MemberType = typeof(ChromecastReceiversFilter))]
-        public async Task TestStoppingApplication(ChromecastReceiver receiver)
-        {
+        public async Task TestStoppingApplication(ChromecastReceiver receiver) {
+            var TestHelper = new TestHelper();
             var client = await TestHelper.CreateAndConnectClient(output, receiver);
 
             var status = await client.LaunchApplicationAsync("B3419EF5");
diff --git a/Sharpcaster.Test/helper/TestHelper.cs b/Sharpcaster.Test/helper/TestHelper.cs
index 4939af4..8c42195 100644
--- a/Sharpcaster.Test/helper/TestHelper.cs
+++ b/Sharpcaster.Test/helper/TestHelper.cs
@@ -34,43 +34,72 @@ namespace Sharpcaster.Test {
     public class ChromecastReceiversFilter  {
 
         public static IEnumerable<object[]> GetAll() {
-            foreach (var cc in ChromecastDevicesFixture.Receivers) {
-                yield return new object[] { cc };
+            if (ChromecastDevicesFixture.Receivers.Count > 0) {
+                foreach (var cc in ChromecastDevicesFixture.Receivers) {
+                    yield return new object[] { cc };
+                }
+            } else {
+                throw new Exception("This Test needs a Chromecast Receiver to be available on local network!");
             }
         }
 
         public static IEnumerable<object[]> GetAny() {
-            var rec = ChromecastDevicesFixture.Receivers.First();
-            yield return new object[] { rec };
+            var rec = ChromecastDevicesFixture.Receivers.FirstOrDefault();
+            if (rec != null) {
+                yield return new object[] { rec };
+            } else {
+                throw new Exception("This Test needs a Chromecast Receiver to be available on local network!");
+            }
         }
 
         public static IEnumerable<object[]> GetJblSpeaker() {
-            var rec = ChromecastDevicesFixture.Receivers.Where(r => r.Model.StartsWith("JBL")).First();
-            yield return new object[] { rec };
+            var rec = ChromecastDevicesFixture.Receivers.Where(r => r.Model.StartsWith("JBL")).FirstOrDefault();
+            if (rec != null) {
+                yield return new object[] { rec };
+            } else {
+                yield break;
+            }
         }
 
         public static IEnumerable<object[]> GetDefaultDevice() {
-            var rec = ChromecastDevicesFixture.Receivers.Where(r => ! r.Model.StartsWith("JBL")).First();
-            yield return new object[] { rec };
+            var rec = ChromecastDevicesFixture.Receivers.Where(r => ! r.Model.StartsWith("JBL")).FirstOrDefault();
+            if (rec != null) {
+                yield return new object[] { rec };
+            } else {
+                yield break;
+            }
         }
 
         public static IEnumerable<object[]> GetChromecastUltra()
         {
-            var rec = ChromecastDevicesFixture.Receivers.Where(r => r.Model.StartsWith("Chromecast Ultra")).First();
-            yield return new object[] { rec };
+            var rec = ChromecastDevicesFixture.Receivers.Where(r => r.Model.StartsWith("Chromecast Ultra")).FirstOrDefault();
+            if (rec != null) {
+                yield return new object[] { rec };
+            } else {
+                yield break;
+            }
         }
         
     }
 
 
-    public static class TestHelper
+    public class TestContext {
+        public List<string> AssertableTestLog = null;
+        public ITestOutputHelper TestOutput = null;
+    }
+
+
+    public class TestHelper
     {
-        private static List<string> AssertableTestLog = null;
-        private static ITestOutputHelper TestOutput = null;
+
+        
+
+        public  List<string> AssertableTestLog = null;
+        private ITestOutputHelper TestOutput = null;
         //public static ChromecastReceiver CurrentReceiver { get; private set; }
 
 
-        public static ChromecastReceiver FindChromecast(string receiverName = null)
+        public ChromecastReceiver FindChromecast(string receiverName = null)
         {
             //IChromecastLocator locator = new MdnsChromecastLocator();
             ChromecastReceiver receiver = null;
@@ -90,15 +119,15 @@ public static ChromecastReceiver FindChromecast(string receiverName = null)
             return receiver;
         }
 
-        public async static Task<ChromecastClient> CreateAndConnectClient(ITestOutputHelper output, string receiverName = null) {
+        public async Task<ChromecastClient> CreateAndConnectClient(ITestOutputHelper output, string receiverName = null) {
             TestOutput = output;
-            var chromecast = TestHelper.FindChromecast(receiverName);
+            var chromecast = FindChromecast(receiverName);
             ChromecastClient cc = GetClientWithTestOutput(output);
             await cc.ConnectChromecast(chromecast);
             return cc;
         }
 
-        public async static Task<ChromecastClient> CreateAndConnectClient(ITestOutputHelper output, ChromecastReceiver receiver) {
+        public async Task<ChromecastClient> CreateAndConnectClient(ITestOutputHelper output, ChromecastReceiver receiver) {
             TestOutput = output;
             TestOutput?.WriteLine("Using Receiver '" + (receiver.Model) + "' at " + receiver.DeviceUri);
             ChromecastClient cc = GetClientWithTestOutput(output);
@@ -107,23 +136,23 @@ public async static Task<ChromecastClient> CreateAndConnectClient(ITestOutputHel
         }
 
 
-        public async static Task<ChromecastClient> CreateConnectAndLoadAppClient(ITestOutputHelper output, string appId = "B3419EF5") {
+        public async Task<ChromecastClient> CreateConnectAndLoadAppClient(ITestOutputHelper output, string appId = "B3419EF5") {
             TestOutput = output;
             ChromecastClient cc = await CreateAndConnectClient(output);
             await cc.LaunchApplicationAsync(appId, false);
             return cc;
         }
 
-        public async static Task<ChromecastClient> CreateConnectAndLoadAppClient(ITestOutputHelper output, ChromecastReceiver receiver, string appId = "B3419EF5") {
+        public async Task<ChromecastClient> CreateConnectAndLoadAppClient(ITestOutputHelper output, ChromecastReceiver receiver, string appId = "B3419EF5") {
             TestOutput = output;
             ChromecastClient cc = await CreateAndConnectClient(output, receiver);
             await cc.LaunchApplicationAsync(appId, false);
             return cc;
         }
 
-        public async static Task<ChromecastClient> CreateConnectAndLoadAppClient(string appId = "B3419EF5") {
+        public async Task<ChromecastClient> CreateConnectAndLoadAppClient(string appId = "B3419EF5") {
             TestOutput = null;
-            var chromecast = TestHelper.FindChromecast();
+            var chromecast = FindChromecast();
             ChromecastClient cc = new ChromecastClient();
             await cc.ConnectChromecast(chromecast);
             await cc.LaunchApplicationAsync(appId, false);
@@ -131,7 +160,7 @@ public async static Task<ChromecastClient> CreateConnectAndLoadAppClient(string
         }
 
 
-        public static ChromecastClient GetClientWithTestOutput(ITestOutputHelper output, List<string> assertableLog = null) {
+        public ChromecastClient GetClientWithTestOutput(ITestOutputHelper output, List<string> assertableLog = null) {
 
             TestOutput = output;
             ILoggerFactory lFactory = CreateMockedLoggerFactory(assertableLog);
@@ -140,7 +169,7 @@ public static ChromecastClient GetClientWithTestOutput(ITestOutputHelper output,
         }
 
 
-        private static Mock<ILogger<T>> CreateILoggerMock<T>() {
+        private Mock<ILogger<T>> CreateILoggerMock<T>() {
             Mock<ILogger<T>> retVal = new Mock<ILogger<T>>();
             retVal.Setup(x => x.Log(
                 It.IsAny<LogLevel>(),
@@ -170,7 +199,7 @@ private static Mock<ILogger<T>> CreateILoggerMock<T>() {
         }
 
 
-        public static ILoggerFactory CreateMockedLoggerFactory(List<string> assertableLog = null) {
+        public ILoggerFactory CreateMockedLoggerFactory(List<string> assertableLog = null) {
             AssertableTestLog = assertableLog;
 
             var loggerGeneric = new Mock<ILogger>();
@@ -228,7 +257,7 @@ public static ILoggerFactory CreateMockedLoggerFactory(List<string> assertableLo
         }
 
 
-        public static QueueItem[] CreateTestCd() {
+        public QueueItem[] CreateTestCd() {
             QueueItem[] MyCd = new QueueItem[4];
             MyCd[0] = new QueueItem() {
                 Media = new Media {
diff --git a/Sharpcaster/Channels/ChromecastChannel.cs b/Sharpcaster/Channels/ChromecastChannel.cs
index 5364413..fa4bf00 100644
--- a/Sharpcaster/Channels/ChromecastChannel.cs
+++ b/Sharpcaster/Channels/ChromecastChannel.cs
@@ -10,7 +10,7 @@ namespace Sharpcaster.Channels
     public abstract class ChromecastChannel : IChromecastChannel
     {
         private const string BASE_NAMESPACE = "urn:x-cast:com.google.cast";
-        protected ILogger _logger = null;
+        public ILogger _logger { get; private set; } = null;
 
         /// <summary>
         /// Initialization
diff --git a/Sharpcaster/Channels/HeartbeatChannel.cs b/Sharpcaster/Channels/HeartbeatChannel.cs
index 47459a1..a4cf136 100644
--- a/Sharpcaster/Channels/HeartbeatChannel.cs
+++ b/Sharpcaster/Channels/HeartbeatChannel.cs
@@ -36,28 +36,28 @@ public HeartbeatChannel(ILogger<HeartbeatChannel> logger = null) : base("tp.hear
         /// <param name="message">message to process</param>
         public override async Task OnMessageReceivedAsync(IMessage message)
         {
-            _logger?.LogDebug("Received ping message on Heartbeat channel");
-            await SendAsync(new PongMessage());
-            _logger?.LogDebug("Sent pong message on Heartbeat channel");
+            
             _timer.Stop();
+            await SendAsync(new PongMessage());
             _timer.Start();
+            _logger?.LogDebug("Pong sent - Heartbeat Timer restarted.");
         }
 
         public void StartTimeoutTimer()
         {
             _timer.Start();
-            _logger?.LogDebug("Started heartbeat timeout timer");
+            _logger?.LogTrace("Started heartbeat timeout timer");
         }
 
         public void StopTimeoutTimer()
         {
             _timer.Stop();
-            _logger?.LogDebug("Stopped heartbeat timeout timer");
+            _logger?.LogTrace("Stopped heartbeat timeout timer");
         }
 
         private void TimerElapsed(object sender, ElapsedEventArgs e)
         {
-            _logger?.LogDebug("Heartbeat timeout");
+            _logger?.LogInformation("Heartbeat timeout");
             StatusChanged?.Invoke(this, e);
         }
     }
diff --git a/Sharpcaster/Channels/MediaChannel.cs b/Sharpcaster/Channels/MediaChannel.cs
index 316fb28..af5fde3 100644
--- a/Sharpcaster/Channels/MediaChannel.cs
+++ b/Sharpcaster/Channels/MediaChannel.cs
@@ -42,7 +42,7 @@ private async Task<MediaStatus> SendAsync(IMessageWithId message, ChromecastAppl
             }
             catch (Exception ex)
             {
-                _logger.LogDebug(ex, "Error sending message: " + message);
+                _logger?.LogError($"Error sending message: {ex.Message}");
                 Status = null;
                 throw ex;
             }
diff --git a/Sharpcaster/Channels/ReceiverChannel.cs b/Sharpcaster/Channels/ReceiverChannel.cs
index 2a69738..3b6ab86 100644
--- a/Sharpcaster/Channels/ReceiverChannel.cs
+++ b/Sharpcaster/Channels/ReceiverChannel.cs
@@ -35,6 +35,7 @@ public async Task<ChromecastStatus> SetVolume(double level)
         {
             if (level < 0 || level > 1.0)
             {
+                _logger?.LogError($"level must be between 0.0 and 1.0 - is {level}");
                 throw new ArgumentException("level must be between 0.0 and 1.0", nameof(level));
             }
             return (await SendAsync<ReceiverStatusMessage>(new SetVolumeMessage() { Volume = new Models.Volume() { Level = level } })).Status;
diff --git a/Sharpcaster/ChromeCastClient.cs b/Sharpcaster/ChromeCastClient.cs
index 0689409..454813a 100644
--- a/Sharpcaster/ChromeCastClient.cs
+++ b/Sharpcaster/ChromeCastClient.cs
@@ -87,7 +87,7 @@ private void Init(IServiceCollection serviceCollection)
             MessageTypes = messages.Where(t => !string.IsNullOrEmpty(t.Type)).ToDictionary(m => m.Type, m => m.GetType());
             Channels = channels;
 
-            _logger = serviceProvider.GetService<ILogger<ChromecastChannel>>();
+            _logger = serviceProvider.GetService<ILogger<ChromecastClient>>();
             _logger?.LogDebug(MessageTypes.Keys.ToString(","));
             _logger?.LogDebug(Channels.ToString(","));
 
@@ -120,6 +120,7 @@ public async Task<ChromecastStatus> ConnectChromecast(ChromecastReceiver chromec
 
         private async void HeartBeatTimedOut(object sender, EventArgs e)
         {
+            _logger?.LogError("Heartbeat timeout - Disconnecting client.");
             await DisconnectAsync();
         }
 
@@ -142,8 +143,7 @@ private void Receive()
                         //Payload can either be Binary or UTF8 json
                         var payload = (castMessage.PayloadType == PayloadType.Binary ?
                             Encoding.UTF8.GetString(castMessage.PayloadBinary.ToByteArray()) : castMessage.PayloadUtf8);
-                        _logger?.LogTrace($"RECEIVED: {castMessage.Namespace} : {payload}");
-                        
+
                         var channel = Channels.FirstOrDefault(c => c.Namespace == castMessage.Namespace);
                         if (channel != null)
                         {
@@ -151,45 +151,53 @@ private void Receive()
                             {
                                 GetChannel<IHeartbeatChannel>().StopTimeoutTimer();
                             }
+                            channel._logger?.LogTrace($"RECEIVED: {payload}");
+                            
                             var message = JsonConvert.DeserializeObject<MessageWithId>(payload);
                             if (MessageTypes.TryGetValue(message.Type, out Type type))
                             {
+                                object tcs = null;
                                 try
                                 {
                                     var response = (IMessage)JsonConvert.DeserializeObject(payload, type);
                                     await channel.OnMessageReceivedAsync(response);
-                                    TaskCompletionSourceInvoke(message, "SetResult", response);
+                                    TaskCompletionSourceInvoke(ref tcs, message, "SetResult", response);
                                 }
                                 catch (Exception ex)
                                 {
-                                    TaskCompletionSourceInvoke(message, "SetException", ex, new Type[] { typeof(Exception) });
+                                    _logger?.LogError($"Exception processing the Response: {ex.Message}");
+                                    TaskCompletionSourceInvoke(ref tcs, message, "SetException", ex, new Type[] { typeof(Exception) });
                                 }
                             }
                             else
                             {
                                 _logger?.LogError("The received Message of Type '{ty}' can not be converted to its response Type." +
-                                    " An implementing IMessage class is missing!", message.Type);
+                                   " An implementing IMessage class is missing!", message.Type);
                                 Debugger.Break();
                             }
                         } else
                         {
-                            _logger?.LogDebug("Couldn't parse the channel from payload: " + payload);
+                            _logger?.LogError($"Couldn't parse the channel from: {castMessage.Namespace}  :  {payload}");
                         }
                     }
                 }
                 catch (Exception exception)
                 {
-                    _logger.LogDebug(exception, "Error on receiving message.");
+                    _logger?.LogError($"Error in receive loop: {exception.Message}");
                     //await Dispose(false);
                     ReceiveTcs.SetResult(true);
                 }
             });
         }
 
-        private void TaskCompletionSourceInvoke(MessageWithId message, string method, object parameter, Type[] types = null)
+        private void TaskCompletionSourceInvoke(ref object tcs, MessageWithId message, string method, object parameter, Type[] types = null)
         {
-            if (message.HasRequestId && WaitingTasks.TryRemove(message.RequestId, out object tcs))
-            {
+            if (tcs == null) {
+                if (message.HasRequestId && WaitingTasks.TryRemove(message.RequestId, out object newtcs)) {
+                    tcs = newtcs;
+                }
+            }
+            if (tcs != null) {
                 var tcsType = tcs.GetType();
                 (types == null ? tcsType.GetMethod(method) : tcsType.GetMethod(method, types)).Invoke(tcs, new object[] { parameter });
             }
@@ -279,7 +287,7 @@ private void Dispose(IDisposable disposable, Action action)
                 }
                 catch (Exception ex)
                 {
-                    _logger?.LogError("Error on disposing.", ex, null);
+                    _logger?.LogError($"Error on disposing. {ex.Message}");
                 }
                 finally
                 {
@@ -317,6 +325,8 @@ public async Task<ChromecastStatus> LaunchApplicationAsync(string applicationId,
                 {
                     await GetChannel<IConnectionChannel>().ConnectAsync(runningApplication.TransportId);
                     return await GetChannel<IReceiverChannel>().GetChromecastStatusAsync();
+                } else {
+                    // another AppId is running
                 }
             }
             var newApplication = await GetChannel<IReceiverChannel>().LaunchApplicationAsync(applicationId);
diff --git a/Sharpcaster/Interfaces/IChromecastChannel.cs b/Sharpcaster/Interfaces/IChromecastChannel.cs
index 2271cd2..d4501e4 100644
--- a/Sharpcaster/Interfaces/IChromecastChannel.cs
+++ b/Sharpcaster/Interfaces/IChromecastChannel.cs
@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using System.Threading.Tasks;
 
 namespace Sharpcaster.Interfaces
 {
@@ -17,6 +18,8 @@ public interface IChromecastChannel
         /// </summary>
         string Namespace { get; }
 
+        ILogger _logger { get; }
+
         /// <summary>
         /// Called when a message for this channel is received
         /// </summary>
diff --git a/Sharpcaster/Messages/Receiver/LaunchErrorMessage.cs b/Sharpcaster/Messages/Receiver/LaunchErrorMessage.cs
new file mode 100644
index 0000000..59122d2
--- /dev/null
+++ b/Sharpcaster/Messages/Receiver/LaunchErrorMessage.cs
@@ -0,0 +1,16 @@
+using System.Runtime.Serialization;
+
+namespace Sharpcaster.Messages.Receiver
+{
+    /// <summary>
+    /// Launch Error message
+    /// </summary>
+    [DataContract]
+    [ReceptionMessage]
+    class LaunchErrorMessage : MessageWithId
+    {
+       
+        [DataMember(Name = "reason")]
+        public string Reason { get; set; }
+    }
+}