diff --git a/tests/executables_src/testIllegalNetworks.cc b/tests/executables_src/testIllegalNetworks.cc
index d525249e16e73ef041ab3bf34171c387d5ef7c62..72caeed826710d5b5be58d61a5a239d0f42d3d70 100644
--- a/tests/executables_src/testIllegalNetworks.cc
+++ b/tests/executables_src/testIllegalNetworks.cc
@@ -17,6 +17,7 @@
 
 #include "ScalarAccessor.h"
 #include "ApplicationModule.h"
+#include "DeviceModule.h"
 
 using namespace boost::unit_test_framework;
 namespace ctk = ChimeraTK;
@@ -67,7 +68,9 @@ BOOST_AUTO_TEST_CASE_TEMPLATE( testTwoScalarPollPushAccessors, T, test_types ) {
   TestApplication app;
   TestModule<T> testModule;
 
-  testModule.consumingPush.consumeFromDevice("Dummy0","/MyModule/Variable", ctk::UpdateMode::poll);
+  ctk::DeviceModule dev{"Dummy0"};
+
+  dev("/MyModule/Variable") >> testModule.consumingPush;
   try {
     app.makeConnections();
     BOOST_ERROR("Exception expected.");
@@ -85,7 +88,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE( testNoFeeder, T, test_types ) {
   TestApplication app;
   TestModule<T> testModule;
 
-  testModule.consumingPush2.connectTo(testModule.consumingPush);
+  testModule.consumingPush2 >> testModule.consumingPush;
   try {
     app.makeConnections();
     BOOST_ERROR("Exception expected.");
@@ -104,7 +107,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE( testTwoFeeders, T, test_types ) {
   TestModule<T> testModule;
 
   try {
-    testModule.feedingPush.connectTo(testModule.feedingPush2);
+    testModule.feedingPush >> testModule.feedingPush2;
     BOOST_ERROR("Exception expected.");
   }
   catch(ctk::ApplicationExceptionWithID<ctk::ApplicationExceptionID::illegalVariableNetwork> &e) {
@@ -122,8 +125,9 @@ BOOST_AUTO_TEST_CASE_TEMPLATE( testTooManyPollingConsumers, T, test_types ) {
   TestApplication app;
   TestModule<T> testModule;
 
-  testModule.consumingPoll.consumeFromDevice("Dummy0","/MyModule/Variable", ctk::UpdateMode::poll);
-  testModule.consumingPoll.connectTo(testModule.consumingPoll2);
+  ctk::DeviceModule dev{"Dummy0"};
+
+  dev("/MyModule/Variable") >> testModule.consumingPoll >> testModule.consumingPoll2;
   try {
     app.makeConnections();
     BOOST_ERROR("Exception expected.");
diff --git a/tests/executables_src/testTrigger.cc b/tests/executables_src/testTrigger.cc
index d63d99d11a254fd2dff6bafc2af2f69f85774fff..0a4bddeb0e265408859aba9c008f4e02f5cd0328 100644
--- a/tests/executables_src/testTrigger.cc
+++ b/tests/executables_src/testTrigger.cc
@@ -17,6 +17,7 @@
 
 #include "ScalarAccessor.h"
 #include "ApplicationModule.h"
+#include "DeviceModule.h"
 
 using namespace boost::unit_test_framework;
 namespace ctk = ChimeraTK;
@@ -68,10 +69,11 @@ BOOST_AUTO_TEST_CASE_TEMPLATE( testTriggerPollFeederPushConsumer, T, test_types
   TestApplication app;
   TestModule<T> testModule;
 
-  testModule.feedingToDevice.feedToDevice("Dummy0","/MyModule/Variable");
+  ctk::DeviceModule dev{"Dummy0"};
 
-  testModule.consumingPush.consumeFromDevice("Dummy0","/MyModule/Variable", ctk::UpdateMode::poll);
-  testModule.consumingPush.addTrigger(testModule.theTrigger);
+  testModule.feedingToDevice >> dev("/MyModule/Variable");
+
+  dev("/MyModule/Variable") [ testModule.theTrigger ] >> testModule.consumingPush;
   app.run();
 
   // single theaded test