diff --git a/CollectionTest.cpp b/CollectionTest.cpp
index 41e36e6..ab509e4 100644
--- a/CollectionTest.cpp
+++ b/CollectionTest.cpp
@@ -15,6 +15,7 @@ void out(const Collection &c)
 {
     MyEnumerator me(&c);
 
+#if 0
     const TEST_TYPE *str=me.begin();
     const size_t count=me.size();
 
@@ -23,16 +24,32 @@ void out(const Collection &c)
         std::cout<<*str<<' ';
         ++str;
     }
+#else
+    for(const TEST_TYPE &value:me)
+        std::cout<<value<<" ";
+#endif//
 
-//    for(const TEST_TYPE &value:me)
-//        std::cout<<value<<" ";
+    std::cout<<std::endl;
+}
+
+void out3(const Collection &c)
+{
+    const char *str=(char *)c.begin();
+    const size_t count=c.GetCount();
+
+    for(size_t i=0;i<count;i++)
+    {
+        std::cout<<str[0]<<str[1]<<str[2]<<' ';
+        str+=3;
+    }
 
     std::cout<<std::endl;
 }
 
 void main(int,char **)
 {
-     {
+    std::cout<<"test one byte Collection."<<std::endl<<std::endl;
+    {
         Collection cu(UNIT_BYTES);
 
         for(TEST_TYPE i=0;i<10;i++)
@@ -43,15 +60,15 @@ void main(int,char **)
 
         cu.Insert(0,0);out(cu);
 
-        std::cout<<"indexOf(E) is "<<cu.indexOf('E')<<std::endl;
+        std::cout<<"indexOf(E) is "<<cu.indexOfValue('E')<<std::endl;
         
         std::cout<<"remove second data."<<std::endl;
         cu.RemoveAt(1);out(cu);
 
         std::cout<<"remove all 'A'"<<std::endl;
-        cu.Remove('A');out(cu);
+        cu.RemoveValue('A');out(cu);
          
-        std::cout<<"remove 3 data from third"<<std::endl;
+        std::cout<<"remove 3 items from third"<<std::endl;
         cu.RemoveAt(2,3);out(cu);
 
         {
@@ -68,10 +85,49 @@ void main(int,char **)
         std::cout<<"exchanged two elements, they at 0 and 2"<<std::endl;
         cu.Exchange(0,2);out(cu);
     }
-
+    
+    std::cout<<std::endl;
+    std::cout<<"test three bytes Collection."<<std::endl<<std::endl;
     {
-        //List<uint32> ul;
+        Collection cu3(3);
 
-        //ul.Add(1024);
+        for(TEST_TYPE i=0;i<10;i++)
+        {
+            char data[3];
+
+            data[0]='A'+i;
+            data[1]='a'+i;
+            data[2]='0'+i;
+
+            cu3.Add(data);
+            out3(cu3);
+        }
+
+        cu3.Insert(0,0);out3(cu3);
+
+        std::cout<<"indexOf(Ee4) is "<<cu3.indexOf("Ee4")<<std::endl;
+        
+        std::cout<<"remove second data."<<std::endl;
+        cu3.RemoveAt(1);out3(cu3);
+
+        std::cout<<"remove all 'Aa0'"<<std::endl;
+        cu3.Remove("Aa0");out3(cu3);
+         
+        std::cout<<"remove 3 items from third"<<std::endl;
+        cu3.RemoveAt(2,3);out3(cu3);
+
+        {
+            Collection del_cu(3);
+            CheckElementMemcmp cee(3);
+
+            del_cu.Add("Ii8");
+            del_cu.Add("Ff5");
+
+            std::cout<<"remove all 'Ii8' and 'Ff5'"<<std::endl;
+            cu3.RemoveCollection(del_cu,&cee);out3(cu3);
+        }
+
+        std::cout<<"exchanged two elements, they at 0 and 2"<<std::endl;
+        cu3.Exchange(0,2);out3(cu3);
     }
 }