diff --git a/src/cwtest/cfg/main.cfg b/src/cwtest/cfg/main.cfg
index 3a32250..3c0e979 100644
--- a/src/cwtest/cfg/main.cfg
+++ b/src/cwtest/cfg/main.cfg
@@ -45,11 +45,26 @@
         object:{ basic:{}, to_json:{} },
         vop:{  test_0:{}  },
         time:{ test_0:{} },
+	textBuf: { test_0:{} },
+	audioBuf:{ test_0:{} }
+	mtx:{ test_0: {
+      	  m0: [ [0,3], [1,4], [2,5]  ],
+     	  m1: [ [0,1,2],[3,4,5] ],
+      
+          m2: [ [[0,1],[2,3]], [[4,5],[6,7]], [[8,9],[10,11]] ],
+      	  m3: [ 0,1,2 ],
+
+      	  m4: [ [10,13], [11,14], [12,15]  ],
+
+      	  y0: [ [5,14],[14,50] ],
+      	  y1: [ [9,12,15],[12,17,22],[15,22,29] ],
+    	} },
+
         flow:"flow_test.cfg",
       }
-    },
+    }},
 
-  }
+  
 
     variadicTpl: {},
 
@@ -58,6 +73,7 @@
     kbTest1: {},
     kbTest2: {},
     kbTest3: {},
+    
     spscBuf: {},
     spscQueueTmpl: {},
     
@@ -123,9 +139,9 @@
 	         fname: "/home/kevin/src/cwtest/src/cwtest/cfg/gutim_full/data1/beck2/record_5/midi.mid"
      },
 	      
-    textBuf: {},
-    audioBuf: {},
-    audioDev: {},
+    //textBuf: {},
+    //audioBuf: {},
+    //audioDev: {},
     audioDevAlsa: {},
     audioDevRpt: {}, // print a list of audio device
 
diff --git a/src/cwtest/main.cpp b/src/cwtest/main.cpp
index a8f400d..8092e7a 100644
--- a/src/cwtest/main.cpp
+++ b/src/cwtest/main.cpp
@@ -326,10 +326,7 @@ cw::rc_t spscBuf(              const cw::object_t* cfg, const cw::object_t* args
 cw::rc_t spscQueueTmpl(        const cw::object_t* cfg, const cw::object_t* args, int argc, const char* argv[] ) { return cw::testSpScQueueTmpl(); }
 cw::rc_t nbMpScQueue(          const cw::object_t* cfg, const cw::object_t* args, int argc, const char* argv[] ) { return cw::nbmpscq::test(args); }
 cw::rc_t serialPortSrvTest(    const cw::object_t* cfg, const cw::object_t* args, int argc, const char* argv[] ) { return cw::serialPortSrvTest(); }
-cw::rc_t textBufTest(          const cw::object_t* cfg, const cw::object_t* args, int argc, const char* argv[] ) { return cw::textBuf::test(); }
-cw::rc_t audioBufTest(         const cw::object_t* cfg, const cw::object_t* args, int argc, const char* argv[] ) { return cw::audio::buf::test(); }
 cw::rc_t audioDevFileTest(     const cw::object_t* cfg, const cw::object_t* args, int argc, const char* argv[] ) { return cw::audio::device::file::test(args); }
-cw::rc_t mtxTest(              const cw::object_t* cfg, const cw::object_t* args, int argc, const char* argv[] ) { return cw::mtx::test(args); }
 cw::rc_t b23TreeTest(          const cw::object_t* cfg, const cw::object_t* args, int argc, const char* argv[] ) { return cw::b23::test(args); }
 cw::rc_t midiFileTest(         const cw::object_t* cfg, const cw::object_t* args, int argc, const char* argv[] ) { return cw::midi::file::test(args); }
 cw::rc_t audioFileTest(        const cw::object_t* cfg, const cw::object_t* args, int argc, const char* argv[] ) { return cw::audiofile::test(args); }
@@ -691,8 +688,6 @@ int main( int argc, const char* argv[] )
    { "midiDeviceReport", midiDeviceReport },
    { "midiDevice", midiDeviceTest },
    { "midiFileDev", midiFileDevTest },
-   { "textBuf", textBufTest },
-   { "audioBuf", audioBufTest },
    { "audioDevFileTest", audioDevFileTest },
    { "audioDevTest",audioDevTest },
    { "audioDevTone", audioDevTestTone },
@@ -718,7 +713,6 @@ int main( int argc, const char* argv[] )
    { "dataset_rdr", datasetRdrTest },
    { "dataset_adapter", datasetAdapterTest },
    { "svg",   svgTest },
-   { "mtx",   mtxTest },
    { "b23Tree",   b23TreeTest },
    { "midifile", midiFileTest },
    { "audiofile", audioFileTest },