diff --git a/meson.build b/meson.build
index e630c01..56c47d9 100644
--- a/meson.build
+++ b/meson.build
@@ -11,7 +11,7 @@ shared_library('parquet',
 	sources: sources 
 )
 
-test('Load the extension', find_program('tests/test-smoke'))
-test('Try loading an unsupported file', find_program('tests/test-bad-create-table'))
-test('Try loading a non-existent file', find_program('tests/test-non-existent'))
+subdir('tests')
+#test('Try loading a non-existent file', find_program('tests/test-non-existent'))
+#test('Try loading an unsupported file', find_program('tests/test-bad-create-table'))
 
diff --git a/runner.py b/runner.py
deleted file mode 100644
index 21e93f6..0000000
--- a/runner.py
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/python3
-import argparse
-import os
-import subprocess
-
-DESCRIPTION = '''sqlite-parquet-vtable test runner
-Run a query against several data files with varying encodings,
-and verify that the output matches an expected value
-'''
-
-COMMON_QUERY_LINES = [
-        '.echo off',
-        '.load ./libparquet',
-]
-
-
-def read(filename):
-    '''Take a filename, read it into a variable -- critically, closing it after we're done'''
-    with open(filename) as file:
-        return file.read()
-
-
-def dispatch(query_file, results_file, expected_exit_code, datasets):
-    '''Run a query against assorted formats of the datasets, verifying the result each time'''
-    query = read(query_file)
-    expected_results = read(results_file)
-    for dataset in datasets:
-        for file in os.listdir(dataset):
-            if not file.endswith('.parquet'):
-                print(f'Ignoring {file} -- does not end in .parquet')
-                continue
-            vtable_statement = f'CREATE VIRTUAL TABLE dataset USING parquet(\'{file}\');'
-            # Append test-specified query to common lines, insert \n between lines
-            full_query = '\n'.join(COMMON_QUERY_LINES+[vtable_statement, query])
-            proc = subprocess.run(
-                'sqlite3',
-                stdout=subprocess.PIPE,
-                input=full_query,
-                encoding='UTF-8',
-                check=False
-            )
-            assert proc.returncode == expected_exit_code
-            assert proc.stdout == expected_results
-
-
-if __name__ == '__main__':
-    PARSER = argparse.ArgumentParser(description=DESCRIPTION)
-    PARSER.add_argument('query', metavar='query', help='the .sql file containing the query')
-    PARSER.add_argument('results', help='the file containing .output format expected results')
-    PARSER.add_argument('exit_code', help='the exit code you expect to recieve')
-    PARSER.add_argument('dataset', nargs='+', help='a dataset to run the query against')
-
-    ARGS = PARSER.parse_args()
-
-    # Verify that each query and result file exist
-    assert os.path.isfile(ARGS.query)
-    assert os.path.isfile(ARGS.results)
-    # Verify that each dataset argument is a folder (ideally with .parquet files inside)
-    for dataset_dir in ARGS.dataset:
-        assert os.path.isdir(dataset_dir)
-
-    dispatch(
-        query_file=ARGS.query,
-        results_file=ARGS.results,
-        expected_exit_code=ARGS.exit_code,
-        datasets=ARGS.dataset
-    )
diff --git a/tests/NOTHING b/tests/NOTHING
new file mode 100644
index 0000000..e69de29
diff --git a/tests/create-queries-from-templates b/tests/create-queries-from-templates
deleted file mode 100755
index 124ea45..0000000
--- a/tests/create-queries-from-templates
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/python3
-
-import os.path
-from os import makedirs
-from glob import glob
-import re
-import itertools
-
-NULL_TOKENS = ['nulls', 'nulls1', 'nulls2', 'nulls3']
-NO_NULL_TOKENS = ['no_nulls', 'no_nulls1', 'no_nulls2', 'no_nulls3']
-
-TOKEN_SET = NULL_TOKENS + NO_NULL_TOKENS
-
-def extract_tokens(line):
-    line = re.sub('[^a-zA-Z0-9_]', ' ', line).split(' ')
-    return list(set([token for token in line if token in TOKEN_SET]))
-
-def main(template_dir, query_dir):
-    try:
-        makedirs(query_dir)
-    except:
-        pass
-
-    for f in glob(os.path.join(query_dir, '*')):
-            os.remove(f)
-
-    for f in glob(os.path.join(template_dir, '*.sql')):
-        basename = os.path.basename(f)
-
-        with open(f, 'r') as fptr:
-            content = fptr.readlines()
-
-        # Sort tokens longest first so string replace will replace no_nullsX before nullsX
-        # (irrelevant ATM, but maybe useful later)
-        tokens = sorted(extract_tokens(content[0]), key=lambda x: -len(x))
-        if not tokens:
-            raise ValueError('{} had no tokens'.format(content[0]))
-
-        # For simplicity, we don't support mixing nulls and no_nulls
-        if not all(len(token) == len(tokens[0]) for token in tokens):
-            raise ValueError('cannot mix nulls and no_nulls: {}'.format(content[0]))
-
-
-        template = content[0]
-        for token in tokens:
-            template = template.replace(token, token.upper())
-
-        replacements = NULL_TOKENS
-        if tokens[0].startswith('no'):
-            replacements = NO_NULL_TOKENS
-
-        for variant, choices in enumerate(itertools.combinations_with_replacement(replacements, len(tokens))):
-            query = template
-            for idx, token in enumerate(tokens):
-                query = query.replace(token.upper(), choices[idx])
-            fname = basename.replace('.sql', '-{}.sql'.format(variant))
-
-            with open(os.path.join(query_dir, fname), 'w') as fptr:
-                content[0] = query
-                fptr.write(''.join(content))
-
-if __name__ == '__main__':
-    template_dir = os.path.abspath(os.path.join(__file__, '..', 'templates'))
-    query_dir = os.path.abspath(os.path.join(__file__, '..', 'queries'))
-    main(template_dir, query_dir)
diff --git a/tests/create-template b/tests/create-template
deleted file mode 100755
index 40b49cb..0000000
--- a/tests/create-template
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-query=${1:?must provide query}
-
-echo "$query"
-psql parquet postgres <<EOF
-COPY ($query) TO STDOUT WITH (DELIMITER '|', NULL '');
-EOF
diff --git a/tests/datasets/no-nulls/99-rows_groupsize-1.parquet b/tests/datasets/no-nulls/99-rows_groupsize-1.parquet
new file mode 100644
index 0000000..c676390
Binary files /dev/null and b/tests/datasets/no-nulls/99-rows_groupsize-1.parquet differ
diff --git a/tests/datasets/no-nulls/99-rows_groupsize-10.parquet b/tests/datasets/no-nulls/99-rows_groupsize-10.parquet
new file mode 100644
index 0000000..403dac5
Binary files /dev/null and b/tests/datasets/no-nulls/99-rows_groupsize-10.parquet differ
diff --git a/tests/datasets/no-nulls/99-rows_groupsize-99.parquet b/tests/datasets/no-nulls/99-rows_groupsize-99.parquet
new file mode 100644
index 0000000..9853d2b
Binary files /dev/null and b/tests/datasets/no-nulls/99-rows_groupsize-99.parquet differ
diff --git a/parquet-generator/99-rows-nulls-1.parquet b/tests/datasets/nulls/99-rows_groupsize-1.parquet
similarity index 100%
rename from parquet-generator/99-rows-nulls-1.parquet
rename to tests/datasets/nulls/99-rows_groupsize-1.parquet
diff --git a/parquet-generator/99-rows-nulls-10.parquet b/tests/datasets/nulls/99-rows_groupsize-10.parquet
similarity index 100%
rename from parquet-generator/99-rows-nulls-10.parquet
rename to tests/datasets/nulls/99-rows_groupsize-10.parquet
diff --git a/parquet-generator/99-rows-nulls-99.parquet b/tests/datasets/nulls/99-rows_groupsize-99.parquet
similarity index 100%
rename from parquet-generator/99-rows-nulls-99.parquet
rename to tests/datasets/nulls/99-rows_groupsize-99.parquet
diff --git a/parquet-generator/unsupported-decimal-10-0-.parquet b/tests/datasets/unsupported/decimal-10-0.parquet
similarity index 100%
rename from parquet-generator/unsupported-decimal-10-0-.parquet
rename to tests/datasets/unsupported/decimal-10-0.parquet
diff --git a/parquet-generator/unsupported-null.parquet b/tests/datasets/unsupported/null.parquet
similarity index 100%
rename from parquet-generator/unsupported-null.parquet
rename to tests/datasets/unsupported/null.parquet
diff --git a/parquet-generator/unsupported-uint16.parquet b/tests/datasets/unsupported/uint16.parquet
similarity index 100%
rename from parquet-generator/unsupported-uint16.parquet
rename to tests/datasets/unsupported/uint16.parquet
diff --git a/parquet-generator/unsupported-uint64.parquet b/tests/datasets/unsupported/uint64.parquet
similarity index 100%
rename from parquet-generator/unsupported-uint64.parquet
rename to tests/datasets/unsupported/uint64.parquet
diff --git a/parquet-generator/unsupported-uint8.parquet b/tests/datasets/unsupported/uint8.parquet
similarity index 100%
rename from parquet-generator/unsupported-uint8.parquet
rename to tests/datasets/unsupported/uint8.parquet
diff --git a/tests/meson.build b/tests/meson.build
new file mode 100644
index 0000000..0a26f7a
--- /dev/null
+++ b/tests/meson.build
@@ -0,0 +1,9 @@
+
+# For more test args see https://mesonbuild.com/Unit-tests.html#other-test-options
+runner = find_program('runner.py')
+
+test('Load the extension', runner, args: files('NOTHING', 'NOTHING')+['0'])
+test('Try loading a non-existent file', runner, args: files('./segfault-safety/nonexistent-file.sql', 'NOTHING')+['1'])
+test('Try loading an unspecified file', runner, args: files('./segfault-safety/unspecified-file.sql', 'NOTHING')+['1'])
+test('Try loading an unsupported file', runner, args: files('NOTHING', 'NOTHING')+['1','unsupported'])
+test('Load all supported test files', runner, args: files('./segfault-safety/load-valid-file/query.sql', './segfault-safety/load-valid-file/results.txt')+['0','no-nulls','nulls'])
diff --git a/tests/runner.py b/tests/runner.py
new file mode 100644
index 0000000..710cdbe
--- /dev/null
+++ b/tests/runner.py
@@ -0,0 +1,77 @@
+#!/usr/bin/python3
+import argparse
+import os
+import subprocess
+
+DESCRIPTION = '''sqlite-parquet-vtable test runner
+Run a query against several data files with varying encodings,
+and verify that the output matches an expected value
+'''
+
+COMMON_QUERY_LINES = [
+        '.echo off',
+        '.load ./libparquet',
+]
+
+TEST_ROOT = os.path.dirname(os.path.abspath(__file__))
+
+def read(filename):
+    '''Take a filename, read it into a variable -- critically, closing it after we're done'''
+    with open(filename) as file:
+        return file.read()
+
+def run_and_verify(query, expected_results, expected_exit_code):
+    '''Run a given query, compare the results and error code'''
+    proc = subprocess.run(
+        'sqlite3',
+        stdout=subprocess.PIPE,
+        input=query,
+        encoding='UTF-8',
+        check=False
+    )
+    assert proc.returncode == expected_exit_code, f'Expected exit code {expected_exit_code}, found {proc.returncode}'
+    assert proc.stdout == expected_results, f'Expected stdout to be {expected_results}, it was actually {proc.stdout}'
+
+def dispatch(query_file, results_file, expected_exit_code, datasets):
+    '''Run a query against assorted formats of the datasets, verifying the result each time'''
+    query = read(query_file)
+    expected_results = read(results_file)
+    # Some of the error test cases don't need multiple datasets
+    if len(datasets) == 0:
+        run_and_verify(query, expected_results, expected_exit_code)
+
+    # For most tests, run against all members of a dataset
+    for dataset in datasets:
+        for file in os.listdir(TEST_ROOT+'/datasets/'+dataset):
+            filepath = TEST_ROOT+'/datasets/'+dataset+'/'+file
+            if not filepath.endswith('.parquet'):
+                print(f'Ignoring {file} -- does not end in .parquet')
+                continue
+            vtable_statement = f'CREATE VIRTUAL TABLE dataset USING parquet(\'{filepath}\');'
+            # Append test-specified query to common lines, insert \n between lines
+            full_query = '\n'.join(COMMON_QUERY_LINES+[vtable_statement, query])
+            run_and_verify(full_query, expected_results, expected_exit_code)
+
+
+if __name__ == '__main__':
+    PARSER = argparse.ArgumentParser(description=DESCRIPTION)
+    PARSER.add_argument('query', help='the .sql file containing the query to run')
+    PARSER.add_argument('results', help='the file containing the expected result of the query')
+    PARSER.add_argument('exit_code', help='the exit code you expect to recieve')
+    PARSER.add_argument('dataset', nargs='*', help='a dataset to run the query against')
+
+    ARGS = PARSER.parse_args()
+
+    # Verify that each query and result file exist
+    assert os.path.isfile(ARGS.query), f'Expected to find query file at {ARGS.query}'
+    assert os.path.isfile(ARGS.results), f'Expected to find results file at {ARGS.results}'
+    # Verify that each dataset argument is a folder (ideally with .parquet files inside)
+    for dataset_dir in ARGS.dataset:
+        assert os.path.isdir(TEST_ROOT+'/datasets/'+dataset_dir), f'Expected dataset to be a directory'
+
+    dispatch(
+        query_file=ARGS.query,
+        results_file=ARGS.results,
+        expected_exit_code=int(ARGS.exit_code),
+        datasets=ARGS.dataset
+    )
diff --git a/tests/segfault-safety/load-valid-file/query.sql b/tests/segfault-safety/load-valid-file/query.sql
new file mode 100644
index 0000000..5e65b01
--- /dev/null
+++ b/tests/segfault-safety/load-valid-file/query.sql
@@ -0,0 +1 @@
+SELECT * FROM dataset LIMIT 1;
diff --git a/tests/segfault-safety/load-valid-file/results.txt b/tests/segfault-safety/load-valid-file/results.txt
new file mode 100644
index 0000000..4248e51
--- /dev/null
+++ b/tests/segfault-safety/load-valid-file/results.txt
@@ -0,0 +1 @@
+1|50|5000|50000000|50000000000|490665600000|99.0|0|000|||1.0
diff --git a/tests/segfault-safety/nonexistent-file.sql b/tests/segfault-safety/nonexistent-file.sql
new file mode 100644
index 0000000..ee6d105
--- /dev/null
+++ b/tests/segfault-safety/nonexistent-file.sql
@@ -0,0 +1 @@
+CREATE VIRTUAL TABLE test USING parquet('$doesnotexist.parquet');
diff --git a/tests/segfault-safety/unspecified-file.sql b/tests/segfault-safety/unspecified-file.sql
new file mode 100644
index 0000000..cded8d7
--- /dev/null
+++ b/tests/segfault-safety/unspecified-file.sql
@@ -0,0 +1 @@
+CREATE VIRTUAL TABLE test USING parquet;
diff --git a/tests/templates/001-table-scan-1-rowgroup.sql b/tests/templates/001-table-scan-1-rowgroup.sql
deleted file mode 100644
index 7dc3c6d..0000000
--- a/tests/templates/001-table-scan-1-rowgroup.sql
+++ /dev/null
@@ -1,100 +0,0 @@
-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
-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/003-cross-join-count-1-rowgroup.sql b/tests/templates/003-cross-join-count-1-rowgroup.sql
deleted file mode 100644
index 18cdd23..0000000
--- a/tests/templates/003-cross-join-count-1-rowgroup.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from (select * from no_nulls1 t1, no_nulls1 t2);
-9801
diff --git a/tests/templates/004-cross-join-10-rowgroups.sql b/tests/templates/004-cross-join-10-rowgroups.sql
deleted file mode 100644
index 92a8c73..0000000
--- a/tests/templates/004-cross-join-10-rowgroups.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from (select * from no_nulls1 t1, no_nulls2 t2);
-9801
diff --git a/tests/templates/005-rowid-1-rowgroup.sql b/tests/templates/005-rowid-1-rowgroup.sql
deleted file mode 100644
index 5a136cb..0000000
--- a/tests/templates/005-rowid-1-rowgroup.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 624d521..0000000
--- a/tests/templates/007-rowid-55-10-rowgroups.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select int8_1 from no_nulls1 where rowid = 56;
--5
diff --git a/tests/templates/008-nulls.sql b/tests/templates/008-nulls.sql
deleted file mode 100644
index 1f4c57d..0000000
--- a/tests/templates/008-nulls.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-SELECT SUM(CASE WHEN bool_0 IS NULL THEN 1 ELSE 0 END), SUM(CASE WHEN int8_1 IS NULL THEN 1 ELSE 0 END), SUM(CASE WHEN int16_2 IS NULL THEN 1 ELSE 0 END), SUM(CASE WHEN int32_3 IS NULL THEN 1 ELSE 0 END), SUM(CASE WHEN int64_4 IS NULL THEN 1 ELSE 0 END), SUM(CASE WHEN ts_5 IS NULL THEN 1 ELSE 0 END), SUM(CASE WHEN double_6 IS NULL THEN 1 ELSE 0 END), SUM(CASE WHEN string_7 IS NULL THEN 1 ELSE 0 END), SUM(CASE WHEN string_8 IS NULL THEN 1 ELSE 0 END), SUM(CASE WHEN binary_9 IS NULL THEN 1 ELSE 0 END), SUM(CASE WHEN binary_10 IS NULL THEN 1 ELSE 0 END) from nulls1;
-50|49|50|49|50|49|50|49|50|49|50
diff --git a/tests/templates/009-rowid-group-by.sql b/tests/templates/009-rowid-group-by.sql
deleted file mode 100644
index d607139..0000000
--- a/tests/templates/009-rowid-group-by.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-select rowid % 10, count(*) from nulls1 group by 1 order by 1
-0|9
-1|10
-2|10
-3|10
-4|10
-5|10
-6|10
-7|10
-8|10
-9|10
diff --git a/tests/templates/010-order-by-string7.sql b/tests/templates/010-order-by-string7.sql
deleted file mode 100644
index e3d3efd..0000000
--- a/tests/templates/010-order-by-string7.sql
+++ /dev/null
@@ -1,100 +0,0 @@
-select string_7 from no_nulls1 order by string_7
-0
-1
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-2
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-3
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-4
-40
-41
-42
-43
-44
-45
-46
-47
-48
-49
-5
-50
-51
-52
-53
-54
-55
-56
-57
-58
-59
-6
-60
-61
-62
-63
-64
-65
-66
-67
-68
-69
-7
-70
-71
-72
-73
-74
-75
-76
-77
-78
-79
-8
-80
-81
-82
-83
-84
-85
-86
-87
-88
-89
-9
-90
-91
-92
-93
-94
-95
-96
-97
-98
diff --git a/tests/templates/011-order-by-string8.sql b/tests/templates/011-order-by-string8.sql
deleted file mode 100644
index d2ff653..0000000
--- a/tests/templates/011-order-by-string8.sql
+++ /dev/null
@@ -1,100 +0,0 @@
-select string_8 from no_nulls1 order by string_8
-000
-001
-002
-003
-004
-005
-006
-007
-008
-009
-010
-011
-012
-013
-014
-015
-016
-017
-018
-019
-020
-021
-022
-023
-024
-025
-026
-027
-028
-029
-030
-031
-032
-033
-034
-035
-036
-037
-038
-039
-040
-041
-042
-043
-044
-045
-046
-047
-048
-049
-050
-051
-052
-053
-054
-055
-056
-057
-058
-059
-060
-061
-062
-063
-064
-065
-066
-067
-068
-069
-070
-071
-072
-073
-074
-075
-076
-077
-078
-079
-080
-081
-082
-083
-084
-085
-086
-087
-088
-089
-090
-091
-092
-093
-094
-095
-096
-097
-098
diff --git a/tests/templates/012-string-7-is-null.sql b/tests/templates/012-string-7-is-null.sql
deleted file mode 100644
index e79bacc..0000000
--- a/tests/templates/012-string-7-is-null.sql
+++ /dev/null
@@ -1,50 +0,0 @@
-select rowid, bool_0, quote(binary_10) from nulls1 where string_7 is null
-11||NULL
-12||NULL
-13||NULL
-14||NULL
-15||NULL
-16||NULL
-17||NULL
-18||NULL
-19||NULL
-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
deleted file mode 100644
index 2722426..0000000
--- a/tests/templates/013-string-7-is-not-null.sql
+++ /dev/null
@@ -1,51 +0,0 @@
-select rowid, bool_0, quote(binary_10) from nulls1 where string_7 is not 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/014-nulls-like-percent-start.sql b/tests/templates/014-nulls-like-percent-start.sql
deleted file mode 100644
index 35c4517..0000000
--- a/tests/templates/014-nulls-like-percent-start.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select string_7, string_8 from nulls1 where string_8 like '%0'
-0|000
diff --git a/tests/templates/015-nulls-like-no-match.sql b/tests/templates/015-nulls-like-no-match.sql
deleted file mode 100644
index 0ec13dc..0000000
--- a/tests/templates/015-nulls-like-no-match.sql
+++ /dev/null
@@ -1 +0,0 @@
-select string_7, string_8 from nulls1 where string_8 like '0'
diff --git a/tests/templates/016-nulls-like-percent-end.sql b/tests/templates/016-nulls-like-percent-end.sql
deleted file mode 100644
index f12a894..0000000
--- a/tests/templates/016-nulls-like-percent-end.sql
+++ /dev/null
@@ -1,50 +0,0 @@
-select string_7, string_8 from nulls1 where string_8 like '0%'
-0|000
-1|001
-2|002
-3|003
-4|004
-5|005
-6|006
-7|007
-8|008
-9|009
-|021
-|023
-|025
-|027
-|029
-|031
-|033
-|035
-|037
-|039
-|041
-|043
-|045
-|047
-|049
-|051
-|053
-|055
-|057
-|059
-|061
-|063
-|065
-|067
-|069
-|071
-|073
-|075
-|077
-|079
-|081
-|083
-|085
-|087
-|089
-|091
-|093
-|095
-|097
diff --git a/tests/templates/017-nulls-like-underscore.sql b/tests/templates/017-nulls-like-underscore.sql
deleted file mode 100644
index 680203b..0000000
--- a/tests/templates/017-nulls-like-underscore.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select string_7, string_8 from nulls1 where string_8 like '0_0'
-0|000
diff --git a/tests/templates/018-string-gt-lt.sql b/tests/templates/018-string-gt-lt.sql
deleted file mode 100644
index 8775ee0..0000000
--- a/tests/templates/018-string-gt-lt.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-select string_8 from nulls1 where string_8 > '010' and string_8 < '024'
-021
-023
diff --git a/tests/templates/019-string-gte-lte.sql b/tests/templates/019-string-gte-lte.sql
deleted file mode 100644
index 128a2fc..0000000
--- a/tests/templates/019-string-gte-lte.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select string_8 from nulls1 where string_8 >= '021' and string_8 <= '021'
-021
diff --git a/tests/templates/020-string-eq.sql b/tests/templates/020-string-eq.sql
deleted file mode 100644
index 6c7d9f4..0000000
--- a/tests/templates/020-string-eq.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select string_8 from nulls1 where string_8 = '021'
-021
diff --git a/tests/templates/021-rowid-and-field-eq.sql b/tests/templates/021-rowid-and-field-eq.sql
deleted file mode 100644
index 904f929..0000000
--- a/tests/templates/021-rowid-and-field-eq.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 3afbd13..0000000
--- a/tests/templates/022-rowid-and-field-ne.sql
+++ /dev/null
@@ -1 +0,0 @@
-select string_8 from nulls1 where rowid = 22 and string_8 <> '021'
diff --git a/tests/templates/023-int8-eq.sql b/tests/templates/023-int8-eq.sql
deleted file mode 100644
index 95213ae..0000000
--- a/tests/templates/023-int8-eq.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select int8_1 from nulls1 where int8_1 = 30
-30
diff --git a/tests/templates/024-int8-lt.sql b/tests/templates/024-int8-lt.sql
deleted file mode 100644
index 64cf4ec..0000000
--- a/tests/templates/024-int8-lt.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select int8_1 from nulls1 where int8_1 < -46
--48
diff --git a/tests/templates/025-int8-lte.sql b/tests/templates/025-int8-lte.sql
deleted file mode 100644
index 4647fcb..0000000
--- a/tests/templates/025-int8-lte.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-select int8_1 from nulls1 where int8_1 <= -46
--46
--48
diff --git a/tests/templates/026-int8-gt.sql b/tests/templates/026-int8-gt.sql
deleted file mode 100644
index 2dd1398..0000000
--- a/tests/templates/026-int8-gt.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select int8_1 from nulls1 where int8_1 > 49
-50
diff --git a/tests/templates/027-int8-gte.sql b/tests/templates/027-int8-gte.sql
deleted file mode 100644
index bf19539..0000000
--- a/tests/templates/027-int8-gte.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-select int8_1 from nulls1 where int8_1 >= 49
-50
-49
diff --git a/tests/templates/028-int8-rowid-eq-and-field-ne.sql b/tests/templates/028-int8-rowid-eq-and-field-ne.sql
deleted file mode 100644
index cceeca7..0000000
--- a/tests/templates/028-int8-rowid-eq-and-field-ne.sql
+++ /dev/null
@@ -1 +0,0 @@
-select int8_1 from nulls1 where rowid = 66 and int8_1 <> -16
diff --git a/tests/templates/029-int64-gte.sql b/tests/templates/029-int64-gte.sql
deleted file mode 100644
index 8215392..0000000
--- a/tests/templates/029-int64-gte.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-select int64_4 from nulls1 where int64_4 >= 49000000000
-50000000000
-49000000000
diff --git a/tests/templates/030-int64-gt.sql b/tests/templates/030-int64-gt.sql
deleted file mode 100644
index 274f56a..0000000
--- a/tests/templates/030-int64-gt.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select int64_4 from nulls1 where int64_4 > 49000000000
-50000000000
diff --git a/tests/templates/031-int64-eq.sql b/tests/templates/031-int64-eq.sql
deleted file mode 100644
index 88df198..0000000
--- a/tests/templates/031-int64-eq.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select int64_4 from nulls1 where int64_4 = 49000000000
-49000000000
diff --git a/tests/templates/032-int64-lt.sql b/tests/templates/032-int64-lt.sql
deleted file mode 100644
index 7fa5e4e..0000000
--- a/tests/templates/032-int64-lt.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select int64_4 from nulls1 where int64_4 < -46000000000
--47000000000
diff --git a/tests/templates/033-int64-lte.sql b/tests/templates/033-int64-lte.sql
deleted file mode 100644
index 0d305c2..0000000
--- a/tests/templates/033-int64-lte.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-select int64_4 from nulls1 where int64_4 <= -45000000000
--45000000000
--47000000000
diff --git a/tests/templates/034-int64-rowid-eq-and-field-ne.sql b/tests/templates/034-int64-rowid-eq-and-field-ne.sql
deleted file mode 100644
index e5c1c36..0000000
--- a/tests/templates/034-int64-rowid-eq-and-field-ne.sql
+++ /dev/null
@@ -1 +0,0 @@
-select int64_4 from nulls1 where rowid = 57 and int64_4 <> -7000000000
diff --git a/tests/templates/035-int64-rowid-eq-and-field-ne2.sql b/tests/templates/035-int64-rowid-eq-and-field-ne2.sql
deleted file mode 100644
index 1c86f0a..0000000
--- a/tests/templates/035-int64-rowid-eq-and-field-ne2.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select int64_4 from nulls1 where rowid = 58 and int64_4 <> -8000000000
--7000000000
diff --git a/tests/templates/036-double-eq.sql b/tests/templates/036-double-eq.sql
deleted file mode 100644
index 3439e49..0000000
--- a/tests/templates/036-double-eq.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select printf('%.2f', double_6) as double_6 from nulls1 where double_6 = 99.0
-99.00
diff --git a/tests/templates/037-double-gt.sql b/tests/templates/037-double-gt.sql
deleted file mode 100644
index 0636e5f..0000000
--- a/tests/templates/037-double-gt.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select printf('%.2f', double_6) as double_6 from nulls1 where double_6 > 98.0
-99.00
diff --git a/tests/templates/038-double-gte.sql b/tests/templates/038-double-gte.sql
deleted file mode 100644
index 8e7536f..0000000
--- a/tests/templates/038-double-gte.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-select printf('%.2f', double_6) as double_6 from nulls1 where double_6 >= 49.5
-99.00
-49.50
diff --git a/tests/templates/039-double-lt.sql b/tests/templates/039-double-lt.sql
deleted file mode 100644
index 716e6d7..0000000
--- a/tests/templates/039-double-lt.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select printf('%.2f', double_6) from nulls1 where double_6 < 99.0 order by double_6 desc limit 1
-49.50
diff --git a/tests/templates/040-double-lte.sql b/tests/templates/040-double-lte.sql
deleted file mode 100644
index a071b2c..0000000
--- a/tests/templates/040-double-lte.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select printf('%.2f', double_6) from nulls1 where double_6 <= 99.0 order by double_6 desc limit 1
-99.00
diff --git a/tests/templates/041-double-rowid-and-field-ne.sql b/tests/templates/041-double-rowid-and-field-ne.sql
deleted file mode 100644
index ef9404e..0000000
--- a/tests/templates/041-double-rowid-and-field-ne.sql
+++ /dev/null
@@ -1 +0,0 @@
-select printf('%.2f', double_6) from nulls1 where rowid = 0 and double_6 <> 99.0
diff --git a/tests/templates/042-double-rowid-and-field-ne2.sql b/tests/templates/042-double-rowid-and-field-ne2.sql
deleted file mode 100644
index d1c778b..0000000
--- a/tests/templates/042-double-rowid-and-field-ne2.sql
+++ /dev/null
@@ -1,2 +0,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
deleted file mode 100644
index e719042..0000000
--- a/tests/templates/043-binary-eq.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select rowid from nulls1 where binary_10 = x'01';
-2
diff --git a/tests/templates/044-binary-rowid-and-ne.sql b/tests/templates/044-binary-rowid-and-ne.sql
deleted file mode 100644
index 0a5d11d..0000000
--- a/tests/templates/044-binary-rowid-and-ne.sql
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index d640862..0000000
--- a/tests/templates/045-binary-lt.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select rowid from nulls1 where binary_10 < x'01';
-1
diff --git a/tests/templates/046-binary-lte.sql b/tests/templates/046-binary-lte.sql
deleted file mode 100644
index 8b07fe9..0000000
--- a/tests/templates/046-binary-lte.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-select rowid from nulls1 where binary_10 <= x'01' order by 1;
-1
-2
diff --git a/tests/templates/047-binary-gt.sql b/tests/templates/047-binary-gt.sql
deleted file mode 100644
index bd10f01..0000000
--- a/tests/templates/047-binary-gt.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select rowid from nulls1 where binary_10 > x'60';
-98
diff --git a/tests/templates/048-binary-gte.sql b/tests/templates/048-binary-gte.sql
deleted file mode 100644
index d8c3030..0000000
--- a/tests/templates/048-binary-gte.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-select rowid from nulls1 where binary_10 >= x'5F' order by 1;
-96
-98
diff --git a/tests/templates/049-unusable-constraint.sql b/tests/templates/049-unusable-constraint.sql
deleted file mode 100644
index 8023fc8..0000000
--- a/tests/templates/049-unusable-constraint.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select nn1.int8_1 from no_nulls1 nn1 join no_nulls2 nn2 using (int8_1) where nn1.int8_1 = 0;
-0
diff --git a/tests/templates/050-rowid-gt-none.sql b/tests/templates/050-rowid-gt-none.sql
deleted file mode 100644
index 6ebb920..0000000
--- a/tests/templates/050-rowid-gt-none.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from no_nulls1 where rowid > 100
-0
diff --git a/tests/templates/051-rowid-gte-none.sql b/tests/templates/051-rowid-gte-none.sql
deleted file mode 100644
index 00b2eef..0000000
--- a/tests/templates/051-rowid-gte-none.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from no_nulls1 where rowid >= 100
-0
diff --git a/tests/templates/052-rowid-lt-none.sql b/tests/templates/052-rowid-lt-none.sql
deleted file mode 100644
index 0c28165..0000000
--- a/tests/templates/052-rowid-lt-none.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from no_nulls1 where rowid < 0
-0
diff --git a/tests/templates/053-rowid-lte-none.sql b/tests/templates/053-rowid-lte-none.sql
deleted file mode 100644
index 2545b46..0000000
--- a/tests/templates/053-rowid-lte-none.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from no_nulls1 where rowid < -1
-0
diff --git a/tests/templates/054-rowid-lte-one.sql b/tests/templates/054-rowid-lte-one.sql
deleted file mode 100644
index d5651df..0000000
--- a/tests/templates/054-rowid-lte-one.sql
+++ /dev/null
@@ -1,2 +0,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
deleted file mode 100644
index bff3003..0000000
--- a/tests/templates/055-rowid-lt-one.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from no_nulls1 where rowid < 2
-1
diff --git a/tests/templates/056-rowid-ne-some.sql b/tests/templates/056-rowid-ne-some.sql
deleted file mode 100644
index fecfaad..0000000
--- a/tests/templates/056-rowid-ne-some.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from no_nulls1 where rowid <> 1
-98
diff --git a/tests/templates/057-rowid-is-null.sql b/tests/templates/057-rowid-is-null.sql
deleted file mode 100644
index 19d15af..0000000
--- a/tests/templates/057-rowid-is-null.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from no_nulls1 where rowid is null
-0
diff --git a/tests/templates/058-rowid-is-not-null.sql b/tests/templates/058-rowid-is-not-null.sql
deleted file mode 100644
index ad1478c..0000000
--- a/tests/templates/058-rowid-is-not-null.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from no_nulls1 where rowid is not null
-99
diff --git a/tests/templates/059-rowid-eq-string.sql b/tests/templates/059-rowid-eq-string.sql
deleted file mode 100644
index ffe4244..0000000
--- a/tests/templates/059-rowid-eq-string.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from no_nulls1 where rowid = '1'
-1
diff --git a/tests/templates/060-rowid-double.sql b/tests/templates/060-rowid-double.sql
deleted file mode 100644
index 7778eda..0000000
--- a/tests/templates/060-rowid-double.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select int8_1 from no_nulls1 where rowid = 51.0;
-0
diff --git a/tests/templates/061-string-eq-int.sql b/tests/templates/061-string-eq-int.sql
deleted file mode 100644
index e9bc52e..0000000
--- a/tests/templates/061-string-eq-int.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select string_7 from nulls1 where string_7 = 22;
-22
diff --git a/tests/templates/062-string-eq-double.sql b/tests/templates/062-string-eq-double.sql
deleted file mode 100644
index 6ea46c4..0000000
--- a/tests/templates/062-string-eq-double.sql
+++ /dev/null
@@ -1 +0,0 @@
-select string_7 from nulls1 where string_7 = 22.0;
diff --git a/tests/templates/063-int8-eq-double.sql b/tests/templates/063-int8-eq-double.sql
deleted file mode 100644
index 76c9223..0000000
--- a/tests/templates/063-int8-eq-double.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select int8_1 from nulls1 where int8_1 = 30.0;
-30
diff --git a/tests/templates/064-int8-eq-str.sql b/tests/templates/064-int8-eq-str.sql
deleted file mode 100644
index 53cc566..0000000
--- a/tests/templates/064-int8-eq-str.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select int8_1 from nulls1 where int8_1 = '30.0';
-30
diff --git a/tests/templates/065-int8-eq-str2.sql b/tests/templates/065-int8-eq-str2.sql
deleted file mode 100644
index 54fd20a..0000000
--- a/tests/templates/065-int8-eq-str2.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select int8_1 from nulls1 where int8_1 = '30';
-30
diff --git a/tests/templates/066-int8-eq-bogus-str.sql b/tests/templates/066-int8-eq-bogus-str.sql
deleted file mode 100644
index f427a87..0000000
--- a/tests/templates/066-int8-eq-bogus-str.sql
+++ /dev/null
@@ -1 +0,0 @@
-select int8_1 from nulls1 where int8_1 = '30f';
diff --git a/tests/templates/067-int8-lt-str.sql b/tests/templates/067-int8-lt-str.sql
deleted file mode 100644
index 1cddf5d..0000000
--- a/tests/templates/067-int8-lt-str.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select int8_1 from nulls1 where int8_1 < '-46'
--48
diff --git a/tests/templates/068-int8-lt-double.sql b/tests/templates/068-int8-lt-double.sql
deleted file mode 100644
index d3e90d4..0000000
--- a/tests/templates/068-int8-lt-double.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select int8_1 from nulls1 where int8_1 < -46.0
--48
diff --git a/tests/templates/069-int8-lte-str.sql b/tests/templates/069-int8-lte-str.sql
deleted file mode 100644
index 2a2e041..0000000
--- a/tests/templates/069-int8-lte-str.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-select int8_1 from nulls1 where int8_1 <= '-46'
--46
--48
diff --git a/tests/templates/070-int8-lte-double.sql b/tests/templates/070-int8-lte-double.sql
deleted file mode 100644
index d6375b8..0000000
--- a/tests/templates/070-int8-lte-double.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-select int8_1 from nulls1 where int8_1 <= -46.0
--46
--48
diff --git a/tests/templates/071-int8-gt-str.sql b/tests/templates/071-int8-gt-str.sql
deleted file mode 100644
index fa71236..0000000
--- a/tests/templates/071-int8-gt-str.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select int8_1 from nulls1 where int8_1 > '49'
-50
diff --git a/tests/templates/072-int8-gt-double.sql b/tests/templates/072-int8-gt-double.sql
deleted file mode 100644
index 8cbc669..0000000
--- a/tests/templates/072-int8-gt-double.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select int8_1 from nulls1 where int8_1 > 49.0
-50
diff --git a/tests/templates/073-int8-gte-str.sql b/tests/templates/073-int8-gte-str.sql
deleted file mode 100644
index 14c83be..0000000
--- a/tests/templates/073-int8-gte-str.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-select int8_1 from nulls1 where int8_1 >= '49'
-50
-49
diff --git a/tests/templates/074-int8-gte-double.sql b/tests/templates/074-int8-gte-double.sql
deleted file mode 100644
index f61e158..0000000
--- a/tests/templates/074-int8-gte-double.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-select int8_1 from nulls1 where int8_1 >= 49.0
-50
-49
diff --git a/tests/templates/075-int8-ne-str.sql b/tests/templates/075-int8-ne-str.sql
deleted file mode 100644
index 25742a7..0000000
--- a/tests/templates/075-int8-ne-str.sql
+++ /dev/null
@@ -1 +0,0 @@
-select int8_1 from nulls1 where rowid = 66 and int8_1 <> '-16'
diff --git a/tests/templates/076-int8-ne-double.sql b/tests/templates/076-int8-ne-double.sql
deleted file mode 100644
index 958b4ed..0000000
--- a/tests/templates/076-int8-ne-double.sql
+++ /dev/null
@@ -1 +0,0 @@
-select int8_1 from nulls1 where rowid = 66 and int8_1 <> -16.0
diff --git a/tests/templates/077-int64-gte-str.sql b/tests/templates/077-int64-gte-str.sql
deleted file mode 100644
index ce32e12..0000000
--- a/tests/templates/077-int64-gte-str.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-select int64_4 from nulls1 where int64_4 >= '49000000000'
-50000000000
-49000000000
diff --git a/tests/templates/078-int64-gte-double.sql b/tests/templates/078-int64-gte-double.sql
deleted file mode 100644
index 684a87c..0000000
--- a/tests/templates/078-int64-gte-double.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-select int64_4 from nulls1 where int64_4 >= 49000000000.0
-50000000000
-49000000000
diff --git a/tests/templates/079-int65-gt-str.sql b/tests/templates/079-int65-gt-str.sql
deleted file mode 100644
index 3f73f86..0000000
--- a/tests/templates/079-int65-gt-str.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select int64_4 from nulls1 where int64_4 > '49000000000'
-50000000000
diff --git a/tests/templates/080-int65-gt-double.sql b/tests/templates/080-int65-gt-double.sql
deleted file mode 100644
index fbd4489..0000000
--- a/tests/templates/080-int65-gt-double.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select int64_4 from nulls1 where int64_4 > 49000000000.0
-50000000000
diff --git a/tests/templates/081-int64-eq-str.sql b/tests/templates/081-int64-eq-str.sql
deleted file mode 100644
index fec63b6..0000000
--- a/tests/templates/081-int64-eq-str.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select int64_4 from nulls1 where int64_4 = '49000000000'
-49000000000
diff --git a/tests/templates/082-int64-eq-double.sql b/tests/templates/082-int64-eq-double.sql
deleted file mode 100644
index f938657..0000000
--- a/tests/templates/082-int64-eq-double.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select int64_4 from nulls1 where int64_4 = 49000000000.0
-49000000000
diff --git a/tests/templates/083-int64-lt-str.sql b/tests/templates/083-int64-lt-str.sql
deleted file mode 100644
index 306fa80..0000000
--- a/tests/templates/083-int64-lt-str.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select int64_4 from nulls1 where int64_4 < '-46000000000'
--47000000000
diff --git a/tests/templates/084-int64-lt-double.sql b/tests/templates/084-int64-lt-double.sql
deleted file mode 100644
index d905218..0000000
--- a/tests/templates/084-int64-lt-double.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select int64_4 from nulls1 where int64_4 < -46000000000.0
--47000000000
diff --git a/tests/templates/085-int64-lte-str.sql b/tests/templates/085-int64-lte-str.sql
deleted file mode 100644
index eef3607..0000000
--- a/tests/templates/085-int64-lte-str.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-select int64_4 from nulls1 where int64_4 <= '-45000000000'
--45000000000
--47000000000
diff --git a/tests/templates/086-int64-lte-double.sql b/tests/templates/086-int64-lte-double.sql
deleted file mode 100644
index dfc225b..0000000
--- a/tests/templates/086-int64-lte-double.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-select int64_4 from nulls1 where int64_4 <= -45000000000.0
--45000000000
--47000000000
diff --git a/tests/templates/087-int64-ne-str.sql b/tests/templates/087-int64-ne-str.sql
deleted file mode 100644
index 41a8718..0000000
--- a/tests/templates/087-int64-ne-str.sql
+++ /dev/null
@@ -1 +0,0 @@
-select int64_4 from nulls1 where rowid = 57 and int64_4 <> '-7000000000'
diff --git a/tests/templates/088-int64-ne-double.sql b/tests/templates/088-int64-ne-double.sql
deleted file mode 100644
index 40555f5..0000000
--- a/tests/templates/088-int64-ne-double.sql
+++ /dev/null
@@ -1 +0,0 @@
-select int64_4 from nulls1 where rowid = 57 and int64_4 <> -7000000000.0
diff --git a/tests/templates/089-int64-ne-some-str.sql b/tests/templates/089-int64-ne-some-str.sql
deleted file mode 100644
index 020ea4b..0000000
--- a/tests/templates/089-int64-ne-some-str.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index d9b3e06..0000000
--- a/tests/templates/090-int64-ne-some-double.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select int64_4 from nulls1 where rowid = 58 and int64_4 <> -8000000000.0
--7000000000
diff --git a/tests/templates/091-double-eq-str.sql b/tests/templates/091-double-eq-str.sql
deleted file mode 100644
index 4e9af68..0000000
--- a/tests/templates/091-double-eq-str.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select printf('%.2f', double_6) as double_6 from nulls1 where double_6 = '99.0'
-99.00
diff --git a/tests/templates/092-double-eq-int.sql b/tests/templates/092-double-eq-int.sql
deleted file mode 100644
index e5b40fa..0000000
--- a/tests/templates/092-double-eq-int.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select printf('%.2f', double_6) as double_6 from nulls1 where double_6 = 99
-99.00
diff --git a/tests/templates/093-double-gt-str.sql b/tests/templates/093-double-gt-str.sql
deleted file mode 100644
index 91198fc..0000000
--- a/tests/templates/093-double-gt-str.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select printf('%.2f', double_6) as double_6 from nulls1 where double_6 > '98'
-99.00
diff --git a/tests/templates/094-double-gt-int.sql b/tests/templates/094-double-gt-int.sql
deleted file mode 100644
index be17f03..0000000
--- a/tests/templates/094-double-gt-int.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select printf('%.2f', double_6) as double_6 from nulls1 where double_6 > 98
-99.00
diff --git a/tests/templates/095-double-gte-str.sql b/tests/templates/095-double-gte-str.sql
deleted file mode 100644
index 0b20634..0000000
--- a/tests/templates/095-double-gte-str.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-select printf('%.2f', double_6) as double_6 from nulls1 where double_6 >= '49.5'
-99.00
-49.50
diff --git a/tests/templates/096-double-gte-int.sql b/tests/templates/096-double-gte-int.sql
deleted file mode 100644
index 9ff614c..0000000
--- a/tests/templates/096-double-gte-int.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select printf('%.2f', double_6) as double_6 from nulls1 where double_6 >= '99'
-99.00
diff --git a/tests/templates/097-double-lt-str.sql b/tests/templates/097-double-lt-str.sql
deleted file mode 100644
index 895815c..0000000
--- a/tests/templates/097-double-lt-str.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select printf('%.2f', double_6) from nulls1 where double_6 < '99.0' order by double_6 desc limit 1
-49.50
diff --git a/tests/templates/098-double-lt-int.sql b/tests/templates/098-double-lt-int.sql
deleted file mode 100644
index 2219f18..0000000
--- a/tests/templates/098-double-lt-int.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select printf('%.2f', double_6) from nulls1 where double_6 < 99 order by double_6 desc limit 1
-49.50
diff --git a/tests/templates/099-double-lte-str.sql b/tests/templates/099-double-lte-str.sql
deleted file mode 100644
index 2005580..0000000
--- a/tests/templates/099-double-lte-str.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select printf('%.2f', double_6) from nulls1 where double_6 <= '99.0' order by double_6 desc limit 1
-99.00
diff --git a/tests/templates/100-double-lte-int.sql b/tests/templates/100-double-lte-int.sql
deleted file mode 100644
index cef9659..0000000
--- a/tests/templates/100-double-lte-int.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select printf('%.2f', double_6) from nulls1 where double_6 <= 99 order by double_6 desc limit 1
-99.00
diff --git a/tests/templates/101-double-rowid-and-field-ne-str.sql b/tests/templates/101-double-rowid-and-field-ne-str.sql
deleted file mode 100644
index a7c8a8b..0000000
--- a/tests/templates/101-double-rowid-and-field-ne-str.sql
+++ /dev/null
@@ -1 +0,0 @@
-select printf('%.2f', double_6) from nulls1 where rowid = 0 and double_6 <> '99.0'
diff --git a/tests/templates/102-double-rowid-and-field-ne-int.sql b/tests/templates/102-double-rowid-and-field-ne-int.sql
deleted file mode 100644
index 91d8048..0000000
--- a/tests/templates/102-double-rowid-and-field-ne-int.sql
+++ /dev/null
@@ -1 +0,0 @@
-select printf('%.2f', double_6) from nulls1 where rowid = 0 and double_6 <> 99
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
deleted file mode 100644
index 2cbd9a8..0000000
--- a/tests/templates/103-double-rowid-and-field-ne2-some-str.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index bc49adc..0000000
--- a/tests/templates/104-double-rowid-and-field-ne2-some-int.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select printf('%.2f', double_6) from nulls1 where rowid = 1 and double_6 <> 100
-99.00
diff --git a/tests/templates/105-rowid-gte-0.sql b/tests/templates/105-rowid-gte-0.sql
deleted file mode 100644
index 941d653..0000000
--- a/tests/templates/105-rowid-gte-0.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from no_nulls1 where rowid >= 0
-99
diff --git a/tests/templates/106-rowid-gt-0.sql b/tests/templates/106-rowid-gt-0.sql
deleted file mode 100644
index fa00ce7..0000000
--- a/tests/templates/106-rowid-gt-0.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from no_nulls1 where rowid > 1
-98
diff --git a/tests/templates/109-bool-where-eq-0.sql b/tests/templates/109-bool-where-eq-0.sql
deleted file mode 100644
index c359765..0000000
--- a/tests/templates/109-bool-where-eq-0.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from nulls1 where bool_0 = 0
-44
diff --git a/tests/templates/110-bool-where-eq-1.sql b/tests/templates/110-bool-where-eq-1.sql
deleted file mode 100644
index 4596109..0000000
--- a/tests/templates/110-bool-where-eq-1.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from nulls1 where bool_0 = 1
-5
diff --git a/tests/templates/111-bool-where-bool.sql b/tests/templates/111-bool-where-bool.sql
deleted file mode 100644
index 22a9370..0000000
--- a/tests/templates/111-bool-where-bool.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from nulls1 where bool_0
-5
diff --git a/tests/templates/112-bool-where-not-bool.sql b/tests/templates/112-bool-where-not-bool.sql
deleted file mode 100644
index 73dd46c..0000000
--- a/tests/templates/112-bool-where-not-bool.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from nulls1 where not bool_0
-44
diff --git a/tests/templates/113-bool-where-gt-0.sql b/tests/templates/113-bool-where-gt-0.sql
deleted file mode 100644
index 3c60dc5..0000000
--- a/tests/templates/113-bool-where-gt-0.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from nulls1 where bool_0 > 0
-5
diff --git a/tests/templates/114-bool-where-gte-0.sql b/tests/templates/114-bool-where-gte-0.sql
deleted file mode 100644
index 479b815..0000000
--- a/tests/templates/114-bool-where-gte-0.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from nulls1 where bool_0 >= 0
-49
diff --git a/tests/templates/115-bool-where-gt-1.sql b/tests/templates/115-bool-where-gt-1.sql
deleted file mode 100644
index 2f33d93..0000000
--- a/tests/templates/115-bool-where-gt-1.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from nulls1 where bool_0 > 1
-0
diff --git a/tests/templates/116-bool-where-lt-0.sql b/tests/templates/116-bool-where-lt-0.sql
deleted file mode 100644
index 7764906..0000000
--- a/tests/templates/116-bool-where-lt-0.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from nulls1 where bool_0 < 0
-0
diff --git a/tests/templates/117-bool-where-lt-1.sql b/tests/templates/117-bool-where-lt-1.sql
deleted file mode 100644
index 4066908..0000000
--- a/tests/templates/117-bool-where-lt-1.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from nulls1 where bool_0 < 1
-44
diff --git a/tests/templates/118-bool-where-lte-1.sql b/tests/templates/118-bool-where-lte-1.sql
deleted file mode 100644
index 0881aaf..0000000
--- a/tests/templates/118-bool-where-lte-1.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from nulls1 where bool_0 <= 1
-49
diff --git a/tests/templates/119-ts-eq-july-20.sql b/tests/templates/119-ts-eq-july-20.sql
deleted file mode 100644
index c552939..0000000
--- a/tests/templates/119-ts-eq-july-20.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from nulls1 where ts_5 = 490665600000
-1
diff --git a/tests/templates/120-ts-lt-july-20.sql b/tests/templates/120-ts-lt-july-20.sql
deleted file mode 100644
index 2269103..0000000
--- a/tests/templates/120-ts-lt-july-20.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from nulls1 where ts_5 < 490665600000
-0
diff --git a/tests/templates/121-ts-lte-july-20.sql b/tests/templates/121-ts-lte-july-20.sql
deleted file mode 100644
index 44c3891..0000000
--- a/tests/templates/121-ts-lte-july-20.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from nulls1 where ts_5 <= 490665600000
-1
diff --git a/tests/templates/122-ts-gt-july-20.sql b/tests/templates/122-ts-gt-july-20.sql
deleted file mode 100644
index 126e0ce..0000000
--- a/tests/templates/122-ts-gt-july-20.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from nulls1 where ts_5 > 490665600000
-49
diff --git a/tests/templates/123-ts-gte-july-20.sql b/tests/templates/123-ts-gte-july-20.sql
deleted file mode 100644
index bf869e0..0000000
--- a/tests/templates/123-ts-gte-july-20.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from nulls1 where ts_5 >= 490665600000
-50
diff --git a/tests/templates/124-ts-ne-july-20.sql b/tests/templates/124-ts-ne-july-20.sql
deleted file mode 100644
index 1d4f330..0000000
--- a/tests/templates/124-ts-ne-july-20.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from nulls1 where ts_5 <> 490665600000
-49
diff --git a/tests/templates/125-fixed-bytearray-eq.sql b/tests/templates/125-fixed-bytearray-eq.sql
deleted file mode 100644
index 9c74478..0000000
--- a/tests/templates/125-fixed-bytearray-eq.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-SELECT COUNT(*) FROM no_nulls1 WHERE binary_10 = X'10'
-1
diff --git a/tests/templates/126-fixed-bytearray-lt.sql b/tests/templates/126-fixed-bytearray-lt.sql
deleted file mode 100644
index b56c898..0000000
--- a/tests/templates/126-fixed-bytearray-lt.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-SELECT COUNT(*) FROM no_nulls1 WHERE binary_10 < X'10'
-16
diff --git a/tests/templates/127-fixed-bytearray-lte.sql b/tests/templates/127-fixed-bytearray-lte.sql
deleted file mode 100644
index 4b94ce3..0000000
--- a/tests/templates/127-fixed-bytearray-lte.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-SELECT COUNT(*) FROM no_nulls1 WHERE binary_10 <= X'10'
-17
diff --git a/tests/templates/128-fixed-bytearray-gt.sql b/tests/templates/128-fixed-bytearray-gt.sql
deleted file mode 100644
index 241f8d9..0000000
--- a/tests/templates/128-fixed-bytearray-gt.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-SELECT COUNT(*) FROM no_nulls1 WHERE binary_10 > X''
-99
diff --git a/tests/templates/129-fixed-bytearray-gte.sql b/tests/templates/129-fixed-bytearray-gte.sql
deleted file mode 100644
index b3a164c..0000000
--- a/tests/templates/129-fixed-bytearray-gte.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-SELECT COUNT(*) FROM no_nulls1 WHERE binary_10 >= X'01'
-98
diff --git a/tests/templates/130-fixed-bytearray-ne.sql b/tests/templates/130-fixed-bytearray-ne.sql
deleted file mode 100644
index 396b49b..0000000
--- a/tests/templates/130-fixed-bytearray-ne.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-SELECT COUNT(*) FROM no_nulls1 WHERE binary_10 <> X'10'
-98
diff --git a/tests/templates/131-var-bytearray-eq.sql b/tests/templates/131-var-bytearray-eq.sql
deleted file mode 100644
index 1971a04..0000000
--- a/tests/templates/131-var-bytearray-eq.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-SELECT COUNT(*) FROM nulls1 WHERE binary_9 = X'020202'
-1
diff --git a/tests/templates/132-var-bytearray-lt.sql b/tests/templates/132-var-bytearray-lt.sql
deleted file mode 100644
index d68086a..0000000
--- a/tests/templates/132-var-bytearray-lt.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-SELECT COUNT(*) FROM no_nulls1 WHERE binary_9 < X'020202'
-2
diff --git a/tests/templates/133-var-bytearray-lte.sql b/tests/templates/133-var-bytearray-lte.sql
deleted file mode 100644
index 8f66494..0000000
--- a/tests/templates/133-var-bytearray-lte.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-SELECT COUNT(*) FROM nulls1 WHERE binary_9 <= X'0101'
-2
diff --git a/tests/templates/134-var-bytearray-gt.sql b/tests/templates/134-var-bytearray-gt.sql
deleted file mode 100644
index 6e86d53..0000000
--- a/tests/templates/134-var-bytearray-gt.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-SELECT COUNT(*) FROM nulls1 WHERE binary_9 > X''
-50
diff --git a/tests/templates/135-var-bytearray-gte.sql b/tests/templates/135-var-bytearray-gte.sql
deleted file mode 100644
index 7494293..0000000
--- a/tests/templates/135-var-bytearray-gte.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-SELECT COUNT(*) FROM nulls1 WHERE binary_9 >= X'62626262'
-1
diff --git a/tests/templates/136-var-bytearray-ne.sql b/tests/templates/136-var-bytearray-ne.sql
deleted file mode 100644
index a1daf7d..0000000
--- a/tests/templates/136-var-bytearray-ne.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-SELECT COUNT(*) FROM nulls1 WHERE binary_9 <> X'62626262'
-49
diff --git a/tests/templates/137-var-bytearray-lte.sql b/tests/templates/137-var-bytearray-lte.sql
deleted file mode 100644
index 529a1ef..0000000
--- a/tests/templates/137-var-bytearray-lte.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-SELECT COUNT(*) FROM nulls1 WHERE binary_9 <= X'01'
-1
diff --git a/tests/templates/138-string-lte.sql b/tests/templates/138-string-lte.sql
deleted file mode 100644
index d4c4966..0000000
--- a/tests/templates/138-string-lte.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from no_nulls1 where string_8 <= '003'
-4
diff --git a/tests/templates/139-random-testcase.sql b/tests/templates/139-random-testcase.sql
deleted file mode 100644
index eb8d1e0..0000000
--- a/tests/templates/139-random-testcase.sql
+++ /dev/null
@@ -1,37 +0,0 @@
-select rowid from nulls1 where binary_9 >= '56' and ts_5 < 496886400000;
-1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-21
-23
-25
-27
-29
-31
-33
-35
-37
-39
-41
-43
-45
-47
-49
-51
-53
-55
-57
-59
-61
-63
-65
-67
-69
-71
diff --git a/tests/templates/140-random-testcase.sql b/tests/templates/140-random-testcase.sql
deleted file mode 100644
index 96f35e2..0000000
--- a/tests/templates/140-random-testcase.sql
+++ /dev/null
@@ -1,56 +0,0 @@
-SELECT quote(int8_1) FROM nulls1 WHERE rowid <> 94 AND bool_0 IS NOT 0;
-50
-48
-46
-44
-42
-NULL
-NULL
-NULL
-NULL
-NULL
-NULL
-NULL
-NULL
-NULL
-NULL
-30
-28
-26
-24
-22
-20
-18
-16
-14
-12
-10
-8
-6
-4
-2
-0
--2
--4
--6
--8
--10
--12
--14
--16
--18
--20
--22
--24
--26
--28
--30
--32
--34
--36
--38
--40
--42
--44
--46
--48
diff --git a/tests/templates/141-random-testcase.sql b/tests/templates/141-random-testcase.sql
deleted file mode 100644
index 74e6984..0000000
--- a/tests/templates/141-random-testcase.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-SELECT rowid FROM nulls WHERE (bool_0 IS 1)
-1
-3
-5
-7
-9
diff --git a/tests/templates/142-rowid-is-null.sql b/tests/templates/142-rowid-is-null.sql
deleted file mode 100644
index e93220c..0000000
--- a/tests/templates/142-rowid-is-null.sql
+++ /dev/null
@@ -1 +0,0 @@
-SELECT * FROM nulls WHERE rowid IS NULL
diff --git a/tests/templates/143-float-eq.sql b/tests/templates/143-float-eq.sql
deleted file mode 100644
index b11f4c6..0000000
--- a/tests/templates/143-float-eq.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select float_11 from nulls where float_11 = 1.0
-1.0
diff --git a/tests/templates/144-float-eq2.sql b/tests/templates/144-float-eq2.sql
deleted file mode 100644
index 7e0bb60..0000000
--- a/tests/templates/144-float-eq2.sql
+++ /dev/null
@@ -1 +0,0 @@
-select float_11 from nulls where float_11 = 123.0
diff --git a/tests/templates/145-float-eq3.sql b/tests/templates/145-float-eq3.sql
deleted file mode 100644
index be29d42..0000000
--- a/tests/templates/145-float-eq3.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select float_11 from nulls where float_11 = '1'
-1.0
diff --git a/tests/templates/146-float-ne.sql b/tests/templates/146-float-ne.sql
deleted file mode 100644
index c8805ae..0000000
--- a/tests/templates/146-float-ne.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from nulls where float_11 <> 1.0
-49
diff --git a/tests/templates/147-float-is-null.sql b/tests/templates/147-float-is-null.sql
deleted file mode 100644
index 057f598..0000000
--- a/tests/templates/147-float-is-null.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from nulls where float_11 is null
-49
diff --git a/tests/templates/148-float-is-not-null.sql b/tests/templates/148-float-is-not-null.sql
deleted file mode 100644
index 2ff14d2..0000000
--- a/tests/templates/148-float-is-not-null.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from nulls where float_11 is not null
-50
diff --git a/tests/templates/149-float-gte.sql b/tests/templates/149-float-gte.sql
deleted file mode 100644
index 6368870..0000000
--- a/tests/templates/149-float-gte.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select float_11 from nulls where float_11 >= 1.0
-1.0
diff --git a/tests/templates/150-float-gt.sql b/tests/templates/150-float-gt.sql
deleted file mode 100644
index 48a7644..0000000
--- a/tests/templates/150-float-gt.sql
+++ /dev/null
@@ -1 +0,0 @@
-select float_11 from nulls where float_11 > 1.0
diff --git a/tests/templates/151-float-gt-2.sql b/tests/templates/151-float-gt-2.sql
deleted file mode 100644
index ad121b7..0000000
--- a/tests/templates/151-float-gt-2.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select float_11 from nulls where float_11 > 0.5
-1.0
diff --git a/tests/templates/152-float-lt.sql b/tests/templates/152-float-lt.sql
deleted file mode 100644
index c59980c..0000000
--- a/tests/templates/152-float-lt.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from nulls where float_11 < 0.0102
-1
diff --git a/tests/templates/153-float-lt.sql b/tests/templates/153-float-lt.sql
deleted file mode 100644
index 1f6b900..0000000
--- a/tests/templates/153-float-lt.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from nulls where float_11 < 0.001
-0
diff --git a/tests/templates/154-float-lte.sql b/tests/templates/154-float-lte.sql
deleted file mode 100644
index c5d5c42..0000000
--- a/tests/templates/154-float-lte.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from nulls where float_11 <= 0.0102
-1
diff --git a/tests/templates/155-float-skip.sql b/tests/templates/155-float-skip.sql
deleted file mode 100644
index 5ff0ab5..0000000
--- a/tests/templates/155-float-skip.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select float_11 from nulls where rowid = 2
-0.5
diff --git a/tests/templates/156-glob.sql b/tests/templates/156-glob.sql
deleted file mode 100644
index f2cba44..0000000
--- a/tests/templates/156-glob.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select string_7 from nulls where string_7 glob '7'
-7
diff --git a/tests/templates/157-glob-star.sql b/tests/templates/157-glob-star.sql
deleted file mode 100644
index 4b03d99..0000000
--- a/tests/templates/157-glob-star.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-select string_7 from nulls where string_7 glob '7*'
-7
-70
-72
-74
-76
-78
diff --git a/tests/templates/158-glob-star-eight.sql b/tests/templates/158-glob-star-eight.sql
deleted file mode 100644
index 2a0e12c..0000000
--- a/tests/templates/158-glob-star-eight.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select string_7 from nulls where string_7 glob '7*8'
-78
diff --git a/tests/templates/159-glob-star-zero.sql b/tests/templates/159-glob-star-zero.sql
deleted file mode 100644
index 1378b63..0000000
--- a/tests/templates/159-glob-star-zero.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-select string_7 from nulls where string_7 glob '*0'
-0
-20
-30
-40
-50
-60
-70
-80
-90
diff --git a/tests/templates/160-glob-star.sql b/tests/templates/160-glob-star.sql
deleted file mode 100644
index 0b401d1..0000000
--- a/tests/templates/160-glob-star.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from nulls where string_7 glob '*'
-50
diff --git a/tests/templates/161-glob-star-stuff.sql b/tests/templates/161-glob-star-stuff.sql
deleted file mode 100644
index 7f474d0..0000000
--- a/tests/templates/161-glob-star-stuff.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from nulls where string_7 glob '*123'
-0
diff --git a/tests/templates/162-like-long.sql b/tests/templates/162-like-long.sql
deleted file mode 100644
index fdf4446..0000000
--- a/tests/templates/162-like-long.sql
+++ /dev/null
@@ -1 +0,0 @@
-select string_7 from nulls where string_7 like 'asdfasdf'
diff --git a/tests/templates/163-blob-is-not.sql b/tests/templates/163-blob-is-not.sql
deleted file mode 100644
index 0df2c8d..0000000
--- a/tests/templates/163-blob-is-not.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select quote(binary_9) from nulls where rowid = 2 and binary_9 is not X'00'
-X'0101'
diff --git a/tests/templates/164-blob-is-not.sql b/tests/templates/164-blob-is-not.sql
deleted file mode 100644
index ad4527a..0000000
--- a/tests/templates/164-blob-is-not.sql
+++ /dev/null
@@ -1 +0,0 @@
-select quote(binary_9) from nulls where rowid = 1 and binary_9 is not X'00'
diff --git a/tests/templates/165-not-null.sql b/tests/templates/165-not-null.sql
deleted file mode 100644
index 78c552e..0000000
--- a/tests/templates/165-not-null.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from nulls where binary_9 not null
-50
diff --git a/tests/templates/166-not-not-null.sql b/tests/templates/166-not-not-null.sql
deleted file mode 100644
index 413ab02..0000000
--- a/tests/templates/166-not-not-null.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from nulls where not binary_9 not null
-49
diff --git a/tests/templates/167-double-is-not-null.sql b/tests/templates/167-double-is-not-null.sql
deleted file mode 100644
index 68baa98..0000000
--- a/tests/templates/167-double-is-not-null.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from nulls where double_6 is not null
-49
diff --git a/tests/templates/168-double-is-not-99.sql b/tests/templates/168-double-is-not-99.sql
deleted file mode 100644
index 8d27d63..0000000
--- a/tests/templates/168-double-is-not-99.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select count(*) from nulls where double_6 is not 99.0
-98
diff --git a/tests/test-all b/tests/test-all
deleted file mode 100755
index e702164..0000000
--- a/tests/test-all
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-here=$(dirname "${BASH_SOURCE[0]}")
-
-set -x
-"$here"/test-non-existent
-"$here"/test-bad-create-table
-"$here"/test-unsupported
-"$here"/test-supported
-"$here"/test-queries
-"$here"/test-random
-
-if [ -v COVERAGE ]; then
-  # Do at most 10 seconds of failmalloc testing
-  "$here"/test-failmalloc || true
-  now=$(date +%s)
-  in_10s=$((now+10))
-  while [ $(date +%s) -lt $in_10s ]; do
-    "$here"/test-failmalloc || true
-  done
-fi
diff --git a/tests/test-bad-create-table b/tests/test-bad-create-table
deleted file mode 100755
index 9f3e5e5..0000000
--- a/tests/test-bad-create-table
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-# Verify that all the unsupported.*parquet files result in an error when creating the virtual table,
-# but don't segfault.
-
-load_bad_table() {
-  cat <<EOF
-.echo on
-.load build/linux/libparquet
-.testcase bad-create-table
-.bail on
-CREATE VIRTUAL TABLE test USING parquet;
-SELECT 123;
-EOF
-}
-
-main() {
-  root=$(dirname "${BASH_SOURCE[0]}")/..
-  root=$(readlink -f "$root")
-  cd "$root"
-
-  "$root"/sqlite/sqlite3 -init <(load_bad_table) < /dev/null > /dev/null 2> testcase-stderr.txt
-  # We expect the 'SELECT 123' command to NOT have been run
-  if grep -q 123 testcase-out.txt; then
-    echo "...FAILED; expected an error message. Check testcase-{out,err}.txt" >&2
-    exit 1
-  fi
-}
-
-main "$@"
diff --git a/tests/test-failmalloc b/tests/test-failmalloc
deleted file mode 100755
index 17ca159..0000000
--- a/tests/test-failmalloc
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-# A harness that runs SQLite with the parquet extension in an environment where malloc randomly
-# fails. "Success" is if the logs don't have any C++ exceptions that talk about std::bad_alloc
-#
-# The results can need a bit of interpretation; look at the log and see if it sniffs like
-# the segfault came from Python or SQLite.
-
-ensure_failmalloc() {
-  if [ ! -d libfailmalloc ]; then
-    git clone https://github.com/cldellow/libfailmalloc.git
-  fi
-
-  if [ ! -e libfailmalloc/.libs/libfailmalloc.so ]; then
-    cd libfailmalloc
-    ./configure
-    make
-  fi
-}
-
-run_under_low_memory() {
-  start=$(date +%s%3N)
-  set +e
-  env LD_PRELOAD="$here"/libfailmalloc/.libs/libfailmalloc.so FAILMALLOC_PROBABILITY=0.00001 ./test-random >results.bad_alloc 2>&1
-  rv=$?
-  now=$(date +%s%3N)
-  echo "Bailed after $((now-start)) ms"
-  set -e
-  if [ "$rv" -gt 127 ]; then
-    cat results.bad_alloc
-    echo "Segfaulted with exit code: $rv"
-    exit 1
-  fi
-}
-
-main() {
-  here=$(dirname "${BASH_SOURCE[0]}")
-  here=$(readlink -f "$here")
-  cd "$here"
-
-  ensure_failmalloc
-  # Sometimes we'll exit due to a Python memory issue, so try a few times.
-  for i in {0..100}; do
-    run_under_low_memory
-  done
-}
-
-main "$@"
diff --git a/tests/test-non-existent b/tests/test-non-existent
deleted file mode 100755
index 43dfab1..0000000
--- a/tests/test-non-existent
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-# Verify that loading a non existent file is an error, not a segfault
-
-load_nonexistent() {
-  cat <<EOF
-.echo on
-.load build/linux/libparquet
-.testcase notfound
-.bail on
-CREATE VIRTUAL TABLE test USING parquet('$root/doesnotexist.parquet');
-SELECT 123;
-EOF
-}
-
-
-main() {
-  root=$(dirname "${BASH_SOURCE[0]}")/..
-  root=$(readlink -f "$root")
-  cd "$root"
-
-  #This line will exit with non-zero in case of a segfault.
-  "$root"/sqlite/sqlite3 -init <(load_nonexistent) < /dev/null > /dev/null 2> testcase-stderr.txt
-
-  # We expect the 'SELECT 123' command to NOT have been run
-  if grep -q 123 testcase-out.txt; then
-    echo "...FAILED; expected an error message. Check testcase-{out,err}.txt" >&2
-    exit 1
-  fi
-}
-
-main "$@"
diff --git a/tests/test-queries b/tests/test-queries
deleted file mode 100755
index eb64a4e..0000000
--- a/tests/test-queries
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-# For each files in tests/queries/*, mount that parquet file, run the query, and compare
-# its output.
-
-run_query() {
-  file=${1:?must provide testcase file}
-  query=${2:?must provide query to run}
-  basename=$(basename "$file")
-  cat <<EOF
-.load build/linux/libparquet
-.testcase $basename
-.bail on
-CREATE VIRTUAL TABLE IF NOT EXISTS nulls1 USING parquet('$root/parquet-generator/99-rows-nulls-1.parquet');
-CREATE VIRTUAL TABLE IF NOT EXISTS nulls2 USING parquet('$root/parquet-generator/99-rows-nulls-10.parquet');
-CREATE VIRTUAL TABLE IF NOT EXISTS nulls3 USING parquet('$root/parquet-generator/99-rows-nulls-99.parquet');
-CREATE VIRTUAL TABLE IF NOT EXISTS no_nulls1 USING parquet('$root/parquet-generator/99-rows-1.parquet');
-CREATE VIRTUAL TABLE IF NOT EXISTS no_nulls2 USING parquet('$root/parquet-generator/99-rows-10.parquet');
-CREATE VIRTUAL TABLE IF NOT EXISTS no_nulls3 USING parquet('$root/parquet-generator/99-rows-99.parquet');
-$query;
-.output
-EOF
-}
-
-main() {
-  root=$(dirname "${BASH_SOURCE[0]}")/..
-  root=$(readlink -f "$root")
-  cd "$root"
-
-  if [ ! -d "$root"/tests/queries ]; then
-    "$root"/tests/create-queries-from-templates
-  fi
-
-  find_cmd=(find tests/queries -type f -name '*.sql')
-  debug=0
-  if [ -n "${1:-""}" ]; then
-    find_cmd+=(-regex ".*$1.*")
-    debug=1
-  fi
-
-  "${find_cmd[@]}" | sort > testcases.txt
-
-  if [ ! -s testcases.txt ]; then
-    echo "no matching testcases found"
-    exit 1
-  fi
-
-  cat "$root"/parquet-generator/*.sql > "$root"/testcase-bootstrap.sql
-  rm -f test.db
-  "$root"/sqlite/sqlite3 test.db -init "$root"/testcase-bootstrap.sql < /dev/null
-  if [ ! -v NO_DEBUG ] && [ "$(cat testcases.txt | wc -l)" == "1" ]; then
-    set -x
-    gdb -ex run --args "$root"/sqlite/sqlite3 test.db -init testcase-cmds.txt
-  else
-    while read -r file; do
-      echo "Testing: $file"
-      query=$(head -n1 "$file" | tail -n1)
-      tail -n+2 "$file" > testcase-expected.txt
-
-      run_query "$file" "$query" > testcase-cmds.txt
-      if ! "$root"/sqlite/sqlite3 test.db -init testcase-cmds.txt < /dev/null > testcase-stdout.txt 2> testcase-stderr.txt; then
-        echo "...FAILED; check testcase-{out,err}.txt" >&2
-        exit 1
-      fi
-      diff testcase-out.txt testcase-expected.txt
-    done < testcases.txt
-  fi
-}
-
-main "$@"
diff --git a/tests/test-random b/tests/test-random
deleted file mode 100755
index e1dd145..0000000
--- a/tests/test-random
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/usr/bin/python3
-
-import sqlite3
-import os.path
-import random
-
-ops = ['=', '<>', '>', '>=', '<', '<=', 'IS', 'IS NOT', 'LIKE'];
-
-def get_column_values(conn, table, column):
-    cursor = conn.execute('SELECT DISTINCT quote({}) FROM {}'.format(column, table))
-    rv = []
-    for row in cursor:
-        rv.append(row[0])
-    cursor.close()
-    return rv
-
-def get_columns(conn, table):
-    cursor = conn.execute('SELECT * FROM {} LIMIT 1'.format(table))
-    rv = ['rowid'] + [description[0] for description in cursor.description]
-    cursor.close()
-    return rv
-
-def generate_statement(conn, table, column_values, all_values):
-    names = list(column_values.keys())
-
-    num_fields = random.randint(1, 20)
-
-    query = 'SELECT '
-    for i in range(num_fields):
-        if i > 0:
-            query += ', '
-
-        query += 'quote(' + names[random.randint(0, len(names) - 1)] + ')'
-    query += ' FROM '
-    query += table
-
-    num_clauses = random.randint(0, 2)
-    for i in range(num_clauses):
-        if i == 0:
-            query += ' WHERE '
-        else:
-            query += ' AND '
-
-        field = names[random.randint(0, len(names) - 1)]
-        op = ops[random.randint(0, len(ops) - 1)]
-        values = column_values[field]
-        if random.randint(0, 1) == 0:
-            values = all_values
-        value = values[random.randint(0, len(values) - 1)]
-        if random.randint(0, 5) == 0:
-            query += ' NOT '
-        query += '(' + field + ' ' + op + ' ' + str(value) + ')'
-
-    if random.randint(0, 3) == 0:
-        how_many = random.randint(0, 15)
-        query += ' LIMIT {}'.format(how_many)
-
-        if random.randint(0, 3) == 0:
-            how_many = random.randint(0, 30)
-            query += ' OFFSET {}'.format(how_many)
-
-    return query
-
-def test_statement(conn, table, column_values, all_values):
-    query = generate_statement(conn, table, column_values, all_values)
-
-    gold = [row for row in conn.execute(query)]
-    print('{} rows: {}'.format(len(gold), query))
-    for parquet in ['nulls1', 'nulls2', 'nulls3']:
-        new_query = query.replace('nulls', parquet)
-        rv = [row for row in conn.execute(new_query)]
-        if gold != rv:
-            with open('testcase-cmds.txt', 'w') as f:
-                f.write('.load build/linux/libparquet\n.testcase query\n.bail on\n{};\n.output\n'.format(new_query))
-            with open('testcase-expected.txt', 'w') as f:
-                for row in gold:
-                    f.write('{}\n'.format(row))
-            with open('testcase-out.txt', 'w') as f:
-                for row in rv:
-                    f.write('{}\n'.format(row))
-
-            raise ValueError('ruhroh')
-
-
-
-def test_table(conn, table):
-    # Don't include the floating point columns in random tests - sqlite itself stores doubles, so
-    # it can't act as an oracle for the FP stuff.
-    column_names = [x for x in get_columns(conn, table) if not x.startswith('float_')]
-    print('Table {}: {}'.format(table, column_names))
-    column_values = {}
-    for name in column_names:
-        column_values[name] = get_column_values(conn, table, name)
-
-    #random.seed(0)
-    all_values = []
-    for values in column_values.values():
-        all_values = all_values + values
-    for i in range(1000):
-        test_statement(conn, table, column_values, all_values)
-
-def test_db(db_file, extension_file, tables):
-    conn = sqlite3.connect(db_file)
-    conn.enable_load_extension(True)
-    conn.load_extension(extension_file)
-    conn.enable_load_extension(False)
-    for table in tables:
-        test_table(conn, table)
-
-if __name__ == '__main__':
-    db_file = os.path.abspath(os.path.join(__file__, '..', '..', 'test.db'))
-    extension_file = os.path.abspath(os.path.join(__file__, '..', '..', 'build', 'linux', 'libparquet'))
-    test_db(db_file, extension_file, ['nulls', 'no_nulls'])
diff --git a/tests/test-supported b/tests/test-supported
deleted file mode 100755
index d78111b..0000000
--- a/tests/test-supported
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-# Verify that all the non-unsupported.*parquet files can be loaded and 'SELECT * FROM x LIMIT 1'ed
-# without segfaulting.
-
-load_supported() {
-  file=${1:?must provide file to load}
-  basename=$(basename "$file")
-  cat <<EOF
-.echo on
-.load build/linux/libparquet
-.testcase $basename
-.bail on
-CREATE VIRTUAL TABLE test USING parquet('$file');
-SELECT * FROM test LIMIT 1;
-SELECT 123;
-DROP TABLE test;
-EOF
-}
-
-main() {
-  root=$(dirname "${BASH_SOURCE[0]}")/..
-  root=$(readlink -f "$root")
-  cd "$root"
-
-  supported_files=$(find ./parquet-generator/ -type f -name '*.parquet' -not -name 'unsupported*.parquet')
-  while read -r supported; do
-    echo "Testing: $supported"
-    if ! "$root"/sqlite/sqlite3 -init <(load_supported "$supported") < /dev/null > /dev/null 2> testcase-stderr.txt; then
-      echo "...FAILED; check testcase-{out,err}.txt" >&2
-      exit 1
-    fi
-    # We expect the 'SELECT 123' command to have been run
-    if ! grep -q 123 testcase-out.txt; then
-      echo "...FAILED; check testcase-{out,err}.txt" >&2
-      exit 1
-    fi
-  done < <(echo "$supported_files")
-}
-
-main "$@"
diff --git a/tests/test-unsupported b/tests/test-unsupported
deleted file mode 100755
index a761646..0000000
--- a/tests/test-unsupported
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-# Verify that all the unsupported.*parquet files result in an error when creating the virtual table,
-# but don't segfault.
-
-load_unsupported() {
-  file=${1:?must provide file to load}
-  basename=$(basename "$file")
-  cat <<EOF
-.echo on
-.load build/linux/libparquet
-.testcase $basename
-.bail on
-CREATE VIRTUAL TABLE test USING parquet('$file');
-SELECT 123;
-EOF
-}
-
-main() {
-  root=$(dirname "${BASH_SOURCE[0]}")/..
-  root=$(readlink -f "$root")
-  cd "$root"
-
-  unsupported_files=$(find . -type f -name 'unsupported*.parquet')
-  while read -r unsupported; do
-    echo "Testing: $unsupported"
-    "$root"/sqlite/sqlite3 -init <(load_unsupported "$unsupported") < /dev/null > /dev/null 2> testcase-stderr.txt
-    # We expect the 'SELECT 123' command to NOT have been run
-    if grep -q 123 testcase-out.txt; then
-      echo "...FAILED; expected an error message. Check testcase-{out,err}.txt" >&2
-      exit 1
-    fi
-  done < <(echo "$unsupported_files")
-}
-
-main "$@"