diff --git a/test/JDBC/expected/concat_ws-vu-prepare.out b/test/JDBC/expected/concat_ws-vu-prepare.out
index 0a2158e480d..c0792e9edd9 100644
--- a/test/JDBC/expected/concat_ws-vu-prepare.out
+++ b/test/JDBC/expected/concat_ws-vu-prepare.out
@@ -466,7 +466,7 @@ RETURN (SELECT TOP 1 CONCAT_WS('-', col_nvarchar, col_nchar, col_int, col_bigint
 GO
 
 CREATE VIEW babel_3409_concat_ws_dep_view2 AS
-    SELECT CONCAT_WS(N'-', col_nvarchar, col_nchar, col_varchar, col_decimal, col_smallmoney, col_smalldatetime) AS concatenated_column FROM babel_3409_concat_ws_t1
+    SELECT CONCAT_WS(N'-', col_nvarchar, col_nchar, col_varchar, col_decimal, col_smalldatetime) AS concatenated_column FROM babel_3409_concat_ws_t1
 GO
 
 CREATE PROCEDURE babel_3409_concat_ws_dep_proc2 AS
diff --git a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/concat_ws-before-15_9-or-16_5-vu-verify.out b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/concat_ws-before-15_9-or-16_5-vu-verify.out
index 06ae85be2a1..dc9d9c8e874 100644
--- a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/concat_ws-before-15_9-or-16_5-vu-verify.out
+++ b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/concat_ws-before-15_9-or-16_5-vu-verify.out
@@ -1244,16 +1244,16 @@ SELECT CONCAT_WS(col_varchar, col_varchar, col_smallmoney) from babel_3409_conca
 GO
 ~~START~~
 varchar
-abcabc12.0000
-?defghi?defghi13.0000
-????14.0000
-比尔·拉比尔·拉15.0000
-莫斯莫斯16.0000
+abcabc12.00
+?defghi?defghi13.00
+????14.00
+比尔·拉比尔·拉15.00
+莫斯莫斯16.00
 
 
-AnikaitAnikait17.0000
+AnikaitAnikait17.00
 
-AgrawalAgrawal18.0000
+AgrawalAgrawal18.00
 ~~END~~
 
 
@@ -1261,16 +1261,16 @@ SELECT CONCAT_WS(col_nvarchar, col_varchar, col_smallmoney) from babel_3409_conc
 GO
 ~~START~~
 nvarchar
-abcabc12.0000
-🙂defghi🙂defghi13.0000
-🙂🙂🙂🙂14.0000
-比尔·拉比尔·拉15.0000
-莫斯莫斯16.0000
+abcabc12.00
+🙂defghi🙂defghi13.00
+🙂🙂🙂🙂14.00
+比尔·拉比尔·拉15.00
+莫斯莫斯16.00
 
 
-AnikaitAnikait17.0000
+AnikaitAnikait17.00
 
-AgrawalAgrawal18.0000
+AgrawalAgrawal18.00
 ~~END~~
 
 
@@ -1278,16 +1278,16 @@ SELECT CONCAT_WS(col_varchar, col_varchar, col_money) from babel_3409_concat_ws_
 GO
 ~~START~~
 varchar
-abcabc12.0000
-?defghi?defghi13.0000
-????14.0000
-比尔·拉比尔·拉15.0000
-莫斯莫斯16.0000
+abcabc12.00
+?defghi?defghi13.00
+????14.00
+比尔·拉比尔·拉15.00
+莫斯莫斯16.00
 
 
-AnikaitAnikait17.0000
+AnikaitAnikait17.00
 
-AgrawalAgrawal18.0000
+AgrawalAgrawal18.00
 ~~END~~
 
 
@@ -1295,16 +1295,16 @@ SELECT CONCAT_WS(col_nvarchar, col_varchar, col_money) from babel_3409_concat_ws
 GO
 ~~START~~
 nvarchar
-abcabc12.0000
-🙂defghi🙂defghi13.0000
+abcabc12.00
+🙂defghi🙂defghi13.00
 🙂🙂🙂🙂14.0000
-比尔·拉比尔·拉15.0000
-莫斯莫斯16.0000
+比尔·拉比尔·拉15.00
+莫斯莫斯16.00
 
 
-AnikaitAnikait17.0000
+AnikaitAnikait17.00
 
-AgrawalAgrawal18.0000
+AgrawalAgrawal18.00
 ~~END~~
 
 
@@ -2196,16 +2196,16 @@ SELECT CONCAT_WS(col_varchar, col_nvarchar, col_smallmoney) from babel_3409_conc
 GO
 ~~START~~
 nvarchar
-abcabc12.0000
-🙂defghi🙂defghi13.0000
-🙂🙂🙂🙂14.0000
-比尔·拉比尔·拉15.0000
-莫斯莫斯16.0000
+abcabc12.00
+🙂defghi🙂defghi13.00
+🙂🙂🙂🙂14.00
+比尔·拉比尔·拉15.00
+莫斯莫斯16.00
 
 
-AnikaitAnikait17.0000
+AnikaitAnikait17.00
 
-AgrawalAgrawal18.0000
+AgrawalAgrawal18.00
 ~~END~~
 
 
@@ -2213,16 +2213,16 @@ SELECT CONCAT_WS(col_nvarchar, col_nvarchar, col_smallmoney) from babel_3409_con
 GO
 ~~START~~
 nvarchar
-abcabc12.0000
-🙂defghi🙂defghi13.0000
-🙂🙂🙂🙂14.0000
-比尔·拉比尔·拉15.0000
-莫斯莫斯16.0000
+abcabc12.00
+🙂defghi🙂defghi13.00
+🙂🙂🙂🙂14.00
+比尔·拉比尔·拉15.00
+莫斯莫斯16.00
 
 
-AnikaitAnikait17.0000
+AnikaitAnikait17.00
 
-AgrawalAgrawal18.0000
+AgrawalAgrawal18.00
 ~~END~~
 
 
@@ -2230,16 +2230,16 @@ SELECT CONCAT_WS(col_varchar, col_nvarchar, col_money) from babel_3409_concat_ws
 GO
 ~~START~~
 nvarchar
-abcabc12.0000
-🙂defghi🙂defghi13.0000
-🙂🙂🙂🙂14.0000
-比尔·拉比尔·拉15.0000
-莫斯莫斯16.0000
+abcabc12.00
+🙂defghi🙂defghi13.00
+🙂🙂🙂🙂14.00
+比尔·拉比尔·拉15.00
+莫斯莫斯16.00
 
 
-AnikaitAnikait17.0000
+AnikaitAnikait17.00
 
-AgrawalAgrawal18.0000
+AgrawalAgrawal18.00
 ~~END~~
 
 
@@ -2247,16 +2247,16 @@ SELECT CONCAT_WS(col_nvarchar, col_nvarchar, col_money) from babel_3409_concat_w
 GO
 ~~START~~
 nvarchar
-abcabc12.0000
-🙂defghi🙂defghi13.0000
-🙂🙂🙂🙂14.0000
-比尔·拉比尔·拉15.0000
-莫斯莫斯16.0000
+abcabc12.00
+🙂defghi🙂defghi13.00
+🙂🙂🙂🙂14.00
+比尔·拉比尔·拉15.00
+莫斯莫斯16.00
 
 
-AnikaitAnikait17.0000
+AnikaitAnikait17.00
 
-AgrawalAgrawal18.0000
+AgrawalAgrawal18.00
 ~~END~~
 
 
@@ -2911,16 +2911,16 @@ SELECT CONCAT_WS(col_smallmoney, col_varchar, col_varchar) from babel_3409_conca
 GO
 ~~START~~
 varchar
-abc12.0000abc
-?defghi13.0000?defghi
-??14.0000??
-比尔·拉15.0000比尔·拉
-莫斯16.0000莫斯
+abc12.00abc
+?defghi13.00?defghi
+??14.00??
+比尔·拉15.00比尔·拉
+莫斯16.00莫斯
 
 
-Anikait17.0000Anikait
+Anikait17.00Anikait
 
-Agrawal18.0000Agrawal
+Agrawal18.00Agrawal
 ~~END~~
 
 
@@ -2928,16 +2928,16 @@ SELECT CONCAT_WS(col_money, col_varchar, col_varchar) from babel_3409_concat_ws_
 GO
 ~~START~~
 varchar
-abc12.0000abc
-?defghi13.0000?defghi
-??14.0000??
-比尔·拉15.0000比尔·拉
-莫斯16.0000莫斯
+abc12.00abc
+?defghi13.00?defghi
+??14.00??
+比尔·拉15.00比尔·拉
+莫斯16.00莫斯
 
 
-Anikait17.0000Anikait
+Anikait17.00Anikait
 
-Agrawal18.0000Agrawal
+Agrawal18.00Agrawal
 ~~END~~
 
 
@@ -3324,16 +3324,16 @@ EXEC babel_3409_concat_ws_dep_proc2
 GO
 ~~START~~
 nvarchar
-abc-12.0000-2000-12-12 12:43:10-2000-12-12 12:43:10-ab-2000-12-12-12:43:10-2000-12-12 12:43:10.1234 +10:00
-🙂defghi-13.0000-2000-12-13 12:43:10-2000-12-13 12:43:10-cd-2000-12-13-12:43:10-2000-12-13 12:43:10.1234 +10:00
-🙂🙂-14.0000-2000-12-14 12:43:10-2000-12-14 12:43:10-ef-2000-12-14-12:43:10-2000-12-14 12:43:10.1234 +10:00
-比尔·拉-15.0000-2000-12-15 12:43:10-2000-12-15 12:43:10-gh-2000-12-15-12:43:10-2000-12-15 12:43:10.1234 +10:00
-莫斯-16.0000-2000-12-16 12:43:10-2000-12-16 12:43:10-ip-2000-12-16-12:43:10-2000-12-16 12:43:10.1234 +10:00
+abc-12.00-2000-12-12 12:43:10-2000-12-12 12:43:10-ab-2000-12-12-12:43:10-2000-12-12 12:43:10.1234 +10:00
+🙂defghi-13.00-2000-12-13 12:43:10-2000-12-13 12:43:10-cd-2000-12-13-12:43:10-2000-12-13 12:43:10.1234 +10:00
+🙂🙂-14.00-2000-12-14 12:43:10-2000-12-14 12:43:10-ef-2000-12-14-12:43:10-2000-12-14 12:43:10.1234 +10:00
+比尔·拉-15.00-2000-12-15 12:43:10-2000-12-15 12:43:10-gh-2000-12-15-12:43:10-2000-12-15 12:43:10.1234 +10:00
+莫斯-16.00-2000-12-16 12:43:10-2000-12-16 12:43:10-ip-2000-12-16-12:43:10-2000-12-16 12:43:10.1234 +10:00
 
 
-Anikait-17.0000-2000-12-17 12:43:10-2000-12-17 12:43:10-qr-2000-12-17-12:43:10-2000-12-17 12:43:10.1234 +10:00
+Anikait-17.00-2000-12-17 12:43:10-2000-12-17 12:43:10-qr-2000-12-17-12:43:10-2000-12-17 12:43:10.1234 +10:00
 
-Agrawal-18.0000-2000-12-18 12:43:10-2000-12-18 12:43:10-rs-2000-12-18-12:43:10-2000-12-18 12:43:10.1234 +10:00
+Agrawal-18.00-2000-12-18 12:43:10-2000-12-18 12:43:10-rs-2000-12-18-12:43:10-2000-12-18 12:43:10.1234 +10:00
 ~~END~~
 
 
diff --git a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/concat_ws-before-15_9-or-16_5-vu-verify.out b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/concat_ws-before-15_9-or-16_5-vu-verify.out
index 7e8f3276a44..61422dce614 100644
--- a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/concat_ws-before-15_9-or-16_5-vu-verify.out
+++ b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/concat_ws-before-15_9-or-16_5-vu-verify.out
@@ -1229,16 +1229,16 @@ SELECT CONCAT_WS(col_varchar, col_varchar, col_smallmoney) from babel_3409_conca
 GO
 ~~START~~
 varchar
-abcabc12.0000
-?defghi?defghi13.0000
-????14.0000
-比??拉比??拉15.0000
-莫斯莫斯16.0000
+abcabc12.00
+?defghi?defghi13.00
+????14.00
+比??拉比??拉15.00
+莫斯莫斯16.00
 
 
-AnikaitAnikait17.0000
+AnikaitAnikait17.00
 
-AgrawalAgrawal18.0000
+AgrawalAgrawal18.00
 ~~END~~
 
 
@@ -1246,16 +1246,16 @@ SELECT CONCAT_WS(col_nvarchar, col_varchar, col_smallmoney) from babel_3409_conc
 GO
 ~~START~~
 nvarchar
-abcabc12.0000
-🙂defghi🙂defghi13.0000
-🙂🙂🙂🙂14.0000
-比尔·拉比尔·拉15.0000
-莫斯莫斯16.0000
+abcabc12.00
+🙂defghi🙂defghi13.00
+🙂🙂🙂🙂14.00
+比尔·拉比尔·拉15.00
+莫斯莫斯16.00
 
 
-AnikaitAnikait17.0000
+AnikaitAnikait17.00
 
-AgrawalAgrawal18.0000
+AgrawalAgrawal18.00
 ~~END~~
 
 
@@ -1263,16 +1263,16 @@ SELECT CONCAT_WS(col_varchar, col_varchar, col_money) from babel_3409_concat_ws_
 GO
 ~~START~~
 varchar
-abcabc12.0000
-?defghi?defghi13.0000
-????14.0000
-比??拉比??拉15.0000
-莫斯莫斯16.0000
+abcabc12.00
+?defghi?defghi13.00
+????14.00
+比??拉比??拉15.00
+莫斯莫斯16.00
 
 
-AnikaitAnikait17.0000
+AnikaitAnikait17.00
 
-AgrawalAgrawal18.0000
+AgrawalAgrawal18.00
 ~~END~~
 
 
@@ -1280,16 +1280,16 @@ SELECT CONCAT_WS(col_nvarchar, col_varchar, col_money) from babel_3409_concat_ws
 GO
 ~~START~~
 nvarchar
-abcabc12.0000
-🙂defghi🙂defghi13.0000
-🙂🙂🙂🙂14.0000
-比尔·拉比尔·拉15.0000
-莫斯莫斯16.0000
+abcabc12.00
+🙂defghi🙂defghi13.00
+🙂🙂🙂🙂14.00
+比尔·拉比尔·拉15.00
+莫斯莫斯16.00
 
 
-AnikaitAnikait17.0000
+AnikaitAnikait17.00
 
-AgrawalAgrawal18.0000
+AgrawalAgrawal18.00
 ~~END~~
 
 
@@ -2141,16 +2141,16 @@ SELECT CONCAT_WS(col_varchar, col_nvarchar, col_smallmoney) from babel_3409_conc
 GO
 ~~START~~
 nvarchar
-abcabc12.0000
-🙂defghi🙂defghi13.0000
-🙂🙂🙂🙂14.0000
-比尔·拉比尔·拉15.0000
-莫斯莫斯16.0000
+abcabc12.00
+🙂defghi🙂defghi13.00
+🙂🙂🙂🙂14.00
+比尔·拉比尔·拉15.00
+莫斯莫斯16.00
 
 
-AnikaitAnikait17.0000
+AnikaitAnikait17.00
 
-AgrawalAgrawal18.0000
+AgrawalAgrawal18.00
 ~~END~~
 
 
@@ -2158,16 +2158,16 @@ SELECT CONCAT_WS(col_nvarchar, col_nvarchar, col_smallmoney) from babel_3409_con
 GO
 ~~START~~
 nvarchar
-abcabc12.0000
-🙂defghi🙂defghi13.0000
-🙂🙂🙂🙂14.0000
-比尔·拉比尔·拉15.0000
-莫斯莫斯16.0000
+abcabc12.00
+🙂defghi🙂defghi13.00
+🙂🙂🙂🙂14.00
+比尔·拉比尔·拉15.00
+莫斯莫斯16.00
 
 
-AnikaitAnikait17.0000
+AnikaitAnikait17.00
 
-AgrawalAgrawal18.0000
+AgrawalAgrawal18.00
 ~~END~~
 
 
@@ -2175,16 +2175,16 @@ SELECT CONCAT_WS(col_varchar, col_nvarchar, col_money) from babel_3409_concat_ws
 GO
 ~~START~~
 nvarchar
-abcabc12.0000
-🙂defghi🙂defghi13.0000
-🙂🙂🙂🙂14.0000
-比尔·拉比尔·拉15.0000
-莫斯莫斯16.0000
+abcabc12.00
+🙂defghi🙂defghi13.00
+🙂🙂🙂🙂14.00
+比尔·拉比尔·拉15.00
+莫斯莫斯16.00
 
 
-AnikaitAnikait17.0000
+AnikaitAnikait17.00
 
-AgrawalAgrawal18.0000
+AgrawalAgrawal18.00
 ~~END~~
 
 
@@ -2192,16 +2192,16 @@ SELECT CONCAT_WS(col_nvarchar, col_nvarchar, col_money) from babel_3409_concat_w
 GO
 ~~START~~
 nvarchar
-abcabc12.0000
-🙂defghi🙂defghi13.0000
-🙂🙂🙂🙂14.0000
-比尔·拉比尔·拉15.0000
-莫斯莫斯16.0000
+abcabc12.00
+🙂defghi🙂defghi13.00
+🙂🙂🙂🙂14.00
+比尔·拉比尔·拉15.00
+莫斯莫斯16.00
 
 
-AnikaitAnikait17.0000
+AnikaitAnikait17.00
 
-AgrawalAgrawal18.0000
+AgrawalAgrawal18.00
 ~~END~~
 
 
diff --git a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/string_agg-before-14_5-vu-verify.out b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/string_agg-before-14_5-vu-verify.out
index a4438e5f749..e3e8ef164e2 100644
--- a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/string_agg-before-14_5-vu-verify.out
+++ b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/string_agg-before-14_5-vu-verify.out
@@ -976,10 +976,10 @@ SELECT STRING_AGG(col_money, '-') FROM babel_5156_string_agg_t1 GROUP BY group_i
 GO
 ~~START~~
 nvarchar
-12.0000-13.0000-14.0000
-15.0000-16.0000
+12.00-13.00-14.00
+15.00-16.00
 <NULL>
-17.0000-18.0000
+17.00-18.00
 ~~END~~
 
 
@@ -996,10 +996,10 @@ SELECT STRING_AGG(col_smallmoney, '-') FROM babel_5156_string_agg_t1 GROUP BY gr
 GO
 ~~START~~
 nvarchar
-12.0000-13.0000-14.0000
-15.0000-16.0000
+12.00-13.00-14.00
+15.00-16.00
 <NULL>
-17.0000-18.0000
+17.00-18.00
 ~~END~~
 
 
diff --git a/test/JDBC/expected/string_agg-before-14_5-vu-verify.out b/test/JDBC/expected/string_agg-before-14_5-vu-verify.out
index c11ef119862..9adbaab5b56 100644
--- a/test/JDBC/expected/string_agg-before-14_5-vu-verify.out
+++ b/test/JDBC/expected/string_agg-before-14_5-vu-verify.out
@@ -1064,10 +1064,10 @@ SELECT STRING_AGG(col_money, '-') FROM babel_5156_string_agg_t1 GROUP BY group_i
 GO
 ~~START~~
 nvarchar
-12.0000-13.0000-14.0000
-15.0000-16.0000
+12.00-13.00-14.00
+15.00-16.00
 <NULL>
-17.0000-18.0000
+17.00-18.00
 ~~END~~
 
 
@@ -1076,10 +1076,10 @@ SELECT STRING_AGG(col_money, @sep) FROM babel_5156_string_agg_t1 GROUP BY group_
 GO
 ~~START~~
 nvarchar
-12.00000.000013.00000.000014.0000
-15.00000.000016.0000
+12.000.0013.000.0014.00
+15.000.0016.00
 <NULL>
-17.00000.000018.0000
+17.000.0018.00
 ~~END~~
 
 
@@ -1088,10 +1088,10 @@ SELECT STRING_AGG(col_smallmoney, '-') FROM babel_5156_string_agg_t1 GROUP BY gr
 GO
 ~~START~~
 nvarchar
-12.0000-13.0000-14.0000
-15.0000-16.0000
+12.00-13.00-14.00
+15.00-16.00
 <NULL>
-17.0000-18.0000
+17.00-18.00
 ~~END~~
 
 
@@ -1100,10 +1100,10 @@ SELECT STRING_AGG(col_smallmoney, @sep) FROM babel_5156_string_agg_t1 GROUP BY g
 GO
 ~~START~~
 nvarchar
-12.00000.000013.00000.000014.0000
-15.00000.000016.0000
+12.000.0013.000.0014.00
+15.000.0016.00
 <NULL>
-17.00000.000018.0000
+17.000.0018.00
 ~~END~~