diff --git a/tests/script/tsim/stream/streamInterpNext0.sim b/tests/script/tsim/stream/streamInterpNext0.sim
index da76354e07..605144378e 100644
--- a/tests/script/tsim/stream/streamInterpNext0.sim
+++ b/tests/script/tsim/stream/streamInterpNext0.sim
@@ -306,11 +306,11 @@ sql create stream streams3 trigger at_once IGNORE EXPIRED 0 IGNORE UPDATE 0 into
 run tsim/stream/checkTaskStatus.sim
 
 
-sql insert into t1 values(1648791212001,0,0,0,0.0) (1648791217001,4,4,4,4.1);
+sql insert into t1 values(1648791210001,0,0,0,0.0) (1648791217001,4,4,4,4.1);
 
 
-print sql select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 range(1648791212000, 1648791217000) every(1s) fill(next);
-sql select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 range(1648791212000, 1648791217000) every(1s) fill(next);
+print sql select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 range(1648791211000, 1648791217000) every(1s) fill(next);
+sql select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 range(1648791211000, 1648791217000) every(1s) fill(next);
 
 print $data00 $data01 $data02 $data03 $data04
 print $data10 $data11 $data12 $data13 $data14
@@ -318,6 +318,7 @@ print $data20 $data21 $data22 $data23 $data24
 print $data30 $data31 $data32 $data33 $data34
 print $data40 $data41 $data42 $data43 $data44
 print $data50 $data51 $data52 $data53 $data54
+print $data60 $data61 $data62 $data63 $data64
 
 $loop_count = 0
 loop5:
@@ -338,18 +339,19 @@ print $data20 $data21 $data22 $data23 $data24
 print $data30 $data31 $data32 $data33 $data34
 print $data40 $data41 $data42 $data43 $data44
 print $data50 $data51 $data52 $data53 $data54
+print $data60 $data61 $data62 $data63 $data64
 
 
 # row 0
-if $rows != 5 then
+if $rows != 7 then
   print ======rows=$rows
   goto loop5
 endi
 
 sql insert into t1 values(1648791213001,1,1,1,1.0) (1648791213009,2,2,2,1.1) (1648791215001,5,5,5,5.1)
 
-print sql select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 range(1648791212000, 1648791217001) every(1s) fill(next);
-sql select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 range(1648791212000, 1648791217001) every(1s) fill(next);
+print sql select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 range(1648791211000, 1648791217001) every(1s) fill(next);
+sql select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 range(1648791211000, 1648791217001) every(1s) fill(next);
 
 print $data00 $data01 $data02 $data03 $data04
 print $data10 $data11 $data12 $data13 $data14
@@ -357,6 +359,7 @@ print $data20 $data21 $data22 $data23 $data24
 print $data30 $data31 $data32 $data33 $data34
 print $data40 $data41 $data42 $data43 $data44
 print $data50 $data51 $data52 $data53 $data54
+print $data60 $data61 $data62 $data63 $data64
 
 $loop_count = 0
 loop6:
@@ -377,10 +380,11 @@ print $data20 $data21 $data22 $data23 $data24
 print $data30 $data31 $data32 $data33 $data34
 print $data40 $data41 $data42 $data43 $data44
 print $data50 $data51 $data52 $data53 $data54
+print $data60 $data61 $data62 $data63 $data64
 
 
 # row 0
-if $rows != 5 then
+if $rows != 7 then
   print ======rows=$rows
   goto loop6
 endi
@@ -391,25 +395,35 @@ if $data01 != 1 then
   goto loop6
 endi
 
-if $data11 != 5 then
+if $data11 != 1 then
   print ======data11=$data11
   goto loop6
 endi
 
-if $data21 != 5 then
+if $data21 != 1 then
   print ======data21=$data21
   goto loop6
 endi
 
-if $data31 != 4 then
+if $data31 != 5 then
   print ======data31=$data31
   goto loop6
 endi
 
-if $data41 != 4 then
+if $data41 != 5 then
   print ======data41=$data41
   goto loop6
 endi
 
+if $data51 != 4 then
+  print ======data51=$data51
+  goto loop6
+endi
+
+if $data61 != 4 then
+  print ======data61=$data61
+  goto loop6
+endi
+
 print  end
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/tsim/stream/streamInterpPrev0.sim b/tests/script/tsim/stream/streamInterpPrev0.sim
index 9ff18d4a71..a326fd87f1 100644
--- a/tests/script/tsim/stream/streamInterpPrev0.sim
+++ b/tests/script/tsim/stream/streamInterpPrev0.sim
@@ -304,11 +304,11 @@ sql create stream streams3 trigger at_once IGNORE EXPIRED 0 IGNORE UPDATE 0 into
 run tsim/stream/checkTaskStatus.sim
 
 
-sql insert into t1 values(1648791212001,0,0,0,0.0) (1648791217001,4,4,4,4.1);
+sql insert into t1 values(1648791210001,0,0,0,0.0) (1648791217001,4,4,4,4.1);
 
 
-print sql select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 range(1648791212000, 1648791217000) every(1s) fill(prev);
-sql select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 range(1648791212000, 1648791217000) every(1s) fill(prev);
+print sql select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 range(1648791210000, 1648791217000) every(1s) fill(prev);
+sql select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 range(1648791210000, 1648791217000) every(1s) fill(prev);
 
 print $data00 $data01 $data02 $data03 $data04
 print $data10 $data11 $data12 $data13 $data14
@@ -316,6 +316,7 @@ print $data20 $data21 $data22 $data23 $data24
 print $data30 $data31 $data32 $data33 $data34
 print $data40 $data41 $data42 $data43 $data44
 print $data50 $data51 $data52 $data53 $data54
+print $data60 $data61 $data62 $data63 $data64
 
 $loop_count = 0
 loop5:
@@ -336,18 +337,19 @@ print $data20 $data21 $data22 $data23 $data24
 print $data30 $data31 $data32 $data33 $data34
 print $data40 $data41 $data42 $data43 $data44
 print $data50 $data51 $data52 $data53 $data54
+print $data60 $data61 $data62 $data63 $data64
 
 
 # row 0
-if $rows != 5 then
+if $rows != 7 then
   print ======rows=$rows
   goto loop5
 endi
 
 sql insert into t1 values(1648791213001,1,1,1,1.0) (1648791213009,2,2,2,1.1) (1648791215001,5,5,5,5.1)
 
-print sql select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 range(1648791212000, 1648791217001) every(1s) fill(prev);
-sql select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 range(1648791212000, 1648791217001) every(1s) fill(prev);
+print sql select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 range(1648791210000, 1648791217001) every(1s) fill(prev);
+sql select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 range(1648791210000, 1648791217001) every(1s) fill(prev);
 
 print $data00 $data01 $data02 $data03 $data04
 print $data10 $data11 $data12 $data13 $data14
@@ -355,6 +357,7 @@ print $data20 $data21 $data22 $data23 $data24
 print $data30 $data31 $data32 $data33 $data34
 print $data40 $data41 $data42 $data43 $data44
 print $data50 $data51 $data52 $data53 $data54
+print $data60 $data61 $data62 $data63 $data64
 
 $loop_count = 0
 loop6:
@@ -375,10 +378,11 @@ print $data20 $data21 $data22 $data23 $data24
 print $data30 $data31 $data32 $data33 $data34
 print $data40 $data41 $data42 $data43 $data44
 print $data50 $data51 $data52 $data53 $data54
+print $data60 $data61 $data62 $data63 $data64
 
 
 # row 0
-if $rows != 5 then
+if $rows != 7 then
   print ======rows=$rows
   goto loop6
 endi
@@ -389,24 +393,34 @@ if $data01 != 0 then
   goto loop6
 endi
 
-if $data11 != 2 then
+if $data11 != 0 then
   print ======data11=$data11
   goto loop6
 endi
 
-if $data21 != 2 then
+if $data21 != 0 then
   print ======data21=$data21
   goto loop6
 endi
 
-if $data31 != 5 then
+if $data31 != 2 then
   print ======data31=$data31
   goto loop6
 endi
 
-if $data41 != 5 then
+if $data41 != 2 then
   print ======data41=$data41
   goto loop6
 endi
 
+if $data51 != 5 then
+  print ======data51=$data51
+  goto loop6
+endi
+
+if $data61 != 5 then
+  print ======data61=$data61
+  goto loop6
+endi
+
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/tsim/stream/streamInterpValue0.sim b/tests/script/tsim/stream/streamInterpValue0.sim
index 1d79d2ec1c..bce7f0ece6 100644
--- a/tests/script/tsim/stream/streamInterpValue0.sim
+++ b/tests/script/tsim/stream/streamInterpValue0.sim
@@ -524,11 +524,11 @@ sql create stream streams3_2 trigger at_once IGNORE EXPIRED 0 IGNORE UPDATE 0 in
 run tsim/stream/checkTaskStatus.sim
 
 
-sql insert into t1 values(1648791212001,0,0,0,0.0) (1648791217001,4,4,4,4.1);
+sql insert into t1 values(1648791210001,0,0,0,0.0) (1648791217001,4,4,4,4.1);
 
 
-print sql select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 range(1648791212000, 1648791217000) every(1s) fill(NULL);
-sql select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 range(1648791212000, 1648791217000) every(1s) fill(NULL);
+print sql select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 range(1648791211000, 1648791217000) every(1s) fill(NULL);
+sql select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 range(1648791211000, 1648791217000) every(1s) fill(NULL);
 
 print $data00 $data01 $data02 $data03 $data04
 print $data10 $data11 $data12 $data13 $data14
@@ -559,13 +559,13 @@ print $data50 $data51 $data52 $data53 $data54
 
 
 # row 0
-if $rows != 5 then
+if $rows != 7 then
   print ======rows=$rows
   goto loop5
 endi
 
-print sql select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 range(1648791212000, 1648791217000) every(1s) fill(value, 10,20,30,40);
-sql select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 range(1648791212000, 1648791217000) every(1s) fill(value, 10,20,30,40);
+print sql select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 range(1648791211000, 1648791217000) every(1s) fill(value, 10,20,30,40);
+sql select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 range(1648791211000, 1648791217000) every(1s) fill(value, 10,20,30,40);
 
 print $data00 $data01 $data02 $data03 $data04
 print $data10 $data11 $data12 $data13 $data14
@@ -596,15 +596,15 @@ print $data50 $data51 $data52 $data53 $data54
 
 
 # row 0
-if $rows != 5 then
+if $rows != 7 then
   print ======rows=$rows
   goto loop5_1
 endi
 
 sql insert into t1 values(1648791213001,1,1,1,1.0) (1648791213009,2,2,2,1.1) (1648791215001,5,5,5,5.1)
 
-print sql select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 range(1648791212000, 1648791217001) every(1s) fill(NULL);
-sql select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 range(1648791212000, 1648791217001) every(1s) fill(NULL);
+print sql select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 range(1648791211000, 1648791217001) every(1s) fill(NULL);
+sql select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 range(1648791211000, 1648791217001) every(1s) fill(NULL);
 
 print $data00 $data01 $data02 $data03 $data04
 print $data10 $data11 $data12 $data13 $data14
@@ -635,7 +635,7 @@ print $data50 $data51 $data52 $data53 $data54
 
 
 # row 0
-if $rows != 5 then
+if $rows != 7 then
   print ======rows=$rows
   goto loop6
 endi
@@ -666,9 +666,19 @@ if $data41 != NULL then
   goto loop6
 endi
 
+if $data51 != NULL then
+  print ======data51=$data51
+  goto loop6
+endi
 
-print sql select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 range(1648791212000, 1648791217001) every(1s) fill(value, 10,20,30,40);
-sql select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 range(1648791212000, 1648791217001) every(1s) fill(value, 10,20,30,40);
+if $data61 != NULL then
+  print ======data61=$data61
+  goto loop6
+endi
+
+
+print sql select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 range(1648791211000, 1648791217001) every(1s) fill(value, 10,20,30,40);
+sql select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 range(1648791211000, 1648791217001) every(1s) fill(value, 10,20,30,40);
 
 print $data00 $data01 $data02 $data03 $data04
 print $data10 $data11 $data12 $data13 $data14
@@ -699,7 +709,7 @@ print $data50 $data51 $data52 $data53 $data54
 
 
 # row 0
-if $rows != 5 then
+if $rows != 7 then
   print ======rows=$rows
   goto loop6_1
 endi
@@ -730,5 +740,15 @@ if $data41 != 10 then
   goto loop6_1
 endi
 
+if $data51 != 10 then
+  print ======data51=$data51
+  goto loop6_1
+endi
+
+if $data61 != 10 then
+  print ======data61=$data61
+  goto loop6_1
+endi
+
 print end
 system sh/exec.sh -n dnode1 -s stop -x SIGINT