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/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