diff --git a/config/yugabyte/colocated/deletes_batched_extra_index_0_colocated.yaml b/config/yugabyte/colocated/deletes_batched_extra_index_0_colocated.yaml
index bfa593c4c..55ce1a885 100644
--- a/config/yugabyte/colocated/deletes_batched_extra_index_0_colocated.yaml
+++ b/config/yugabyte/colocated/deletes_batched_extra_index_0_colocated.yaml
@@ -25,8 +25,8 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
diff --git a/config/yugabyte/colocated/deletes_batched_extra_index_10_colocated.yaml b/config/yugabyte/colocated/deletes_batched_extra_index_10_colocated.yaml
index 0262fe9bd..36d295912 100644
--- a/config/yugabyte/colocated/deletes_batched_extra_index_10_colocated.yaml
+++ b/config/yugabyte/colocated/deletes_batched_extra_index_10_colocated.yaml
@@ -25,18 +25,18 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
-            - create index demo_idx1 on demo(col1);
-            - create index demo_idx2 on demo(col2);
-            - create index demo_idx3 on demo(col3);
-            - create index demo_idx4 on demo(col4);
-            - create index demo_idx5 on demo(col5);
-            - create index demo_idx6 on demo(col6);
-            - create index demo_idx7 on demo(col7);
-            - create index demo_idx8 on demo(col8);
-            - create index demo_idx9 on demo(col9);
-            - create index demo_idx10 on demo(col10);
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
+            - create unique index demo_idx1 on demo(col1);
+            - create unique index demo_idx2 on demo(col2);
+            - create unique index demo_idx3 on demo(col3);
+            - create unique index demo_idx4 on demo(col4);
+            - create unique index demo_idx5 on demo(col5);
+            - create unique index demo_idx6 on demo(col6);
+            - create unique index demo_idx7 on demo(col7);
+            - create unique index demo_idx8 on demo(col8);
+            - create unique index demo_idx9 on demo(col9);
+            - create unique index demo_idx10 on demo(col10);
diff --git a/config/yugabyte/colocated/deletes_batched_extra_index_1_colocated.yaml b/config/yugabyte/colocated/deletes_batched_extra_index_1_colocated.yaml
index 8dbb27859..990994fff 100644
--- a/config/yugabyte/colocated/deletes_batched_extra_index_1_colocated.yaml
+++ b/config/yugabyte/colocated/deletes_batched_extra_index_1_colocated.yaml
@@ -25,9 +25,9 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
-            - create index demo_idx1 on demo(col1);
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
+            - create unique index demo_idx1 on demo(col1);
diff --git a/config/yugabyte/colocated/deletes_batched_extra_index_2_colocated.yaml b/config/yugabyte/colocated/deletes_batched_extra_index_2_colocated.yaml
index d69379233..f7b04c874 100644
--- a/config/yugabyte/colocated/deletes_batched_extra_index_2_colocated.yaml
+++ b/config/yugabyte/colocated/deletes_batched_extra_index_2_colocated.yaml
@@ -25,10 +25,10 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
-            - create index demo_idx1 on demo(col1);
-            - create index demo_idx2 on demo(col2);
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
+            - create unique index demo_idx1 on demo(col1);
+            - create unique index demo_idx2 on demo(col2);
\ No newline at end of file
diff --git a/config/yugabyte/colocated/deletes_batched_extra_index_3_colocated.yaml b/config/yugabyte/colocated/deletes_batched_extra_index_3_colocated.yaml
index fbc925c14..c447040fb 100644
--- a/config/yugabyte/colocated/deletes_batched_extra_index_3_colocated.yaml
+++ b/config/yugabyte/colocated/deletes_batched_extra_index_3_colocated.yaml
@@ -25,11 +25,11 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
-            - create index demo_idx1 on demo(col1);
-            - create index demo_idx2 on demo(col2);
-            - create index demo_idx3 on demo(col3);
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
+            - create unique index demo_idx1 on demo(col1);
+            - create unique index demo_idx2 on demo(col2);
+            - create unique index demo_idx3 on demo(col3);
\ No newline at end of file
diff --git a/config/yugabyte/colocated/deletes_batched_extra_index_5_colocated.yaml b/config/yugabyte/colocated/deletes_batched_extra_index_5_colocated.yaml
index abd6b7021..3b255727c 100644
--- a/config/yugabyte/colocated/deletes_batched_extra_index_5_colocated.yaml
+++ b/config/yugabyte/colocated/deletes_batched_extra_index_5_colocated.yaml
@@ -25,13 +25,13 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
-            - create index demo_idx1 on demo(col1);
-            - create index demo_idx2 on demo(col2);
-            - create index demo_idx3 on demo(col3);
-            - create index demo_idx4 on demo(col4);
-            - create index demo_idx5 on demo(col5);
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
+            - create unique index demo_idx1 on demo(col1);
+            - create unique index demo_idx2 on demo(col2);
+            - create unique index demo_idx3 on demo(col3);
+            - create unique index demo_idx4 on demo(col4);
+            - create unique index demo_idx5 on demo(col5);
diff --git a/config/yugabyte/colocated/deletes_sequential_extra_index_0_colocated.yaml b/config/yugabyte/colocated/deletes_sequential_extra_index_0_colocated.yaml
index 4d046366f..a315638a3 100644
--- a/config/yugabyte/colocated/deletes_sequential_extra_index_0_colocated.yaml
+++ b/config/yugabyte/colocated/deletes_sequential_extra_index_0_colocated.yaml
@@ -25,8 +25,8 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
diff --git a/config/yugabyte/colocated/deletes_sequential_extra_index_10_colocated.yaml b/config/yugabyte/colocated/deletes_sequential_extra_index_10_colocated.yaml
index 92d4d768e..5014e1516 100644
--- a/config/yugabyte/colocated/deletes_sequential_extra_index_10_colocated.yaml
+++ b/config/yugabyte/colocated/deletes_sequential_extra_index_10_colocated.yaml
@@ -25,18 +25,18 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
-            - create index demo_idx1 on demo(col1);
-            - create index demo_idx2 on demo(col2);
-            - create index demo_idx3 on demo(col3);
-            - create index demo_idx4 on demo(col4);
-            - create index demo_idx5 on demo(col5);
-            - create index demo_idx6 on demo(col6);
-            - create index demo_idx7 on demo(col7);
-            - create index demo_idx8 on demo(col8);
-            - create index demo_idx9 on demo(col9);
-            - create index demo_idx10 on demo(col10);
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
+            - create unique index demo_idx1 on demo(col1);
+            - create unique index demo_idx2 on demo(col2);
+            - create unique index demo_idx3 on demo(col3);
+            - create unique index demo_idx4 on demo(col4);
+            - create unique index demo_idx5 on demo(col5);
+            - create unique index demo_idx6 on demo(col6);
+            - create unique index demo_idx7 on demo(col7);
+            - create unique index demo_idx8 on demo(col8);
+            - create unique index demo_idx9 on demo(col9);
+            - create unique index demo_idx10 on demo(col10);
\ No newline at end of file
diff --git a/config/yugabyte/colocated/deletes_sequential_extra_index_1_colocated.yaml b/config/yugabyte/colocated/deletes_sequential_extra_index_1_colocated.yaml
index 5413c681b..3e517c178 100644
--- a/config/yugabyte/colocated/deletes_sequential_extra_index_1_colocated.yaml
+++ b/config/yugabyte/colocated/deletes_sequential_extra_index_1_colocated.yaml
@@ -25,9 +25,9 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
-            - create index demo_idx1 on demo(col1);
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
+            - create unique index demo_idx1 on demo(col1);
diff --git a/config/yugabyte/colocated/deletes_sequential_extra_index_2_colocated.yaml b/config/yugabyte/colocated/deletes_sequential_extra_index_2_colocated.yaml
index b5e14202c..be01033c4 100644
--- a/config/yugabyte/colocated/deletes_sequential_extra_index_2_colocated.yaml
+++ b/config/yugabyte/colocated/deletes_sequential_extra_index_2_colocated.yaml
@@ -25,10 +25,10 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
-            - create index demo_idx1 on demo(col1);
-            - create index demo_idx2 on demo(col2);
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
+            - create unique index demo_idx1 on demo(col1);
+            - create unique index demo_idx2 on demo(col2);
\ No newline at end of file
diff --git a/config/yugabyte/colocated/deletes_sequential_extra_index_3_colocated.yaml b/config/yugabyte/colocated/deletes_sequential_extra_index_3_colocated.yaml
index 93de3bd09..d10d66d1a 100644
--- a/config/yugabyte/colocated/deletes_sequential_extra_index_3_colocated.yaml
+++ b/config/yugabyte/colocated/deletes_sequential_extra_index_3_colocated.yaml
@@ -25,11 +25,11 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
-            - create index demo_idx1 on demo(col1);
-            - create index demo_idx2 on demo(col2);
-            - create index demo_idx3 on demo(col3);
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
+            - create unique index demo_idx1 on demo(col1);
+            - create unique index demo_idx2 on demo(col2);
+            - create unique index demo_idx3 on demo(col3);
\ No newline at end of file
diff --git a/config/yugabyte/colocated/deletes_sequential_extra_index_5_colocated.yaml b/config/yugabyte/colocated/deletes_sequential_extra_index_5_colocated.yaml
index 7ea6d404e..7d8b5eab8 100644
--- a/config/yugabyte/colocated/deletes_sequential_extra_index_5_colocated.yaml
+++ b/config/yugabyte/colocated/deletes_sequential_extra_index_5_colocated.yaml
@@ -25,13 +25,13 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
-            - create index demo_idx1 on demo(col1);
-            - create index demo_idx2 on demo(col2);
-            - create index demo_idx3 on demo(col3);
-            - create index demo_idx4 on demo(col4);
-            - create index demo_idx5 on demo(col5);
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
+            - create unique index demo_idx1 on demo(col1);
+            - create unique index demo_idx2 on demo(col2);
+            - create unique index demo_idx3 on demo(col3);
+            - create unique index demo_idx4 on demo(col4);
+            - create unique index demo_idx5 on demo(col5);
\ No newline at end of file
diff --git a/config/yugabyte/colocated/insert_batched_extra_index_0_colocated.yaml b/config/yugabyte/colocated/insert_batched_extra_index_0_colocated.yaml
index e21a5a2f6..a3a1fe085 100644
--- a/config/yugabyte/colocated/insert_batched_extra_index_0_colocated.yaml
+++ b/config/yugabyte/colocated/insert_batched_extra_index_0_colocated.yaml
@@ -25,8 +25,8 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
diff --git a/config/yugabyte/colocated/insert_batched_extra_index_10_colocated.yaml b/config/yugabyte/colocated/insert_batched_extra_index_10_colocated.yaml
index 264f3f795..38901d60f 100644
--- a/config/yugabyte/colocated/insert_batched_extra_index_10_colocated.yaml
+++ b/config/yugabyte/colocated/insert_batched_extra_index_10_colocated.yaml
@@ -25,18 +25,18 @@ microbenchmark:
                 AS $$
                 DECLARE
                 BEGIN
-                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
                 END;
                 $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
-            - create index demo_idx1 on demo(col1);
-            - create index demo_idx2 on demo(col2);
-            - create index demo_idx3 on demo(col3);
-            - create index demo_idx4 on demo(col4);
-            - create index demo_idx5 on demo(col5);
-            - create index demo_idx6 on demo(col6);
-            - create index demo_idx7 on demo(col7);
-            - create index demo_idx8 on demo(col8);
-            - create index demo_idx9 on demo(col9);
-            - create index demo_idx10 on demo(col10);
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
+            - create unique index demo_idx1 on demo(col1);
+            - create unique index demo_idx2 on demo(col2);
+            - create unique index demo_idx3 on demo(col3);
+            - create unique index demo_idx4 on demo(col4);
+            - create unique index demo_idx5 on demo(col5);
+            - create unique index demo_idx6 on demo(col6);
+            - create unique index demo_idx7 on demo(col7);
+            - create unique index demo_idx8 on demo(col8);
+            - create unique index demo_idx9 on demo(col9);
+            - create unique index demo_idx10 on demo(col10);
diff --git a/config/yugabyte/colocated/insert_batched_extra_index_1_colocated.yaml b/config/yugabyte/colocated/insert_batched_extra_index_1_colocated.yaml
index 7a02faa26..380dcc03d 100644
--- a/config/yugabyte/colocated/insert_batched_extra_index_1_colocated.yaml
+++ b/config/yugabyte/colocated/insert_batched_extra_index_1_colocated.yaml
@@ -25,9 +25,9 @@ microbenchmark:
                 AS $$
                 DECLARE
                 BEGIN
-                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
                 END;
                 $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
-            - create index demo_idx1 on demo(col1);
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
+            - create unique index demo_idx1 on demo(col1);
\ No newline at end of file
diff --git a/config/yugabyte/colocated/insert_batched_extra_index_2_colocated.yaml b/config/yugabyte/colocated/insert_batched_extra_index_2_colocated.yaml
index 1665197fd..e87c5db2a 100644
--- a/config/yugabyte/colocated/insert_batched_extra_index_2_colocated.yaml
+++ b/config/yugabyte/colocated/insert_batched_extra_index_2_colocated.yaml
@@ -25,10 +25,10 @@ microbenchmark:
                 AS $$
                 DECLARE
                 BEGIN
-                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
                 END;
                 $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
-            - create index demo_idx1 on demo(col1);
-            - create index demo_idx2 on demo(col2);
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
+            - create unique index demo_idx1 on demo(col1);
+            - create unique index demo_idx2 on demo(col2);
diff --git a/config/yugabyte/colocated/insert_batched_extra_index_3_colocated.yaml b/config/yugabyte/colocated/insert_batched_extra_index_3_colocated.yaml
index bda9e1442..3c46c2e7f 100644
--- a/config/yugabyte/colocated/insert_batched_extra_index_3_colocated.yaml
+++ b/config/yugabyte/colocated/insert_batched_extra_index_3_colocated.yaml
@@ -25,11 +25,11 @@ microbenchmark:
                 AS $$
                 DECLARE
                 BEGIN
-                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
                 END;
                 $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
-            - create index demo_idx1 on demo(col1);
-            - create index demo_idx2 on demo(col2);
-            - create index demo_idx3 on demo(col3);
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
+            - create unique index demo_idx1 on demo(col1);
+            - create unique index demo_idx2 on demo(col2);
+            - create unique index demo_idx3 on demo(col3);
\ No newline at end of file
diff --git a/config/yugabyte/colocated/insert_batched_extra_index_5_colocated.yaml b/config/yugabyte/colocated/insert_batched_extra_index_5_colocated.yaml
index d69cf15b6..c5cf676f8 100644
--- a/config/yugabyte/colocated/insert_batched_extra_index_5_colocated.yaml
+++ b/config/yugabyte/colocated/insert_batched_extra_index_5_colocated.yaml
@@ -25,13 +25,13 @@ microbenchmark:
                 AS $$
                 DECLARE
                 BEGIN
-                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
                 END;
                 $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
-            - create index demo_idx1 on demo(col1);
-            - create index demo_idx2 on demo(col2);
-            - create index demo_idx3 on demo(col3);
-            - create index demo_idx4 on demo(col4);
-            - create index demo_idx5 on demo(col5);
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
+            - create unique index demo_idx1 on demo(col1);
+            - create unique index demo_idx2 on demo(col2);
+            - create unique index demo_idx3 on demo(col3);
+            - create unique index demo_idx4 on demo(col4);
+            - create unique index demo_idx5 on demo(col5);
diff --git a/config/yugabyte/colocated/insert_sequential_extra_index_0_colocated.yaml b/config/yugabyte/colocated/insert_sequential_extra_index_0_colocated.yaml
index fe65c04d8..f667b515e 100644
--- a/config/yugabyte/colocated/insert_sequential_extra_index_0_colocated.yaml
+++ b/config/yugabyte/colocated/insert_sequential_extra_index_0_colocated.yaml
@@ -25,8 +25,8 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
diff --git a/config/yugabyte/colocated/insert_sequential_extra_index_10_colocated.yaml b/config/yugabyte/colocated/insert_sequential_extra_index_10_colocated.yaml
index 642370223..8784be0b4 100644
--- a/config/yugabyte/colocated/insert_sequential_extra_index_10_colocated.yaml
+++ b/config/yugabyte/colocated/insert_sequential_extra_index_10_colocated.yaml
@@ -25,18 +25,18 @@ microbenchmark:
                 AS $$
                 DECLARE
                 BEGIN
-                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
                 END;
                 $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
-            - create index demo_idx1 on demo(col1);
-            - create index demo_idx2 on demo(col2);
-            - create index demo_idx3 on demo(col3);
-            - create index demo_idx4 on demo(col4);
-            - create index demo_idx5 on demo(col5);
-            - create index demo_idx6 on demo(col6);
-            - create index demo_idx7 on demo(col7);
-            - create index demo_idx8 on demo(col8);
-            - create index demo_idx9 on demo(col9);
-            - create index demo_idx10 on demo(col10);
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
+            - create unique index demo_idx1 on demo(col1);
+            - create unique index demo_idx2 on demo(col2);
+            - create unique index demo_idx3 on demo(col3);
+            - create unique index demo_idx4 on demo(col4);
+            - create unique index demo_idx5 on demo(col5);
+            - create unique index demo_idx6 on demo(col6);
+            - create unique index demo_idx7 on demo(col7);
+            - create unique index demo_idx8 on demo(col8);
+            - create unique index demo_idx9 on demo(col9);
+            - create unique index demo_idx10 on demo(col10);
diff --git a/config/yugabyte/colocated/insert_sequential_extra_index_1_colocated.yaml b/config/yugabyte/colocated/insert_sequential_extra_index_1_colocated.yaml
index f2175b399..98dc51dcb 100644
--- a/config/yugabyte/colocated/insert_sequential_extra_index_1_colocated.yaml
+++ b/config/yugabyte/colocated/insert_sequential_extra_index_1_colocated.yaml
@@ -25,9 +25,9 @@ microbenchmark:
                 AS $$
                 DECLARE
                 BEGIN
-                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
                 END;
                 $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
-            - create index demo_idx1 on demo(col1);
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
+            - create unique index demo_idx1 on demo(col1);
\ No newline at end of file
diff --git a/config/yugabyte/colocated/insert_sequential_extra_index_2_colocated.yaml b/config/yugabyte/colocated/insert_sequential_extra_index_2_colocated.yaml
index 3f4cb8952..de1c7d549 100644
--- a/config/yugabyte/colocated/insert_sequential_extra_index_2_colocated.yaml
+++ b/config/yugabyte/colocated/insert_sequential_extra_index_2_colocated.yaml
@@ -25,10 +25,10 @@ microbenchmark:
                 AS $$
                 DECLARE
                 BEGIN
-                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
                 END;
                 $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
-            - create index demo_idx1 on demo(col1);
-            - create index demo_idx2 on demo(col2);
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
+            - create unique index demo_idx1 on demo(col1);
+            - create unique index demo_idx2 on demo(col2);
diff --git a/config/yugabyte/colocated/insert_sequential_extra_index_3_colocated.yaml b/config/yugabyte/colocated/insert_sequential_extra_index_3_colocated.yaml
index 881834f52..709e0c05e 100644
--- a/config/yugabyte/colocated/insert_sequential_extra_index_3_colocated.yaml
+++ b/config/yugabyte/colocated/insert_sequential_extra_index_3_colocated.yaml
@@ -25,11 +25,11 @@ microbenchmark:
                 AS $$
                 DECLARE
                 BEGIN
-                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
                 END;
                 $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
-            - create index demo_idx1 on demo(col1);
-            - create index demo_idx2 on demo(col2);
-            - create index demo_idx3 on demo(col3);
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
+            - create unique index demo_idx1 on demo(col1);
+            - create unique index demo_idx2 on demo(col2);
+            - create unique index demo_idx3 on demo(col3);
\ No newline at end of file
diff --git a/config/yugabyte/colocated/insert_sequential_extra_index_5_colocated.yaml b/config/yugabyte/colocated/insert_sequential_extra_index_5_colocated.yaml
index 7b24d2226..2bc790610 100644
--- a/config/yugabyte/colocated/insert_sequential_extra_index_5_colocated.yaml
+++ b/config/yugabyte/colocated/insert_sequential_extra_index_5_colocated.yaml
@@ -25,13 +25,13 @@ microbenchmark:
                 AS $$
                 DECLARE
                 BEGIN
-                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
                 END;
                 $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
-            - create index demo_idx1 on demo(col1);
-            - create index demo_idx2 on demo(col2);
-            - create index demo_idx3 on demo(col3);
-            - create index demo_idx4 on demo(col4);
-            - create index demo_idx5 on demo(col5);
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
+            - create unique index demo_idx1 on demo(col1);
+            - create unique index demo_idx2 on demo(col2);
+            - create unique index demo_idx3 on demo(col3);
+            - create unique index demo_idx4 on demo(col4);
+            - create unique index demo_idx5 on demo(col5);
diff --git a/config/yugabyte/colocated/updates_batched_extra_index_0_colocated.yaml b/config/yugabyte/colocated/updates_batched_extra_index_0_colocated.yaml
index 22b4d2a7d..df994cfe8 100644
--- a/config/yugabyte/colocated/updates_batched_extra_index_0_colocated.yaml
+++ b/config/yugabyte/colocated/updates_batched_extra_index_0_colocated.yaml
@@ -25,8 +25,8 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
diff --git a/config/yugabyte/colocated/updates_batched_extra_index_10_colocated.yaml b/config/yugabyte/colocated/updates_batched_extra_index_10_colocated.yaml
index 967e6af74..257ad3344 100644
--- a/config/yugabyte/colocated/updates_batched_extra_index_10_colocated.yaml
+++ b/config/yugabyte/colocated/updates_batched_extra_index_10_colocated.yaml
@@ -25,18 +25,18 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
-            - create index demo_idx1 on demo(col1);
-            - create index demo_idx2 on demo(col2);
-            - create index demo_idx3 on demo(col3);
-            - create index demo_idx4 on demo(col4);
-            - create index demo_idx5 on demo(col5);
-            - create index demo_idx6 on demo(col6);
-            - create index demo_idx7 on demo(col7);
-            - create index demo_idx8 on demo(col8);
-            - create index demo_idx9 on demo(col9);
-            - create index demo_idx10 on demo(col10);
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
+            - create unique index demo_idx1 on demo(col1);
+            - create unique index demo_idx2 on demo(col2);
+            - create unique index demo_idx3 on demo(col3);
+            - create unique index demo_idx4 on demo(col4);
+            - create unique index demo_idx5 on demo(col5);
+            - create unique index demo_idx6 on demo(col6);
+            - create unique index demo_idx7 on demo(col7);
+            - create unique index demo_idx8 on demo(col8);
+            - create unique index demo_idx9 on demo(col9);
+            - create unique index demo_idx10 on demo(col10);
\ No newline at end of file
diff --git a/config/yugabyte/colocated/updates_batched_extra_index_1_colocated.yaml b/config/yugabyte/colocated/updates_batched_extra_index_1_colocated.yaml
index 782d53d16..42723b4d5 100644
--- a/config/yugabyte/colocated/updates_batched_extra_index_1_colocated.yaml
+++ b/config/yugabyte/colocated/updates_batched_extra_index_1_colocated.yaml
@@ -25,9 +25,9 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
-            - create index demo_idx1 on demo(col1);
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
+            - create unique index demo_idx1 on demo(col1);
\ No newline at end of file
diff --git a/config/yugabyte/colocated/updates_batched_extra_index_2_colocated.yaml b/config/yugabyte/colocated/updates_batched_extra_index_2_colocated.yaml
index 1ff0ccc93..93c87e3ac 100644
--- a/config/yugabyte/colocated/updates_batched_extra_index_2_colocated.yaml
+++ b/config/yugabyte/colocated/updates_batched_extra_index_2_colocated.yaml
@@ -25,10 +25,10 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
-            - create index demo_idx1 on demo(col1);
-            - create index demo_idx2 on demo(col2);
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
+            - create unique index demo_idx1 on demo(col1);
+            - create unique index demo_idx2 on demo(col2);
\ No newline at end of file
diff --git a/config/yugabyte/colocated/updates_batched_extra_index_3_colocated.yaml b/config/yugabyte/colocated/updates_batched_extra_index_3_colocated.yaml
index 2197ddc16..729c3ae6b 100644
--- a/config/yugabyte/colocated/updates_batched_extra_index_3_colocated.yaml
+++ b/config/yugabyte/colocated/updates_batched_extra_index_3_colocated.yaml
@@ -25,11 +25,11 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
-            - create index demo_idx1 on demo(col1);
-            - create index demo_idx2 on demo(col2);
-            - create index demo_idx3 on demo(col3);
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
+            - create unique index demo_idx1 on demo(col1);
+            - create unique index demo_idx2 on demo(col2);
+            - create unique index demo_idx3 on demo(col3);
\ No newline at end of file
diff --git a/config/yugabyte/colocated/updates_batched_extra_index_5_colocated.yaml b/config/yugabyte/colocated/updates_batched_extra_index_5_colocated.yaml
index 63e6e58e1..67e3f5ba4 100644
--- a/config/yugabyte/colocated/updates_batched_extra_index_5_colocated.yaml
+++ b/config/yugabyte/colocated/updates_batched_extra_index_5_colocated.yaml
@@ -25,13 +25,13 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
-            - create index demo_idx1 on demo(col1);
-            - create index demo_idx2 on demo(col2);
-            - create index demo_idx3 on demo(col3);
-            - create index demo_idx4 on demo(col4);
-            - create index demo_idx5 on demo(col5);
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
+            - create unique index demo_idx1 on demo(col1);
+            - create unique index demo_idx2 on demo(col2);
+            - create unique index demo_idx3 on demo(col3);
+            - create unique index demo_idx4 on demo(col4);
+            - create unique index demo_idx5 on demo(col5);
\ No newline at end of file
diff --git a/config/yugabyte/colocated/updates_sequential_extra_index_0_colocated.yaml b/config/yugabyte/colocated/updates_sequential_extra_index_0_colocated.yaml
index 84fafc70e..1c73cac33 100644
--- a/config/yugabyte/colocated/updates_sequential_extra_index_0_colocated.yaml
+++ b/config/yugabyte/colocated/updates_sequential_extra_index_0_colocated.yaml
@@ -25,8 +25,8 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
diff --git a/config/yugabyte/colocated/updates_sequential_extra_index_10_colocated.yaml b/config/yugabyte/colocated/updates_sequential_extra_index_10_colocated.yaml
index 26501a299..b532ef224 100644
--- a/config/yugabyte/colocated/updates_sequential_extra_index_10_colocated.yaml
+++ b/config/yugabyte/colocated/updates_sequential_extra_index_10_colocated.yaml
@@ -25,18 +25,18 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
-            - create index demo_idx1 on demo(col1);
-            - create index demo_idx2 on demo(col2);
-            - create index demo_idx3 on demo(col3);
-            - create index demo_idx4 on demo(col4);
-            - create index demo_idx5 on demo(col5);
-            - create index demo_idx6 on demo(col6);
-            - create index demo_idx7 on demo(col7);
-            - create index demo_idx8 on demo(col8);
-            - create index demo_idx9 on demo(col9);
-            - create index demo_idx10 on demo(col10);
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
+            - create unique index demo_idx1 on demo(col1);
+            - create unique index demo_idx2 on demo(col2);
+            - create unique index demo_idx3 on demo(col3);
+            - create unique index demo_idx4 on demo(col4);
+            - create unique index demo_idx5 on demo(col5);
+            - create unique index demo_idx6 on demo(col6);
+            - create unique index demo_idx7 on demo(col7);
+            - create unique index demo_idx8 on demo(col8);
+            - create unique index demo_idx9 on demo(col9);
+            - create unique index demo_idx10 on demo(col10);
\ No newline at end of file
diff --git a/config/yugabyte/colocated/updates_sequential_extra_index_1_colocated.yaml b/config/yugabyte/colocated/updates_sequential_extra_index_1_colocated.yaml
index 39a8122ce..b5ec5b230 100644
--- a/config/yugabyte/colocated/updates_sequential_extra_index_1_colocated.yaml
+++ b/config/yugabyte/colocated/updates_sequential_extra_index_1_colocated.yaml
@@ -25,9 +25,9 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
-            - create index demo_idx1 on demo(col1);
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
+            - create unique index demo_idx1 on demo(col1);
\ No newline at end of file
diff --git a/config/yugabyte/colocated/updates_sequential_extra_index_2_colocated.yaml b/config/yugabyte/colocated/updates_sequential_extra_index_2_colocated.yaml
index 3c47b182d..78ac78795 100644
--- a/config/yugabyte/colocated/updates_sequential_extra_index_2_colocated.yaml
+++ b/config/yugabyte/colocated/updates_sequential_extra_index_2_colocated.yaml
@@ -25,10 +25,10 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
-            - create index demo_idx1 on demo(col1);
-            - create index demo_idx2 on demo(col2);
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
+            - create unique index demo_idx1 on demo(col1);
+            - create unique index demo_idx2 on demo(col2);
\ No newline at end of file
diff --git a/config/yugabyte/colocated/updates_sequential_extra_index_3_colocated.yaml b/config/yugabyte/colocated/updates_sequential_extra_index_3_colocated.yaml
index 07c944b4b..03df11050 100644
--- a/config/yugabyte/colocated/updates_sequential_extra_index_3_colocated.yaml
+++ b/config/yugabyte/colocated/updates_sequential_extra_index_3_colocated.yaml
@@ -25,11 +25,11 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
-            - create index demo_idx1 on demo(col1);
-            - create index demo_idx2 on demo(col2);
-            - create index demo_idx3 on demo(col3);
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
+            - create unique index demo_idx1 on demo(col1);
+            - create unique index demo_idx2 on demo(col2);
+            - create unique index demo_idx3 on demo(col3);
\ No newline at end of file
diff --git a/config/yugabyte/colocated/updates_sequential_extra_index_5_colocated.yaml b/config/yugabyte/colocated/updates_sequential_extra_index_5_colocated.yaml
index 9deb48e28..97a7f062d 100644
--- a/config/yugabyte/colocated/updates_sequential_extra_index_5_colocated.yaml
+++ b/config/yugabyte/colocated/updates_sequential_extra_index_5_colocated.yaml
@@ -25,13 +25,13 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
-            - create index demo_idx1 on demo(col1);
-            - create index demo_idx2 on demo(col2);
-            - create index demo_idx3 on demo(col3);
-            - create index demo_idx4 on demo(col4);
-            - create index demo_idx5 on demo(col5);
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
+            - create unique index demo_idx1 on demo(col1);
+            - create unique index demo_idx2 on demo(col2);
+            - create unique index demo_idx3 on demo(col3);
+            - create unique index demo_idx4 on demo(col4);
+            - create unique index demo_idx5 on demo(col5);
\ No newline at end of file
diff --git a/config/yugabyte/non-colocated/deletes_batched_extra_index_0.yaml b/config/yugabyte/non-colocated/deletes_batched_extra_index_0.yaml
index 5e15dad52..d3bca437d 100644
--- a/config/yugabyte/non-colocated/deletes_batched_extra_index_0.yaml
+++ b/config/yugabyte/non-colocated/deletes_batched_extra_index_0.yaml
@@ -24,8 +24,8 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
diff --git a/config/yugabyte/non-colocated/deletes_batched_extra_index_1.yaml b/config/yugabyte/non-colocated/deletes_batched_extra_index_1.yaml
index 664639de0..da651a875 100644
--- a/config/yugabyte/non-colocated/deletes_batched_extra_index_1.yaml
+++ b/config/yugabyte/non-colocated/deletes_batched_extra_index_1.yaml
@@ -24,9 +24,9 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
-            - create index demo_idx1 on demo(col1) split into 1 tablets;
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
+            - create unique index demo_idx1 on demo(col1) split into 1 tablets;
diff --git a/config/yugabyte/non-colocated/deletes_batched_extra_index_10.yaml b/config/yugabyte/non-colocated/deletes_batched_extra_index_10.yaml
index ee78a0991..4f6a8b4c8 100644
--- a/config/yugabyte/non-colocated/deletes_batched_extra_index_10.yaml
+++ b/config/yugabyte/non-colocated/deletes_batched_extra_index_10.yaml
@@ -24,18 +24,18 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
-            - create index demo_idx1 on demo(col1) split into 1 tablets;
-            - create index demo_idx2 on demo(col2) split into 1 tablets;
-            - create index demo_idx3 on demo(col3) split into 1 tablets;
-            - create index demo_idx4 on demo(col4) split into 1 tablets;
-            - create index demo_idx5 on demo(col5) split into 1 tablets;
-            - create index demo_idx6 on demo(col6) split into 1 tablets;
-            - create index demo_idx7 on demo(col7) split into 1 tablets;
-            - create index demo_idx8 on demo(col8) split into 1 tablets;
-            - create index demo_idx9 on demo(col9) split into 1 tablets;
-            - create index demo_idx10 on demo(col10) split into 1 tablets;
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
+            - create unique index demo_idx1 on demo(col1) split into 1 tablets;
+            - create unique index demo_idx2 on demo(col2) split into 1 tablets;
+            - create unique index demo_idx3 on demo(col3) split into 1 tablets;
+            - create unique index demo_idx4 on demo(col4) split into 1 tablets;
+            - create unique index demo_idx5 on demo(col5) split into 1 tablets;
+            - create unique index demo_idx6 on demo(col6) split into 1 tablets;
+            - create unique index demo_idx7 on demo(col7) split into 1 tablets;
+            - create unique index demo_idx8 on demo(col8) split into 1 tablets;
+            - create unique index demo_idx9 on demo(col9) split into 1 tablets;
+            - create unique index demo_idx10 on demo(col10) split into 1 tablets;
diff --git a/config/yugabyte/non-colocated/deletes_batched_extra_index_2.yaml b/config/yugabyte/non-colocated/deletes_batched_extra_index_2.yaml
index 87f1c90ae..26b7500e8 100644
--- a/config/yugabyte/non-colocated/deletes_batched_extra_index_2.yaml
+++ b/config/yugabyte/non-colocated/deletes_batched_extra_index_2.yaml
@@ -24,10 +24,10 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
-            - create index demo_idx1 on demo(col1) split into 1 tablets;
-            - create index demo_idx2 on demo(col2) split into 1 tablets;
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
+            - create unique index demo_idx1 on demo(col1) split into 1 tablets;
+            - create unique index demo_idx2 on demo(col2) split into 1 tablets;
\ No newline at end of file
diff --git a/config/yugabyte/non-colocated/deletes_batched_extra_index_3.yaml b/config/yugabyte/non-colocated/deletes_batched_extra_index_3.yaml
index 44eb2dce5..8ca55ab62 100644
--- a/config/yugabyte/non-colocated/deletes_batched_extra_index_3.yaml
+++ b/config/yugabyte/non-colocated/deletes_batched_extra_index_3.yaml
@@ -24,11 +24,11 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
-            - create index demo_idx1 on demo(col1) split into 1 tablets;
-            - create index demo_idx2 on demo(col2) split into 1 tablets;
-            - create index demo_idx3 on demo(col3) split into 1 tablets;
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
+            - create unique index demo_idx1 on demo(col1) split into 1 tablets;
+            - create unique index demo_idx2 on demo(col2) split into 1 tablets;
+            - create unique index demo_idx3 on demo(col3) split into 1 tablets;
\ No newline at end of file
diff --git a/config/yugabyte/non-colocated/deletes_batched_extra_index_5.yaml b/config/yugabyte/non-colocated/deletes_batched_extra_index_5.yaml
index 7b3cb446d..10e04106e 100644
--- a/config/yugabyte/non-colocated/deletes_batched_extra_index_5.yaml
+++ b/config/yugabyte/non-colocated/deletes_batched_extra_index_5.yaml
@@ -24,13 +24,13 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
-            - create index demo_idx1 on demo(col1) split into 1 tablets;
-            - create index demo_idx2 on demo(col2) split into 1 tablets;
-            - create index demo_idx3 on demo(col3) split into 1 tablets;
-            - create index demo_idx4 on demo(col4) split into 1 tablets;
-            - create index demo_idx5 on demo(col5) split into 1 tablets;
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
+            - create unique index demo_idx1 on demo(col1) split into 1 tablets;
+            - create unique index demo_idx2 on demo(col2) split into 1 tablets;
+            - create unique index demo_idx3 on demo(col3) split into 1 tablets;
+            - create unique index demo_idx4 on demo(col4) split into 1 tablets;
+            - create unique index demo_idx5 on demo(col5) split into 1 tablets;
diff --git a/config/yugabyte/non-colocated/deletes_sequential_extra_index_0.yaml b/config/yugabyte/non-colocated/deletes_sequential_extra_index_0.yaml
index 72771b7ee..fda9ef15c 100644
--- a/config/yugabyte/non-colocated/deletes_sequential_extra_index_0.yaml
+++ b/config/yugabyte/non-colocated/deletes_sequential_extra_index_0.yaml
@@ -24,8 +24,8 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
diff --git a/config/yugabyte/non-colocated/deletes_sequential_extra_index_1.yaml b/config/yugabyte/non-colocated/deletes_sequential_extra_index_1.yaml
index 0e9009044..0cec5cd8e 100644
--- a/config/yugabyte/non-colocated/deletes_sequential_extra_index_1.yaml
+++ b/config/yugabyte/non-colocated/deletes_sequential_extra_index_1.yaml
@@ -24,9 +24,9 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
-            - create index demo_idx1 on demo(col1) split into 1 tablets;
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
+            - create unique index demo_idx1 on demo(col1) split into 1 tablets;
diff --git a/config/yugabyte/non-colocated/deletes_sequential_extra_index_10.yaml b/config/yugabyte/non-colocated/deletes_sequential_extra_index_10.yaml
index bc74e9f93..d3dfb0e6d 100644
--- a/config/yugabyte/non-colocated/deletes_sequential_extra_index_10.yaml
+++ b/config/yugabyte/non-colocated/deletes_sequential_extra_index_10.yaml
@@ -24,18 +24,18 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
-            - create index demo_idx1 on demo(col1) split into 1 tablets;
-            - create index demo_idx2 on demo(col2) split into 1 tablets;
-            - create index demo_idx3 on demo(col3) split into 1 tablets;
-            - create index demo_idx4 on demo(col4) split into 1 tablets;
-            - create index demo_idx5 on demo(col5) split into 1 tablets;
-            - create index demo_idx6 on demo(col6) split into 1 tablets;
-            - create index demo_idx7 on demo(col7) split into 1 tablets;
-            - create index demo_idx8 on demo(col8) split into 1 tablets;
-            - create index demo_idx9 on demo(col9) split into 1 tablets;
-            - create index demo_idx10 on demo(col10) split into 1 tablets;
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
+            - create unique index demo_idx1 on demo(col1) split into 1 tablets;
+            - create unique index demo_idx2 on demo(col2) split into 1 tablets;
+            - create unique index demo_idx3 on demo(col3) split into 1 tablets;
+            - create unique index demo_idx4 on demo(col4) split into 1 tablets;
+            - create unique index demo_idx5 on demo(col5) split into 1 tablets;
+            - create unique index demo_idx6 on demo(col6) split into 1 tablets;
+            - create unique index demo_idx7 on demo(col7) split into 1 tablets;
+            - create unique index demo_idx8 on demo(col8) split into 1 tablets;
+            - create unique index demo_idx9 on demo(col9) split into 1 tablets;
+            - create unique index demo_idx10 on demo(col10) split into 1 tablets;
\ No newline at end of file
diff --git a/config/yugabyte/non-colocated/deletes_sequential_extra_index_2.yaml b/config/yugabyte/non-colocated/deletes_sequential_extra_index_2.yaml
index 48bc5d49e..de472a715 100644
--- a/config/yugabyte/non-colocated/deletes_sequential_extra_index_2.yaml
+++ b/config/yugabyte/non-colocated/deletes_sequential_extra_index_2.yaml
@@ -24,10 +24,10 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
-            - create index demo_idx1 on demo(col1) split into 1 tablets;
-            - create index demo_idx2 on demo(col2) split into 1 tablets;
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
+            - create unique index demo_idx1 on demo(col1) split into 1 tablets;
+            - create unique index demo_idx2 on demo(col2) split into 1 tablets;
\ No newline at end of file
diff --git a/config/yugabyte/non-colocated/deletes_sequential_extra_index_3.yaml b/config/yugabyte/non-colocated/deletes_sequential_extra_index_3.yaml
index e4e714e26..e53eae840 100644
--- a/config/yugabyte/non-colocated/deletes_sequential_extra_index_3.yaml
+++ b/config/yugabyte/non-colocated/deletes_sequential_extra_index_3.yaml
@@ -24,11 +24,11 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
-            - create index demo_idx1 on demo(col1) split into 1 tablets;
-            - create index demo_idx2 on demo(col2) split into 1 tablets;
-            - create index demo_idx3 on demo(col3) split into 1 tablets;
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
+            - create unique index demo_idx1 on demo(col1) split into 1 tablets;
+            - create unique index demo_idx2 on demo(col2) split into 1 tablets;
+            - create unique index demo_idx3 on demo(col3) split into 1 tablets;
\ No newline at end of file
diff --git a/config/yugabyte/non-colocated/deletes_sequential_extra_index_5.yaml b/config/yugabyte/non-colocated/deletes_sequential_extra_index_5.yaml
index 11dcef640..e983fb8c8 100644
--- a/config/yugabyte/non-colocated/deletes_sequential_extra_index_5.yaml
+++ b/config/yugabyte/non-colocated/deletes_sequential_extra_index_5.yaml
@@ -24,13 +24,13 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
-            - create index demo_idx1 on demo(col1) split into 1 tablets;
-            - create index demo_idx2 on demo(col2) split into 1 tablets;
-            - create index demo_idx3 on demo(col3) split into 1 tablets;
-            - create index demo_idx4 on demo(col4) split into 1 tablets;
-            - create index demo_idx5 on demo(col5) split into 1 tablets;
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
+            - create unique index demo_idx1 on demo(col1) split into 1 tablets;
+            - create unique index demo_idx2 on demo(col2) split into 1 tablets;
+            - create unique index demo_idx3 on demo(col3) split into 1 tablets;
+            - create unique index demo_idx4 on demo(col4) split into 1 tablets;
+            - create unique index demo_idx5 on demo(col5) split into 1 tablets;
\ No newline at end of file
diff --git a/config/yugabyte/non-colocated/insert_batched_extra_index_0.yaml b/config/yugabyte/non-colocated/insert_batched_extra_index_0.yaml
index 19d8e4eed..4237ea78b 100644
--- a/config/yugabyte/non-colocated/insert_batched_extra_index_0.yaml
+++ b/config/yugabyte/non-colocated/insert_batched_extra_index_0.yaml
@@ -24,8 +24,8 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
diff --git a/config/yugabyte/non-colocated/insert_batched_extra_index_1.yaml b/config/yugabyte/non-colocated/insert_batched_extra_index_1.yaml
index 3e3c2e4f0..98614ba57 100644
--- a/config/yugabyte/non-colocated/insert_batched_extra_index_1.yaml
+++ b/config/yugabyte/non-colocated/insert_batched_extra_index_1.yaml
@@ -24,9 +24,9 @@ microbenchmark:
                 AS $$
                 DECLARE
                 BEGIN
-                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
                 END;
                 $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
-            - create index demo_idx1 on demo(col1) split into 1 tablets;
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
+            - create unique index demo_idx1 on demo(col1) split into 1 tablets;
\ No newline at end of file
diff --git a/config/yugabyte/non-colocated/insert_batched_extra_index_10.yaml b/config/yugabyte/non-colocated/insert_batched_extra_index_10.yaml
index 10a46f8dd..57598ed5a 100644
--- a/config/yugabyte/non-colocated/insert_batched_extra_index_10.yaml
+++ b/config/yugabyte/non-colocated/insert_batched_extra_index_10.yaml
@@ -24,18 +24,18 @@ microbenchmark:
                 AS $$
                 DECLARE
                 BEGIN
-                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
                 END;
                 $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
-            - create index demo_idx1 on demo(col1) split into 1 tablets;
-            - create index demo_idx2 on demo(col2) split into 1 tablets;
-            - create index demo_idx3 on demo(col3) split into 1 tablets;
-            - create index demo_idx4 on demo(col4) split into 1 tablets;
-            - create index demo_idx5 on demo(col5) split into 1 tablets;
-            - create index demo_idx6 on demo(col6) split into 1 tablets;
-            - create index demo_idx7 on demo(col7) split into 1 tablets;
-            - create index demo_idx8 on demo(col8) split into 1 tablets;
-            - create index demo_idx9 on demo(col9) split into 1 tablets;
-            - create index demo_idx10 on demo(col10) split into 1 tablets;
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
+            - create unique index demo_idx1 on demo(col1) split into 1 tablets;
+            - create unique index demo_idx2 on demo(col2) split into 1 tablets;
+            - create unique index demo_idx3 on demo(col3) split into 1 tablets;
+            - create unique index demo_idx4 on demo(col4) split into 1 tablets;
+            - create unique index demo_idx5 on demo(col5) split into 1 tablets;
+            - create unique index demo_idx6 on demo(col6) split into 1 tablets;
+            - create unique index demo_idx7 on demo(col7) split into 1 tablets;
+            - create unique index demo_idx8 on demo(col8) split into 1 tablets;
+            - create unique index demo_idx9 on demo(col9) split into 1 tablets;
+            - create unique index demo_idx10 on demo(col10) split into 1 tablets;
diff --git a/config/yugabyte/non-colocated/insert_batched_extra_index_2.yaml b/config/yugabyte/non-colocated/insert_batched_extra_index_2.yaml
index c3752ad40..e3be220d6 100644
--- a/config/yugabyte/non-colocated/insert_batched_extra_index_2.yaml
+++ b/config/yugabyte/non-colocated/insert_batched_extra_index_2.yaml
@@ -24,10 +24,10 @@ microbenchmark:
                 AS $$
                 DECLARE
                 BEGIN
-                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
                 END;
                 $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
-            - create index demo_idx1 on demo(col1) split into 1 tablets;
-            - create index demo_idx2 on demo(col2) split into 1 tablets;
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
+            - create unique index demo_idx1 on demo(col1) split into 1 tablets;
+            - create unique index demo_idx2 on demo(col2) split into 1 tablets;
diff --git a/config/yugabyte/non-colocated/insert_batched_extra_index_3.yaml b/config/yugabyte/non-colocated/insert_batched_extra_index_3.yaml
index aa4dc91a0..7619b3cd0 100644
--- a/config/yugabyte/non-colocated/insert_batched_extra_index_3.yaml
+++ b/config/yugabyte/non-colocated/insert_batched_extra_index_3.yaml
@@ -24,11 +24,11 @@ microbenchmark:
                 AS $$
                 DECLARE
                 BEGIN
-                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
                 END;
                 $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
-            - create index demo_idx1 on demo(col1) split into 1 tablets;
-            - create index demo_idx2 on demo(col2) split into 1 tablets;
-            - create index demo_idx3 on demo(col3) split into 1 tablets;
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
+            - create unique index demo_idx1 on demo(col1) split into 1 tablets;
+            - create unique index demo_idx2 on demo(col2) split into 1 tablets;
+            - create unique index demo_idx3 on demo(col3) split into 1 tablets;
\ No newline at end of file
diff --git a/config/yugabyte/non-colocated/insert_batched_extra_index_5.yaml b/config/yugabyte/non-colocated/insert_batched_extra_index_5.yaml
index 8b1d28840..21f630c85 100644
--- a/config/yugabyte/non-colocated/insert_batched_extra_index_5.yaml
+++ b/config/yugabyte/non-colocated/insert_batched_extra_index_5.yaml
@@ -24,13 +24,13 @@ microbenchmark:
                 AS $$
                 DECLARE
                 BEGIN
-                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
                 END;
                 $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
-            - create index demo_idx1 on demo(col1) split into 1 tablets;
-            - create index demo_idx2 on demo(col2) split into 1 tablets;
-            - create index demo_idx3 on demo(col3) split into 1 tablets;
-            - create index demo_idx4 on demo(col4) split into 1 tablets;
-            - create index demo_idx5 on demo(col5) split into 1 tablets;
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
+            - create unique index demo_idx1 on demo(col1) split into 1 tablets;
+            - create unique index demo_idx2 on demo(col2) split into 1 tablets;
+            - create unique index demo_idx3 on demo(col3) split into 1 tablets;
+            - create unique index demo_idx4 on demo(col4) split into 1 tablets;
+            - create unique index demo_idx5 on demo(col5) split into 1 tablets;
diff --git a/config/yugabyte/non-colocated/insert_sequential_extra_index_0.yaml b/config/yugabyte/non-colocated/insert_sequential_extra_index_0.yaml
index be55ce3c4..8a509ea3b 100644
--- a/config/yugabyte/non-colocated/insert_sequential_extra_index_0.yaml
+++ b/config/yugabyte/non-colocated/insert_sequential_extra_index_0.yaml
@@ -24,8 +24,8 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
diff --git a/config/yugabyte/non-colocated/insert_sequential_extra_index_1.yaml b/config/yugabyte/non-colocated/insert_sequential_extra_index_1.yaml
index 622b49dbf..9310a5744 100644
--- a/config/yugabyte/non-colocated/insert_sequential_extra_index_1.yaml
+++ b/config/yugabyte/non-colocated/insert_sequential_extra_index_1.yaml
@@ -24,9 +24,9 @@ microbenchmark:
                 AS $$
                 DECLARE
                 BEGIN
-                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
                 END;
                 $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
-            - create index demo_idx1 on demo(col1) split into 1 tablets;
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
+            - create unique index demo_idx1 on demo(col1) split into 1 tablets;
\ No newline at end of file
diff --git a/config/yugabyte/non-colocated/insert_sequential_extra_index_10.yaml b/config/yugabyte/non-colocated/insert_sequential_extra_index_10.yaml
index 533a03439..58cf44d7f 100644
--- a/config/yugabyte/non-colocated/insert_sequential_extra_index_10.yaml
+++ b/config/yugabyte/non-colocated/insert_sequential_extra_index_10.yaml
@@ -24,18 +24,18 @@ microbenchmark:
                 AS $$
                 DECLARE
                 BEGIN
-                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
                 END;
                 $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
-            - create index demo_idx1 on demo(col1) split into 1 tablets;
-            - create index demo_idx2 on demo(col2) split into 1 tablets;
-            - create index demo_idx3 on demo(col3) split into 1 tablets;
-            - create index demo_idx4 on demo(col4) split into 1 tablets;
-            - create index demo_idx5 on demo(col5) split into 1 tablets;
-            - create index demo_idx6 on demo(col6) split into 1 tablets;
-            - create index demo_idx7 on demo(col7) split into 1 tablets;
-            - create index demo_idx8 on demo(col8) split into 1 tablets;
-            - create index demo_idx9 on demo(col9) split into 1 tablets;
-            - create index demo_idx10 on demo(col10) split into 1 tablets;
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
+            - create unique index demo_idx1 on demo(col1) split into 1 tablets;
+            - create unique index demo_idx2 on demo(col2) split into 1 tablets;
+            - create unique index demo_idx3 on demo(col3) split into 1 tablets;
+            - create unique index demo_idx4 on demo(col4) split into 1 tablets;
+            - create unique index demo_idx5 on demo(col5) split into 1 tablets;
+            - create unique index demo_idx6 on demo(col6) split into 1 tablets;
+            - create unique index demo_idx7 on demo(col7) split into 1 tablets;
+            - create unique index demo_idx8 on demo(col8) split into 1 tablets;
+            - create unique index demo_idx9 on demo(col9) split into 1 tablets;
+            - create unique index demo_idx10 on demo(col10) split into 1 tablets;
diff --git a/config/yugabyte/non-colocated/insert_sequential_extra_index_2.yaml b/config/yugabyte/non-colocated/insert_sequential_extra_index_2.yaml
index 49cefc24c..9d14cc83a 100644
--- a/config/yugabyte/non-colocated/insert_sequential_extra_index_2.yaml
+++ b/config/yugabyte/non-colocated/insert_sequential_extra_index_2.yaml
@@ -24,10 +24,10 @@ microbenchmark:
                 AS $$
                 DECLARE
                 BEGIN
-                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
                 END;
                 $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
-            - create index demo_idx1 on demo(col1) split into 1 tablets;
-            - create index demo_idx2 on demo(col2) split into 1 tablets;
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
+            - create unique index demo_idx1 on demo(col1) split into 1 tablets;
+            - create unique index demo_idx2 on demo(col2) split into 1 tablets;
diff --git a/config/yugabyte/non-colocated/insert_sequential_extra_index_3.yaml b/config/yugabyte/non-colocated/insert_sequential_extra_index_3.yaml
index 7eb2ce331..4c39198b5 100644
--- a/config/yugabyte/non-colocated/insert_sequential_extra_index_3.yaml
+++ b/config/yugabyte/non-colocated/insert_sequential_extra_index_3.yaml
@@ -24,11 +24,11 @@ microbenchmark:
                 AS $$
                 DECLARE
                 BEGIN
-                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
                 END;
                 $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
-            - create index demo_idx1 on demo(col1) split into 1 tablets;
-            - create index demo_idx2 on demo(col2) split into 1 tablets;
-            - create index demo_idx3 on demo(col3) split into 1 tablets;
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
+            - create unique index demo_idx1 on demo(col1) split into 1 tablets;
+            - create unique index demo_idx2 on demo(col2) split into 1 tablets;
+            - create unique index demo_idx3 on demo(col3) split into 1 tablets;
\ No newline at end of file
diff --git a/config/yugabyte/non-colocated/insert_sequential_extra_index_5.yaml b/config/yugabyte/non-colocated/insert_sequential_extra_index_5.yaml
index 90d897c4a..94128da78 100644
--- a/config/yugabyte/non-colocated/insert_sequential_extra_index_5.yaml
+++ b/config/yugabyte/non-colocated/insert_sequential_extra_index_5.yaml
@@ -24,13 +24,13 @@ microbenchmark:
                 AS $$
                 DECLARE
                 BEGIN
-                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+                insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
                 END;
                 $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
-            - create index demo_idx1 on demo(col1) split into 1 tablets;
-            - create index demo_idx2 on demo(col2) split into 1 tablets;
-            - create index demo_idx3 on demo(col3) split into 1 tablets;
-            - create index demo_idx4 on demo(col4) split into 1 tablets;
-            - create index demo_idx5 on demo(col5) split into 1 tablets;
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
+            - create unique index demo_idx1 on demo(col1) split into 1 tablets;
+            - create unique index demo_idx2 on demo(col2) split into 1 tablets;
+            - create unique index demo_idx3 on demo(col3) split into 1 tablets;
+            - create unique index demo_idx4 on demo(col4) split into 1 tablets;
+            - create unique index demo_idx5 on demo(col5) split into 1 tablets;
diff --git a/config/yugabyte/non-colocated/updates_batched_extra_index_0.yaml b/config/yugabyte/non-colocated/updates_batched_extra_index_0.yaml
index 67ac57a23..70492c890 100644
--- a/config/yugabyte/non-colocated/updates_batched_extra_index_0.yaml
+++ b/config/yugabyte/non-colocated/updates_batched_extra_index_0.yaml
@@ -24,8 +24,8 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
diff --git a/config/yugabyte/non-colocated/updates_batched_extra_index_1.yaml b/config/yugabyte/non-colocated/updates_batched_extra_index_1.yaml
index 268a97156..ca840af3b 100644
--- a/config/yugabyte/non-colocated/updates_batched_extra_index_1.yaml
+++ b/config/yugabyte/non-colocated/updates_batched_extra_index_1.yaml
@@ -24,9 +24,9 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
-            - create index demo_idx1 on demo(col1) split into 1 tablets;
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
+            - create unique index demo_idx1 on demo(col1) split into 1 tablets;
\ No newline at end of file
diff --git a/config/yugabyte/non-colocated/updates_batched_extra_index_10.yaml b/config/yugabyte/non-colocated/updates_batched_extra_index_10.yaml
index d6cf38978..e2aea3231 100644
--- a/config/yugabyte/non-colocated/updates_batched_extra_index_10.yaml
+++ b/config/yugabyte/non-colocated/updates_batched_extra_index_10.yaml
@@ -24,18 +24,18 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
-            - create index demo_idx1 on demo(col1) split into 1 tablets;
-            - create index demo_idx2 on demo(col2) split into 1 tablets;
-            - create index demo_idx3 on demo(col3) split into 1 tablets;
-            - create index demo_idx4 on demo(col4) split into 1 tablets;
-            - create index demo_idx5 on demo(col5) split into 1 tablets;
-            - create index demo_idx6 on demo(col6) split into 1 tablets;
-            - create index demo_idx7 on demo(col7) split into 1 tablets;
-            - create index demo_idx8 on demo(col8) split into 1 tablets;
-            - create index demo_idx9 on demo(col9) split into 1 tablets;
-            - create index demo_idx10 on demo(col10) split into 1 tablets;
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
+            - create unique index demo_idx1 on demo(col1) split into 1 tablets;
+            - create unique index demo_idx2 on demo(col2) split into 1 tablets;
+            - create unique index demo_idx3 on demo(col3) split into 1 tablets;
+            - create unique index demo_idx4 on demo(col4) split into 1 tablets;
+            - create unique index demo_idx5 on demo(col5) split into 1 tablets;
+            - create unique index demo_idx6 on demo(col6) split into 1 tablets;
+            - create unique index demo_idx7 on demo(col7) split into 1 tablets;
+            - create unique index demo_idx8 on demo(col8) split into 1 tablets;
+            - create unique index demo_idx9 on demo(col9) split into 1 tablets;
+            - create unique index demo_idx10 on demo(col10) split into 1 tablets;
\ No newline at end of file
diff --git a/config/yugabyte/non-colocated/updates_batched_extra_index_2.yaml b/config/yugabyte/non-colocated/updates_batched_extra_index_2.yaml
index f40324b3d..e46a0d303 100644
--- a/config/yugabyte/non-colocated/updates_batched_extra_index_2.yaml
+++ b/config/yugabyte/non-colocated/updates_batched_extra_index_2.yaml
@@ -24,10 +24,10 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
-            - create index demo_idx1 on demo(col1) split into 1 tablets;
-            - create index demo_idx2 on demo(col2) split into 1 tablets;
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
+            - create unique index demo_idx1 on demo(col1) split into 1 tablets;
+            - create unique index demo_idx2 on demo(col2) split into 1 tablets;
\ No newline at end of file
diff --git a/config/yugabyte/non-colocated/updates_batched_extra_index_3.yaml b/config/yugabyte/non-colocated/updates_batched_extra_index_3.yaml
index f1fdf02e6..00ef8c311 100644
--- a/config/yugabyte/non-colocated/updates_batched_extra_index_3.yaml
+++ b/config/yugabyte/non-colocated/updates_batched_extra_index_3.yaml
@@ -24,11 +24,11 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
-            - create index demo_idx1 on demo(col1) split into 1 tablets;
-            - create index demo_idx2 on demo(col2) split into 1 tablets;
-            - create index demo_idx3 on demo(col3) split into 1 tablets;
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
+            - create unique index demo_idx1 on demo(col1) split into 1 tablets;
+            - create unique index demo_idx2 on demo(col2) split into 1 tablets;
+            - create unique index demo_idx3 on demo(col3) split into 1 tablets;
\ No newline at end of file
diff --git a/config/yugabyte/non-colocated/updates_batched_extra_index_5.yaml b/config/yugabyte/non-colocated/updates_batched_extra_index_5.yaml
index e759562da..902a5b78b 100644
--- a/config/yugabyte/non-colocated/updates_batched_extra_index_5.yaml
+++ b/config/yugabyte/non-colocated/updates_batched_extra_index_5.yaml
@@ -24,13 +24,13 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
-            - create index demo_idx1 on demo(col1) split into 1 tablets;
-            - create index demo_idx2 on demo(col2) split into 1 tablets;
-            - create index demo_idx3 on demo(col3) split into 1 tablets;
-            - create index demo_idx4 on demo(col4) split into 1 tablets;
-            - create index demo_idx5 on demo(col5) split into 1 tablets;
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
+            - create unique index demo_idx1 on demo(col1) split into 1 tablets;
+            - create unique index demo_idx2 on demo(col2) split into 1 tablets;
+            - create unique index demo_idx3 on demo(col3) split into 1 tablets;
+            - create unique index demo_idx4 on demo(col4) split into 1 tablets;
+            - create unique index demo_idx5 on demo(col5) split into 1 tablets;
\ No newline at end of file
diff --git a/config/yugabyte/non-colocated/updates_sequential_extra_index_0.yaml b/config/yugabyte/non-colocated/updates_sequential_extra_index_0.yaml
index 65adbbb07..d8ffe0470 100644
--- a/config/yugabyte/non-colocated/updates_sequential_extra_index_0.yaml
+++ b/config/yugabyte/non-colocated/updates_sequential_extra_index_0.yaml
@@ -24,8 +24,8 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
diff --git a/config/yugabyte/non-colocated/updates_sequential_extra_index_1.yaml b/config/yugabyte/non-colocated/updates_sequential_extra_index_1.yaml
index be865b9bb..e4f99b35b 100644
--- a/config/yugabyte/non-colocated/updates_sequential_extra_index_1.yaml
+++ b/config/yugabyte/non-colocated/updates_sequential_extra_index_1.yaml
@@ -24,9 +24,9 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
-            - create index demo_idx1 on demo(col1) split into 1 tablets;
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
+            - create unique index demo_idx1 on demo(col1) split into 1 tablets;
\ No newline at end of file
diff --git a/config/yugabyte/non-colocated/updates_sequential_extra_index_10.yaml b/config/yugabyte/non-colocated/updates_sequential_extra_index_10.yaml
index 64917e4be..bf627e9f0 100644
--- a/config/yugabyte/non-colocated/updates_sequential_extra_index_10.yaml
+++ b/config/yugabyte/non-colocated/updates_sequential_extra_index_10.yaml
@@ -24,18 +24,18 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
-            - create index demo_idx1 on demo(col1) split into 1 tablets;
-            - create index demo_idx2 on demo(col2) split into 1 tablets;
-            - create index demo_idx3 on demo(col3) split into 1 tablets;
-            - create index demo_idx4 on demo(col4) split into 1 tablets;
-            - create index demo_idx5 on demo(col5) split into 1 tablets;
-            - create index demo_idx6 on demo(col6) split into 1 tablets;
-            - create index demo_idx7 on demo(col7) split into 1 tablets;
-            - create index demo_idx8 on demo(col8) split into 1 tablets;
-            - create index demo_idx9 on demo(col9) split into 1 tablets;
-            - create index demo_idx10 on demo(col10) split into 1 tablets;
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
+            - create unique index demo_idx1 on demo(col1) split into 1 tablets;
+            - create unique index demo_idx2 on demo(col2) split into 1 tablets;
+            - create unique index demo_idx3 on demo(col3) split into 1 tablets;
+            - create unique index demo_idx4 on demo(col4) split into 1 tablets;
+            - create unique index demo_idx5 on demo(col5) split into 1 tablets;
+            - create unique index demo_idx6 on demo(col6) split into 1 tablets;
+            - create unique index demo_idx7 on demo(col7) split into 1 tablets;
+            - create unique index demo_idx8 on demo(col8) split into 1 tablets;
+            - create unique index demo_idx9 on demo(col9) split into 1 tablets;
+            - create unique index demo_idx10 on demo(col10) split into 1 tablets;
\ No newline at end of file
diff --git a/config/yugabyte/non-colocated/updates_sequential_extra_index_2.yaml b/config/yugabyte/non-colocated/updates_sequential_extra_index_2.yaml
index 646fb4ffa..ae60f655c 100644
--- a/config/yugabyte/non-colocated/updates_sequential_extra_index_2.yaml
+++ b/config/yugabyte/non-colocated/updates_sequential_extra_index_2.yaml
@@ -24,10 +24,10 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
-            - create index demo_idx1 on demo(col1) split into 1 tablets;
-            - create index demo_idx2 on demo(col2) split into 1 tablets;
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
+            - create unique index demo_idx1 on demo(col1) split into 1 tablets;
+            - create unique index demo_idx2 on demo(col2) split into 1 tablets;
\ No newline at end of file
diff --git a/config/yugabyte/non-colocated/updates_sequential_extra_index_3.yaml b/config/yugabyte/non-colocated/updates_sequential_extra_index_3.yaml
index b3def73c8..b83dd7d22 100644
--- a/config/yugabyte/non-colocated/updates_sequential_extra_index_3.yaml
+++ b/config/yugabyte/non-colocated/updates_sequential_extra_index_3.yaml
@@ -24,11 +24,11 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
-            - create index demo_idx1 on demo(col1) split into 1 tablets;
-            - create index demo_idx2 on demo(col2) split into 1 tablets;
-            - create index demo_idx3 on demo(col3) split into 1 tablets;
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
+            - create unique index demo_idx1 on demo(col1) split into 1 tablets;
+            - create unique index demo_idx2 on demo(col2) split into 1 tablets;
+            - create unique index demo_idx3 on demo(col3) split into 1 tablets;
\ No newline at end of file
diff --git a/config/yugabyte/non-colocated/updates_sequential_extra_index_5.yaml b/config/yugabyte/non-colocated/updates_sequential_extra_index_5.yaml
index 6ef7c5e43..2a26fb90a 100644
--- a/config/yugabyte/non-colocated/updates_sequential_extra_index_5.yaml
+++ b/config/yugabyte/non-colocated/updates_sequential_extra_index_5.yaml
@@ -24,13 +24,13 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n, n, n, n, n, n, n, n, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
-            - create index demo_idx1 on demo(col1) split into 1 tablets;
-            - create index demo_idx2 on demo(col2) split into 1 tablets;
-            - create index demo_idx3 on demo(col3) split into 1 tablets;
-            - create index demo_idx4 on demo(col4) split into 1 tablets;
-            - create index demo_idx5 on demo(col5) split into 1 tablets;
\ No newline at end of file
+            - create table demo (id int not null primary key, col1 int not null, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int) split into 1 tablets;
+            - create unique index demo_idx1 on demo(col1) split into 1 tablets;
+            - create unique index demo_idx2 on demo(col2) split into 1 tablets;
+            - create unique index demo_idx3 on demo(col3) split into 1 tablets;
+            - create unique index demo_idx4 on demo(col4) split into 1 tablets;
+            - create unique index demo_idx5 on demo(col5) split into 1 tablets;
\ No newline at end of file
diff --git a/src/main/java/com/oltpbenchmark/benchmarks/featurebench/customworkload/YBMicroBenchmarkDeletesBatched.java b/src/main/java/com/oltpbenchmark/benchmarks/featurebench/customworkload/YBMicroBenchmarkDeletesBatched.java
index 068e6b850..c8d6d6d95 100644
--- a/src/main/java/com/oltpbenchmark/benchmarks/featurebench/customworkload/YBMicroBenchmarkDeletesBatched.java
+++ b/src/main/java/com/oltpbenchmark/benchmarks/featurebench/customworkload/YBMicroBenchmarkDeletesBatched.java
@@ -13,7 +13,7 @@ public class YBMicroBenchmarkDeletesBatched extends YBMicroBenchmark {
   public final static Logger LOG =
       Logger.getLogger(com.oltpbenchmark.benchmarks.featurebench.customworkload
                            .YBMicroBenchmarkDeletesBatched.class);
-  private static final int NUM_ROWS = 10000;
+  private static final int NUM_ROWS = 1000;
 
   public YBMicroBenchmarkDeletesBatched(
       HierarchicalConfiguration<ImmutableNode> config) {
@@ -29,7 +29,18 @@ public void loadOnce(Connection conn) throws SQLException {
   }
 
   public void executeOnce(Connection conn) throws SQLException {
-    String batchedDeleteStatement = String.format("delete from demo");
+    String inClause = "(";
+    for (int i = 101; i <= NUM_ROWS; i++) {
+      inClause += String.format("%d", i);
+      if (i < NUM_ROWS) {
+        inClause += ",";
+      }
+    }
+    inClause += ")";
+
+    // Delete the last 900 rows.
+    String batchedDeleteStatement =
+        String.format("delete from demo where id in %s", inClause);
     Statement stmtObj = conn.createStatement();
     stmtObj.execute(batchedDeleteStatement);
     stmtObj.close();
diff --git a/src/main/java/com/oltpbenchmark/benchmarks/featurebench/customworkload/YBMicroBenchmarkDeletesSequential.java b/src/main/java/com/oltpbenchmark/benchmarks/featurebench/customworkload/YBMicroBenchmarkDeletesSequential.java
index 09d473ea4..2669ab1dd 100644
--- a/src/main/java/com/oltpbenchmark/benchmarks/featurebench/customworkload/YBMicroBenchmarkDeletesSequential.java
+++ b/src/main/java/com/oltpbenchmark/benchmarks/featurebench/customworkload/YBMicroBenchmarkDeletesSequential.java
@@ -13,7 +13,7 @@ public class YBMicroBenchmarkDeletesSequential extends YBMicroBenchmark {
   public final static Logger LOG =
       Logger.getLogger(com.oltpbenchmark.benchmarks.featurebench.customworkload
                            .YBMicroBenchmarkDeletesSequential.class);
-  private static final int NUM_ROWS = 10000;
+  private static final int NUM_ROWS = 1000;
 
   public YBMicroBenchmarkDeletesSequential(
       HierarchicalConfiguration<ImmutableNode> config) {
@@ -30,7 +30,8 @@ public void loadOnce(Connection conn) throws SQLException {
 
   public void executeOnce(Connection conn) throws SQLException {
     Statement stmtObj = conn.createStatement();
-    for (int id = 1; id <= NUM_ROWS; id++) {
+    // Delete last 900 rows sequentially.
+    for (int id = 101; id <= NUM_ROWS; id++) {
       stmtObj.execute(String.format("delete from demo where id = %d;", id));
     }
     stmtObj.close();
diff --git a/src/main/java/com/oltpbenchmark/benchmarks/featurebench/customworkload/YBMicroBenchmarkInsertsBatched.java b/src/main/java/com/oltpbenchmark/benchmarks/featurebench/customworkload/YBMicroBenchmarkInsertsBatched.java
index c9bf55433..eac25e13d 100644
--- a/src/main/java/com/oltpbenchmark/benchmarks/featurebench/customworkload/YBMicroBenchmarkInsertsBatched.java
+++ b/src/main/java/com/oltpbenchmark/benchmarks/featurebench/customworkload/YBMicroBenchmarkInsertsBatched.java
@@ -21,15 +21,29 @@ public YBMicroBenchmarkInsertsBatched(
   }
 
   public void loadOnce(Connection conn) throws SQLException {
-    String insertStmt = "call insert_demo(10000);";
+    String insertStmt = "call insert_demo(100);";
     PreparedStatement stmt = conn.prepareStatement(insertStmt);
     stmt.execute();
     stmt.close();
   }
 
   public void executeOnce(Connection conn) throws SQLException {
-    String insertStmt1 =
-        "insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(10001,20000) n;";
+    String values = "";
+    for (int i = 101; i <= 1000; i++) {
+      values += "(";
+      for (int col = 1; col <= 11; col++) {
+        values += String.format("%d", i);
+        if (col < 11) {
+          values += ",";
+        }
+      }
+      values += ")";
+      if (i < 1000) {
+        values += ",";
+      }
+    }
+
+    String insertStmt1 = String.format("insert into demo values %s;", values);
     Statement stmtObj = conn.createStatement();
     stmtObj.execute(insertStmt1);
     stmtObj.close();
diff --git a/src/main/java/com/oltpbenchmark/benchmarks/featurebench/customworkload/YBMicroBenchmarkInsertsSequential.java b/src/main/java/com/oltpbenchmark/benchmarks/featurebench/customworkload/YBMicroBenchmarkInsertsSequential.java
index da35b7a53..afb54b118 100644
--- a/src/main/java/com/oltpbenchmark/benchmarks/featurebench/customworkload/YBMicroBenchmarkInsertsSequential.java
+++ b/src/main/java/com/oltpbenchmark/benchmarks/featurebench/customworkload/YBMicroBenchmarkInsertsSequential.java
@@ -21,7 +21,7 @@ public YBMicroBenchmarkInsertsSequential(
   }
 
   public void loadOnce(Connection conn) throws SQLException {
-    String insertStmt = "call insert_demo(10000);";
+    String insertStmt = "call insert_demo(100);";
     PreparedStatement stmt = conn.prepareStatement(insertStmt);
     stmt.execute();
     stmt.close();
@@ -29,12 +29,11 @@ public void loadOnce(Connection conn) throws SQLException {
 
   public void executeOnce(Connection conn) throws SQLException {
     Statement stmtObj = conn.createStatement();
-    String partialInsertQuery =
-        "insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n";
-    for (int id = 10001; id <= 20000; id++) {
-      String suffixInsertQuery =
-          String.format(" from generate_series(%d, %d) n;", id, id);
-      stmtObj.execute(partialInsertQuery + suffixInsertQuery);
+    for (int id = 101; id <= 1000; id++) {
+      String query = String.format(
+          "insert into demo values (%d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d)",
+          id, id, id, id, id, id, id, id, id, id, id);
+      stmtObj.execute(query);
     }
     stmtObj.close();
   }
diff --git a/src/main/java/com/oltpbenchmark/benchmarks/featurebench/customworkload/YBMicroBenchmarkUpdatesBatched.java b/src/main/java/com/oltpbenchmark/benchmarks/featurebench/customworkload/YBMicroBenchmarkUpdatesBatched.java
index 94ad46ab9..14190f73f 100644
--- a/src/main/java/com/oltpbenchmark/benchmarks/featurebench/customworkload/YBMicroBenchmarkUpdatesBatched.java
+++ b/src/main/java/com/oltpbenchmark/benchmarks/featurebench/customworkload/YBMicroBenchmarkUpdatesBatched.java
@@ -13,7 +13,7 @@ public class YBMicroBenchmarkUpdatesBatched extends YBMicroBenchmark {
   public final static Logger LOG =
       Logger.getLogger(com.oltpbenchmark.benchmarks.featurebench.customworkload
                            .YBMicroBenchmarkUpdatesBatched.class);
-  private static final int NUM_ROWS = 10000;
+  private static final int NUM_ROWS = 1000;
 
   public YBMicroBenchmarkUpdatesBatched(
       HierarchicalConfiguration<ImmutableNode> config) {
@@ -30,7 +30,7 @@ public void loadOnce(Connection conn) throws SQLException {
 
   public void executeOnce(Connection conn) throws SQLException {
     String inClause = "(";
-    for (int i = 1; i <= NUM_ROWS; i++) {
+    for (int i = 101; i <= NUM_ROWS; i++) {
       inClause += String.format("%d", i);
       if (i < NUM_ROWS) {
         inClause += ",";
@@ -38,10 +38,9 @@ public void executeOnce(Connection conn) throws SQLException {
     }
     inClause += ")";
 
-    // Update all the columns which have an index in the 10-index benchmark so
-    // that we can accurately determine the impact of maintaining indexes.
+    // Update last 900 rows.
     String batchedUpdateStatement = String.format(
-        "update demo set col1 = col1 + 1000, col2 = 101, col3 = col3 - 100, col4 = 1111, col5 = 2222, col6 = 7777, col7 = 1234, col8 = col7 + col6, col9 = col1 + col3, col10 = col2 - col6 where id in %s;",
+        "update demo set col1 = col1 + 10000, col2 = col2 + 10000, col3 = col3 + 10000, col4 = col4 + 10000, col5 = col5 + 10000, col6 = col6 + 10000, col7 = col7 + 10000, col8 = col8 + 10000, col9 = col9 + 10000, col10 = col10 + 10000 where id in %s;",
         inClause);
     Statement stmtObj = conn.createStatement();
     stmtObj.execute(batchedUpdateStatement);
diff --git a/src/main/java/com/oltpbenchmark/benchmarks/featurebench/customworkload/YBMicroBenchmarkUpdatesSequential.java b/src/main/java/com/oltpbenchmark/benchmarks/featurebench/customworkload/YBMicroBenchmarkUpdatesSequential.java
index 34db23207..4664335f4 100644
--- a/src/main/java/com/oltpbenchmark/benchmarks/featurebench/customworkload/YBMicroBenchmarkUpdatesSequential.java
+++ b/src/main/java/com/oltpbenchmark/benchmarks/featurebench/customworkload/YBMicroBenchmarkUpdatesSequential.java
@@ -30,11 +30,10 @@ public void loadOnce(Connection conn) throws SQLException {
 
   public void executeOnce(Connection conn) throws SQLException {
     Statement stmtObj = conn.createStatement();
-    for (int id = 1; id <= NUM_ROWS; id++) {
-      // Update all the columns which have an index in the 10-index benchmark so
-      // that we can accurately determine the impact of maintaining indexes.
+    // Update last 900 rows sequentially.
+    for (int id = 101; id <= NUM_ROWS; id++) {
       stmtObj.execute(String.format(
-          "update demo set col1 = col1 + 1000, col2 = 101, col3 = col3 - 100, col4 = 1111, col5 = 2222, col6 = 7777, col7 = 1234, col8 = col7 + col6, col9 = col1 + col3, col10 = col2 - col6 where id = %d;",
+          "update demo set col1 = col1 + 10000, col2 = col2 + 10000, col3 = col3 + 10000, col4 = col4 + 10000, col5 = col5 + 10000, col6 = col6 + 10000, col7 = col7 + 10000, col8 = col8 + 10000, col9 = col9 + 10000, col10 = col10 + 10000 where id = %d;",
           id));
     }
     stmtObj.close();