diff --git a/tests/test_config.cpp b/tests/test_config.cpp
index 668e9b0..85bc712 100644
--- a/tests/test_config.cpp
+++ b/tests/test_config.cpp
@@ -133,6 +133,14 @@ TEST(HNZConfig, TestConfigBAD) {
 
 }
 
+TEST(HNZConfig, TestConfigEmpty) {
+  
+  HnzConfig config("", ""exchanged_data.substr(20)"");
+  ASSERT_EQ(config.IsProtocolConfigComplete(), false);
+  ASSERT_EQ(config.IsExchangeConfigComplete(), false);
+
+}
+
 TEST(HNZConfig, TestConfigNodRemoteAddress) {
 
   HnzConfig config(protocol_stack_no_remote_address, exchanged_data);
diff --git a/tests/test_server_wrapper.cpp b/tests/test_server_wrapper.cpp
index ee62c41..68b0623 100644
--- a/tests/test_server_wrapper.cpp
+++ b/tests/test_server_wrapper.cpp
@@ -159,4 +159,14 @@ TEST(HNZServerWrapper, TestHNZServerReceiving_loop) {
   // Launch the thread
   std::thread t1(&EnhancedHNZServer::receiving_loop,&m_server1);
   t1.join();
+
+  ASSERT_NO_THROW(m_server1.startHNZServer());
+
+  m_server1.ServerIsReady(3);
+  // Launch the thread
+  std::thread t2(&EnhancedHNZServer::receiving_loop,&m_server1);
+  
+  ASSERT_NO_THROW(m_server1.stopHNZServer());
+
+  t2.join();
 }
\ No newline at end of file