1 files changed, 5 insertions, 7 deletions
diff --git a/test/routing_tests/local_routing_test_client.cpp b/test/routing_tests/local_routing_test_client.cpp
index a97c63c..f280eb2 100644
--- a/test/routing_tests/local_routing_test_client.cpp
+++ b/test/routing_tests/local_routing_test_client.cpp
@@ -20,7 +20,10 @@ local_routing_test_client::local_routing_test_client(bool _use_tcp) :
 
 void local_routing_test_client::init()
 {
-    app_->init();
+    if (!app_->init()) {
+        VSOMEIP_ERROR << "Couldn't initialize application";
+        EXPECT_TRUE(false);
+    }
 
     app_->register_state_handler(
             std::bind(&local_routing_test_client::on_state, this,
@@ -47,12 +50,7 @@ void local_routing_test_client::start()
 void local_routing_test_client::stop()
 {
     VSOMEIP_INFO << "Stopping...";
-    app_->unregister_availability_handler(vsomeip_test::TEST_SERVICE_SERVICE_ID,
-            vsomeip_test::TEST_SERVICE_INSTANCE_ID);
-    app_->unregister_state_handler();
-    app_->unregister_message_handler(vsomeip::ANY_SERVICE,
-            vsomeip_test::TEST_SERVICE_INSTANCE_ID, vsomeip::ANY_METHOD);
-
+    app_->clear_all_handler();
     app_->stop();
 }