diff --git a/languages/cpp/src/shared/src/Transport/Transport.h b/languages/cpp/src/shared/src/Transport/Transport.h
index a0c61718..d7fcfe37 100644
--- a/languages/cpp/src/shared/src/Transport/Transport.h
+++ b/languages/cpp/src/shared/src/Transport/Transport.h
@@ -420,12 +420,13 @@ namespace FireboltSDK
 #ifdef UNIT_TEST
         bool IsOpen()
         {
-            return (_channel.IsOpen() == true);
+            return true;
         }
+        
 #else
         bool IsOpen()
         {
-            return true;
+            return (_channel.IsOpen() == true);
         }
 #endif
         
@@ -450,6 +451,11 @@ namespace FireboltSDK
         }
         
 #ifdef UNIT_TEST
+        bool Open(const uint32_t waitTime)
+        {
+            return true;
+        }
+#else
         bool Open(const uint32_t waitTime)
         {
             bool result = true;
@@ -458,11 +464,7 @@ namespace FireboltSDK
             }
             return (result);
         }
-#else
-        bool Open(const uint32_t waitTime)
-        {
-            return true;
-        }
+        
 #endif
         void Close()
         {
@@ -610,13 +612,13 @@ namespace FireboltSDK
 #ifdef UNIT_TEST
         inline bool IsOpen()
         {
-            return _channel->IsOpen();
+            return true;
         }
 #else
         inline bool IsOpen()
         {
-            return true;
-        }
+            return _channel->IsOpen();
+        } 
 #endif
 
         void Revoke(const string &eventName)