diff --git a/doc/technical/infra/TestSupport.txt b/doc/technical/infra/TestSupport.txt
index a4350baf7..59d134cbf 100644
--- a/doc/technical/infra/TestSupport.txt
+++ b/doc/technical/infra/TestSupport.txt
@@ -107,7 +107,7 @@ See the following
 .hello-world-test example
 [source,C]
 ----------------------------------------------------------------
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include <iostream>
 
 using std::cout;
diff --git a/research/try.cpp b/research/try.cpp
index b6e9d0a82..6fa4a24b9 100644
--- a/research/try.cpp
+++ b/research/try.cpp
@@ -19,8 +19,8 @@
 
 
 #include "lib/format-cout.hpp"
-#include "lib/test/test-helper.hpp"
-#include "lib/test/diagnostic-output.hpp"
+#include "test/test-helper.hpp"
+#include "test/diagnostic-output.hpp"
 #include "lib/meta/tuple-helper.hpp"
 #include "lib/hetero-data.hpp"
 #include "lib/util.hpp"
@@ -41,11 +41,11 @@ template<lib::meta::tuple_like X>
 void
 show()
   {
-    cout << "Tup!! "<< lib::test::showType<X>() <<endl;
+    cout << "Tup!! "<< ::test::showType<X>() <<endl;
     lib::meta::forEachIDX<X> ([](auto i)
                                 {
                                   using Elm = std::tuple_element_t<i, X>;
-                                  cout <<"  "<<uint(i)<<": "<< lib::test::showType<Elm>() <<endl;
+                                  cout <<"  "<<uint(i)<<": "<< ::test::showType<Elm>() <<endl;
                                 });
   }
 
diff --git a/src/SConscript b/src/SConscript
index e52b258a3..d5ddf2194 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -32,6 +32,10 @@ lumiera = ( env.Program('lumiera', ['lumiera/main.cpp'] + core, install=True)
 env.SymLink('$DESTDIR/bin/lumiera',env.path.installExe+'lumiera','../lib/lumiera/lumiera')
 
 
+# Unit/Integration test support
+test_support = env.SharedLibrary('testsupport', srcSubtree('test'), addLibs=vessel_lib, install=False)
+
+
 # building Lumiera Plugins
 plugins = [] # currently none
 
@@ -49,4 +53,4 @@ gui       = ( guimodule
             )
 
 
-Export('lumiera core core_lib vessel_lib vault_lib support_lib plugins envGtk guimodule gui')
+Export('lumiera core core_lib vessel_lib vault_lib support_lib test_support plugins envGtk guimodule gui')
diff --git a/src/lib/diff/test-mutation-target.hpp b/src/lib/diff/test-mutation-target.hpp
index 713fe23b6..13ee8583e 100644
--- a/src/lib/diff/test-mutation-target.hpp
+++ b/src/lib/diff/test-mutation-target.hpp
@@ -43,7 +43,7 @@
 #include "lib/idi/genfunc.hpp"
 #include "lib/format-string.hpp"
 #include "lib/format-util.hpp"
-#include "lib/test/event-log.hpp"
+#include "test/event-log.hpp"
 #include "lib/nocopy.hpp"
 #include "lib/util.hpp"
 
@@ -58,8 +58,8 @@ namespace diff{
   namespace error = lumiera::error;
   
   using lib::Literal;
-  using lib::test::EventLog;
-  using lib::test::EventMatch;
+  using test::EventLog;
+  using test::EventMatch;
   using iter_stl::eachElm;
   using util::unConst;
   using util::isnil;
diff --git a/src/lib/format-obj.cpp b/src/lib/format-obj.cpp
index 06086cb8c..676a4713f 100644
--- a/src/lib/format-obj.cpp
+++ b/src/lib/format-obj.cpp
@@ -197,10 +197,10 @@ apologies for that."
                                 "|(\\w+::)+\\(anonymous namespace\\)::"
                                 "|lib::meta::"
                                 "|lib::time::"
-                                "|lib::test::"
                                 "|lib::diff::"
                                 "|lib::"
                                 "|util::"
+                                "|\\btest::"
                                 "|steam::(asset::|mobject::(session::)?|play::)?"
                                 "|stage::model"
                                 "|stage::ctrl"
diff --git a/src/lib/random.cpp b/src/lib/random.cpp
index cebf81a18..bcce7fa0d 100644
--- a/src/lib/random.cpp
+++ b/src/lib/random.cpp
@@ -85,6 +85,27 @@ namespace lib {
     entropyGen.reseed(entropyNucleus);
     defaultGen.reseed(entropyNucleus);
   }
+
+  
+  
+  /**
+   * @remark this is a general-purpose util mostly used in unit-tests
+   *   to generate a short string item that looks readable; probabilities
+   *   of individual letters were chosen non-uniformely to improve readability.
+   */
+  string
+  randStr (size_t len)
+  {
+    static const string alpha{"aaaabbccdddeeeeeffgghiiiiiijjkkllmmnnnoooopqqrrssttuuuuvwwxxxxxxxxxyyyyzz0123456789"};
+    static const size_t MAXCH{alpha.size()};
+    
+    string garbage(len,'\0');
+    size_t p = len;
+    while (p)
+      garbage[--p] = alpha[rani (MAXCH)];
+    return garbage;
+  }
+  
   
   
 } // namespace lib
diff --git a/src/lib/random.hpp b/src/lib/random.hpp
index fb2c800b3..f03744d64 100644
--- a/src/lib/random.hpp
+++ b/src/lib/random.hpp
@@ -166,6 +166,14 @@ namespace lib {
   
   
   
+  /* ===== general-purpose utils ===== */
+  
+  /** create garbage string of given length.
+   *  @return string containing arbitrary lower case letters and numbers
+   */
+  std::string randStr (size_t len);
+  
+  
   
   /* ===== Implementation details ===== */
   
diff --git a/src/stage/dialog/test-control.hpp b/src/stage/dialog/test-control.hpp
index 45ccf97a4..628a7db55 100644
--- a/src/stage/dialog/test-control.hpp
+++ b/src/stage/dialog/test-control.hpp
@@ -40,7 +40,7 @@
 #include "include/gui-notification-facade.h"
 #include "steam/mobject/session/dummy-session-connection.hpp"
 
-#include "lib/test/test-helper.hpp"
+#include "test/test-helper.hpp"
 #include "lib/diff/gen-node.hpp"
 #include "lib/scoped-ptrvect.hpp"
 #include "lib/format-string.hpp"
@@ -285,7 +285,7 @@ namespace dialog {
           pickDummyID()
             {
               string dummyID = sanitise (dummy_.get_text());
-              dummy_.set_text (string{_Fmt{"d%s%02d"} % lib::test::randStr(2) % (1 + lib::rani(99))});
+              dummy_.set_text (string{_Fmt{"d%s%02d"} % lib::randStr(2) % (1 + lib::rani(99))});
               return dummyID;
             }
           
diff --git a/src/steam/engine/feed-manifold.hpp b/src/steam/engine/feed-manifold.hpp
index f91ba8f44..7487955a5 100644
--- a/src/steam/engine/feed-manifold.hpp
+++ b/src/steam/engine/feed-manifold.hpp
@@ -83,7 +83,7 @@
 #include "lib/meta/variadic-helper.hpp"
 #include "lib/meta/tuple-helper.hpp"
 #include "lib/meta/generator.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/test-helper.hpp"
 
 
 namespace steam {
diff --git a/src/steam/engine/weaving-pattern-builder.hpp b/src/steam/engine/weaving-pattern-builder.hpp
index 9b82b57bc..945ce238a 100644
--- a/src/steam/engine/weaving-pattern-builder.hpp
+++ b/src/steam/engine/weaving-pattern-builder.hpp
@@ -139,7 +139,7 @@
 #include "steam/engine/media-weaving-pattern.hpp"
 #include "lib/meta/tuple-closure.hpp"
 #include "lib/meta/tuple-helper.hpp"
-//#include "lib/test/test-helper.hpp" ////////////////////////////OOO TODO added for test
+//#include "test/test-helper.hpp" ////////////////////////////OOO TODO added for test
 #include "lib/format-string.hpp"
 #include "lib/iter-zip.hpp"
 #include "lib/util.hpp"
diff --git a/src/steam/mobject/test-dummy-mobject.hpp b/src/steam/mobject/test-dummy-mobject.hpp
index cccdefac7..aad699f33 100644
--- a/src/steam/mobject/test-dummy-mobject.hpp
+++ b/src/steam/mobject/test-dummy-mobject.hpp
@@ -31,7 +31,7 @@
 #ifndef MOBJECT_TEST_DUMMY_MOBJECT_H
 #define MOBJECT_TEST_DUMMY_MOBJECT_H
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 
 #include "steam/mobject/builder/buildertool.hpp"
 #include "steam/mobject/session/abstractmo.hpp"
diff --git a/src/test/DIR_INFO b/src/test/DIR_INFO
new file mode 100644
index 000000000..d51353d19
--- /dev/null
+++ b/src/test/DIR_INFO
@@ -0,0 +1 @@
+Testrunner and test support utilities -- but not the unit-tests themselves
diff --git a/src/lib/test/diagnostic-output.hpp b/src/test/diagnostic-output.hpp
similarity index 82%
rename from src/lib/test/diagnostic-output.hpp
rename to src/test/diagnostic-output.hpp
index 4ab9f851b..c7061ebcf 100644
--- a/src/lib/test/diagnostic-output.hpp
+++ b/src/test/diagnostic-output.hpp
@@ -23,12 +23,12 @@
  */
 
 
-#ifndef LIB_TEST_DIAGNOSTIC_OUTPUT_H
-#define LIB_TEST_DIAGNOSTIC_OUTPUT_H
+#ifndef TEST_DIAGNOSTIC_OUTPUT_H
+#define TEST_DIAGNOSTIC_OUTPUT_H
 
 
 #include "lib/format-cout.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/test-helper.hpp"
 
 #include <boost/lexical_cast.hpp>
 #include <string>
@@ -36,10 +36,9 @@
 
 using std::string;
 
-namespace lib {
 namespace test{
   
-}} // namespace lib::test
+}// namespace test
 
 
 
@@ -51,11 +50,11 @@ namespace test{
  * using Lumiera's string conversion framework
  */
 #define SHOW_TYPE(_TY_) \
-    cout << "typeof( " << STRINGIFY(_TY_) << " )= " << lib::test::showType<_TY_>() <<endl;
+    cout << "typeof( " << STRINGIFY(_TY_) << " )= " << ::test::showType<_TY_>() <<endl;
 #define SHOW_EXPR(_XX_) \
     cout << "#--◆--# " << STRINGIFY(_XX_) << " ? = " << util::toString(_XX_) <<endl;
 #define SHOW_EXPL(_XX_) \
     cout << "#--◆--# " << STRINGIFY(_XX_) << " ? = " << boost::lexical_cast<string>(_XX_) <<endl;
 
 
-#endif /*LIB_TEST_DIAGNOSTIC_OUTPUT_H*/
+#endif /*TEST_DIAGNOSTIC_OUTPUT_H*/
diff --git a/src/lib/test/event-log.cpp b/src/test/event-log.cpp
similarity index 99%
rename from src/lib/test/event-log.cpp
rename to src/test/event-log.cpp
index cc5a16680..95f5e54f2 100644
--- a/src/lib/test/event-log.cpp
+++ b/src/test/event-log.cpp
@@ -35,11 +35,10 @@
 
 
 #include "lib/error.hpp"
-#include "lib/test/event-log.hpp"
+#include "test/event-log.hpp"
 
 
 
-namespace lib {
 namespace test{
   namespace error = lumiera::error;
   
@@ -48,6 +47,7 @@ namespace test{
   using util::isnil;
   using lib::Symbol;
   using std::string;
+  using std::forward;
   
   
   namespace { /* == elementary matchers == */
@@ -812,4 +812,4 @@ namespace test{
   
   
   
-}} // namespace lib::test
+}// namespace test
diff --git a/src/lib/test/event-log.hpp b/src/test/event-log.hpp
similarity index 97%
rename from src/lib/test/event-log.hpp
rename to src/test/event-log.hpp
index 4c0761917..d2e04ea94 100644
--- a/src/lib/test/event-log.hpp
+++ b/src/test/event-log.hpp
@@ -67,8 +67,8 @@
  */
 
 
-#ifndef LIB_TEST_EVENT_LOG_H
-#define LIB_TEST_EVENT_LOG_H
+#ifndef TESTSUPPORT_EVENT_LOG_H
+#define TESTSUPPORT_EVENT_LOG_H
 
 
 #include "lib/error.hpp"
@@ -88,12 +88,13 @@
 
 
 
-namespace lib {
-namespace test{
+namespace test {
   
-  using lib::Symbol;
   using std::string;
+  using lib::Symbol;
+  using lib::Literal;
   using util::collectStr;
+  using lib::idi::instanceTypeID;
   
   namespace {
     using Entry = lib::diff::Record<string>;
@@ -103,7 +104,7 @@ namespace test{
     buildSearchFilter(Log const& srcSeq)
     {
       using Cursor  = lib::iter::CursorGear<Log::const_iterator>;
-      return iter::chainSearch (Cursor{srcSeq.begin(), srcSeq.end()});
+      return lib::iter::chainSearch (Cursor{srcSeq.begin(), srcSeq.end()});
     }
   }
   
@@ -243,7 +244,7 @@ namespace test{
       template<typename X>
       EventMatch& on (const X *const targetObj)
         {
-          string targetID = idi::instanceTypeID (targetObj);
+          string targetID = instanceTypeID (targetObj);
           return this->on(targetID);
         }
       
@@ -305,7 +306,7 @@ namespace test{
       template<class X>
       explicit
       EventLog (const X *const obj)
-        : EventLog(idi::instanceTypeID (obj))
+        : EventLog(instanceTypeID (obj))
         { }
       
       
@@ -337,7 +338,7 @@ namespace test{
       EventLog&
       clear (const X *const obj)
         {
-          return clear (idi::instanceTypeID (obj));
+          return clear (instanceTypeID (obj));
         }
       
       
@@ -387,7 +388,7 @@ namespace test{
       EventLog&
       call (const X *const targetObj, string function, ARGS const& ...args)
         {
-          return call (idi::instanceTypeID (targetObj), function, args...);
+          return call (instanceTypeID (targetObj), function, args...);
         }
       
       template<typename...ARGS>
@@ -532,5 +533,5 @@ namespace test{
   
   
   
-}} // namespace lib::test
-#endif /*LIB_TEST_EVENT_LOG_H*/
+} // namespace test
+#endif /*TESTSUPPORT_EVENT_LOG_H*/
diff --git a/src/lib/test/microbenchmark-adaptor.hpp b/src/test/microbenchmark-adaptor.hpp
similarity index 96%
rename from src/lib/test/microbenchmark-adaptor.hpp
rename to src/test/microbenchmark-adaptor.hpp
index 3733d3a02..262783b2f 100644
--- a/src/lib/test/microbenchmark-adaptor.hpp
+++ b/src/test/microbenchmark-adaptor.hpp
@@ -27,14 +27,13 @@
  */
 
 
-#ifndef LIB_TEST_MICROBENCHMARK_ADAPTOR_H
-#define LIB_TEST_MICROBENCHMARK_ADAPTOR_H
+#ifndef TEST_MICROBENCHMARK_ADAPTOR_H
+#define TEST_MICROBENCHMARK_ADAPTOR_H
 
 
 #include "lib/meta/function.hpp"
 #include "lib/meta/util.hpp"
 
-namespace lib {
 namespace test{
 namespace microbenchmark {
   
@@ -158,5 +157,5 @@ namespace microbenchmark {
   
   
   
-}}} // namespace lib::test::microbenchmark
-#endif /*LIB_TEST_MICROBENCHMARK_ADAPTOR_H*/
+}} // namespace test::microbenchmark
+#endif /*TEST_MICROBENCHMARK_ADAPTOR_H*/
diff --git a/src/lib/test/microbenchmark.hpp b/src/test/microbenchmark.hpp
similarity index 97%
rename from src/lib/test/microbenchmark.hpp
rename to src/test/microbenchmark.hpp
index e8e4c5630..13c5ac6e2 100644
--- a/src/lib/test/microbenchmark.hpp
+++ b/src/test/microbenchmark.hpp
@@ -41,8 +41,8 @@
  */
 
 
-#ifndef LIB_TEST_MICROBENCHMARK_H
-#define LIB_TEST_MICROBENCHMARK_H
+#ifndef TEST_MICROBENCHMARK_H
+#define TEST_MICROBENCHMARK_H
 
 
 #include "lib/meta/function.hpp"
@@ -50,13 +50,12 @@
 #include "lib/sync-barrier.hpp"
 #include "lib/thread.hpp"
 
-#include "lib/test/microbenchmark-adaptor.hpp"
+#include "test/microbenchmark-adaptor.hpp"
 
 #include <chrono>
 
 
 
-namespace lib {
 namespace test{
   
   namespace {
@@ -146,6 +145,7 @@ namespace test{
   inline auto
   threadBenchmark(FUN const& subject, const size_t repeatCnt = DEFAULT_RUNS)
   {
+    using lib::SyncBarrier;
     using std::chrono::steady_clock;
     using Dur = std::chrono::duration<double, CLOCK_SCALE>;
     
@@ -195,5 +195,5 @@ namespace test{
   
   
   
-}} // namespace lib::test
-#endif /*LIB_TEST_MICROBENCHMARK_H*/
+}// namespace test
+#endif /*TESTSUPPORT_MICROBENCHMARK_H*/
diff --git a/src/lib/test/run.hpp b/src/test/run.hpp
similarity index 96%
rename from src/lib/test/run.hpp
rename to src/test/run.hpp
index 035633af9..b353b062c 100644
--- a/src/lib/test/run.hpp
+++ b/src/test/run.hpp
@@ -24,15 +24,15 @@
  */
 
 
-#ifndef TESTHELPER_RUN_H
-#define TESTHELPER_RUN_H
+#ifndef TESTSUITE_RUN_H
+#define TESTSUITE_RUN_H
 
 #include "lib/error.hpp"
 #include "lib/random.hpp"
-
-#include "lib/test/suite.hpp"
 #include "lib/util.hpp"
 
+#include "test/suite.hpp"
+
 #include <memory>
 #include <string>
 
@@ -118,4 +118,4 @@ using lib::defaultGen;
   Launch<_TEST_CLASS_> run_##_TEST_CLASS_##_(STRINGIFY(_TEST_CLASS_), _GROUPS_);
 
 
-#endif /*TESTHELPER_RUN_H*/
+#endif /*TESTSUITE_RUN_H*/
diff --git a/src/lib/test/suite.cpp b/src/test/suite.cpp
similarity index 99%
rename from src/lib/test/suite.cpp
rename to src/test/suite.cpp
index 2f1a096d9..eaa0557f3 100644
--- a/src/lib/test/suite.cpp
+++ b/src/test/suite.cpp
@@ -22,12 +22,13 @@
 #include "lib/symbol.hpp"
 #include "lib/random-reseed.hpp"
 #include "lib/format-cout.hpp"
-#include "lib/test/suite.hpp"
-#include "lib/test/run.hpp"
 #include "lib/cmdline.hpp"
 #include "lib/random.hpp"
 #include "lib/util.hpp"
 
+#include "test/suite.hpp"
+#include "test/run.hpp"
+
 #include <boost/algorithm/string.hpp>
 #include <optional>
 #include <sstream>
diff --git a/src/lib/test/suite.hpp b/src/test/suite.hpp
similarity index 96%
rename from src/lib/test/suite.hpp
rename to src/test/suite.hpp
index b7e7137e5..d072209f8 100644
--- a/src/lib/test/suite.hpp
+++ b/src/test/suite.hpp
@@ -28,8 +28,8 @@
  */
 
 
-#ifndef TESTHELPER_SUITE_H
-#define TESTHELPER_SUITE_H
+#ifndef TEST_SUITE_H
+#define TEST_SUITE_H
 
 #include <vector>
 #include <string>
@@ -75,4 +75,4 @@ namespace test {
   
   
 } // namespace test
-#endif
+#endif /*TEST_SUITE_H*/
diff --git a/src/lib/test/temp-dir.hpp b/src/test/temp-dir.hpp
similarity index 92%
rename from src/lib/test/temp-dir.hpp
rename to src/test/temp-dir.hpp
index 5c20aea88..ae2d995c6 100644
--- a/src/lib/test/temp-dir.hpp
+++ b/src/test/temp-dir.hpp
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef LIB_TEST_TEMP_DIR_H
-#define LIB_TEST_TEMP_DIR_H
+#ifndef TESTSUPPORT_TEMP_DIR_H
+#define TESTSUPPORT_TEMP_DIR_H
 
 
 #include "lib/error.hpp"
@@ -27,6 +27,7 @@
 #include "lib/random.hpp"
 #include "include/limits.hpp"
 #include "lib/format-string.hpp"
+#include "lib/format-obj.hpp"
 #include "lib/file.hpp"
 #include "lib/util.hpp"
 
@@ -34,9 +35,7 @@
 #include <string>
 
 
-namespace lib {
 namespace test{
-  
   namespace error = lumiera::error;
   
   using util::_Fmt;
@@ -44,7 +43,7 @@ namespace test{
   using std::string;
   
   namespace {
-    Literal TEMPFILE_PREFIX = "Lux";
+    lib::Literal TEMPFILE_PREFIX = "Lux";
   }
   
   
@@ -98,7 +97,7 @@ namespace test{
           auto tmpDir = fs::temp_directory_path();
           for (uint attempt=0; attempt<LUMIERA_MAX_COMPETITION; ++attempt)
             {
-              auto randName = TEMPFILE_PREFIX + util::showHash (entropyGen.u64());
+              auto randName = TEMPFILE_PREFIX + util::showHash (lib::entropyGen.u64());
               auto newPath = tmpDir / randName;
               //  attempt to create it....
               if (fs::create_directory (newPath)
@@ -117,7 +116,7 @@ namespace test{
         {
           for (uint attempt=0; attempt<LUMIERA_MAX_COMPETITION; ++attempt)
             {
-              auto randName = prefix + "." + util::showHash (entropyGen.u64());
+              auto randName = prefix + "." + util::showHash (lib::entropyGen.u64());
               auto newPath = loc_ / randName;
               //  attempt to create it....
               if (fs::exists(newPath))
@@ -141,5 +140,5 @@ namespace test{
     };
   
   
-}} // namespace lib::test
-#endif /*LIB_TEST_TEMP_DIR_H*/
+}// namespace test
+#endif /*TESTSUPPORT_TEMP_DIR_H*/
diff --git a/src/lib/test/test-coll.hpp b/src/test/test-coll.hpp
similarity index 81%
rename from src/lib/test/test-coll.hpp
rename to src/test/test-coll.hpp
index 4c5acbd4f..4e737bb58 100644
--- a/src/lib/test/test-coll.hpp
+++ b/src/test/test-coll.hpp
@@ -17,8 +17,8 @@
  */
 
 
-#ifndef LIB_TEST_TEST_COLL_H
-#define LIB_TEST_TEST_COLL_H
+#ifndef TESTSUPPORT_TEST_COLL_H
+#define TESTSUPPORT_TEST_COLL_H
 
 
 #include <unordered_map>
@@ -27,8 +27,7 @@
 #include <map>
 
 
-namespace lib {
-namespace test{
+namespace test {
   
   
   typedef std::vector<int> VecI;
@@ -45,11 +44,11 @@ namespace test{
   }
   
 
-  typedef std::map<int,int> MapII;
-  typedef std::multimap<int,int> MMapII;
+  using MapII   = std::map<int,int>;
+  using MMapII  = std::multimap<int,int>;
   
-  typedef std::unordered_map<int,int> HMapII;
-  typedef std::unordered_multimap<int,int> HMMapII;
+  using HMapII  = std::unordered_map<int,int>;
+  using HMMapII = std::unordered_multimap<int,int>;
   
   
   template<class MAP>
@@ -87,5 +86,5 @@ namespace test{
 
   
   
-}} // namespace lib::test
-#endif /*LIB_TEST_TEST_COLL_H*/
+}// namespace test
+#endif /*TESTSUPPORT_TEST_COLL_H*/
diff --git a/src/lib/test/test-helper.cpp b/src/test/test-helper.cpp
similarity index 76%
rename from src/lib/test/test-helper.cpp
rename to src/test/test-helper.cpp
index 891a71cdf..e53aa86fd 100644
--- a/src/lib/test/test-helper.cpp
+++ b/src/test/test-helper.cpp
@@ -21,8 +21,8 @@
  */
 
 
-#include "lib/test/test-helper.hpp"
-#include "lib/test/tracking-dummy.hpp"
+#include "test/test-helper.hpp"
+#include "test/tracking-dummy.hpp"
 #include "lib/unique-malloc-owner.hpp"
 #include "lib/format-string.hpp"
 #include "lib/format-cout.hpp"
@@ -33,7 +33,6 @@
 using util::_Fmt;
 using std::string;
 
-namespace lib {
 namespace test{
 
   
@@ -55,23 +54,6 @@ namespace test{
   
   
   
-  /** @todo probably this can be done in a more clever way. Anyone...?
-   */
-  string
-  randStr (size_t len)
-  {
-    static const string alpha{"aaaabbccddeeeeffgghiiiijjkkllmmnnooooppqqrrssttuuuuvvwwxxyyyyzz0123456789"};
-    static const size_t MAXAL{alpha.size()};
-    
-    string garbage(len,'\0');
-    size_t p = len;
-    while (p)
-      garbage[--p] = alpha[rani (MAXAL)];
-    return garbage;
-  }
-  
-  
-  
   /**
    * @internal check equality and print difference
    * @remark defined here to avoid inclusion of `<iostream>` in header
@@ -92,4 +74,4 @@ namespace test{
   }
   
   
-}} // namespace lib::test
+}// namespace test
diff --git a/src/lib/test/test-helper.hpp b/src/test/test-helper.hpp
similarity index 88%
rename from src/lib/test/test-helper.hpp
rename to src/test/test-helper.hpp
index 4f3a73515..1aabfebf9 100644
--- a/src/lib/test/test-helper.hpp
+++ b/src/test/test-helper.hpp
@@ -27,14 +27,14 @@
  */
 
 
-#ifndef LIB_TEST_TEST_HELPER_H
-#define LIB_TEST_TEST_HELPER_H
+#ifndef TESTSUPPORT_TEST_HELPER_H
+#define TESTSUPPORT_TEST_HELPER_H
 
 
 #include "lib/symbol.hpp"
 #include "lib/meta/trait.hpp"
 #include "lib/time/timevalue.hpp"
-#include "lib/test/transiently.hpp"
+#include "test/transiently.hpp"
 #include "lib/format-obj.hpp"
 #include "lib/random.hpp"
 
@@ -48,22 +48,25 @@
 
 
 
-namespace lib {
 namespace test{
 
   using lib::Literal;
   using std::string;
+  using lib::randStr;
   using lib::rani;
+  using lib::meta::enable_if;
+  using lib::meta::disable_if;
   using lib::meta::demangleCxx;
+  using lib::meta::humanReadableTypeID;
   
   
-  constexpr auto ROUGH_PRECISION  = pow (10, -3);
-  constexpr auto EPSILON_ULP      = 5;
+  constexpr auto ROUGH_PRECISION = pow (10, -3);
+  constexpr auto EPSILON_ULP     = 5;
   
   
   template<typename F, typename N>
-  constexpr inline                                   meta::enable_if< std::is_floating_point<F>,
-  bool                                                              >
+  constexpr inline                                   enable_if< std::is_floating_point<F>,
+  bool                                                        >
   roughEQ (F val, N target, F limit =ROUGH_PRECISION)
   {
     REQUIRE (0 < limit);
@@ -72,8 +75,8 @@ namespace test{
   
   
   template<typename F>
-  constexpr inline                                   meta::enable_if< std::is_floating_point<F>,
-  F                                                                 >
+  constexpr inline                                   enable_if< std::is_floating_point<F>,
+  F                                                           >
   ulp (F val)
   {
     val = fabs (val);
@@ -86,8 +89,8 @@ namespace test{
   }
   
   template<typename F, typename N>
-  constexpr inline                                   meta::enable_if< std::is_floating_point<F>,
-  bool                                                              >
+  constexpr inline                                   enable_if< std::is_floating_point<F>,
+  bool                                                        >
   epsEQ (F val, N target, uint ulps =EPSILON_ULP)
   {
     return abs (val - target) < ulps * ulp<F> (target);
@@ -112,8 +115,8 @@ namespace test{
   }
   
   template<typename T>
-  inline                                      meta::disable_if<std::is_pointer<T>,
-  string                                      >                                 // note:: force invocations with pointer to the first overload
+  inline                                      disable_if<std::is_pointer<T>,
+  string                                      >                           // note:: force invocations with pointer to the first overload
   showSizeof (T const& obj, CStr name =nullptr)
   {
     return showSizeof (&obj, name);
@@ -260,7 +263,7 @@ namespace test{
     using Type = Case::Type;
     
     return Case::prefix
-         + meta::humanReadableTypeID (typeid(Type).name())
+         + humanReadableTypeID (typeid(Type).name())
          + Case::postfix;
   }
   
@@ -304,17 +307,13 @@ namespace test{
   
   
   
-  /** create a random but not insane Time value between 1s ... 10min + 500ms */
+  /** create a random yet plausible Time value between 1s ... 10min + 500ms */
   inline lib::time::Time
   randTime ()
   {
     return lib::time::Time (500 * rani(2), 1 + rani(600));
   }
   
-  /** create garbage string of given length
-   *  @return string containing arbitrary lower case letters and numbers
-   */
-  string randStr (size_t len);
   
   
   /**
@@ -360,7 +359,7 @@ namespace test{
       bool verify (std::string const& actual)  const;
     };
   
-}} // namespace lib::test
+}// namespace test
 
 
 
@@ -374,10 +373,10 @@ namespace test{
  * CHECK (result23 == "[-100..100]"_expect);
  * \endcode
  */
-inline lib::test::ExpectString
+inline ::test::ExpectString
 operator""_expect (CStr lit, size_t siz)
 {
-  return lib::test::ExpectString{lit, siz};
+  return ::test::ExpectString{lit, siz};
 }
 
 
@@ -390,24 +389,24 @@ operator""_expect (CStr lit, size_t siz)
  * an assertion failure. In case of exception, the #lumiera_error
  * state is checked, cleared and verified.
  */
-#define VERIFY_ERROR(ERROR_ID, ERRONEOUS_STATEMENT)               \
-          try                                                      \
-            {                                                       \
-              ERRONEOUS_STATEMENT ;                                  \
-              NOTREACHED("expected »%s« failure in: %s",              \
-                          #ERROR_ID, #ERRONEOUS_STATEMENT);            \
-            }                                                           \
-          catch (lumiera::Error& ex)                                     \
-            {                                                             \
-              CHECK (ex.getID()                                            \
-                     == lib::test::ExpectString{LUMIERA_ERROR_##ERROR_ID} );\
-              lumiera_error();                                               \
-            }                                                                 \
-          catch (...)                                                          \
-            {                                                                   \
-              CHECK (lumiera_error_peek()                                        \
-                     == lib::test::ExpectString{LUMIERA_ERROR_##ERROR_ID} );      \
-              lumiera_error();                                                     \
+#define VERIFY_ERROR(ERROR_ID, ERRONEOUS_STATEMENT)            \
+          try                                                   \
+            {                                                    \
+              ERRONEOUS_STATEMENT ;                               \
+              NOTREACHED("expected »%s« failure in: %s",           \
+                          #ERROR_ID, #ERRONEOUS_STATEMENT);         \
+            }                                                        \
+          catch (lumiera::Error& ex)                                  \
+            {                                                          \
+              CHECK (ex.getID()                                         \
+                     == ::test::ExpectString{LUMIERA_ERROR_##ERROR_ID} );\
+              lumiera_error();                                            \
+            }                                                              \
+          catch (...)                                                       \
+            {                                                                \
+              CHECK (lumiera_error_peek()                                     \
+                     == ::test::ExpectString{LUMIERA_ERROR_##ERROR_ID} );      \
+              lumiera_error();                                                  \
             }
 
 /**
@@ -443,4 +442,4 @@ operator""_expect (CStr lit, size_t siz)
 #define MARK_TEST_FUN \
           cout << "|" << endl << "|  »"<<__FUNCTION__<<"«" <<endl;
 
-#endif /*LIB_TEST_TEST_HELPER_H*/
+#endif /*TESTSUPPORT_TEST_HELPER_H*/
diff --git a/src/lib/test/test.h b/src/test/test.h
similarity index 96%
rename from src/lib/test/test.h
rename to src/test/test.h
index 92450406f..40fd55175 100644
--- a/src/lib/test/test.h
+++ b/src/test/test.h
@@ -21,8 +21,8 @@
  */
 
 
-#ifndef LIB_TEST_TEST_H
-#define LIB_TEST_TEST_H
+#ifndef TESTSUPPORT_TEST_H
+#define TESTSUPPORT_TEST_H
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -59,7 +59,7 @@ main (int argc, const char** argv)              \
 }
 
 
-#endif
+#endif /*TESTSUPPORT_TEST_H*/
 
 /*
 // Local Variables:
diff --git a/src/lib/test/testoption.cpp b/src/test/testoption.cpp
similarity index 98%
rename from src/lib/test/testoption.cpp
rename to src/test/testoption.cpp
index 5614ff8ec..0b69af2b6 100644
--- a/src/lib/test/testoption.cpp
+++ b/src/test/testoption.cpp
@@ -18,8 +18,8 @@
 
 
 #include "lib/error.hpp"
-#include "lib/test/testoption.hpp"
-#include "lib/test/suite.hpp"
+#include "test/testoption.hpp"
+#include "test/suite.hpp"
 
 
 
diff --git a/src/lib/test/testoption.hpp b/src/test/testoption.hpp
similarity index 94%
rename from src/lib/test/testoption.hpp
rename to src/test/testoption.hpp
index aa3914d05..54ed9272f 100644
--- a/src/lib/test/testoption.hpp
+++ b/src/test/testoption.hpp
@@ -17,8 +17,8 @@
  */
 
 
-#ifndef TESTHELPER_TESTOPTION_H
-#define TESTHELPER_TESTOPTION_H
+#ifndef TESTSUPPORT_TESTOPTION_H
+#define TESTSUPPORT_TESTOPTION_H
 
 #include "lib/cmdline.hpp"
 #include "lib/nocopy.hpp"
@@ -74,4 +74,4 @@ namespace test {
   
   
 } // namespace test
-#endif
+#endif /*TESTSUPPORT_TESTOPTION_H*/
diff --git a/src/lib/test/tracking-allocator.cpp b/src/test/tracking-allocator.cpp
similarity index 98%
rename from src/lib/test/tracking-allocator.cpp
rename to src/test/tracking-allocator.cpp
index f9d761fc7..f013103fe 100644
--- a/src/lib/test/tracking-allocator.cpp
+++ b/src/test/tracking-allocator.cpp
@@ -30,7 +30,7 @@
  */
 
 
-#include "lib/test/tracking-allocator.hpp"
+#include "test/tracking-allocator.hpp"
 #include "lib/uninitialised-storage.hpp"
 #include "lib/iter-explorer.hpp"
 #include "lib/depend.hpp"
@@ -46,9 +46,10 @@ using std::make_pair;
 using util::contains;
 using util::joinDash;
 using util::showAdr;
+using lib::explore;
+using lib::Depend;
 
 
-namespace lib {
 namespace test{
   
   
@@ -69,7 +70,7 @@ namespace test{
       struct Allocation
         : util::MoveOnly
         {
-          UninitialisedDynBlock<byte> buff{};
+          lib::UninitialisedDynBlock<byte> buff{};
           size_t entryID{0};
         };
       
@@ -343,4 +344,4 @@ namespace test{
 
   
   
-}} // namespace lib::test
+} // namespace test
diff --git a/src/lib/test/tracking-allocator.hpp b/src/test/tracking-allocator.hpp
similarity index 97%
rename from src/lib/test/tracking-allocator.hpp
rename to src/test/tracking-allocator.hpp
index 42c7bfbea..896adfc3d 100644
--- a/src/lib/test/tracking-allocator.hpp
+++ b/src/test/tracking-allocator.hpp
@@ -43,26 +43,25 @@
  */
 
 
-#ifndef LIB_TEST_TRACKING_ALLOCATOR_H
-#define LIB_TEST_TRACKING_ALLOCATOR_H
+#ifndef TESTSUPPORT_TRACKING_ALLOCATOR_H
+#define TESTSUPPORT_TRACKING_ALLOCATOR_H
 
 #include "lib/error.hpp"
 #include "lib/symbol.hpp"
 #include "lib/nocopy.hpp"
 #include "lib/hash-value.h"
-#include "lib/test/event-log.hpp"
 #include "lib/format-string.hpp"
+#include "test/event-log.hpp"
 
 #include <utility>
 #include <memory>
 
 using std::byte;
+using lib::HashVal;
 
 
-namespace lib {
 namespace test {
   
-  
   namespace {
     const Symbol GLOBAL{"GLOBAL"};
   }
@@ -243,5 +242,5 @@ namespace test {
   
   
   
-}} // namespace lib::test
-#endif /*LIB_TEST_TRACKING_ALLOCATOR_H*/
+}// namespace test
+#endif /*TESTSUPPORT_TRACKING_ALLOCATOR_H*/
diff --git a/src/lib/test/tracking-dummy.hpp b/src/test/tracking-dummy.hpp
similarity index 95%
rename from src/lib/test/tracking-dummy.hpp
rename to src/test/tracking-dummy.hpp
index a46bd1307..98a25a2cd 100644
--- a/src/lib/test/tracking-dummy.hpp
+++ b/src/test/tracking-dummy.hpp
@@ -20,12 +20,12 @@
  */
 
 
-#ifndef LIB_TEST_TRACKING_DUMMY_H
-#define LIB_TEST_TRACKING_DUMMY_H
+#ifndef TESTSUPPORT_TRACKING_DUMMY_H
+#define TESTSUPPORT_TRACKING_DUMMY_H
 
 
 #include "lib/nocopy.hpp"
-#include "lib/test/event-log.hpp"
+#include "test/event-log.hpp"
 #include "lib/format-string.hpp"
 #include "lib/random.hpp"
 #include "lib/util.hpp"
@@ -34,8 +34,7 @@
 #include <limits>
 
 
-namespace lib {
-namespace test{
+namespace test {
   
   
   /**
@@ -147,7 +146,7 @@ namespace test{
    */
   struct Tracker
     {
-      static lib::test::EventLog log;
+      static EventLog log;
       
       static constexpr int DEFUNCT = std::numeric_limits<int>::min();
       static constexpr int DEAD    = std::numeric_limits<int>::max();
@@ -231,5 +230,5 @@ namespace test{
   
   
   
-}} // namespace lib::test
-#endif /*LIB_TEST_TRACKING_DUMMY_H*/
+}// namespace test
+#endif /*TESTSUPPORT_TRACKING_DUMMY_H*/
diff --git a/src/lib/test/transiently.hpp b/src/test/transiently.hpp
similarity index 91%
rename from src/lib/test/transiently.hpp
rename to src/test/transiently.hpp
index 074d2aaf4..256c19b23 100644
--- a/src/lib/test/transiently.hpp
+++ b/src/test/transiently.hpp
@@ -24,8 +24,8 @@
  */
 
 
-#ifndef LIB_TEST_TRANSIENTLY_H
-#define LIB_TEST_TRANSIENTLY_H
+#ifndef TEST_TRANSIENTLY_H
+#define TEST_TRANSIENTLY_H
 
 
 #include "lib/nocopy.hpp"
@@ -34,7 +34,6 @@
 
 #include <utility>
 
-namespace lib {
 namespace test{
   
   /**
@@ -107,7 +106,7 @@ namespace test{
   template<typename FUN,                 typename=lib::meta::enable_if<lib::meta::has_Sig<FUN, void(void)>>>
   Transiently (FUN&&) -> Transiently<void(void)>;
   
-}} // namespace lib::test
+}// namespace test
 
 
 
@@ -119,7 +118,7 @@ namespace test{
  * @remark use as `TRANSIENTLY(blah) = moo;`
  */
 #define TRANSIENTLY(_OO_) \
-  lib::test::Transiently PPMPL_CAT(transientlyManipulated_,__LINE__)(_OO_); PPMPL_CAT(transientlyManipulated_,__LINE__)
+  ::test::Transiently PPMPL_CAT(transientlyManipulated_,__LINE__)(_OO_); PPMPL_CAT(transientlyManipulated_,__LINE__)
 
 
-#endif /*LIB_TEST_TRANSIENTLY_H*/
+#endif /*TEST_TRANSIENTLY_H*/
diff --git a/tests/00support.tests b/tests/00support.tests
index 3e8fbc752..4dcc187b2 100644
--- a/tests/00support.tests
+++ b/tests/00support.tests
@@ -6,16 +6,16 @@ TEST "Test support functions" TestHelper_test <<END
 out: [a-z0-9]{80}$
 out-lit: Displaying types and sizes....
 out-lit: sizeof( just a char )                   =   1
-out-lit: sizeof( test::Murpf )                   =   1
-out-lit: sizeof( test::Wrmrmpft<test::Murpf> )   =   1
-out-lit: sizeof( test::Wrmrmpft<char [2]> )      =   2
-out-lit: sizeof( test::Wrmrmpft<char [3]> )      =   3
+out-lit: sizeof( Murpf )                         =   1
+out-lit: sizeof( Wrmrmpft<Murpf> )               =   1
+out-lit: sizeof( Wrmrmpft<char [2]> )            =   2
+out-lit: sizeof( Wrmrmpft<char [3]> )            =   3
 out-lit: sizeof( Universe )                      =  42
-out-lit: sizeof( test::Wrmrmpft<test::Murpf> )   =   1
-out-lit: sizeof( test::Wrmrmpft<test::Murpf> )   =   1
-out-lit: sizeof( test::Wrmrmpft<test::Murpf> )   =   1
-out-lit: sizeof( test::Wrmrmpft<test::Murpf> )   =   1
-out-lit: sizeof( test::Wrmrmpft<test::Murpf> )   =   1
+out-lit: sizeof( Wrmrmpft<Murpf> )               =   1
+out-lit: sizeof( Wrmrmpft<Murpf> )               =   1
+out-lit: sizeof( Wrmrmpft<Murpf> )               =   1
+out-lit: sizeof( Wrmrmpft<Murpf> )               =   1
+out-lit: sizeof( Wrmrmpft<Murpf> )               =   1
 return: 0
 END
 
diff --git a/tests/15library.tests b/tests/15library.tests
index 262d6d227..44e7a267d 100644
--- a/tests/15library.tests
+++ b/tests/15library.tests
@@ -91,7 +91,7 @@ END
 TEST "Diff: Generic recursive mutation with closure binding" TreeMutator_test <<END
 out-lit: |
 out-lit: |  »simpleAttributeBinding«
-out: concrete TreeMutator .+Builder<ChangeOperation<TreeMutator, test::TreeMutator_test::simpleAttributeBinding().+lambda\(string\).+> >
+out: concrete TreeMutator .+Builder<ChangeOperation<TreeMutator, TreeMutator_test::simpleAttributeBinding().+lambda\(string\).+> >
 out-lit: "data" closure received something that would be acceptable
 out-lit: localData changed to: that would be acceptable
 out-lit: |
@@ -355,7 +355,7 @@ END
 TEST "formatting by string template" FormatString_test <<END
 out-lit: --format-template--int=0012--double=+1.23--string=Lumiera  --
 out: 0x....+ _____+ .
-out-lit: «test::FormatString_test::Silent»
+out-lit: «FormatString_test::Silent»
 out-lit: __nix_
 out-lit: ____
 out-lit: __1__
diff --git a/tests/16calculation.tests b/tests/16calculation.tests
index adee06594..a5e0b8404 100644
--- a/tests/16calculation.tests
+++ b/tests/16calculation.tests
@@ -7,7 +7,7 @@ return: 0
 END
 
 
-PLANNED "Statistic and Regression" Statistic_test << END
+TEST "Statistic and Regression" Statistic_test << END
 return: 0
 END
 
diff --git a/tests/43session.tests b/tests/43session.tests
index b2864ca66..8186c0b69 100644
--- a/tests/43session.tests
+++ b/tests/43session.tests
@@ -99,14 +99,14 @@ END
 
 
 TEST "hierarchical placement types" PlacementHierarchy_test <<END
-out: sizeof\( test::TestPlacement<test::TestSubMO1, test::DummyMO> \) =  [0-9]{2}
-out: sizeof\( test::TestPlacement<test::TestSubMO2, test::DummyMO> \) =  [0-9]{2}
-out: sizeof\( test::TestPlacement<test::TestSubMO21, test::TestSubMO2> \) =  [0-9]{2}
-out: sizeof\( test::TestPlacement<test::DummyMO, test::DummyMO> \) =  [0-9]{2}
+out: sizeof\( TestPlacement<TestSubMO1, DummyMO> \) =  [0-9]{2}
+out: sizeof\( TestPlacement<TestSubMO2, DummyMO> \) =  [0-9]{2}
+out: sizeof\( TestPlacement<TestSubMO21, TestSubMO2> \) =  [0-9]{2}
+out: sizeof\( TestPlacement<DummyMO, DummyMO> \) =  [0-9]{2}
 out: sizeof\( Placement<MObject, MObject> \)   =  [0-9]{2}
-out: Placement<test::TestSubMO1> ...................... use-cnt=1 ID.\w{16}
-out: Placement<test::TestSubMO2> ...................... use-cnt=1 ID.\w{16}
-out: Placement<test::TestSubMO21> ..................... use-cnt=2 ID.\w{16}
+out: Placement<TestSubMO1> ............................ use-cnt=1 ID.\w{16}
+out: Placement<TestSubMO2> ............................ use-cnt=1 ID.\w{16}
+out: Placement<TestSubMO21> ........................... use-cnt=2 ID.\w{16}
 out: Placement<Clip> .................................. use-cnt=2 ID.\w{16}
 out: specialAPI()
 out: pID\(\w{6,16}\)
@@ -115,22 +115,22 @@ END
 
 
 TEST "PlacementRef_test" PlacementRef_test <<END
-out: Placement<test::TestSubMO21> ..................... use-cnt=2 ID.\w{16}
+out: Placement<TestSubMO21> ........................... use-cnt=2 ID.\w{16}
 out: specialAPI()
 return: 0
 END
 
 
 TEST "Placement Index" PlacementIndex_test <<END
-out: ^::Placement<test::TestClip> ........................ use-cnt=2
-out: ^::Placement<test::TestClip> ........................ use-cnt=6
-out: ^ ::Placement<test::TestClip> ........................ use-cnt=6
-out: ^  ::Placement<test::TestClip> ........................ use-cnt=6
+out: ^::Placement<TestClip> .............................. use-cnt=2
+out: ^::Placement<TestClip> .............................. use-cnt=6
+out: ^ ::Placement<TestClip> .............................. use-cnt=6
+out: ^  ::Placement<TestClip> .............................. use-cnt=6
 out: ^  ...2 elements at Level 2
-out: ^ ::Placement<test::TestClip> ........................ use-cnt=6
+out: ^ ::Placement<TestClip> .............................. use-cnt=6
 out: ^ ...3 elements at Level 1
-out: ^::Placement<test::TestClip> ........................ use-cnt=2
-out: ^ ::Placement<test::TestClip> ........................ use-cnt=1
+out: ^::Placement<TestClip> .............................. use-cnt=2
+out: ^ ::Placement<TestClip> .............................. use-cnt=1
 out: ^ ...1 elements at Level 1
 out: ^...3 elements at Level 0
 return: 0
@@ -139,12 +139,12 @@ END
 
 TEST "Querying the index" PlacementIndexQuery_test <<END
 out: explore contents depth-first...
-out: Placement<test::TestSubMO2> ...................... use-cnt=1
-out: Placement<test::TestSubMO1> ...................... use-cnt=1
-out: Placement<test::DummyMO> ......................... use-cnt=1
-out: Placement<test::TestSubMO21> ..................... use-cnt=1
-out: path to root starting at Placement<test::TestSubMO1> ...................... use-cnt=1
-out: Placement<test::TestSubMO2> ...................... use-cnt=1
+out: Placement<TestSubMO2> ............................ use-cnt=1
+out: Placement<TestSubMO1> ............................ use-cnt=1
+out: Placement<DummyMO> ............................... use-cnt=1
+out: Placement<TestSubMO21> ........................... use-cnt=1
+out: path to root starting at Placement<TestSubMO1> ............................ use-cnt=1
+out: Placement<TestSubMO2> ............................ use-cnt=1
 out: Placement<Label> ................................. use-cnt=1
 return: 0
 END
@@ -152,57 +152,57 @@ END
 
 TEST "discovering scopes" ScopeQuery_test <<END
 out: --------------------------------Test-1: contents depth-first
-out: Placement<test::TestSubMO2>
-out: Placement<test::TestSubMO1>
-out: Placement<test::DummyMO>
-out: Placement<test::TestSubMO21>
+out: Placement<TestSubMO2>
+out: Placement<TestSubMO1>
+out: Placement<DummyMO>
+out: Placement<TestSubMO21>
 out: --------------------------------Test-2: contents depth-first, filtered to Clip
 out: --------------------------------Test-3: contents depth-first, filtered to DummyMO
-out: Placement<test::TestSubMO2>
-out: Placement<test::TestSubMO1>
-out: Placement<test::DummyMO>
-out: Placement<test::TestSubMO21>
+out: Placement<TestSubMO2>
+out: Placement<TestSubMO1>
+out: Placement<DummyMO>
+out: Placement<TestSubMO21>
 out: --------------------------------Test-4: contents depth-first, filtered to TestSubMO1
-out: Placement<test::TestSubMO1>
+out: Placement<TestSubMO1>
 out: --------------------------------Test-5: contents depth-first, filtered to TestSubMO2
-out: Placement<test::TestSubMO2>
-out: Placement<test::TestSubMO21>
+out: Placement<TestSubMO2>
+out: Placement<TestSubMO21>
 out: --------------------------------Test-6: contents depth-first, custom filtered DummyMO
-out: Placement<test::TestSubMO2>
-out: Placement<test::TestSubMO21>
+out: Placement<TestSubMO2>
+out: Placement<TestSubMO21>
 out: --------------------------------Test-7: parents of the second TestSubMO2 element found
-out: Placement<test::TestSubMO21>
+out: Placement<TestSubMO21>
 out: Placement<Label>
 out: --------------------------------Test-8: children of the this TestSubMO2 element
-out: Placement<test::TestSubMO21>
+out: Placement<TestSubMO21>
 out: --------------------------------Test-9: path from there to root
-out: Placement<test::TestSubMO21>
+out: Placement<TestSubMO21>
 out: Placement<Label>
 out: --------------------------------Test-10: same path, but filtered to TestSubMO2
-out: Placement<test::TestSubMO21>
+out: Placement<TestSubMO21>
 out: --------------------------------Test-11: continue exploring partially used TestSubMO2 iterator
-out: Placement<test::TestSubMO21>
+out: Placement<TestSubMO21>
 return: 0
 END
 
 
 TEST "Placement search scope" PlacementScope_test <<END
 out: Scope: \[Label.[0-9]{3}\]
-out: Placement<test::TestSubMO2>
+out: Placement<TestSubMO2>
 out: Scope: \[DummyMO.[0-9]{3}\]
-out: Placement<test::TestSubMO1>
+out: Placement<TestSubMO1>
 out: Scope: \[Label.[0-9]{3}\]
-out: Placement<test::DummyMO>
+out: Placement<DummyMO>
 out: Scope: \[Label.[0-9]{3}\]
-out: Placement<test::TestSubMO21>
+out: Placement<TestSubMO21>
 out: Scope: \[DummyMO.[0-9]{3}\]
-out: Placement<test::TestSubMO21>
+out: Placement<TestSubMO21>
 out: Scope: \[DummyMO.[0-9]{3}\]
-out: Placement<test::TestSubMO21>
+out: Placement<TestSubMO21>
 out: Scope: \[DummyMO.[0-9]{3}\]
-out: Placement<test::TestSubMO21>
+out: Placement<TestSubMO21>
 out: Scope: \[DummyMO.[0-9]{3}\]
-out: Placement<test::TestSubMO21>
+out: Placement<TestSubMO21>
 return: 0
 END
 
diff --git a/tests/SConscript b/tests/SConscript
index 75e9e6f8e..044245328 100644
--- a/tests/SConscript
+++ b/tests/SConscript
@@ -12,7 +12,7 @@ from Buildhelper import scanSubtree
 from Buildhelper import globRootdirs
 from Buildhelper import createPlugins
 
-Import('env core_lib vessel_lib vault_lib guimodule tools config')
+Import('env core_lib vessel_lib vault_lib test_support guimodule tools config')
 env = env.Clone()
 env.Append(CPPPATH='include')  # additional headers for tests
 
@@ -23,13 +23,15 @@ sharedTestLibs = {}
 
 def linkContext(id):
     if id.startswith('lib'):
-        return vessel_lib           # tests in 'lib*' subdirs only linked with framework (including support-lib)
+        return test_support + vessel_lib           # tests in 'lib*' subdirs only linked with framework (including support-lib)
+    elif id.startswith('vessel'):
+        return test_support + vessel_lib           # framework tests linked with framework and support-lib
     elif id.startswith('vault'):
-        return vault_lib            # tests in 'vault*' subdirs only linked against vault layer (including framework)
+        return test_support + vault_lib            # tests in 'vault*' subdirs only linked against vault layer (including framework)
     elif id.startswith('stage'):
-        return guimodule+core_lib   # tests in 'stage*' are additionally linked against the GTK GUI module
+        return test_support + guimodule+core_lib   # tests in 'stage*' are additionally linked against the GTK GUI module
     else:
-        return core_lib             # all other tests linked against complete application core
+        return test_support + core_lib             # all other tests linked against complete application core
 
 
 def exeTestName(srcName):
@@ -81,7 +83,7 @@ testSrcDirs = globRootdirs('*')
 
 testcases  = [testCases(env, dir)  for dir in testSrcDirs if not dir in specialDirs]
 testLibs   = list(sharedTestLibs.values())
-testrunner = envSuite.Program("test-suite", ["testrunner.cpp"]+testLibs+core_lib)
+testrunner = envSuite.Program("test-suite", ["testrunner.cpp"]+testLibs+test_support+core_lib)
 
 
 testsuite = ( testcases
diff --git a/tests/basics/call-queue-test.cpp b/tests/basics/call-queue-test.cpp
index cd1f98134..38493c8cc 100644
--- a/tests/basics/call-queue-test.cpp
+++ b/tests/basics/call-queue-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/scoped-collection.hpp"
 #include "lib/sync-barrier.hpp"
 #include "lib/thread.hpp"
diff --git a/tests/basics/dependency-configuration-test.cpp b/tests/basics/dependency-configuration-test.cpp
index 05cd86784..e075049e2 100644
--- a/tests/basics/dependency-configuration-test.cpp
+++ b/tests/basics/dependency-configuration-test.cpp
@@ -20,9 +20,9 @@
 
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/format-cout.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/test-helper.hpp"
 #include "lib/util.hpp"
 
 #include "lib/depend.hpp"
diff --git a/tests/basics/dependency-factory-test.cpp b/tests/basics/dependency-factory-test.cpp
index e196835d7..82c28d6fc 100644
--- a/tests/basics/dependency-factory-test.cpp
+++ b/tests/basics/dependency-factory-test.cpp
@@ -20,7 +20,7 @@
 
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/format-obj.hpp"
 #include "lib/util.hpp"
 
diff --git a/tests/basics/diagnostic-context-test.cpp b/tests/basics/diagnostic-context-test.cpp
index b9eddb9f3..63138e724 100644
--- a/tests/basics/diagnostic-context-test.cpp
+++ b/tests/basics/diagnostic-context-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 
 #include "lib/diagnostic-context.hpp"
 #include "lib/iter-explorer.hpp"
diff --git a/tests/basics/singleton-subclass-test.cpp b/tests/basics/singleton-subclass-test.cpp
index 9bf012cdc..44d55c8fe 100644
--- a/tests/basics/singleton-subclass-test.cpp
+++ b/tests/basics/singleton-subclass-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/format-string.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/util.hpp"
diff --git a/tests/basics/singleton-test.cpp b/tests/basics/singleton-test.cpp
index e952174cd..de0a83d91 100644
--- a/tests/basics/singleton-test.cpp
+++ b/tests/basics/singleton-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/format-string.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/util.hpp"
diff --git a/tests/basics/singleton-testmock-test.cpp b/tests/basics/singleton-testmock-test.cpp
index 4d51b8918..010a54c85 100644
--- a/tests/basics/singleton-testmock-test.cpp
+++ b/tests/basics/singleton-testmock-test.cpp
@@ -17,7 +17,7 @@
 
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/depend-inject.hpp"
 #include "lib/util.hpp"
 
diff --git a/tests/basics/stream-type-basics-test.cpp b/tests/basics/stream-type-basics-test.cpp
index fb4edd5b8..191dbef04 100644
--- a/tests/basics/stream-type-basics-test.cpp
+++ b/tests/basics/stream-type-basics-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/util.hpp"
 
 #include "steam/control/stypemanager.hpp"
diff --git a/tests/basics/stream-type-lifecycle-test.cpp b/tests/basics/stream-type-lifecycle-test.cpp
index 154a8ca00..aa980e57a 100644
--- a/tests/basics/stream-type-lifecycle-test.cpp
+++ b/tests/basics/stream-type-lifecycle-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/util.hpp"
 
 #include "steam/control/stypemanager.hpp"
diff --git a/tests/basics/test-target-obj.hpp b/tests/basics/test-target-obj.hpp
index f4ca332eb..519ce1aae 100644
--- a/tests/basics/test-target-obj.hpp
+++ b/tests/basics/test-target-obj.hpp
@@ -22,7 +22,7 @@
 #define LIBRARY_TEST_TARGET_OBJ_H
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/format-string.hpp"
 #include "lib/format-cout.hpp"
 
diff --git a/tests/basics/time/digxel-configurations-test.cpp b/tests/basics/time/digxel-configurations-test.cpp
index 73d10b40d..083ae8744 100644
--- a/tests/basics/time/digxel-configurations-test.cpp
+++ b/tests/basics/time/digxel-configurations-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/time/digxel.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/error.hpp"
diff --git a/tests/basics/time/digxel-test.cpp b/tests/basics/time/digxel-test.cpp
index 0517330d7..d9a063d24 100644
--- a/tests/basics/time/digxel-test.cpp
+++ b/tests/basics/time/digxel-test.cpp
@@ -16,10 +16,10 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/format-string.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/test-helper.hpp"
 #include "lib/time/digxel.hpp"
 #include "lib/random.hpp"
 #include "lib/util.hpp"
diff --git a/tests/basics/time/format-support-test.cpp b/tests/basics/time/format-support-test.cpp
index 30122a9e4..63763cb6f 100644
--- a/tests/basics/time/format-support-test.cpp
+++ b/tests/basics/time/format-support-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/time/formats.hpp"
 
 
diff --git a/tests/basics/time/quantiser-basics-test.cpp b/tests/basics/time/quantiser-basics-test.cpp
index 2c0493b2d..d20d78b89 100644
--- a/tests/basics/time/quantiser-basics-test.cpp
+++ b/tests/basics/time/quantiser-basics-test.cpp
@@ -16,12 +16,11 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/time/quantiser.hpp"
 #include "lib/random.hpp"
 #include "lib/util.hpp"
-#include "lib/test/diagnostic-output.hpp"
 
 using lumiera::error::LUMIERA_ERROR_BOTTOM_VALUE;
 using util::isnil;
diff --git a/tests/basics/time/time-basics-test.cpp b/tests/basics/time/time-basics-test.cpp
index f879a6bcd..f9532222d 100644
--- a/tests/basics/time/time-basics-test.cpp
+++ b/tests/basics/time/time-basics-test.cpp
@@ -16,9 +16,9 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/time/timevalue.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/test-helper.hpp"
 #include "lib/random.hpp"
 #include "lib/util.hpp"
 
diff --git a/tests/basics/time/time-control-test.cpp b/tests/basics/time/time-control-test.cpp
index 726779290..8bf407e19 100644
--- a/tests/basics/time/time-control-test.cpp
+++ b/tests/basics/time/time-control-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/time/timevalue.hpp"
 #include "lib/time/timequant.hpp"
 #include "lib/time/control.hpp"
diff --git a/tests/basics/time/time-dropframe-test.cpp b/tests/basics/time/time-dropframe-test.cpp
index 1641dee19..fd98b8670 100644
--- a/tests/basics/time/time-dropframe-test.cpp
+++ b/tests/basics/time/time-dropframe-test.cpp
@@ -20,8 +20,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/time/dropframe.hpp"
 #include "lib/time/timevalue.hpp"
 
diff --git a/tests/basics/time/time-formats-test.cpp b/tests/basics/time/time-formats-test.cpp
index e3c58f63e..b62baa30d 100644
--- a/tests/basics/time/time-formats-test.cpp
+++ b/tests/basics/time/time-formats-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-//#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+//#include "test/test-helper.hpp"
 #include "steam/asset/meta/time-grid.hpp"
 #include "lib/time/timequant.hpp"
 #include "lib/time/timecode.hpp"
diff --git a/tests/basics/time/time-mutation-test.cpp b/tests/basics/time/time-mutation-test.cpp
index a5e5a44d7..cdee59a1f 100644
--- a/tests/basics/time/time-mutation-test.cpp
+++ b/tests/basics/time/time-mutation-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/time/timevalue.hpp"
 #include "lib/time/timequant.hpp"
 #include "lib/time/mutation.hpp"
diff --git a/tests/basics/time/time-parsing-test.cpp b/tests/basics/time/time-parsing-test.cpp
index ef537aee0..5ed6179d2 100644
--- a/tests/basics/time/time-parsing-test.cpp
+++ b/tests/basics/time/time-parsing-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "steam/asset/meta/time-grid.hpp"
 #include "lib/time/quantiser.hpp"
 #include "lib/time/timecode.hpp"
diff --git a/tests/basics/time/time-quantisation-test.cpp b/tests/basics/time/time-quantisation-test.cpp
index d0c5f7f83..66c3e0e9b 100644
--- a/tests/basics/time/time-quantisation-test.cpp
+++ b/tests/basics/time/time-quantisation-test.cpp
@@ -17,8 +17,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "steam/asset/meta/time-grid.hpp"
 #include "lib/time/timequant.hpp"
 #include "lib/format-cout.hpp"
diff --git a/tests/basics/time/time-value-test.cpp b/tests/basics/time/time-value-test.cpp
index 9f22a9f38..c7ed6c01e 100644
--- a/tests/basics/time/time-value-test.cpp
+++ b/tests/basics/time/time-value-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/time/timevalue.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/util.hpp"
diff --git a/tests/basics/typed-counter-test.cpp b/tests/basics/typed-counter-test.cpp
index 4ae103354..b203872d0 100644
--- a/tests/basics/typed-counter-test.cpp
+++ b/tests/basics/typed-counter-test.cpp
@@ -32,9 +32,9 @@
 
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/typed-counter.hpp"
-#include "lib/test/microbenchmark.hpp"
+#include "test/microbenchmark.hpp"
 #include "lib/random.hpp"
 #include "lib/util.hpp"
 
@@ -43,13 +43,13 @@
 #include <array>
 
 
+using test::threadBenchmark;
+using util::isnil;
+using lib::rani;
+
 namespace lib {
 namespace test{
   
-  using util::isnil;
-  using lib::rani;
-  
-  
   namespace { // test parametrisation...
     const uint MAX_INDEX      =    10;  ///< number of distinct types / counters
     const uint NUM_THREADS    =   100;  ///< number of threads to run in parallel
diff --git a/tests/basics/typed-family-member-id-test.cpp b/tests/basics/typed-family-member-id-test.cpp
index 02f8ee125..8bbd06665 100644
--- a/tests/basics/typed-family-member-id-test.cpp
+++ b/tests/basics/typed-family-member-id-test.cpp
@@ -18,7 +18,7 @@
 
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/typed-counter.hpp"
 
 
diff --git a/tests/basics/visitingtool-concept.cpp b/tests/basics/visitingtool-concept.cpp
index aa9bf18a1..7110767d7 100644
--- a/tests/basics/visitingtool-concept.cpp
+++ b/tests/basics/visitingtool-concept.cpp
@@ -43,7 +43,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/format-string.hpp"
 #include "lib/depend.hpp"
diff --git a/tests/basics/visitingtool-extended-test.cpp b/tests/basics/visitingtool-extended-test.cpp
index 25f1065df..cf0445b30 100644
--- a/tests/basics/visitingtool-extended-test.cpp
+++ b/tests/basics/visitingtool-extended-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/visitor.hpp"
 #include "lib/format-string.hpp"
 
diff --git a/tests/basics/visitingtool-test.cpp b/tests/basics/visitingtool-test.cpp
index 3a8390bbe..9670310de 100644
--- a/tests/basics/visitingtool-test.cpp
+++ b/tests/basics/visitingtool-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/visitor.hpp"
 #include "lib/format-string.hpp"
 
diff --git a/tests/basics/zombie-check-test.cpp b/tests/basics/zombie-check-test.cpp
index 7b88914d3..a93e68c2a 100644
--- a/tests/basics/zombie-check-test.cpp
+++ b/tests/basics/zombie-check-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/zombie-check.hpp"
 #include "lib/util.hpp"
 
diff --git a/tests/core/steam/asset/asset-category-test.cpp b/tests/core/steam/asset/asset-category-test.cpp
index 96a9d2447..78c211c2d 100644
--- a/tests/core/steam/asset/asset-category-test.cpp
+++ b/tests/core/steam/asset/asset-category-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/format-string.hpp"
 #include "lib/util.hpp"
diff --git a/tests/core/steam/asset/basicpipetest.cpp b/tests/core/steam/asset/basicpipetest.cpp
index 890efe717..490dd1889 100644
--- a/tests/core/steam/asset/basicpipetest.cpp
+++ b/tests/core/steam/asset/basicpipetest.cpp
@@ -17,7 +17,7 @@
 
 
 #include "include/logging.h"
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/util.hpp"
 
 #include "steam/asset/category.hpp"
diff --git a/tests/core/steam/asset/compoundmediatest.cpp b/tests/core/steam/asset/compoundmediatest.cpp
index 98846f3d6..0458f0d5b 100644
--- a/tests/core/steam/asset/compoundmediatest.cpp
+++ b/tests/core/steam/asset/compoundmediatest.cpp
@@ -17,7 +17,7 @@
 
 
 #include "include/logging.h"
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/util.hpp"
 
 #include "steam/assetmanager.hpp"
diff --git a/tests/core/steam/asset/create-asset-test.cpp b/tests/core/steam/asset/create-asset-test.cpp
index c01dd1e1d..bc4b6eb4a 100644
--- a/tests/core/steam/asset/create-asset-test.cpp
+++ b/tests/core/steam/asset/create-asset-test.cpp
@@ -17,8 +17,8 @@
 
 
 #include "include/logging.h"
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 
 #include "steam/assetmanager.hpp"
 #include "steam/asset/media.hpp"
@@ -35,7 +35,7 @@
 using util::isnil;
 using std::string;
 using lib::time::FrameRate;
-using lib::test::randStr;
+using lib::randStr;
 
 
 namespace steam {
diff --git a/tests/core/steam/asset/deleteassettest.cpp b/tests/core/steam/asset/deleteassettest.cpp
index a1da80d39..39b5baf67 100644
--- a/tests/core/steam/asset/deleteassettest.cpp
+++ b/tests/core/steam/asset/deleteassettest.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 //#include "lib/util.hpp"
 
 
diff --git a/tests/core/steam/asset/dependent-assets-test.cpp b/tests/core/steam/asset/dependent-assets-test.cpp
index 542ea21fa..74f6ba068 100644
--- a/tests/core/steam/asset/dependent-assets-test.cpp
+++ b/tests/core/steam/asset/dependent-assets-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "steam/asset/testasset.hpp"
 #include "steam/asset/asset-diagnostics.hpp"
 #include "vault/media-access-mock.hpp"
diff --git a/tests/core/steam/asset/entry-id-test.cpp b/tests/core/steam/asset/entry-id-test.cpp
index 2ecbae9d7..d0773b5d6 100644
--- a/tests/core/steam/asset/entry-id-test.cpp
+++ b/tests/core/steam/asset/entry-id-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 
 #include "lib/idi/entry-id.hpp"
 #include "steam/asset/struct-scheme.hpp"
@@ -31,8 +31,8 @@
 #include <unordered_map>
 #include <string>
 
-using lib::test::showSizeof;
-using lib::test::randStr;
+using test::showSizeof;
+using test::randStr;
 using util::isSameObject;
 using util::contains;
 using util::and_all;
diff --git a/tests/core/steam/asset/identity-of-assets-test.cpp b/tests/core/steam/asset/identity-of-assets-test.cpp
index 762037c5b..846a1c8b0 100644
--- a/tests/core/steam/asset/identity-of-assets-test.cpp
+++ b/tests/core/steam/asset/identity-of-assets-test.cpp
@@ -17,7 +17,7 @@
 
 
 #include "include/logging.h"
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/util.hpp"
 
 #include "steam/assetmanager.hpp"
diff --git a/tests/core/steam/asset/make-clip-test.cpp b/tests/core/steam/asset/make-clip-test.cpp
index 60b0288af..ab1ab660c 100644
--- a/tests/core/steam/asset/make-clip-test.cpp
+++ b/tests/core/steam/asset/make-clip-test.cpp
@@ -17,7 +17,7 @@
 
 
 #include "include/logging.h"
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/util.hpp"
 
 #include "lib/time/timevalue.hpp"
diff --git a/tests/core/steam/asset/media-structure-query-test.cpp b/tests/core/steam/asset/media-structure-query-test.cpp
index fd4139ffe..90108b722 100644
--- a/tests/core/steam/asset/media-structure-query-test.cpp
+++ b/tests/core/steam/asset/media-structure-query-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/util.hpp"
 
 #include "steam/assetmanager.hpp"
diff --git a/tests/core/steam/asset/meta/time-grid-basics-test.cpp b/tests/core/steam/asset/meta/time-grid-basics-test.cpp
index 0e06203e5..49dc4eeb9 100644
--- a/tests/core/steam/asset/meta/time-grid-basics-test.cpp
+++ b/tests/core/steam/asset/meta/time-grid-basics-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 
 #include "steam/asset/meta.hpp"
 #include "steam/asset/meta/time-grid.hpp"
@@ -28,7 +28,7 @@
 #include <boost/rational.hpp>
 
 using boost::rational_cast;
-using lib::test::randStr;
+using lib::randStr;
 
 
 
diff --git a/tests/core/steam/asset/ordering-of-assets-test.cpp b/tests/core/steam/asset/ordering-of-assets-test.cpp
index e0b7f1b2b..958150ac0 100644
--- a/tests/core/steam/asset/ordering-of-assets-test.cpp
+++ b/tests/core/steam/asset/ordering-of-assets-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/util.hpp"
 
 #include "steam/assetmanager.hpp"
diff --git a/tests/core/steam/asset/testclipasset.hpp b/tests/core/steam/asset/testclipasset.hpp
index 9fd094e19..e5c5fece1 100644
--- a/tests/core/steam/asset/testclipasset.hpp
+++ b/tests/core/steam/asset/testclipasset.hpp
@@ -20,7 +20,7 @@
 #define ASSET_TESTCLIPASSET_H
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 //#include "lib/util.hpp"
 
 
diff --git a/tests/core/steam/asset/typed-id-test.cpp b/tests/core/steam/asset/typed-id-test.cpp
index 1b5476b69..a95c66928 100644
--- a/tests/core/steam/asset/typed-id-test.cpp
+++ b/tests/core/steam/asset/typed-id-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 
 #include "steam/asset/typed-id.hpp"
 #include "lib/idi/entry-id.hpp"
@@ -34,8 +34,8 @@
 //#include <unordered_map>
 //#include <string>
 
-//using lib::test::showSizeof;
-//using lib::test::randStr;
+//using test::showSizeof;
+//using test::randStr;
 //using util::isSameObject;
 //using util::and_all;
 using util::for_each;
diff --git a/tests/core/steam/control/argument-tuple-accept-test.cpp b/tests/core/steam/control/argument-tuple-accept-test.cpp
index 8fb0fb5fd..9d504f3b9 100644
--- a/tests/core/steam/control/argument-tuple-accept-test.cpp
+++ b/tests/core/steam/control/argument-tuple-accept-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "steam/control/argument-tuple-accept.hpp"
 #include "lib/meta/tuple-helper.hpp"
 #include "lib/meta/function.hpp"
@@ -29,10 +29,9 @@
 
 namespace steam {
 namespace control {
-namespace test    {
   
-  using lib::test::showSizeof;
-  using lib::test::randTime;
+  using test::randTime;
+  using test::showSizeof;
   
   using lib::time::TimeVar;
   using std::function;
@@ -116,4 +115,4 @@ namespace test    {
   LAUNCHER (ArgumentTupleAccept_test, "unit controller");
   
   
-}}} // namespace steam::control::test
+}} // namespace steam::control
diff --git a/tests/core/steam/control/command-argument-test.cpp b/tests/core/steam/control/command-argument-test.cpp
index 1f0b50df2..59ccd4b3e 100644
--- a/tests/core/steam/control/command-argument-test.cpp
+++ b/tests/core/steam/control/command-argument-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "steam/control/command-storage-holder.hpp"
 #include "lib/scoped-ptrvect.hpp"
 #include "lib/format-string.hpp"
@@ -46,10 +46,9 @@ using std::rand;
 
 namespace steam {
 namespace control {
-namespace test    {
   
-  using lib::test::showSizeof;
-  using lib::test::randTime;
+  using test::randTime;
+  using test::showSizeof;
   using namespace lib::meta;
   using LERR_(MISSING_MEMENTO);
   
@@ -346,4 +345,4 @@ namespace test    {
   LAUNCHER (CommandArgument_test, "unit controller");
   
   
-}}} // namespace steam::control::test
+}} // namespace steam::control
diff --git a/tests/core/steam/control/command-basic-test.cpp b/tests/core/steam/control/command-basic-test.cpp
index dc13ecba4..36efb88d8 100644
--- a/tests/core/steam/control/command-basic-test.cpp
+++ b/tests/core/steam/control/command-basic-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "steam/control/command-def.hpp"
 #include "lib/time/timevalue.hpp"
 #include "lib/p.hpp"
diff --git a/tests/core/steam/control/command-binding-test.cpp b/tests/core/steam/control/command-binding-test.cpp
index f6237517e..19dfa6030 100644
--- a/tests/core/steam/control/command-binding-test.cpp
+++ b/tests/core/steam/control/command-binding-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "steam/control/command-def.hpp"
 #include "steam/control/test-dummy-commands.hpp"
 #include "lib/format-cout.hpp"
diff --git a/tests/core/steam/control/command-clone-builder-test.cpp b/tests/core/steam/control/command-clone-builder-test.cpp
index ece5c11ba..d67a267e5 100644
--- a/tests/core/steam/control/command-clone-builder-test.cpp
+++ b/tests/core/steam/control/command-clone-builder-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "steam/control/command-impl.hpp"
 #include "steam/control/command-registry.hpp"
 #include "steam/control/argument-erasure.hpp"
diff --git a/tests/core/steam/control/command-equality-test.cpp b/tests/core/steam/control/command-equality-test.cpp
index b5d013663..bd8a71ad0 100644
--- a/tests/core/steam/control/command-equality-test.cpp
+++ b/tests/core/steam/control/command-equality-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "steam/control/command-def.hpp"
 #include "steam/control/command-mutation.hpp"
 #include "steam/control/argument-erasure.hpp"
diff --git a/tests/core/steam/control/command-instance-manager-test.cpp b/tests/core/steam/control/command-instance-manager-test.cpp
index 7aebfcead..cc65950ce 100644
--- a/tests/core/steam/control/command-instance-manager-test.cpp
+++ b/tests/core/steam/control/command-instance-manager-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "steam/control/test-dummy-commands.hpp"
 #include "steam/control/command-instance-manager.hpp"
 #include "lib/format-string.hpp"
diff --git a/tests/core/steam/control/command-message-binding-test.cpp b/tests/core/steam/control/command-message-binding-test.cpp
index 0a9e2912e..bba690ce1 100644
--- a/tests/core/steam/control/command-message-binding-test.cpp
+++ b/tests/core/steam/control/command-message-binding-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "steam/control/command-def.hpp"
 #include "lib/time/timevalue.hpp"
 #include "lib/diff/gen-node.hpp"
@@ -27,12 +27,12 @@ namespace steam {
 namespace control {
 namespace test    {
   
+  using ::test::randTime;
   using lib::time::Time;
   using lib::time::TimeVar;
   using lib::time::TimeValue;
   using lib::time::TimeSpan;
   using lib::time::Duration;
-  using lib::test::randTime;
   using lib::diff::Rec;
   
   
@@ -88,6 +88,8 @@ namespace test    {
       virtual void
       run (Arg) 
         {
+          seedRand();
+          
           Time five(TimeValue(5));
           implicitTestState = five;
           
diff --git a/tests/core/steam/control/command-mutation-test.cpp b/tests/core/steam/control/command-mutation-test.cpp
index 857385afd..e06644fed 100644
--- a/tests/core/steam/control/command-mutation-test.cpp
+++ b/tests/core/steam/control/command-mutation-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "steam/control/command-mutation.hpp"
 #include "steam/control/command-simple-closure.hpp"
 #include "steam/control/memento-tie.hpp"
diff --git a/tests/core/steam/control/command-queue-test.cpp b/tests/core/steam/control/command-queue-test.cpp
index cd0e2e5e2..49344b702 100644
--- a/tests/core/steam/control/command-queue-test.cpp
+++ b/tests/core/steam/control/command-queue-test.cpp
@@ -12,7 +12,7 @@
 * *****************************************************************/
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "steam/control/command-queue.hpp"
 #include "steam/control/command-def.hpp"
 #include "lib/symbol.hpp"
diff --git a/tests/core/steam/control/command-registry-test.cpp b/tests/core/steam/control/command-registry-test.cpp
index 189331e6a..fb2837a9d 100644
--- a/tests/core/steam/control/command-registry-test.cpp
+++ b/tests/core/steam/control/command-registry-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "steam/control/command-def.hpp"
 #include "steam/control/command-registry.hpp"
 #include "lib/symbol.hpp"
diff --git a/tests/core/steam/control/command-setup-test.cpp b/tests/core/steam/control/command-setup-test.cpp
index 3da7d75fc..3f37a564e 100644
--- a/tests/core/steam/control/command-setup-test.cpp
+++ b/tests/core/steam/control/command-setup-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "steam/cmd.hpp"
 #include "steam/control/command-def.hpp"
 #include "lib/format-string.hpp"
diff --git a/tests/core/steam/control/command-use1-test.cpp b/tests/core/steam/control/command-use1-test.cpp
index a7268b5a7..c9f36f8f4 100644
--- a/tests/core/steam/control/command-use1-test.cpp
+++ b/tests/core/steam/control/command-use1-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "steam/control/command-invocation.hpp"
 #include "steam/control/command-def.hpp"
 #include "lib/format-cout.hpp"
diff --git a/tests/core/steam/control/command-use2-test.cpp b/tests/core/steam/control/command-use2-test.cpp
index a70e0bc69..5d57c3ec3 100644
--- a/tests/core/steam/control/command-use2-test.cpp
+++ b/tests/core/steam/control/command-use2-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "steam/control/command.hpp"
 #include "steam/control/command-def.hpp"
 #include "steam/control/handling-pattern.hpp"
diff --git a/tests/core/steam/control/command-use3-test.cpp b/tests/core/steam/control/command-use3-test.cpp
index 04caa3220..a334abf3f 100644
--- a/tests/core/steam/control/command-use3-test.cpp
+++ b/tests/core/steam/control/command-use3-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "steam/control/command-def.hpp"
 //#include "lib/format-cout.hpp"
 //#include "lib/util.hpp"
@@ -40,7 +40,7 @@ namespace test    {
 //  using std::bind;
 //  using std::string;
   //using std::rand;
-//  using lib::test::showSizeof;
+//  using test::showSizeof;
 //  using util::isSameObject;
 //  using util::contains;
   
diff --git a/tests/core/steam/control/dispatcher-looper-test.cpp b/tests/core/steam/control/dispatcher-looper-test.cpp
index 1b264bfa6..074f8b93f 100644
--- a/tests/core/steam/control/dispatcher-looper-test.cpp
+++ b/tests/core/steam/control/dispatcher-looper-test.cpp
@@ -12,7 +12,7 @@
 * *****************************************************************/
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "steam/control/looper.hpp"
 
 #include <chrono>
diff --git a/tests/core/steam/control/handling-pattern-basics-test.cpp b/tests/core/steam/control/handling-pattern-basics-test.cpp
index 8bdb42f12..c1f950e62 100644
--- a/tests/core/steam/control/handling-pattern-basics-test.cpp
+++ b/tests/core/steam/control/handling-pattern-basics-test.cpp
@@ -16,14 +16,14 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "steam/control/command.hpp"
 #include "steam/control/command-impl.hpp"
 #include "steam/control/command-registry.hpp"
 #include "steam/control/argument-erasure.hpp"
 #include "steam/control/handling-pattern.hpp"
-#include "lib/test/event-log.hpp"
 
+#include "test/event-log.hpp"
 #include "steam/control/test-dummy-commands.hpp"
 
 
@@ -43,7 +43,7 @@ namespace test   {
       : public HandlingPattern
       {
         mutable
-        lib::test::EventLog log_{"custom command handler"};
+        ::test::EventLog log_{"custom command handler"};
         
         
         /* ==== HandlingPattern - Interface ==== */
diff --git a/tests/core/steam/control/handling-pattern-standard-impl-test.cpp b/tests/core/steam/control/handling-pattern-standard-impl-test.cpp
index b8c6dcb87..41ab0e7ef 100644
--- a/tests/core/steam/control/handling-pattern-standard-impl-test.cpp
+++ b/tests/core/steam/control/handling-pattern-standard-impl-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-//#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+//#include "test/test-helper.hpp"
 //#include "steam/asset/media.hpp"
 //#include "steam/mobject/session.hpp"
 //#include "steam/mobject/session/edl.hpp"
@@ -53,7 +53,7 @@ namespace test    {
 //  using std::bind;
 //  using std::string;
   //using std::rand;
-//  using lib::test::showSizeof;
+//  using test::showSizeof;
 //  using util::isSameObject;
 //  using util::contains;
 
diff --git a/tests/core/steam/control/memento-tie-test.cpp b/tests/core/steam/control/memento-tie-test.cpp
index 06381d46f..3e91fdb06 100644
--- a/tests/core/steam/control/memento-tie-test.cpp
+++ b/tests/core/steam/control/memento-tie-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "steam/control/memento-tie.hpp"
 
 #include <functional>
diff --git a/tests/core/steam/control/session-command-function-test.cpp b/tests/core/steam/control/session-command-function-test.cpp
index a32530db4..5d7d0f3f8 100644
--- a/tests/core/steam/control/session-command-function-test.cpp
+++ b/tests/core/steam/control/session-command-function-test.cpp
@@ -64,8 +64,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 extern "C" {
 #include "vessel/interfaceregistry.h"
 }
@@ -97,7 +97,7 @@ namespace test    {
   using std::chrono::microseconds;
   using namespace std::chrono_literals;
   using steam::control::SessionCommand;
-  using lib::test::randTime;
+  using ::test::randTime;
   using lib::diff::GenNode;
   using lib::diff::Rec;
   using lib::time::Time;
diff --git a/tests/core/steam/control/test-dummy-commands.hpp b/tests/core/steam/control/test-dummy-commands.hpp
index 9b6e5d840..d0fc48060 100644
--- a/tests/core/steam/control/test-dummy-commands.hpp
+++ b/tests/core/steam/control/test-dummy-commands.hpp
@@ -30,7 +30,7 @@
 #define COMMAND_TEST_DUMMY_COMMANDS_H
 
 #include "lib/error.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/test-helper.hpp"
 #include "steam/control/command-setup.hpp"
 
 #include <functional>
diff --git a/tests/core/steam/engine/buffer-metadata-key-test.cpp b/tests/core/steam/engine/buffer-metadata-key-test.cpp
index 143c01787..2ed7c82d6 100644
--- a/tests/core/steam/engine/buffer-metadata-key-test.cpp
+++ b/tests/core/steam/engine/buffer-metadata-key-test.cpp
@@ -17,8 +17,8 @@
 
 
 #include "lib/error.hpp"
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "steam/engine/buffer-metadata.hpp"
 
 #include <cstdlib>
diff --git a/tests/core/steam/engine/buffer-metadata-test.cpp b/tests/core/steam/engine/buffer-metadata-test.cpp
index d3f6de398..52323aa54 100644
--- a/tests/core/steam/engine/buffer-metadata-test.cpp
+++ b/tests/core/steam/engine/buffer-metadata-test.cpp
@@ -17,8 +17,8 @@
 
 
 #include "lib/error.hpp"
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "steam/engine/buffer-metadata.hpp"
 #include "steam/engine/testframe.hpp"
 #include "lib/util.hpp"
@@ -27,9 +27,9 @@
 
 using std::strncpy;
 using std::unique_ptr;
-using lib::test::randStr;
 using util::isSameObject;
 using util::isnil;
+using lib::randStr;
 
 
 namespace steam {
diff --git a/tests/core/steam/engine/buffer-provider-protocol-test.cpp b/tests/core/steam/engine/buffer-provider-protocol-test.cpp
index 8c3a871d2..d791651c9 100644
--- a/tests/core/steam/engine/buffer-provider-protocol-test.cpp
+++ b/tests/core/steam/engine/buffer-provider-protocol-test.cpp
@@ -17,9 +17,9 @@
 
 
 #include "lib/error.hpp"
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
-#include "lib/test/tracking-dummy.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
+#include "test/tracking-dummy.hpp"
 #include "steam/engine/diagnostic-buffer-provider.hpp"
 #include "steam/engine/test-rand-ontology.hpp"
 #include "steam/engine/testframe.hpp"
@@ -275,7 +275,7 @@ namespace test  {
         {
           DiagnosticBufferProvider provider;
           
-          using lib::test::Tracker;
+          using ::test::Tracker;
           auto& log = Tracker::log;
           log.clear();
           
diff --git a/tests/core/steam/engine/calc-stream-test.cpp b/tests/core/steam/engine/calc-stream-test.cpp
index 01aac9bbb..f865663be 100644
--- a/tests/core/steam/engine/calc-stream-test.cpp
+++ b/tests/core/steam/engine/calc-stream-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/error.hpp"
 
 #include "steam/engine/engine-service.hpp"
diff --git a/tests/core/steam/engine/diagnostic-buffer-provider-test.cpp b/tests/core/steam/engine/diagnostic-buffer-provider-test.cpp
index 58dc9c493..16abc0a9a 100644
--- a/tests/core/steam/engine/diagnostic-buffer-provider-test.cpp
+++ b/tests/core/steam/engine/diagnostic-buffer-provider-test.cpp
@@ -17,7 +17,7 @@
 
 
 #include "lib/error.hpp"
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "steam/engine/diagnostic-buffer-provider.hpp"
 #include "steam/engine/testframe.hpp"
 #include "lib/util.hpp"
diff --git a/tests/core/steam/engine/dispatcher-interface-test.cpp b/tests/core/steam/engine/dispatcher-interface-test.cpp
index e740ba7b8..83ce151ae 100644
--- a/tests/core/steam/engine/dispatcher-interface-test.cpp
+++ b/tests/core/steam/engine/dispatcher-interface-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "steam/engine/mock-dispatcher.hpp"
 #include "steam/play/timings.hpp"
 #include "lib/time/timevalue.hpp"
diff --git a/tests/core/steam/engine/engine-ctx-test.cpp b/tests/core/steam/engine/engine-ctx-test.cpp
index abdc4daca..1101a026f 100644
--- a/tests/core/steam/engine/engine-ctx-test.cpp
+++ b/tests/core/steam/engine/engine-ctx-test.cpp
@@ -17,8 +17,8 @@
 
 
 #include "lib/error.hpp"
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "steam/engine/engine-ctx.hpp"
 #include "steam/engine/buffer-provider.hpp"
 //#include "steam/engine/engine-ctx-facilities.hpp" //////////TODO required?
diff --git a/tests/core/steam/engine/engine-interface-test.cpp b/tests/core/steam/engine/engine-interface-test.cpp
index c081e2b14..3833d45b8 100644
--- a/tests/core/steam/engine/engine-interface-test.cpp
+++ b/tests/core/steam/engine/engine-interface-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/error.hpp"
 
 #include "steam/engine/calc-stream.hpp"
diff --git a/tests/core/steam/engine/job-hash-test.cpp b/tests/core/steam/engine/job-hash-test.cpp
index 78487815c..09fc89cf1 100644
--- a/tests/core/steam/engine/job-hash-test.cpp
+++ b/tests/core/steam/engine/job-hash-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/util.hpp"
 
 #include "vault/real-clock.hpp"
diff --git a/tests/core/steam/engine/job-planning-pipeline-test.cpp b/tests/core/steam/engine/job-planning-pipeline-test.cpp
index 3df8f7809..29620b74b 100644
--- a/tests/core/steam/engine/job-planning-pipeline-test.cpp
+++ b/tests/core/steam/engine/job-planning-pipeline-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "steam/engine/mock-dispatcher.hpp"
 
 #include "lib/iter-explorer.hpp"
@@ -96,7 +96,7 @@ namespace test  {
       void
       demonstrateScaffolding()
         {
-          Time nominalTime = lib::test::randTime();
+          Time nominalTime = ::test::randTime();
           int additionalKey = rani(5000);
           
           // (1) mocked render Job
diff --git a/tests/core/steam/engine/job-planning-test.cpp b/tests/core/steam/engine/job-planning-test.cpp
index e5eac9df7..fc0aab39a 100644
--- a/tests/core/steam/engine/job-planning-test.cpp
+++ b/tests/core/steam/engine/job-planning-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "steam/engine/mock-dispatcher.hpp"
 #include "steam/play/timings.hpp"
 #include "lib/time/timevalue.hpp"
diff --git a/tests/core/steam/engine/mock-dispatcher.cpp b/tests/core/steam/engine/mock-dispatcher.cpp
index 822bd1f86..ccb9ab055 100644
--- a/tests/core/steam/engine/mock-dispatcher.cpp
+++ b/tests/core/steam/engine/mock-dispatcher.cpp
@@ -32,7 +32,7 @@
 
 #include "steam/engine/mock-dispatcher.hpp"
 #include "vault/gear/nop-job-functor.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/test-helper.hpp"
 #include "lib/time/timevalue.hpp"
 #include "vault/real-clock.hpp"
 #include "lib/hash-combine.hpp"
@@ -179,7 +179,7 @@ namespace test  {
     invoKey.part.a = rani (MAX_PARAM_A);
     invoKey.part.b = rani (2*MAX_PARAM_B - MAX_PARAM_B);
     
-    Time nominalTime = lib::test::randTime();
+    Time nominalTime = ::test::randTime();
     
     return Job(dummyClosure, invoKey, nominalTime);
   }
diff --git a/tests/core/steam/engine/mock-dispatcher.hpp b/tests/core/steam/engine/mock-dispatcher.hpp
index 2e6602a1e..696db2172 100644
--- a/tests/core/steam/engine/mock-dispatcher.hpp
+++ b/tests/core/steam/engine/mock-dispatcher.hpp
@@ -42,7 +42,7 @@
 #define STEAM_ENGINE_TEST_MOCK_DISPATCHER_H
 
 
-#include "lib/test/test-helper.hpp"
+#include "test/test-helper.hpp"
 #include "steam/play/dummy-play-connection.hpp"
 #include "steam/fixture/node-graph-attachment.hpp"
 #include "steam/fixture/segmentation.hpp"
diff --git a/tests/core/steam/engine/mock-support-test.cpp b/tests/core/steam/engine/mock-support-test.cpp
index aa5cf980d..0c0a711b2 100644
--- a/tests/core/steam/engine/mock-support-test.cpp
+++ b/tests/core/steam/engine/mock-support-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "steam/engine/mock-dispatcher.hpp"
 #include "vault/gear/nop-job-functor.hpp"
 #include "lib/iter-explorer.hpp"
@@ -32,6 +32,7 @@ namespace steam {
 namespace engine{
 namespace test  {
   
+  using ::test::randTime;
   using steam::fixture::Segment;
   using lib::singleValIterator;
   using util::isSameObject;
@@ -95,7 +96,7 @@ namespace test  {
       void
       verify_MockJob()
         {
-          Time nominalTime = lib::test::randTime();
+          Time nominalTime{randTime()};
           int additionalKey = rani(5000);
           MockJob mockJob{nominalTime, additionalKey};
           CHECK (mockJob.getNominalTime() == nominalTime);
@@ -119,7 +120,7 @@ namespace test  {
       void
       verify_MockJobTicket()
         {
-          auto frameTime = lib::test::randTime();
+          Time frameTime{randTime()};
           
           // build a render job to do nothing....
           Job nopJob = JobTicket::NOP.createJobFor (frameTime);
@@ -150,7 +151,7 @@ namespace test  {
       void
       verify_MockSegmentation()
         {
-          Time someTime = lib::test::randTime();
+          Time someTime{randTime()};
           //
           //-----------------------------------------------------------------/// Empty default Segmentation
           {
@@ -305,7 +306,7 @@ namespace test  {
       void
       verify_MockPrerequisites()
         {
-          Time someTime = lib::test::randTime();
+          Time someTime{randTime()};
           //-----------------------------------------------------------------/// one Segment with one additional prerequisite
           {
             MockSegmentation mockSegs{MakeRec()
diff --git a/tests/core/steam/engine/node-base-test.cpp b/tests/core/steam/engine/node-base-test.cpp
index 0c6a639e0..9c0c76e77 100644
--- a/tests/core/steam/engine/node-base-test.cpp
+++ b/tests/core/steam/engine/node-base-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/iter-zip.hpp"
 #include "lib/meta/function.hpp"
 #include "lib/several-builder.hpp"
@@ -27,14 +27,14 @@
 #include "steam/engine/feed-manifold.hpp"
 #include "steam/engine/node-builder.hpp"
 #include "steam/engine/buffhandle.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/test-helper.hpp"
 #include "lib/util.hpp"
 
 
 using std::tuple;
 using std::array;
 using util::isSameAdr;
-using lib::test::showType;
+using ::test::showType;
 using lib::makeSeveral;
 using lib::izip;
 
diff --git a/tests/core/steam/engine/node-builder-test.cpp b/tests/core/steam/engine/node-builder-test.cpp
index 91cf89852..fdf8e800e 100644
--- a/tests/core/steam/engine/node-builder-test.cpp
+++ b/tests/core/steam/engine/node-builder-test.cpp
@@ -16,11 +16,10 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "steam/engine/engine-ctx.hpp"
 #include "steam/engine/node-builder.hpp"
 #include "steam/asset/meta/time-grid.hpp"
-#include "lib/test/diagnostic-output.hpp"
 #include "lib/time/timequant.hpp"
 #include "lib/time/timecode.hpp"
 #include "lib/iter-explorer.hpp"
diff --git a/tests/core/steam/engine/node-devel-test.cpp b/tests/core/steam/engine/node-devel-test.cpp
index d86e3e364..f69676bcc 100644
--- a/tests/core/steam/engine/node-devel-test.cpp
+++ b/tests/core/steam/engine/node-devel-test.cpp
@@ -16,9 +16,9 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/hash-combine.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/test-helper.hpp"
 #include "steam/engine/engine-ctx.hpp"
 #include "steam/engine/node-builder.hpp"
 #include "steam/engine/test-rand-ontology.hpp"
@@ -33,7 +33,7 @@ using lib::izip;
 using std::array;
 using std::vector;
 using std::make_tuple;
-using lib::test::showType;
+using test::showType;
 
 
 namespace steam {
@@ -294,7 +294,7 @@ namespace test  {
           // generate a binding as processing-functor
           auto procFun = spec.makeFun();
           using Sig = lib::meta::_Fun<decltype(procFun)>::Sig;
-          CHECK (showType<Sig>() == "void (tuple<ulong, uint>, engine::test::TestFrame*)"_expect);
+          CHECK (showType<Sig>() == "void (tuple<ulong, uint>, engine::TestFrame*)"_expect);
 
           // Behaves identical to processing_generateFrame() — see above...
           size_t frameNr = defaultGen.u64();
@@ -373,7 +373,7 @@ namespace test  {
           // generate a binding as processing-functor
           auto procFun = spec.makeFun();
           using Sig = lib::meta::_Fun<decltype(procFun)>::Sig;
-          CHECK (showType<Sig>() == "void (ulong, engine::test::TestFrame const*, engine::test::TestFrame*)"_expect);
+          CHECK (showType<Sig>() == "void (ulong, engine::TestFrame const*, engine::TestFrame*)"_expect);
           
           // Results can be verified by ont::manipulateFrame() — see above
           size_t frameNr = defaultGen.u64();
@@ -447,8 +447,8 @@ namespace test  {
           // generate a binding as processing-functor
           auto procFun = spec.makeFun();
           using Sig = lib::meta::_Fun<decltype(procFun)>::Sig;
-          CHECK (showType<Sig>() == "void (double, array<engine::test::TestFrame const*, 2ul>, "
-                                                  "engine::test::TestFrame*)"_expect);  //^^/////////////////TICKET #1391 needlessly rendered as `long`
+          CHECK (showType<Sig>() == "void (double, array<engine::TestFrame const*, 2ul>, "
+                                                  "engine::TestFrame*)"_expect);  //^^/////////////////TICKET #1391 needlessly rendered as `long`
           size_t frameNr = defaultGen.u64();
           uint flavour   = defaultGen.u64();
           double mix     = defaultGen.uni();
diff --git a/tests/core/steam/engine/node-feed-test.cpp b/tests/core/steam/engine/node-feed-test.cpp
index b74ebab0a..29ff3dbbb 100644
--- a/tests/core/steam/engine/node-feed-test.cpp
+++ b/tests/core/steam/engine/node-feed-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/depend-inject.hpp"
 #include "steam/engine/engine-ctx.hpp"
 #include "steam/engine/proc-node.hpp"
@@ -29,8 +29,8 @@
 #include "steam/asset/meta/time-grid.hpp"
 #include "lib/several-builder.hpp"
 #include "lib/time/timecode.hpp"
-#include "lib/test/test-helper.hpp"
-#include "lib/test/diagnostic-output.hpp"/////////////////////TODO
+#include "test/test-helper.hpp"
+#include "test/diagnostic-output.hpp"/////////////////////TODO
 //#include "lib/util.hpp"
 
 
@@ -38,7 +38,7 @@ using lib::Several;
 using lib::makeSeveral;
 using lib::time::Time;
 using lib::time::FrameNr;
-using lib::test::showType;
+using test::showType;
 using std::make_tuple;
 using std::get;
 
diff --git a/tests/core/steam/engine/node-link-test.cpp b/tests/core/steam/engine/node-link-test.cpp
index 643bf24cc..292a36936 100644
--- a/tests/core/steam/engine/node-link-test.cpp
+++ b/tests/core/steam/engine/node-link-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "steam/engine/engine-ctx.hpp"
 #include "steam/engine/proc-node.hpp"
 #include "steam/engine/node-builder.hpp"
diff --git a/tests/core/steam/engine/node-meta-test.cpp b/tests/core/steam/engine/node-meta-test.cpp
index 1bbe9fd18..ded59722f 100644
--- a/tests/core/steam/engine/node-meta-test.cpp
+++ b/tests/core/steam/engine/node-meta-test.cpp
@@ -16,12 +16,12 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "steam/engine/proc-node.hpp"
 #include "steam/engine/node-builder.hpp"
 #include "lib/format-util.hpp"
-#include "lib/test/test-helper.hpp"
-#include "lib/test/diagnostic-output.hpp"/////////////////TODO
+#include "test/test-helper.hpp"
+#include "test/diagnostic-output.hpp"/////////////////TODO
 
 #include <cmath>
 
diff --git a/tests/core/steam/engine/node-opera-test.cpp b/tests/core/steam/engine/node-opera-test.cpp
index 20185f12f..09272194e 100644
--- a/tests/core/steam/engine/node-opera-test.cpp
+++ b/tests/core/steam/engine/node-opera-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 //#include "lib/util.hpp"
 
 
diff --git a/tests/core/steam/engine/node-storage-test.cpp b/tests/core/steam/engine/node-storage-test.cpp
index 0660c668e..bb95a11c2 100644
--- a/tests/core/steam/engine/node-storage-test.cpp
+++ b/tests/core/steam/engine/node-storage-test.cpp
@@ -19,7 +19,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 //#include "lib/util.hpp"
 
 
diff --git a/tests/core/steam/engine/output-proxy-provider-test.cpp b/tests/core/steam/engine/output-proxy-provider-test.cpp
index 19046a6c2..3f41fc07f 100644
--- a/tests/core/steam/engine/output-proxy-provider-test.cpp
+++ b/tests/core/steam/engine/output-proxy-provider-test.cpp
@@ -16,13 +16,13 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 
 //#include "steam/play/diagnostic-output-slot.hpp"
 #include "steam/engine/buffer-proxy-adaptor.hpp"
 #include "steam/engine/test-rand-ontology.hpp"
 #include "lib/meta/prop-builder.hpp"
-#include "lib/test/diagnostic-output.hpp"
+#include "test/diagnostic-output.hpp" ////////////////////TODO
 
 
 namespace steam {
diff --git a/tests/core/steam/engine/scheduler-interface-test.cpp b/tests/core/steam/engine/scheduler-interface-test.cpp
index 359e2ab6e..04696872b 100644
--- a/tests/core/steam/engine/scheduler-interface-test.cpp
+++ b/tests/core/steam/engine/scheduler-interface-test.cpp
@@ -19,7 +19,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/util.hpp"
 
 #include "vault/real-clock.hpp"
diff --git a/tests/core/steam/engine/testframe-test.cpp b/tests/core/steam/engine/testframe-test.cpp
index 45699b6e9..207c2ba45 100644
--- a/tests/core/steam/engine/testframe-test.cpp
+++ b/tests/core/steam/engine/testframe-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "steam/engine/testframe.hpp"
 #include "lib/util.hpp"
 
diff --git a/tests/core/steam/engine/timings-test.cpp b/tests/core/steam/engine/timings-test.cpp
index eeeddd487..183d724ae 100644
--- a/tests/core/steam/engine/timings-test.cpp
+++ b/tests/core/steam/engine/timings-test.cpp
@@ -18,8 +18,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 
 #include "steam/play/timings.hpp"
 #include "lib/time/timevalue.hpp"
diff --git a/tests/core/steam/fixture/fixture-change-detector-test.cpp b/tests/core/steam/fixture/fixture-change-detector-test.cpp
index 086f8e273..4f3b57181 100644
--- a/tests/core/steam/fixture/fixture-change-detector-test.cpp
+++ b/tests/core/steam/fixture/fixture-change-detector-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "steam/fixture/fixture-change-detector.hpp"
 #include "steam/asset/timeline.hpp"
 #include "steam/asset/pipe.hpp"
diff --git a/tests/core/steam/fixture/fixture-segment-test.cpp b/tests/core/steam/fixture/fixture-segment-test.cpp
index 8cde8f4ee..613364c10 100644
--- a/tests/core/steam/fixture/fixture-segment-test.cpp
+++ b/tests/core/steam/fixture/fixture-segment-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "steam/fixture/node-graph-attachment.hpp"
 #include "steam/engine/mock-dispatcher.hpp"
 #include "steam/engine/exit-node.hpp"
diff --git a/tests/core/steam/fixture/model-port-registry-test.cpp b/tests/core/steam/fixture/model-port-registry-test.cpp
index e756c0f9a..e03438544 100644
--- a/tests/core/steam/fixture/model-port-registry-test.cpp
+++ b/tests/core/steam/fixture/model-port-registry-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "steam/fixture/model-port-registry.hpp"
 #include "steam/asset/timeline.hpp"
 #include "steam/asset/pipe.hpp"
diff --git a/tests/core/steam/fixture/node-graph-attachment-test.cpp b/tests/core/steam/fixture/node-graph-attachment-test.cpp
index 0b98e2b25..e59b0ef45 100644
--- a/tests/core/steam/fixture/node-graph-attachment-test.cpp
+++ b/tests/core/steam/fixture/node-graph-attachment-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "steam/fixture/node-graph-attachment.hpp"
 #include "steam/engine/mock-dispatcher.hpp"
 #include "steam/engine/exit-node.hpp"
diff --git a/tests/core/steam/fixture/segmentation-integration-test.cpp b/tests/core/steam/fixture/segmentation-integration-test.cpp
index c51346e6d..d5590bc4f 100644
--- a/tests/core/steam/fixture/segmentation-integration-test.cpp
+++ b/tests/core/steam/fixture/segmentation-integration-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "steam/fixture/fixture-change-detector.hpp"
 #include "steam/asset/timeline.hpp"
 #include "steam/asset/pipe.hpp"
diff --git a/tests/core/steam/mobject/builder/build-segment-test.cpp b/tests/core/steam/mobject/builder/build-segment-test.cpp
index e8c861250..b2266a828 100644
--- a/tests/core/steam/mobject/builder/build-segment-test.cpp
+++ b/tests/core/steam/mobject/builder/build-segment-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 //#include "lib/util.hpp"
 
 
diff --git a/tests/core/steam/mobject/builder/builder-tool-test.cpp b/tests/core/steam/mobject/builder/builder-tool-test.cpp
index bc80d4722..b9b1ace9d 100644
--- a/tests/core/steam/mobject/builder/builder-tool-test.cpp
+++ b/tests/core/steam/mobject/builder/builder-tool-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 
 #include "steam/mobject/builder/buildertool.hpp"
 #include "steam/mobject/placement.hpp"
diff --git a/tests/core/steam/mobject/mobject-interface-test.cpp b/tests/core/steam/mobject/mobject-interface-test.cpp
index 5c7c61214..a470c8676 100644
--- a/tests/core/steam/mobject/mobject-interface-test.cpp
+++ b/tests/core/steam/mobject/mobject-interface-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/symbol.hpp"
 
 #include "steam/asset/media.hpp"
@@ -43,8 +43,6 @@ namespace steam    {
 namespace mobject {
 namespace test    {
   
-//  using lib::test::showSizeof;
-  
   using lib::Symbol;
   using lib::time::Duration;
   using lib::time::FSecs;
@@ -59,7 +57,7 @@ namespace test    {
   
   
   using namespace mobject::test;
-  typedef TestPlacement<DummyMO> PDummy;
+  using PDummy = TestPlacement<DummyMO>;
   
   
   /*****************************************************************************//**
diff --git a/tests/core/steam/mobject/mobject-ref-test.cpp b/tests/core/steam/mobject/mobject-ref-test.cpp
index f99164c79..6a08aa743 100644
--- a/tests/core/steam/mobject/mobject-ref-test.cpp
+++ b/tests/core/steam/mobject/mobject-ref-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "steam/asset/media.hpp"
 #include "steam/mobject/mobject.hpp"
 #include "steam/mobject/mobject-ref.hpp"
@@ -29,14 +29,14 @@
 #include "steam/mobject/test-dummy-mobject.hpp"
 #include "vault/media-access-mock.hpp"
 #include "lib/depend-inject.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/test-helper.hpp"
 #include "lib/time/timevalue.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/util.hpp"
 
 #include <string>
 
-using lib::test::showSizeof;
+using test::showSizeof;
 using lib::time::Duration;
 using lib::time::FSecs;
 using lib::time::Time;
diff --git a/tests/core/steam/mobject/placement-basic-test.cpp b/tests/core/steam/mobject/placement-basic-test.cpp
index 1c6e6bcf0..81568571c 100644
--- a/tests/core/steam/mobject/placement-basic-test.cpp
+++ b/tests/core/steam/mobject/placement-basic-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "steam/asset/media.hpp"
 #include "steam/mobject/session.hpp"
 #include "steam/mobject/session/testclip.hpp"
diff --git a/tests/core/steam/mobject/placement-hierarchy-test.cpp b/tests/core/steam/mobject/placement-hierarchy-test.cpp
index 515e8c327..d7f0041ea 100644
--- a/tests/core/steam/mobject/placement-hierarchy-test.cpp
+++ b/tests/core/steam/mobject/placement-hierarchy-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/depend-inject.hpp"
 #include "vault/media-access-mock.hpp"
 #include "steam/mobject/test-dummy-mobject.hpp"
@@ -36,7 +36,7 @@ namespace session {
 namespace test    {
   
   using session::Clip;
-  using lib::test::showSizeof;
+  using ::test::showSizeof;
   using namespace mobject::test;
   using lumiera::error::LUMIERA_ERROR_ASSERTION;
   
diff --git a/tests/core/steam/mobject/placement-object-identity-test.cpp b/tests/core/steam/mobject/placement-object-identity-test.cpp
index 553b6964a..f235910d7 100644
--- a/tests/core/steam/mobject/placement-object-identity-test.cpp
+++ b/tests/core/steam/mobject/placement-object-identity-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "steam/asset/media.hpp"
 #include "steam/mobject/mobject.hpp"
 #include "steam/mobject/mobject-ref.hpp"
@@ -28,7 +28,7 @@
 #include "steam/mobject/explicitplacement.hpp"
 #include "lib/time/timevalue.hpp"
 //#include "steam/mobject/test-dummy-mobject.hpp"
-//#include "lib/test/test-helper.hpp"
+//#include "test/test-helper.hpp"
 
 
 
diff --git a/tests/core/steam/mobject/placement-ref-test.cpp b/tests/core/steam/mobject/placement-ref-test.cpp
index 3437f2b60..73d0101cc 100644
--- a/tests/core/steam/mobject/placement-ref-test.cpp
+++ b/tests/core/steam/mobject/placement-ref-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "steam/mobject/placement.hpp"
 #include "steam/mobject/placement-ref.hpp"
 #include "steam/mobject/session/placement-index.hpp"
diff --git a/tests/core/steam/mobject/session/add-clip-test.cpp b/tests/core/steam/mobject/session/add-clip-test.cpp
index 25c80d9e2..993f0bc26 100644
--- a/tests/core/steam/mobject/session/add-clip-test.cpp
+++ b/tests/core/steam/mobject/session/add-clip-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "steam/mobject/session.hpp"
 #include "steam/mobject/session/testclip.hpp"
 #include "steam/mobject/placement.hpp"
diff --git a/tests/core/steam/mobject/session/defs-manager-impl-test.cpp b/tests/core/steam/mobject/session/defs-manager-impl-test.cpp
index bd81c4d66..89372155f 100644
--- a/tests/core/steam/mobject/session/defs-manager-impl-test.cpp
+++ b/tests/core/steam/mobject/session/defs-manager-impl-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/util.hpp"
 
 #include "steam/asset.hpp"
diff --git a/tests/core/steam/mobject/session/defs-manager-test.cpp b/tests/core/steam/mobject/session/defs-manager-test.cpp
index 52488fb4d..36ce1587b 100644
--- a/tests/core/steam/mobject/session/defs-manager-test.cpp
+++ b/tests/core/steam/mobject/session/defs-manager-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/symbol.hpp"
 #include "lib/util.hpp"
 #include "lib/format-string.hpp"
diff --git a/tests/core/steam/mobject/session/defs-registry-impl-test.cpp b/tests/core/steam/mobject/session/defs-registry-impl-test.cpp
index 6b3247d32..7a9792fd1 100644
--- a/tests/core/steam/mobject/session/defs-registry-impl-test.cpp
+++ b/tests/core/steam/mobject/session/defs-registry-impl-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/util.hpp"
 
 #include "vessel/query.hpp"
diff --git a/tests/core/steam/mobject/session/deletecliptest.cpp b/tests/core/steam/mobject/session/deletecliptest.cpp
index c11e27923..6859c7357 100644
--- a/tests/core/steam/mobject/session/deletecliptest.cpp
+++ b/tests/core/steam/mobject/session/deletecliptest.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "steam/assetmanager.hpp"
 #include "steam/mobject/session.hpp"
 #include "steam/mobject/session/testsession1.hpp"
diff --git a/tests/core/steam/mobject/session/output-mapping-test.cpp b/tests/core/steam/mobject/session/output-mapping-test.cpp
index 8da429c5f..39c81a1ac 100644
--- a/tests/core/steam/mobject/session/output-mapping-test.cpp
+++ b/tests/core/steam/mobject/session/output-mapping-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "steam/mobject/output-mapping.hpp"
 #include "steam/asset/pipe.hpp"
 #include "lib/format-string.hpp"
diff --git a/tests/core/steam/mobject/session/placement-index-query-test.cpp b/tests/core/steam/mobject/session/placement-index-query-test.cpp
index 937d0d632..054a2bc75 100644
--- a/tests/core/steam/mobject/session/placement-index-query-test.cpp
+++ b/tests/core/steam/mobject/session/placement-index-query-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "steam/mobject/session/scope-query.hpp"
 #include "steam/mobject/session/session-service-explore-scope.hpp"
 #include "steam/mobject/session/placement-index-query-resolver.hpp"
diff --git a/tests/core/steam/mobject/session/placement-index-test.cpp b/tests/core/steam/mobject/session/placement-index-test.cpp
index df1322ace..01b81d1f4 100644
--- a/tests/core/steam/mobject/session/placement-index-test.cpp
+++ b/tests/core/steam/mobject/session/placement-index-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "steam/mobject/session/placement-index.hpp"
 #include "steam/mobject/session/scope.hpp"
 #include "steam/mobject/placement.hpp"
diff --git a/tests/core/steam/mobject/session/placement-scope-test.cpp b/tests/core/steam/mobject/session/placement-scope-test.cpp
index 727948a71..127794199 100644
--- a/tests/core/steam/mobject/session/placement-scope-test.cpp
+++ b/tests/core/steam/mobject/session/placement-scope-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "steam/mobject/mobject.hpp"
 #include "steam/mobject/session/scope.hpp"
 #include "steam/mobject/session/test-scopes.hpp"
diff --git a/tests/core/steam/mobject/session/query-focus-stack-test.cpp b/tests/core/steam/mobject/session/query-focus-stack-test.cpp
index def5b6685..e261a69df 100644
--- a/tests/core/steam/mobject/session/query-focus-stack-test.cpp
+++ b/tests/core/steam/mobject/session/query-focus-stack-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "steam/mobject/session/test-scopes.hpp"
 #include "steam/mobject/session/query-focus-stack.hpp"
 #include "steam/mobject/session/test-scope-invalid.hpp"
diff --git a/tests/core/steam/mobject/session/query-focus-test.cpp b/tests/core/steam/mobject/session/query-focus-test.cpp
index ffb0f0cbe..4fc2765d7 100644
--- a/tests/core/steam/mobject/session/query-focus-test.cpp
+++ b/tests/core/steam/mobject/session/query-focus-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "steam/mobject/session/test-scopes.hpp"
 #include "steam/mobject/session/placement-index.hpp"
 #include "steam/mobject/session/query-focus.hpp"
diff --git a/tests/core/steam/mobject/session/query-resolver-test.cpp b/tests/core/steam/mobject/session/query-resolver-test.cpp
index 9ed9b0200..d8c34130b 100644
--- a/tests/core/steam/mobject/session/query-resolver-test.cpp
+++ b/tests/core/steam/mobject/session/query-resolver-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/depend.hpp"
 
@@ -30,8 +30,8 @@
 namespace vessel {
 namespace test {
   
-  using lib::test::showSizeof;
   using std::string;
+  using ::test::showSizeof;
   
   
   
diff --git a/tests/core/steam/mobject/session/rebuildfixturetest.cpp b/tests/core/steam/mobject/session/rebuildfixturetest.cpp
index 48b7a0c33..30dccd81a 100644
--- a/tests/core/steam/mobject/session/rebuildfixturetest.cpp
+++ b/tests/core/steam/mobject/session/rebuildfixturetest.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "steam/mobject/session.hpp"
 #include "steam/mobject/session/testsession1.hpp"
 //#include "lib/format-cout.hpp"
diff --git a/tests/core/steam/mobject/session/scope-path-test.cpp b/tests/core/steam/mobject/session/scope-path-test.cpp
index 14ce6022d..a7abaab8c 100644
--- a/tests/core/steam/mobject/session/scope-path-test.cpp
+++ b/tests/core/steam/mobject/session/scope-path-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "steam/mobject/session/test-scopes.hpp"
 #include "steam/mobject/session/placement-index.hpp"
 #include "steam/mobject/session/scope-path.hpp"
diff --git a/tests/core/steam/mobject/session/scope-query-test.cpp b/tests/core/steam/mobject/session/scope-query-test.cpp
index 7ddd871c6..ee900d43e 100644
--- a/tests/core/steam/mobject/session/scope-query-test.cpp
+++ b/tests/core/steam/mobject/session/scope-query-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "steam/mobject/session/scope-query.hpp"
 #include "steam/mobject/session/specific-contents-query.hpp"
 #include "steam/mobject/session/session-service-explore-scope.hpp"
diff --git a/tests/core/steam/mobject/session/session-element-query-test.cpp b/tests/core/steam/mobject/session/session-element-query-test.cpp
index fece93a2b..2275b16c1 100644
--- a/tests/core/steam/mobject/session/session-element-query-test.cpp
+++ b/tests/core/steam/mobject/session/session-element-query-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "steam/mobject/session/test-scopes.hpp"
 #include "steam/mobject/session/element-query.hpp"
 #include "steam/mobject/session/scope-path.hpp"
diff --git a/tests/core/steam/mobject/session/session-element-tracker-test.cpp b/tests/core/steam/mobject/session/session-element-tracker-test.cpp
index 18ffe8128..b6284cb87 100644
--- a/tests/core/steam/mobject/session/session-element-tracker-test.cpp
+++ b/tests/core/steam/mobject/session/session-element-tracker-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 
 #include "lib/element-tracker.hpp"
 
diff --git a/tests/core/steam/mobject/session/session-manager-test.cpp b/tests/core/steam/mobject/session/session-manager-test.cpp
index 13243a443..c0a9fd595 100644
--- a/tests/core/steam/mobject/session/session-manager-test.cpp
+++ b/tests/core/steam/mobject/session/session-manager-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "steam/mobject/session.hpp"
 #include "steam/mobject/session/testsession1.hpp"
 //#include "lib/util.hpp"
diff --git a/tests/core/steam/mobject/session/session-modify-parts-test.cpp b/tests/core/steam/mobject/session/session-modify-parts-test.cpp
index 9de711101..f52167c67 100644
--- a/tests/core/steam/mobject/session/session-modify-parts-test.cpp
+++ b/tests/core/steam/mobject/session/session-modify-parts-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "steam/mobject/session.hpp"
 #include "steam/fixture/fixture.hpp"             // TODO only temporarily needed
 //#include "steam/assetmanager.hpp"          //////??
diff --git a/tests/core/steam/mobject/session/session-service-access-test.cpp b/tests/core/steam/mobject/session/session-service-access-test.cpp
index b13e39703..c2828fe31 100644
--- a/tests/core/steam/mobject/session/session-service-access-test.cpp
+++ b/tests/core/steam/mobject/session/session-service-access-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "steam/mobject/session.hpp"
 #include "lib/meta/generator.hpp"
 #include "lib/format-cout.hpp"
diff --git a/tests/core/steam/mobject/session/session-structure-test.cpp b/tests/core/steam/mobject/session/session-structure-test.cpp
index d1b41d617..3c8553ffc 100644
--- a/tests/core/steam/mobject/session/session-structure-test.cpp
+++ b/tests/core/steam/mobject/session/session-structure-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "steam/mobject/session.hpp"
 #include "steam/fixture/fixture.hpp"             // TODO only temporarily needed
 #include "steam/assetmanager.hpp"          //////??
diff --git a/tests/core/steam/mobject/session/timeline-sequence-handling-test.cpp b/tests/core/steam/mobject/session/timeline-sequence-handling-test.cpp
index 479e8f2b3..597db9c0f 100644
--- a/tests/core/steam/mobject/session/timeline-sequence-handling-test.cpp
+++ b/tests/core/steam/mobject/session/timeline-sequence-handling-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "steam/mobject/session.hpp"
 #include "steam/mobject/mobject-ref.hpp"
 #include "steam/mobject/session/binding.hpp"
diff --git a/tests/core/steam/play/dummy-play-connection-test.cpp b/tests/core/steam/play/dummy-play-connection-test.cpp
index badbfaf90..3f7661853 100644
--- a/tests/core/steam/play/dummy-play-connection-test.cpp
+++ b/tests/core/steam/play/dummy-play-connection-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 
 #include "steam/play/dummy-play-connection.hpp"
 #include "vessel/spine/play-facade.hpp"
diff --git a/tests/core/steam/play/output-slot-protocol-test.cpp b/tests/core/steam/play/output-slot-protocol-test.cpp
index c18c103d5..34d885993 100644
--- a/tests/core/steam/play/output-slot-protocol-test.cpp
+++ b/tests/core/steam/play/output-slot-protocol-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 
 #include "steam/play/diagnostic-output-slot.hpp"
 #include "steam/engine/buffhandle.hpp"
diff --git a/tests/core/steam/play/timing-constraints-test.cpp b/tests/core/steam/play/timing-constraints-test.cpp
index 9ccc982f9..3794028a4 100644
--- a/tests/core/steam/play/timing-constraints-test.cpp
+++ b/tests/core/steam/play/timing-constraints-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 
 #include "steam/play/timings.hpp"
 #include "lib/time/timevalue.hpp"
diff --git a/tests/core/steam/render-segment-test.cpp b/tests/core/steam/render-segment-test.cpp
index 380d58e1c..b95376bc5 100644
--- a/tests/core/steam/render-segment-test.cpp
+++ b/tests/core/steam/render-segment-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 //#include "lib/util.hpp"
 
 //using std::string;
diff --git a/tests/core/vault/media-access-mock-test.cpp b/tests/core/vault/media-access-mock-test.cpp
index 0f8aa6832..c5e96c767 100644
--- a/tests/core/vault/media-access-mock-test.cpp
+++ b/tests/core/vault/media-access-mock-test.cpp
@@ -25,7 +25,7 @@
 #include "lib/depend-inject.hpp"
 #include "lib/format-cout.hpp"
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/symbol.hpp"
 
 #include <string>
diff --git a/tests/core/vessel/advice/advice-basics-test.cpp b/tests/core/vessel/advice/advice-basics-test.cpp
index e5f10d3e8..6251f86d1 100644
--- a/tests/core/vessel/advice/advice-basics-test.cpp
+++ b/tests/core/vessel/advice/advice-basics-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "vessel/advice.hpp"
 
 
diff --git a/tests/core/vessel/advice/advice-binding-pattern-test.cpp b/tests/core/vessel/advice/advice-binding-pattern-test.cpp
index 880a49fa8..09e08d289 100644
--- a/tests/core/vessel/advice/advice-binding-pattern-test.cpp
+++ b/tests/core/vessel/advice/advice-binding-pattern-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/format-cout.hpp"
 
 #include "lib/time/timevalue.hpp"
diff --git a/tests/core/vessel/advice/advice-configuration-test.cpp b/tests/core/vessel/advice/advice-configuration-test.cpp
index 3d39a590f..7c073e5e9 100644
--- a/tests/core/vessel/advice/advice-configuration-test.cpp
+++ b/tests/core/vessel/advice/advice-configuration-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-//#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+//#include "test/test-helper.hpp"
 
 #include "vessel/advice.hpp"
 //#include "lib/p.hpp"
@@ -31,8 +31,8 @@
 
 //#include <string>
 
-//using lib::test::showSizeof;
-//using lib::test::randStr;
+//using test::showSizeof;
+//using test::randStr;
 //using util::isSameObject;
 //using util::and_all;
 //using util::for_each;
diff --git a/tests/core/vessel/advice/advice-index-test.cpp b/tests/core/vessel/advice/advice-index-test.cpp
index b02c00cd9..160b61cfb 100644
--- a/tests/core/vessel/advice/advice-index-test.cpp
+++ b/tests/core/vessel/advice/advice-index-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/hash-value.h"
 #include "vessel/advice/index.hpp"
 
diff --git a/tests/core/vessel/advice/advice-multiplicity-test.cpp b/tests/core/vessel/advice/advice-multiplicity-test.cpp
index 24507b755..33e56b811 100644
--- a/tests/core/vessel/advice/advice-multiplicity-test.cpp
+++ b/tests/core/vessel/advice/advice-multiplicity-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-//#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+//#include "test/test-helper.hpp"
 
 //#include "lib/p.hpp"
 //#include "steam/assetmanager.hpp"
@@ -31,8 +31,8 @@
 
 //#include <string>
 
-//using lib::test::showSizeof;
-//using lib::test::randStr;
+//using test::showSizeof;
+//using test::randStr;
 //using util::isSameObject;
 //using util::and_all;
 //using util::for_each;
diff --git a/tests/core/vessel/advice/advice-situations-test.cpp b/tests/core/vessel/advice/advice-situations-test.cpp
index 3ae11a29b..161328054 100644
--- a/tests/core/vessel/advice/advice-situations-test.cpp
+++ b/tests/core/vessel/advice/advice-situations-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-//#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+//#include "test/test-helper.hpp"
 
 #include "vessel/advice.hpp"
 
diff --git a/tests/core/vessel/subsystem-runner-test.cpp b/tests/core/vessel/subsystem-runner-test.cpp
index 021a630f8..fd1747228 100644
--- a/tests/core/vessel/subsystem-runner-test.cpp
+++ b/tests/core/vessel/subsystem-runner-test.cpp
@@ -18,8 +18,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "vessel/subsys.hpp"
 #include "vessel/subsystem-runner.hpp"
 #include "vessel/option.hpp"
diff --git a/tests/core/vessel/test-configloader.c b/tests/core/vessel/test-configloader.c
index 8d3da7c83..7db939323 100644
--- a/tests/core/vessel/test-configloader.c
+++ b/tests/core/vessel/test-configloader.c
@@ -18,12 +18,12 @@
  */
 
 
+#include "test/test.h"
 #include "lib/tmpbuf.h"
 
 #include "vessel/config.h"
 #include "vessel/configitem.h"
 
-#include "lib/test/test.h"
 
 TESTS_BEGIN
 
diff --git a/tests/core/vessel/test-interfaces.c b/tests/core/vessel/test-interfaces.c
index 2699e7e93..ce36da56b 100644
--- a/tests/core/vessel/test-interfaces.c
+++ b/tests/core/vessel/test-interfaces.c
@@ -18,13 +18,13 @@
  */
 
 
+#include "test/test.h"
 #include "vessel/interface.h"
 #include "vessel/interfaceregistry.h"
 #include "vessel/interface-descriptor.h"
 #include "vessel/config.h"
 #include "vessel/config-interface.h"
 
-#include "lib/test/test.h"
 #include "interface/say-hello.h"
 
 /*
diff --git a/tests/library/allocation-cluster-test.cpp b/tests/library/allocation-cluster-test.cpp
index ecff23fbb..9e991735e 100644
--- a/tests/library/allocation-cluster-test.cpp
+++ b/tests/library/allocation-cluster-test.cpp
@@ -17,11 +17,9 @@
 
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/allocation-cluster.hpp"
-#include "lib/test/diagnostic-output.hpp"/////////////////TODO
-#include "lib/format-util.hpp"/////////////TODO
 #include "lib/iter-explorer.hpp"
 #include "lib/util.hpp"
 
@@ -31,9 +29,9 @@
 #include <array>
 #include <set>
 
-using ::Test;
+using test::Test;
+using test::showSizeof;
 using lib::explore;
-using lib::test::showSizeof;
 using util::getAdr;
 using util::isnil;
 
@@ -331,7 +329,7 @@ namespace test {
             CHECK (dtor->next == nullptr);
             
             // any other object with non-trivial destructor....
-            string rands = lib::test::randStr(9);
+            string rands = lib::randStr(9);
             pp = posOffset();
             string& s1 = clu.create<string> (rands);                   // a string that fits into the small-string optimisation
             CHECK (s1 == rands);
@@ -407,7 +405,7 @@ namespace test {
           SetS setS{clu.getAllocator<Strg>()};
 
           for (uint i=0; i<NUM_OBJECTS; ++i)
-            setS.emplace (test::randStr(32), clu.getAllocator<char>());
+            setS.emplace (lib::randStr(32), clu.getAllocator<char>());
           CHECK (setS.size() > 0.9 * NUM_OBJECTS);
           CHECK (clu.numExtents() > 200);
           
diff --git a/tests/library/app-config-test.cpp b/tests/library/app-config-test.cpp
index df3c55d06..ad14484eb 100644
--- a/tests/library/app-config-test.cpp
+++ b/tests/library/app-config-test.cpp
@@ -17,7 +17,7 @@
 
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "vessel/spine/config-facade.h"
 #include "lib/symbol.hpp"
 #include "lib/util.hpp"
diff --git a/tests/library/branch-case-test.cpp b/tests/library/branch-case-test.cpp
index 2809f7596..ed4a3dc0f 100644
--- a/tests/library/branch-case-test.cpp
+++ b/tests/library/branch-case-test.cpp
@@ -17,18 +17,19 @@
 
 
 
-#include "lib/test/run.hpp"
-//#include "lib/test/test-helper.hpp"
-#include "lib/test/tracking-dummy.hpp"
+#include "test/run.hpp"
+#include "test/tracking-dummy.hpp"
 #include "lib/branch-case.hpp"
 #include "lib/format-obj.hpp"
-#include "lib/test/diagnostic-output.hpp"//////////////////TODO
+#include "test/diagnostic-output.hpp"//////////////////TODO
 
+using test::Dummy;
 
 namespace lib {
 namespace test{
   
   
+  
   /********************************************************//**
    * @test verify a _Sum Type_ to hold alternative model types
    *       for several result branches of an evaluation.
diff --git a/tests/library/builder-qualifier-support-test.cpp b/tests/library/builder-qualifier-support-test.cpp
index 16da3898e..b6dbd544f 100644
--- a/tests/library/builder-qualifier-support-test.cpp
+++ b/tests/library/builder-qualifier-support-test.cpp
@@ -18,9 +18,9 @@
 
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/builder-qualifier-support.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/test-helper.hpp"
 
 #include <string>
 
diff --git a/tests/library/c-lib/test-llist.c b/tests/library/c-lib/test-llist.c
index 99478f8b5..8ac49ca4e 100644
--- a/tests/library/c-lib/test-llist.c
+++ b/tests/library/c-lib/test-llist.c
@@ -17,10 +17,10 @@
  */
 
 
-#include <nobug.h>
-
+#include "test/test.h"
 #include "lib/llist.h"
-#include "lib/test/test.h"
+
+#include <nobug.h>
 
 TESTS_BEGIN
 
diff --git a/tests/library/c-lib/test-locking.c b/tests/library/c-lib/test-locking.c
index a5488c888..c67cf8110 100644
--- a/tests/library/c-lib/test-locking.c
+++ b/tests/library/c-lib/test-locking.c
@@ -20,7 +20,7 @@
  */
 
 
-#include "lib/test/test.h"
+#include "test/test.h"
 #include "lib/mutex.h"
 #include "lib/recmutex.h"
 
diff --git a/tests/library/c-lib/test-psplay.c b/tests/library/c-lib/test-psplay.c
index c9323f7b2..d7b117928 100644
--- a/tests/library/c-lib/test-psplay.c
+++ b/tests/library/c-lib/test-psplay.c
@@ -19,13 +19,13 @@
  */
 
 
+#include "test/test.h"
+#include "lib/psplay.h"
+
 #include <time.h>
 #include <stdlib.h>
 #include <nobug.h>
 
-#include "lib/psplay.h"
-#include "lib/test/test.h"
-
 struct testitem
 {
   psplaynode node;
diff --git a/tests/library/c-lib/test-safeclib.c b/tests/library/c-lib/test-safeclib.c
index 6d04fffb8..6474f72a3 100644
--- a/tests/library/c-lib/test-safeclib.c
+++ b/tests/library/c-lib/test-safeclib.c
@@ -17,9 +17,9 @@
  */
 
 
+#include "test/test.h"
 #include "lib/safeclib.h"
 #include "lib/tmpbuf.h" /* not factored out yet */
-#include "lib/test/test.h"
 
 #include <sys/time.h>
 #include <sys/resource.h>
diff --git a/tests/library/cmdline-wrapper-test.cpp b/tests/library/cmdline-wrapper-test.cpp
index fd2b585f1..342d444f5 100644
--- a/tests/library/cmdline-wrapper-test.cpp
+++ b/tests/library/cmdline-wrapper-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/cmdline.hpp"
 #include "lib/util-foreach.hpp"
 #include "lib/format-cout.hpp"
diff --git a/tests/library/custom-shared-ptr-test.cpp b/tests/library/custom-shared-ptr-test.cpp
index 269724691..bfee54783 100644
--- a/tests/library/custom-shared-ptr-test.cpp
+++ b/tests/library/custom-shared-ptr-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/util.hpp"
 
 #include "lib/p.hpp"
diff --git a/tests/library/del-stash-test.cpp b/tests/library/del-stash-test.cpp
index 9a654c632..990ee66eb 100644
--- a/tests/library/del-stash-test.cpp
+++ b/tests/library/del-stash-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/del-stash.hpp"
 
 
diff --git a/tests/library/diff/diff-complex-application-test.cpp b/tests/library/diff/diff-complex-application-test.cpp
index 602182c83..25d9ac3ca 100644
--- a/tests/library/diff/diff-complex-application-test.cpp
+++ b/tests/library/diff/diff-complex-application-test.cpp
@@ -21,7 +21,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/format-util.hpp"
 #include "lib/diff/tree-diff-application.hpp"
 #include "lib/diff/test-mutation-target.hpp"
diff --git a/tests/library/diff/diff-ignore-changes-test.cpp b/tests/library/diff/diff-ignore-changes-test.cpp
index 241275b41..6fb2e584a 100644
--- a/tests/library/diff/diff-ignore-changes-test.cpp
+++ b/tests/library/diff/diff-ignore-changes-test.cpp
@@ -18,8 +18,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/format-util.hpp"
 #include "lib/diff/tree-diff-application.hpp"
 #include "lib/diff/test-mutation-target.hpp"
diff --git a/tests/library/diff/diff-index-table-test.cpp b/tests/library/diff/diff-index-table-test.cpp
index 21a7e7e98..714db725e 100644
--- a/tests/library/diff/diff-index-table-test.cpp
+++ b/tests/library/diff/diff-index-table-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/diff/index-table.hpp"
 
 #include <utility>
diff --git a/tests/library/diff/diff-list-application-test.cpp b/tests/library/diff/diff-list-application-test.cpp
index 86257b08e..3cbe763c0 100644
--- a/tests/library/diff/diff-list-application-test.cpp
+++ b/tests/library/diff/diff-list-application-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/diff/list-diff-application.hpp"
 #include "lib/iter-adapter-stl.hpp"
 #include "lib/util.hpp"
diff --git a/tests/library/diff/diff-list-generation-test.cpp b/tests/library/diff/diff-list-generation-test.cpp
index 5d6b82a97..844126976 100644
--- a/tests/library/diff/diff-list-generation-test.cpp
+++ b/tests/library/diff/diff-list-generation-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/diff/list-diff-detector.hpp"
 #include "lib/itertools.hpp"
 #include "lib/util.hpp"
diff --git a/tests/library/diff/diff-tree-application-simple-test.cpp b/tests/library/diff/diff-tree-application-simple-test.cpp
index f2e7d7405..8a5d9974a 100644
--- a/tests/library/diff/diff-tree-application-simple-test.cpp
+++ b/tests/library/diff/diff-tree-application-simple-test.cpp
@@ -18,7 +18,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/diff/mutation-message.hpp"
 #include "lib/diff/tree-diff-application.hpp"
 #include "lib/format-util.hpp"
diff --git a/tests/library/diff/diff-tree-application-test.cpp b/tests/library/diff/diff-tree-application-test.cpp
index dc72d37ec..2e12a0df2 100644
--- a/tests/library/diff/diff-tree-application-test.cpp
+++ b/tests/library/diff/diff-tree-application-test.cpp
@@ -21,7 +21,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/format-util.hpp"
 #include "lib/diff/tree-diff-application.hpp"
 #include "lib/iter-adapter-stl.hpp"
diff --git a/tests/library/diff/diff-tree-mutation-listener-test.cpp b/tests/library/diff/diff-tree-mutation-listener-test.cpp
index 9c15e1d6a..47009419a 100644
--- a/tests/library/diff/diff-tree-mutation-listener-test.cpp
+++ b/tests/library/diff/diff-tree-mutation-listener-test.cpp
@@ -17,7 +17,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/diff/mutation-message.hpp"
 #include "lib/diff/tree-diff-application.hpp"
 #include "lib/format-util.hpp"
diff --git a/tests/library/diff/gen-node-test.cpp b/tests/library/diff/gen-node-test.cpp
index 3ae88b6c6..2a296a5c5 100644
--- a/tests/library/diff/gen-node-test.cpp
+++ b/tests/library/diff/gen-node-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/diff/gen-node.hpp"
 #include "lib/diff/record.hpp"
@@ -35,7 +35,7 @@ using lib::hash::LuidH;
 using lib::time::FSecs;
 using lib::time::Time;
 using lib::time::TimeSpan;
-using lib::test::randTime;
+using test::randTime;
 using std::string;
 
 
diff --git a/tests/library/diff/generic-record-test.cpp b/tests/library/diff/generic-record-test.cpp
index 33380083a..dadf691dd 100644
--- a/tests/library/diff/generic-record-test.cpp
+++ b/tests/library/diff/generic-record-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/format-util.hpp"
 #include "lib/diff/record.hpp"
diff --git a/tests/library/diff/mutation-message-test.cpp b/tests/library/diff/mutation-message-test.cpp
index d21ec0bbc..89f82f580 100644
--- a/tests/library/diff/mutation-message-test.cpp
+++ b/tests/library/diff/mutation-message-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/diff/mutation-message.hpp"
 #include "lib/diff/tree-diff-application.hpp"
 #include "lib/iter-adapter-stl.hpp"
diff --git a/tests/library/diff/tree-mutator-binding-test.cpp b/tests/library/diff/tree-mutator-binding-test.cpp
index 0c72f9959..5297436fa 100644
--- a/tests/library/diff/tree-mutator-binding-test.cpp
+++ b/tests/library/diff/tree-mutator-binding-test.cpp
@@ -16,9 +16,9 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/format-util.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/test-helper.hpp"
 #include "lib/diff/tree-mutator.hpp"
 #include "lib/diff/test-mutation-target.hpp"
 #include "lib/iter-adapter-stl.hpp"
diff --git a/tests/library/diff/tree-mutator-test.cpp b/tests/library/diff/tree-mutator-test.cpp
index 64a82ccec..246fc4f2b 100644
--- a/tests/library/diff/tree-mutator-test.cpp
+++ b/tests/library/diff/tree-mutator-test.cpp
@@ -16,9 +16,9 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/format-util.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/test-helper.hpp"
 #include "lib/diff/tree-mutator.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/format-util.hpp"
diff --git a/tests/library/exception-error-test.cpp b/tests/library/exception-error-test.cpp
index 859c95ff9..a6a139a44 100644
--- a/tests/library/exception-error-test.cpp
+++ b/tests/library/exception-error-test.cpp
@@ -19,7 +19,7 @@
 
 #include "lib/error.h"
 #include "lib/error.hpp"
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/util.hpp"
 
diff --git a/tests/library/file-support-test.cpp b/tests/library/file-support-test.cpp
index 42eea6dee..1f36c512d 100644
--- a/tests/library/file-support-test.cpp
+++ b/tests/library/file-support-test.cpp
@@ -16,22 +16,19 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
-#include "lib/test/temp-dir.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
+#include "test/temp-dir.hpp"
 #include "lib/file.hpp"
 
 #include <fstream>
 
+using test::TempDir;
 
 namespace lib {
 namespace stat{
 namespace test{
   
-  using lib::test::TempDir;
-  
-  
-  
   
   /********************************************************************//**
    * @test verify supplemental helper functions for file-handling support,
diff --git a/tests/library/format-cout-test.cpp b/tests/library/format-cout-test.cpp
index 1c4da32d2..462dce2d5 100644
--- a/tests/library/format-cout-test.cpp
+++ b/tests/library/format-cout-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 
 #include "lib/p.hpp"
 #include "lib/diff/gen-node.hpp"
diff --git a/tests/library/format-helper-test.cpp b/tests/library/format-helper-test.cpp
index e8eb99f8b..2ffe762c9 100644
--- a/tests/library/format-helper-test.cpp
+++ b/tests/library/format-helper-test.cpp
@@ -16,11 +16,11 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/format-util.hpp"
 #include "lib/format-string.hpp"
 #include "lib/iter-adapter-stl.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/test-helper.hpp"
 #include "lib/error.hpp"
 
 #include <vector>
diff --git a/tests/library/format-string-test.cpp b/tests/library/format-string-test.cpp
index d9673f040..5e4e12dae 100644
--- a/tests/library/format-string-test.cpp
+++ b/tests/library/format-string-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/format-string.hpp"
 #include "lib/symbol.hpp"
 #include "lib/error.hpp"
diff --git a/tests/library/fun-hash-dispatch-test.cpp b/tests/library/fun-hash-dispatch-test.cpp
index 192db7daf..03bd6dbd3 100644
--- a/tests/library/fun-hash-dispatch-test.cpp
+++ b/tests/library/fun-hash-dispatch-test.cpp
@@ -18,11 +18,11 @@
 
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/fun-hash-dispatch.hpp"
 #include "lib/format-obj.hpp"
-#include "lib/test/diagnostic-output.hpp"////////////////////TODO
+#include "test/diagnostic-output.hpp"////////////////////TODO
 //#include "lib/util.hpp"
 
 //#include <cstdlib>
diff --git a/tests/library/gnuplot-gen-test.cpp b/tests/library/gnuplot-gen-test.cpp
index 74378023d..a32c6af7f 100644
--- a/tests/library/gnuplot-gen-test.cpp
+++ b/tests/library/gnuplot-gen-test.cpp
@@ -17,7 +17,7 @@
 
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/gnuplot-gen.hpp"
 #include "lib/iter-explorer.hpp"
 #include "lib/format-cout.hpp"
diff --git a/tests/library/hash-generator-test.cpp b/tests/library/hash-generator-test.cpp
index 87ab08ebf..7ffaa93de 100644
--- a/tests/library/hash-generator-test.cpp
+++ b/tests/library/hash-generator-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/util.hpp"
 
 #include <boost/functional/hash.hpp>
diff --git a/tests/library/hash-indexed-test.cpp b/tests/library/hash-indexed-test.cpp
index 339d911bb..768a7556b 100644
--- a/tests/library/hash-indexed-test.cpp
+++ b/tests/library/hash-indexed-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 
 #include "lib/hash-indexed.hpp"
 #include "lib/util.hpp"
diff --git a/tests/library/hash-standard-to-boost-bridge-test.cpp b/tests/library/hash-standard-to-boost-bridge-test.cpp
index 300055721..10284f51b 100644
--- a/tests/library/hash-standard-to-boost-bridge-test.cpp
+++ b/tests/library/hash-standard-to-boost-bridge-test.cpp
@@ -16,9 +16,9 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/hash-standard.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/test-helper.hpp"
 #include "lib/util.hpp"
 
 #include <boost/functional/hash.hpp>
diff --git a/tests/library/helloworldtest.cpp b/tests/library/helloworldtest.cpp
index 20e43f877..501bf15bc 100644
--- a/tests/library/helloworldtest.cpp
+++ b/tests/library/helloworldtest.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/util.hpp"
 
 #include <boost/lexical_cast.hpp>
diff --git a/tests/library/hetero-data-test.cpp b/tests/library/hetero-data-test.cpp
index bdf4b51b7..e35f3a987 100644
--- a/tests/library/hetero-data-test.cpp
+++ b/tests/library/hetero-data-test.cpp
@@ -16,10 +16,10 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/hetero-data.hpp"
 #include "lib/meta/trait.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/test-helper.hpp"
 #include "lib/uninitialised-storage.hpp"
 #include "lib/util.hpp"
 
@@ -30,6 +30,7 @@ namespace lib {
 namespace test{
   
   using std::string;
+  using ::test::showType;
   using meta::is_Subclass_v;
   using util::isSameObject;
   using util::isSameAdr;
diff --git a/tests/library/idi/generic-id-function-test.cpp b/tests/library/idi/generic-id-function-test.cpp
index 3b3f239b6..41b891823 100644
--- a/tests/library/idi/generic-id-function-test.cpp
+++ b/tests/library/idi/generic-id-function-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-//#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+//#include "test/test-helper.hpp"
 #include "lib/idi/genfunc.hpp"
 //#include "lib/format-cout.hpp"
 
diff --git a/tests/library/incidence-count-test.cpp b/tests/library/incidence-count-test.cpp
index 65753593e..92060d5fe 100644
--- a/tests/library/incidence-count-test.cpp
+++ b/tests/library/incidence-count-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/microbenchmark.hpp"
+#include "test/run.hpp"
+#include "test/microbenchmark.hpp"
 #include "lib/incidence-count.hpp"
 #include "lib/thread.hpp"
 #include "lib/util.hpp"
@@ -163,7 +163,7 @@ namespace test{
                           t2.join();
                         };
           
-          double runTime = test::benchmarkTime (run_parallel);
+          double runTime = ::test::benchmarkTime (run_parallel);
           
           // join ensures visibility of all data changes from within threads,
           // which is a prerequisite for performing the data evaluation safely.
@@ -227,7 +227,7 @@ namespace test{
                         };
           
           // Invoke these two nested activations numerous times in several threads
-          auto [runTime, sum] = test::threadBenchmark<CONCURR> (act, REPETITIONS);
+          auto [runTime, sum] = ::test::threadBenchmark<CONCURR> (act, REPETITIONS);
           
           CHECK (sum == CONCURR*REPETITIONS);      // each invocation contributes +1
           CHECK (isLimited (900, runTime, 1400));  // delay is 500µs on average
diff --git a/tests/library/index-iter-test.cpp b/tests/library/index-iter-test.cpp
index 7222ddac1..8345b79cc 100644
--- a/tests/library/index-iter-test.cpp
+++ b/tests/library/index-iter-test.cpp
@@ -17,9 +17,9 @@
 
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/index-iter.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/test-helper.hpp"
 #include "lib/iter-explorer.hpp"
 #include "lib/format-util.hpp"
 #include "lib/util.hpp"
diff --git a/tests/library/ios-savepoint-test.cpp b/tests/library/ios-savepoint-test.cpp
index 585cc2c5f..8f1989a3b 100644
--- a/tests/library/ios-savepoint-test.cpp
+++ b/tests/library/ios-savepoint-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/ios-savepoint.hpp"
 
diff --git a/tests/library/item-wrapper-test.cpp b/tests/library/item-wrapper-test.cpp
index 412b2bb6d..c4accb4be 100644
--- a/tests/library/item-wrapper-test.cpp
+++ b/tests/library/item-wrapper-test.cpp
@@ -17,8 +17,8 @@
 
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/random.hpp"
 #include "lib/util.hpp"
@@ -33,24 +33,22 @@
 #include <vector>
 
 
+using test::Test;
+using test::randStr;
+using test::showSizeof;
+using util::isSameObject;
+
+using std::placeholders::_1;
+using std::ref;
+using std::shared_ptr;
+using std::vector;
+using std::string;
+
 
 namespace lib {
 namespace wrapper {
 namespace test{
   
-  using ::Test;
-  using lib::test::randStr;
-  using lib::test::showSizeof;
-  using util::isSameObject;
-  
-  using std::placeholders::_1;
-  using std::ref;
-  using std::shared_ptr;
-  using std::vector;
-  using std::string;
-  
-  
-  
   namespace { // Test helper: yet another ctor/dtor counting class
     
     long cntTracker = 0;
diff --git a/tests/library/iter-adapter-stl-test.cpp b/tests/library/iter-adapter-stl-test.cpp
index 7b2f9f18d..ee70ca0a1 100644
--- a/tests/library/iter-adapter-stl-test.cpp
+++ b/tests/library/iter-adapter-stl-test.cpp
@@ -17,8 +17,8 @@
 
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-coll.hpp"
+#include "test/run.hpp"
+#include "test/test-coll.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/util.hpp"
 
@@ -28,14 +28,21 @@
 #include <vector>
 
 
+using boost::lexical_cast;
+using util::isnil;
+using test::VecI;
+using test::MapII;
+using test::HMapII;
+using test::MMapII;
+using test::HMMapII;
+using test::pullOut;
+using test::getTestSeq_int;
+using test::getTestMap_int;
+using test::getTestMultiMap_int;
+
 
 namespace lib {
 namespace test{
-  
-  using ::Test;
-  using boost::lexical_cast;
-  using util::isnil;
-  
   namespace iter = lib::iter_stl;
   
   
diff --git a/tests/library/iter-adapter-test.cpp b/tests/library/iter-adapter-test.cpp
index da12b3aca..ced46d5e2 100644
--- a/tests/library/iter-adapter-test.cpp
+++ b/tests/library/iter-adapter-test.cpp
@@ -17,8 +17,8 @@
 
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/util.hpp"
 #include "lib/util-foreach.hpp"
 #include "lib/format-cout.hpp"
diff --git a/tests/library/iter-chain-search-test.cpp b/tests/library/iter-chain-search-test.cpp
index 04414a60e..201820cd0 100644
--- a/tests/library/iter-chain-search-test.cpp
+++ b/tests/library/iter-chain-search-test.cpp
@@ -17,8 +17,8 @@
 
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/format-util.hpp"
 #include "lib/iter-chain-search.hpp"
 #include "lib/iter-cursor.hpp"
diff --git a/tests/library/iter-core-adapter-test.cpp b/tests/library/iter-core-adapter-test.cpp
index a1a50d77d..520734628 100644
--- a/tests/library/iter-core-adapter-test.cpp
+++ b/tests/library/iter-core-adapter-test.cpp
@@ -17,8 +17,8 @@
 
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/util.hpp"
 
 #include "lib/iter-adapter.hpp"
@@ -26,14 +26,15 @@
 #include <string>
 
 
+using LERR_(ITER_EXHAUST);
+using util::isSameObject;
+using test::showType;
+using std::string;
+
 
 namespace lib {
 namespace test{
   
-  using LERR_(ITER_EXHAUST);
-  using util::isSameObject;
-  using std::string;
-  
   namespace { // Test fixture
     
     /**
diff --git a/tests/library/iter-cursor-test.cpp b/tests/library/iter-cursor-test.cpp
index a9f606a3f..cc73655ea 100644
--- a/tests/library/iter-cursor-test.cpp
+++ b/tests/library/iter-cursor-test.cpp
@@ -17,8 +17,8 @@
 
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/format-util.hpp"
 #include "lib/iter-cursor.hpp"
 #include "lib/util.hpp"
diff --git a/tests/library/iter-explorer-test.cpp b/tests/library/iter-explorer-test.cpp
index 55f0adf8e..c65130661 100644
--- a/tests/library/iter-explorer-test.cpp
+++ b/tests/library/iter-explorer-test.cpp
@@ -41,8 +41,8 @@
 
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/iter-adapter-stl.hpp"
 #include "lib/format-string.hpp"
 #include "lib/format-cout.hpp"
@@ -62,19 +62,19 @@
 #include <set>
 
 
+using test::Test;
+using test::showType;
+using util::_Fmt;
+using util::isnil;
+using util::isSameObject;
+using lib::iter_stl::eachElm;
+using LERR_(ITER_EXHAUST);
+using std::vector;
+using std::string;
+
 namespace lib {
 namespace test{
   
-  using ::Test;
-  using util::_Fmt;
-  using util::isnil;
-  using util::isSameObject;
-  using lib::iter_stl::eachElm;
-  using LERR_(ITER_EXHAUST);
-  using std::vector;
-  using std::string;
-  
-  
   namespace { // test substrate: simple number sequence iterator
     
     /**
@@ -694,7 +694,7 @@ namespace test{
           CHECK(not ii.getRestElms());
           CHECK (materialise(ii.getGroupedElms()) == "23-22-21-20-19"_expect);
           
-          CHECK ( test::showType<decltype(*ii)>()== "array<uint, 5ul>&"_expect);
+          CHECK (showType<decltype(*ii)>()== "array<uint, 5ul>&"_expect);
           
           uint s = *(ii.getGroupedElms());
           for ( ; ii; ++ii)
@@ -1181,7 +1181,7 @@ namespace test{
                                .resultSum();
           
           using Res = decltype(accumulated);
-          CHECK (lib::test::showType<Res>()  == "int"_expect);
+          CHECK (showType<Res>()  == "int"_expect);
           
           auto expectedSum = [](auto N){ return N*(N+1) / 2; };
           CHECK (accumulated == expectedSum(29));
@@ -1224,7 +1224,7 @@ namespace test{
                                .effuse();
           
           using Res = decltype(solidified);
-          CHECK (lib::test::showType<Res>()  == "vector<double>"_expect);
+          CHECK (showType<Res>()  == "vector<double>"_expect);
           CHECK (util::join(solidified, "|") == "9.5|8.5|7.5|6.5|5.5|4.5|3.5|2.5|1.5|0.5"_expect);
         }
       
diff --git a/tests/library/iter-queue-test.cpp b/tests/library/iter-queue-test.cpp
index b96142b57..9dec66e19 100644
--- a/tests/library/iter-queue-test.cpp
+++ b/tests/library/iter-queue-test.cpp
@@ -17,8 +17,8 @@
 
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/util.hpp"
 
 #include "lib/iter-stack.hpp"
diff --git a/tests/library/iter-source-test.cpp b/tests/library/iter-source-test.cpp
index 8a4ef0a66..48ab5ac82 100644
--- a/tests/library/iter-source-test.cpp
+++ b/tests/library/iter-source-test.cpp
@@ -17,8 +17,8 @@
 
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/nocopy.hpp"
 #include "lib/util.hpp"
@@ -36,12 +36,11 @@
 namespace lib {
 namespace test{
   
-  using ::Test;
   using util::isnil;
   using boost::lexical_cast;
   using lib::time::TimeVar;
-  using lib::test::randStr;
-  using lib::test::randTime;
+  using ::test::randTime;
+  using ::test::randStr;
   using std::make_pair;
   using std::string;
   using std::list;
diff --git a/tests/library/iter-stack-test.cpp b/tests/library/iter-stack-test.cpp
index ef49fe5cd..a8df02ccf 100644
--- a/tests/library/iter-stack-test.cpp
+++ b/tests/library/iter-stack-test.cpp
@@ -17,8 +17,8 @@
 
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/util.hpp"
 
 #include "lib/iter-stack.hpp"
diff --git a/tests/library/iter-zip-test.cpp b/tests/library/iter-zip-test.cpp
index 15696057e..f02280397 100644
--- a/tests/library/iter-zip-test.cpp
+++ b/tests/library/iter-zip-test.cpp
@@ -17,11 +17,10 @@
 
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/iter-zip.hpp"
 #include "lib/iter-explorer.hpp"
-#include "lib/test/test-helper.hpp"
-#include "lib/test/diagnostic-output.hpp"/////////////TODO
+#include "test/test-helper.hpp"
 #include "lib/format-util.hpp"
 #include "lib/util.hpp"
 
@@ -64,7 +63,7 @@ namespace test{
     }
   }
   
-  #define TYPE(_EXPR_) showType<decltype(_EXPR_)>()
+  #define TYPE(_EXPR_) ::test::showType<decltype(_EXPR_)>()
 
   
   
diff --git a/tests/library/itertools-test.cpp b/tests/library/itertools-test.cpp
index 28aa30e86..0c6af00e7 100644
--- a/tests/library/itertools-test.cpp
+++ b/tests/library/itertools-test.cpp
@@ -17,8 +17,8 @@
 
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/util-foreach.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/util.hpp"
diff --git a/tests/library/lazy-init-test.cpp b/tests/library/lazy-init-test.cpp
index 1f23df848..6fe8f4d07 100644
--- a/tests/library/lazy-init-test.cpp
+++ b/tests/library/lazy-init-test.cpp
@@ -17,8 +17,8 @@
 
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/lazy-init.hpp"
 #include "lib/meta/util.hpp"
 #include "lib/util.hpp"
diff --git a/tests/library/life-cycle-test.cpp b/tests/library/life-cycle-test.cpp
index 4e2a297bd..52f5e650d 100644
--- a/tests/library/life-cycle-test.cpp
+++ b/tests/library/life-cycle-test.cpp
@@ -17,7 +17,7 @@
 
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/util.hpp"
 
 #include "include/lifecycle.hpp"
diff --git a/tests/library/linked-elements-test.cpp b/tests/library/linked-elements-test.cpp
index 8c8235cd6..23dcd5e56 100644
--- a/tests/library/linked-elements-test.cpp
+++ b/tests/library/linked-elements-test.cpp
@@ -17,29 +17,28 @@
 
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
-#include "lib/util.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
+#include "test/tracking-dummy.hpp"
 
 #include "lib/allocation-cluster.hpp"
 #include "lib/linked-elements.hpp"
-#include "lib/test/tracking-dummy.hpp"
 #include "lib/iter-source.hpp"
+#include "lib/util.hpp"
 
 #include <memory>
 
 
+using test::Dummy;
+using util::isnil;
+using util::isSameObject;
+using LERR_(ITER_EXHAUST);
+
 
 namespace lib {
 namespace test{
-  
   namespace error = lumiera::error;
   
-  using util::isnil;
-  using util::isSameObject;
-  using LERR_(ITER_EXHAUST);
-  
-  
   namespace { // test data...
     
     LUMIERA_ERROR_DEFINE(PROVOKED_FAILURE, "provoked failure");
diff --git a/tests/library/meta/access-casted-test.cpp b/tests/library/meta/access-casted-test.cpp
index 6e868b246..7e4d37d56 100644
--- a/tests/library/meta/access-casted-test.cpp
+++ b/tests/library/meta/access-casted-test.cpp
@@ -17,8 +17,8 @@
 
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/access-casted.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/util.hpp"
diff --git a/tests/library/meta/duck-detector-extension-test.cpp b/tests/library/meta/duck-detector-extension-test.cpp
index 73934f8f6..76bb0d51e 100644
--- a/tests/library/meta/duck-detector-extension-test.cpp
+++ b/tests/library/meta/duck-detector-extension-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/meta/duck-detector.hpp"
 #include "lib/util.hpp"
 
diff --git a/tests/library/meta/duck-detector-test.cpp b/tests/library/meta/duck-detector-test.cpp
index 7079ae491..f7cfefb92 100644
--- a/tests/library/meta/duck-detector-test.cpp
+++ b/tests/library/meta/duck-detector-test.cpp
@@ -17,7 +17,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/meta/duck-detector.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/util.hpp"
diff --git a/tests/library/meta/function-closure-test.cpp b/tests/library/meta/function-closure-test.cpp
index b9202e616..ca11aedd3 100644
--- a/tests/library/meta/function-closure-test.cpp
+++ b/tests/library/meta/function-closure-test.cpp
@@ -26,8 +26,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/meta/typelist.hpp"
 #include "lib/meta/typelist-manip.hpp"
 #include "lib/meta/function.hpp"
diff --git a/tests/library/meta/function-composition-test.cpp b/tests/library/meta/function-composition-test.cpp
index 289f4fa71..4f322d0a3 100644
--- a/tests/library/meta/function-composition-test.cpp
+++ b/tests/library/meta/function-composition-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/meta/typelist.hpp"
 #include "lib/meta/function.hpp"
 #include "lib/meta/function-closure.hpp"
@@ -30,7 +30,7 @@ namespace meta {
 namespace test {
   
   using ::test::Test;
-  using lib::test::showType;
+  using ::test::showType;
   using lib::meta::_Fun;
   using func::bindFirst;
   using func::bindLast;
diff --git a/tests/library/meta/function-erasure-test.cpp b/tests/library/meta/function-erasure-test.cpp
index 4fc447fa7..d05ba149c 100644
--- a/tests/library/meta/function-erasure-test.cpp
+++ b/tests/library/meta/function-erasure-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/meta/function-erasure.hpp"
 #include "lib/error.hpp"
 #include "meta/dummy-functions.hpp"
diff --git a/tests/library/meta/function-signature-test.cpp b/tests/library/meta/function-signature-test.cpp
index 1187eefa1..870800383 100644
--- a/tests/library/meta/function-signature-test.cpp
+++ b/tests/library/meta/function-signature-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/format-util.hpp"
 #include "lib/meta/function.hpp"
diff --git a/tests/library/meta/generator-combinations-test.cpp b/tests/library/meta/generator-combinations-test.cpp
index 528050168..182b857b3 100644
--- a/tests/library/meta/generator-combinations-test.cpp
+++ b/tests/library/meta/generator-combinations-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/meta/generator.hpp"
 #include "lib/meta/generator-combinations.hpp"
 #include "meta/typelist-diagnostics.hpp"
diff --git a/tests/library/meta/generator-test.cpp b/tests/library/meta/generator-test.cpp
index 3c6511b1a..28dbf7bed 100644
--- a/tests/library/meta/generator-test.cpp
+++ b/tests/library/meta/generator-test.cpp
@@ -28,7 +28,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/format-string.hpp"
 #include "lib/meta/generator.hpp"
 
diff --git a/tests/library/meta/iterable-classification-test.cpp b/tests/library/meta/iterable-classification-test.cpp
index b5f7042e0..1f3af4c20 100644
--- a/tests/library/meta/iterable-classification-test.cpp
+++ b/tests/library/meta/iterable-classification-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 
 #include "steam/mobject/session/scope-query.hpp"
 #include "steam/mobject/session/effect.hpp"
diff --git a/tests/library/meta/late-bind-instance-test.cpp b/tests/library/meta/late-bind-instance-test.cpp
index f7470f786..9abdbd1fb 100644
--- a/tests/library/meta/late-bind-instance-test.cpp
+++ b/tests/library/meta/late-bind-instance-test.cpp
@@ -16,11 +16,11 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
+#include "test/tracking-dummy.hpp"
 #include "lib/meta/function.hpp"
 #include "lib/meta/tuple-helper.hpp"
-#include "lib/test/test-helper.hpp"
-#include "lib/test/tracking-dummy.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/format-util.hpp"
 #include "lib/util.hpp"
@@ -37,7 +37,7 @@ namespace test {
   using std::tuple;
   using std::string;
   using lib::meta::dump;
-  using lib::test::Tracker;
+  using ::test::Tracker;
   
   
   
diff --git a/tests/library/meta/meta-utils-test.cpp b/tests/library/meta/meta-utils-test.cpp
index 1afe4f3e9..f6736ec7b 100644
--- a/tests/library/meta/meta-utils-test.cpp
+++ b/tests/library/meta/meta-utils-test.cpp
@@ -17,11 +17,11 @@
 
 
 #include "lib/symbol.hpp"
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/meta/util.hpp"
 #include "lib/meta/typelist.hpp"
 #include "lib/hetero-data.hpp"
-#include "lib/test/diagnostic-output.hpp"
+#include "lib/format-cout.hpp"
 
 #include <string>
 #include <array>
diff --git a/tests/library/meta/prop-builder-test.cpp b/tests/library/meta/prop-builder-test.cpp
index 9cc202698..9c75476cd 100644
--- a/tests/library/meta/prop-builder-test.cpp
+++ b/tests/library/meta/prop-builder-test.cpp
@@ -18,8 +18,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/meta/prop-builder.hpp"
 #include "lib/format-string.hpp"
 
@@ -32,7 +32,7 @@ namespace lib  {
 namespace meta {
 namespace test {
   
-  using lib::test::showType;
+  using ::test::showType;
   #define TYPE(_TY_) showType<decltype(_TY_)>()
   
   
@@ -116,8 +116,8 @@ namespace test {
           Derived derived;
           Base& baseref{derived};
           
-          CHECK (baseref.showSelfType() == "test::PropBuilder_test::Base"_expect    );
-          CHECK (derived.showSelfType() == "test::PropBuilder_test::Derived"_expect );
+          CHECK (baseref.showSelfType() == "PropBuilder_test::Base"_expect    );
+          CHECK (derived.showSelfType() == "PropBuilder_test::Derived"_expect );
           
           
           // The next building block exploits the fact that C++ allows to define
diff --git a/tests/library/meta/tuple-closure-test.cpp b/tests/library/meta/tuple-closure-test.cpp
index 00d7f0243..d6432aa19 100644
--- a/tests/library/meta/tuple-closure-test.cpp
+++ b/tests/library/meta/tuple-closure-test.cpp
@@ -21,8 +21,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/meta/tuple-closure.hpp"
 #include "lib/format-util.hpp"
 
@@ -36,7 +36,7 @@ namespace test {
   using std::array;
   using std::make_tuple;
   using lib::meta::_Fun;
-  using lib::test::showType;
+  using ::test::showType;
   
   
   
diff --git a/tests/library/meta/tuple-diagnostics.hpp b/tests/library/meta/tuple-diagnostics.hpp
index fccd13ef0..cd7a4b2e8 100644
--- a/tests/library/meta/tuple-diagnostics.hpp
+++ b/tests/library/meta/tuple-diagnostics.hpp
@@ -68,7 +68,7 @@ namespace test {
   
   template<tuple_like TUP>
   inline string
-  showType ()
+  renderSeq()           ///< @note specialisation of type-sequence printer for tuple-like
   {
     using TypeList    = RebindTupleTypes<TUP>::List;
     using DumpPrinter = InstantiateChained<TypeList, Printer, NullP>;
diff --git a/tests/library/meta/tuple-helper-test.cpp b/tests/library/meta/tuple-helper-test.cpp
index 80514481a..aa4ff8a88 100644
--- a/tests/library/meta/tuple-helper-test.cpp
+++ b/tests/library/meta/tuple-helper-test.cpp
@@ -22,19 +22,19 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/meta/tuple-helper.hpp"
 #include "meta/typelist-diagnostics.hpp"
 #include "meta/tuple-diagnostics.hpp"
 #include "lib/format-string.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/hetero-data.hpp"
-#include "lib/test/diagnostic-output.hpp"////////////////TODO
 
 #include <string>
 
-using lib::test::showSizeof;
+using test::showSizeof;
+using test::showType;
 using util::toString;
 using util::_Fmt;
 using std::is_same_v;
@@ -91,15 +91,15 @@ namespace test {
       void
       check_diagnostics ()
         {
-          typedef Types1::List L1;
-          typedef Types2::List L2;
-          typedef Types3::List L3;
+          using L1 = Types1::List;
+          using L2 = Types2::List;
+          using L3 = Types3::List;
           
           DISPLAY (L1);
           DISPLAY (L2);
           DISPLAY (L3);
           
-          typedef Tuple<Types1> Tup1;
+          using Tup1 = Tuple<Types1>;
           Tup1 tup1x (Num<1>(11), Num<3>(), 55);
           
           DISPLAY (Tup1);     // prints the type
@@ -236,7 +236,7 @@ namespace test {
       string
       render()
         {
-          return lib::test::showType<X>();
+          return showType<X>();
         }
       
       template<tuple_like X>
@@ -244,11 +244,11 @@ namespace test {
       render()
         {
           string res{"Tup"};
-          res +="("+toString(std::tuple_size_v<X>)+") : "+ lib::test::showType<X>();
+          res +="("+toString(std::tuple_size_v<X>)+") : "+ showType<X>();
           lib::meta::forEachIDX<X> ([&](auto i)
                                       {
                                         using Elm = std::tuple_element_t<i, X>;
-                                        res += " ▷"+ toString(uint(i)) + ": " + lib::test::showType<Elm>();
+                                        res += " ▷"+ toString(uint(i)) + ": " + showType<Elm>();
                                       });
           return res;
         }
@@ -333,33 +333,33 @@ namespace test {
           CHECK (std::tuple_size_v<const Tup> == 2 );
           
           using Elm1 = std::tuple_element_t<1, const Tup>;
-          CHECK (lib::test::showType<Elm1>() == "const short"_expect);
+          CHECK (showType<Elm1>() == "const short"_expect);
           
           // note: a const tuple will add const qualification to each element type
           using TupConstSeq = lib::meta::ElmTypes<const Tup>::Seq;
-          CHECK (lib::test::showType<TupConstSeq>() == "Types<long const, short const>"_expect);
+          CHECK (showType<TupConstSeq>() == "Types<long const, short const>"_expect);
           
           
           // a unified access function `getElm`
           // which works both with access by member or free function
           
           using T1 = decltype(lib::meta::getElm<0> (std::declval<Tup>()));
-          CHECK (lib::test::showType<T1>() == "long &&"_expect);
+          CHECK (showType<T1>() == "long &&"_expect);
           
           using T2 = decltype(lib::meta::getElm<0> (std::declval<Tup&>()));
-          CHECK (lib::test::showType<T2>() == "long&"_expect);
+          CHECK (showType<T2>() == "long&"_expect);
           
           using T3 = decltype(lib::meta::getElm<0> (std::declval<Tup const&>()));
-          CHECK (lib::test::showType<T3>() == "long const&"_expect);
+          CHECK (showType<T3>() == "long const&"_expect);
           
           using H1 = decltype(lib::meta::getElm<4> (std::declval<Het>()));
-          CHECK (lib::test::showType<H1>() == "Nil"_expect);
+          CHECK (showType<H1>() == "Nil"_expect);
           
           using H2 = decltype(lib::meta::getElm<4> (std::declval<Het&>()));
-          CHECK (lib::test::showType<H2>() == "Nil&"_expect);
+          CHECK (showType<H2>() == "Nil&"_expect);
           
           using H3 = decltype(lib::meta::getElm<4> (std::declval<Het const&>()));
-          CHECK (lib::test::showType<H3>() == "Nil const&"_expect);
+          CHECK (showType<H3>() == "Nil const&"_expect);
         }
     };
   
diff --git a/tests/library/meta/tuple-record-init-test.cpp b/tests/library/meta/tuple-record-init-test.cpp
index 3fe0ce694..616ae6e40 100644
--- a/tests/library/meta/tuple-record-init-test.cpp
+++ b/tests/library/meta/tuple-record-init-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/time/timevalue.hpp"
 #include "lib/meta/tuple-record-init.hpp"
 #include "lib/format-cout.hpp"
diff --git a/tests/library/meta/type-demangling-test.cpp b/tests/library/meta/type-demangling-test.cpp
index 1cb329aa9..900f4d344 100644
--- a/tests/library/meta/type-demangling-test.cpp
+++ b/tests/library/meta/type-demangling-test.cpp
@@ -17,7 +17,7 @@
 
 
 #include "lib/symbol.hpp"
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/meta/util.hpp"
 
 #include <string>
diff --git a/tests/library/meta/type-display-test.cpp b/tests/library/meta/type-display-test.cpp
index 226e2afe0..307fc7acc 100644
--- a/tests/library/meta/type-display-test.cpp
+++ b/tests/library/meta/type-display-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/meta/util.hpp"
 #include "lib/format-cout.hpp"
 
@@ -113,7 +113,7 @@ namespace test{
           CHECK (typeStr(&magic)    == "Space const* (*)(Outer<Space>::Inner&&)");
           CHECK (typeSymbol(&magic) == "Function");
           
-          CHECK (typeStr   <Outer<decltype(this)>::Inner>()  == "Outer<test::TypeDisplay_test*>::Inner");
+          CHECK (typeStr   <Outer<decltype(this)>::Inner>()  == "Outer<TypeDisplay_test*>::Inner");
           CHECK (typeSymbol<Outer<decltype(this)>::Inner>()  == "Inner"      );
           
           CHECK (primaryTypeComponent("")                    == "void"       );
diff --git a/tests/library/meta/typelist-diagnostics.hpp b/tests/library/meta/typelist-diagnostics.hpp
index 9c5edef7e..894006cea 100644
--- a/tests/library/meta/typelist-diagnostics.hpp
+++ b/tests/library/meta/typelist-diagnostics.hpp
@@ -30,7 +30,7 @@
 #define META_TYPELIST_DIAGNOSTICS_H
 
 
-#include "lib/test/test-helper.hpp"
+#include "test/test-helper.hpp"
 #include "lib/meta/typelist.hpp"
 #include "lib/meta/generator.hpp"
 #include "lib/format-string.hpp"
@@ -182,7 +182,7 @@ namespace meta {
     template<typename TYPES>
     inline                  enable_if< is_Typelist<TYPES>,
     string                  >
-    showType ()
+    renderSeq()
     {
       using TypeList = TYPES::List;
       return printSublist<TypeList>();
@@ -197,13 +197,13 @@ namespace meta {
     /* ================= convenience macro notation ================= */
     
 #define DISPLAY(_IT_)  \
-        cout << STRINGIFY(_IT_) << "\t:" << showType<_IT_>() << endl;
+        cout << STRINGIFY(_IT_) << "\t:" << renderSeq<_IT_>() << endl;
     
 #define DUMPVAL(_IT_)  \
         cout << STRINGIFY(_IT_) << "\t:" << util::toString(_IT_) << endl;
     
 #define EXPECT(_TY_, RENDERED_STRUCTURE )  \
-        CHECK (showType<_TY_>() == RENDERED_STRUCTURE ## _expect)
+        CHECK (renderSeq<_TY_>() == RENDERED_STRUCTURE ## _expect)
     
     
 }}} // namespace lib::meta::test
diff --git a/tests/library/meta/typelist-manip-test.cpp b/tests/library/meta/typelist-manip-test.cpp
index 46b091e6f..f7780ae7e 100644
--- a/tests/library/meta/typelist-manip-test.cpp
+++ b/tests/library/meta/typelist-manip-test.cpp
@@ -29,7 +29,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/meta/generator.hpp"
 #include "lib/meta/typelist-manip.hpp"
 #include "meta/typelist-diagnostics.hpp"
@@ -112,7 +112,7 @@ namespace test {
               // Furthermore, we use verification against lib::test::ExpectString,
               // which can be given as literal "some text"_expect, to document and
               // verify that the rendered type structure is indeed as expected
-              CHECK (showType<List1>() == "-<1>-<2>-<3>-"_expect);
+              CHECK (renderSeq<List1>() == "-<1>-<2>-<3>-"_expect);
               
               EXPECT (List2, "-<5>-<6>-<7>-");
             }
diff --git a/tests/library/meta/typelist-test.cpp b/tests/library/meta/typelist-test.cpp
index 792fde6b3..f162a2b55 100644
--- a/tests/library/meta/typelist-test.cpp
+++ b/tests/library/meta/typelist-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/meta/typelist.hpp"
 
 #include <iostream>
diff --git a/tests/library/meta/typelist-util-test.cpp b/tests/library/meta/typelist-util-test.cpp
index 2f3d1baac..ede981ee5 100644
--- a/tests/library/meta/typelist-util-test.cpp
+++ b/tests/library/meta/typelist-util-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/meta/typelist-util.hpp"
 
 
diff --git a/tests/library/meta/typeseq-manip-test.cpp b/tests/library/meta/typeseq-manip-test.cpp
index c365a3d1c..3ce709033 100644
--- a/tests/library/meta/typeseq-manip-test.cpp
+++ b/tests/library/meta/typeseq-manip-test.cpp
@@ -28,7 +28,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/meta/typeseq-util.hpp"
 #include "lib/meta/typelist-manip.hpp"
 #include "meta/typelist-diagnostics.hpp"
diff --git a/tests/library/meta/value-type-binding-test.cpp b/tests/library/meta/value-type-binding-test.cpp
index 2a0a8a8e3..364ffa0b2 100644
--- a/tests/library/meta/value-type-binding-test.cpp
+++ b/tests/library/meta/value-type-binding-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/meta/value-type-binding.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/meta/util.hpp"
@@ -25,12 +25,11 @@
 #include <memory>
 
 
+using test::showType;
+
 namespace lib {
 namespace meta{
 namespace test{
-  
-  using lib::test::showType;
-  
 
   namespace { // test fixture
     
diff --git a/tests/library/meta/variadic-argument-picker-test.cpp b/tests/library/meta/variadic-argument-picker-test.cpp
index db531926a..9abae566e 100644
--- a/tests/library/meta/variadic-argument-picker-test.cpp
+++ b/tests/library/meta/variadic-argument-picker-test.cpp
@@ -34,7 +34,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/meta/variadic-helper.hpp"
 #include "lib/format-string.hpp"
 #include "lib/format-cout.hpp"
diff --git a/tests/library/meta/variadic-helper-test.cpp b/tests/library/meta/variadic-helper-test.cpp
index ee385da9a..ea4774616 100644
--- a/tests/library/meta/variadic-helper-test.cpp
+++ b/tests/library/meta/variadic-helper-test.cpp
@@ -22,16 +22,15 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/meta/variadic-helper.hpp"
 #include "lib/meta/tuple-helper.hpp"
 #include "lib/hetero-data.hpp"
-#include "lib/test/diagnostic-output.hpp"////////////TODO
 
 #include <array>
 
-using lib::test::showType;
+using test::showType;
 using std::array;
 using std::tuple;
 
diff --git a/tests/library/meta/virtual-copy-support-test.cpp b/tests/library/meta/virtual-copy-support-test.cpp
index d0332800f..0eb248fa1 100644
--- a/tests/library/meta/virtual-copy-support-test.cpp
+++ b/tests/library/meta/virtual-copy-support-test.cpp
@@ -17,9 +17,9 @@
 
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/format-string.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/test-helper.hpp"
 #include "lib/meta/virtual-copy-support.hpp"
 #include "lib/format-string.hpp"
 #include "lib/format-cout.hpp"
diff --git a/tests/library/multifact-argument-test.cpp b/tests/library/multifact-argument-test.cpp
index 4c017fbdf..06fa014b3 100644
--- a/tests/library/multifact-argument-test.cpp
+++ b/tests/library/multifact-argument-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/multifact.hpp"
 
@@ -31,7 +31,7 @@ namespace test{
   using std::bind;
   using std::function;
   using std::placeholders::_1;
-  using lib::test::showSizeof;
+  using ::test::showSizeof;
   
   
   
diff --git a/tests/library/multifact-singleton-test.cpp b/tests/library/multifact-singleton-test.cpp
index cdab81ab9..40b7640a7 100644
--- a/tests/library/multifact-singleton-test.cpp
+++ b/tests/library/multifact-singleton-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/multifact.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/util.hpp"
@@ -31,7 +31,7 @@ namespace lib {
 namespace test{
   
   using boost::lexical_cast;
-  using lib::test::showSizeof;
+  using ::test::showSizeof;
   using util::isSameObject;
   using util::isnil;
   using std::ostream;
diff --git a/tests/library/multifact-test.cpp b/tests/library/multifact-test.cpp
index 043d8223d..f96846660 100644
--- a/tests/library/multifact-test.cpp
+++ b/tests/library/multifact-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/multifact.hpp"
 #include "lib/util.hpp"
 
diff --git a/tests/library/null-value-test.cpp b/tests/library/null-value-test.cpp
index 7cad359e1..617e4f82f 100644
--- a/tests/library/null-value-test.cpp
+++ b/tests/library/null-value-test.cpp
@@ -18,7 +18,7 @@
 
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/null-value.hpp"
 #include "lib/util.hpp"
 
diff --git a/tests/library/opaque-holder-test.cpp b/tests/library/opaque-holder-test.cpp
index 946d33bae..75af8798b 100644
--- a/tests/library/opaque-holder-test.cpp
+++ b/tests/library/opaque-holder-test.cpp
@@ -17,8 +17,8 @@
 
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/util.hpp"
 #include "lib/util-foreach.hpp"
 #include "lib/opaque-holder.hpp"
@@ -30,7 +30,7 @@
 namespace lib {
 namespace test{
   
-  using ::Test;
+  using ::test::showSizeof;
   using util::isnil;
   using util::for_each;
   using util::isSameObject;
diff --git a/tests/library/opaque-unchecked-buffer-test.cpp b/tests/library/opaque-unchecked-buffer-test.cpp
index 4a1498533..7a33781ce 100644
--- a/tests/library/opaque-unchecked-buffer-test.cpp
+++ b/tests/library/opaque-unchecked-buffer-test.cpp
@@ -17,8 +17,8 @@
 
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/nocopy.hpp"
 #include "lib/util.hpp"
 
@@ -30,12 +30,12 @@
 namespace lib {
 namespace test{
   
-  using ::Test;
   using util::min;
   using lumiera::error::LUMIERA_ERROR_FATAL;
   using lumiera::error::LUMIERA_ERROR_CAPACITY;
   using util::MoveOnly;
   
+  using std::string;
   using std::strlen;
   using std::cout;
   using std::endl;
diff --git a/tests/library/optional-ref-test.cpp b/tests/library/optional-ref-test.cpp
index 1600fee45..93dec1567 100644
--- a/tests/library/optional-ref-test.cpp
+++ b/tests/library/optional-ref-test.cpp
@@ -17,21 +17,19 @@
 
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 
 #include "lib/optional-ref.hpp"
 
 
+using test::Test;
+using lib::randStr;
+using std::string;
 
 namespace lib {
 namespace test{
   
-  using ::Test;
-  using lib::test::randStr;
-  
-  using std::string;
-  
   
   
   /***************************************************************************//**
diff --git a/tests/library/parse-test.cpp b/tests/library/parse-test.cpp
index 5c5a73d00..54e1d0ba2 100644
--- a/tests/library/parse-test.cpp
+++ b/tests/library/parse-test.cpp
@@ -17,8 +17,8 @@
 
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/meta/tuple-helper.hpp"
 #include "lib/parse.hpp"
 
@@ -29,7 +29,7 @@ namespace util {
 namespace parse{
 namespace test {
   
-  using lib::test::showType;
+  using ::test::showType;
   using lib::meta::typeSymbol;
   using lib::meta::is_Tuple;
   using std::decay_t;
diff --git a/tests/library/path-array-test.cpp b/tests/library/path-array-test.cpp
index 02e1fc2d1..defc69ada 100644
--- a/tests/library/path-array-test.cpp
+++ b/tests/library/path-array-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/path-array.hpp"
 #include "lib/format-util.hpp"
 #include "lib/util.hpp"
diff --git a/tests/library/polymorphic-value-test.cpp b/tests/library/polymorphic-value-test.cpp
index 556fa029e..aed6cad04 100644
--- a/tests/library/polymorphic-value-test.cpp
+++ b/tests/library/polymorphic-value-test.cpp
@@ -17,8 +17,8 @@
 
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/util-foreach.hpp"
 
 #include "lib/polymorphic-value.hpp"
diff --git a/tests/library/query-text-test.cpp b/tests/library/query-text-test.cpp
index 86265ceac..996290ac5 100644
--- a/tests/library/query-text-test.cpp
+++ b/tests/library/query-text-test.cpp
@@ -17,7 +17,7 @@
 
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/query-util.hpp"
 #include "lib/query-text.hpp"
 #include "lib/util.hpp"
diff --git a/tests/library/query/query-utils-test.cpp b/tests/library/query/query-utils-test.cpp
index 0ebdce76c..fa77b1c9c 100644
--- a/tests/library/query/query-utils-test.cpp
+++ b/tests/library/query/query-utils-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/util.hpp"
 #include "lib/util-foreach.hpp"
 #include "lib/query-util.hpp"
diff --git a/tests/library/random-concurrent-test.cpp b/tests/library/random-concurrent-test.cpp
index ac90638b4..3d64633cf 100644
--- a/tests/library/random-concurrent-test.cpp
+++ b/tests/library/random-concurrent-test.cpp
@@ -17,23 +17,24 @@
 
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/sync-barrier.hpp"
 #include "lib/random.hpp"
 #include "lib/thread.hpp"
 #include "lib/sync.hpp"
 #include "lib/util.hpp"
 #include "lib/scoped-collection.hpp"
-#include "lib/test/microbenchmark.hpp"
+#include "test/microbenchmark.hpp"
 #include "lib/format-string.hpp"
 #include "lib/format-cout.hpp"
-#include "lib/test/diagnostic-output.hpp"
 
 #include <deque>
 #include <tuple>
 using std::tuple;
 using std::deque;
 using util::_Fmt;
+using test::microBenchmark;
+using test::threadBenchmark;
 
 namespace lib {
 namespace test {
diff --git a/tests/library/random-draw-test.cpp b/tests/library/random-draw-test.cpp
index 88e1832f9..07b6502da 100644
--- a/tests/library/random-draw-test.cpp
+++ b/tests/library/random-draw-test.cpp
@@ -17,18 +17,19 @@
 
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/random-draw.hpp"
 #include "lib/format-string.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/test-helper.hpp"
 
 #include <array>
-
+#include <string>
 
 
 namespace lib {
 namespace test{
   
+  using std::string;
   using util::_Fmt;
   using lib::meta::_FunRet;
   using err::LUMIERA_ERROR_LIFECYCLE;
diff --git a/tests/library/random-test.cpp b/tests/library/random-test.cpp
index fc82696f0..cdfd5e7b3 100644
--- a/tests/library/random-test.cpp
+++ b/tests/library/random-test.cpp
@@ -17,10 +17,9 @@
 
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/random.hpp"
 #include "lib/util.hpp"
-#include "lib/test/diagnostic-output.hpp"
 
 using util::isLimited;
 
diff --git a/tests/library/rational-test.cpp b/tests/library/rational-test.cpp
index dbb4cd8c0..28ba1676b 100644
--- a/tests/library/rational-test.cpp
+++ b/tests/library/rational-test.cpp
@@ -18,10 +18,10 @@
 
 
 #include "lib/error.hpp"
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/integral.hpp"
 #include "lib/format-cout.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/test-helper.hpp"
 
 #include "lib/rational.hpp"
 
diff --git a/tests/library/removefromsettest.cpp b/tests/library/removefromsettest.cpp
index 79b4b6db8..d621e1129 100644
--- a/tests/library/removefromsettest.cpp
+++ b/tests/library/removefromsettest.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/util-foreach.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/format-util.hpp"
diff --git a/tests/library/result-test.cpp b/tests/library/result-test.cpp
index db985f4ae..529b72095 100644
--- a/tests/library/result-test.cpp
+++ b/tests/library/result-test.cpp
@@ -18,8 +18,8 @@
 
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/result.hpp"
 #include "lib/util.hpp"
 
@@ -42,7 +42,7 @@ namespace test{
     const Literal THE_END = "all dead and hero got the girl";
     
     
-    #define Type(_EXPR_) lib::test::showType<decltype(_EXPR_)>()
+    #define Type(_EXPR_) ::test::showType<decltype(_EXPR_)>()
   }
 
   
diff --git a/tests/library/scoped-collection-test.cpp b/tests/library/scoped-collection-test.cpp
index faf56cffd..f2f872fd5 100644
--- a/tests/library/scoped-collection-test.cpp
+++ b/tests/library/scoped-collection-test.cpp
@@ -17,20 +17,20 @@
 
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
-#include "lib/util.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
+#include "test/tracking-dummy.hpp"
 
 #include "lib/scoped-collection.hpp"
-#include "lib/test/tracking-dummy.hpp"
+#include "lib/util.hpp"
 
 
+using test::Dummy;
+
 namespace lib {
 namespace test{
-  
   namespace error = lumiera::error;
   
-  
   namespace { // our explosive special Dummy
     
     LUMIERA_ERROR_DEFINE(SUBVERSIVE, "undercover action");
diff --git a/tests/library/scoped-ptrvect-test.cpp b/tests/library/scoped-ptrvect-test.cpp
index b14a3cba8..edb2381bd 100644
--- a/tests/library/scoped-ptrvect-test.cpp
+++ b/tests/library/scoped-ptrvect-test.cpp
@@ -17,23 +17,22 @@
 
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
-#include "lib/util.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
+#include "test/tracking-dummy.hpp"
 
 #include "lib/scoped-ptrvect.hpp"
-#include "lib/test/tracking-dummy.hpp"
+#include "lib/util.hpp"
 
 
+using test::Dummy;
+using util::isnil;
+using lumiera::error::LUMIERA_ERROR_ITER_EXHAUST;
+
 namespace lib {
 namespace test{
   
-  using ::Test;
-  using util::isnil;
-  using lumiera::error::LUMIERA_ERROR_ITER_EXHAUST;
-  
-  
-  typedef ScopedPtrVect<Dummy> VectD;
+  using VectD = ScopedPtrVect<Dummy>;
   
   
   /****************************************************************//**
diff --git a/tests/library/search-path-splitter-test.cpp b/tests/library/search-path-splitter-test.cpp
index 50282f8d4..de2e65095 100644
--- a/tests/library/search-path-splitter-test.cpp
+++ b/tests/library/search-path-splitter-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/file.hpp"
 #include "lib/util.hpp"
@@ -26,6 +26,7 @@
 
 
 using util::isnil;
+using test::ExpectString;
 
 namespace lib {
 namespace test {
diff --git a/tests/library/several-builder-test.cpp b/tests/library/several-builder-test.cpp
index 9d7aa3986..d1fc71e4f 100644
--- a/tests/library/several-builder-test.cpp
+++ b/tests/library/several-builder-test.cpp
@@ -17,11 +17,11 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/tracking-dummy.hpp"
-#include "lib/test/tracking-allocator.hpp"
-#include "lib/test/test-coll.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-coll.hpp"
+#include "test/test-helper.hpp"
+#include "test/tracking-dummy.hpp"
+#include "test/tracking-allocator.hpp"
 #include "lib/allocation-cluster.hpp"
 #include "lib/iter-explorer.hpp"
 #include "lib/format-util.hpp"
@@ -31,14 +31,19 @@
 
 #include <array>
 
-using ::test::Test;
-using std::array;
+using test::Test;
+using test::Dummy;
+using test::VecI;
+using test::getTestSeq_int;
+using test::TrackingAllocator;
+using test::TrackAlloc;
 
 using lib::explore;
 using util::isLimited;
 using util::toString;
 using util::isnil;
 using util::join;
+using std::array;
 
 
 namespace lib {
@@ -58,7 +63,7 @@ namespace test{
      */
     template<uint i>
     class Num
-      : public test::Dummy
+      : public Dummy
       {
         std::array<int,i> ext_;
         
@@ -562,7 +567,7 @@ namespace test{
           CHECK (0 == TrackingAllocator::use_count());
           {
             auto builder = makeSeveral<Dummy>()
-                              .withAllocator<test::TrackAlloc>()
+                              .withAllocator<TrackAlloc>()
                               .fillElm(55);
             
             size_t elmSiz = sizeof(Dummy);
diff --git a/tests/library/split-splice-test.cpp b/tests/library/split-splice-test.cpp
index 7e81fa6e6..a7a569442 100644
--- a/tests/library/split-splice-test.cpp
+++ b/tests/library/split-splice-test.cpp
@@ -29,8 +29,8 @@
 
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/format-util.hpp"
 #include "lib/format-string.hpp"
@@ -51,6 +51,7 @@ namespace test {
   using util::isnil;
   using util::getAdr;
   using util::isSameObject;
+  using ::test::ExpectString;
   using std::string;
   using std::move;
 
diff --git a/tests/library/stat/data-csv-test.cpp b/tests/library/stat/data-csv-test.cpp
index 9f44c23ef..e16dcd1f1 100644
--- a/tests/library/stat/data-csv-test.cpp
+++ b/tests/library/stat/data-csv-test.cpp
@@ -16,9 +16,9 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
-#include "lib/test/temp-dir.hpp"
+#include "test/run.hpp"
+#include "test/temp-dir.hpp"
+#include "test/test-helper.hpp"
 #include "lib/stat/data.hpp"
 #include "lib/time/timevalue.hpp"
 #include "lib/format-cout.hpp"
@@ -30,7 +30,7 @@
 
 using util::isnil;
 using lib::time::Time;
-using lib::test::TempDir;
+using test::TempDir;
 using std::make_tuple;
 using std::string;
 using std::vector;
diff --git a/tests/library/stat/statistic-test.cpp b/tests/library/stat/statistic-test.cpp
index 2490f2d51..bfc228830 100644
--- a/tests/library/stat/statistic-test.cpp
+++ b/tests/library/stat/statistic-test.cpp
@@ -16,17 +16,19 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/stat/statistic.hpp"
 #include "lib/iter-explorer.hpp"
 #include "lib/format-util.hpp"
 #include "lib/random.hpp"
 #include "lib/util.hpp"
 #include "lib/format-cout.hpp"            ///////////////////////TODO
-#include "lib/test/diagnostic-output.hpp" ///////////////////////TODO
+#include "test/diagnostic-output.hpp"    ////////////////////////TODO
 
 
+using test::roughEQ;
+using util::isnil;
 
 namespace lib {
 namespace stat{
@@ -35,9 +37,7 @@ namespace test{
   namespace {
     const size_t NUM_POINTS = 1'000;
   }
-
-  using lib::test::roughEQ;
-  using util::isnil;
+  
   using error::LUMIERA_ERROR_INVALID;
   
   
diff --git a/tests/library/symbol-hashtable-test.cpp b/tests/library/symbol-hashtable-test.cpp
index 49e2a8aa5..dc15ed765 100644
--- a/tests/library/symbol-hashtable-test.cpp
+++ b/tests/library/symbol-hashtable-test.cpp
@@ -17,8 +17,8 @@
 
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/util.hpp"
 
 #include "lib/symbol.hpp"
diff --git a/tests/library/symbol-test.cpp b/tests/library/symbol-test.cpp
index c68b84ab9..14d02b5fc 100644
--- a/tests/library/symbol-test.cpp
+++ b/tests/library/symbol-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/util.hpp"
 
@@ -26,9 +26,10 @@
 #include <string>
 #include <map>
 
+using util::isnil;
 using util::typeStr;
 using util::isSameObject;
-using util::isnil;
+using test::showSizeof;
 using std::string;
 using std::map;
 
diff --git a/tests/library/sync-barrier-performance-test.cpp b/tests/library/sync-barrier-performance-test.cpp
index 6e29d7398..0b40f31c7 100644
--- a/tests/library/sync-barrier-performance-test.cpp
+++ b/tests/library/sync-barrier-performance-test.cpp
@@ -17,14 +17,15 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/sync-barrier.hpp"
-#include "lib/test/microbenchmark.hpp"
+#include "test/microbenchmark.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/sync.hpp"
 
 using test::Test;
 using std::array;
+using test::threadBenchmark;
 
 
 namespace lib {
diff --git a/tests/library/sync-barrier-test.cpp b/tests/library/sync-barrier-test.cpp
index 8e6c4cf11..d181055e2 100644
--- a/tests/library/sync-barrier-test.cpp
+++ b/tests/library/sync-barrier-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/sync-barrier.hpp"
 #include "lib/iter-explorer.hpp"
 #include "lib/thread.hpp"
diff --git a/tests/library/sync-classlock-test.cpp b/tests/library/sync-classlock-test.cpp
index b1aaef50d..138b108ce 100644
--- a/tests/library/sync-classlock-test.cpp
+++ b/tests/library/sync-classlock-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/sync-classlock.hpp"
 #include "lib/scoped-collection.hpp"
 #include "lib/thread.hpp"
diff --git a/tests/library/sync-locking-test.cpp b/tests/library/sync-locking-test.cpp
index 76f019d82..420182536 100644
--- a/tests/library/sync-locking-test.cpp
+++ b/tests/library/sync-locking-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 
 #include "lib/sync.hpp"
 #include "lib/thread.hpp"
diff --git a/tests/library/sync-timedwait-test.cpp b/tests/library/sync-timedwait-test.cpp
index 602efb4b6..30499a8f8 100644
--- a/tests/library/sync-timedwait-test.cpp
+++ b/tests/library/sync-timedwait-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/error.hpp"
 #include "lib/sync.hpp"
 
diff --git a/tests/library/sync-waiting-test.cpp b/tests/library/sync-waiting-test.cpp
index 5b875ce95..987b8c3cb 100644
--- a/tests/library/sync-waiting-test.cpp
+++ b/tests/library/sync-waiting-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/error.hpp"
 
 #include "lib/thread.hpp"
diff --git a/tests/library/test/event-log-test.cpp b/tests/library/test/event-log-test.cpp
index e01bead27..602d27c24 100644
--- a/tests/library/test/event-log-test.cpp
+++ b/tests/library/test/event-log-test.cpp
@@ -16,27 +16,25 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
+#include "test/event-log.hpp"
 #include "lib/format-util.hpp"
-#include "lib/test/event-log.hpp"
 #include "lib/util.hpp"
 
 #include <string>
 
 using util::join;
 using util::isnil;
+using lib::idi::instanceTypeID;
 
 using std::string;
 
 
-namespace lib {
 namespace test{
 namespace test{
   
   
   
-  
-  
   /***********************************************************//**
    * @test verify a logging facility, which can be used to ensure
    *       some events happened while running test code.
@@ -83,7 +81,7 @@ namespace test{
           CHECK (log.verify("α").before("β"));
           CHECK (not log.verify("β").before("α"));
           
-          CHECK (join(log) == "Rec(EventLogHeader| this = "+idi::instanceTypeID(this)+" ), "
+          CHECK (join(log) == "Rec(EventLogHeader| this = "+instanceTypeID(this)+" ), "
                            +  "Rec(event|{α}), "
                            +  "Rec(event|{β})");
         }
@@ -212,7 +210,7 @@ namespace test{
           
           CHECK (join(log) == string(
                               "Rec(EventLogHeader| this = funCall ), "
-                              "Rec(call| fun = fun1, this = "+idi::instanceTypeID(this)+" ), "
+                              "Rec(call| fun = fun1, this = "+instanceTypeID(this)+" ), "
                               "Rec(call| fun = fun2, this = some ), "
                               "Rec(call| fun = fun3, this = more |{facts, 3.2, 1})"));
           
@@ -387,5 +385,5 @@ namespace test{
   LAUNCHER (EventLog_test, "unit common");
   
   
-}}} // namespace lib::test::test
+}} // namespace test::test
 
diff --git a/tests/library/test/temp-dir-test.cpp b/tests/library/test/temp-dir-test.cpp
index 9998eb499..f54ba67b0 100644
--- a/tests/library/test/temp-dir-test.cpp
+++ b/tests/library/test/temp-dir-test.cpp
@@ -16,14 +16,13 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
-#include "lib/test/temp-dir.hpp"
+#include "test/run.hpp"
+#include "test/temp-dir.hpp"
+#include "test/test-helper.hpp"
 
 #include <fstream>
 
 
-namespace lib {
 namespace test{
 namespace test{
   
@@ -117,4 +116,4 @@ namespace test{
   LAUNCHER (TempDir_test, "unit common");
   
   
-}}} // namespace lib::test::test
+}} // namespace test::test
diff --git a/tests/library/test/test-helper-test.cpp b/tests/library/test/test-helper-test.cpp
index 949dddafa..79eb45262 100644
--- a/tests/library/test/test-helper-test.cpp
+++ b/tests/library/test/test-helper-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/time/timevalue.hpp"
 #include "lib/error.hpp"
 #include "lib/util-foreach.hpp"
@@ -40,7 +40,6 @@ using std::function;
 using std::string;
 
 
-namespace lib {
 namespace test{
 namespace test{
   
@@ -143,11 +142,6 @@ namespace test{
         {
           // verify the exception is indeed raised
           VERIFY_ERROR (EXCEPTION, doThrow() );
-          
-#if false ///////////////////////////////////////////////////////////////////////////////////////////////TICKET #537 : restore throwing ASSERT
-          // and when actually no exception is raised, this is an ASSERTION failure
-          VERIFY_ERROR (ASSERTION, VERIFY_ERROR (EXCEPTION, dontThrow() ));
-#endif    ///////////////////////////////////////////////////////////////////////////////////////////////TICKET #537 : restore throwing ASSERT
         }
       
       
@@ -197,5 +191,5 @@ namespace test{
   LAUNCHER (TestHelper_test, "unit common");
   
   
-}}} // namespace lib::test::test
+}} // namespace test::test
 
diff --git a/tests/library/test/test-helper-variadic-test.cpp b/tests/library/test/test-helper-variadic-test.cpp
index ca0b61110..dbbf209da 100644
--- a/tests/library/test/test-helper-variadic-test.cpp
+++ b/tests/library/test/test-helper-variadic-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 
 
 #include <iostream>
@@ -25,8 +25,9 @@
 #include <string>
 #include <cmath>
 
-using std::string;
 using std::cout;
+using std::string;
+using test::showVariadicTypes;
 
 
 namespace lib {
diff --git a/tests/library/test/test-option-test.cpp b/tests/library/test/test-option-test.cpp
index 6402a751e..f8e63d6cb 100644
--- a/tests/library/test/test-option-test.cpp
+++ b/tests/library/test/test-option-test.cpp
@@ -16,9 +16,9 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
-#include "lib/test/testoption.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
+#include "test/testoption.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/util.hpp"
 
diff --git a/tests/library/test/test-tracking-test.cpp b/tests/library/test/test-tracking-test.cpp
index ede13577e..db075a18e 100644
--- a/tests/library/test/test-tracking-test.cpp
+++ b/tests/library/test/test-tracking-test.cpp
@@ -16,22 +16,25 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
-#include "lib/test/tracking-dummy.hpp"
-#include "lib/test/tracking-allocator.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
+#include "test/tracking-dummy.hpp"
+#include "test/tracking-allocator.hpp"
 #include "lib/allocator-handle.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/format-util.hpp"
 
 #include <string>
+#include <utility>
 
+using std::move;
 using std::string;
 using util::toString;
 using util::join;
+using test::TrackingAllocator;
+using test::TrackingFactory;
 
 
-namespace lib {
 namespace test{
 namespace test{
   
@@ -213,10 +216,10 @@ namespace test{
           { // Test-2 : attach scoped-ownership-front-End
             log.event("Test-2");
             
-            allo::OwnUniqueAdapter<TrackingFactory> uniFab;
+            lib::allo::OwnUniqueAdapter<TrackingFactory> uniFab;
             CHECK (sizeof(uniFab) == sizeof(TrackingFactory));
             CHECK (sizeof(uniFab) == sizeof(std::shared_ptr<byte>));
-            CHECK (not allo::is_Stateless_v<decltype(uniFab)>);
+            CHECK (not lib::allo::is_Stateless_v<decltype(uniFab)>);
             
             CHECK (TrackingAllocator::use_count() == 1);
             CHECK (TrackingAllocator::numAlloc()  == 0);
@@ -416,5 +419,5 @@ namespace test{
   LAUNCHER (TestTracking_test, "unit common");
   
   
-}}} // namespace lib::test::test
+}} // namespace test::test
 
diff --git a/tests/library/text-template-test.cpp b/tests/library/text-template-test.cpp
index ebddf0d83..f3e8950d2 100644
--- a/tests/library/text-template-test.cpp
+++ b/tests/library/text-template-test.cpp
@@ -17,8 +17,8 @@
 
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/text-template.hpp"
 #include "lib/text-template-gen-node-binding.hpp"
 
diff --git a/tests/library/thread-wrapper-autonomous-test.cpp b/tests/library/thread-wrapper-autonomous-test.cpp
index 9803fcc64..45fd880eb 100644
--- a/tests/library/thread-wrapper-autonomous-test.cpp
+++ b/tests/library/thread-wrapper-autonomous-test.cpp
@@ -16,14 +16,15 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/tracking-dummy.hpp"
+#include "test/run.hpp"
+#include "test/tracking-dummy.hpp"
 #include "lib/thread.hpp"
 
 #include <atomic>
 #include <chrono>
 
 using test::Test;
+using test::Dummy;
 using std::atomic_bool;
 using std::this_thread::sleep_for;
 using namespace std::chrono_literals;
diff --git a/tests/library/thread-wrapper-join-test.cpp b/tests/library/thread-wrapper-join-test.cpp
index cea5681e9..38151bc1b 100644
--- a/tests/library/thread-wrapper-join-test.cpp
+++ b/tests/library/thread-wrapper-join-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/thread.hpp"
 #include "lib/error.hpp"
 
@@ -38,7 +38,7 @@ namespace test {
     
     LUMIERA_ERROR_DEFINE(SPECIAL, "007 exception");
     
-    #define Type(_EXPR_) lib::test::showType<decltype(_EXPR_)>()
+    #define Type(_EXPR_) ::test::showType<decltype(_EXPR_)>()
   }
   
   
diff --git a/tests/library/thread-wrapper-lifecycle-test.cpp b/tests/library/thread-wrapper-lifecycle-test.cpp
index aa3111fd4..4429e3676 100644
--- a/tests/library/thread-wrapper-lifecycle-test.cpp
+++ b/tests/library/thread-wrapper-lifecycle-test.cpp
@@ -16,17 +16,17 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
+#include "test/tracking-dummy.hpp"
 #include "lib/thread.hpp"
-#include "lib/test/tracking-dummy.hpp"
 
 #include <atomic>
 #include <chrono>
 #include <memory>
 
 using test::Test;
+using test::Dummy;
 using lib::explore;
-using lib::test::Dummy;
 using std::atomic_uint;
 using std::this_thread::yield;
 using std::this_thread::sleep_for;
diff --git a/tests/library/thread-wrapper-self-recognition-test.cpp b/tests/library/thread-wrapper-self-recognition-test.cpp
index b016f7912..ca7d4c921 100644
--- a/tests/library/thread-wrapper-self-recognition-test.cpp
+++ b/tests/library/thread-wrapper-self-recognition-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/thread.hpp"
 
 using test::Test;
diff --git a/tests/library/thread-wrapper-test.cpp b/tests/library/thread-wrapper-test.cpp
index 5d272a047..b9f3a0d29 100644
--- a/tests/library/thread-wrapper-test.cpp
+++ b/tests/library/thread-wrapper-test.cpp
@@ -16,11 +16,11 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/thread.hpp"
 #include "lib/iter-explorer.hpp"
 #include "lib/scoped-collection.hpp"
-#include "lib/test/microbenchmark.hpp"
+#include "test/microbenchmark.hpp"
 
 #include <atomic>
 #include <chrono>
@@ -129,7 +129,7 @@ namespace test{
                                       }
                                   };
             
-            double runTime = benchmarkTime (launchThreads, REPETITIONS);
+            double runTime = ::test::benchmarkTime (launchThreads, REPETITIONS);
             
             CHECK (checkSum == globalSum);           // sum of precomputed random numbers matches sum from threads
             CHECK (runTime < NUM_THREADS * 1000/2);  // random sleep time should be > 500ms on average
diff --git a/tests/library/typed-allocation-manager-test.cpp b/tests/library/typed-allocation-manager-test.cpp
index 22f7cf095..370f314cd 100644
--- a/tests/library/typed-allocation-manager-test.cpp
+++ b/tests/library/typed-allocation-manager-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/typed-allocation-manager.hpp"
 #include "lib/util.hpp"
 
diff --git a/tests/library/unique-malloc-owner-test.cpp b/tests/library/unique-malloc-owner-test.cpp
index 606baec20..08e554cdf 100644
--- a/tests/library/unique-malloc-owner-test.cpp
+++ b/tests/library/unique-malloc-owner-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/unique-malloc-owner.hpp"
 #include "lib/util.hpp"
 
diff --git a/tests/library/util-collection-test.cpp b/tests/library/util-collection-test.cpp
index fe93541fa..a5c142ec7 100644
--- a/tests/library/util-collection-test.cpp
+++ b/tests/library/util-collection-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/itertools.hpp"
 #include "lib/util-coll.hpp"
 #include "lib/iter-adapter.hpp"
diff --git a/tests/library/util-floordiv-test.cpp b/tests/library/util-floordiv-test.cpp
index 82494b60b..e9401121f 100644
--- a/tests/library/util-floordiv-test.cpp
+++ b/tests/library/util-floordiv-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/util-quant.hpp"
 #include "lib/util.hpp"
 
diff --git a/tests/library/util-floorwrap-test.cpp b/tests/library/util-floorwrap-test.cpp
index f65acbcd2..849558248 100644
--- a/tests/library/util-floorwrap-test.cpp
+++ b/tests/library/util-floorwrap-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/format-string.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/util-quant.hpp"
diff --git a/tests/library/util-foreach-test.cpp b/tests/library/util-foreach-test.cpp
index d15bcdd14..ccc07a0ce 100644
--- a/tests/library/util-foreach-test.cpp
+++ b/tests/library/util-foreach-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/util-foreach.hpp"
 #include "lib/iter-adapter.hpp"
 
diff --git a/tests/library/util-identity-test.cpp b/tests/library/util-identity-test.cpp
index 7caca2033..f985af622 100644
--- a/tests/library/util-identity-test.cpp
+++ b/tests/library/util-identity-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/format-obj.hpp"
 #include "lib/util.hpp"
 
diff --git a/tests/library/util-parse-bool-test.cpp b/tests/library/util-parse-bool-test.cpp
index 9a83341a2..4db5becad 100644
--- a/tests/library/util-parse-bool-test.cpp
+++ b/tests/library/util-parse-bool-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/util.hpp"
 
 #include <string>
diff --git a/tests/library/util-sanitised-identifier-test.cpp b/tests/library/util-sanitised-identifier-test.cpp
index 5466910c4..01589f1d6 100644
--- a/tests/library/util-sanitised-identifier-test.cpp
+++ b/tests/library/util-sanitised-identifier-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/util.hpp"
 
 
diff --git a/tests/library/util-tuple-test.cpp b/tests/library/util-tuple-test.cpp
index b8fa92aa6..38e9b8090 100644
--- a/tests/library/util-tuple-test.cpp
+++ b/tests/library/util-tuple-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/util-tuple.hpp"
 #include "lib/iter-adapter.hpp"
 #include "lib/util.hpp"
diff --git a/tests/library/variant-test.cpp b/tests/library/variant-test.cpp
index f69fab78f..e500ccde6 100644
--- a/tests/library/variant-test.cpp
+++ b/tests/library/variant-test.cpp
@@ -17,8 +17,8 @@
 
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/time/timevalue.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/variant.hpp"
@@ -30,10 +30,10 @@
 namespace lib {
 namespace test{
   
-  using ::Test;
   using meta::Types;
   using lib::time::Time;
   using lib::time::TimeVar;
+  using ::test::randTime;
   
   using util::contains;
   using std::string;
diff --git a/tests/library/verb-function-dispatch-test.cpp b/tests/library/verb-function-dispatch-test.cpp
index 1c1beab47..f739e1e64 100644
--- a/tests/library/verb-function-dispatch-test.cpp
+++ b/tests/library/verb-function-dispatch-test.cpp
@@ -17,7 +17,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/verb-token.hpp"
 #include "lib/format-string.hpp"
 #include "lib/format-cout.hpp"
diff --git a/tests/library/verb-visitor-dispatch-test.cpp b/tests/library/verb-visitor-dispatch-test.cpp
index 297b44671..39265d5a1 100644
--- a/tests/library/verb-visitor-dispatch-test.cpp
+++ b/tests/library/verb-visitor-dispatch-test.cpp
@@ -17,7 +17,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "lib/verb-visitor.hpp"
 #include "lib/format-string.hpp"
 #include "lib/format-cout.hpp"
diff --git a/tests/operation/bugs/hello-bug-test.cpp b/tests/operation/bugs/hello-bug-test.cpp
index bf3e3b30c..ee1d74689 100644
--- a/tests/operation/bugs/hello-bug-test.cpp
+++ b/tests/operation/bugs/hello-bug-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 
 #include <iostream>
 
diff --git a/tests/stage/abstract-tangible-test.cpp b/tests/stage/abstract-tangible-test.cpp
index 8ca842aaf..7d52dc672 100644
--- a/tests/stage/abstract-tangible-test.cpp
+++ b/tests/stage/abstract-tangible-test.cpp
@@ -35,9 +35,9 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
-#include "lib/test/event-log.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
+#include "test/event-log.hpp"
 #include "test/mock-elm.hpp"
 #include "test/test-nexus.hpp"
 #include "lib/idi/genfunc.hpp"
@@ -57,9 +57,9 @@
 using lib::Symbol;
 using util::isnil;
 using util::toString;
+using test::EventLog;
 using lib::time::Time;
 using stage::test::MockElm;
-using lib::test::EventLog;
 using lib::idi::EntryID;
 using lib::diff::Rec;
 using lib::diff::MakeRec;
diff --git a/tests/stage/bus-term-test.cpp b/tests/stage/bus-term-test.cpp
index 4af5aa2bb..64b8c2de5 100644
--- a/tests/stage/bus-term-test.cpp
+++ b/tests/stage/bus-term-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/thread.hpp"
 #include "lib/sync.hpp"
 #include "lib/sync-classlock.hpp"
@@ -50,6 +50,7 @@ using lib::iter_stl::dischargeToSnapshot;
 using lib::IterQueue;
 using lib::IterStack;
 using std::function;
+using test::EventLog;
 using util::contains;
 using util::isnil;
 using util::_Fmt;
@@ -76,7 +77,6 @@ namespace test {
   using lib::time::Time;
   using lib::time::TimeSpan;
   using lib::hash::LuidH;
-  using lib::test::EventLog;
   using lib::CallQueue;
   
   using LERR_(UNBOUND_ARGUMENTS);
@@ -225,8 +225,8 @@ namespace test {
           MockElm mock("uiElm");
           
           // random command arguments...
-          string text {lib::test::randStr(12)};
-          TimeSpan clip (Time(1,2,3), lib::test::randTime());
+          string text {::test::randStr(12)};
+          TimeSpan clip (Time(1,2,3), ::test::randTime());
           LuidH luid;
           
           // we cannot invoke commands without binding required arguments
diff --git a/tests/stage/ctrl/state-map-grouping-storage-test.cpp b/tests/stage/ctrl/state-map-grouping-storage-test.cpp
index e9fb91b11..1b878a24c 100644
--- a/tests/stage/ctrl/state-map-grouping-storage-test.cpp
+++ b/tests/stage/ctrl/state-map-grouping-storage-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "stage/ctrl/state-map-grouping-storage.hpp"
 #include "lib/idi/entry-id.hpp"
 #include "lib/diff/gen-node.hpp"
diff --git a/tests/stage/interact/cmd-context-test.cpp b/tests/stage/interact/cmd-context-test.cpp
index 48f209252..4b61dae5d 100644
--- a/tests/stage/interact/cmd-context-test.cpp
+++ b/tests/stage/interact/cmd-context-test.cpp
@@ -18,8 +18,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-//#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+//#include "test/test-helper.hpp"
 #include "stage/interact/cmd-context.hpp"
 //#include "lib/idi/entry-id.hpp"
 //#include "lib/diff/gen-node.hpp"
diff --git a/tests/stage/interact/ui-coord-resolver-test.cpp b/tests/stage/interact/ui-coord-resolver-test.cpp
index 0e89a5f38..639d46299 100644
--- a/tests/stage/interact/ui-coord-resolver-test.cpp
+++ b/tests/stage/interact/ui-coord-resolver-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "stage/interact/ui-coord.hpp"
 #include "stage/interact/ui-coord-resolver.hpp"
 #include "gen-node-location-query.hpp"
diff --git a/tests/stage/interact/ui-coord-test.cpp b/tests/stage/interact/ui-coord-test.cpp
index 950d49074..cc5dfa767 100644
--- a/tests/stage/interact/ui-coord-test.cpp
+++ b/tests/stage/interact/ui-coord-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "stage/interact/ui-coord.hpp"
 #include "lib/format-util.hpp"
 #include "lib/util.hpp"
diff --git a/tests/stage/interact/ui-location-solver-test.cpp b/tests/stage/interact/ui-location-solver-test.cpp
index d1a24c376..a2f28b96b 100644
--- a/tests/stage/interact/ui-location-solver-test.cpp
+++ b/tests/stage/interact/ui-location-solver-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "stage/interact/ui-coord.hpp"
 #include "stage/interact/ui-location-solver.hpp"
 #include "gen-node-location-query.hpp"
diff --git a/tests/stage/interact/view-spec-dsl-test.cpp b/tests/stage/interact/view-spec-dsl-test.cpp
index c83a65d61..39469a622 100644
--- a/tests/stage/interact/view-spec-dsl-test.cpp
+++ b/tests/stage/interact/view-spec-dsl-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "stage/interact/ui-coord.hpp"
 #include "stage/interact/view-locator.hpp"
 #include "stage/interact/view-spec-dsl.hpp"
@@ -41,6 +41,7 @@ using lib::diff::Rec;
 //using util::isSameObject;
 //using util::isnil;
 using util::contains;
+using test::showSizeof;
 
 
 namespace stage {
@@ -62,7 +63,6 @@ namespace interact {
 namespace test {
   
 //  using lumiera::error::LUMIERA_ERROR_WRONG_TYPE;
-  using lib::test::showSizeof;
   using stage::model::ElementAccess;
   using stage::test::TestElementAccess;
   using stage::test::DummyWidget;
diff --git a/tests/stage/model/canvas-hook-test.cpp b/tests/stage/model/canvas-hook-test.cpp
index a4058b334..e564edaaf 100644
--- a/tests/stage/model/canvas-hook-test.cpp
+++ b/tests/stage/model/canvas-hook-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "stage/model/canvas-hook.hpp"
 #include "lib/scoped-collection.hpp"
 #include "lib/iter-explorer.hpp"
diff --git a/tests/stage/model/element-access-test.cpp b/tests/stage/model/element-access-test.cpp
index a468c92b5..095675ebf 100644
--- a/tests/stage/model/element-access-test.cpp
+++ b/tests/stage/model/element-access-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 //#include "stage/interact/view-spec-dsl.hpp"
 #include "test/test-element-access.hpp"
 #include "stage/interact/ui-coord.hpp"
@@ -45,8 +45,6 @@ namespace stage  {
 namespace model{
 namespace test {
   
-//  using lumiera::error::LUMIERA_ERROR_WRONG_TYPE;
-//  using lib::test::showSizeof;
   using interact::UICoord;
   using stage::test::TestElementAccess;
   using stage::test::DummyWidget;
diff --git a/tests/stage/model/view-hook-test.cpp b/tests/stage/model/view-hook-test.cpp
index f711754e2..c8b371359 100644
--- a/tests/stage/model/view-hook-test.cpp
+++ b/tests/stage/model/view-hook-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "stage/model/view-hook.hpp"
 #include "lib/scoped-collection.hpp"
 #include "lib/iter-explorer.hpp"
diff --git a/tests/stage/model/w-link-test.cpp b/tests/stage/model/w-link-test.cpp
index 0cbf23717..d493bcd81 100644
--- a/tests/stage/model/w-link-test.cpp
+++ b/tests/stage/model/w-link-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "stage/model/w-link.hpp"
 #include "lib/util.hpp"
 
diff --git a/tests/stage/model/zoom-window-test.cpp b/tests/stage/model/zoom-window-test.cpp
index 7ea542db1..74fb6e60d 100644
--- a/tests/stage/model/zoom-window-test.cpp
+++ b/tests/stage/model/zoom-window-test.cpp
@@ -58,8 +58,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "stage/model/zoom-window.hpp"
 
 
diff --git a/tests/stage/test/mock-elm.hpp b/tests/stage/test/mock-elm.hpp
index 6b6f468b6..91b38f3b5 100644
--- a/tests/stage/test/mock-elm.hpp
+++ b/tests/stage/test/mock-elm.hpp
@@ -53,7 +53,7 @@
 
 #include "lib/error.hpp"
 #include "include/ui-protocol.hpp"
-#include "lib/test/event-log.hpp"
+#include "test/event-log.hpp"
 #include "stage/model/tangible.hpp"
 #include "lib/diff/record.hpp"
 #include "lib/idi/genfunc.hpp"
@@ -69,13 +69,11 @@
 #include <map>
 
 
-namespace stage {
-  using lib::test::EventLog;
-  using lib::test::EventMatch;
-  
-namespace test{
-  
+namespace stage{
+namespace test {
   
+  using ::test::EventLog;
+  using ::test::EventMatch;
   using lib::diff::TreeMutator;
   using util::isnil;
   using lib::Symbol;
diff --git a/tests/stage/test/placeholder-command.hpp b/tests/stage/test/placeholder-command.hpp
index 0dc5e0414..2e4c717e5 100644
--- a/tests/stage/test/placeholder-command.hpp
+++ b/tests/stage/test/placeholder-command.hpp
@@ -35,9 +35,9 @@
 #include "lib/error.hpp"
 #include "lib/symbol.hpp"
 #include "lib/idi/genfunc.hpp"
-#include "lib/test/event-log.hpp"
 #include "steam/control/command-def.hpp"
 #include "lib/format-util.hpp"
+#include "test/event-log.hpp"
 
 #include <vector>
 #include <string>
@@ -67,7 +67,7 @@ namespace test{
   template<typename...ARGS>
   class PlaceholderCommand
     {
-      static lib::test::EventLog log_;
+      static ::test::EventLog log_;
       
       /** @internal unique ID-string specific for the instance `ARGS` */
       static string
@@ -105,7 +105,7 @@ namespace test{
       
     public:
       static steam::control::Command
-      fabricateNewInstance (lib::test::EventLog const& invocationLog)
+      fabricateNewInstance (::test::EventLog const& invocationLog)
         {
           log_ = invocationLog;
           return steam::control::CommandDef{Symbol{uniqueTypeInstance()}}
@@ -118,7 +118,7 @@ namespace test{
   
   
   template<typename...ARGS>
-  lib::test::EventLog  PlaceholderCommand<ARGS...>::log_{"test-dummy-"+fullTypeID()};
+  ::test::EventLog  PlaceholderCommand<ARGS...>::log_{"test-dummy-"+fullTypeID()};
 
   
   
diff --git a/tests/stage/test/test-nexus.cpp b/tests/stage/test/test-nexus.cpp
index 87861cb73..70cb590bc 100644
--- a/tests/stage/test/test-nexus.cpp
+++ b/tests/stage/test/test-nexus.cpp
@@ -37,8 +37,8 @@
 #include "lib/error.hpp"
 #include "lib/symbol.hpp"
 #include "lib/itertools.hpp"
+#include "test/event-log.hpp"
 #include "test/test-nexus.hpp"
-#include "lib/test/event-log.hpp"
 #include "steam/control/command.hpp"
 #include "stage/ctrl/nexus.hpp"
 #include "stage/ctrl/state-recorder.hpp"
@@ -63,13 +63,13 @@ using lib::diff::GenNode;
 using lib::diff::DataCap;
 using lib::diff::MutationMessage;
 using lib::idi::instanceTypeID;
-using lib::test::EventLog;
 using stage::ctrl::BusTerm;
 using stage::ctrl::StateManager;
 using stage::ctrl::StateRecorder;
 using steam::control::Command;
 using steam::control::CommandImpl;
 using steam::control::HandlingPattern;
+using test::EventLog;
 using util::_Fmt;
 
 namespace stage {
@@ -368,13 +368,13 @@ namespace test{
     return testNexus();
   }
   
-  lib::test::EventLog const&
+  ::test::EventLog const&
   Nexus::getLog()
   {
     return testNexus().getLog();
   }
   
-  lib::test::EventLog const&
+  ::test::EventLog const&
   Nexus::startNewLog()
   {
     return testNexus().getLog().clear();
diff --git a/tests/stage/test/test-nexus.hpp b/tests/stage/test/test-nexus.hpp
index c958703ce..207049fc2 100644
--- a/tests/stage/test/test-nexus.hpp
+++ b/tests/stage/test/test-nexus.hpp
@@ -42,8 +42,8 @@
 #include "stage/model/tangible.hpp"
 #include "stage/ctrl/state-manager.hpp"
 #include "test/placeholder-command.hpp"
-#include "lib/test/event-log.hpp"
 #include "lib/diff/gen-node.hpp"
+#include "test/event-log.hpp"
 
 #include <functional>
 #include <string>
@@ -75,8 +75,8 @@ namespace test{
       /** kill the given [BusTerm] and implant a dead terminal in place */
       static void zombificate(ctrl::BusTerm&);
       
-      static lib::test::EventLog const& getLog();
-      static lib::test::EventLog const& startNewLog();
+      static ::test::EventLog const& getLog();
+      static ::test::EventLog const& startNewLog();
       
       static size_t size();
       
diff --git a/tests/testrunner.cpp b/tests/testrunner.cpp
index bf4b91ded..bae8e41a7 100644
--- a/tests/testrunner.cpp
+++ b/tests/testrunner.cpp
@@ -19,8 +19,8 @@
  */
 
 #include "include/lifecycle.hpp"
-#include "lib/test/testoption.hpp"
-#include "lib/test/suite.hpp"
+#include "test/testoption.hpp"
+#include "test/suite.hpp"
 
 using vessel::LifecycleHook;
 using vessel::ON_GLOBAL_INIT;
diff --git a/tests/vault/gear/activity-detector-test.cpp b/tests/vault/gear/activity-detector-test.cpp
index 877ff157b..1d8eca2ed 100644
--- a/tests/vault/gear/activity-detector-test.cpp
+++ b/tests/vault/gear/activity-detector-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "activity-detector.hpp"
 #include "vault/real-clock.hpp"
 #include "lib/time/timevalue.hpp"
@@ -29,8 +29,8 @@ using lib::time::Time;
 using lib::time::FSecs;
 
 using util::isSameObject;
-using lib::test::randStr;
-using lib::test::randTime;
+using test::randTime;
+using test::randStr;
 
 
 namespace vault{
diff --git a/tests/vault/gear/activity-detector.hpp b/tests/vault/gear/activity-detector.hpp
index cad30087f..ab92569b3 100644
--- a/tests/vault/gear/activity-detector.hpp
+++ b/tests/vault/gear/activity-detector.hpp
@@ -63,8 +63,8 @@
 
 
 #include "vault/common.hpp"
-#include "lib/test/test-helper.hpp"
-#include "lib/test/event-log.hpp"
+#include "test/test-helper.hpp"
+#include "test/event-log.hpp"
 
 #include "vault/gear/job.h"
 #include "vault/gear/activity.hpp"
@@ -127,12 +127,12 @@ namespace test {
    *         Moreover, it is convertible to `bool` to retrieve the verification result.
    */
   class ActivityMatch
-    : private lib::test::EventMatch
+    : private ::test::EventMatch
     {
-      using _Parent = lib::test::EventMatch;
+      using EventMatch = ::test::EventMatch;
       
-      ActivityMatch (lib::test::EventMatch&& matcher)
-        : _Parent{move (matcher)}
+      ActivityMatch (EventMatch&& matcher)
+        : EventMatch{move (matcher)}
         { }
       
       friend class ActivityDetector;
@@ -144,7 +144,7 @@ namespace test {
        *  usually triggered from the unit test `CHECK()`.
        * @note failure cause is printed to STDERR.
        */
-      operator bool()  const { return _Parent::operator bool(); }
+      operator bool()  const { return EventMatch::operator bool(); }
       
       
       /* query builder(s) to find a match stepping forwards */
@@ -168,7 +168,7 @@ namespace test {
       ActivityMatch&
       seq (uint seqNr)
         {
-          _Parent::attrib (MARK_SEQ, util::toString (seqNr));
+          EventMatch::attrib (MARK_SEQ, util::toString (seqNr));
           return *this;
         }
       
@@ -176,13 +176,13 @@ namespace test {
       ActivityMatch&
       beforeSeqIncrement (uint seqNr)
         {
-          _Parent::beforeEvent(MARK_INC, util::toString(seqNr));
+          EventMatch::beforeEvent(MARK_INC, util::toString(seqNr));
           return  *this;
         }
       ActivityMatch&
       afterSeqIncrement (uint seqNr)
         {
-          _Parent::afterEvent(MARK_INC, util::toString(seqNr));
+          EventMatch::afterEvent(MARK_INC, util::toString(seqNr));
           return  *this;
         }
       
@@ -202,7 +202,7 @@ namespace test {
        *  */
       template<typename...ARGS>
       ActivityMatch&
-      delegate (_Parent& (_Parent::*fun) (ARGS...),  ARGS&& ...args)
+      delegate (EventMatch& (EventMatch::*fun) (ARGS...),  ARGS&& ...args)
         {
           return static_cast<ActivityMatch&> (
                    (this->*fun) (forward<ARGS> (args)...));
@@ -221,7 +221,7 @@ namespace test {
   class ActivityDetector
     : util::NonCopyable
     {
-      using EventLog = lib::test::EventLog;
+      using EventLog = ::test::EventLog;
       
       EventLog eventLog_;
       uint invocationSeq_;
@@ -523,7 +523,7 @@ namespace test {
       
       Job
       buildMockJob (string id =""
-                   ,Time nominal = lib::test::randTime()
+                   ,Time nominal = ::test::randTime()
                    ,size_t extra = rani())
         {
           InvocationInstanceID invoKey;
diff --git a/tests/vault/gear/block-flow-test.cpp b/tests/vault/gear/block-flow-test.cpp
index 1d672d6ad..be78717d2 100644
--- a/tests/vault/gear/block-flow-test.cpp
+++ b/tests/vault/gear/block-flow-test.cpp
@@ -16,10 +16,10 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
+#include "test/microbenchmark.hpp"
 #include "vault/gear/block-flow.hpp"
-#include "lib/test/microbenchmark.hpp"
 #include "lib/time/timevalue.hpp"
 #include "lib/meta/function.hpp"
 #include "lib/format-cout.hpp"
@@ -30,10 +30,10 @@
 #include <tuple>
 
 using test::Test;
-using util::isSameObject;
-using lib::test::randTime;
-using lib::test::showType;
+using test::randTime;
+using test::showType;
 using lib::time::Offset;
+using util::isSameObject;
 
 using std::vector;
 using std::pair;
@@ -448,7 +448,7 @@ namespace test {
           
           auto benchmark = [INSTANCES](auto invokeTest)
                             {         //  does the timing measurement with result in µ-seconds
-                              return lib::test::benchmarkTime(invokeTest, INSTANCES);
+                              return ::test::benchmarkTime(invokeTest, INSTANCES);
                             };
           
           
diff --git a/tests/vault/gear/scheduler-activity-test.cpp b/tests/vault/gear/scheduler-activity-test.cpp
index d44d3ae89..d2ac3862e 100644
--- a/tests/vault/gear/scheduler-activity-test.cpp
+++ b/tests/vault/gear/scheduler-activity-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "activity-detector.hpp"
 #include "vault/gear/activity-lang.hpp"
 #include "vault/real-clock.hpp"
@@ -134,7 +134,7 @@ namespace test {
           ActivityDetector detector;
           
           uint64_t x1=rani(), x2=rani();
-          Time nomTime = lib::test::randTime();
+          Time nomTime = ::test::randTime();
           Activity feed{x1,x2};
           Activity feed2{x1+1,x1+2};
           feed.next = &feed2;
diff --git a/tests/vault/gear/scheduler-commutator-test.cpp b/tests/vault/gear/scheduler-commutator-test.cpp
index 56e88f5db..ba1672c78 100644
--- a/tests/vault/gear/scheduler-commutator-test.cpp
+++ b/tests/vault/gear/scheduler-commutator-test.cpp
@@ -16,10 +16,10 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "activity-detector.hpp"
+#include "test/microbenchmark.hpp"
 #include "vault/gear/scheduler-commutator.hpp"
-#include "lib/test/microbenchmark.hpp"
 #include "lib/time/timevalue.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/thread.hpp"
@@ -28,7 +28,7 @@
 #include <chrono>
 
 using test::Test;
-using lib::test::threadBenchmark;
+using test::threadBenchmark;
 
 
 namespace vault{
diff --git a/tests/vault/gear/scheduler-invocation-test.cpp b/tests/vault/gear/scheduler-invocation-test.cpp
index eab037cf6..9b3a16da1 100644
--- a/tests/vault/gear/scheduler-invocation-test.cpp
+++ b/tests/vault/gear/scheduler-invocation-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "vault/gear/scheduler-invocation.hpp"
 #include "lib/util.hpp"
 
diff --git a/tests/vault/gear/scheduler-load-control-test.cpp b/tests/vault/gear/scheduler-load-control-test.cpp
index 5f75f6cca..f0d962b00 100644
--- a/tests/vault/gear/scheduler-load-control-test.cpp
+++ b/tests/vault/gear/scheduler-load-control-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "vault/gear/load-controller.hpp"
 #include "vault/real-clock.hpp"
 
diff --git a/tests/vault/gear/scheduler-service-test.cpp b/tests/vault/gear/scheduler-service-test.cpp
index 1d4ab7121..14c4f977a 100644
--- a/tests/vault/gear/scheduler-service-test.cpp
+++ b/tests/vault/gear/scheduler-service-test.cpp
@@ -16,15 +16,15 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "test-chain-load.hpp"
+#include "test/transiently.hpp"
+#include "test/microbenchmark.hpp"
 #include "activity-detector.hpp"
 #include "vault/gear/scheduler.hpp"
 #include "lib/time/timevalue.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/format-string.hpp"
-#include "lib/test/transiently.hpp"
-#include "lib/test/microbenchmark.hpp"
 #include "lib/util.hpp"
 
 #include <thread>
@@ -340,7 +340,7 @@ namespace test {
                               };
           
           auto pullWork = [&] {
-                                delay_us = lib::test::benchmarkTime([&]{ res = scheduler.doWork(); });
+                                delay_us = test::benchmarkTime([&]{ res = scheduler.doWork(); });
                                 slip_us = _raw(detector.invokeTime(probe)) - _raw(start);
                                 cout << "res:"<<res<<" delay="<<delay_us<<"µs slip="<<slip_us<<"µs"<<endl;
                               };
diff --git a/tests/vault/gear/scheduler-stress-test.cpp b/tests/vault/gear/scheduler-stress-test.cpp
index eba9a1cc5..c76ce0e79 100644
--- a/tests/vault/gear/scheduler-stress-test.cpp
+++ b/tests/vault/gear/scheduler-stress-test.cpp
@@ -16,10 +16,10 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "test-chain-load.hpp"
 #include "stress-test-rig.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/test-helper.hpp"
 #include "vault/gear/scheduler.hpp"
 #include "lib/time/timevalue.hpp"
 #include "lib/format-string.hpp"
diff --git a/tests/vault/gear/scheduler-usage-test.cpp b/tests/vault/gear/scheduler-usage-test.cpp
index 11c393f2e..43bb7043d 100644
--- a/tests/vault/gear/scheduler-usage-test.cpp
+++ b/tests/vault/gear/scheduler-usage-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "vault/gear/scheduler.hpp"
 //#include "lib/time/timevalue.hpp"
 //#include "lib/format-cout.hpp"
diff --git a/tests/vault/gear/special-job-fun-test.cpp b/tests/vault/gear/special-job-fun-test.cpp
index 6f96b73dc..6668ecc6f 100644
--- a/tests/vault/gear/special-job-fun-test.cpp
+++ b/tests/vault/gear/special-job-fun-test.cpp
@@ -16,14 +16,14 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
+#include "test/tracking-dummy.hpp"
 //#include "vault/real-clock.hpp"
 //#include "lib/time/timevalue.hpp"
 #include "vault/gear/special-job-fun.hpp"
 #include "lib/format-cout.hpp" ////////////////////////////////////TODO Moo-oh
-#include "lib/test/diagnostic-output.hpp"//////////////////////////TODO TOD-oh
-#include "lib/test/tracking-dummy.hpp"
+#include "test/diagnostic-output.hpp"//////////////////////////////TODO TOD-oh
 //#include "lib/util.hpp"
 
 //#include <array>
@@ -36,7 +36,7 @@
 //using util::isSameObject;
 //using lib::test::randStr;
 //using lib::test::randTime;
-using lib::test::Dummy;
+using test::Dummy;
 //using std::array;
 
 
diff --git a/tests/vault/gear/stress-test-rig.hpp b/tests/vault/gear/stress-test-rig.hpp
index c6c002623..0b6f29ba6 100644
--- a/tests/vault/gear/stress-test-rig.hpp
+++ b/tests/vault/gear/stress-test-rig.hpp
@@ -133,8 +133,8 @@
 
 
 #include "test-chain-load.hpp"
+#include "test/transiently.hpp"
 #include "lib/binary-search.hpp"
-#include "lib/test/transiently.hpp"
 
 #include "vault/gear/scheduler.hpp"
 #include "lib/time/timevalue.hpp"
diff --git a/tests/vault/gear/test-chain-load-test.cpp b/tests/vault/gear/test-chain-load-test.cpp
index 660523c58..f4a85276d 100644
--- a/tests/vault/gear/test-chain-load-test.cpp
+++ b/tests/vault/gear/test-chain-load-test.cpp
@@ -16,8 +16,8 @@
  */
 
 
-#include "lib/test/run.hpp"
-#include "lib/test/test-helper.hpp"
+#include "test/run.hpp"
+#include "test/test-helper.hpp"
 #include "lib/format-string.hpp"
 #include "test-chain-load.hpp"
 #include "vault/gear/job.h"
diff --git a/tests/vault/gear/test-chain-load.hpp b/tests/vault/gear/test-chain-load.hpp
index 9b49e98ab..a403aa497 100644
--- a/tests/vault/gear/test-chain-load.hpp
+++ b/tests/vault/gear/test-chain-load.hpp
@@ -111,13 +111,13 @@
 
 
 #include "vault/common.hpp"
-#include "lib/test/transiently.hpp"
+#include "test/transiently.hpp"
+#include "test/microbenchmark.hpp"
 
 #include "vault/gear/job.h"
 #include "vault/gear/scheduler.hpp"
 #include "vault/gear/special-job-fun.hpp"
 #include "lib/uninitialised-storage.hpp"
-#include "lib/test/microbenchmark.hpp"
 #include "lib/incidence-count.hpp"
 #include "lib/time/timevalue.hpp"
 #include "lib/time/quantiser.hpp"
@@ -156,10 +156,10 @@ namespace test {
   using lib::time::TimeValue;
   using lib::time::FrameRate;
   using lib::time::Duration;
-  using lib::test::benchmarkTime;
-  using lib::test::microBenchmark;
-  using lib::test::Transiently;
   using lib::meta::_FunRet;
+  using ::test::benchmarkTime;
+  using ::test::microBenchmark;
+  using ::test::Transiently;
 
   using std::string;
   using std::function;
diff --git a/tests/vault/gear/work-force-test.cpp b/tests/vault/gear/work-force-test.cpp
index 5161288ea..cdc0860d8 100644
--- a/tests/vault/gear/work-force-test.cpp
+++ b/tests/vault/gear/work-force-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "vault/gear/work-force.hpp"
 #include "lib/thread.hpp"
 #include "lib/sync.hpp"
diff --git a/tests/vault/mem/extent-family-test.cpp b/tests/vault/mem/extent-family-test.cpp
index 7dea333ec..30dd58828 100644
--- a/tests/vault/mem/extent-family-test.cpp
+++ b/tests/vault/mem/extent-family-test.cpp
@@ -16,7 +16,7 @@
  */
 
 
-#include "lib/test/run.hpp"
+#include "test/run.hpp"
 #include "vault/mem/extent-family.hpp"
 #include "lib/iter-explorer.hpp"
 #include "lib/util.hpp"
diff --git a/wiki/thinkPad.ichthyo.mm b/wiki/thinkPad.ichthyo.mm
index 5bec02349..86c55cbfc 100644
--- a/wiki/thinkPad.ichthyo.mm
+++ b/wiki/thinkPad.ichthyo.mm
@@ -72189,7 +72189,7 @@
 </node>
 <node CREATED="1772467713314" ID="ID_1260307377" MODIFIED="1772467717464" TEXT="vessel">
 <node CREATED="1772478667252" ID="ID_1873381687" MODIFIED="1772478785290" TEXT="vessel::spine">
-<linktarget COLOR="#785e5b" DESTINATION="ID_1873381687" ENDARROW="Default" ENDINCLINATION="3167;618;" ID="Arrow_ID_790663035" SOURCE="ID_1230702980" STARTARROW="None" STARTINCLINATION="1144;89;"/>
+<linktarget COLOR="#785e5b" DESTINATION="ID_1873381687" ENDARROW="Default" ENDINCLINATION="3167;618;" ID="Arrow_ID_790663035" SOURCE="ID_1230702980" STARTARROW="None" STARTINCLINATION="1154;87;"/>
 <node COLOR="#56312d" CREATED="1772478751648" ID="ID_1228838617" MODIFIED="1772478768902" TEXT="&#xfc;bergreifende Definitionen und Schnittstellen"/>
 </node>
 <node CREATED="1772467881056" ID="ID_1519471369" MODIFIED="1772467885264" TEXT="vessel::advice"/>
@@ -72495,6 +72495,14 @@
 <icon BUILTIN="flag-yellow"/>
 </node>
 </node>
+<node CREATED="1772672526054" ID="ID_85555678" MODIFIED="1772672533751" TEXT="Bootstrap / Shutdown">
+<node CREATED="1772672668672" ID="ID_386247962" MODIFIED="1772672672988" TEXT="pre-main()">
+<node BACKGROUND_COLOR="#e0ceaa" COLOR="#690f14" CREATED="1772672545371" ID="ID_1518775415" MODIFIED="1772672666550" TEXT="ungekl&#xe4;rt: Initialisieren von NoBug">
+<arrowlink COLOR="#be310e" DESTINATION="ID_1499658866" ENDARROW="Default" ENDINCLINATION="406;-831;" ID="Arrow_ID_1371501056" STARTARROW="None" STARTINCLINATION="1543;113;"/>
+<icon BUILTIN="bell"/>
+</node>
+</node>
+</node>
 </node>
 <node CREATED="1721058312039" ID="ID_202200971" MODIFIED="1721058318320" TEXT="Modell-Strukturen">
 <node CREATED="1721058373845" ID="ID_1036649579" MODIFIED="1721058704362" TEXT="Session &#x27fa; High-Level-Model">
@@ -114904,14 +114912,14 @@ StM_bind(Builder&lt;R1&gt; b1, Extension&lt;R1,R2&gt; extension)
 </node>
 <node BACKGROUND_COLOR="#eef0c5" COLOR="#990000" CREATED="1772477958773" ID="ID_1191642200" MODIFIED="1772477969130" TEXT="Ausf&#xfc;hrung">
 <icon BUILTIN="pencil"/>
-<node BACKGROUND_COLOR="#eef0c5" COLOR="#990000" CREATED="1772477970489" ID="ID_945262676" MODIFIED="1772478233574" TEXT="Vorbereitungen...">
+<node COLOR="#435e98" CREATED="1772477970489" ID="ID_945262676" MODIFIED="1772672410752" TEXT="Vorbereitungen...">
 <icon BUILTIN="yes"/>
 <node CREATED="1772477978051" ID="ID_1145781733" MODIFIED="1772477987770" TEXT="&#xbb;Vessel&#xab; dokumentieren"/>
 <node CREATED="1772560467924" ID="ID_1419619818" MODIFIED="1772560522485" TEXT="und aus AppState wird eine Voyage">
 <linktarget COLOR="#2e83e6" DESTINATION="ID_1419619818" ENDARROW="Default" ENDINCLINATION="291;21;" ID="Arrow_ID_464210861" SOURCE="ID_92248164" STARTARROW="None" STARTINCLINATION="-19;125;"/>
 <icon BUILTIN="ksmiletris"/>
 </node>
-<node CREATED="1772477989246" ID="ID_1526065242" MODIFIED="1772478019620">
+<node CREATED="1772477989246" ID="ID_1526065242" MODIFIED="1772734890901">
 <richcontent TYPE="NODE"><html>
   <head/>
   <body>
@@ -114998,26 +115006,15 @@ StM_bind(Builder&lt;R1&gt; b1, Extension&lt;R1,R2&gt; extension)
 </node>
 </node>
 </node>
-<node BACKGROUND_COLOR="#f0d5c5" COLOR="#990033" CREATED="1772503464810" ID="ID_1499658866" MODIFIED="1772503479586" TEXT="&#xdc;berraschung: wird gar nicht (mehr) gebraucht?">
+<node BACKGROUND_COLOR="#f0d5c5" COLOR="#990033" CREATED="1772503464810" ID="ID_1499658866" MODIFIED="1772672666550" TEXT="&#xdc;berraschung: wird gar nicht (mehr) gebraucht?">
+<linktarget COLOR="#be310e" DESTINATION="ID_1499658866" ENDARROW="Default" ENDINCLINATION="406;-831;" ID="Arrow_ID_1371501056" SOURCE="ID_1518775415" STARTARROW="None" STARTINCLINATION="1543;113;"/>
 <icon BUILTIN="help"/>
 <node CREATED="1772503485519" ID="ID_1516911789" LINK="https://issues.lumiera.org/ticket/1133" MODIFIED="1772503891550" TEXT="hier hat sich wohl mit dem ZombieCheck und #1133 die Begr&#xfc;ndung in &#xbb;Luft&#xab; aufgel&#xf6;st">
 <arrowlink COLOR="#fddcce" DESTINATION="ID_1997666438" ENDARROW="Default" ENDINCLINATION="263;3774;" ID="Arrow_ID_519178011" STARTARROW="Default" STARTINCLINATION="2312;70;"/>
 </node>
 <node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1772507033399" ID="ID_753555895" LINK="https://issues.lumiera.org/ticket/1416" MODIFIED="1772507046892" TEXT="#1416 clarify lifecycle of the &#xbb;Vessel&#xab; ">
 <icon BUILTIN="flag-yellow"/>
-<node CREATED="1772508264250" ID="ID_1439037571" MODIFIED="1772508277789" TEXT="habe dort mal alle diese Beobachtungen notiert">
-<node BACKGROUND_COLOR="#fafe99" COLOR="#fa002a" CREATED="1772508622392" ID="ID_426690721" MODIFIED="1772508665323" TEXT="Vorsicht: Kommentar gespeichert?">
-<richcontent TYPE="NOTE"><html>
-  <head/>
-  <body>
-    <p>
-      Grade Netzwerk-Wartungsarbeiten bei M-Net. Notfalls sollte der Kommentar in der Form-History sein
-    </p>
-  </body>
-</html></richcontent>
-<icon BUILTIN="broken-line"/>
-</node>
-</node>
+<node CREATED="1772508264250" ID="ID_1439037571" MODIFIED="1772508277789" TEXT="habe dort mal alle diese Beobachtungen notiert"/>
 <node CREATED="1772508279112" ID="ID_944148147" MODIFIED="1772508282540" TEXT="Idee...">
 <node CREATED="1772508288777" ID="ID_1204563226" MODIFIED="1772508296203" TEXT="ON_BASIC_INIT abschaffen"/>
 <node CREATED="1772508309618" ID="ID_1996440422" MODIFIED="1772508369554" TEXT="danach kl&#xe4;ren, ob wir nobug-init.hpp &#xfc;berhaupt noch brauchen">
@@ -115081,7 +115078,7 @@ StM_bind(Builder&lt;R1&gt; b1, Extension&lt;R1,R2&gt; extension)
     </p>
   </body>
 </html></richcontent>
-<arrowlink COLOR="#785e5b" DESTINATION="ID_1873381687" ENDARROW="Default" ENDINCLINATION="3167;618;" ID="Arrow_ID_790663035" STARTARROW="None" STARTINCLINATION="1144;89;"/>
+<arrowlink COLOR="#785e5b" DESTINATION="ID_1873381687" ENDARROW="Default" ENDINCLINATION="3167;618;" ID="Arrow_ID_790663035" STARTARROW="None" STARTINCLINATION="1154;87;"/>
 <icon BUILTIN="yes"/>
 <node CREATED="1772478793204" HGAP="81" ID="ID_619773844" MODIFIED="1772478808375" TEXT="dorthin..." VSHIFT="22">
 <node COLOR="#435e98" CREATED="1772478866834" ID="ID_734568081" MODIFIED="1772580766202" TEXT="play-facade"/>
@@ -115136,7 +115133,7 @@ StM_bind(Builder&lt;R1&gt; b1, Extension&lt;R1,R2&gt; extension)
 </node>
 </node>
 </node>
-<node COLOR="#338800" CREATED="1772478107573" ID="ID_1357120432" MODIFIED="1772586311743" TEXT="Quellcode verschieben">
+<node COLOR="#338800" CREATED="1772478107573" FOLDED="true" ID="ID_1357120432" MODIFIED="1772586311743" TEXT="Quellcode verschieben">
 <icon BUILTIN="button_ok"/>
 <node BACKGROUND_COLOR="#c8c0b6" COLOR="#435e98" CREATED="1772584502630" ID="ID_1373602101" MODIFIED="1772584531277" TEXT="&apos;appstate.hpp|cpp&apos; wird zu voyage.hpp|cpp"/>
 <node COLOR="#435e98" CREATED="1772583766047" ID="ID_176079965" MODIFIED="1772583842890" TEXT="die ausgew&#xe4;hlten Header in vessel/spine"/>
@@ -115169,7 +115166,8 @@ StM_bind(Builder&lt;R1&gt; b1, Extension&lt;R1,R2&gt; extension)
 <node CREATED="1772586215223" ID="ID_1431676379" MODIFIED="1772586251267" TEXT="die Tests selber includieren einander nicht und k&#xf6;nnten in beliebigen Verzeichnissen liegen">
 <icon BUILTIN="idea"/>
 </node>
-<node BACKGROUND_COLOR="#d2beaf" COLOR="#5c4d6e" CREATED="1772586254019" ID="ID_1101747989" MODIFIED="1772586272421" TEXT="Idee: man k&#xf6;nnte eine separate Sektion f&#xfc;r die Test-Hilfsmittel schaffen">
+<node BACKGROUND_COLOR="#d2beaf" COLOR="#5c4d6e" CREATED="1772586254019" ID="ID_1101747989" MODIFIED="1772750921925" TEXT="Idee: man k&#xf6;nnte eine separate Sektion f&#xfc;r die Test-Hilfsmittel schaffen">
+<arrowlink COLOR="#733bc5" DESTINATION="ID_1130050398" ENDARROW="Default" ENDINCLINATION="30;-51;" ID="Arrow_ID_580685301" STARTARROW="None" STARTINCLINATION="-262;10;"/>
 <icon BUILTIN="hourglass"/>
 </node>
 </node>
@@ -115178,6 +115176,125 @@ StM_bind(Builder&lt;R1&gt; b1, Extension&lt;R1,R2&gt; extension)
 </node>
 </node>
 </node>
+<node CREATED="1772734875124" ID="ID_876509086" MODIFIED="1772734883385" TEXT="Test-Support-Komponenten">
+<node CREATED="1772746030333" ID="ID_1311869069" MODIFIED="1772746035156" TEXT="Anforderungen">
+<node CREATED="1772746049047" ID="ID_1822802235" MODIFIED="1772746065274" TEXT="aus der Application-Core heraushalten"/>
+<node CREATED="1772746077541" ID="ID_647564690" MODIFIED="1772746253257" TEXT="haben oft eine statische &#xbb;runtime&#xab;">
+<richcontent TYPE="NOTE"><html>
+  <head/>
+  <body>
+    <p>
+      Hier besteht eine gewisse Tendenz zur Systembildung; dieser sollte aber nicht stattgegeben werden, denn Lumiera ist keine Plattform &#8212; was impliziert da&#223; alle essentiellen, system-artigen Strukturen in die Applikation geh&#246;ren
+    </p>
+  </body>
+</html></richcontent>
+</node>
+<node CREATED="1772750693985" ID="ID_1754292501" MODIFIED="1772750709101" TEXT="&#xbb;Layered Linkage&#xab; beachten"/>
+<node CREATED="1772750782919" ID="ID_880221294" MODIFIED="1772750800656" TEXT="Include-Path passend zum Namespace"/>
+<node CREATED="1772750802636" ID="ID_1096862657" MODIFIED="1772750829353" TEXT="w&#xfc;nschenswert: stets in einem sub-Namespace test"/>
+</node>
+<node CREATED="1772750954208" ID="ID_1247182351" MODIFIED="1772750958745" TEXT="L&#xf6;sungsans&#xe4;tze">
+<node CREATED="1772734920128" ID="ID_1130050398" MODIFIED="1772751079519" TEXT="Separate Sektion">
+<linktarget COLOR="#733bc5" DESTINATION="ID_1130050398" ENDARROW="Default" ENDINCLINATION="30;-51;" ID="Arrow_ID_580685301" SOURCE="ID_1101747989" STARTARROW="None" STARTINCLINATION="-262;10;"/>
+<node COLOR="#5b280f" CREATED="1772751012088" ID="ID_484445328" MODIFIED="1772751088539" TEXT="ist nicht so einfach realisierbar">
+<icon BUILTIN="stop-sign"/>
+</node>
+<node CREATED="1772751020899" ID="ID_1920052635" MODIFIED="1772751042987" TEXT="dann m&#xfc;&#xdf;te es zumindest f&#xfc;r Vault eine separate L&#xf6;sung geben"/>
+<node CREATED="1772751103418" ID="ID_346407074" MODIFIED="1772751122957" TEXT="dies w&#xe4;re dann eine dedizierte Komponente, auf die die Vault-Tests explizit gelinkt sind"/>
+<node CREATED="1772751175583" ID="ID_872754641" MODIFIED="1772751203434" TEXT="das schlie&#xdf;t Test-Implementierungen f&#xfc;r Komponenten aus h&#xf6;hren Layern aus"/>
+<node CREATED="1772751219205" ID="ID_1591035437" MODIFIED="1772751225560" TEXT="damit w&#xfc;rde diese L&#xf6;sung....">
+<node CREATED="1772751226747" ID="ID_1025898359" MODIFIED="1772751385577" TEXT="alle Tests so lassen wie sie sind">
+<icon BUILTIN="ksmiletris"/>
+</node>
+<node CREATED="1772751236431" ID="ID_1155383842" MODIFIED="1772751404483" TEXT="eine neue Test-Support-Library einf&#xfc;hren">
+<icon BUILTIN="idea"/>
+</node>
+<node CREATED="1772751302102" ID="ID_672895906" MODIFIED="1772751394250" TEXT="diese w&#xfc;rde auch den Test-Runner / die Suite umfassen">
+<icon BUILTIN="ksmiletris"/>
+</node>
+<node CREATED="1772751347723" ID="ID_1327301155" MODIFIED="1772751377834" TEXT="trotzdem g&#xe4;be es auch noch dedizierte Test-Komponenten in Steam und Stage">
+<icon BUILTIN="messagebox_warning"/>
+</node>
+<node CREATED="1772752175087" ID="ID_1554413064" MODIFIED="1772752188584" TEXT="im Besonderen f&#xfc;r Stage bleibt das alte Problem ungel&#xf6;st">
+<icon BUILTIN="broken-line"/>
+</node>
+</node>
+</node>
+<node CREATED="1772751445934" ID="ID_1104603650" MODIFIED="1772751466055" TEXT="lediglich f&#xfc;r Vault eine Spezialbehandlung">
+<node CREATED="1772751472565" ID="ID_602088488" MODIFIED="1772751691948" TEXT="entweder indem man eine hart-gecodete Variante im SConscript einf&#xfc;hrt">
+<icon BUILTIN="smiley-angry"/>
+</node>
+<node CREATED="1772751492688" ID="ID_49085207" MODIFIED="1772751698309" TEXT="oder einen neuen Container-Folder, in dem &#xbb;vault&#xab; residiert">
+<icon BUILTIN="smily_bad"/>
+</node>
+<node COLOR="#5b280f" CREATED="1772751653731" ID="ID_1435980519" MODIFIED="1772751709179" TEXT="das gleiche Problem besteht aber auch f&#xfc;r &#xbb;stage&#xab;">
+<icon BUILTIN="closed"/>
+<node BACKGROUND_COLOR="#e0ceaa" COLOR="#bf0913" CREATED="1772751718454" HGAP="30" ID="ID_962252938" MODIFIED="1772751748748" TEXT="&#x27f9; das ist also gar keine L&#xf6;sung" VSHIFT="6">
+<font NAME="SansSerif" SIZE="9"/>
+</node>
+</node>
+</node>
+<node CREATED="1772751795632" ID="ID_561199561" MODIFIED="1772751803921" TEXT="&quot;test&quot;-Subfolder f&#xfc;r Vault und Stage">
+<node CREATED="1772751806842" ID="ID_545037302" MODIFIED="1772751817584" TEXT="sonst bleibt alles beim Status-quo">
+<icon BUILTIN="ksmiletris"/>
+</node>
+<node CREATED="1772751820548" ID="ID_988474156" MODIFIED="1772752047852" TEXT="Test-Hilfsmittel wandern in top-Level Namespace test::">
+<icon BUILTIN="smiley-neutral"/>
+</node>
+<node CREATED="1772751892683" ID="ID_1975715926" MODIFIED="1772752070139" TEXT="Test-Hilfsmittel werden mit &quot;test/&quot;-Pfr&#xe4;fix includiert">
+<icon BUILTIN="smiley-angry"/>
+</node>
+<node CREATED="1772751908684" ID="ID_561455613" MODIFIED="1772752089589" TEXT="man k&#xf6;nnte dieses Schema auch f&#xfc;r Steam etablieren">
+<icon BUILTIN="idea"/>
+</node>
+<node CREATED="1772752004092" ID="ID_385348264" MODIFIED="1772752013613" TEXT="Test-Runner bleibt in der Library"/>
+<node CREATED="1772751984927" ID="ID_1490429454" MODIFIED="1772751992642" TEXT="Linkage ist gem&#xe4;&#xdf; Layer"/>
+</node>
+<node CREATED="1772752213285" ID="ID_119992226" MODIFIED="1772758923648" TEXT="Test-Folder-Hierarchie umbauen">
+<icon BUILTIN="forward"/>
+<node CREATED="1772752222480" ID="ID_1909429773" MODIFIED="1772752259275" TEXT="in das SConscript kommt nun fest &lt;Projekt&gt;/test als Include">
+<node CREATED="1772758759407" ID="ID_1272067307" MODIFIED="1772758773603" TEXT="k&#xf6;nnte schwierig zu realisieren sein"/>
+<node CREATED="1772758774765" ID="ID_1624766230" LINK="https://stackoverflow.com/q/9806573/444796" MODIFIED="1772758793881" TEXT="L&#xf6;sung aus Stackoverflow"/>
+</node>
+<node CREATED="1772752266378" ID="ID_714310366" MODIFIED="1772752322365" TEXT="jeder Subfolder wird eine eigene Library und damit isoliert">
+<node CREATED="1772757152527" ID="ID_1027840867" MODIFIED="1772757163253" TEXT="&quot;core&quot; f&#xe4;llt weg"/>
+<node CREATED="1772757164308" ID="ID_1257306485" MODIFIED="1772757186074" TEXT="stattdessen steam + vessel"/>
+<node CREATED="1772757187529" ID="ID_842215360" MODIFIED="1772757194316" TEXT="&quot;library&quot; wird zu &quot;lib&quot;"/>
+</node>
+<node CREATED="1772757230370" ID="ID_770966486" MODIFIED="1772759001179" TEXT="sonst kann alles bleiben wie es ist">
+<icon BUILTIN="ksmiletris"/>
+</node>
+<node CREATED="1772752342869" ID="ID_1001543443" MODIFIED="1772758997681" TEXT="universelle Test-Komponenten m&#xfc;ssen in die Library">
+<icon BUILTIN="button_cancel"/>
+</node>
+<node CREATED="1772752406382" ID="ID_1284509593" MODIFIED="1772758994194" TEXT="alternativ: separate Test-Komponente">
+<icon BUILTIN="forward"/>
+<node CREATED="1772752442408" ID="ID_106774014" MODIFIED="1772752455213" TEXT="liegt neben oder &#xfc;ber &#xbb;Vessel&#xab;"/>
+<node CREATED="1772756612218" ID="ID_1748402106" MODIFIED="1772756624757" TEXT="eigener top-Namespace test::"/>
+<node CREATED="1772756648816" ID="ID_1312861966" MODIFIED="1772756658066" TEXT="wird allen Test-Komponenten zugelinkt"/>
+</node>
+</node>
+</node>
+<node BACKGROUND_COLOR="#ccb59b" COLOR="#6e2a38" CREATED="1772758927320" ID="ID_1030178738" MODIFIED="1772758932789" TEXT="Beschlu&#xdf;">
+<font ITALIC="true" NAME="SansSerif" SIZE="14"/>
+<icon BUILTIN="yes"/>
+<node BACKGROUND_COLOR="#e0d5a7" COLOR="#435e98" CREATED="1772758933963" ID="ID_1303869681" MODIFIED="1772842837273" TEXT="die zuletzt aufgef&#xfc;hrte L&#xf6;sung ist klar &#xfc;berlegen">
+<icon BUILTIN="yes"/>
+</node>
+<node COLOR="#435e98" CREATED="1772758948030" ID="ID_244079057" MODIFIED="1772842856603" TEXT="die separate Komponente sollte sofort eingef&#xfc;hrt werden">
+<node CREATED="1772823385501" ID="ID_1536853190" MODIFIED="1772824850661" TEXT="Quellverzeichnis: src/test"/>
+<node CREATED="1772823348665" ID="ID_81280209" MODIFIED="1772823364031" TEXT="SCons - Exportvariable &apos;test_support&apos;"/>
+<node CREATED="1772823365541" ID="ID_1605366511" MODIFIED="1772823380198" TEXT="erzeugt libtestsupport.so (nicht installiert)"/>
+<node BACKGROUND_COLOR="#e0ceaa" COLOR="#a21384" CREATED="1772842862040" ID="ID_822025236" MODIFIED="1772842887781" TEXT="(puh ... war sehr aufwendig)">
+<font NAME="SansSerif" SIZE="11"/>
+</node>
+</node>
+<node CREATED="1772759056034" ID="ID_261195132" MODIFIED="1772759065317" TEXT="die Reorganisation der Test-Folder">
+<node CREATED="1772759066479" ID="ID_1069566157" MODIFIED="1772759072426" TEXT="ist eigentlich nicht schlimm"/>
+<node CREATED="1772759073470" ID="ID_1564401966" MODIFIED="1772759081236" TEXT="k&#xf6;nnte aber auf sp&#xe4;ter verschoben werden"/>
+</node>
+</node>
+</node>
 <node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1772478162244" ID="ID_1203250191" MODIFIED="1772478221803" TEXT="Komponenten in Vault verschieben">
 <icon BUILTIN="flag-yellow"/>
 <node CREATED="1772478171837" ID="ID_1324850294" MODIFIED="1772478177785" TEXT="BufferProvider"/>