diff --git a/parquet-generator/no-nulls.csv b/parquet-generator/no-nulls.csv
index 9b1be2c..5edd093 100644
--- a/parquet-generator/no-nulls.csv
+++ b/parquet-generator/no-nulls.csv
@@ -1,99 +1,99 @@
-0	1	50	5000	50000000	50000000000	490665600000	99.0	0	000	X'00'	X'00'
-1	0	49	4900	49000000	49000000000	490752000000	49.5	1	001	X'0101'	X'01'
-2	1	48	4800	48000000	48000000000	490838400000	33.0	2	002	X'020202'	X'02'
-3	0	47	4700	47000000	47000000000	490924800000	24.75	3	003	X'03030303'	X'03'
-4	1	46	4600	46000000	46000000000	491011200000	19.8	4	004	X'0404040404'	X'04'
-5	0	45	4500	45000000	45000000000	491097600000	16.5	5	005	X'05'	X'05'
-6	1	44	4400	44000000	44000000000	491184000000	14.142857142857142	6	006	X'0606'	X'06'
-7	0	43	4300	43000000	43000000000	491270400000	12.375	7	007	X'070707'	X'07'
-8	1	42	4200	42000000	42000000000	491356800000	11.0	8	008	X'08080808'	X'08'
-9	0	41	4100	41000000	41000000000	491443200000	9.9	9	009	X'0909090909'	X'09'
-10	1	40	4000	40000000	40000000000	491529600000	9.0	10	010	X'0A'	X'0A'
-11	0	39	3900	39000000	39000000000	491616000000	8.25	11	011	X'0B0B'	X'0B'
-12	1	38	3800	38000000	38000000000	491702400000	7.615384615384615	12	012	X'0C0C0C'	X'0C'
-13	0	37	3700	37000000	37000000000	491788800000	7.071428571428571	13	013	X'0D0D0D0D'	X'0D'
-14	1	36	3600	36000000	36000000000	491875200000	6.6	14	014	X'0E0E0E0E0E'	X'0E'
-15	0	35	3500	35000000	35000000000	491961600000	6.1875	15	015	X'0F'	X'0F'
-16	1	34	3400	34000000	34000000000	492048000000	5.823529411764706	16	016	X'1010'	X'10'
-17	0	33	3300	33000000	33000000000	492134400000	5.5	17	017	X'111111'	X'11'
-18	1	32	3200	32000000	32000000000	492220800000	5.2105263157894735	18	018	X'12121212'	X'12'
-19	0	31	3100	31000000	31000000000	492307200000	4.95	19	019	X'1313131313'	X'13'
-20	1	30	3000	30000000	30000000000	492393600000	4.714285714285714	20	020	X'14'	X'14'
-21	0	29	2900	29000000	29000000000	492480000000	4.5	21	021	X'1515'	X'15'
-22	1	28	2800	28000000	28000000000	492566400000	4.304347826086956	22	022	X'161616'	X'16'
-23	0	27	2700	27000000	27000000000	492652800000	4.125	23	023	X'17171717'	X'17'
-24	1	26	2600	26000000	26000000000	492739200000	3.96	24	024	X'1818181818'	X'18'
-25	0	25	2500	25000000	25000000000	492825600000	3.8076923076923075	25	025	X'19'	X'19'
-26	1	24	2400	24000000	24000000000	492912000000	3.6666666666666665	26	026	X'1A1A'	X'1A'
-27	0	23	2300	23000000	23000000000	492998400000	3.5357142857142856	27	027	X'1B1B1B'	X'1B'
-28	1	22	2200	22000000	22000000000	493084800000	3.413793103448276	28	028	X'1C1C1C1C'	X'1C'
-29	0	21	2100	21000000	21000000000	493171200000	3.3	29	029	X'1D1D1D1D1D'	X'1D'
-30	1	20	2000	20000000	20000000000	493257600000	3.193548387096774	30	030	X'1E'	X'1E'
-31	0	19	1900	19000000	19000000000	493344000000	3.09375	31	031	X'1F1F'	X'1F'
-32	1	18	1800	18000000	18000000000	493430400000	3.0	32	032	X'202020'	X'20'
-33	0	17	1700	17000000	17000000000	493516800000	2.911764705882353	33	033	X'21212121'	X'21'
-34	1	16	1600	16000000	16000000000	493603200000	2.8285714285714287	34	034	X'2222222222'	X'22'
-35	0	15	1500	15000000	15000000000	493689600000	2.75	35	035	X'23'	X'23'
-36	1	14	1400	14000000	14000000000	493776000000	2.675675675675676	36	036	X'2424'	X'24'
-37	0	13	1300	13000000	13000000000	493862400000	2.6052631578947367	37	037	X'252525'	X'25'
-38	1	12	1200	12000000	12000000000	493948800000	2.5384615384615383	38	038	X'26262626'	X'26'
-39	0	11	1100	11000000	11000000000	494035200000	2.475	39	039	X'2727272727'	X'27'
-40	1	10	1000	10000000	10000000000	494121600000	2.4146341463414633	40	040	X'28'	X'28'
-41	0	9	900	9000000	9000000000	494208000000	2.357142857142857	41	041	X'2929'	X'29'
-42	1	8	800	8000000	8000000000	494294400000	2.302325581395349	42	042	X'2A2A2A'	X'2A'
-43	0	7	700	7000000	7000000000	494380800000	2.25	43	043	X'2B2B2B2B'	X'2B'
-44	1	6	600	6000000	6000000000	494467200000	2.2	44	044	X'2C2C2C2C2C'	X'2C'
-45	0	5	500	5000000	5000000000	494553600000	2.152173913043478	45	045	X'2D'	X'2D'
-46	1	4	400	4000000	4000000000	494640000000	2.106382978723404	46	046	X'2E2E'	X'2E'
-47	0	3	300	3000000	3000000000	494726400000	2.0625	47	047	X'2F2F2F'	X'2F'
-48	1	2	200	2000000	2000000000	494812800000	2.020408163265306	48	048	X'30303030'	X'30'
-49	0	1	100	1000000	1000000000	494899200000	1.98	49	049	X'3131313131'	X'31'
-50	1	0	0	0	0	494985600000	1.9411764705882353	50	050	X'32'	X'32'
-51	0	-1	-100	-1000000	-1000000000	495072000000	1.9038461538461537	51	051	X'3333'	X'33'
-52	1	-2	-200	-2000000	-2000000000	495158400000	1.8679245283018868	52	052	X'343434'	X'34'
-53	0	-3	-300	-3000000	-3000000000	495244800000	1.8333333333333333	53	053	X'35353535'	X'35'
-54	1	-4	-400	-4000000	-4000000000	495331200000	1.8	54	054	X'3636363636'	X'36'
-55	0	-5	-500	-5000000	-5000000000	495417600000	1.7678571428571428	55	055	X'37'	X'37'
-56	1	-6	-600	-6000000	-6000000000	495504000000	1.736842105263158	56	056	X'3838'	X'38'
-57	0	-7	-700	-7000000	-7000000000	495590400000	1.706896551724138	57	057	X'393939'	X'39'
-58	1	-8	-800	-8000000	-8000000000	495676800000	1.6779661016949152	58	058	X'3A3A3A3A'	X'3A'
-59	0	-9	-900	-9000000	-9000000000	495763200000	1.65	59	059	X'3B3B3B3B3B'	X'3B'
-60	1	-10	-1000	-10000000	-10000000000	495849600000	1.6229508196721312	60	060	X'3C'	X'3C'
-61	0	-11	-1100	-11000000	-11000000000	495936000000	1.596774193548387	61	061	X'3D3D'	X'3D'
-62	1	-12	-1200	-12000000	-12000000000	496022400000	1.5714285714285714	62	062	X'3E3E3E'	X'3E'
-63	0	-13	-1300	-13000000	-13000000000	496108800000	1.546875	63	063	X'3F3F3F3F'	X'3F'
-64	1	-14	-1400	-14000000	-14000000000	496195200000	1.523076923076923	64	064	X'4040404040'	X'40'
-65	0	-15	-1500	-15000000	-15000000000	496281600000	1.5	65	065	X'41'	X'41'
-66	1	-16	-1600	-16000000	-16000000000	496368000000	1.4776119402985075	66	066	X'4242'	X'42'
-67	0	-17	-1700	-17000000	-17000000000	496454400000	1.4558823529411764	67	067	X'434343'	X'43'
-68	1	-18	-1800	-18000000	-18000000000	496540800000	1.434782608695652	68	068	X'44444444'	X'44'
-69	0	-19	-1900	-19000000	-19000000000	496627200000	1.4142857142857144	69	069	X'4545454545'	X'45'
-70	1	-20	-2000	-20000000	-20000000000	496713600000	1.3943661971830985	70	070	X'46'	X'46'
-71	0	-21	-2100	-21000000	-21000000000	496800000000	1.375	71	071	X'4747'	X'47'
-72	1	-22	-2200	-22000000	-22000000000	496886400000	1.356164383561644	72	072	X'484848'	X'48'
-73	0	-23	-2300	-23000000	-23000000000	496972800000	1.337837837837838	73	073	X'49494949'	X'49'
-74	1	-24	-2400	-24000000	-24000000000	497059200000	1.32	74	074	X'4A4A4A4A4A'	X'4A'
-75	0	-25	-2500	-25000000	-25000000000	497145600000	1.3026315789473684	75	075	X'4B'	X'4B'
-76	1	-26	-2600	-26000000	-26000000000	497232000000	1.2857142857142858	76	076	X'4C4C'	X'4C'
-77	0	-27	-2700	-27000000	-27000000000	497318400000	1.2692307692307692	77	077	X'4D4D4D'	X'4D'
-78	1	-28	-2800	-28000000	-28000000000	497404800000	1.2531645569620253	78	078	X'4E4E4E4E'	X'4E'
-79	0	-29	-2900	-29000000	-29000000000	497491200000	1.2375	79	079	X'4F4F4F4F4F'	X'4F'
-80	1	-30	-3000	-30000000	-30000000000	497577600000	1.2222222222222223	80	080	X'50'	X'50'
-81	0	-31	-3100	-31000000	-31000000000	497664000000	1.2073170731707317	81	081	X'5151'	X'51'
-82	1	-32	-3200	-32000000	-32000000000	497750400000	1.1927710843373494	82	082	X'525252'	X'52'
-83	0	-33	-3300	-33000000	-33000000000	497836800000	1.1785714285714286	83	083	X'53535353'	X'53'
-84	1	-34	-3400	-34000000	-34000000000	497923200000	1.1647058823529413	84	084	X'5454545454'	X'54'
-85	0	-35	-3500	-35000000	-35000000000	498009600000	1.1511627906976745	85	085	X'55'	X'55'
-86	1	-36	-3600	-36000000	-36000000000	498096000000	1.1379310344827587	86	086	X'5656'	X'56'
-87	0	-37	-3700	-37000000	-37000000000	498182400000	1.125	87	087	X'575757'	X'57'
-88	1	-38	-3800	-38000000	-38000000000	498268800000	1.1123595505617978	88	088	X'58585858'	X'58'
-89	0	-39	-3900	-39000000	-39000000000	498355200000	1.1	89	089	X'5959595959'	X'59'
-90	1	-40	-4000	-40000000	-40000000000	498441600000	1.0879120879120878	90	090	X'5A'	X'5A'
-91	0	-41	-4100	-41000000	-41000000000	498528000000	1.076086956521739	91	091	X'5B5B'	X'5B'
-92	1	-42	-4200	-42000000	-42000000000	498614400000	1.064516129032258	92	092	X'5C5C5C'	X'5C'
-93	0	-43	-4300	-43000000	-43000000000	498700800000	1.053191489361702	93	093	X'5D5D5D5D'	X'5D'
-94	1	-44	-4400	-44000000	-44000000000	498787200000	1.0421052631578946	94	094	X'5E5E5E5E5E'	X'5E'
-95	0	-45	-4500	-45000000	-45000000000	498873600000	1.03125	95	095	X'5F'	X'5F'
-96	1	-46	-4600	-46000000	-46000000000	498960000000	1.0206185567010309	96	096	X'6060'	X'60'
-97	0	-47	-4700	-47000000	-47000000000	499046400000	1.010204081632653	97	097	X'616161'	X'61'
-98	1	-48	-4800	-48000000	-48000000000	499132800000	1	98	098	X'62626262'	X'62'
+1	1	50	5000	50000000	50000000000	490665600000	99.0	0	000	X'00'	X'00'
+2	0	49	4900	49000000	49000000000	490752000000	49.5	1	001	X'0101'	X'01'
+3	1	48	4800	48000000	48000000000	490838400000	33.0	2	002	X'020202'	X'02'
+4	0	47	4700	47000000	47000000000	490924800000	24.75	3	003	X'03030303'	X'03'
+5	1	46	4600	46000000	46000000000	491011200000	19.8	4	004	X'0404040404'	X'04'
+6	0	45	4500	45000000	45000000000	491097600000	16.5	5	005	X'05'	X'05'
+7	1	44	4400	44000000	44000000000	491184000000	14.142857142857142	6	006	X'0606'	X'06'
+8	0	43	4300	43000000	43000000000	491270400000	12.375	7	007	X'070707'	X'07'
+9	1	42	4200	42000000	42000000000	491356800000	11.0	8	008	X'08080808'	X'08'
+10	0	41	4100	41000000	41000000000	491443200000	9.9	9	009	X'0909090909'	X'09'
+11	1	40	4000	40000000	40000000000	491529600000	9.0	10	010	X'0A'	X'0A'
+12	0	39	3900	39000000	39000000000	491616000000	8.25	11	011	X'0B0B'	X'0B'
+13	1	38	3800	38000000	38000000000	491702400000	7.615384615384615	12	012	X'0C0C0C'	X'0C'
+14	0	37	3700	37000000	37000000000	491788800000	7.071428571428571	13	013	X'0D0D0D0D'	X'0D'
+15	1	36	3600	36000000	36000000000	491875200000	6.6	14	014	X'0E0E0E0E0E'	X'0E'
+16	0	35	3500	35000000	35000000000	491961600000	6.1875	15	015	X'0F'	X'0F'
+17	1	34	3400	34000000	34000000000	492048000000	5.823529411764706	16	016	X'1010'	X'10'
+18	0	33	3300	33000000	33000000000	492134400000	5.5	17	017	X'111111'	X'11'
+19	1	32	3200	32000000	32000000000	492220800000	5.2105263157894735	18	018	X'12121212'	X'12'
+20	0	31	3100	31000000	31000000000	492307200000	4.95	19	019	X'1313131313'	X'13'
+21	1	30	3000	30000000	30000000000	492393600000	4.714285714285714	20	020	X'14'	X'14'
+22	0	29	2900	29000000	29000000000	492480000000	4.5	21	021	X'1515'	X'15'
+23	1	28	2800	28000000	28000000000	492566400000	4.304347826086956	22	022	X'161616'	X'16'
+24	0	27	2700	27000000	27000000000	492652800000	4.125	23	023	X'17171717'	X'17'
+25	1	26	2600	26000000	26000000000	492739200000	3.96	24	024	X'1818181818'	X'18'
+26	0	25	2500	25000000	25000000000	492825600000	3.8076923076923075	25	025	X'19'	X'19'
+27	1	24	2400	24000000	24000000000	492912000000	3.6666666666666665	26	026	X'1A1A'	X'1A'
+28	0	23	2300	23000000	23000000000	492998400000	3.5357142857142856	27	027	X'1B1B1B'	X'1B'
+29	1	22	2200	22000000	22000000000	493084800000	3.413793103448276	28	028	X'1C1C1C1C'	X'1C'
+30	0	21	2100	21000000	21000000000	493171200000	3.3	29	029	X'1D1D1D1D1D'	X'1D'
+31	1	20	2000	20000000	20000000000	493257600000	3.193548387096774	30	030	X'1E'	X'1E'
+32	0	19	1900	19000000	19000000000	493344000000	3.09375	31	031	X'1F1F'	X'1F'
+33	1	18	1800	18000000	18000000000	493430400000	3.0	32	032	X'202020'	X'20'
+34	0	17	1700	17000000	17000000000	493516800000	2.911764705882353	33	033	X'21212121'	X'21'
+35	1	16	1600	16000000	16000000000	493603200000	2.8285714285714287	34	034	X'2222222222'	X'22'
+36	0	15	1500	15000000	15000000000	493689600000	2.75	35	035	X'23'	X'23'
+37	1	14	1400	14000000	14000000000	493776000000	2.675675675675676	36	036	X'2424'	X'24'
+38	0	13	1300	13000000	13000000000	493862400000	2.6052631578947367	37	037	X'252525'	X'25'
+39	1	12	1200	12000000	12000000000	493948800000	2.5384615384615383	38	038	X'26262626'	X'26'
+40	0	11	1100	11000000	11000000000	494035200000	2.475	39	039	X'2727272727'	X'27'
+41	1	10	1000	10000000	10000000000	494121600000	2.4146341463414633	40	040	X'28'	X'28'
+42	0	9	900	9000000	9000000000	494208000000	2.357142857142857	41	041	X'2929'	X'29'
+43	1	8	800	8000000	8000000000	494294400000	2.302325581395349	42	042	X'2A2A2A'	X'2A'
+44	0	7	700	7000000	7000000000	494380800000	2.25	43	043	X'2B2B2B2B'	X'2B'
+45	1	6	600	6000000	6000000000	494467200000	2.2	44	044	X'2C2C2C2C2C'	X'2C'
+46	0	5	500	5000000	5000000000	494553600000	2.152173913043478	45	045	X'2D'	X'2D'
+47	1	4	400	4000000	4000000000	494640000000	2.106382978723404	46	046	X'2E2E'	X'2E'
+48	0	3	300	3000000	3000000000	494726400000	2.0625	47	047	X'2F2F2F'	X'2F'
+49	1	2	200	2000000	2000000000	494812800000	2.020408163265306	48	048	X'30303030'	X'30'
+50	0	1	100	1000000	1000000000	494899200000	1.98	49	049	X'3131313131'	X'31'
+51	1	0	0	0	0	494985600000	1.9411764705882353	50	050	X'32'	X'32'
+52	0	-1	-100	-1000000	-1000000000	495072000000	1.9038461538461537	51	051	X'3333'	X'33'
+53	1	-2	-200	-2000000	-2000000000	495158400000	1.8679245283018868	52	052	X'343434'	X'34'
+54	0	-3	-300	-3000000	-3000000000	495244800000	1.8333333333333333	53	053	X'35353535'	X'35'
+55	1	-4	-400	-4000000	-4000000000	495331200000	1.8	54	054	X'3636363636'	X'36'
+56	0	-5	-500	-5000000	-5000000000	495417600000	1.7678571428571428	55	055	X'37'	X'37'
+57	1	-6	-600	-6000000	-6000000000	495504000000	1.736842105263158	56	056	X'3838'	X'38'
+58	0	-7	-700	-7000000	-7000000000	495590400000	1.706896551724138	57	057	X'393939'	X'39'
+59	1	-8	-800	-8000000	-8000000000	495676800000	1.6779661016949152	58	058	X'3A3A3A3A'	X'3A'
+60	0	-9	-900	-9000000	-9000000000	495763200000	1.65	59	059	X'3B3B3B3B3B'	X'3B'
+61	1	-10	-1000	-10000000	-10000000000	495849600000	1.6229508196721312	60	060	X'3C'	X'3C'
+62	0	-11	-1100	-11000000	-11000000000	495936000000	1.596774193548387	61	061	X'3D3D'	X'3D'
+63	1	-12	-1200	-12000000	-12000000000	496022400000	1.5714285714285714	62	062	X'3E3E3E'	X'3E'
+64	0	-13	-1300	-13000000	-13000000000	496108800000	1.546875	63	063	X'3F3F3F3F'	X'3F'
+65	1	-14	-1400	-14000000	-14000000000	496195200000	1.523076923076923	64	064	X'4040404040'	X'40'
+66	0	-15	-1500	-15000000	-15000000000	496281600000	1.5	65	065	X'41'	X'41'
+67	1	-16	-1600	-16000000	-16000000000	496368000000	1.4776119402985075	66	066	X'4242'	X'42'
+68	0	-17	-1700	-17000000	-17000000000	496454400000	1.4558823529411764	67	067	X'434343'	X'43'
+69	1	-18	-1800	-18000000	-18000000000	496540800000	1.434782608695652	68	068	X'44444444'	X'44'
+70	0	-19	-1900	-19000000	-19000000000	496627200000	1.4142857142857144	69	069	X'4545454545'	X'45'
+71	1	-20	-2000	-20000000	-20000000000	496713600000	1.3943661971830985	70	070	X'46'	X'46'
+72	0	-21	-2100	-21000000	-21000000000	496800000000	1.375	71	071	X'4747'	X'47'
+73	1	-22	-2200	-22000000	-22000000000	496886400000	1.356164383561644	72	072	X'484848'	X'48'
+74	0	-23	-2300	-23000000	-23000000000	496972800000	1.337837837837838	73	073	X'49494949'	X'49'
+75	1	-24	-2400	-24000000	-24000000000	497059200000	1.32	74	074	X'4A4A4A4A4A'	X'4A'
+76	0	-25	-2500	-25000000	-25000000000	497145600000	1.3026315789473684	75	075	X'4B'	X'4B'
+77	1	-26	-2600	-26000000	-26000000000	497232000000	1.2857142857142858	76	076	X'4C4C'	X'4C'
+78	0	-27	-2700	-27000000	-27000000000	497318400000	1.2692307692307692	77	077	X'4D4D4D'	X'4D'
+79	1	-28	-2800	-28000000	-28000000000	497404800000	1.2531645569620253	78	078	X'4E4E4E4E'	X'4E'
+80	0	-29	-2900	-29000000	-29000000000	497491200000	1.2375	79	079	X'4F4F4F4F4F'	X'4F'
+81	1	-30	-3000	-30000000	-30000000000	497577600000	1.2222222222222223	80	080	X'50'	X'50'
+82	0	-31	-3100	-31000000	-31000000000	497664000000	1.2073170731707317	81	081	X'5151'	X'51'
+83	1	-32	-3200	-32000000	-32000000000	497750400000	1.1927710843373494	82	082	X'525252'	X'52'
+84	0	-33	-3300	-33000000	-33000000000	497836800000	1.1785714285714286	83	083	X'53535353'	X'53'
+85	1	-34	-3400	-34000000	-34000000000	497923200000	1.1647058823529413	84	084	X'5454545454'	X'54'
+86	0	-35	-3500	-35000000	-35000000000	498009600000	1.1511627906976745	85	085	X'55'	X'55'
+87	1	-36	-3600	-36000000	-36000000000	498096000000	1.1379310344827587	86	086	X'5656'	X'56'
+88	0	-37	-3700	-37000000	-37000000000	498182400000	1.125	87	087	X'575757'	X'57'
+89	1	-38	-3800	-38000000	-38000000000	498268800000	1.1123595505617978	88	088	X'58585858'	X'58'
+90	0	-39	-3900	-39000000	-39000000000	498355200000	1.1	89	089	X'5959595959'	X'59'
+91	1	-40	-4000	-40000000	-40000000000	498441600000	1.0879120879120878	90	090	X'5A'	X'5A'
+92	0	-41	-4100	-41000000	-41000000000	498528000000	1.076086956521739	91	091	X'5B5B'	X'5B'
+93	1	-42	-4200	-42000000	-42000000000	498614400000	1.064516129032258	92	092	X'5C5C5C'	X'5C'
+94	0	-43	-4300	-43000000	-43000000000	498700800000	1.053191489361702	93	093	X'5D5D5D5D'	X'5D'
+95	1	-44	-4400	-44000000	-44000000000	498787200000	1.0421052631578946	94	094	X'5E5E5E5E5E'	X'5E'
+96	0	-45	-4500	-45000000	-45000000000	498873600000	1.03125	95	095	X'5F'	X'5F'
+97	1	-46	-4600	-46000000	-46000000000	498960000000	1.0206185567010309	96	096	X'6060'	X'60'
+98	0	-47	-4700	-47000000	-47000000000	499046400000	1.010204081632653	97	097	X'616161'	X'61'
+99	1	-48	-4800	-48000000	-48000000000	499132800000	1	98	098	X'62626262'	X'62'
diff --git a/parquet-generator/nulls.csv b/parquet-generator/nulls.csv
index 5ec75ec..9f4fe86 100644
--- a/parquet-generator/nulls.csv
+++ b/parquet-generator/nulls.csv
@@ -1,14 +1,13 @@
-0	1	50	5000	50000000	50000000000	490665600000	99.0	0	000	X'00'	X'00'
-1	0	49	4900	49000000	49000000000	490752000000	49.5	1	001	X'0101'	X'01'
-2	1	48	4800	48000000	48000000000	490838400000	33.0	2	002	X'020202'	X'02'
-3	0	47	4700	47000000	47000000000	490924800000	24.75	3	003	X'03030303'	X'03'
-4	1	46	4600	46000000	46000000000	491011200000	19.8	4	004	X'0404040404'	X'04'
-5	0	45	4500	45000000	45000000000	491097600000	16.5	5	005	X'05'	X'05'
-6	1	44	4400	44000000	44000000000	491184000000	14.142857142857142	6	006	X'0606'	X'06'
-7	0	43	4300	43000000	43000000000	491270400000	12.375	7	007	X'070707'	X'07'
-8	1	42	4200	42000000	42000000000	491356800000	11.0	8	008	X'08080808'	X'08'
-9	0	41	4100	41000000	41000000000	491443200000	9.9	9	009	X'0909090909'	X'09'
-10	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N
+1	1	50	5000	50000000	50000000000	490665600000	99.0	0	000	X'00'	X'00'
+2	0	49	4900	49000000	49000000000	490752000000	49.5	1	001	X'0101'	X'01'
+3	1	48	4800	48000000	48000000000	490838400000	33.0	2	002	X'020202'	X'02'
+4	0	47	4700	47000000	47000000000	490924800000	24.75	3	003	X'03030303'	X'03'
+5	1	46	4600	46000000	46000000000	491011200000	19.8	4	004	X'0404040404'	X'04'
+6	0	45	4500	45000000	45000000000	491097600000	16.5	5	005	X'05'	X'05'
+7	1	44	4400	44000000	44000000000	491184000000	14.142857142857142	6	006	X'0606'	X'06'
+8	0	43	4300	43000000	43000000000	491270400000	12.375	7	007	X'070707'	X'07'
+9	1	42	4200	42000000	42000000000	491356800000	11.0	8	008	X'08080808'	X'08'
+10	0	41	4100	41000000	41000000000	491443200000	9.9	9	009	X'0909090909'	X'09'
 11	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N
 12	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N
 13	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N
@@ -18,82 +17,83 @@
 17	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N
 18	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N
 19	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N
-20	\N	30	\N	30000000	\N	492393600000	\N	20	\N	X'14'	\N
-21	0	\N	2900	\N	29000000000	\N	4.5	\N	021	\N	X'15'
-22	\N	28	\N	28000000	\N	492566400000	\N	22	\N	X'161616'	\N
-23	0	\N	2700	\N	27000000000	\N	4.125	\N	023	\N	X'17'
-24	\N	26	\N	26000000	\N	492739200000	\N	24	\N	X'1818181818'	\N
-25	0	\N	2500	\N	25000000000	\N	3.8076923076923075	\N	025	\N	X'19'
-26	\N	24	\N	24000000	\N	492912000000	\N	26	\N	X'1A1A'	\N
-27	0	\N	2300	\N	23000000000	\N	3.5357142857142856	\N	027	\N	X'1B'
-28	\N	22	\N	22000000	\N	493084800000	\N	28	\N	X'1C1C1C1C'	\N
-29	0	\N	2100	\N	21000000000	\N	3.3	\N	029	\N	X'1D'
-30	\N	20	\N	20000000	\N	493257600000	\N	30	\N	X'1E'	\N
-31	0	\N	1900	\N	19000000000	\N	3.09375	\N	031	\N	X'1F'
-32	\N	18	\N	18000000	\N	493430400000	\N	32	\N	X'202020'	\N
-33	0	\N	1700	\N	17000000000	\N	2.911764705882353	\N	033	\N	X'21'
-34	\N	16	\N	16000000	\N	493603200000	\N	34	\N	X'2222222222'	\N
-35	0	\N	1500	\N	15000000000	\N	2.75	\N	035	\N	X'23'
-36	\N	14	\N	14000000	\N	493776000000	\N	36	\N	X'2424'	\N
-37	0	\N	1300	\N	13000000000	\N	2.6052631578947367	\N	037	\N	X'25'
-38	\N	12	\N	12000000	\N	493948800000	\N	38	\N	X'26262626'	\N
-39	0	\N	1100	\N	11000000000	\N	2.475	\N	039	\N	X'27'
-40	\N	10	\N	10000000	\N	494121600000	\N	40	\N	X'28'	\N
-41	0	\N	900	\N	9000000000	\N	2.357142857142857	\N	041	\N	X'29'
-42	\N	8	\N	8000000	\N	494294400000	\N	42	\N	X'2A2A2A'	\N
-43	0	\N	700	\N	7000000000	\N	2.25	\N	043	\N	X'2B'
-44	\N	6	\N	6000000	\N	494467200000	\N	44	\N	X'2C2C2C2C2C'	\N
-45	0	\N	500	\N	5000000000	\N	2.152173913043478	\N	045	\N	X'2D'
-46	\N	4	\N	4000000	\N	494640000000	\N	46	\N	X'2E2E'	\N
-47	0	\N	300	\N	3000000000	\N	2.0625	\N	047	\N	X'2F'
-48	\N	2	\N	2000000	\N	494812800000	\N	48	\N	X'30303030'	\N
-49	0	\N	100	\N	1000000000	\N	1.98	\N	049	\N	X'31'
-50	\N	0	\N	0	\N	494985600000	\N	50	\N	X'32'	\N
-51	0	\N	-100	\N	-1000000000	\N	1.9038461538461537	\N	051	\N	X'33'
-52	\N	-2	\N	-2000000	\N	495158400000	\N	52	\N	X'343434'	\N
-53	0	\N	-300	\N	-3000000000	\N	1.8333333333333333	\N	053	\N	X'35'
-54	\N	-4	\N	-4000000	\N	495331200000	\N	54	\N	X'3636363636'	\N
-55	0	\N	-500	\N	-5000000000	\N	1.7678571428571428	\N	055	\N	X'37'
-56	\N	-6	\N	-6000000	\N	495504000000	\N	56	\N	X'3838'	\N
-57	0	\N	-700	\N	-7000000000	\N	1.706896551724138	\N	057	\N	X'39'
-58	\N	-8	\N	-8000000	\N	495676800000	\N	58	\N	X'3A3A3A3A'	\N
-59	0	\N	-900	\N	-9000000000	\N	1.65	\N	059	\N	X'3B'
-60	\N	-10	\N	-10000000	\N	495849600000	\N	60	\N	X'3C'	\N
-61	0	\N	-1100	\N	-11000000000	\N	1.596774193548387	\N	061	\N	X'3D'
-62	\N	-12	\N	-12000000	\N	496022400000	\N	62	\N	X'3E3E3E'	\N
-63	0	\N	-1300	\N	-13000000000	\N	1.546875	\N	063	\N	X'3F'
-64	\N	-14	\N	-14000000	\N	496195200000	\N	64	\N	X'4040404040'	\N
-65	0	\N	-1500	\N	-15000000000	\N	1.5	\N	065	\N	X'41'
-66	\N	-16	\N	-16000000	\N	496368000000	\N	66	\N	X'4242'	\N
-67	0	\N	-1700	\N	-17000000000	\N	1.4558823529411764	\N	067	\N	X'43'
-68	\N	-18	\N	-18000000	\N	496540800000	\N	68	\N	X'44444444'	\N
-69	0	\N	-1900	\N	-19000000000	\N	1.4142857142857144	\N	069	\N	X'45'
-70	\N	-20	\N	-20000000	\N	496713600000	\N	70	\N	X'46'	\N
-71	0	\N	-2100	\N	-21000000000	\N	1.375	\N	071	\N	X'47'
-72	\N	-22	\N	-22000000	\N	496886400000	\N	72	\N	X'484848'	\N
-73	0	\N	-2300	\N	-23000000000	\N	1.337837837837838	\N	073	\N	X'49'
-74	\N	-24	\N	-24000000	\N	497059200000	\N	74	\N	X'4A4A4A4A4A'	\N
-75	0	\N	-2500	\N	-25000000000	\N	1.3026315789473684	\N	075	\N	X'4B'
-76	\N	-26	\N	-26000000	\N	497232000000	\N	76	\N	X'4C4C'	\N
-77	0	\N	-2700	\N	-27000000000	\N	1.2692307692307692	\N	077	\N	X'4D'
-78	\N	-28	\N	-28000000	\N	497404800000	\N	78	\N	X'4E4E4E4E'	\N
-79	0	\N	-2900	\N	-29000000000	\N	1.2375	\N	079	\N	X'4F'
-80	\N	-30	\N	-30000000	\N	497577600000	\N	80	\N	X'50'	\N
-81	0	\N	-3100	\N	-31000000000	\N	1.2073170731707317	\N	081	\N	X'51'
-82	\N	-32	\N	-32000000	\N	497750400000	\N	82	\N	X'525252'	\N
-83	0	\N	-3300	\N	-33000000000	\N	1.1785714285714286	\N	083	\N	X'53'
-84	\N	-34	\N	-34000000	\N	497923200000	\N	84	\N	X'5454545454'	\N
-85	0	\N	-3500	\N	-35000000000	\N	1.1511627906976745	\N	085	\N	X'55'
-86	\N	-36	\N	-36000000	\N	498096000000	\N	86	\N	X'5656'	\N
-87	0	\N	-3700	\N	-37000000000	\N	1.125	\N	087	\N	X'57'
-88	\N	-38	\N	-38000000	\N	498268800000	\N	88	\N	X'58585858'	\N
-89	0	\N	-3900	\N	-39000000000	\N	1.1	\N	089	\N	X'59'
-90	\N	-40	\N	-40000000	\N	498441600000	\N	90	\N	X'5A'	\N
-91	0	\N	-4100	\N	-41000000000	\N	1.076086956521739	\N	091	\N	X'5B'
-92	\N	-42	\N	-42000000	\N	498614400000	\N	92	\N	X'5C5C5C'	\N
-93	0	\N	-4300	\N	-43000000000	\N	1.053191489361702	\N	093	\N	X'5D'
-94	\N	-44	\N	-44000000	\N	498787200000	\N	94	\N	X'5E5E5E5E5E'	\N
-95	0	\N	-4500	\N	-45000000000	\N	1.03125	\N	095	\N	X'5F'
-96	\N	-46	\N	-46000000	\N	498960000000	\N	96	\N	X'6060'	\N
-97	0	\N	-4700	\N	-47000000000	\N	1.010204081632653	\N	097	\N	X'61'
-98	\N	-48	\N	-48000000	\N	499132800000	\N	98	\N	X'62626262'	\N
+20	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N
+21	\N	30	\N	30000000	\N	492393600000	\N	20	\N	X'14'	\N
+22	0	\N	2900	\N	29000000000	\N	4.5	\N	021	\N	X'15'
+23	\N	28	\N	28000000	\N	492566400000	\N	22	\N	X'161616'	\N
+24	0	\N	2700	\N	27000000000	\N	4.125	\N	023	\N	X'17'
+25	\N	26	\N	26000000	\N	492739200000	\N	24	\N	X'1818181818'	\N
+26	0	\N	2500	\N	25000000000	\N	3.8076923076923075	\N	025	\N	X'19'
+27	\N	24	\N	24000000	\N	492912000000	\N	26	\N	X'1A1A'	\N
+28	0	\N	2300	\N	23000000000	\N	3.5357142857142856	\N	027	\N	X'1B'
+29	\N	22	\N	22000000	\N	493084800000	\N	28	\N	X'1C1C1C1C'	\N
+30	0	\N	2100	\N	21000000000	\N	3.3	\N	029	\N	X'1D'
+31	\N	20	\N	20000000	\N	493257600000	\N	30	\N	X'1E'	\N
+32	0	\N	1900	\N	19000000000	\N	3.09375	\N	031	\N	X'1F'
+33	\N	18	\N	18000000	\N	493430400000	\N	32	\N	X'202020'	\N
+34	0	\N	1700	\N	17000000000	\N	2.911764705882353	\N	033	\N	X'21'
+35	\N	16	\N	16000000	\N	493603200000	\N	34	\N	X'2222222222'	\N
+36	0	\N	1500	\N	15000000000	\N	2.75	\N	035	\N	X'23'
+37	\N	14	\N	14000000	\N	493776000000	\N	36	\N	X'2424'	\N
+38	0	\N	1300	\N	13000000000	\N	2.6052631578947367	\N	037	\N	X'25'
+39	\N	12	\N	12000000	\N	493948800000	\N	38	\N	X'26262626'	\N
+40	0	\N	1100	\N	11000000000	\N	2.475	\N	039	\N	X'27'
+41	\N	10	\N	10000000	\N	494121600000	\N	40	\N	X'28'	\N
+42	0	\N	900	\N	9000000000	\N	2.357142857142857	\N	041	\N	X'29'
+43	\N	8	\N	8000000	\N	494294400000	\N	42	\N	X'2A2A2A'	\N
+44	0	\N	700	\N	7000000000	\N	2.25	\N	043	\N	X'2B'
+45	\N	6	\N	6000000	\N	494467200000	\N	44	\N	X'2C2C2C2C2C'	\N
+46	0	\N	500	\N	5000000000	\N	2.152173913043478	\N	045	\N	X'2D'
+47	\N	4	\N	4000000	\N	494640000000	\N	46	\N	X'2E2E'	\N
+48	0	\N	300	\N	3000000000	\N	2.0625	\N	047	\N	X'2F'
+49	\N	2	\N	2000000	\N	494812800000	\N	48	\N	X'30303030'	\N
+50	0	\N	100	\N	1000000000	\N	1.98	\N	049	\N	X'31'
+51	\N	0	\N	0	\N	494985600000	\N	50	\N	X'32'	\N
+52	0	\N	-100	\N	-1000000000	\N	1.9038461538461537	\N	051	\N	X'33'
+53	\N	-2	\N	-2000000	\N	495158400000	\N	52	\N	X'343434'	\N
+54	0	\N	-300	\N	-3000000000	\N	1.8333333333333333	\N	053	\N	X'35'
+55	\N	-4	\N	-4000000	\N	495331200000	\N	54	\N	X'3636363636'	\N
+56	0	\N	-500	\N	-5000000000	\N	1.7678571428571428	\N	055	\N	X'37'
+57	\N	-6	\N	-6000000	\N	495504000000	\N	56	\N	X'3838'	\N
+58	0	\N	-700	\N	-7000000000	\N	1.706896551724138	\N	057	\N	X'39'
+59	\N	-8	\N	-8000000	\N	495676800000	\N	58	\N	X'3A3A3A3A'	\N
+60	0	\N	-900	\N	-9000000000	\N	1.65	\N	059	\N	X'3B'
+61	\N	-10	\N	-10000000	\N	495849600000	\N	60	\N	X'3C'	\N
+62	0	\N	-1100	\N	-11000000000	\N	1.596774193548387	\N	061	\N	X'3D'
+63	\N	-12	\N	-12000000	\N	496022400000	\N	62	\N	X'3E3E3E'	\N
+64	0	\N	-1300	\N	-13000000000	\N	1.546875	\N	063	\N	X'3F'
+65	\N	-14	\N	-14000000	\N	496195200000	\N	64	\N	X'4040404040'	\N
+66	0	\N	-1500	\N	-15000000000	\N	1.5	\N	065	\N	X'41'
+67	\N	-16	\N	-16000000	\N	496368000000	\N	66	\N	X'4242'	\N
+68	0	\N	-1700	\N	-17000000000	\N	1.4558823529411764	\N	067	\N	X'43'
+69	\N	-18	\N	-18000000	\N	496540800000	\N	68	\N	X'44444444'	\N
+70	0	\N	-1900	\N	-19000000000	\N	1.4142857142857144	\N	069	\N	X'45'
+71	\N	-20	\N	-20000000	\N	496713600000	\N	70	\N	X'46'	\N
+72	0	\N	-2100	\N	-21000000000	\N	1.375	\N	071	\N	X'47'
+73	\N	-22	\N	-22000000	\N	496886400000	\N	72	\N	X'484848'	\N
+74	0	\N	-2300	\N	-23000000000	\N	1.337837837837838	\N	073	\N	X'49'
+75	\N	-24	\N	-24000000	\N	497059200000	\N	74	\N	X'4A4A4A4A4A'	\N
+76	0	\N	-2500	\N	-25000000000	\N	1.3026315789473684	\N	075	\N	X'4B'
+77	\N	-26	\N	-26000000	\N	497232000000	\N	76	\N	X'4C4C'	\N
+78	0	\N	-2700	\N	-27000000000	\N	1.2692307692307692	\N	077	\N	X'4D'
+79	\N	-28	\N	-28000000	\N	497404800000	\N	78	\N	X'4E4E4E4E'	\N
+80	0	\N	-2900	\N	-29000000000	\N	1.2375	\N	079	\N	X'4F'
+81	\N	-30	\N	-30000000	\N	497577600000	\N	80	\N	X'50'	\N
+82	0	\N	-3100	\N	-31000000000	\N	1.2073170731707317	\N	081	\N	X'51'
+83	\N	-32	\N	-32000000	\N	497750400000	\N	82	\N	X'525252'	\N
+84	0	\N	-3300	\N	-33000000000	\N	1.1785714285714286	\N	083	\N	X'53'
+85	\N	-34	\N	-34000000	\N	497923200000	\N	84	\N	X'5454545454'	\N
+86	0	\N	-3500	\N	-35000000000	\N	1.1511627906976745	\N	085	\N	X'55'
+87	\N	-36	\N	-36000000	\N	498096000000	\N	86	\N	X'5656'	\N
+88	0	\N	-3700	\N	-37000000000	\N	1.125	\N	087	\N	X'57'
+89	\N	-38	\N	-38000000	\N	498268800000	\N	88	\N	X'58585858'	\N
+90	0	\N	-3900	\N	-39000000000	\N	1.1	\N	089	\N	X'59'
+91	\N	-40	\N	-40000000	\N	498441600000	\N	90	\N	X'5A'	\N
+92	0	\N	-4100	\N	-41000000000	\N	1.076086956521739	\N	091	\N	X'5B'
+93	\N	-42	\N	-42000000	\N	498614400000	\N	92	\N	X'5C5C5C'	\N
+94	0	\N	-4300	\N	-43000000000	\N	1.053191489361702	\N	093	\N	X'5D'
+95	\N	-44	\N	-44000000	\N	498787200000	\N	94	\N	X'5E5E5E5E5E'	\N
+96	0	\N	-4500	\N	-45000000000	\N	1.03125	\N	095	\N	X'5F'
+97	\N	-46	\N	-46000000	\N	498960000000	\N	96	\N	X'6060'	\N
+98	0	\N	-4700	\N	-47000000000	\N	1.010204081632653	\N	097	\N	X'61'
+99	\N	-48	\N	-48000000	\N	499132800000	\N	98	\N	X'62626262'	\N
diff --git a/parquet-generator/parquets.py b/parquet-generator/parquets.py
index 4c49444..b6b75da 100644
--- a/parquet-generator/parquets.py
+++ b/parquet-generator/parquets.py
@@ -102,7 +102,7 @@ def write_csv(file_name, rows):
     print('Writing {}'.format(file_name))
     with open(file_name, 'w') as f:
         for rowid, row in enumerate(rows):
-            line = str(rowid)
+            line = str(rowid + 1)
             for col in row:
                 line += '\t'
 
diff --git a/parquet/parquet_cursor.cc b/parquet/parquet_cursor.cc
index 361bcfe..8a4b250 100644
--- a/parquet/parquet_cursor.cc
+++ b/parquet/parquet_cursor.cc
@@ -682,7 +682,7 @@ int ParquetCursor::getRowId() {
 }
 
 bool ParquetCursor::eof() {
-  return rowId >= numRows;
+  return rowId > numRows;
 }
 
 void ParquetCursor::ensureColumn(int col) {
@@ -937,7 +937,7 @@ void ParquetCursor::close() {
 void ParquetCursor::reset(std::vector<Constraint> constraints) {
   close();
   this->constraints = constraints;
-  rowId = -1;
+  rowId = 0;
   // TODO: consider having a long lived handle in ParquetTable that can be borrowed
   // without incurring the cost of opening the file from scratch twice
   reader = parquet::ParquetFileReader::OpenFile(
@@ -948,7 +948,7 @@ void ParquetCursor::reset(std::vector<Constraint> constraints) {
 
   rowGroupId = -1;
   rowGroupSize = 0;
-  rowGroupStartRowId = -1;
+  rowGroupStartRowId = 0;
   // TODO: handle the case where rowgroups have disjoint schemas?
   // TODO: or at least, fail fast if detected
   rowsLeftInRowGroup = 0;
diff --git a/tests/templates/001-table-scan-1-rowgroup.sql b/tests/templates/001-table-scan-1-rowgroup.sql
index 5a425dc..7dc3c6d 100644
--- a/tests/templates/001-table-scan-1-rowgroup.sql
+++ b/tests/templates/001-table-scan-1-rowgroup.sql
@@ -1,100 +1,100 @@
 SELECT rowid, bool_0, int8_1, int16_2, int32_3, int64_4, datetime(ts_5 / 1000, 'unixepoch'), printf('%.2f', double_6) AS double_6, string_7, string_8, quote(binary_9), quote(binary_10) FROM no_nulls1
-0|1|50|5000|50000000|50000000000|1985-07-20 00:00:00|99.00|0|000|X'00'|X'00'
-1|0|49|4900|49000000|49000000000|1985-07-21 00:00:00|49.50|1|001|X'0101'|X'01'
-2|1|48|4800|48000000|48000000000|1985-07-22 00:00:00|33.00|2|002|X'020202'|X'02'
-3|0|47|4700|47000000|47000000000|1985-07-23 00:00:00|24.75|3|003|X'03030303'|X'03'
-4|1|46|4600|46000000|46000000000|1985-07-24 00:00:00|19.80|4|004|X'0404040404'|X'04'
-5|0|45|4500|45000000|45000000000|1985-07-25 00:00:00|16.50|5|005|X'05'|X'05'
-6|1|44|4400|44000000|44000000000|1985-07-26 00:00:00|14.14|6|006|X'0606'|X'06'
-7|0|43|4300|43000000|43000000000|1985-07-27 00:00:00|12.38|7|007|X'070707'|X'07'
-8|1|42|4200|42000000|42000000000|1985-07-28 00:00:00|11.00|8|008|X'08080808'|X'08'
-9|0|41|4100|41000000|41000000000|1985-07-29 00:00:00|9.90|9|009|X'0909090909'|X'09'
-10|1|40|4000|40000000|40000000000|1985-07-30 00:00:00|9.00|10|010|X'0A'|X'0A'
-11|0|39|3900|39000000|39000000000|1985-07-31 00:00:00|8.25|11|011|X'0B0B'|X'0B'
-12|1|38|3800|38000000|38000000000|1985-08-01 00:00:00|7.62|12|012|X'0C0C0C'|X'0C'
-13|0|37|3700|37000000|37000000000|1985-08-02 00:00:00|7.07|13|013|X'0D0D0D0D'|X'0D'
-14|1|36|3600|36000000|36000000000|1985-08-03 00:00:00|6.60|14|014|X'0E0E0E0E0E'|X'0E'
-15|0|35|3500|35000000|35000000000|1985-08-04 00:00:00|6.19|15|015|X'0F'|X'0F'
-16|1|34|3400|34000000|34000000000|1985-08-05 00:00:00|5.82|16|016|X'1010'|X'10'
-17|0|33|3300|33000000|33000000000|1985-08-06 00:00:00|5.50|17|017|X'111111'|X'11'
-18|1|32|3200|32000000|32000000000|1985-08-07 00:00:00|5.21|18|018|X'12121212'|X'12'
-19|0|31|3100|31000000|31000000000|1985-08-08 00:00:00|4.95|19|019|X'1313131313'|X'13'
-20|1|30|3000|30000000|30000000000|1985-08-09 00:00:00|4.71|20|020|X'14'|X'14'
-21|0|29|2900|29000000|29000000000|1985-08-10 00:00:00|4.50|21|021|X'1515'|X'15'
-22|1|28|2800|28000000|28000000000|1985-08-11 00:00:00|4.30|22|022|X'161616'|X'16'
-23|0|27|2700|27000000|27000000000|1985-08-12 00:00:00|4.13|23|023|X'17171717'|X'17'
-24|1|26|2600|26000000|26000000000|1985-08-13 00:00:00|3.96|24|024|X'1818181818'|X'18'
-25|0|25|2500|25000000|25000000000|1985-08-14 00:00:00|3.81|25|025|X'19'|X'19'
-26|1|24|2400|24000000|24000000000|1985-08-15 00:00:00|3.67|26|026|X'1A1A'|X'1A'
-27|0|23|2300|23000000|23000000000|1985-08-16 00:00:00|3.54|27|027|X'1B1B1B'|X'1B'
-28|1|22|2200|22000000|22000000000|1985-08-17 00:00:00|3.41|28|028|X'1C1C1C1C'|X'1C'
-29|0|21|2100|21000000|21000000000|1985-08-18 00:00:00|3.30|29|029|X'1D1D1D1D1D'|X'1D'
-30|1|20|2000|20000000|20000000000|1985-08-19 00:00:00|3.19|30|030|X'1E'|X'1E'
-31|0|19|1900|19000000|19000000000|1985-08-20 00:00:00|3.09|31|031|X'1F1F'|X'1F'
-32|1|18|1800|18000000|18000000000|1985-08-21 00:00:00|3.00|32|032|X'202020'|X'20'
-33|0|17|1700|17000000|17000000000|1985-08-22 00:00:00|2.91|33|033|X'21212121'|X'21'
-34|1|16|1600|16000000|16000000000|1985-08-23 00:00:00|2.83|34|034|X'2222222222'|X'22'
-35|0|15|1500|15000000|15000000000|1985-08-24 00:00:00|2.75|35|035|X'23'|X'23'
-36|1|14|1400|14000000|14000000000|1985-08-25 00:00:00|2.68|36|036|X'2424'|X'24'
-37|0|13|1300|13000000|13000000000|1985-08-26 00:00:00|2.61|37|037|X'252525'|X'25'
-38|1|12|1200|12000000|12000000000|1985-08-27 00:00:00|2.54|38|038|X'26262626'|X'26'
-39|0|11|1100|11000000|11000000000|1985-08-28 00:00:00|2.48|39|039|X'2727272727'|X'27'
-40|1|10|1000|10000000|10000000000|1985-08-29 00:00:00|2.41|40|040|X'28'|X'28'
-41|0|9|900|9000000|9000000000|1985-08-30 00:00:00|2.36|41|041|X'2929'|X'29'
-42|1|8|800|8000000|8000000000|1985-08-31 00:00:00|2.30|42|042|X'2A2A2A'|X'2A'
-43|0|7|700|7000000|7000000000|1985-09-01 00:00:00|2.25|43|043|X'2B2B2B2B'|X'2B'
-44|1|6|600|6000000|6000000000|1985-09-02 00:00:00|2.20|44|044|X'2C2C2C2C2C'|X'2C'
-45|0|5|500|5000000|5000000000|1985-09-03 00:00:00|2.15|45|045|X'2D'|X'2D'
-46|1|4|400|4000000|4000000000|1985-09-04 00:00:00|2.11|46|046|X'2E2E'|X'2E'
-47|0|3|300|3000000|3000000000|1985-09-05 00:00:00|2.06|47|047|X'2F2F2F'|X'2F'
-48|1|2|200|2000000|2000000000|1985-09-06 00:00:00|2.02|48|048|X'30303030'|X'30'
-49|0|1|100|1000000|1000000000|1985-09-07 00:00:00|1.98|49|049|X'3131313131'|X'31'
-50|1|0|0|0|0|1985-09-08 00:00:00|1.94|50|050|X'32'|X'32'
-51|0|-1|-100|-1000000|-1000000000|1985-09-09 00:00:00|1.90|51|051|X'3333'|X'33'
-52|1|-2|-200|-2000000|-2000000000|1985-09-10 00:00:00|1.87|52|052|X'343434'|X'34'
-53|0|-3|-300|-3000000|-3000000000|1985-09-11 00:00:00|1.83|53|053|X'35353535'|X'35'
-54|1|-4|-400|-4000000|-4000000000|1985-09-12 00:00:00|1.80|54|054|X'3636363636'|X'36'
-55|0|-5|-500|-5000000|-5000000000|1985-09-13 00:00:00|1.77|55|055|X'37'|X'37'
-56|1|-6|-600|-6000000|-6000000000|1985-09-14 00:00:00|1.74|56|056|X'3838'|X'38'
-57|0|-7|-700|-7000000|-7000000000|1985-09-15 00:00:00|1.71|57|057|X'393939'|X'39'
-58|1|-8|-800|-8000000|-8000000000|1985-09-16 00:00:00|1.68|58|058|X'3A3A3A3A'|X'3A'
-59|0|-9|-900|-9000000|-9000000000|1985-09-17 00:00:00|1.65|59|059|X'3B3B3B3B3B'|X'3B'
-60|1|-10|-1000|-10000000|-10000000000|1985-09-18 00:00:00|1.62|60|060|X'3C'|X'3C'
-61|0|-11|-1100|-11000000|-11000000000|1985-09-19 00:00:00|1.60|61|061|X'3D3D'|X'3D'
-62|1|-12|-1200|-12000000|-12000000000|1985-09-20 00:00:00|1.57|62|062|X'3E3E3E'|X'3E'
-63|0|-13|-1300|-13000000|-13000000000|1985-09-21 00:00:00|1.55|63|063|X'3F3F3F3F'|X'3F'
-64|1|-14|-1400|-14000000|-14000000000|1985-09-22 00:00:00|1.52|64|064|X'4040404040'|X'40'
-65|0|-15|-1500|-15000000|-15000000000|1985-09-23 00:00:00|1.50|65|065|X'41'|X'41'
-66|1|-16|-1600|-16000000|-16000000000|1985-09-24 00:00:00|1.48|66|066|X'4242'|X'42'
-67|0|-17|-1700|-17000000|-17000000000|1985-09-25 00:00:00|1.46|67|067|X'434343'|X'43'
-68|1|-18|-1800|-18000000|-18000000000|1985-09-26 00:00:00|1.43|68|068|X'44444444'|X'44'
-69|0|-19|-1900|-19000000|-19000000000|1985-09-27 00:00:00|1.41|69|069|X'4545454545'|X'45'
-70|1|-20|-2000|-20000000|-20000000000|1985-09-28 00:00:00|1.39|70|070|X'46'|X'46'
-71|0|-21|-2100|-21000000|-21000000000|1985-09-29 00:00:00|1.38|71|071|X'4747'|X'47'
-72|1|-22|-2200|-22000000|-22000000000|1985-09-30 00:00:00|1.36|72|072|X'484848'|X'48'
-73|0|-23|-2300|-23000000|-23000000000|1985-10-01 00:00:00|1.34|73|073|X'49494949'|X'49'
-74|1|-24|-2400|-24000000|-24000000000|1985-10-02 00:00:00|1.32|74|074|X'4A4A4A4A4A'|X'4A'
-75|0|-25|-2500|-25000000|-25000000000|1985-10-03 00:00:00|1.30|75|075|X'4B'|X'4B'
-76|1|-26|-2600|-26000000|-26000000000|1985-10-04 00:00:00|1.29|76|076|X'4C4C'|X'4C'
-77|0|-27|-2700|-27000000|-27000000000|1985-10-05 00:00:00|1.27|77|077|X'4D4D4D'|X'4D'
-78|1|-28|-2800|-28000000|-28000000000|1985-10-06 00:00:00|1.25|78|078|X'4E4E4E4E'|X'4E'
-79|0|-29|-2900|-29000000|-29000000000|1985-10-07 00:00:00|1.24|79|079|X'4F4F4F4F4F'|X'4F'
-80|1|-30|-3000|-30000000|-30000000000|1985-10-08 00:00:00|1.22|80|080|X'50'|X'50'
-81|0|-31|-3100|-31000000|-31000000000|1985-10-09 00:00:00|1.21|81|081|X'5151'|X'51'
-82|1|-32|-3200|-32000000|-32000000000|1985-10-10 00:00:00|1.19|82|082|X'525252'|X'52'
-83|0|-33|-3300|-33000000|-33000000000|1985-10-11 00:00:00|1.18|83|083|X'53535353'|X'53'
-84|1|-34|-3400|-34000000|-34000000000|1985-10-12 00:00:00|1.16|84|084|X'5454545454'|X'54'
-85|0|-35|-3500|-35000000|-35000000000|1985-10-13 00:00:00|1.15|85|085|X'55'|X'55'
-86|1|-36|-3600|-36000000|-36000000000|1985-10-14 00:00:00|1.14|86|086|X'5656'|X'56'
-87|0|-37|-3700|-37000000|-37000000000|1985-10-15 00:00:00|1.13|87|087|X'575757'|X'57'
-88|1|-38|-3800|-38000000|-38000000000|1985-10-16 00:00:00|1.11|88|088|X'58585858'|X'58'
-89|0|-39|-3900|-39000000|-39000000000|1985-10-17 00:00:00|1.10|89|089|X'5959595959'|X'59'
-90|1|-40|-4000|-40000000|-40000000000|1985-10-18 00:00:00|1.09|90|090|X'5A'|X'5A'
-91|0|-41|-4100|-41000000|-41000000000|1985-10-19 00:00:00|1.08|91|091|X'5B5B'|X'5B'
-92|1|-42|-4200|-42000000|-42000000000|1985-10-20 00:00:00|1.06|92|092|X'5C5C5C'|X'5C'
-93|0|-43|-4300|-43000000|-43000000000|1985-10-21 00:00:00|1.05|93|093|X'5D5D5D5D'|X'5D'
-94|1|-44|-4400|-44000000|-44000000000|1985-10-22 00:00:00|1.04|94|094|X'5E5E5E5E5E'|X'5E'
-95|0|-45|-4500|-45000000|-45000000000|1985-10-23 00:00:00|1.03|95|095|X'5F'|X'5F'
-96|1|-46|-4600|-46000000|-46000000000|1985-10-24 00:00:00|1.02|96|096|X'6060'|X'60'
-97|0|-47|-4700|-47000000|-47000000000|1985-10-25 00:00:00|1.01|97|097|X'616161'|X'61'
-98|1|-48|-4800|-48000000|-48000000000|1985-10-26 00:00:00|1.00|98|098|X'62626262'|X'62'
+1|1|50|5000|50000000|50000000000|1985-07-20 00:00:00|99.00|0|000|X'00'|X'00'
+2|0|49|4900|49000000|49000000000|1985-07-21 00:00:00|49.50|1|001|X'0101'|X'01'
+3|1|48|4800|48000000|48000000000|1985-07-22 00:00:00|33.00|2|002|X'020202'|X'02'
+4|0|47|4700|47000000|47000000000|1985-07-23 00:00:00|24.75|3|003|X'03030303'|X'03'
+5|1|46|4600|46000000|46000000000|1985-07-24 00:00:00|19.80|4|004|X'0404040404'|X'04'
+6|0|45|4500|45000000|45000000000|1985-07-25 00:00:00|16.50|5|005|X'05'|X'05'
+7|1|44|4400|44000000|44000000000|1985-07-26 00:00:00|14.14|6|006|X'0606'|X'06'
+8|0|43|4300|43000000|43000000000|1985-07-27 00:00:00|12.38|7|007|X'070707'|X'07'
+9|1|42|4200|42000000|42000000000|1985-07-28 00:00:00|11.00|8|008|X'08080808'|X'08'
+10|0|41|4100|41000000|41000000000|1985-07-29 00:00:00|9.90|9|009|X'0909090909'|X'09'
+11|1|40|4000|40000000|40000000000|1985-07-30 00:00:00|9.00|10|010|X'0A'|X'0A'
+12|0|39|3900|39000000|39000000000|1985-07-31 00:00:00|8.25|11|011|X'0B0B'|X'0B'
+13|1|38|3800|38000000|38000000000|1985-08-01 00:00:00|7.62|12|012|X'0C0C0C'|X'0C'
+14|0|37|3700|37000000|37000000000|1985-08-02 00:00:00|7.07|13|013|X'0D0D0D0D'|X'0D'
+15|1|36|3600|36000000|36000000000|1985-08-03 00:00:00|6.60|14|014|X'0E0E0E0E0E'|X'0E'
+16|0|35|3500|35000000|35000000000|1985-08-04 00:00:00|6.19|15|015|X'0F'|X'0F'
+17|1|34|3400|34000000|34000000000|1985-08-05 00:00:00|5.82|16|016|X'1010'|X'10'
+18|0|33|3300|33000000|33000000000|1985-08-06 00:00:00|5.50|17|017|X'111111'|X'11'
+19|1|32|3200|32000000|32000000000|1985-08-07 00:00:00|5.21|18|018|X'12121212'|X'12'
+20|0|31|3100|31000000|31000000000|1985-08-08 00:00:00|4.95|19|019|X'1313131313'|X'13'
+21|1|30|3000|30000000|30000000000|1985-08-09 00:00:00|4.71|20|020|X'14'|X'14'
+22|0|29|2900|29000000|29000000000|1985-08-10 00:00:00|4.50|21|021|X'1515'|X'15'
+23|1|28|2800|28000000|28000000000|1985-08-11 00:00:00|4.30|22|022|X'161616'|X'16'
+24|0|27|2700|27000000|27000000000|1985-08-12 00:00:00|4.13|23|023|X'17171717'|X'17'
+25|1|26|2600|26000000|26000000000|1985-08-13 00:00:00|3.96|24|024|X'1818181818'|X'18'
+26|0|25|2500|25000000|25000000000|1985-08-14 00:00:00|3.81|25|025|X'19'|X'19'
+27|1|24|2400|24000000|24000000000|1985-08-15 00:00:00|3.67|26|026|X'1A1A'|X'1A'
+28|0|23|2300|23000000|23000000000|1985-08-16 00:00:00|3.54|27|027|X'1B1B1B'|X'1B'
+29|1|22|2200|22000000|22000000000|1985-08-17 00:00:00|3.41|28|028|X'1C1C1C1C'|X'1C'
+30|0|21|2100|21000000|21000000000|1985-08-18 00:00:00|3.30|29|029|X'1D1D1D1D1D'|X'1D'
+31|1|20|2000|20000000|20000000000|1985-08-19 00:00:00|3.19|30|030|X'1E'|X'1E'
+32|0|19|1900|19000000|19000000000|1985-08-20 00:00:00|3.09|31|031|X'1F1F'|X'1F'
+33|1|18|1800|18000000|18000000000|1985-08-21 00:00:00|3.00|32|032|X'202020'|X'20'
+34|0|17|1700|17000000|17000000000|1985-08-22 00:00:00|2.91|33|033|X'21212121'|X'21'
+35|1|16|1600|16000000|16000000000|1985-08-23 00:00:00|2.83|34|034|X'2222222222'|X'22'
+36|0|15|1500|15000000|15000000000|1985-08-24 00:00:00|2.75|35|035|X'23'|X'23'
+37|1|14|1400|14000000|14000000000|1985-08-25 00:00:00|2.68|36|036|X'2424'|X'24'
+38|0|13|1300|13000000|13000000000|1985-08-26 00:00:00|2.61|37|037|X'252525'|X'25'
+39|1|12|1200|12000000|12000000000|1985-08-27 00:00:00|2.54|38|038|X'26262626'|X'26'
+40|0|11|1100|11000000|11000000000|1985-08-28 00:00:00|2.48|39|039|X'2727272727'|X'27'
+41|1|10|1000|10000000|10000000000|1985-08-29 00:00:00|2.41|40|040|X'28'|X'28'
+42|0|9|900|9000000|9000000000|1985-08-30 00:00:00|2.36|41|041|X'2929'|X'29'
+43|1|8|800|8000000|8000000000|1985-08-31 00:00:00|2.30|42|042|X'2A2A2A'|X'2A'
+44|0|7|700|7000000|7000000000|1985-09-01 00:00:00|2.25|43|043|X'2B2B2B2B'|X'2B'
+45|1|6|600|6000000|6000000000|1985-09-02 00:00:00|2.20|44|044|X'2C2C2C2C2C'|X'2C'
+46|0|5|500|5000000|5000000000|1985-09-03 00:00:00|2.15|45|045|X'2D'|X'2D'
+47|1|4|400|4000000|4000000000|1985-09-04 00:00:00|2.11|46|046|X'2E2E'|X'2E'
+48|0|3|300|3000000|3000000000|1985-09-05 00:00:00|2.06|47|047|X'2F2F2F'|X'2F'
+49|1|2|200|2000000|2000000000|1985-09-06 00:00:00|2.02|48|048|X'30303030'|X'30'
+50|0|1|100|1000000|1000000000|1985-09-07 00:00:00|1.98|49|049|X'3131313131'|X'31'
+51|1|0|0|0|0|1985-09-08 00:00:00|1.94|50|050|X'32'|X'32'
+52|0|-1|-100|-1000000|-1000000000|1985-09-09 00:00:00|1.90|51|051|X'3333'|X'33'
+53|1|-2|-200|-2000000|-2000000000|1985-09-10 00:00:00|1.87|52|052|X'343434'|X'34'
+54|0|-3|-300|-3000000|-3000000000|1985-09-11 00:00:00|1.83|53|053|X'35353535'|X'35'
+55|1|-4|-400|-4000000|-4000000000|1985-09-12 00:00:00|1.80|54|054|X'3636363636'|X'36'
+56|0|-5|-500|-5000000|-5000000000|1985-09-13 00:00:00|1.77|55|055|X'37'|X'37'
+57|1|-6|-600|-6000000|-6000000000|1985-09-14 00:00:00|1.74|56|056|X'3838'|X'38'
+58|0|-7|-700|-7000000|-7000000000|1985-09-15 00:00:00|1.71|57|057|X'393939'|X'39'
+59|1|-8|-800|-8000000|-8000000000|1985-09-16 00:00:00|1.68|58|058|X'3A3A3A3A'|X'3A'
+60|0|-9|-900|-9000000|-9000000000|1985-09-17 00:00:00|1.65|59|059|X'3B3B3B3B3B'|X'3B'
+61|1|-10|-1000|-10000000|-10000000000|1985-09-18 00:00:00|1.62|60|060|X'3C'|X'3C'
+62|0|-11|-1100|-11000000|-11000000000|1985-09-19 00:00:00|1.60|61|061|X'3D3D'|X'3D'
+63|1|-12|-1200|-12000000|-12000000000|1985-09-20 00:00:00|1.57|62|062|X'3E3E3E'|X'3E'
+64|0|-13|-1300|-13000000|-13000000000|1985-09-21 00:00:00|1.55|63|063|X'3F3F3F3F'|X'3F'
+65|1|-14|-1400|-14000000|-14000000000|1985-09-22 00:00:00|1.52|64|064|X'4040404040'|X'40'
+66|0|-15|-1500|-15000000|-15000000000|1985-09-23 00:00:00|1.50|65|065|X'41'|X'41'
+67|1|-16|-1600|-16000000|-16000000000|1985-09-24 00:00:00|1.48|66|066|X'4242'|X'42'
+68|0|-17|-1700|-17000000|-17000000000|1985-09-25 00:00:00|1.46|67|067|X'434343'|X'43'
+69|1|-18|-1800|-18000000|-18000000000|1985-09-26 00:00:00|1.43|68|068|X'44444444'|X'44'
+70|0|-19|-1900|-19000000|-19000000000|1985-09-27 00:00:00|1.41|69|069|X'4545454545'|X'45'
+71|1|-20|-2000|-20000000|-20000000000|1985-09-28 00:00:00|1.39|70|070|X'46'|X'46'
+72|0|-21|-2100|-21000000|-21000000000|1985-09-29 00:00:00|1.38|71|071|X'4747'|X'47'
+73|1|-22|-2200|-22000000|-22000000000|1985-09-30 00:00:00|1.36|72|072|X'484848'|X'48'
+74|0|-23|-2300|-23000000|-23000000000|1985-10-01 00:00:00|1.34|73|073|X'49494949'|X'49'
+75|1|-24|-2400|-24000000|-24000000000|1985-10-02 00:00:00|1.32|74|074|X'4A4A4A4A4A'|X'4A'
+76|0|-25|-2500|-25000000|-25000000000|1985-10-03 00:00:00|1.30|75|075|X'4B'|X'4B'
+77|1|-26|-2600|-26000000|-26000000000|1985-10-04 00:00:00|1.29|76|076|X'4C4C'|X'4C'
+78|0|-27|-2700|-27000000|-27000000000|1985-10-05 00:00:00|1.27|77|077|X'4D4D4D'|X'4D'
+79|1|-28|-2800|-28000000|-28000000000|1985-10-06 00:00:00|1.25|78|078|X'4E4E4E4E'|X'4E'
+80|0|-29|-2900|-29000000|-29000000000|1985-10-07 00:00:00|1.24|79|079|X'4F4F4F4F4F'|X'4F'
+81|1|-30|-3000|-30000000|-30000000000|1985-10-08 00:00:00|1.22|80|080|X'50'|X'50'
+82|0|-31|-3100|-31000000|-31000000000|1985-10-09 00:00:00|1.21|81|081|X'5151'|X'51'
+83|1|-32|-3200|-32000000|-32000000000|1985-10-10 00:00:00|1.19|82|082|X'525252'|X'52'
+84|0|-33|-3300|-33000000|-33000000000|1985-10-11 00:00:00|1.18|83|083|X'53535353'|X'53'
+85|1|-34|-3400|-34000000|-34000000000|1985-10-12 00:00:00|1.16|84|084|X'5454545454'|X'54'
+86|0|-35|-3500|-35000000|-35000000000|1985-10-13 00:00:00|1.15|85|085|X'55'|X'55'
+87|1|-36|-3600|-36000000|-36000000000|1985-10-14 00:00:00|1.14|86|086|X'5656'|X'56'
+88|0|-37|-3700|-37000000|-37000000000|1985-10-15 00:00:00|1.13|87|087|X'575757'|X'57'
+89|1|-38|-3800|-38000000|-38000000000|1985-10-16 00:00:00|1.11|88|088|X'58585858'|X'58'
+90|0|-39|-3900|-39000000|-39000000000|1985-10-17 00:00:00|1.10|89|089|X'5959595959'|X'59'
+91|1|-40|-4000|-40000000|-40000000000|1985-10-18 00:00:00|1.09|90|090|X'5A'|X'5A'
+92|0|-41|-4100|-41000000|-41000000000|1985-10-19 00:00:00|1.08|91|091|X'5B5B'|X'5B'
+93|1|-42|-4200|-42000000|-42000000000|1985-10-20 00:00:00|1.06|92|092|X'5C5C5C'|X'5C'
+94|0|-43|-4300|-43000000|-43000000000|1985-10-21 00:00:00|1.05|93|093|X'5D5D5D5D'|X'5D'
+95|1|-44|-4400|-44000000|-44000000000|1985-10-22 00:00:00|1.04|94|094|X'5E5E5E5E5E'|X'5E'
+96|0|-45|-4500|-45000000|-45000000000|1985-10-23 00:00:00|1.03|95|095|X'5F'|X'5F'
+97|1|-46|-4600|-46000000|-46000000000|1985-10-24 00:00:00|1.02|96|096|X'6060'|X'60'
+98|0|-47|-4700|-47000000|-47000000000|1985-10-25 00:00:00|1.01|97|097|X'616161'|X'61'
+99|1|-48|-4800|-48000000|-48000000000|1985-10-26 00:00:00|1.00|98|098|X'62626262'|X'62'
diff --git a/tests/templates/005-rowid-1-rowgroup.sql b/tests/templates/005-rowid-1-rowgroup.sql
index df4f2b8..5a136cb 100644
--- a/tests/templates/005-rowid-1-rowgroup.sql
+++ b/tests/templates/005-rowid-1-rowgroup.sql
@@ -1,2 +1,2 @@
-select int8_1 from no_nulls1 where rowid = 50;
+select int8_1 from no_nulls1 where rowid = 51;
 0
diff --git a/tests/templates/007-rowid-55-10-rowgroups.sql b/tests/templates/007-rowid-55-10-rowgroups.sql
index fd78d4a..624d521 100644
--- a/tests/templates/007-rowid-55-10-rowgroups.sql
+++ b/tests/templates/007-rowid-55-10-rowgroups.sql
@@ -1,2 +1,2 @@
-select int8_1 from no_nulls1 where rowid = 55;
+select int8_1 from no_nulls1 where rowid = 56;
 -5
diff --git a/tests/templates/009-rowid-group-by.sql b/tests/templates/009-rowid-group-by.sql
index c35f7a6..d607139 100644
--- a/tests/templates/009-rowid-group-by.sql
+++ b/tests/templates/009-rowid-group-by.sql
@@ -1,5 +1,5 @@
 select rowid % 10, count(*) from nulls1 group by 1 order by 1
-0|10
+0|9
 1|10
 2|10
 3|10
@@ -8,4 +8,4 @@ select rowid % 10, count(*) from nulls1 group by 1 order by 1
 6|10
 7|10
 8|10
-9|9
+9|10
diff --git a/tests/templates/012-string-7-is-null.sql b/tests/templates/012-string-7-is-null.sql
index aa9b140..e79bacc 100644
--- a/tests/templates/012-string-7-is-null.sql
+++ b/tests/templates/012-string-7-is-null.sql
@@ -1,5 +1,4 @@
 select rowid, bool_0, quote(binary_10) from nulls1 where string_7 is null
-10||NULL
 11||NULL
 12||NULL
 13||NULL
@@ -9,42 +8,43 @@ select rowid, bool_0, quote(binary_10) from nulls1 where string_7 is null
 17||NULL
 18||NULL
 19||NULL
-21|0|X'15'
-23|0|X'17'
-25|0|X'19'
-27|0|X'1B'
-29|0|X'1D'
-31|0|X'1F'
-33|0|X'21'
-35|0|X'23'
-37|0|X'25'
-39|0|X'27'
-41|0|X'29'
-43|0|X'2B'
-45|0|X'2D'
-47|0|X'2F'
-49|0|X'31'
-51|0|X'33'
-53|0|X'35'
-55|0|X'37'
-57|0|X'39'
-59|0|X'3B'
-61|0|X'3D'
-63|0|X'3F'
-65|0|X'41'
-67|0|X'43'
-69|0|X'45'
-71|0|X'47'
-73|0|X'49'
-75|0|X'4B'
-77|0|X'4D'
-79|0|X'4F'
-81|0|X'51'
-83|0|X'53'
-85|0|X'55'
-87|0|X'57'
-89|0|X'59'
-91|0|X'5B'
-93|0|X'5D'
-95|0|X'5F'
-97|0|X'61'
+20||NULL
+22|0|X'15'
+24|0|X'17'
+26|0|X'19'
+28|0|X'1B'
+30|0|X'1D'
+32|0|X'1F'
+34|0|X'21'
+36|0|X'23'
+38|0|X'25'
+40|0|X'27'
+42|0|X'29'
+44|0|X'2B'
+46|0|X'2D'
+48|0|X'2F'
+50|0|X'31'
+52|0|X'33'
+54|0|X'35'
+56|0|X'37'
+58|0|X'39'
+60|0|X'3B'
+62|0|X'3D'
+64|0|X'3F'
+66|0|X'41'
+68|0|X'43'
+70|0|X'45'
+72|0|X'47'
+74|0|X'49'
+76|0|X'4B'
+78|0|X'4D'
+80|0|X'4F'
+82|0|X'51'
+84|0|X'53'
+86|0|X'55'
+88|0|X'57'
+90|0|X'59'
+92|0|X'5B'
+94|0|X'5D'
+96|0|X'5F'
+98|0|X'61'
diff --git a/tests/templates/013-string-7-is-not-null.sql b/tests/templates/013-string-7-is-not-null.sql
index edf46f6..2722426 100644
--- a/tests/templates/013-string-7-is-not-null.sql
+++ b/tests/templates/013-string-7-is-not-null.sql
@@ -1,51 +1,51 @@
 select rowid, bool_0, quote(binary_10) from nulls1 where string_7 is not null
-0|1|X'00'
-1|0|X'01'
-2|1|X'02'
-3|0|X'03'
-4|1|X'04'
-5|0|X'05'
-6|1|X'06'
-7|0|X'07'
-8|1|X'08'
-9|0|X'09'
-20||NULL
-22||NULL
-24||NULL
-26||NULL
-28||NULL
-30||NULL
-32||NULL
-34||NULL
-36||NULL
-38||NULL
-40||NULL
-42||NULL
-44||NULL
-46||NULL
-48||NULL
-50||NULL
-52||NULL
-54||NULL
-56||NULL
-58||NULL
-60||NULL
-62||NULL
-64||NULL
-66||NULL
-68||NULL
-70||NULL
-72||NULL
-74||NULL
-76||NULL
-78||NULL
-80||NULL
-82||NULL
-84||NULL
-86||NULL
-88||NULL
-90||NULL
-92||NULL
-94||NULL
-96||NULL
-98||NULL
+1|1|X'00'
+2|0|X'01'
+3|1|X'02'
+4|0|X'03'
+5|1|X'04'
+6|0|X'05'
+7|1|X'06'
+8|0|X'07'
+9|1|X'08'
+10|0|X'09'
+21||NULL
+23||NULL
+25||NULL
+27||NULL
+29||NULL
+31||NULL
+33||NULL
+35||NULL
+37||NULL
+39||NULL
+41||NULL
+43||NULL
+45||NULL
+47||NULL
+49||NULL
+51||NULL
+53||NULL
+55||NULL
+57||NULL
+59||NULL
+61||NULL
+63||NULL
+65||NULL
+67||NULL
+69||NULL
+71||NULL
+73||NULL
+75||NULL
+77||NULL
+79||NULL
+81||NULL
+83||NULL
+85||NULL
+87||NULL
+89||NULL
+91||NULL
+93||NULL
+95||NULL
+97||NULL
+99||NULL
diff --git a/tests/templates/021-rowid-and-field-eq.sql b/tests/templates/021-rowid-and-field-eq.sql
index 7932149..904f929 100644
--- a/tests/templates/021-rowid-and-field-eq.sql
+++ b/tests/templates/021-rowid-and-field-eq.sql
@@ -1,2 +1,2 @@
-select string_8 from nulls1 where rowid = 21 and string_8 = '021'
+select string_8 from nulls1 where rowid = 22 and string_8 = '021'
 021
diff --git a/tests/templates/022-rowid-and-field-ne.sql b/tests/templates/022-rowid-and-field-ne.sql
index 8862ac0..3afbd13 100644
--- a/tests/templates/022-rowid-and-field-ne.sql
+++ b/tests/templates/022-rowid-and-field-ne.sql
@@ -1 +1 @@
-select string_8 from nulls1 where rowid = 21 and string_8 <> '021'
+select string_8 from nulls1 where rowid = 22 and string_8 <> '021'
diff --git a/tests/templates/035-int64-rowid-eq-and-field-ne2.sql b/tests/templates/035-int64-rowid-eq-and-field-ne2.sql
index 8bcc97b..1c86f0a 100644
--- a/tests/templates/035-int64-rowid-eq-and-field-ne2.sql
+++ b/tests/templates/035-int64-rowid-eq-and-field-ne2.sql
@@ -1,2 +1,2 @@
-select int64_4 from nulls1 where rowid = 57 and int64_4 <> -8000000000
+select int64_4 from nulls1 where rowid = 58 and int64_4 <> -8000000000
 -7000000000
diff --git a/tests/templates/042-double-rowid-and-field-ne2.sql b/tests/templates/042-double-rowid-and-field-ne2.sql
index 4af9635..d1c778b 100644
--- a/tests/templates/042-double-rowid-and-field-ne2.sql
+++ b/tests/templates/042-double-rowid-and-field-ne2.sql
@@ -1,2 +1,2 @@
-select printf('%.2f', double_6) from nulls1 where rowid = 0 and double_6 <> 100.0
+select printf('%.2f', double_6) from nulls1 where rowid = 1 and double_6 <> 100.0
 99.00
diff --git a/tests/templates/043-binary-eq.sql b/tests/templates/043-binary-eq.sql
index 8d4c96a..e719042 100644
--- a/tests/templates/043-binary-eq.sql
+++ b/tests/templates/043-binary-eq.sql
@@ -1,2 +1,2 @@
 select rowid from nulls1 where binary_10 = x'01';
-1
+2
diff --git a/tests/templates/044-binary-rowid-and-ne.sql b/tests/templates/044-binary-rowid-and-ne.sql
index 9c818b2..0a5d11d 100644
--- a/tests/templates/044-binary-rowid-and-ne.sql
+++ b/tests/templates/044-binary-rowid-and-ne.sql
@@ -1 +1 @@
-select rowid from nulls1 where rowid = 1 and binary_10 <> x'01';
+select rowid from nulls1 where rowid = 2 and binary_10 <> x'01';
diff --git a/tests/templates/045-binary-lt.sql b/tests/templates/045-binary-lt.sql
index 2673833..d640862 100644
--- a/tests/templates/045-binary-lt.sql
+++ b/tests/templates/045-binary-lt.sql
@@ -1,2 +1,2 @@
 select rowid from nulls1 where binary_10 < x'01';
-0
+1
diff --git a/tests/templates/046-binary-lte.sql b/tests/templates/046-binary-lte.sql
index 5a6ae96..8b07fe9 100644
--- a/tests/templates/046-binary-lte.sql
+++ b/tests/templates/046-binary-lte.sql
@@ -1,3 +1,3 @@
 select rowid from nulls1 where binary_10 <= x'01' order by 1;
-0
 1
+2
diff --git a/tests/templates/047-binary-gt.sql b/tests/templates/047-binary-gt.sql
index 5da1ecc..bd10f01 100644
--- a/tests/templates/047-binary-gt.sql
+++ b/tests/templates/047-binary-gt.sql
@@ -1,2 +1,2 @@
 select rowid from nulls1 where binary_10 > x'60';
-97
+98
diff --git a/tests/templates/048-binary-gte.sql b/tests/templates/048-binary-gte.sql
index 97205b4..d8c3030 100644
--- a/tests/templates/048-binary-gte.sql
+++ b/tests/templates/048-binary-gte.sql
@@ -1,3 +1,3 @@
 select rowid from nulls1 where binary_10 >= x'5F' order by 1;
-95
-97
+96
+98
diff --git a/tests/templates/054-rowid-lte-one.sql b/tests/templates/054-rowid-lte-one.sql
index ba6fc8b..d5651df 100644
--- a/tests/templates/054-rowid-lte-one.sql
+++ b/tests/templates/054-rowid-lte-one.sql
@@ -1,2 +1,2 @@
-select count(*) from no_nulls1 where rowid <= 0
+select count(*) from no_nulls1 where rowid <= 1
 1
diff --git a/tests/templates/055-rowid-lt-one.sql b/tests/templates/055-rowid-lt-one.sql
index e52480d..bff3003 100644
--- a/tests/templates/055-rowid-lt-one.sql
+++ b/tests/templates/055-rowid-lt-one.sql
@@ -1,2 +1,2 @@
-select count(*) from no_nulls1 where rowid < 1
+select count(*) from no_nulls1 where rowid < 2
 1
diff --git a/tests/templates/060-rowid-double.sql b/tests/templates/060-rowid-double.sql
index bc82a14..7778eda 100644
--- a/tests/templates/060-rowid-double.sql
+++ b/tests/templates/060-rowid-double.sql
@@ -1,2 +1,2 @@
-select int8_1 from no_nulls1 where rowid = 50.0;
+select int8_1 from no_nulls1 where rowid = 51.0;
 0
diff --git a/tests/templates/089-int64-ne-some-str.sql b/tests/templates/089-int64-ne-some-str.sql
index 831aced..020ea4b 100644
--- a/tests/templates/089-int64-ne-some-str.sql
+++ b/tests/templates/089-int64-ne-some-str.sql
@@ -1,2 +1,2 @@
-select int64_4 from nulls1 where rowid = 57 and int64_4 <> '-8000000000'
+select int64_4 from nulls1 where rowid = 58 and int64_4 <> '-8000000000'
 -7000000000
diff --git a/tests/templates/090-int64-ne-some-double.sql b/tests/templates/090-int64-ne-some-double.sql
index d51736e..d9b3e06 100644
--- a/tests/templates/090-int64-ne-some-double.sql
+++ b/tests/templates/090-int64-ne-some-double.sql
@@ -1,2 +1,2 @@
-select int64_4 from nulls1 where rowid = 57 and int64_4 <> -8000000000.0
+select int64_4 from nulls1 where rowid = 58 and int64_4 <> -8000000000.0
 -7000000000
diff --git a/tests/templates/103-double-rowid-and-field-ne2-some-str.sql b/tests/templates/103-double-rowid-and-field-ne2-some-str.sql
index 2e6401b..2cbd9a8 100644
--- a/tests/templates/103-double-rowid-and-field-ne2-some-str.sql
+++ b/tests/templates/103-double-rowid-and-field-ne2-some-str.sql
@@ -1,2 +1,2 @@
-select printf('%.2f', double_6) from nulls1 where rowid = 0 and double_6 <> '100'
+select printf('%.2f', double_6) from nulls1 where rowid = 1 and double_6 <> '100'
 99.00
diff --git a/tests/templates/104-double-rowid-and-field-ne2-some-int.sql b/tests/templates/104-double-rowid-and-field-ne2-some-int.sql
index 171b5b3..bc49adc 100644
--- a/tests/templates/104-double-rowid-and-field-ne2-some-int.sql
+++ b/tests/templates/104-double-rowid-and-field-ne2-some-int.sql
@@ -1,2 +1,2 @@
-select printf('%.2f', double_6) from nulls1 where rowid = 0 and double_6 <> 100
+select printf('%.2f', double_6) from nulls1 where rowid = 1 and double_6 <> 100
 99.00
diff --git a/tests/templates/106-rowid-gt-0.sql b/tests/templates/106-rowid-gt-0.sql
index 55e8e53..fa00ce7 100644
--- a/tests/templates/106-rowid-gt-0.sql
+++ b/tests/templates/106-rowid-gt-0.sql
@@ -1,2 +1,2 @@
-select count(*) from no_nulls1 where rowid > 0
+select count(*) from no_nulls1 where rowid > 1
 98