diff --git a/src/test/java/com/alipay/oceanbase/hbase/secondary/OHTableSecondaryPartDeleteTest.java b/src/test/java/com/alipay/oceanbase/hbase/secondary/OHTableSecondaryPartDeleteTest.java
index af937fc9..81f41c0b 100644
--- a/src/test/java/com/alipay/oceanbase/hbase/secondary/OHTableSecondaryPartDeleteTest.java
+++ b/src/test/java/com/alipay/oceanbase/hbase/secondary/OHTableSecondaryPartDeleteTest.java
@@ -42,7 +42,7 @@ public class OHTableSecondaryPartDeleteTest {
     @BeforeClass
     public static void before() throws Exception {
         openDistributedExecute();
-        for (TableTemplateManager.TableType type : TableTemplateManager.TableType.values()) {
+        for (TableTemplateManager.TableType type : TableTemplateManager.NORMAL_TABLES) {
             createTables(type, tableNames, group2tableNames, true);
         }
     }
@@ -163,7 +163,7 @@ public static void testDeleteColumnImpl(String tableName) throws Exception {
             get.addColumn(toBytes(family), toBytes(column));
             get.setMaxVersions();
             Result result = hTable.get(get);
-            Assert(tableName, ()->Assert.assertEquals(2, result.size())); // ts1, ts2, ts3 is deleted
+            Assert(tableName, ()->Assert.assertEquals(1, result.size())); // ts1, ts2, ts3 is deleted
             Assert.assertEquals(Arrays.toString((value + ts4).getBytes()), Arrays.toString(result.getValue(family.getBytes(), column.getBytes())));
             for (Cell cell : result.rawCells()) {
                 Assert.assertTrue(cell.getTimestamp() != ts1);
diff --git a/src/test/java/com/alipay/oceanbase/hbase/secondary/OHTableSecondaryPartPutTest.java b/src/test/java/com/alipay/oceanbase/hbase/secondary/OHTableSecondaryPartPutTest.java
index 89c3bd7d..94a81316 100644
--- a/src/test/java/com/alipay/oceanbase/hbase/secondary/OHTableSecondaryPartPutTest.java
+++ b/src/test/java/com/alipay/oceanbase/hbase/secondary/OHTableSecondaryPartPutTest.java
@@ -42,10 +42,8 @@ public class OHTableSecondaryPartPutTest {
     @BeforeClass
     public static void before() throws Exception {
         openDistributedExecute();
-        for (TableTemplateManager.TableType type : TableTemplateManager.TableType.values()) {
-            if (!type.name().contains("TIME")) {
-                createTables(type, tableNames, group2tableNames, true);
-            }
+        for (TableTemplateManager.TableType type : TableTemplateManager.NORMAL_TABLES) {
+            createTables(type, tableNames, group2tableNames, true);
         }
     }
 
@@ -84,11 +82,10 @@ public static void testPutImpl(String tableName) throws Exception {
             Assert(tableName, ()->Assert.assertTrue(ObHTableTestUtil.secureCompare((column1 + value).getBytes(), r.getValue(family.getBytes(), column1.getBytes()))));
             Assert(tableName, ()->Assert.assertTrue(ObHTableTestUtil.secureCompare((column1 + value).getBytes(), r.getValue(family.getBytes(), column1.getBytes()))));
         }
-
         { // put exist key and get
             long timestamp = System.currentTimeMillis();
             Put put = new Put(toBytes(key));
-            put.add(family.getBytes(), column1.getBytes(), toBytes(column1 + value + timestamp));
+            put.add(family.getBytes(), column1.getBytes(), timestamp, toBytes(column1 + value + timestamp));
             hTable.put(put);
             
             Get get = new Get(toBytes(key));
@@ -112,7 +109,7 @@ public static void testPutImpl(String tableName) throws Exception {
             Assert(tableName, ()->Assert.assertEquals(timestamp, r.rawCells()[0].getTimestamp()));
             
             Put put1 = new Put(toBytes(key));
-            put1.add(family.getBytes(), column1.getBytes(), toBytes(column1 + value));
+            put1.add(family.getBytes(), column1.getBytes(), timestamp + 100, toBytes(column1 + value));
             hTable.put(put1);
             
             Result r2 = hTable.get(get);
@@ -236,6 +233,7 @@ public static void testMultiCFPutImpl(Map.Entry<String, List<String>> entry) thr
             }
             for (String tableName : entry.getValue()) {
                 String family = getColumnFamilyName(tableName);
+                // TODO: Get/Scan返回的结果Q 带了cf, 这里预期跑不过
                 Assert(entry.getValue(), () -> Assert.assertTrue(secureCompare((column1 + value).getBytes(), r.getValue(family.getBytes(), column1.getBytes()))));
                 Assert(entry.getValue(), () -> Assert.assertTrue(secureCompare((column2 + value).getBytes(), r.getValue(family.getBytes(), column2.getBytes()))));
             }
@@ -273,6 +271,7 @@ public static void testMltiCFPutBatchImpl(Map.Entry<String, List<String>> entry)
             }
             for (String tableName : entry.getValue()) {
                 String family = getColumnFamilyName(tableName);
+                // TODO: Get/Scan返回的结果Q 带了cf, 这里预期跑不过
                 Assert(entry.getValue(), () -> Assert.assertTrue(secureCompare((column1 + value + timestamp).getBytes(), result.getValue(family.getBytes(), column1.getBytes()))));
                 Assert(entry.getValue(), () -> Assert.assertTrue(secureCompare((column2 + value + timestamp).getBytes(), result.getValue(family.getBytes(), column2.getBytes()))));
             }