diff --git a/test/pEpTest/test/test_pEpTest_basic.cc b/test/pEpTest/test/test_pEpTest_basic.cc
index 3c59121..f33638e 100644
--- a/test/pEpTest/test/test_pEpTest_basic.cc
+++ b/test/pEpTest/test/test_pEpTest_basic.cc
@@ -8,7 +8,7 @@ using namespace pEp;
 using namespace pEp::Test;
 
 
-void printHomeDir(pEpTestTree& myself, int sleepmilis, int rep_count)
+void printHomeDir(const pEpTestTree<>& myself, int sleepmilis, int rep_count)
 {
     //    TESTLOGH1("HYA FROM:" + myself.getFQName());
     int i = 0;
@@ -23,49 +23,49 @@ void printHomeDir(pEpTestTree& myself, int sleepmilis, int rep_count)
 int main(int argc, char* argv[])
 {
     string dummy;
-    pEpTestModel model{ "pEpTestModel" };
     {
         // DEBUG Logging of pEpTestTree itself
-        pEpTestTree::debug_log_enabled = true;
+        pEpTestTree<>::debug_log_enabled = false;
 
         // Configure DataRoot for all TestNodes
-        pEpTestTree::setDataRoot("./basic_data_root");
+        pEpTestTree<>::setGlobalRootDir("./basic_data_root");
 
         // The RootNode is the
-        pEpTestTree root = pEpTestTree::createRootNode(
-            model,
-            "Test Execution Model",
-            [](pEpTestTree mynode) { printHomeDir(mynode, 200, 5); });
+        pEpTestTree<> root = pEpTestTree<>{ nullptr, "Test Execution Model"};
 
         // Subprocess 1
-        pEpTestTree test1 = pEpTestTree::createChildNode(
-            root,
+        pEpTestTree<> test1 = pEpTestTree<>{
+            &root,
             "node1",
-            [](pEpTestTree mynode) { printHomeDir(mynode, 200, 10); },
-            pEp::Test::pEpTestTree::ExecutionMode::PROCESS_PARALLEL);
+            [](const pEpTestTree<>& mynode) { printHomeDir(mynode, 200, 10); },
+            nullptr,
+            pEp::Test::pEpTestTree<>::ExecutionMode::PROCESS_PARALLEL
+        };
 
-        pEpTestTree test1_1 = pEpTestTree::createChildNode(test1, "test1.1", [](pEpTestTree mynode) {
-            printHomeDir(mynode, 200, 10);
-        });
+        pEpTestTree<> test1_1 = pEpTestTree<>{ &test1, "test1.1", [](const pEpTestTree<>& mynode) {
+                                                  printHomeDir(mynode, 200, 10);
+                                              } };
 
-        pEpTestTree test1_2 = pEpTestTree::createChildNode(test1, "test1.2", [](pEpTestTree mynode) {
-            printHomeDir(mynode, 200, 10);
-        });
+        pEpTestTree<> test1_2 = pEpTestTree<>{ &test1, "test1.2", [](const pEpTestTree<>& mynode) {
+                                                  printHomeDir(mynode, 200, 10);
+                                              } };
 
         // Subprocess 2
-        pEpTestTree test2 = pEpTestTree::createChildNode(
-            root,
+        pEpTestTree<> test2 = pEpTestTree<>{
+            &root,
             "node2",
-            [](pEpTestTree mynode) { printHomeDir(mynode, 200, 10); },
-            pEp::Test::pEpTestTree::ExecutionMode::PROCESS_PARALLEL);
+            [](const pEpTestTree<>& mynode) { printHomeDir(mynode, 200, 10); },
+            nullptr,
+            pEp::Test::pEpTestTree<>::ExecutionMode::PROCESS_PARALLEL
+        };
 
-        pEpTestTree test2_1 = pEpTestTree::createChildNode(test2, "test2.1", [](pEpTestTree mynode) {
-          printHomeDir(mynode, 200, 10);
-        });
+        pEpTestTree<> test2_1 = pEpTestTree<>{ &test2, "test2.1", [](const pEpTestTree<>& mynode) {
+                                                  printHomeDir(mynode, 200, 10);
+                                              } };
 
-        pEpTestTree test2_2 = pEpTestTree::createChildNode(test2, "test2.2", [](pEpTestTree mynode) {
-          printHomeDir(mynode, 200, 10);
-        });
+        pEpTestTree<> test2_2 = pEpTestTree<>{ &test2, "test2.2", [](const pEpTestTree<>& mynode) {
+                                                  printHomeDir(mynode, 200, 10);
+                                              } };
 
         root.run();
     }
diff --git a/test/pEpTest/test/test_transport.cc b/test/pEpTest/test/test_transport.cc
index 22ed387..053869a 100644
--- a/test/pEpTest/test/test_transport.cc
+++ b/test/pEpTest/test/test_transport.cc
@@ -11,48 +11,43 @@ using namespace pEp;
 using namespace pEp::Test;
 
 
-void printHomeDir(pEpTestTree& myself)
+void printHomeDir(const pEpTestTree<>& myself)
 {
     //    TESTLOG(string(myself.getFQName() + " - PID: " + to_string(getpid())));
     //    cout << "[" << to_string(getpid()) << "/" << myself.getFQName() << "] -  " << endl;
-    setenv("HOME", myself.getDataDir().c_str(), 1);
+    setenv("HOME", myself.processDir().c_str(), 1);
     myself.log("HOME=" + string(getenv("HOME")));
 }
 
+
 int main(int argc, char* argv[])
 {
-    pEpTestModel model{ "TestTransport" };
-//    pEpTestTree::debug_log_enabled = true;
-    pEpTestTree::setDataRoot("./testdata/");
-    {
-        pEpTestTree root = pEpTestTree::createRootNode(
-            model,
-            "root node nr.1",
-            [](pEpTestTree mynode) { printHomeDir(mynode); },
-            pEp::Test::pEpTestTree::ExecutionMode::PROCESS_PARALLEL);
-
-        pEpTestTree test1 = pEpTestTree::createChildNode(root, "node 1", [](pEpTestTree mynode) {
-            printHomeDir(mynode);
-        });
-
-        pEpTestTree test1_1 = pEpTestTree::createChildNode(test1, "node 1.1", [](pEpTestTree mynode) {
-            printHomeDir(mynode);
-        });
-
-        pEpTestTree test2 = pEpTestTree::createChildNode(root, "node 2", [](pEpTestTree mynode) {
-            printHomeDir(mynode);
-        });
-
-        pEpTestTree test2_1 = pEpTestTree::createChildNode(
-            test2,
-            "node 2.1",
-            [](pEpTestTree mynode) { printHomeDir(mynode); },
-            pEp::Test::pEpTestTree::ExecutionMode::PROCESS_PARALLEL);
-
-        pEpTestTree test2_1_1 = pEpTestTree::createChildNode(test2_1, "node 2.1.1", [](pEpTestTree mynode) {
-            printHomeDir(mynode);
-        });
-
-        root.run();
-    }
+    pEpTestTree<>::debug_log_enabled = true;
+    pEpTestTree<>::setGlobalRootDir("./testdata");
+    pEpTestTree<> root = pEpTestTree<>{ nullptr, "rootnode"};
+
+    pEpTestTree<> test1 = pEpTestTree<>{ &root, "node 1", [](const pEpTestTree<>& mynode) {
+                                            printHomeDir(mynode);
+                                        } };
+
+    pEpTestTree<> test1_1 = pEpTestTree<>{ &test1, "node 1.1", [](const pEpTestTree<>& mynode) {
+                                              printHomeDir(mynode);
+                                          } };
+
+    pEpTestTree<> test2 = pEpTestTree<>{ &root, "node 2", [](const pEpTestTree<>& mynode) {
+                                            printHomeDir(mynode);
+                                        } };
+
+    pEpTestTree<> test2_1 = pEpTestTree<>{ &test2,
+                                           "node 2.1",
+                                           [](const pEpTestTree<>& mynode) { printHomeDir(mynode); },
+                                           nullptr,
+                                           pEp::Test::pEpTestTree<>::ExecutionMode::PROCESS_PARALLEL };
+
+
+    pEpTestTree<> test2_1_1 = pEpTestTree<>{ &test2_1, "node 2.1.1", [](pEpTestTree<> mynode) {
+                                                printHomeDir(mynode);
+                                            } };
+
+    root.run();
 }
\ No newline at end of file