diff --git a/tests/pytest/fulltest.sh b/tests/pytest/fulltest.sh
index cff6db202849c16e70476c887ce5d2512a3b4071..249245c76242edb93161510ba761d684fa97259b 100755
--- a/tests/pytest/fulltest.sh
+++ b/tests/pytest/fulltest.sh
@@ -9,6 +9,7 @@ python3 ./test.py $1 -f insert/smallint.py
 python3 ./test.py $1 -f insert/tinyint.py
 python3 ./test.py $1 -f insert/date.py
 python3 ./test.py $1 -f insert/binary.py
+python3 ./test.py $1 -f insert/nchar.py
 
 python3 ./test.py $1 -f table/column_name.py
 python3 ./test.py $1 -f table/column_num.py
diff --git a/tests/pytest/insert/nchar.py b/tests/pytest/insert/nchar.py
new file mode 100644
index 0000000000000000000000000000000000000000..d61a44844dae7997721f5cae9e4e38d1f217e05a
--- /dev/null
+++ b/tests/pytest/insert/nchar.py
@@ -0,0 +1,44 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        tdSql.prepare()
+
+        tdSql.execute('create table tb (ts timestamp, col nchar(10))')
+        tdSql.execute("insert into tb values (now, 'taosdata')")
+        tdSql.query("select * from tb")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 1, 'taosdata')
+        tdSql.execute("insert into tb values (now, '涛思数据')")
+        tdSql.query("select * from tb")
+        tdSql.checkRows(2)
+        tdSql.checkData(1, 1, '涛思数据')
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/smoketest.sh b/tests/pytest/smoketest.sh
index af597fb6c53123da7eb514967a93cf4d7d162642..37af5f3f42a26cd6322571c399e5573c205f2540 100755
--- a/tests/pytest/smoketest.sh
+++ b/tests/pytest/smoketest.sh
@@ -23,6 +23,15 @@ sleep 1
 python3 ./test.py $1 -f insert/tinyint.py
 python3 ./test.py -s $1
 sleep 1
+python3 ./test.py $1 -f insert/binary.py
+python3 ./test.py -s $1
+sleep 1
+python3 ./test.py $1 -f insert/date.py
+python3 ./test.py -s $1
+sleep 1
+python3 ./test.py $1 -f insert/nchar.py
+python3 ./test.py -s $1
+sleep 1
 
 python3 ./test.py $1 -f table/column_name.py
 python3 ./test.py -s $1
@@ -34,33 +43,130 @@ python3 ./test.py $1 -f table/db_table.py
 python3 ./test.py -s $1
 sleep 1
 
-python3 ./test.py $1 -f import_merge/importDataLastTO.py 
+python3 ./test.py $1 -f import_merge/importDataLastTO.py
+python3 ./test.py -s $1
+sleep 1
+python3 ./test.py $1 -f import_merge/importDataLastT.py
+python3 ./test.py -s $1
+sleep 1
+python3 ./test.py $1 -f import_merge/importDataTO.py
+python3 ./test.py -s $1
+sleep 1
+python3 ./test.py $1 -f import_merge/importDataT.py
+python3 ./test.py -s $1
+sleep 1
+python3 ./test.py $1 -f import_merge/importHeadOverlap.py
+python3 ./test.py -s $1
+sleep 1
+python3 ./test.py $1 -f import_merge/importHeadPartOverlap.py
+python3 ./test.py -s $1
+sleep 1
+python3 ./test.py $1 -f import_merge/importHORestart.py
+python3 ./test.py -s $1
+sleep 1
+python3 ./test.py $1 -f import_merge/importHPORestart.py
+python3 ./test.py -s $1
+sleep 1
+python3 ./test.py $1 -f import_merge/importHRestart.py
+python3 ./test.py -s $1
+sleep 1
+python3 ./test.py $1 -f import_merge/importLastSub.py
+python3 ./test.py -s $1
+sleep 1
+
+python3 ./test.py $1 -f import_merge/importBlock1HO.py
+python3 ./test.py -s $1
+sleep 1
+python3 ./test.py $1 -f import_merge/importBlock1HPO.py
+python3 ./test.py -s $1
+sleep 1
+python3 ./test.py $1 -f import_merge/importBlock1H.py
+python3 ./test.py -s $1
+sleep 1
+python3 ./test.py $1 -f import_merge/importBlock1S.py
+python3 ./test.py -s $1
+sleep 1
+python3 ./test.py $1 -f import_merge/importBlock1Sub.py
+python3 ./test.py -s $1
+sleep 1
+python3 ./test.py $1 -f import_merge/importBlock1TO.py
+python3 ./test.py -s $1
+sleep 1
+python3 ./test.py $1 -f import_merge/importBlock1TPO.py
+python3 ./test.py -s $1
+sleep 1
+python3 ./test.py $1 -f import_merge/importBlock1T.py
+python3 ./test.py -s $1
+sleep 1
+python3 ./test.py $1 -f import_merge/importBlock2HO.py
+python3 ./test.py -s $1
+sleep 1
+python3 ./test.py $1 -f import_merge/importBlock2HPO.py
+python3 ./test.py -s $1
+sleep 1
+python3 ./test.py $1 -f import_merge/importBlock2H.py
+python3 ./test.py -s $1
+sleep 1
+python3 ./test.py $1 -f import_merge/importBlock2S.py
+python3 ./test.py -s $1
+sleep 1
+python3 ./test.py $1 -f import_merge/importBlock2Sub.py
+python3 ./test.py -s $1
+sleep 1
+python3 ./test.py $1 -f import_merge/importBlock2TO.py
+python3 ./test.py -s $1
+sleep 1
+python3 ./test.py $1 -f import_merge/importBlock2TPO.py
+python3 ./test.py -s $1
+sleep 1
+python3 ./test.py $1 -f import_merge/importBlock2T.py
+python3 ./test.py -s $1
+sleep 1
+python3 ./test.py $1 -f import_merge/importBlockbetween.py
+python3 ./test.py -s $1
+sleep 1
+python3 ./test.py $1 -f import_merge/importCacheFileSub.py
+python3 ./test.py -s $1
+sleep 1
+python3 ./test.py $1 -f import_merge/importCacheFileTO.py
+python3 ./test.py -s $1
+sleep 1
+python3 ./test.py $1 -f import_merge/importCacheFileT.py
+python3 ./test.py -s $1
+sleep 1
+python3 ./test.py $1 -f import_merge/importDataLastSub.py
+python3 ./test.py -s $1
+sleep 1
+python3 ./test.py $1 -f import_merge/importHead.py
+python3 ./test.py -s $1
+sleep 1
+python3 ./test.py $1 -f import_merge/importLastTO.py
 python3 ./test.py -s $1
 sleep 1
-python3 ./test.py $1 -f import_merge/importDataLastT.py 
+python3 ./test.py $1 -f import_merge/importLastT.py
 python3 ./test.py -s $1
 sleep 1
-python3 ./test.py $1 -f import_merge/importDataTO.py 
+python3 ./test.py $1 -f import_merge/importSpan.py
 python3 ./test.py -s $1
 sleep 1
-python3 ./test.py $1 -f import_merge/importDataT.py 
+python3 ./test.py $1 -f import_merge/importSRestart.py
 python3 ./test.py -s $1
 sleep 1
-python3 ./test.py $1 -f import_merge/importHeadOverlap.py 
+python3 ./test.py $1 -f import_merge/importSubRestart.py
 python3 ./test.py -s $1
 sleep 1
-python3 ./test.py $1 -f import_merge/importHeadPartOverlap.py 
+python3 ./test.py $1 -f import_merge/importTailOverlap.py
 python3 ./test.py -s $1
 sleep 1
-python3 ./test.py $1 -f import_merge/importHORestart.py 
+python3 ./test.py $1 -f import_merge/importTail.py
 python3 ./test.py -s $1
 sleep 1
-python3 ./test.py $1 -f import_merge/importHPORestart.py 
+python3 ./test.py $1 -f import_merge/importTORestart.py
 python3 ./test.py -s $1
 sleep 1
-python3 ./test.py $1 -f import_merge/importHRestart.py 
+python3 ./test.py $1 -f import_merge/importTPORestart.py
 python3 ./test.py -s $1
 sleep 1
-python3 ./test.py $1 -f import_merge/importLastSub.py 
+python3 ./test.py $1 -f import_merge/importTRestart.py
 python3 ./test.py -s $1
 sleep 1