diff --git a/src/PityUnit.hh b/src/PityUnit.hh
index 5d39714..8351bbb 100644
--- a/src/PityUnit.hh
+++ b/src/PityUnit.hh
@@ -19,7 +19,7 @@
 namespace pEp {
     namespace PityTest11 {
 
-        template<class TestContext>
+        template<class TestContext = void>
         class PityUnit {
         public:
             using TestFunction = const std::function<void(PityUnit<TestContext>&, TestContext*)>;
diff --git a/test/test_execmodes.cc b/test/test_execmodes.cc
index 6de72a9..b66865f 100644
--- a/test/test_execmodes.cc
+++ b/test/test_execmodes.cc
@@ -29,46 +29,36 @@ int main(int argc, char* argv[])
         // Subprocess 1
         PityUnit<> test1 = PityUnit<>{ &root,
                                        "node1",
-                                       [](PityUnit<>& unit,
-                                          PityModel* model,
-                                          PityPerspective* psp) { do_some_work(unit, 200, 10); },
-                                       nullptr,
+                                       [](PityUnit<>& unit, void* ctx) {
+                                           do_some_work(unit, 200, 10);
+                                       },
                                        nullptr,
                                        pEp::PityTest11::PityUnit<>::ExecutionMode::PROCESS_PARALLEL };
 
-        PityUnit<> test1_1 = PityUnit<>{ &test1,
-                                         "test1.1",
-                                         [](PityUnit<>& unit,
-                                            PityModel* model,
-                                            PityPerspective* psp) { do_some_work(unit, 200, 10); } };
+        PityUnit<> test1_1 = PityUnit<>{ &test1, "test1.1", [](PityUnit<>& unit, void* ctx) {
+                                            do_some_work(unit, 200, 10);
+                                        } };
 
-        PityUnit<> test1_2 = PityUnit<>{ &test1,
-                                         "test1.2",
-                                         [](PityUnit<>& unit,
-                                            PityModel* model,
-                                            PityPerspective* psp) { do_some_work(unit, 200, 10); } };
+        PityUnit<> test1_2 = PityUnit<>{ &test1, "test1.2", [](PityUnit<>& unit, void* ctx) {
+                                            do_some_work(unit, 200, 10);
+                                        } };
 
         // Subprocess 2
         PityUnit<> test2 = PityUnit<>{ &root,
                                        "node2",
-                                       [](PityUnit<>& unit,
-                                          PityModel* model,
-                                          PityPerspective* psp) { do_some_work(unit, 200, 10); },
-                                       nullptr,
+                                       [](PityUnit<>& unit, void* ctx) {
+                                           do_some_work(unit, 200, 10);
+                                       },
                                        nullptr,
                                        pEp::PityTest11::PityUnit<>::ExecutionMode::PROCESS_PARALLEL };
 
-        PityUnit<> test2_1 = PityUnit<>{ &test2,
-                                         "test2.1",
-                                         [](PityUnit<>& unit,
-                                            PityModel* model,
-                                            PityPerspective* psp) { do_some_work(unit, 200, 10); } };
+        PityUnit<> test2_1 = PityUnit<>{ &test2, "test2.1", [](PityUnit<>& unit, void* ctx) {
+                                            do_some_work(unit, 200, 10);
+                                        } };
 
-        PityUnit<> test2_2 = PityUnit<>{ &test2,
-                                         "test2.2",
-                                         [](PityUnit<>& unit,
-                                            PityModel* model,
-                                            PityPerspective* psp) { do_some_work(unit, 200, 10); } };
+        PityUnit<> test2_2 = PityUnit<>{ &test2, "test2.2", [](PityUnit<>& unit, void* ctx) {
+                                            do_some_work(unit, 200, 10);
+                                        } };
 
         root.run();
     }
diff --git a/test/test_linear.cc b/test/test_linear.cc
index 3a8f880..27208e6 100644
--- a/test/test_linear.cc
+++ b/test/test_linear.cc
@@ -35,16 +35,16 @@ public:
     Car car;
 };
 
-void test_setGear(const PityUnit<CarTestModel>& node)
+void test_setGear(PityUnit<CarTestModel>& node, CarTestModel* ctx)
 {
     int gear = 1;
     node.log("Setting gear to: " + to_string(gear));
-    node.getModel()->car.setGear(gear);
+    ctx->car.setGear(gear);
 }
 
-void test_drive(const PityUnit<CarTestModel>& node)
+void test_drive(PityUnit<CarTestModel>& node, CarTestModel* ctx)
 {
-    node.getModel()->car.drive();
+    ctx->car.drive();
 }
 
 int main(int argc, char* argv[])
diff --git a/test/test_processdirs.cc b/test/test_processdirs.cc
index 70fe215..ad823d3 100644
--- a/test/test_processdirs.cc
+++ b/test/test_processdirs.cc
@@ -19,95 +19,78 @@ int main(int argc, char* argv[])
     PityUnit<> root = PityUnit<>{ nullptr, "test_processdirs" };
 
     // 1
-    PityUnit<> test1 = PityUnit<>{
-        &root,
-        "node 1",
-        [](PityUnit<>& mynode, PityModel* model, PityPerspective* psp) {
-            PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/");
-        }
-    };
+    PityUnit<> test1 = PityUnit<>{ &root, "node 1", [](PityUnit<>& mynode, void* ctx) {
+                                      PTASSERT(
+                                          mynode.processDir() == "./pitytest_data/test_processdirs/");
+                                  } };
 
-    PityUnit<> test1_1 = PityUnit<>{
-        &test1,
-        "node 1.1",
-        []( PityUnit<>& mynode, PityModel* model, PityPerspective* psp) {
-            PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/");
-        }
-    };
+    PityUnit<> test1_1 = PityUnit<>{ &test1, "node 1.1", [](PityUnit<>& mynode, void* ctx) {
+                                        PTASSERT(
+                                            mynode.processDir() ==
+                                            "./pitytest_data/test_processdirs/");
+                                    } };
 
     // 2
-    PityUnit<> test2 = PityUnit<>{
-        &root,
-        "node 2",
-        []( PityUnit<>& mynode, PityModel* model, PityPerspective* psp) {
-            PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/");
-        }
-    };
+    PityUnit<> test2 = PityUnit<>{ &root, "node 2", [](PityUnit<>& mynode, void* ctx) {
+                                      PTASSERT(
+                                          mynode.processDir() == "./pitytest_data/test_processdirs/");
+                                  } };
 
     PityUnit<> test2_1 = PityUnit<>{
         &test2,
         "node 2.1",
-        []( PityUnit<>& mynode, PityModel* model, PityPerspective* psp) {
+        [](PityUnit<>& mynode, void* ctx) {
             PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_2_1/");
         },
         nullptr,
-        nullptr,
         pEp::PityTest11::PityUnit<>::ExecutionMode::PROCESS_PARALLEL
     };
 
 
-    PityUnit<> test2_1_1 = PityUnit<>{
-        &test2_1,
-        "node 2.1.1",
-        [](PityUnit<> mynode, PityModel* model, PityPerspective* psp) {
-            PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_2_1/");
-        }
-    };
+    PityUnit<> test2_1_1 = PityUnit<>{ &test2_1, "node 2.1.1", [](PityUnit<> mynode, void* ctx) {
+                                          PTASSERT(
+                                              mynode.processDir() ==
+                                              "./pitytest_data/test_processdirs/node_2_1/");
+                                      } };
 
 
     // 3
     PityUnit<> test3 = PityUnit<>{
         &root,
         "node 3",
-        []( PityUnit<>& mynode, PityModel* model, PityPerspective* psp) {
+        [](PityUnit<>& mynode, void* ctx) {
             PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_3/");
         },
         nullptr,
-        nullptr,
         PityUnit<>::ExecutionMode::PROCESS_PARALLEL
     };
 
-    PityUnit<> test3_1 = PityUnit<>{
-        &test3,
-        "node 3.1",
-        []( PityUnit<>& mynode, PityModel* model, PityPerspective* psp) {
-            PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_3/");
-        }
-    };
+    PityUnit<> test3_1 = PityUnit<>{ &test3, "node 3.1", [](PityUnit<>& mynode, void* ctx) {
+                                        PTASSERT(
+                                            mynode.processDir() ==
+                                            "./pitytest_data/test_processdirs/node_3/");
+                                    } };
 
-    PityUnit<> test3_1_1 = PityUnit<>{
-        &test3_1,
-        "node 3.1.1",
-        []( PityUnit<>& mynode, PityModel* model, PityPerspective* psp) {
-            PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_3/");
-        }
-    };
+    PityUnit<> test3_1_1 = PityUnit<>{ &test3_1, "node 3.1.1", [](PityUnit<>& mynode, void* ctx) {
+                                          PTASSERT(
+                                              mynode.processDir() ==
+                                              "./pitytest_data/test_processdirs/node_3/");
+                                      } };
 
     PityUnit<> test3_1_1_1 = PityUnit<>{
         &test3_1_1,
         "node 3.1.1",
-        []( PityUnit<>& mynode, PityModel* model, PityPerspective* psp) {
+        [](PityUnit<>& mynode, void* ctx) {
             PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_3_1_1/");
         },
         nullptr,
-        nullptr,
         PityUnit<>::ExecutionMode::PROCESS_PARALLEL
     };
 
     PityUnit<> test3_1_1_1_1 = PityUnit<>{
         &test3_1_1_1,
         "node 3.1.1.1",
-        []( PityUnit<>& mynode, PityModel* model, PityPerspective* psp) {
+        [](PityUnit<>& mynode, void* ctx) {
             PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_3_1_1/");
         }
     };
diff --git a/test/test_swarm.cc b/test/test_swarm.cc
index eb6ebe5..8a5b2a5 100644
--- a/test/test_swarm.cc
+++ b/test/test_swarm.cc
@@ -29,7 +29,7 @@ void test_node1(PityUnit<PityPerspective>& unit, PityPerspective* psp)
 
 int main(int argc, char* argv[])
 {
-    int nodesCount = 3;
+    int nodesCount = 23;
     PityModel model{ "test_swarm", nodesCount };
     PitySwarm swarm{model};