diff --git a/mysql-test/columnstore/autopilot/.DS_Store b/mysql-test/columnstore/autopilot/.DS_Store
deleted file mode 100644
index 753f68f75..000000000
Binary files a/mysql-test/columnstore/autopilot/.DS_Store and /dev/null differ
diff --git a/mysql-test/columnstore/autopilot/r/mcs6735_json_JSON_MERGE_KnownIssue.result b/mysql-test/columnstore/autopilot/r/mcs6735_json_JSON_MERGE_KnownIssue.result
index e28ac9864..1cc5312ea 100644
--- a/mysql-test/columnstore/autopilot/r/mcs6735_json_JSON_MERGE_KnownIssue.result
+++ b/mysql-test/columnstore/autopilot/r/mcs6735_json_JSON_MERGE_KnownIssue.result
@@ -18,9 +18,7 @@ cInt	cVarchar	cText
 1	[1, 2]	[1, 2]
 1	[3, 4]	[3, 4]
 SELECT cVarchar, JSON_MERGE(cVarchar, @json2), cText, JSON_MERGE(cText, @json2) from jsontest;
-cVarchar	JSON_MERGE(cVarchar, @json2)	cText	JSON_MERGE(cText, @json2)
-[1, 2]	[1, 2, 3, 4]	[1, 2]	[1, 2, 3, 4]
-[3, 4]	[3, 4, 3, 4]	[3, 4]	[3, 4, 3, 4]
+ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_merge_preserve' isn't supported.
 SELECT cVarchar, JSON_MERGE(cVarchar, cText), cText, JSON_MERGE(cText, cVarchar) from jsontest;
 ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_merge_preserve' isn't supported.
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/t/mcs6735_json_JSON_MERGE_KnownIssue.test b/mysql-test/columnstore/autopilot/t/mcs6735_json_JSON_MERGE_KnownIssue.test
index a1905f729..22b8e8a63 100644
--- a/mysql-test/columnstore/autopilot/t/mcs6735_json_JSON_MERGE_KnownIssue.test
+++ b/mysql-test/columnstore/autopilot/t/mcs6735_json_JSON_MERGE_KnownIssue.test
@@ -19,6 +19,7 @@ INSERT INTO jsontest VALUES (1, @json2, @json2);
 SELECT JSON_MERGE(@json1,@json2);
 #
 SELECT * FROM jsontest;
+--error 1178
 SELECT cVarchar, JSON_MERGE(cVarchar, @json2), cText, JSON_MERGE(cText, @json2) from jsontest;
 --error 1178
 SELECT cVarchar, JSON_MERGE(cVarchar, cText), cText, JSON_MERGE(cText, cVarchar) from jsontest;
diff --git a/mysql-test/columnstore/extended/r/mcs7000_version_buffer.result b/mysql-test/columnstore/extended/r/mcs7000_version_buffer.result
index c07bdfce7..569b49ef0 100644
--- a/mysql-test/columnstore/extended/r/mcs7000_version_buffer.result
+++ b/mysql-test/columnstore/extended/r/mcs7000_version_buffer.result
@@ -20,21 +20,23 @@ l_shipmode char (10),
 l_comment varchar (44)
 ) engine=columnstore DEFAULT CHARSET=utf8mb3;
 LOAD DATA INFILE '/data/qa/source/dbt3/10g/lineitem.tbl' INTO TABLE lineitem FIELDS TERMINATED BY '|';
+LOAD DATA INFILE '/data/qa/source/dbt3/10g/lineitem.tbl' INTO TABLE lineitem FIELDS TERMINATED BY '|';
+LOAD DATA INFILE '/data/qa/source/dbt3/10g/lineitem.tbl' INTO TABLE lineitem FIELDS TERMINATED BY '|';
 SELECT COUNT(*) FROM lineitem;
 COUNT(*)
-59986052
+179958156
 SET autocommit=off;
 UPDATE lineitem SET l_orderkey=-1, l_linenumber=-1;
 SELECT COUNT(*) FROM lineitem where l_orderkey=-1 and l_linenumber=-1;
 COUNT(*)
-59986052
+179958156
 rollback;
 SELECT COUNT(*) FROM lineitem where l_orderkey=-1 and l_linenumber=-1;
 COUNT(*)
 0
-update lineitem set l_orderkey=-2, l_linenumber=-2,l_comment='hello';
+update lineitem set l_orderkey=-2, l_linenumber=-2, l_comment='hello', l_shipinstruct=l_shipmode;
 ERROR HY000: Internal error: CAL0002: Update Failed:  MCS-2008: The version buffer overflowed. Increase VersionBufferFileSize or limit the rows to be processed.
-SELECT COUNT(*) FROM lineitem where l_orderkey=-2 and l_linenumber=-2 and l_comment='hello';
+SELECT COUNT(*) FROM lineitem where l_orderkey=-2 and l_linenumber=-2 and l_comment='hello' and l_shipinstruct=l_shipmode;
 COUNT(*)
 0
 DROP DATABASE mcs7000_db;
diff --git a/mysql-test/columnstore/extended/t/mcs7000_version_buffer.test b/mysql-test/columnstore/extended/t/mcs7000_version_buffer.test
index 5e8a3ca13..db4b43de5 100644
--- a/mysql-test/columnstore/extended/t/mcs7000_version_buffer.test
+++ b/mysql-test/columnstore/extended/t/mcs7000_version_buffer.test
@@ -37,6 +37,8 @@ l_comment varchar (44)
 # LDI 10g dataset for the lineitem table
 # -------------------------------------------------------------- #
 LOAD DATA INFILE '/data/qa/source/dbt3/10g/lineitem.tbl' INTO TABLE lineitem FIELDS TERMINATED BY '|';
+LOAD DATA INFILE '/data/qa/source/dbt3/10g/lineitem.tbl' INTO TABLE lineitem FIELDS TERMINATED BY '|';
+LOAD DATA INFILE '/data/qa/source/dbt3/10g/lineitem.tbl' INTO TABLE lineitem FIELDS TERMINATED BY '|';
 SELECT COUNT(*) FROM lineitem;
 #
 # Version buffer positive test - successful update expected
@@ -48,8 +50,8 @@ SELECT COUNT(*) FROM lineitem where l_orderkey=-1 and l_linenumber=-1;
 # Version buffer negative test - overflow error expected
 --error 1815
 --error ER_INTERNAL_ERROR
-update lineitem set l_orderkey=-2, l_linenumber=-2,l_comment='hello';
-SELECT COUNT(*) FROM lineitem where l_orderkey=-2 and l_linenumber=-2 and l_comment='hello';
+update lineitem set l_orderkey=-2, l_linenumber=-2, l_comment='hello', l_shipinstruct=l_shipmode;
+SELECT COUNT(*) FROM lineitem where l_orderkey=-2 and l_linenumber=-2 and l_comment='hello' and l_shipinstruct=l_shipmode;
 #
 DROP DATABASE mcs7000_db;
 #