[spatialite] 01/05: Imported Upstream version 4.4.0~rc1

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Sat May 7 13:09:12 UTC 2016


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch experimental
in repository spatialite.

commit 1b7c7694fdbd4abdd4752b97706ae8c9807f6c0d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat May 7 14:30:23 2016 +0200

    Imported Upstream version 4.4.0~rc1
---
 .fslckout                                          |  Bin 18578432 -> 0 bytes
 amalgamate.c                                       | 1140 ---------------
 compile                                            |  347 +++++
 configure                                          |   24 +-
 configure.ac                                       |    4 +-
 examples/HOW-TO-BUILD.txt                          |  137 --
 src/connection_cache/alloc_cache.c                 |   48 +-
 src/cutter/gaia_cutter.c                           |  290 ++++
 src/gaiageo/gg_relations.c                         |    6 +-
 src/headers/spatialite.h                           |   22 +
 src/headers/spatialite_private.h                   |    1 +
 src/spatialite/spatialite.c                        |   53 +-
 test/Makefile.am                                   |    3 +-
 test/Makefile.in                                   |    3 +-
 test/check_sql_stmt.c                              |   22 +
 test/check_topology2d.c                            |    3 -
 test/geos-init.supp                                |   13 -
 test/shp/ReadMe.txt                                |   11 -
 test/sql_stmt_cache_tests/Makefile                 |  460 ------
 test/sql_stmt_cache_tests/Makefile.am              |    8 +-
 test/sql_stmt_cache_tests/Makefile.in              |    8 +-
 test/sql_stmt_freexl_tests/Makefile                |  456 ------
 test/sql_stmt_geos_tests/geoserror8.testcase       |   11 -
 test/sql_stmt_geosadvanced_tests/Makefile          |  487 -------
 .../Makefile.am                                    |    3 +-
 .../Makefile.in                                    |   14 +-
 .../amphibious1.testcase                           |    0
 .../amphibious2.testcase                           |    0
 .../gpkg1.testcase                                 |    0
 .../gpkg2.testcase                                 |    0
 .../Makefile.am                                    |    2 -
 .../Makefile.in}                                   |  302 ++--
 .../amphibious1.testcase                           |    0
 .../amphibious2.testcase                           |    0
 .../gpkg1.testcase                                 |    0
 .../gpkg2.testcase                                 |    0
 .../registerStllGroupStyle2.testcase               |    7 -
 .../unregisterStllGroupStyle2.testcase             |    7 -
 test/sql_stmt_lwgeom_20_tests/Makefile.am          |    5 -
 test/sql_stmt_lwgeom_20_tests/st_asx3d25.testcase  |    8 -
 test/sql_stmt_lwgeom_20_tests/st_asx3d26.testcase  |    8 -
 test/sql_stmt_lwgeom_20_tests/st_asx3d30.testcase  |    8 -
 test/sql_stmt_lwgeom_20_tests/st_split8.testcase   |    7 -
 test/sql_stmt_lwgeom_22_tests/Makefile.am          | 1019 --------------
 test/sql_stmt_lwgeom_22_tests/Makefile.in          | 1466 --------------------
 .../addedgemodface1.testcase                       |    7 -
 .../addedgemodface10.testcase                      |    7 -
 .../addedgemodface11.testcase                      |    7 -
 .../addedgemodface12.testcase                      |    7 -
 .../addedgemodface13.testcase                      |    7 -
 .../addedgemodface14.testcase                      |    7 -
 .../addedgemodface15.testcase                      |    7 -
 .../addedgemodface16.testcase                      |    7 -
 .../addedgemodface17.testcase                      |    7 -
 .../addedgemodface18.testcase                      |    7 -
 .../addedgemodface19.testcase                      |    7 -
 .../addedgemodface2.testcase                       |    7 -
 .../addedgemodface20.testcase                      |    7 -
 .../addedgemodface3.testcase                       |    7 -
 .../addedgemodface4.testcase                       |    7 -
 .../addedgemodface5.testcase                       |    7 -
 .../addedgemodface6.testcase                       |    7 -
 .../addedgemodface7.testcase                       |    7 -
 .../addedgemodface8.testcase                       |    7 -
 .../addedgemodface9.testcase                       |    7 -
 .../addedgenewfaces1.testcase                      |    7 -
 .../addedgenewfaces10.testcase                     |    7 -
 .../addedgenewfaces11.testcase                     |    7 -
 .../addedgenewfaces12.testcase                     |    7 -
 .../addedgenewfaces13.testcase                     |    7 -
 .../addedgenewfaces14.testcase                     |    7 -
 .../addedgenewfaces15.testcase                     |    7 -
 .../addedgenewfaces16.testcase                     |    7 -
 .../addedgenewfaces17.testcase                     |    7 -
 .../addedgenewfaces18.testcase                     |    7 -
 .../addedgenewfaces19.testcase                     |    7 -
 .../addedgenewfaces2.testcase                      |    7 -
 .../addedgenewfaces20.testcase                     |    7 -
 .../addedgenewfaces3.testcase                      |    7 -
 .../addedgenewfaces4.testcase                      |    7 -
 .../addedgenewfaces5.testcase                      |    7 -
 .../addedgenewfaces6.testcase                      |    7 -
 .../addedgenewfaces7.testcase                      |    7 -
 .../addedgenewfaces8.testcase                      |    7 -
 .../addedgenewfaces9.testcase                      |    7 -
 test/sql_stmt_lwgeom_22_tests/addisoedge1.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/addisoedge10.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/addisoedge11.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/addisoedge12.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/addisoedge13.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/addisoedge14.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/addisoedge15.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/addisoedge16.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/addisoedge17.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/addisoedge18.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/addisoedge19.testcase |    7 -
 test/sql_stmt_lwgeom_22_tests/addisoedge2.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/addisoedge20.testcase |    7 -
 test/sql_stmt_lwgeom_22_tests/addisoedge3.testcase |    7 -
 test/sql_stmt_lwgeom_22_tests/addisoedge4.testcase |    7 -
 test/sql_stmt_lwgeom_22_tests/addisoedge5.testcase |    7 -
 test/sql_stmt_lwgeom_22_tests/addisoedge6.testcase |    7 -
 test/sql_stmt_lwgeom_22_tests/addisoedge7.testcase |    7 -
 test/sql_stmt_lwgeom_22_tests/addisoedge8.testcase |    7 -
 test/sql_stmt_lwgeom_22_tests/addisoedge9.testcase |    7 -
 .../addisonetnode1.testcase                        |    7 -
 .../addisonetnode2.testcase                        |    7 -
 .../addisonetnode3.testcase                        |    7 -
 .../addisonetnode4.testcase                        |    7 -
 .../addisonetnode5.testcase                        |    7 -
 test/sql_stmt_lwgeom_22_tests/addisonode1.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/addisonode10.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/addisonode11.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/addisonode12.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/addisonode13.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/addisonode14.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/addisonode15.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/addisonode16.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/addisonode17.testcase |    7 -
 test/sql_stmt_lwgeom_22_tests/addisonode2.testcase |    7 -
 test/sql_stmt_lwgeom_22_tests/addisonode3.testcase |    7 -
 test/sql_stmt_lwgeom_22_tests/addisonode4.testcase |    7 -
 test/sql_stmt_lwgeom_22_tests/addisonode5.testcase |    7 -
 test/sql_stmt_lwgeom_22_tests/addisonode6.testcase |    7 -
 test/sql_stmt_lwgeom_22_tests/addisonode7.testcase |    7 -
 test/sql_stmt_lwgeom_22_tests/addisonode8.testcase |    7 -
 test/sql_stmt_lwgeom_22_tests/addisonode9.testcase |    7 -
 test/sql_stmt_lwgeom_22_tests/addlink1.testcase    |    7 -
 test/sql_stmt_lwgeom_22_tests/addlink10.testcase   |    7 -
 test/sql_stmt_lwgeom_22_tests/addlink11.testcase   |    7 -
 test/sql_stmt_lwgeom_22_tests/addlink12.testcase   |    7 -
 test/sql_stmt_lwgeom_22_tests/addlink13.testcase   |    7 -
 test/sql_stmt_lwgeom_22_tests/addlink2.testcase    |    7 -
 test/sql_stmt_lwgeom_22_tests/addlink3.testcase    |    7 -
 test/sql_stmt_lwgeom_22_tests/addlink4.testcase    |    7 -
 test/sql_stmt_lwgeom_22_tests/addlink5.testcase    |    7 -
 test/sql_stmt_lwgeom_22_tests/addlink6.testcase    |    7 -
 test/sql_stmt_lwgeom_22_tests/addlink7.testcase    |    7 -
 test/sql_stmt_lwgeom_22_tests/addlink8.testcase    |    7 -
 test/sql_stmt_lwgeom_22_tests/addlink9.testcase    |    7 -
 .../changeedgegeom1.testcase                       |    7 -
 .../changeedgegeom10.testcase                      |    7 -
 .../changeedgegeom11.testcase                      |    7 -
 .../changeedgegeom12.testcase                      |    7 -
 .../changeedgegeom13.testcase                      |    7 -
 .../changeedgegeom14.testcase                      |    7 -
 .../changeedgegeom15.testcase                      |    7 -
 .../changeedgegeom16.testcase                      |    7 -
 .../changeedgegeom17.testcase                      |    7 -
 .../changeedgegeom2.testcase                       |    7 -
 .../changeedgegeom3.testcase                       |    7 -
 .../changeedgegeom4.testcase                       |    7 -
 .../changeedgegeom5.testcase                       |    7 -
 .../changeedgegeom6.testcase                       |    7 -
 .../changeedgegeom7.testcase                       |    7 -
 .../changeedgegeom8.testcase                       |    7 -
 .../changeedgegeom9.testcase                       |    7 -
 .../changelinkgeom1.testcase                       |    7 -
 .../changelinkgeom2.testcase                       |    7 -
 .../changelinkgeom3.testcase                       |    7 -
 .../changelinkgeom4.testcase                       |    7 -
 .../changelinkgeom5.testcase                       |    7 -
 .../changelinkgeom6.testcase                       |    7 -
 .../changelinkgeom7.testcase                       |    7 -
 .../changelinkgeom8.testcase                       |    7 -
 .../createnetwork1.testcase                        |    7 -
 .../createnetwork10.testcase                       |    7 -
 .../createnetwork11.testcase                       |    7 -
 .../createnetwork12.testcase                       |    7 -
 .../createnetwork13.testcase                       |    7 -
 .../createnetwork14.testcase                       |    7 -
 .../createnetwork15.testcase                       |    7 -
 .../createnetwork16.testcase                       |    7 -
 .../createnetwork17.testcase                       |    7 -
 .../createnetwork18.testcase                       |    7 -
 .../createnetwork19.testcase                       |    7 -
 .../createnetwork2.testcase                        |    7 -
 .../createnetwork20.testcase                       |    7 -
 .../createnetwork21.testcase                       |    7 -
 .../createnetwork22.testcase                       |    7 -
 .../createnetwork23.testcase                       |    7 -
 .../createnetwork24.testcase                       |    7 -
 .../createnetwork25.testcase                       |    7 -
 .../createnetwork3.testcase                        |    7 -
 .../createnetwork4.testcase                        |    7 -
 .../createnetwork5.testcase                        |    7 -
 .../createnetwork6.testcase                        |    7 -
 .../createnetwork7.testcase                        |    7 -
 .../createnetwork8.testcase                        |    7 -
 .../createnetwork9.testcase                        |    7 -
 .../createtopogeo1.testcase                        |    7 -
 .../createtopogeo10.testcase                       |    7 -
 .../createtopogeo2.testcase                        |    7 -
 .../createtopogeo3.testcase                        |    7 -
 .../createtopogeo4.testcase                        |    7 -
 .../createtopogeo5.testcase                        |    7 -
 .../createtopogeo6.testcase                        |    7 -
 .../createtopogeo7.testcase                        |    7 -
 .../createtopogeo8.testcase                        |    7 -
 .../createtopogeo9.testcase                        |    7 -
 .../createtopolayer1.testcase                      |    7 -
 .../createtopolayer10.testcase                     |    7 -
 .../createtopolayer11.testcase                     |    7 -
 .../createtopolayer12.testcase                     |    7 -
 .../createtopolayer13.testcase                     |    7 -
 .../createtopolayer14.testcase                     |    7 -
 .../createtopolayer15.testcase                     |    7 -
 .../createtopolayer16.testcase                     |    7 -
 .../createtopolayer17.testcase                     |    7 -
 .../createtopolayer18.testcase                     |    7 -
 .../createtopolayer19.testcase                     |    7 -
 .../createtopolayer2.testcase                      |    7 -
 .../createtopolayer20.testcase                     |    7 -
 .../createtopolayer21.testcase                     |    7 -
 .../createtopolayer22.testcase                     |    7 -
 .../createtopolayer23.testcase                     |    7 -
 .../createtopolayer24.testcase                     |    7 -
 .../createtopolayer25.testcase                     |    7 -
 .../createtopolayer26.testcase                     |    7 -
 .../createtopolayer3.testcase                      |    7 -
 .../createtopolayer4.testcase                      |    7 -
 .../createtopolayer5.testcase                      |    7 -
 .../createtopolayer6.testcase                      |    7 -
 .../createtopolayer7.testcase                      |    7 -
 .../createtopolayer8.testcase                      |    7 -
 .../createtopolayer9.testcase                      |    7 -
 .../createtopology1.testcase                       |    7 -
 .../createtopology10.testcase                      |    7 -
 .../createtopology11.testcase                      |    7 -
 .../createtopology12.testcase                      |    7 -
 .../createtopology13.testcase                      |    7 -
 .../createtopology14.testcase                      |    7 -
 .../createtopology15.testcase                      |    7 -
 .../createtopology16.testcase                      |    7 -
 .../createtopology17.testcase                      |    7 -
 .../createtopology18.testcase                      |    7 -
 .../createtopology19.testcase                      |    7 -
 .../createtopology2.testcase                       |    7 -
 .../createtopology20.testcase                      |    7 -
 .../createtopology3.testcase                       |    7 -
 .../createtopology4.testcase                       |    7 -
 .../createtopology5.testcase                       |    7 -
 .../createtopology6.testcase                       |    7 -
 .../createtopology7.testcase                       |    7 -
 .../createtopology8.testcase                       |    7 -
 .../createtopology9.testcase                       |    7 -
 .../sql_stmt_lwgeom_22_tests/dropnetwork1.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/dropnetwork2.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/dropnetwork3.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/dropnetwork4.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/dropnetwork5.testcase |    7 -
 .../droptopology1.testcase                         |    7 -
 .../droptopology2.testcase                         |    7 -
 .../droptopology3.testcase                         |    7 -
 .../droptopology4.testcase                         |    7 -
 .../droptopology5.testcase                         |    7 -
 .../exporttopolayer1.testcase                      |    7 -
 .../exporttopolayer10.testcase                     |    7 -
 .../exporttopolayer11.testcase                     |    7 -
 .../exporttopolayer12.testcase                     |    7 -
 .../exporttopolayer13.testcase                     |    7 -
 .../exporttopolayer14.testcase                     |    7 -
 .../exporttopolayer15.testcase                     |    7 -
 .../exporttopolayer16.testcase                     |    7 -
 .../exporttopolayer17.testcase                     |    7 -
 .../exporttopolayer18.testcase                     |    7 -
 .../exporttopolayer19.testcase                     |    7 -
 .../exporttopolayer2.testcase                      |    7 -
 .../exporttopolayer20.testcase                     |    7 -
 .../exporttopolayer21.testcase                     |    7 -
 .../exporttopolayer22.testcase                     |    7 -
 .../exporttopolayer23.testcase                     |    7 -
 .../exporttopolayer3.testcase                      |    7 -
 .../exporttopolayer4.testcase                      |    7 -
 .../exporttopolayer5.testcase                      |    7 -
 .../exporttopolayer6.testcase                      |    7 -
 .../exporttopolayer7.testcase                      |    7 -
 .../exporttopolayer8.testcase                      |    7 -
 .../exporttopolayer9.testcase                      |    7 -
 .../featuretopolayer1.testcase                     |    7 -
 .../featuretopolayer10.testcase                    |    7 -
 .../featuretopolayer11.testcase                    |    7 -
 .../featuretopolayer12.testcase                    |    7 -
 .../featuretopolayer13.testcase                    |    7 -
 .../featuretopolayer14.testcase                    |    7 -
 .../featuretopolayer15.testcase                    |    7 -
 .../featuretopolayer16.testcase                    |    7 -
 .../featuretopolayer17.testcase                    |    7 -
 .../featuretopolayer2.testcase                     |    7 -
 .../featuretopolayer3.testcase                     |    7 -
 .../featuretopolayer4.testcase                     |    7 -
 .../featuretopolayer5.testcase                     |    7 -
 .../featuretopolayer6.testcase                     |    7 -
 .../featuretopolayer7.testcase                     |    7 -
 .../featuretopolayer8.testcase                     |    7 -
 .../featuretopolayer9.testcase                     |    7 -
 .../getedgebypoint1.testcase                       |    7 -
 .../getedgebypoint10.testcase                      |    7 -
 .../getedgebypoint11.testcase                      |    7 -
 .../getedgebypoint12.testcase                      |    7 -
 .../getedgebypoint13.testcase                      |    7 -
 .../getedgebypoint14.testcase                      |    7 -
 .../getedgebypoint15.testcase                      |    7 -
 .../getedgebypoint16.testcase                      |    7 -
 .../getedgebypoint17.testcase                      |    7 -
 .../getedgebypoint2.testcase                       |    7 -
 .../getedgebypoint3.testcase                       |    7 -
 .../getedgebypoint4.testcase                       |    7 -
 .../getedgebypoint5.testcase                       |    7 -
 .../getedgebypoint6.testcase                       |    7 -
 .../getedgebypoint7.testcase                       |    7 -
 .../getedgebypoint8.testcase                       |    7 -
 .../getedgebypoint9.testcase                       |    7 -
 .../sql_stmt_lwgeom_22_tests/getedgeseed1.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/getedgeseed2.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/getedgeseed3.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/getedgeseed4.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/getedgeseed5.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/getedgeseed6.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/getedgeseed7.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/getedgeseed8.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/getedgeseed9.testcase |    7 -
 .../getfacebypoint1.testcase                       |    7 -
 .../getfacebypoint10.testcase                      |    7 -
 .../getfacebypoint11.testcase                      |    7 -
 .../getfacebypoint12.testcase                      |    7 -
 .../getfacebypoint13.testcase                      |    7 -
 .../getfacebypoint14.testcase                      |    7 -
 .../getfacebypoint15.testcase                      |    7 -
 .../getfacebypoint16.testcase                      |    7 -
 .../getfacebypoint17.testcase                      |    7 -
 .../getfacebypoint2.testcase                       |    7 -
 .../getfacebypoint3.testcase                       |    7 -
 .../getfacebypoint4.testcase                       |    7 -
 .../getfacebypoint5.testcase                       |    7 -
 .../getfacebypoint6.testcase                       |    7 -
 .../getfacebypoint7.testcase                       |    7 -
 .../getfacebypoint8.testcase                       |    7 -
 .../getfacebypoint9.testcase                       |    7 -
 .../getfaceedges1.testcase                         |    7 -
 .../getfaceedges2.testcase                         |    7 -
 .../getfaceedges3.testcase                         |    7 -
 .../getfaceedges4.testcase                         |    7 -
 .../getfaceedges5.testcase                         |    7 -
 .../getfaceedges6.testcase                         |    7 -
 .../getfaceedges7.testcase                         |    7 -
 .../getfaceedges8.testcase                         |    7 -
 .../getfaceedges9.testcase                         |    7 -
 .../getfacegeometry1.testcase                      |    7 -
 .../getfacegeometry2.testcase                      |    7 -
 .../getfacegeometry3.testcase                      |    7 -
 .../getfacegeometry4.testcase                      |    7 -
 .../getfacegeometry5.testcase                      |    7 -
 .../getfacegeometry6.testcase                      |    7 -
 .../getfacegeometry7.testcase                      |    7 -
 .../getfacegeometry8.testcase                      |    7 -
 .../getfacegeometry9.testcase                      |    7 -
 .../sql_stmt_lwgeom_22_tests/getfaceseed1.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/getfaceseed2.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/getfaceseed3.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/getfaceseed4.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/getfaceseed5.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/getfaceseed6.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/getfaceseed7.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/getfaceseed8.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/getfaceseed9.testcase |    7 -
 .../getlinkbypoint1.testcase                       |    7 -
 .../getlinkbypoint10.testcase                      |    7 -
 .../getlinkbypoint11.testcase                      |    7 -
 .../getlinkbypoint12.testcase                      |    7 -
 .../getlinkbypoint13.testcase                      |    7 -
 .../getlinkbypoint14.testcase                      |    7 -
 .../getlinkbypoint15.testcase                      |    7 -
 .../getlinkbypoint16.testcase                      |    7 -
 .../getlinkbypoint17.testcase                      |    7 -
 .../getlinkbypoint2.testcase                       |    7 -
 .../getlinkbypoint3.testcase                       |    7 -
 .../getlinkbypoint4.testcase                       |    7 -
 .../getlinkbypoint5.testcase                       |    7 -
 .../getlinkbypoint6.testcase                       |    7 -
 .../getlinkbypoint7.testcase                       |    7 -
 .../getlinkbypoint8.testcase                       |    7 -
 .../getlinkbypoint9.testcase                       |    7 -
 .../sql_stmt_lwgeom_22_tests/getlinkseed1.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/getlinkseed2.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/getlinkseed3.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/getlinkseed4.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/getlinkseed5.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/getlinkseed6.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/getlinkseed7.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/getlinkseed8.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/getlinkseed9.testcase |    7 -
 .../getnetnodebypoint1.testcase                    |    7 -
 .../getnetnodebypoint10.testcase                   |    7 -
 .../getnetnodebypoint11.testcase                   |    7 -
 .../getnetnodebypoint12.testcase                   |    7 -
 .../getnetnodebypoint13.testcase                   |    7 -
 .../getnetnodebypoint14.testcase                   |    7 -
 .../getnetnodebypoint15.testcase                   |    7 -
 .../getnetnodebypoint16.testcase                   |    7 -
 .../getnetnodebypoint17.testcase                   |    7 -
 .../getnetnodebypoint2.testcase                    |    7 -
 .../getnetnodebypoint3.testcase                    |    7 -
 .../getnetnodebypoint4.testcase                    |    7 -
 .../getnetnodebypoint5.testcase                    |    7 -
 .../getnetnodebypoint6.testcase                    |    7 -
 .../getnetnodebypoint7.testcase                    |    7 -
 .../getnetnodebypoint8.testcase                    |    7 -
 .../getnetnodebypoint9.testcase                    |    7 -
 .../getnodebypoint1.testcase                       |    7 -
 .../getnodebypoint10.testcase                      |    7 -
 .../getnodebypoint11.testcase                      |    7 -
 .../getnodebypoint12.testcase                      |    7 -
 .../getnodebypoint13.testcase                      |    7 -
 .../getnodebypoint14.testcase                      |    7 -
 .../getnodebypoint15.testcase                      |    7 -
 .../getnodebypoint16.testcase                      |    7 -
 .../getnodebypoint17.testcase                      |    7 -
 .../getnodebypoint2.testcase                       |    7 -
 .../getnodebypoint3.testcase                       |    7 -
 .../getnodebypoint4.testcase                       |    7 -
 .../getnodebypoint5.testcase                       |    7 -
 .../getnodebypoint6.testcase                       |    7 -
 .../getnodebypoint7.testcase                       |    7 -
 .../getnodebypoint8.testcase                       |    7 -
 .../getnodebypoint9.testcase                       |    7 -
 .../inittopolayer1.testcase                        |    7 -
 .../inittopolayer10.testcase                       |    7 -
 .../inittopolayer11.testcase                       |    7 -
 .../inittopolayer12.testcase                       |    7 -
 .../inittopolayer13.testcase                       |    7 -
 .../inittopolayer14.testcase                       |    7 -
 .../inittopolayer15.testcase                       |    7 -
 .../inittopolayer16.testcase                       |    7 -
 .../inittopolayer17.testcase                       |    7 -
 .../inittopolayer2.testcase                        |    7 -
 .../inittopolayer3.testcase                        |    7 -
 .../inittopolayer4.testcase                        |    7 -
 .../inittopolayer5.testcase                        |    7 -
 .../inittopolayer6.testcase                        |    7 -
 .../inittopolayer7.testcase                        |    7 -
 .../inittopolayer8.testcase                        |    7 -
 .../inittopolayer9.testcase                        |    7 -
 .../linesnapseed1.testcase                         |    7 -
 .../linesnapseed10.testcase                        |    7 -
 .../linesnapseed11.testcase                        |    7 -
 .../linesnapseed12.testcase                        |    7 -
 .../linesnapseed13.testcase                        |    7 -
 .../linesnapseed14.testcase                        |    7 -
 .../linesnapseed15.testcase                        |    7 -
 .../linesnapseed16.testcase                        |    7 -
 .../linesnapseed17.testcase                        |    7 -
 .../linesnapseed2.testcase                         |    7 -
 .../linesnapseed3.testcase                         |    7 -
 .../linesnapseed4.testcase                         |    7 -
 .../linesnapseed5.testcase                         |    7 -
 .../linesnapseed6.testcase                         |    7 -
 .../linesnapseed7.testcase                         |    7 -
 .../linesnapseed8.testcase                         |    7 -
 .../linesnapseed9.testcase                         |    7 -
 .../loginetfromtgeo1.testcase                      |    7 -
 .../loginetfromtgeo2.testcase                      |    7 -
 .../loginetfromtgeo3.testcase                      |    7 -
 .../loginetfromtgeo4.testcase                      |    7 -
 .../loginetfromtgeo5.testcase                      |    7 -
 .../loginetfromtgeo6.testcase                      |    7 -
 .../loginetfromtgeo7.testcase                      |    7 -
 .../loginetfromtgeo8.testcase                      |    7 -
 .../loginetfromtgeo9.testcase                      |    7 -
 .../sql_stmt_lwgeom_22_tests/modedgeheal1.testcase |    7 -
 .../modedgeheal10.testcase                         |    7 -
 .../modedgeheal11.testcase                         |    7 -
 .../modedgeheal12.testcase                         |    7 -
 .../modedgeheal13.testcase                         |    7 -
 .../sql_stmt_lwgeom_22_tests/modedgeheal2.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/modedgeheal3.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/modedgeheal4.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/modedgeheal5.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/modedgeheal6.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/modedgeheal7.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/modedgeheal8.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/modedgeheal9.testcase |    7 -
 .../modedgesplit1.testcase                         |    7 -
 .../modedgesplit10.testcase                        |    7 -
 .../modedgesplit11.testcase                        |    7 -
 .../modedgesplit12.testcase                        |    7 -
 .../modedgesplit13.testcase                        |    7 -
 .../modedgesplit14.testcase                        |    7 -
 .../modedgesplit15.testcase                        |    7 -
 .../modedgesplit16.testcase                        |    7 -
 .../modedgesplit2.testcase                         |    7 -
 .../modedgesplit3.testcase                         |    7 -
 .../modedgesplit4.testcase                         |    7 -
 .../modedgesplit5.testcase                         |    7 -
 .../modedgesplit6.testcase                         |    7 -
 .../modedgesplit7.testcase                         |    7 -
 .../modedgesplit8.testcase                         |    7 -
 .../modedgesplit9.testcase                         |    7 -
 .../modgeolinksplit1.testcase                      |    7 -
 .../modgeolinksplit2.testcase                      |    7 -
 .../modgeolinksplit3.testcase                      |    7 -
 .../modgeolinksplit4.testcase                      |    7 -
 .../modgeolinksplit5.testcase                      |    7 -
 .../modgeolinksplit6.testcase                      |    7 -
 .../modgeolinksplit7.testcase                      |    7 -
 .../modgeolinksplit8.testcase                      |    7 -
 .../modgeolinksplit9.testcase                      |    7 -
 .../sql_stmt_lwgeom_22_tests/modlinkheal1.testcase |    7 -
 .../modlinkheal10.testcase                         |    7 -
 .../modlinkheal11.testcase                         |    7 -
 .../modlinkheal12.testcase                         |    7 -
 .../modlinkheal13.testcase                         |    7 -
 .../sql_stmt_lwgeom_22_tests/modlinkheal2.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/modlinkheal3.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/modlinkheal4.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/modlinkheal5.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/modlinkheal6.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/modlinkheal7.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/modlinkheal8.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/modlinkheal9.testcase |    7 -
 .../modloglinksplit1.testcase                      |    7 -
 .../modloglinksplit2.testcase                      |    7 -
 .../modloglinksplit3.testcase                      |    7 -
 .../modloglinksplit4.testcase                      |    7 -
 .../modloglinksplit5.testcase                      |    7 -
 .../modloglinksplit6.testcase                      |    7 -
 .../modloglinksplit7.testcase                      |    7 -
 .../modloglinksplit8.testcase                      |    7 -
 .../modloglinksplit9.testcase                      |    7 -
 .../moveisonetnode1.testcase                       |    7 -
 .../moveisonetnode2.testcase                       |    7 -
 .../moveisonetnode3.testcase                       |    7 -
 .../moveisonetnode4.testcase                       |    7 -
 .../moveisonetnode5.testcase                       |    7 -
 .../moveisonetnode6.testcase                       |    7 -
 .../moveisonetnode7.testcase                       |    7 -
 .../moveisonetnode8.testcase                       |    7 -
 .../moveisonetnode9.testcase                       |    7 -
 .../sql_stmt_lwgeom_22_tests/moveisonode1.testcase |    7 -
 .../moveisonode10.testcase                         |    7 -
 .../moveisonode11.testcase                         |    7 -
 .../moveisonode12.testcase                         |    7 -
 .../moveisonode13.testcase                         |    7 -
 .../moveisonode14.testcase                         |    7 -
 .../moveisonode15.testcase                         |    7 -
 .../moveisonode16.testcase                         |    7 -
 .../moveisonode17.testcase                         |    7 -
 .../sql_stmt_lwgeom_22_tests/moveisonode2.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/moveisonode3.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/moveisonode4.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/moveisonode5.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/moveisonode6.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/moveisonode7.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/moveisonode8.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/moveisonode9.testcase |    7 -
 .../netexception1.testcase                         |    7 -
 .../netexception2.testcase                         |    7 -
 .../sql_stmt_lwgeom_22_tests/newedgeheal1.testcase |    7 -
 .../newedgeheal10.testcase                         |    7 -
 .../newedgeheal11.testcase                         |    7 -
 .../newedgeheal12.testcase                         |    7 -
 .../newedgeheal13.testcase                         |    7 -
 .../sql_stmt_lwgeom_22_tests/newedgeheal2.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/newedgeheal3.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/newedgeheal4.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/newedgeheal5.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/newedgeheal6.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/newedgeheal7.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/newedgeheal8.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/newedgeheal9.testcase |    7 -
 .../newedgessplit1.testcase                        |    7 -
 .../newedgessplit10.testcase                       |    7 -
 .../newedgessplit11.testcase                       |    7 -
 .../newedgessplit12.testcase                       |    7 -
 .../newedgessplit13.testcase                       |    7 -
 .../newedgessplit14.testcase                       |    7 -
 .../newedgessplit15.testcase                       |    7 -
 .../newedgessplit16.testcase                       |    7 -
 .../newedgessplit2.testcase                        |    7 -
 .../newedgessplit3.testcase                        |    7 -
 .../newedgessplit4.testcase                        |    7 -
 .../newedgessplit5.testcase                        |    7 -
 .../newedgessplit6.testcase                        |    7 -
 .../newedgessplit7.testcase                        |    7 -
 .../newedgessplit8.testcase                        |    7 -
 .../newedgessplit9.testcase                        |    7 -
 .../newgeolinksplit1.testcase                      |    7 -
 .../newgeolinksplit2.testcase                      |    7 -
 .../newgeolinksplit3.testcase                      |    7 -
 .../newgeolinksplit4.testcase                      |    7 -
 .../newgeolinksplit5.testcase                      |    7 -
 .../newgeolinksplit6.testcase                      |    7 -
 .../newgeolinksplit7.testcase                      |    7 -
 .../newgeolinksplit8.testcase                      |    7 -
 .../newgeolinksplit9.testcase                      |    7 -
 .../sql_stmt_lwgeom_22_tests/newlinkheal1.testcase |    7 -
 .../newlinkheal10.testcase                         |    7 -
 .../newlinkheal11.testcase                         |    7 -
 .../newlinkheal12.testcase                         |    7 -
 .../newlinkheal13.testcase                         |    7 -
 .../sql_stmt_lwgeom_22_tests/newlinkheal2.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/newlinkheal3.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/newlinkheal4.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/newlinkheal5.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/newlinkheal6.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/newlinkheal7.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/newlinkheal8.testcase |    7 -
 .../sql_stmt_lwgeom_22_tests/newlinkheal9.testcase |    7 -
 .../newloglinksplit1.testcase                      |    7 -
 .../newloglinksplit2.testcase                      |    7 -
 .../newloglinksplit3.testcase                      |    7 -
 .../newloglinksplit4.testcase                      |    7 -
 .../newloglinksplit5.testcase                      |    7 -
 .../newloglinksplit6.testcase                      |    7 -
 .../newloglinksplit7.testcase                      |    7 -
 .../newloglinksplit8.testcase                      |    7 -
 .../newloglinksplit9.testcase                      |    7 -
 .../pointsnapseed1.testcase                        |    7 -
 .../pointsnapseed10.testcase                       |    7 -
 .../pointsnapseed11.testcase                       |    7 -
 .../pointsnapseed12.testcase                       |    7 -
 .../pointsnapseed13.testcase                       |    7 -
 .../pointsnapseed14.testcase                       |    7 -
 .../pointsnapseed15.testcase                       |    7 -
 .../pointsnapseed16.testcase                       |    7 -
 .../pointsnapseed17.testcase                       |    7 -
 .../pointsnapseed2.testcase                        |    7 -
 .../pointsnapseed3.testcase                        |    7 -
 .../pointsnapseed4.testcase                        |    7 -
 .../pointsnapseed5.testcase                        |    7 -
 .../pointsnapseed6.testcase                        |    7 -
 .../pointsnapseed7.testcase                        |    7 -
 .../pointsnapseed8.testcase                        |    7 -
 .../pointsnapseed9.testcase                        |    7 -
 .../remedgemodface1.testcase                       |    7 -
 .../remedgemodface2.testcase                       |    7 -
 .../remedgemodface3.testcase                       |    7 -
 .../remedgemodface4.testcase                       |    7 -
 .../remedgemodface5.testcase                       |    7 -
 .../remedgemodface6.testcase                       |    7 -
 .../remedgemodface7.testcase                       |    7 -
 .../remedgemodface8.testcase                       |    7 -
 .../remedgemodface9.testcase                       |    7 -
 .../remedgenewface1.testcase                       |    7 -
 .../remedgenewface2.testcase                       |    7 -
 .../remedgenewface3.testcase                       |    7 -
 .../remedgenewface4.testcase                       |    7 -
 .../remedgenewface5.testcase                       |    7 -
 .../remedgenewface6.testcase                       |    7 -
 .../remedgenewface7.testcase                       |    7 -
 .../remedgenewface8.testcase                       |    7 -
 .../remedgenewface9.testcase                       |    7 -
 test/sql_stmt_lwgeom_22_tests/remisoedge1.testcase |    7 -
 test/sql_stmt_lwgeom_22_tests/remisoedge2.testcase |    7 -
 test/sql_stmt_lwgeom_22_tests/remisoedge3.testcase |    7 -
 test/sql_stmt_lwgeom_22_tests/remisoedge4.testcase |    7 -
 test/sql_stmt_lwgeom_22_tests/remisoedge5.testcase |    7 -
 test/sql_stmt_lwgeom_22_tests/remisoedge6.testcase |    7 -
 test/sql_stmt_lwgeom_22_tests/remisoedge7.testcase |    7 -
 test/sql_stmt_lwgeom_22_tests/remisoedge8.testcase |    7 -
 test/sql_stmt_lwgeom_22_tests/remisoedge9.testcase |    7 -
 .../remisonetnode1.testcase                        |    7 -
 .../remisonetnode2.testcase                        |    7 -
 .../remisonetnode3.testcase                        |    7 -
 .../remisonetnode4.testcase                        |    7 -
 .../remisonetnode5.testcase                        |    7 -
 .../remisonetnode6.testcase                        |    7 -
 .../remisonetnode7.testcase                        |    7 -
 .../remisonetnode8.testcase                        |    7 -
 .../remisonetnode9.testcase                        |    7 -
 test/sql_stmt_lwgeom_22_tests/remisonode1.testcase |    7 -
 test/sql_stmt_lwgeom_22_tests/remisonode2.testcase |    7 -
 test/sql_stmt_lwgeom_22_tests/remisonode3.testcase |    7 -
 test/sql_stmt_lwgeom_22_tests/remisonode4.testcase |    7 -
 test/sql_stmt_lwgeom_22_tests/remisonode5.testcase |    7 -
 test/sql_stmt_lwgeom_22_tests/remisonode6.testcase |    7 -
 test/sql_stmt_lwgeom_22_tests/remisonode7.testcase |    7 -
 test/sql_stmt_lwgeom_22_tests/remisonode8.testcase |    7 -
 test/sql_stmt_lwgeom_22_tests/remisonode9.testcase |    7 -
 test/sql_stmt_lwgeom_22_tests/remlink1.testcase    |    7 -
 test/sql_stmt_lwgeom_22_tests/remlink2.testcase    |    7 -
 test/sql_stmt_lwgeom_22_tests/remlink3.testcase    |    7 -
 test/sql_stmt_lwgeom_22_tests/remlink4.testcase    |    7 -
 test/sql_stmt_lwgeom_22_tests/remlink5.testcase    |    7 -
 test/sql_stmt_lwgeom_22_tests/remlink6.testcase    |    7 -
 test/sql_stmt_lwgeom_22_tests/remlink7.testcase    |    7 -
 test/sql_stmt_lwgeom_22_tests/remlink8.testcase    |    7 -
 test/sql_stmt_lwgeom_22_tests/remlink9.testcase    |    7 -
 .../removetopolayer1.testcase                      |    7 -
 .../removetopolayer2.testcase                      |    7 -
 .../removetopolayer3.testcase                      |    7 -
 .../removetopolayer4.testcase                      |    7 -
 .../removetopolayer5.testcase                      |    7 -
 .../removetopolayer6.testcase                      |    7 -
 .../removetopolayer7.testcase                      |    7 -
 .../removetopolayer8.testcase                      |    7 -
 .../removetopolayer9.testcase                      |    7 -
 .../spatnetfromgeom1.testcase                      |    7 -
 .../spatnetfromgeom10.testcase                     |    7 -
 .../spatnetfromgeom2.testcase                      |    7 -
 .../spatnetfromgeom3.testcase                      |    7 -
 .../spatnetfromgeom4.testcase                      |    7 -
 .../spatnetfromgeom5.testcase                      |    7 -
 .../spatnetfromgeom6.testcase                      |    7 -
 .../spatnetfromgeom7.testcase                      |    7 -
 .../spatnetfromgeom8.testcase                      |    7 -
 .../spatnetfromgeom9.testcase                      |    7 -
 .../spatnetfromtgeo1.testcase                      |    7 -
 .../spatnetfromtgeo2.testcase                      |    7 -
 .../spatnetfromtgeo3.testcase                      |    7 -
 .../spatnetfromtgeo4.testcase                      |    7 -
 .../spatnetfromtgeo5.testcase                      |    7 -
 .../spatnetfromtgeo6.testcase                      |    7 -
 .../spatnetfromtgeo7.testcase                      |    7 -
 .../spatnetfromtgeo8.testcase                      |    7 -
 .../spatnetfromtgeo9.testcase                      |    7 -
 .../topoexception1.testcase                        |    7 -
 .../topoexception2.testcase                        |    7 -
 .../topogeoaddline1.testcase                       |    7 -
 .../topogeoaddline10.testcase                      |    7 -
 .../topogeoaddline11.testcase                      |    7 -
 .../topogeoaddline12.testcase                      |    7 -
 .../topogeoaddline13.testcase                      |    7 -
 .../topogeoaddline14.testcase                      |    7 -
 .../topogeoaddline15.testcase                      |    7 -
 .../topogeoaddline16.testcase                      |    7 -
 .../topogeoaddline17.testcase                      |    7 -
 .../topogeoaddline2.testcase                       |    7 -
 .../topogeoaddline3.testcase                       |    7 -
 .../topogeoaddline4.testcase                       |    7 -
 .../topogeoaddline5.testcase                       |    7 -
 .../topogeoaddline6.testcase                       |    7 -
 .../topogeoaddline7.testcase                       |    7 -
 .../topogeoaddline8.testcase                       |    7 -
 .../topogeoaddline9.testcase                       |    7 -
 .../topogeoaddpoint1.testcase                      |    7 -
 .../topogeoaddpoint10.testcase                     |    7 -
 .../topogeoaddpoint11.testcase                     |    7 -
 .../topogeoaddpoint12.testcase                     |    7 -
 .../topogeoaddpoint13.testcase                     |    7 -
 .../topogeoaddpoint14.testcase                     |    7 -
 .../topogeoaddpoint15.testcase                     |    7 -
 .../topogeoaddpoint16.testcase                     |    7 -
 .../topogeoaddpoint17.testcase                     |    7 -
 .../topogeoaddpoint2.testcase                      |    7 -
 .../topogeoaddpoint3.testcase                      |    7 -
 .../topogeoaddpoint4.testcase                      |    7 -
 .../topogeoaddpoint5.testcase                      |    7 -
 .../topogeoaddpoint6.testcase                      |    7 -
 .../topogeoaddpoint7.testcase                      |    7 -
 .../topogeoaddpoint8.testcase                      |    7 -
 .../topogeoaddpoint9.testcase                      |    7 -
 .../topogeoclone1.testcase                         |    7 -
 .../topogeoclone10.testcase                        |    7 -
 .../topogeoclone11.testcase                        |    7 -
 .../topogeoclone12.testcase                        |    7 -
 .../topogeoclone2.testcase                         |    7 -
 .../topogeoclone3.testcase                         |    7 -
 .../topogeoclone4.testcase                         |    7 -
 .../topogeoclone5.testcase                         |    7 -
 .../topogeoclone6.testcase                         |    7 -
 .../topogeoclone7.testcase                         |    7 -
 .../topogeoclone8.testcase                         |    7 -
 .../topogeoclone9.testcase                         |    7 -
 .../topogeofromext1.testcase                       |    7 -
 .../topogeofromext10.testcase                      |    7 -
 .../topogeofromext11.testcase                      |    7 -
 .../topogeofromext12.testcase                      |    7 -
 .../topogeofromext13.testcase                      |    7 -
 .../topogeofromext14.testcase                      |    7 -
 .../topogeofromext15.testcase                      |    7 -
 .../topogeofromext16.testcase                      |    7 -
 .../topogeofromext17.testcase                      |    7 -
 .../topogeofromext18.testcase                      |    7 -
 .../topogeofromext19.testcase                      |    7 -
 .../topogeofromext2.testcase                       |    7 -
 .../topogeofromext20.testcase                      |    7 -
 .../topogeofromext21.testcase                      |    7 -
 .../topogeofromext22.testcase                      |    7 -
 .../topogeofromext23.testcase                      |    7 -
 .../topogeofromext24.testcase                      |    7 -
 .../topogeofromext25.testcase                      |    7 -
 .../topogeofromext26.testcase                      |    7 -
 .../topogeofromext27.testcase                      |    7 -
 .../topogeofromext28.testcase                      |    7 -
 .../topogeofromext29.testcase                      |    7 -
 .../topogeofromext3.testcase                       |    7 -
 .../topogeofromext30.testcase                      |    7 -
 .../topogeofromext31.testcase                      |    7 -
 .../topogeofromext32.testcase                      |    7 -
 .../topogeofromext33.testcase                      |    7 -
 .../topogeofromext34.testcase                      |    7 -
 .../topogeofromext35.testcase                      |    7 -
 .../topogeofromext36.testcase                      |    7 -
 .../topogeofromext37.testcase                      |    7 -
 .../topogeofromext38.testcase                      |    7 -
 .../topogeofromext39.testcase                      |    7 -
 .../topogeofromext4.testcase                       |    7 -
 .../topogeofromext5.testcase                       |    7 -
 .../topogeofromext6.testcase                       |    7 -
 .../topogeofromext7.testcase                       |    7 -
 .../topogeofromext8.testcase                       |    7 -
 .../topogeofromext9.testcase                       |    7 -
 .../topogeofromtable1.testcase                     |    7 -
 .../topogeofromtable10.testcase                    |    7 -
 .../topogeofromtable11.testcase                    |    7 -
 .../topogeofromtable12.testcase                    |    7 -
 .../topogeofromtable13.testcase                    |    7 -
 .../topogeofromtable14.testcase                    |    7 -
 .../topogeofromtable15.testcase                    |    7 -
 .../topogeofromtable16.testcase                    |    7 -
 .../topogeofromtable17.testcase                    |    7 -
 .../topogeofromtable18.testcase                    |    7 -
 .../topogeofromtable19.testcase                    |    7 -
 .../topogeofromtable2.testcase                     |    7 -
 .../topogeofromtable20.testcase                    |    7 -
 .../topogeofromtable21.testcase                    |    7 -
 .../topogeofromtable22.testcase                    |    7 -
 .../topogeofromtable23.testcase                    |    7 -
 .../topogeofromtable24.testcase                    |    7 -
 .../topogeofromtable25.testcase                    |    7 -
 .../topogeofromtable26.testcase                    |    7 -
 .../topogeofromtable27.testcase                    |    7 -
 .../topogeofromtable28.testcase                    |    7 -
 .../topogeofromtable29.testcase                    |    7 -
 .../topogeofromtable3.testcase                     |    7 -
 .../topogeofromtable30.testcase                    |    7 -
 .../topogeofromtable4.testcase                     |    7 -
 .../topogeofromtable5.testcase                     |    7 -
 .../topogeofromtable6.testcase                     |    7 -
 .../topogeofromtable7.testcase                     |    7 -
 .../topogeofromtable8.testcase                     |    7 -
 .../topogeofromtable9.testcase                     |    7 -
 .../topogeoremoveedges1.testcase                   |    7 -
 .../topogeoremoveedges2.testcase                   |    7 -
 .../topogeoremoveedges3.testcase                   |    7 -
 .../topogeoremoveedges4.testcase                   |    7 -
 .../topogeoremoveedges5.testcase                   |    7 -
 .../topogeoremovenodes1.testcase                   |    7 -
 .../topogeoremovenodes2.testcase                   |    7 -
 .../topogeoremovenodes3.testcase                   |    7 -
 .../topogeoremovenodes4.testcase                   |    7 -
 .../topogeoremovenodes5.testcase                   |    7 -
 .../topogeoremovesmall1.testcase                   |    7 -
 .../topogeoremovesmall2.testcase                   |    7 -
 .../topogeoremovesmall3.testcase                   |    7 -
 .../topogeoremovesmall4.testcase                   |    7 -
 .../topogeoremovesmall5.testcase                   |    7 -
 .../topogeoremovesmall6.testcase                   |    7 -
 .../topogeoremovesmall7.testcase                   |    7 -
 .../topogeoremovesmall8.testcase                   |    7 -
 .../topogeoremovesmall9.testcase                   |    7 -
 .../topogeosplitline1.testcase                     |    7 -
 .../topogeosplitline10.testcase                    |    7 -
 .../topogeosplitline11.testcase                    |    7 -
 .../topogeosplitline12.testcase                    |    7 -
 .../topogeosplitline13.testcase                    |    7 -
 .../topogeosplitline14.testcase                    |    7 -
 .../topogeosplitline15.testcase                    |    7 -
 .../topogeosplitline16.testcase                    |    7 -
 .../topogeosplitline2.testcase                     |    7 -
 .../topogeosplitline3.testcase                     |    7 -
 .../topogeosplitline4.testcase                     |    7 -
 .../topogeosplitline5.testcase                     |    7 -
 .../topogeosplitline6.testcase                     |    7 -
 .../topogeosplitline7.testcase                     |    7 -
 .../topogeosplitline8.testcase                     |    7 -
 .../topogeosplitline9.testcase                     |    7 -
 .../topogeototable1.testcase                       |    7 -
 .../topogeototable10.testcase                      |    7 -
 .../topogeototable11.testcase                      |    7 -
 .../topogeototable12.testcase                      |    7 -
 .../topogeototable13.testcase                      |    7 -
 .../topogeototable14.testcase                      |    7 -
 .../topogeototable15.testcase                      |    7 -
 .../topogeototable16.testcase                      |    7 -
 .../topogeototable17.testcase                      |    7 -
 .../topogeototable18.testcase                      |    7 -
 .../topogeototable19.testcase                      |    7 -
 .../topogeototable2.testcase                       |    7 -
 .../topogeototable20.testcase                      |    7 -
 .../topogeototable21.testcase                      |    7 -
 .../topogeototable22.testcase                      |    7 -
 .../topogeototable23.testcase                      |    7 -
 .../topogeototable24.testcase                      |    7 -
 .../topogeototable25.testcase                      |    7 -
 .../topogeototable26.testcase                      |    7 -
 .../topogeototable3.testcase                       |    7 -
 .../topogeototable4.testcase                       |    7 -
 .../topogeototable5.testcase                       |    7 -
 .../topogeototable6.testcase                       |    7 -
 .../topogeototable7.testcase                       |    7 -
 .../topogeototable8.testcase                       |    7 -
 .../topogeototable9.testcase                       |    7 -
 .../topogeototablegen1.testcase                    |    7 -
 .../topogeototablegen10.testcase                   |    7 -
 .../topogeototablegen11.testcase                   |    7 -
 .../topogeototablegen12.testcase                   |    7 -
 .../topogeototablegen13.testcase                   |    7 -
 .../topogeototablegen14.testcase                   |    7 -
 .../topogeototablegen15.testcase                   |    7 -
 .../topogeototablegen16.testcase                   |    7 -
 .../topogeototablegen17.testcase                   |    7 -
 .../topogeototablegen18.testcase                   |    7 -
 .../topogeototablegen19.testcase                   |    7 -
 .../topogeototablegen2.testcase                    |    7 -
 .../topogeototablegen20.testcase                   |    7 -
 .../topogeototablegen21.testcase                   |    7 -
 .../topogeototablegen22.testcase                   |    7 -
 .../topogeototablegen23.testcase                   |    7 -
 .../topogeototablegen24.testcase                   |    7 -
 .../topogeototablegen25.testcase                   |    7 -
 .../topogeototablegen26.testcase                   |    7 -
 .../topogeototablegen27.testcase                   |    7 -
 .../topogeototablegen28.testcase                   |    7 -
 .../topogeototablegen29.testcase                   |    7 -
 .../topogeototablegen3.testcase                    |    7 -
 .../topogeototablegen30.testcase                   |    7 -
 .../topogeototablegen31.testcase                   |    7 -
 .../topogeototablegen4.testcase                    |    7 -
 .../topogeototablegen5.testcase                    |    7 -
 .../topogeototablegen6.testcase                    |    7 -
 .../topogeototablegen7.testcase                    |    7 -
 .../topogeototablegen8.testcase                    |    7 -
 .../topogeototablegen9.testcase                    |    7 -
 .../topogeoupdateseeds1.testcase                   |    7 -
 .../topogeoupdateseeds10.testcase                  |    7 -
 .../topogeoupdateseeds2.testcase                   |    7 -
 .../topogeoupdateseeds3.testcase                   |    7 -
 .../topogeoupdateseeds4.testcase                   |    7 -
 .../topogeoupdateseeds5.testcase                   |    7 -
 .../topogeoupdateseeds6.testcase                   |    7 -
 .../topogeoupdateseeds7.testcase                   |    7 -
 .../topogeoupdateseeds8.testcase                   |    7 -
 .../topogeoupdateseeds9.testcase                   |    7 -
 .../topomettotable25.testcase                      |    7 -
 .../toponetclone1.testcase                         |    7 -
 .../toponetclone10.testcase                        |    7 -
 .../toponetclone11.testcase                        |    7 -
 .../toponetclone12.testcase                        |    7 -
 .../toponetclone2.testcase                         |    7 -
 .../toponetclone3.testcase                         |    7 -
 .../toponetclone4.testcase                         |    7 -
 .../toponetclone5.testcase                         |    7 -
 .../toponetclone6.testcase                         |    7 -
 .../toponetclone7.testcase                         |    7 -
 .../toponetclone8.testcase                         |    7 -
 .../toponetclone9.testcase                         |    7 -
 .../toponetfromtable1.testcase                     |    7 -
 .../toponetfromtable10.testcase                    |    7 -
 .../toponetfromtable11.testcase                    |    7 -
 .../toponetfromtable12.testcase                    |    7 -
 .../toponetfromtable13.testcase                    |    7 -
 .../toponetfromtable14.testcase                    |    7 -
 .../toponetfromtable15.testcase                    |    7 -
 .../toponetfromtable16.testcase                    |    7 -
 .../toponetfromtable17.testcase                    |    7 -
 .../toponetfromtable2.testcase                     |    7 -
 .../toponetfromtable3.testcase                     |    7 -
 .../toponetfromtable4.testcase                     |    7 -
 .../toponetfromtable5.testcase                     |    7 -
 .../toponetfromtable6.testcase                     |    7 -
 .../toponetfromtable7.testcase                     |    7 -
 .../toponetfromtable8.testcase                     |    7 -
 .../toponetfromtable9.testcase                     |    7 -
 .../toponettotable1.testcase                       |    7 -
 .../toponettotable10.testcase                      |    7 -
 .../toponettotable11.testcase                      |    7 -
 .../toponettotable12.testcase                      |    7 -
 .../toponettotable13.testcase                      |    7 -
 .../toponettotable14.testcase                      |    7 -
 .../toponettotable15.testcase                      |    7 -
 .../toponettotable16.testcase                      |    7 -
 .../toponettotable17.testcase                      |    7 -
 .../toponettotable18.testcase                      |    7 -
 .../toponettotable19.testcase                      |    7 -
 .../toponettotable2.testcase                       |    7 -
 .../toponettotable20.testcase                      |    7 -
 .../toponettotable21.testcase                      |    7 -
 .../toponettotable22.testcase                      |    7 -
 .../toponettotable23.testcase                      |    7 -
 .../toponettotable24.testcase                      |    7 -
 .../toponettotable25.testcase                      |    7 -
 .../toponettotable26.testcase                      |    7 -
 .../toponettotable3.testcase                       |    7 -
 .../toponettotable4.testcase                       |    7 -
 .../toponettotable5.testcase                       |    7 -
 .../toponettotable6.testcase                       |    7 -
 .../toponettotable7.testcase                       |    7 -
 .../toponettotable8.testcase                       |    7 -
 .../toponettotable9.testcase                       |    7 -
 .../toponettotablegen1.testcase                    |    7 -
 .../toponettotablegen10.testcase                   |    7 -
 .../toponettotablegen11.testcase                   |    7 -
 .../toponettotablegen12.testcase                   |    7 -
 .../toponettotablegen13.testcase                   |    7 -
 .../toponettotablegen14.testcase                   |    7 -
 .../toponettotablegen15.testcase                   |    7 -
 .../toponettotablegen16.testcase                   |    7 -
 .../toponettotablegen17.testcase                   |    7 -
 .../toponettotablegen18.testcase                   |    7 -
 .../toponettotablegen19.testcase                   |    7 -
 .../toponettotablegen2.testcase                    |    7 -
 .../toponettotablegen20.testcase                   |    7 -
 .../toponettotablegen21.testcase                   |    7 -
 .../toponettotablegen22.testcase                   |    7 -
 .../toponettotablegen23.testcase                   |    7 -
 .../toponettotablegen24.testcase                   |    7 -
 .../toponettotablegen25.testcase                   |    7 -
 .../toponettotablegen26.testcase                   |    7 -
 .../toponettotablegen27.testcase                   |    7 -
 .../toponettotablegen28.testcase                   |    7 -
 .../toponettotablegen29.testcase                   |    7 -
 .../toponettotablegen3.testcase                    |    7 -
 .../toponettotablegen30.testcase                   |    7 -
 .../toponettotablegen31.testcase                   |    7 -
 .../toponettotablegen4.testcase                    |    7 -
 .../toponettotablegen5.testcase                    |    7 -
 .../toponettotablegen6.testcase                    |    7 -
 .../toponettotablegen7.testcase                    |    7 -
 .../toponettotablegen8.testcase                    |    7 -
 .../toponettotablegen9.testcase                    |    7 -
 .../toponetupdateseeds1.testcase                   |    7 -
 .../toponetupdateseeds10.testcase                  |    7 -
 .../toponetupdateseeds2.testcase                   |    7 -
 .../toponetupdateseeds3.testcase                   |    7 -
 .../toponetupdateseeds4.testcase                   |    7 -
 .../toponetupdateseeds5.testcase                   |    7 -
 .../toponetupdateseeds6.testcase                   |    7 -
 .../toponetupdateseeds7.testcase                   |    7 -
 .../toponetupdateseeds8.testcase                   |    7 -
 .../toponetupdateseeds9.testcase                   |    7 -
 .../validatetopogeo1.testcase                      |    7 -
 .../validatetopogeo2.testcase                      |    7 -
 .../validatetopogeo3.testcase                      |    7 -
 .../validatetopogeo4.testcase                      |    7 -
 .../validatetopogeo5.testcase                      |    7 -
 .../validlogicalnet1.testcase                      |    7 -
 .../validlogicalnet2.testcase                      |    7 -
 .../validlogicalnet3.testcase                      |    7 -
 .../validlogicalnet4.testcase                      |    7 -
 .../validlogicalnet5.testcase                      |    7 -
 .../validspatialnet1.testcase                      |    7 -
 .../validspatialnet2.testcase                      |    7 -
 .../validspatialnet3.testcase                      |    7 -
 .../validspatialnet4.testcase                      |    7 -
 .../validspatialnet5.testcase                      |    7 -
 test/sql_stmt_nocache_tests/Makefile.am            |    8 +-
 test/sql_stmt_nocache_tests/Makefile.in            |    8 +-
 test/sql_stmt_rtgeom_tests/st_azimuth10.testcase   |    7 -
 .../topomettotable25.testcase                      |    7 -
 .../toponetupdateseeds1.testcase                   |    7 -
 .../toponetupdateseeds10.testcase                  |    7 -
 .../toponetupdateseeds2.testcase                   |    7 -
 .../toponetupdateseeds3.testcase                   |    7 -
 .../toponetupdateseeds4.testcase                   |    7 -
 .../toponetupdateseeds5.testcase                   |    7 -
 .../toponetupdateseeds6.testcase                   |    7 -
 .../toponetupdateseeds7.testcase                   |    7 -
 .../toponetupdateseeds8.testcase                   |    7 -
 .../toponetupdateseeds9.testcase                   |    7 -
 test/sql_stmt_tests/atmtransform10.testcase        |    7 -
 test/sql_stmt_tests/atmtransform9.testcase         |    7 -
 test/sql_stmt_voronoj1_tests/Makefile              |  468 -------
 test/sql_stmt_voronoj2_tests/Makefile              |  468 -------
 1065 files changed, 965 insertions(+), 13512 deletions(-)

diff --git a/.fslckout b/.fslckout
deleted file mode 100644
index 7590e98..0000000
Binary files a/.fslckout and /dev/null differ
diff --git a/amalgamate.c b/amalgamate.c
deleted file mode 100644
index bec0d0e..0000000
--- a/amalgamate.c
+++ /dev/null
@@ -1,1140 +0,0 @@
-/* 
-**
-** amalgamate.c
-**
-** produces the SpatiaLite's AMALGAMATION
-**
-*/
-
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <stdlib.h>
-
-#define PREFIX	"./src"
-
-/* globals: autogenerated snippet paths */
-const char *vanuatuWkt_h = "/gaiageo/vanuatuWkt.h";
-const char *vanuatuWkt_c = "/gaiageo/vanuatuWkt.c";
-const char *Ewkt_h = "/gaiageo/Ewkt.h";
-const char *Ewkt_c = "/gaiageo/Ewkt.c";
-const char *geoJSON_h = "/gaiageo/geoJSON.h";
-const char *geoJSON_c = "/gaiageo/geoJSON.c";
-const char *Kml_h = "/gaiageo/Kml.h";
-const char *Kml_c = "/gaiageo/Kml.c";
-const char *Gml_h = "/gaiageo/Gml.h";
-const char *Gml_c = "/gaiageo/Gml.c";
-const char *lex_VanuatuWkt_c = "/gaiageo/lex.VanuatuWkt.c";
-const char *lex_Ewkt_c = "/gaiageo/lex.Ewkt.c";
-const char *lex_GeoJson_c = "/gaiageo/lex.GeoJson.c";
-const char *lex_Kml_c = "/gaiageo/lex.Kml.c";
-const char *lex_Gml_c = "/gaiageo/lex.Gml.c";
-const char *epsg_inlined_c = "/srsinit/epsg_inlined.c";
-
-struct masked_keyword
-{
-    char *keyword;
-    struct masked_keyword *next;
-};
-
-static void
-do_auto_sh (FILE * out)
-{
-/* producing the auto-sh script [automake chain] */
-    fprintf (out, "cd ./amalgamation\n");
-    fprintf (out, "echo aclocal\n");
-    fprintf (out, "aclocal\n");
-    fprintf (out, "echo autoheader\n");
-    fprintf (out, "autoheader\n");
-    fprintf (out, "echo autoconf\n");
-    fprintf (out, "autoconf\n");
-    fprintf (out, "echo libtoolize\n");
-    fprintf (out, "libtoolize\n");
-    fprintf (out, "echo automake --add-missing --foreign\n");
-    fprintf (out, "automake --add-missing --foreign\n\n");
-}
-
-static void
-do_headers (FILE * out, struct masked_keyword *first)
-{
-/* prepares the headers for SpatiaLite-Amalgamation */
-    struct masked_keyword *p;
-    char now[64];
-    time_t now_time;
-    struct tm *tmp;
-    now_time = time (NULL);
-    tmp = localtime (&now_time);
-    strftime (now, 64, "%Y-%m-%d %H:%M:%S %z", tmp);
-    fprintf (out,
-	     "/******************************************************************************\n");
-    fprintf (out,
-	     "** This file is an amalgamation of many separate C source files from SpatiaLite\n");
-    fprintf (out,
-	     "** version 3.0.0-beta1.  By combining all the individual C code files into this\n");
-    fprintf (out,
-	     "** single large file, the entire code can be compiled as a one translation\n");
-    fprintf (out,
-	     "** unit.  This allows many compilers to do optimizations that would not be\n");
-    fprintf (out,
-	     "** possible if the files were compiled separately.  Performance improvements\n");
-    fprintf (out,
-	     "** of 5%% are more are commonly seen when SQLite is compiled as a single\n");
-    fprintf (out, "** translation unit.\n");
-    fprintf (out, "**\n** This amalgamation was generated on %s.\n\n", now);
-    fprintf (out, "Author: Alessandro (Sandro) Furieri <a.furieri at lqt.it>\n\n");
-    fprintf (out,
-	     "------------------------------------------------------------------------------\n\n");
-    fprintf (out, "Version: MPL 1.1/GPL 2.0/LGPL 2.1\n\n");
-    fprintf (out,
-	     "The contents of this file are subject to the Mozilla Public License Version\n");
-    fprintf (out,
-	     "1.1 (the \"License\"); you may not use this file except in compliance with\n");
-    fprintf (out, "the License. You may obtain a copy of the License at\n");
-    fprintf (out, "http://www.mozilla.org/MPL/\n\n");
-    fprintf (out,
-	     "Software distributed under the License is distributed on an \"AS IS\" basis,\n");
-    fprintf (out,
-	     "WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License\n");
-    fprintf (out,
-	     "for the specific language governing rights and limitations under the\n");
-    fprintf (out, "License.\n\n");
-    fprintf (out, "The Original Code is the SpatiaLite library\n\n");
-    fprintf (out,
-	     "The Initial Developer of the Original Code is Alessandro Furieri\n\n");
-    fprintf (out,
-	     "Portions created by the Initial Developer are Copyright (C) 2008\n");
-    fprintf (out, "the Initial Developer. All Rights Reserved.\n\n");
-    fprintf (out, "Contributor(s):\n");
-    fprintf (out, "Klaus Foerster klaus.foerster at svg.cc\n");
-    fprintf (out, "Luigi Costalli luigi.costalli at gmail.com\n");
-    fprintf (out, "The Vanuatu Team - University of Toronto\n");
-    fprintf (out, "\tSupervisor: Greg Wilson gwilson at cs.toronto.ca\n");
-    fprintf (out, "\n");
-    fprintf (out,
-	     "Alternatively, the contents of this file may be used under the terms of\n");
-    fprintf (out,
-	     "either the GNU General Public License Version 2 or later (the \"GPL\"), or\n");
-    fprintf (out,
-	     "the GNU Lesser General Public License Version 2.1 or later (the \"LGPL\"),\n");
-    fprintf (out,
-	     "in which case the provisions of the GPL or the LGPL are applicable instead\n");
-    fprintf (out,
-	     "of those above. If you wish to allow use of your version of this file only\n");
-    fprintf (out,
-	     "under the terms of either the GPL or the LGPL, and not to allow others to\n");
-    fprintf (out,
-	     "use your version of this file under the terms of the MPL, indicate your\n");
-    fprintf (out,
-	     "decision by deleting the provisions above and replace them with the notice\n");
-    fprintf (out,
-	     "and other provisions required by the GPL or the LGPL. If you do not delete\n");
-    fprintf (out,
-	     "the provisions above, a recipient may use your version of this file under\n");
-    fprintf (out,
-	     "the terms of any one of the MPL, the GPL or the LGPL.\n\n*/\n\n");
-    fprintf (out, "#if defined(_WIN32) && !defined(__MINGW32__)\n");
-    fprintf (out, "/* MSVC strictly requires this include [off_t] */\n");
-    fprintf (out, "#include <sys/types.h>\n");
-    fprintf (out, "#endif\n\n");
-    fprintf (out, "#include <stdio.h>\n");
-    fprintf (out, "#include <stdlib.h>\n");
-    fprintf (out, "#include <string.h>\n");
-    fprintf (out, "#include <memory.h>\n");
-    fprintf (out, "#include <limits.h>\n");
-    fprintf (out, "#include <math.h>\n");
-    fprintf (out, "#include <float.h>\n");
-    fprintf (out, "#include <locale.h>\n");
-    fprintf (out, "#include <errno.h>\n\n");
-    fprintf (out, "#include <assert.h>\n\n");
-    fprintf (out, "#include \"config.h\"\n\n");
-    fprintf (out, "#if defined(__MINGW32__) || defined(_WIN32)\n");
-    fprintf (out, "#define LIBICONV_STATIC\n");
-    fprintf (out, "#include <iconv.h>\n");
-    fprintf (out, "#define LIBCHARSET_STATIC\n");
-    fprintf (out, "#ifdef _MSC_VER\n");
-    fprintf (out, "/* <localcharset.h> isn't supported on OSGeo4W */\n");
-    fprintf (out, "/* applying a tricky workaround to fix this issue */\n");
-    fprintf (out, "extern const char * locale_charset (void);\n");
-    fprintf (out, "#else /* sane Windows - not OSGeo4W */\n");
-    fprintf (out, "#include <localcharset.h>\n");
-    fprintf (out, "#endif /* end localcharset */\n");
-    fprintf (out, "#else /* not WINDOWS */\n");
-    fprintf (out, "#if defined(__APPLE__) || defined(__ANDROID__)\n");
-    fprintf (out, "#include <iconv.h>\n");
-    fprintf (out, "#include <localcharset.h>\n");
-    fprintf (out, "#else /* not Mac OsX */\n");
-    fprintf (out, "#include <iconv.h>\n");
-    fprintf (out, "#include <langinfo.h>\n");
-    fprintf (out, "#endif\n#endif\n\n");
-    fprintf (out, "#if defined(_WIN32) || defined(WIN32)\n");
-    fprintf (out, "#include <io.h>\n");
-    fprintf (out, "#ifndef isatty\n");
-    fprintf (out, "#define isatty	_isatty\n");
-    fprintf (out, "#endif\n");
-    fprintf (out, "#ifndef fileno\n");
-    fprintf (out, "#define fileno	_fileno\n");
-    fprintf (out, "#endif\n");
-    fprintf (out, "#else\n");
-    fprintf (out, "#include <unistd.h>\n");
-    fprintf (out, "#endif\n\n");
-    fprintf (out, "#ifndef OMIT_GEOS	/* including GEOS */\n");
-    fprintf (out, "#include <geos_c.h>\n");
-    fprintf (out, "#endif\n\n");
-    fprintf (out, "#ifndef OMIT_PROJ	/* including PROJ.4 */\n");
-    fprintf (out, "#include <proj_api.h>\n");
-    fprintf (out, "#endif\n\n");
-    fprintf (out, "#ifndef OMIT_FREEXL	/* including FreeXL */\n");
-    fprintf (out, "#include <freexl.h>\n");
-    fprintf (out, "#endif\n\n");
-    fprintf (out, "#ifdef _WIN32\n");
-    fprintf (out, "#define strcasecmp\t_stricmp\n");
-    fprintf (out, "#define strncasecmp\t_strnicmp\n");
-    fprintf (out, "#define atoll\t_atoi64\n");
-    fprintf (out, "#endif /* not WIN32 */\n\n");
-    fprintf (out, "/*\n** alias MACROs to avoid any potential collision\n");
-    fprintf (out, "** for linker symbols declared into the sqlite3 code\n");
-    fprintf (out, "** internally embedded into SpatiaLite\n*/\n");
-    p = first;
-    while (p)
-      {
-	  char alias[1024];
-	  strcpy (alias, p->keyword);
-	  alias[0] = 'S';
-	  alias[1] = 'P';
-	  alias[2] = 'L';
-	  fprintf (out, "#define %s %s\n", p->keyword, alias);
-	  p = p->next;
-      }
-    fprintf (out, "/* end SpatiaLite/sqlite3 alias macros */\n\n");
-}
-
-static void
-do_note (FILE * out, const char *file, int mode)
-{
-/* begin/end file markerts */
-    if (mode)
-	fprintf (out, "/**************** End file: %s **********/\n\n", file);
-    else
-	fprintf (out, "\n/**************** Begin file: %s **********/\n", file);
-}
-
-static void
-do_sqlite3_dll (FILE * out, struct masked_keyword *first)
-{
-/* inserting #ifdef to build a Windows DLL */
-    struct masked_keyword *p;
-    fprintf (out, "#ifdef DLL_EXPORT\n");
-    fprintf (out, "#define SQLITE_API __declspec(dllexport)\n");
-    fprintf (out, "#else\n#define SQLITE_API\n#endif\n\n");
-    fprintf (out, "/*\n** the following macros ensure that the sqlite3\n");
-    fprintf (out, "** code internally embedded in SpatiaLite never defines\n");
-    fprintf (out, "** any linker symbol potentially conflicting with\n");
-    fprintf (out, "** an external sqlite3 library\n*/\n");
-    p = first;
-    while (p)
-      {
-	  char alias[1024];
-	  strcpy (alias, p->keyword);
-	  if (strcmp (alias, "sqlite3_column_database_name") == 0 ||
-	      strcmp (alias, "sqlite3_column_database_name16") == 0 ||
-	      strcmp (alias, "sqlite3_column_table_name") == 0 ||
-	      strcmp (alias, "sqlite3_column_table_name16") == 0 ||
-	      strcmp (alias, "sqlite3_column_origin_name") == 0 ||
-	      strcmp (alias, "sqlite3_column_origin_name16") == 0 ||
-	      strcmp (alias, "sqlite3_table_column_metadata") == 0)
-	    {
-/* avoiding to define METADATA symbols (usually disabled) */
-		p = p->next;
-		continue;
-	    }
-	  alias[0] = 'S';
-	  alias[1] = 'P';
-	  alias[2] = 'L';
-	  fprintf (out, "#define %s %s\n", p->keyword, alias);
-	  p = p->next;
-      }
-    fprintf (out, "/* End SpatiaLite alias-MACROs */\n\n");
-}
-
-static int
-is_header (const char *row)
-{
-/* checks for #include */
-    if (strncmp (row, "#include <inttypes.h>", 21) == 0)
-      {
-	  /* note well: inttypes.h must not be commented */
-	  return 0;
-      }
-    if (strlen (row) >= 8 && strncmp (row, "#include", 8) == 0)
-	return 1;
-    return 0;
-}
-
-static const char *
-check_autogenerated_path (const char *row)
-{
-/* checks for #include (autogenerated code) */
-    if (strncmp (row, "#include \"vanuatuWkt.h\"", 23) == 0)
-	return vanuatuWkt_h;
-    if (strncmp (row, "#include \"vanuatuWkt.c\"", 23) == 0)
-	return vanuatuWkt_c;
-    if (strncmp (row, "#include \"Ewkt.h\"", 17) == 0)
-	return Ewkt_h;
-    if (strncmp (row, "#include \"Ewkt.c\"", 17) == 0)
-	return Ewkt_c;
-    if (strncmp (row, "#include \"geoJSON.h\"", 20) == 0)
-	return geoJSON_h;
-    if (strncmp (row, "#include \"geoJSON.c\"", 20) == 0)
-	return geoJSON_c;
-    if (strncmp (row, "#include \"Kml.h\"", 16) == 0)
-	return Kml_h;
-    if (strncmp (row, "#include \"Kml.c\"", 16) == 0)
-	return Kml_c;
-    if (strncmp (row, "#include \"Gml.h\"", 16) == 0)
-	return Gml_h;
-    if (strncmp (row, "#include \"Gml.c\"", 16) == 0)
-	return Gml_c;
-    if (strncmp (row, "#include \"lex.VanuatuWkt.c\"", 27) == 0)
-	return lex_VanuatuWkt_c;
-    if (strncmp (row, "#include \"lex.Ewkt.c\"", 21) == 0)
-	return lex_Ewkt_c;
-    if (strncmp (row, "#include \"lex.GeoJson.c\"", 24) == 0)
-	return lex_GeoJson_c;
-    if (strncmp (row, "#include \"lex.Kml.c\"", 20) == 0)
-	return lex_Kml_c;
-    if (strncmp (row, "#include \"lex.Gml.c\"", 20) == 0)
-	return lex_Gml_c;
-    if (strncmp (row, "#include \"epsg_inlined.c\"", 25) == 0)
-	return epsg_inlined_c;
-    return NULL;
-}
-
-static void
-do_copy_sqlite (FILE * out, const char *basedir, const char *file)
-{
-/* copy the sqlite3.h header */
-    char input[1024];
-    char row[256];
-    char *p = row;
-    int c;
-    FILE *in;
-    strcpy (input, PREFIX);
-    strcat (input, basedir);
-    strcat (input, file);
-    in = fopen (input, "r");
-    if (!in)
-      {
-	  fprintf (stderr, "Error opening %s\n", input);
-	  return;
-      }
-    do_note (out, file, 0);
-    while ((c = getc (in)) != EOF)
-      {
-	  *p++ = c;
-	  if (c == '\n')
-	    {
-		*p = '\0';
-		p = row;
-		fprintf (out, "%s", row);
-	    }
-      }
-    fclose (in);
-    do_note (out, file, 1);
-}
-
-static void
-do_copy_plain (FILE * out, const char *file)
-{
-/* copy a source AS IS */
-    char input[1024];
-    int c;
-    FILE *in;
-    strcpy (input, PREFIX);
-    strcat (input, file);
-    in = fopen (input, "r");
-    if (!in)
-      {
-	  fprintf (stderr, "Error opening %s\n", input);
-	  return;
-      }
-    while ((c = getc (in)) != EOF)
-	putc (c, out);
-    fclose (in);
-}
-
-static void
-do_copy (FILE * out, const char *basedir, const char *file)
-{
-
-/* copy a source file suppressing the boiler-plate and headers */
-    char input[1024];
-    char row[256];
-    char *p = row;
-    int c;
-    int boiler_plate = 0;
-    int boiler_plate_found = 0;
-    FILE *in;
-    strcpy (input, PREFIX);
-    strcat (input, basedir);
-    strcat (input, file);
-    in = fopen (input, "r");
-    if (!in)
-      {
-	  fprintf (stderr, "Error opening %s\n", input);
-	  return;
-      }
-    do_note (out, file, 0);
-    while ((c = getc (in)) != EOF)
-      {
-	  *p++ = c;
-	  if (c == '\n')
-	    {
-		*p = '\0';
-		p = row;
-		if (!boiler_plate_found && strlen (row) >= 2
-		    && strncmp (row, "/*", 2) == 0)
-		  {
-		      boiler_plate_found = 1;
-		      boiler_plate = 1;
-		      continue;
-		  }
-		if (boiler_plate)
-		  {
-		      if (strlen (row) >= 2 && strncmp (row, "*/", 2) == 0)
-			  boiler_plate = 0;
-		      continue;
-		  }
-		if (is_header (row))
-		  {
-		      const char *auto_path = check_autogenerated_path (row);
-		      row[strlen (row) - 1] = '\0';
-		      fprintf (out, "/* %s */\n", row);
-		      if (auto_path != NULL)
-			  do_copy_plain (out, auto_path);
-		      continue;
-		  }
-		fprintf (out, "%s", row);
-	    }
-      }
-    fclose (in);
-    do_note (out, file, 1);
-}
-
-static void
-feed_export_keywords (char *row, struct masked_keyword **first,
-		      struct masked_keyword **last)
-{
-    struct masked_keyword *p;
-    char kw[1024];
-    int len;
-    int i;
-    int skip = 0;
-    int pos;
-    int end = (int) strlen (row);
-    for (i = 0; i < end; i++)
-      {
-	  if (row[i] == ' ' || row[i] == '\t')
-	      skip++;
-	  else
-	      break;
-      }
-    if (strncmp (row + skip, "SPATIALITE_DECLARE ", 19) == 0)
-	skip += 19;
-    else if (strncmp (row + skip, "GAIAAUX_DECLARE ", 16) == 0)
-	skip += 16;
-    else if (strncmp (row + skip, "GAIAEXIF_DECLARE ", 17) == 0)
-	skip += 17;
-    else if (strncmp (row + skip, "GAIAGEO_DECLARE ", 16) == 0)
-	skip += 16;
-    else
-	return;
-
-    if (strncmp (row + skip, "const char *", 12) == 0)
-	pos = skip + 12;
-    else if (strncmp (row + skip, "unsigned char ", 14) == 0)
-	pos = skip + 14;
-    else if (strncmp (row + skip, "unsigned short ", 15) == 0)
-	pos = skip + 15;
-    else if (strncmp (row + skip, "unsigned int ", 13) == 0)
-	pos = skip + 13;
-    else if (strncmp (row + skip, "char *", 6) == 0)
-	pos = skip + 6;
-    else if (strncmp (row + skip, "void *", 6) == 0)
-	pos = skip + 6;
-    else if (strncmp (row + skip, "void ", 5) == 0)
-	pos = skip + 5;
-    else if (strncmp (row + skip, "int ", 4) == 0)
-	pos = skip + 4;
-    else if (strncmp (row + skip, "double ", 7) == 0)
-	pos = skip + 7;
-    else if (strncmp (row + skip, "float ", 6) == 0)
-	pos = skip + 6;
-    else if (strncmp (row + skip, "short ", 6) == 0)
-	pos = skip + 6;
-    else if (strncmp (row + skip, "sqlite3_int64 ", 14) == 0)
-	pos = skip + 14;
-    else if (strncmp (row + skip, "gaiaPointPtr ", 13) == 0)
-	pos = skip + 13;
-    else if (strncmp (row + skip, "gaiaLinestringPtr ", 18) == 0)
-	pos = skip + 18;
-    else if (strncmp (row + skip, "gaiaPolygonPtr ", 15) == 0)
-	pos = skip + 15;
-    else if (strncmp (row + skip, "gaiaRingPtr ", 12) == 0)
-	pos = skip + 12;
-    else if (strncmp (row + skip, "gaiaGeomCollPtr ", 16) == 0)
-	pos = skip + 16;
-    else if (strncmp (row + skip, "gaiaDynamicLinePtr ", 19) == 0)
-	pos = skip + 19;
-    else if (strncmp (row + skip, "gaiaDbfFieldPtr ", 16) == 0)
-	pos = skip + 16;
-    else if (strncmp (row + skip, "gaiaValuePtr ", 13) == 0)
-	pos = skip + 13;
-    else if (strncmp (row + skip, "gaiaExifTagListPtr ", 19) == 0)
-	pos = skip + 19;
-    else if (strncmp (row + skip, "gaiaExifTagPtr ", 15) == 0)
-	pos = skip + 15;
-    else
-	return;
-
-    for (i = pos; i < end; i++)
-      {
-	  if (row[i] == ' ' || row[i] == '(' || row[i] == '[' || row[i] == ';')
-	    {
-		end = i;
-		break;
-	    }
-      }
-    len = end - pos;
-    memcpy (kw, row + pos, len);
-    kw[len] = '\0';
-    p = *first;
-    while (p)
-      {
-	  if (strcmp (p->keyword, kw) == 0)
-	      return;
-	  p = p->next;
-      }
-    p = malloc (sizeof (struct masked_keyword));
-    p->keyword = malloc (len + 1);
-    strcpy (p->keyword, kw);
-    p->next = NULL;
-    if (*first == NULL)
-	*first = p;
-    if (*last != NULL)
-	(*last)->next = p;
-    *last = p;
-}
-
-static void
-do_copy_export (FILE * out, const char *file, struct masked_keyword **first,
-		struct masked_keyword **last)
-{
-/* copy a source AS IS */
-    char input[1024];
-    char row[1024];
-    char *p = row;
-    int c;
-    FILE *in;
-    strcpy (input, PREFIX);
-    strcat (input, file);
-    in = fopen (input, "r");
-    if (!in)
-      {
-	  fprintf (stderr, "Error opening %s\n", input);
-	  return;
-      }
-    while ((c = getc (in)) != EOF)
-      {
-	  if (c == '\n')
-	    {
-		*p = '\0';
-		feed_export_keywords (row, first, last);
-		fprintf (out, "%s\n", row);
-		p = row;
-		continue;
-	    }
-	  else
-	      *p++ = c;
-      }
-    fclose (in);
-}
-
-static void
-do_copy_header (FILE * out, const char *file, struct masked_keyword *first)
-{
-/* copy a source AS IS */
-    struct masked_keyword *p;
-    char input[1024];
-    int c;
-    FILE *in;
-    strcpy (input, PREFIX);
-    strcat (input, file);
-    in = fopen (input, "r");
-    if (!in)
-      {
-	  fprintf (stderr, "Error opening %s\n", input);
-	  return;
-      }
-    fprintf (out, "/*\n** alias MACROs to avoid any potential collision\n");
-    fprintf (out, "** for linker symbols declared into the sqlite3 code\n");
-    fprintf (out, "** internally embedded into SpatiaLite\n*/\n");
-    p = first;
-    while (p)
-      {
-	  char alias[1024];
-	  strcpy (alias, p->keyword);
-	  alias[0] = 'S';
-	  alias[1] = 'P';
-	  alias[2] = 'L';
-	  fprintf (out, "#define %s %s\n", p->keyword, alias);
-	  p = p->next;
-      }
-    fprintf (out, "/* end SpatiaLite/sqlite3 alias macros */\n\n");
-    while ((c = getc (in)) != EOF)
-	putc (c, out);
-    fclose (in);
-}
-
-static void
-feed_masked_keywords (char *row, int pos, struct masked_keyword **first,
-		      struct masked_keyword **last)
-{
-    struct masked_keyword *p;
-    char kw[1024];
-    int len;
-    int i;
-    int end = (int) strlen (row);
-    for (i = pos; i < end; i++)
-      {
-	  if (row[i] == ' ' || row[i] == '(' || row[i] == '[' || row[i] == ';')
-	    {
-		end = i;
-		break;
-	    }
-      }
-    len = end - pos;
-    memcpy (kw, row + pos, len);
-    kw[len] = '\0';
-
-/*
-** caveat: this symbol is abdolutely required by loadable extension modules 
-** and must *never* be masked
-*/
-    if (strcmp (kw, "sqlite3_extension_init") == 0)
-	return;
-
-    p = *first;
-    while (p)
-      {
-	  if (strcmp (p->keyword, kw) == 0)
-	      return;
-	  p = p->next;
-      }
-    p = malloc (sizeof (struct masked_keyword));
-    p->keyword = malloc (len + 1);
-    strcpy (p->keyword, kw);
-    p->next = NULL;
-    if (*first == NULL)
-	*first = p;
-    if (*last != NULL)
-	(*last)->next = p;
-    *last = p;
-}
-
-static void
-prepare_masked (const char *file, struct masked_keyword **first,
-		struct masked_keyword **last)
-{
-/* feeding the ALIAS-macros */
-    char input[1024];
-    char row[1024];
-    char *p = row;
-    int c;
-    FILE *in;
-    strcpy (input, PREFIX);
-    strcat (input, file);
-    in = fopen (input, "r");
-    if (!in)
-      {
-	  fprintf (stderr, "Error opening %s\n", input);
-	  return;
-      }
-    while ((c = getc (in)) != EOF)
-      {
-	  if (c == '\n')
-	    {
-		*p = '\0';
-		if (strncmp (row, "SQLITE_API int ", 15) == 0)
-		    feed_masked_keywords (row, 15, first, last);
-		else if (strncmp (row, "SQLITE_API double ", 18) == 0)
-		    feed_masked_keywords (row, 18, first, last);
-		else if (strncmp (row, "SQLITE_API void *", 17) == 0)
-		    feed_masked_keywords (row, 17, first, last);
-		else if (strncmp (row, "SQLITE_API void ", 16) == 0)
-		    feed_masked_keywords (row, 16, first, last);
-		else if (strncmp (row, "SQLITE_API char *", 17) == 0)
-		    feed_masked_keywords (row, 17, first, last);
-		else if (strncmp (row, "SQLITE_API const void *", 23) == 0)
-		    feed_masked_keywords (row, 23, first, last);
-		else if (strncmp (row, "SQLITE_API const char *", 23) == 0)
-		    feed_masked_keywords (row, 23, first, last);
-		else if (strncmp (row, "SQLITE_API const char ", 22) == 0)
-		    feed_masked_keywords (row, 22, first, last);
-		else if (strncmp (row, "SQLITE_API const unsigned char *", 32)
-			 == 0)
-		    feed_masked_keywords (row, 32, first, last);
-		else if (strncmp (row, "SQLITE_API sqlite3_int64 ", 25) == 0)
-		    feed_masked_keywords (row, 25, first, last);
-		else if (strncmp (row, "SQLITE_API sqlite3_value *", 26) == 0)
-		    feed_masked_keywords (row, 26, first, last);
-		else if (strncmp (row, "SQLITE_API sqlite3_backup *", 27) == 0)
-		    feed_masked_keywords (row, 27, first, last);
-		else if (strncmp (row, "SQLITE_API sqlite3_mutex *", 26) == 0)
-		    feed_masked_keywords (row, 26, first, last);
-		else if (strncmp (row, "SQLITE_API sqlite3_stmt *", 25) == 0)
-		    feed_masked_keywords (row, 25, first, last);
-		else if (strncmp (row, "SQLITE_API sqlite3_vfs *", 24) == 0)
-		    feed_masked_keywords (row, 24, first, last);
-		else if (strncmp (row, "SQLITE_API sqlite3 *", 20) == 0)
-		    feed_masked_keywords (row, 20, first, last);
-		p = row;
-		continue;
-	    }
-	  else
-	      *p++ = c;
-      }
-    fclose (in);
-}
-
-static void
-do_copy_ext (FILE * out, const char *basedir, const char *file)
-{
-/* copy the sqlite3ext.h header */
-    char input[1024];
-    char row[1024];
-    char *p = row;
-    int c;
-    FILE *in;
-    strcpy (input, PREFIX);
-    strcat (input, basedir);
-    strcat (input, file);
-    in = fopen (input, "r");
-    if (!in)
-      {
-	  fprintf (stderr, "Error opening %s\n", input);
-	  return;
-      }
-    do_note (out, file, 0);
-    while ((c = getc (in)) != EOF)
-      {
-	  if (c == '\n')
-	    {
-		*p = '\0';
-		if (strlen (row) > 16)
-		  {
-		      if (strncmp (row, "#define sqlite3_", 16) == 0)
-			{
-			    row[8] = 'S';
-			    row[9] = 'P';
-			    row[10] = 'L';
-			}
-		  }
-		if (strcmp (row, "#include \"sqlite3.h\"") == 0)
-		    fprintf (out, "/* %s */\n", row);
-		else
-		    fprintf (out, "%s\n", row);
-		p = row;
-		continue;
-	    }
-	  else
-	      *p++ = c;
-      }
-    fclose (in);
-    do_note (out, file, 1);
-}
-
-static void
-do_makefile (FILE * out)
-{
-/* generating the Makefile.am for headers */
-    fprintf (out, "\nnobase_include_HEADERS = \\\n");
-    fprintf (out, "\tspatialite.h \\\n");
-    fprintf (out, "\tspatialite/gaiaexif.h \\\n");
-    fprintf (out, "\tspatialite/gaiaaux.h \\\n");
-    fprintf (out, "\tspatialite/gaiageo.h \\\n");
-    fprintf (out, "\tspatialite/gg_const.h \\\n");
-    fprintf (out, "\tspatialite/gg_structs.h \\\n");
-    fprintf (out, "\tspatialite/gg_core.h \\\n");
-    fprintf (out, "\tspatialite/gg_mbr.h \\\n");
-    fprintf (out, "\tspatialite/gg_formats.h \\\n");
-    fprintf (out, "\tspatialite/gg_dynamic.h \\\n");
-    fprintf (out, "\tspatialite/gg_advanced.h \\\n");
-    fprintf (out, "\tspatialite/sqlite3.h \\\n");
-    fprintf (out, "\tspatialite/sqlite3ext.h \\\n");
-    fprintf (out, "\tspatialite/spatialite.h \\\n");
-    fprintf (out, "\tspatialite/sqlite.h \\\n");
-    fprintf (out, "\tspatialite/debug.h\n");
-}
-
-static void
-free_masked_keywords (struct masked_keyword *first,
-		      struct masked_keyword *first_defn)
-{
-    struct masked_keyword *p = first;
-    struct masked_keyword *pn;
-    while (p)
-      {
-/* freeing masked keywords */
-	  pn = p->next;
-	  free (p->keyword);
-	  free (p);
-	  p = pn;
-      }
-    p = first_defn;
-    while (p)
-      {
-/* freeing export keyworks */
-	  pn = p->next;
-	  free (p->keyword);
-	  free (p);
-	  p = pn;
-      }
-}
-
-int
-main ()
-{
-    struct masked_keyword *first = NULL;
-    struct masked_keyword *last = NULL;
-    struct masked_keyword *first_def = NULL;
-    struct masked_keyword *last_def = NULL;
-    FILE *out;
-
-/* produces the AMALGAMATION */
-    mkdir ("amalgamation", 0777);
-    mkdir ("amalgamation/headers", 0777);
-    mkdir ("amalgamation/headers/spatialite", 0777);
-/* amalgamating SpatiaLite */
-    prepare_masked ("/sqlite3/sqlite3.c", &first, &last);
-    out = fopen ("amalgamation/spatialite.c", "wb");
-    if (!out)
-      {
-	  fprintf (stderr, "Error opening amalgamation/amalgamation.c\n");
-	  return 1;
-      }
-    do_headers (out, first);
-    do_copy_sqlite (out, "/headers/spatialite/", "sqlite3.h");
-    do_copy_ext (out, "/headers/spatialite/", "sqlite3ext.h");
-    do_copy (out, "/headers/", "spatialite.h");
-    do_copy (out, "/headers/spatialite/", "gaiaaux.h");
-    do_copy (out, "/headers/spatialite/", "gaiaexif.h");
-    do_copy (out, "/headers/spatialite/", "gaiageo.h");
-    do_copy (out, "/headers/spatialite/", "gg_const.h");
-    do_copy (out, "/headers/spatialite/", "gg_structs.h");
-    do_copy (out, "/headers/spatialite/", "gg_core.h");
-    do_copy (out, "/headers/spatialite/", "gg_mbr.h");
-    do_copy (out, "/headers/spatialite/", "gg_formats.h");
-    do_copy (out, "/headers/spatialite/", "gg_dynamic.h");
-    do_copy (out, "/headers/spatialite/", "gg_advanced.h");
-    do_copy (out, "/headers/spatialite/", "spatialite.h");
-    do_copy (out, "/headers/spatialite/", "sqlite.h");
-    do_copy (out, "/headers/spatialite/", "debug.h");
-    do_copy (out, "/gaiaaux/", "gg_sqlaux.c");
-    do_copy (out, "/gaiaaux/", "gg_utf8.c");
-    do_copy (out, "/gaiaexif/", "gaia_exif.c");
-    do_copy (out, "/gaiageo/", "gg_advanced.c");
-    do_copy (out, "/gaiageo/", "gg_endian.c");
-    do_copy (out, "/gaiageo/", "gg_geometries.c");
-    do_copy (out, "/gaiageo/", "gg_relations.c");
-    do_copy (out, "/gaiageo/", "gg_geoscvt.c");
-    do_copy (out, "/gaiageo/", "gg_shape.c");
-    do_copy (out, "/gaiageo/", "gg_transform.c");
-    do_copy (out, "/gaiageo/", "gg_wkb.c");
-    do_copy (out, "/gaiageo/", "gg_geodesic.c");
-    do_copy (out, "/spatialite/", "spatialite.c");
-    do_copy (out, "/spatialite/", "mbrcache.c");
-    do_copy (out, "/spatialite/", "virtualshape.c");
-    do_copy (out, "/spatialite/", "virtualdbf.c");
-    do_copy (out, "/spatialite/", "virtualXL.c");
-    do_copy (out, "/spatialite/", "virtualnetwork.c");
-    do_copy (out, "/spatialite/", "virtualspatialindex.c");
-    do_copy (out, "/spatialite/", "virtualfdo.c");
-    do_copy (out, "/virtualtext/", "virtualtext.c");
-    do_copy (out, "/versioninfo/", "version.c");
-    do_copy (out, "/gaiageo/", "gg_wkt.c");
-    do_copy (out, "/srsinit/", "srs_init.c");
-    do_copy (out, "/shapefiles/", "shapefiles.c");
-    do_copy (out, "/gaiageo/", "gg_vanuatu.c");
-    do_copy (out, "/gaiageo/", "gg_ewkt.c");
-    do_copy (out, "/gaiageo/", "gg_geoJSON.c");
-    do_copy (out, "/gaiageo/", "gg_kml.c");
-    do_copy (out, "/gaiageo/", "gg_gml.c");
-    fclose (out);
-
-/* setting up the HEADERS */
-    out = fopen ("amalgamation/headers/spatialite/sqlite3.h", "wb");
-    if (!out)
-      {
-	  fprintf (stderr,
-		   "Error opening amalgamation/headers/spatialite/sqlite3.h\n");
-	  return 1;
-      }
-    do_copy_header (out, "/headers/spatialite/sqlite3.h", first);
-    fclose (out);
-    out = fopen ("amalgamation/headers/spatialite/sqlite3ext.h", "wb");
-    if (!out)
-      {
-	  fprintf (stderr,
-		   "Error opening amalgamation/headers/spatialite/sqlite3.h\n");
-	  return 1;
-      }
-    do_copy_header (out, "/headers/spatialite/sqlite3ext.h", first);
-    fclose (out);
-    out = fopen ("amalgamation/sqlite3.c", "wb");
-    if (!out)
-      {
-	  fprintf (stderr, "Error opening amalgamation/sqlite3.c\n");
-	  return 1;
-      }
-    do_sqlite3_dll (out, first);
-    prepare_masked ("/sqlite3/sqlite3.c", &first, &last);
-    do_copy_plain (out, "/sqlite3/sqlite3.c");
-    fclose (out);
-    out = fopen ("amalgamation/headers/spatialite/gaiaaux.h", "wb");
-    if (!out)
-      {
-	  fprintf (stderr,
-		   "Error opening amalgamation/headers/spatialite/gaiaaux.h\n");
-	  return 1;
-      }
-    do_copy_export (out, "/headers/spatialite/gaiaaux.h", &first_def,
-		    &last_def);
-    fclose (out);
-    out = fopen ("amalgamation/headers/spatialite/gaiageo.h", "wb");
-    if (!out)
-      {
-	  fprintf (stderr,
-		   "Error opening amalgamation/headers/spatialite/gaiageo.h\n");
-	  return 1;
-      }
-    do_copy_export (out, "/headers/spatialite/gaiageo.h", &first_def,
-		    &last_def);
-    fclose (out);
-    out = fopen ("amalgamation/headers/spatialite/gg_const.h", "wb");
-    if (!out)
-      {
-	  fprintf (stderr,
-		   "Error opening amalgamation/headers/spatialite/gg_const.h\n");
-	  return 1;
-      }
-    do_copy_export (out, "/headers/spatialite/gg_const.h", &first_def,
-		    &last_def);
-    fclose (out);
-    out = fopen ("amalgamation/headers/spatialite/gg_structs.h", "wb");
-    if (!out)
-      {
-	  fprintf (stderr,
-		   "Error opening amalgamation/headers/spatialite/gg_structs.h\n");
-	  return 1;
-      }
-    do_copy_export (out, "/headers/spatialite/gg_structs.h", &first_def,
-		    &last_def);
-    fclose (out);
-    out = fopen ("amalgamation/headers/spatialite/gg_core.h", "wb");
-    if (!out)
-      {
-	  fprintf (stderr,
-		   "Error opening amalgamation/headers/spatialite/gg_core.h\n");
-	  return 1;
-      }
-    do_copy_export (out, "/headers/spatialite/gg_core.h", &first_def,
-		    &last_def);
-    fclose (out);
-    out = fopen ("amalgamation/headers/spatialite/gg_mbr.h", "wb");
-    if (!out)
-      {
-	  fprintf (stderr,
-		   "Error opening amalgamation/headers/spatialite/gg_mbr.h\n");
-	  return 1;
-      }
-    do_copy_export (out, "/headers/spatialite/gg_mbr.h", &first_def, &last_def);
-    fclose (out);
-    out = fopen ("amalgamation/headers/spatialite/gg_formats.h", "wb");
-    if (!out)
-      {
-	  fprintf (stderr,
-		   "Error opening amalgamation/headers/spatialite/gg_formats.h\n");
-	  return 1;
-      }
-    do_copy_export (out, "/headers/spatialite/gg_formats.h", &first_def,
-		    &last_def);
-    fclose (out);
-    out = fopen ("amalgamation/headers/spatialite/gg_dynamic.h", "wb");
-    if (!out)
-      {
-	  fprintf (stderr,
-		   "Error opening amalgamation/headers/spatialite/gg_dynamic.h\n");
-	  return 1;
-      }
-    do_copy_export (out, "/headers/spatialite/gg_dynamic.h", &first_def,
-		    &last_def);
-    fclose (out);
-    out = fopen ("amalgamation/headers/spatialite/gg_advanced.h", "wb");
-    if (!out)
-      {
-	  fprintf (stderr,
-		   "Error opening amalgamation/headers/spatialite/gg_advanced.h\n");
-	  return 1;
-      }
-    do_copy_export (out, "/headers/spatialite/gg_advanced.h", &first_def,
-		    &last_def);
-    fclose (out);
-    out = fopen ("amalgamation/headers/spatialite/gaiaexif.h", "wb");
-    if (!out)
-      {
-	  fprintf (stderr,
-		   "Error opening amalgamation/headers/spatialite/gaiaexif.h\n");
-	  return 1;
-      }
-    do_copy_export (out, "/headers/spatialite/gaiaexif.h", &first_def,
-		    &last_def);
-    fclose (out);
-    out = fopen ("amalgamation/headers/spatialite/spatialite.h", "wb");
-    if (!out)
-      {
-	  fprintf (stderr,
-		   "Error opening amalgamation/headers/spatialite/spatialite.h\n");
-	  return 1;
-      }
-    do_copy_export (out, "/headers/spatialite/spatialite.h", &first_def,
-		    &last_def);
-    fclose (out);
-    out = fopen ("amalgamation/headers/spatialite/sqlite.h", "wb");
-    if (!out)
-      {
-	  fprintf (stderr,
-		   "Error opening amalgamation/headers/spatialite/sqlite.h\n");
-	  return 1;
-      }
-    do_copy_export (out, "/headers/spatialite/sqlite.h", &first_def, &last_def);
-    fclose (out);
-    out = fopen ("amalgamation/headers/spatialite/debug.h", "wb");
-    if (!out)
-      {
-	  fprintf (stderr,
-		   "Error opening amalgamation/headers/spatialite/debug.h\n");
-	  return 1;
-      }
-    do_copy_export (out, "/headers/spatialite/debug.h", &first_def, &last_def);
-    fclose (out);
-    out = fopen ("amalgamation/headers/spatialite.h", "wb");
-    if (!out)
-      {
-	  fprintf (stderr, "Error opening amalgamation/headers/spatialite.h\n");
-	  return 1;
-      }
-    do_copy_export (out, "/headers/spatialite.h", &first_def, &last_def);
-    fclose (out);
-    out = fopen ("amalgamation/headers/Makefile.am", "wb");
-    if (!out)
-      {
-	  fprintf (stderr, "Error opening amalgamation/headers/Makefile.am\n");
-	  return 1;
-      }
-    do_makefile (out);
-    fclose (out);
-
-/* setting up the AUTOMAKE stuff */
-    out = fopen ("amalgamation/AUTHORS", "wb");
-    if (!out)
-      {
-	  fprintf (stderr, "Error opening amalgamation/AUTHORS\n");
-	  return 1;
-      }
-    do_copy_plain (out, "/automake/AUTHORS");
-    fclose (out);
-    out = fopen ("amalgamation/COPYING", "wb");
-    if (!out)
-      {
-	  fprintf (stderr, "Error opening amalgamation/COPYING\n");
-	  return 1;
-      }
-    do_copy_plain (out, "/automake/COPYING");
-    fclose (out);
-    out = fopen ("amalgamation/INSTALL", "wb");
-    if (!out)
-      {
-	  fprintf (stderr, "Error opening amalgamation/INSTALL\n");
-	  return 1;
-      }
-    do_copy_plain (out, "/automake/INSTALL");
-    fclose (out);
-    out = fopen ("amalgamation/README", "wb");
-    if (!out)
-      {
-	  fprintf (stderr, "Error opening amalgamation/README\n");
-	  return 1;
-      }
-    do_copy_plain (out, "/automake/README");
-    fclose (out);
-    out = fopen ("amalgamation/configure.ac", "wb");
-    if (!out)
-      {
-	  fprintf (stderr, "Error opening amalgamation/configure.ac\n");
-	  return 1;
-      }
-    do_copy_plain (out, "/automake/configure.ac");
-    fclose (out);
-    out = fopen ("amalgamation/Makefile.am", "wb");
-    if (!out)
-      {
-	  fprintf (stderr, "Error opening amalgamation/Makefile.am\n");
-	  return 1;
-      }
-    do_copy_plain (out, "/automake/Makefile.am");
-    fclose (out);
-    out = fopen ("amalgamation/makefile.vc", "wb");
-    if (!out)
-      {
-	  fprintf (stderr, "Error opening amalgamation/makefile.vc\n");
-	  return 1;
-      }
-    do_copy_plain (out, "/automake/makefile.vc");
-    fclose (out);
-    out = fopen ("amalgamation/nmake.opt", "wb");
-    if (!out)
-      {
-	  fprintf (stderr, "Error opening amalgamation/nmake.opt\n");
-	  return 1;
-      }
-    do_copy_plain (out, "/automake/nmake.opt");
-    out = fopen ("amalgamation/spatialite.pc.in", "wb");
-    if (!out)
-      {
-	  fprintf (stderr, "Error opening amalgamation/spatialite.pc.in\n");
-	  return 1;
-      }
-    do_copy_plain (out, "/automake/spatialite.pc.in");
-    fclose (out);
-    out = fopen ("amalgamation/auto-sh", "wb");
-    if (!out)
-      {
-	  fprintf (stderr, "Error opening amalgamation/auto-sh\n");
-	  return 1;
-      }
-    do_auto_sh (out);
-    fclose (out);
-    out = fopen ("amalgamation/spatialite-sql-latest.html", "wb");
-    if (!out)
-      {
-	  fprintf (stderr,
-		   "Error opening amalgamation/spatialite-sql-latest.html\n");
-	  return 1;
-      }
-    do_copy_plain (out, "/../spatialite-sql-latest.html");
-    fclose (out);
-    free_masked_keywords (first, first_def);
-    return 0;
-}
diff --git a/compile b/compile
new file mode 100755
index 0000000..a85b723
--- /dev/null
+++ b/compile
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey at cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake at gnu.org> or send patches to
+# <automake-patches at gnu.org>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv/,$2, in
+	*,$file_conv,*)
+	  ;;
+	mingw/*)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin/*)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine/*)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+    if test -f "$dir/lib$lib.a"; then
+      found=yes
+      lib=$dir/lib$lib.a
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+    if test -n "$eat"; then
+      eat=
+    else
+      case $1 in
+	-o)
+	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
+	  eat=1
+	  case $2 in
+	    *.o | *.[oO][bB][jJ])
+	      func_file_conv "$2"
+	      set x "$@" -Fo"$file"
+	      shift
+	      ;;
+	    *)
+	      func_file_conv "$2"
+	      set x "$@" -Fe"$file"
+	      shift
+	      ;;
+	  esac
+	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-l*)
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
+	-L*)
+	  func_cl_dashL "${1#-L}"
+	  ;;
+	-static)
+	  shared=false
+	  ;;
+	-Wl,*)
+	  arg=${1#-Wl,}
+	  save_ifs="$IFS"; IFS=','
+	  for flag in $arg; do
+	    IFS="$save_ifs"
+	    linker_opts="$linker_opts $flag"
+	  done
+	  IFS="$save_ifs"
+	  ;;
+	-Xlinker)
+	  eat=1
+	  linker_opts="$linker_opts $2"
+	  ;;
+	-*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+	  func_file_conv "$1"
+	  set x "$@" -Tp"$file"
+	  shift
+	  ;;
+	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+	  func_file_conv "$1" mingw
+	  set x "$@" "$file"
+	  shift
+	  ;;
+	*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+      esac
+    fi
+    shift
+  done
+  if test -n "$linker_opts"; then
+    linker_opts="-link$linker_opts"
+  fi
+  exec "$@" $linker_opts
+  exit 1
+}
+
+eat=
+
+case $1 in
+  '')
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <bug-automake at gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+    func_cl_wrapper "$@"      # Doesn't return...
+    ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as 'compile cc -o foo foo.c'.
+	# So we strip '-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no '-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # '.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/configure b/configure
index 3b603fb..72c109d 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libspatialite 4.4.0-RC0.
+# Generated by GNU Autoconf 2.69 for libspatialite 4.4.0-RC1.
 #
 # Report bugs to <a.furieri at lqt.it>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libspatialite'
 PACKAGE_TARNAME='libspatialite'
-PACKAGE_VERSION='4.4.0-RC0'
-PACKAGE_STRING='libspatialite 4.4.0-RC0'
+PACKAGE_VERSION='4.4.0-RC1'
+PACKAGE_STRING='libspatialite 4.4.0-RC1'
 PACKAGE_BUGREPORT='a.furieri at lqt.it'
 PACKAGE_URL=''
 
@@ -1369,7 +1369,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libspatialite 4.4.0-RC0 to adapt to many kinds of systems.
+\`configure' configures libspatialite 4.4.0-RC1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1439,7 +1439,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libspatialite 4.4.0-RC0:";;
+     short | recursive ) echo "Configuration of libspatialite 4.4.0-RC1:";;
    esac
   cat <<\_ACEOF
 
@@ -1581,7 +1581,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libspatialite configure 4.4.0-RC0
+libspatialite configure 4.4.0-RC1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2171,7 +2171,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libspatialite $as_me 4.4.0-RC0, which was
+It was created by libspatialite $as_me 4.4.0-RC1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3042,7 +3042,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libspatialite'
- VERSION='4.4.0-RC0'
+ VERSION='4.4.0-RC1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17414,7 +17414,7 @@ else
 fi
 
 
-ac_config_files="$ac_config_files Makefile src/Makefile src/headers/Makefile src/gaiaaux/Makefile src/gaiaexif/Makefile src/gaiageo/Makefile src/gaiageo/flex/Makefile src/gaiageo/lemon/Makefile src/gaiageo/lemon/lemon_src/Makefile src/geopackage/Makefile src/spatialite/Makefile src/shapefiles/Makefile src/dxf/Makefile src/md5/Makefile src/control_points/Makefile src/cutter/Makefile src/topology/Makefile src/srsinit/Makefile src/srsinit/epsg_update/Makefile src/connection_cache/Makefile s [...]
+ac_config_files="$ac_config_files Makefile src/Makefile src/headers/Makefile src/gaiaaux/Makefile src/gaiaexif/Makefile src/gaiageo/Makefile src/gaiageo/flex/Makefile src/gaiageo/lemon/Makefile src/gaiageo/lemon/lemon_src/Makefile src/geopackage/Makefile src/spatialite/Makefile src/shapefiles/Makefile src/dxf/Makefile src/md5/Makefile src/control_points/Makefile src/cutter/Makefile src/topology/Makefile src/srsinit/Makefile src/srsinit/epsg_update/Makefile src/connection_cache/Makefile s [...]
 
 
 # exporting the TARGET_CPU string
@@ -19408,7 +19408,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libspatialite $as_me 4.4.0-RC0, which was
+This file was extended by libspatialite $as_me 4.4.0-RC1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19474,7 +19474,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libspatialite config.status 4.4.0-RC0
+libspatialite config.status 4.4.0-RC1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -20023,7 +20023,9 @@ do
     "test/sql_stmt_xmlsec_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_xmlsec_tests/Makefile" ;;
     "test/sql_stmt_freexl_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_freexl_tests/Makefile" ;;
     "test/sql_stmt_cache_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_cache_tests/Makefile" ;;
+    "test/sql_stmt_gpkgcache_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_gpkgcache_tests/Makefile" ;;
     "test/sql_stmt_nocache_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_nocache_tests/Makefile" ;;
+    "test/sql_stmt_gpkgnocache_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_gpkgnocache_tests/Makefile" ;;
     "test/sql_stmt_voronoj1_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_voronoj1_tests/Makefile" ;;
     "test/sql_stmt_voronoj2_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_voronoj2_tests/Makefile" ;;
     "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index 8a0a7b6..6f88ec5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT(libspatialite, 4.4.0-RC0, a.furieri at lqt.it)
+AC_INIT(libspatialite, 4.4.0-RC1, a.furieri at lqt.it)
 AC_LANG(C)
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -148,7 +148,9 @@ AC_CONFIG_FILES([Makefile \
 		test/sql_stmt_xmlsec_tests/Makefile \
 		test/sql_stmt_freexl_tests/Makefile \
 		test/sql_stmt_cache_tests/Makefile \
+		test/sql_stmt_gpkgcache_tests/Makefile \
 		test/sql_stmt_nocache_tests/Makefile \
+		test/sql_stmt_gpkgnocache_tests/Makefile \
 		test/sql_stmt_voronoj1_tests/Makefile \
 		test/sql_stmt_voronoj2_tests/Makefile \
 		examples/Makefile \
diff --git a/examples/HOW-TO-BUILD.txt b/examples/HOW-TO-BUILD.txt
deleted file mode 100644
index 16f2eee..0000000
--- a/examples/HOW-TO-BUILD.txt
+++ /dev/null
@@ -1,137 +0,0 @@
-Basically you can build the demo C programs simply 
-using the C compiler alone [there is no need to use 
-a Makefile], as in:
-
-gcc -Wall demo1.c -o demo1
-
-but unhappily you can't follow a so simplistic approach
-
-Step 1:
--------
-you have to instruct the C compiler about location 
-of any required header file and library to link; 
-you do this setting -Ipath_include and -Lpath_lib 
-directives [actual paths depends on your locale 
-file system layout]
-
-Step 2:
--------
-you have to instruct the C compiler about location
-and type of external libraries you have to link.
-you can build an executable binary in two alternative
-ways:
-a) you can link STATIC libraries, thus obtaining a
-   monolithic executable, with no external dependencies
-   [this will produce a bigger sized executable, but
-    will strongly simplify following installation and
-    deployment steps]
-b) you can link DYNAMIC / SHARED libraries, thus
-   obtaining an executable requiring external dependencies
-   to be resolved at run time
-   [this will produce a smallest sized executable, but
-    you have then to face quite complex problems in the
-    installation and deployment steps]
-Both static and shared linkage modes have pros and cons;
-choosing the one or the other depends on your specific 
-needs.
-There are several way to set DYNAMIC or STATIC linkage,
-but the simplest one is:
-gcc -dynamic ...
-   or
-gcc -static ...
-The -dynamic option is the default one, so you simply can use:
-gcc ...
-in order to select DYNAMIC linkage.
-A different approach is to directly link the static libraries,
-directly referring their paths.
-
->>>
->>> following examples are assuming:
->>> 1. that you have installed any required dependency for the 
->>>    specific platform you are using to compile 
->>> 2. you have placed all this stuff under /usr/local/include
->>>    and /usr/local/lib
->>>    if not, you have to accommodate paths in order to match
->>>    your locale file system layout
->>>
-
-Building on Linux systems:
-=================================================
-
-static linkage:
----------------
-
-gcc -Wall -I/usr/local/include demo1.c -o demo1 \
-    /usr/local/lib/libspatialite.a \
-    /usr/local/lib/libsqlite3.a \
-    /usr/local/lib/libgeos_c.a \
-    /usr/local/lib/libgeos.a \
-    /usr/local/lib/libproj.a \
-    -lm -lstdc++ -lpthread -ldl
-
-dynamic linkage:
-----------------
-
-gcc -Wall -I/usr/local/include -L/usr/local/lib demo1.c \
-    -o demo1.exe -lspatialite
-
- 
-Building on Windows systems:
-=================================================
-
->>>
->>> requires the MinGW compiler
->>> and the MSys command shell
->>>
->>> on the standard MSys setup,
->>>     /usr/local/ 
->>> corresponds to
->>>     C:\msys\1.0\local or C:\msys\local
->>>
-
-static linkage:
----------------
-
-gcc -static -Wall -I/usr/local/include -L/usr/local/lib \
-    demo1.c -o demo1.exe \
-    -lspatialite -liconv -lproj -lgeos_c -lgeos \
-    -lm -lstdc++
-
-dynamic linkage:
-----------------
-
-gcc -Wall -I/usr/local/include -L/usr/local/lib demo1.c \
-    -o demo1.exe -lspatialite
-
-
-
-Building on Mac OsX systems:
-=================================================
-
-static linkage:
----------------
-
-gcc -Wall -I/usr/local/include demo1.c -o demo1 \
-    /usr/local/lib/libspatialite.a \
-    /usr/local/lib/libsqlite3.a \
-    /usr/local/lib/libgeos_c.a \
-    /usr/local/lib/libgeos.a \
-    /usr/local/lib/libproj.a \
-    -liconv -lm -lstdc++ -lpthread -ldl
-
-dynamic linkage:
-----------------
-
-gcc -Wall -I/usr/local/include -L/usr/local/lib demo1.c \
-    -o demo1 -lspatialite
-    
-=========================================================
-
-Some remarkable point to be noted:
-a) when using dynamic linkage you simply need to use 
-   the 'libspatialite' alone, because this latter will
-   automatically resolve any other required dependency
-b) but when using static linkage you need instead to 
-   resolve explicitly (by yourself) any required dependency.
-   And this explains why do you need to refer so many 
-   libraries (-lgeos_c, -lgeos, -lproj ....)
diff --git a/src/connection_cache/alloc_cache.c b/src/connection_cache/alloc_cache.c
index bcfae08..30dc59b 100644
--- a/src/connection_cache/alloc_cache.c
+++ b/src/connection_cache/alloc_cache.c
@@ -124,7 +124,8 @@ conn_geos_error (const char *msg, void *userdata)
     cache->gaia_geos_error_msg = NULL;
     if (msg)
       {
-	  spatialite_e ("GEOS error: %s\n", msg);
+	  if (cache->silent_mode == 0)
+	      spatialite_e ("GEOS error: %s\n", msg);
 	  len = strlen (msg);
 	  cache->gaia_geos_error_msg = malloc (len + 1);
 	  strcpy (cache->gaia_geos_error_msg, msg);
@@ -154,7 +155,8 @@ conn_geos_warning (const char *msg, void *userdata)
     cache->gaia_geos_warning_msg = NULL;
     if (msg)
       {
-	  spatialite_e ("GEOS warning: %s\n", msg);
+	  if (cache->silent_mode == 0)
+	      spatialite_e ("GEOS warning: %s\n", msg);
 	  len = strlen (msg);
 	  cache->gaia_geos_warning_msg = malloc (len + 1);
 	  strcpy (cache->gaia_geos_warning_msg, msg);
@@ -189,7 +191,8 @@ conn_rttopo_error (const char *fmt, va_list ap, void *userdata)
       {
 	  if (strlen (msg) > 0)
 	    {
-		spatialite_e ("RTTOPO error: %s\n\n", msg);
+		if (cache->silent_mode == 0)
+		    spatialite_e ("RTTOPO error: %s\n\n", msg);
 		len = strlen (msg);
 		cache->gaia_rttopo_error_msg = malloc (len + 1);
 		strcpy (cache->gaia_rttopo_error_msg, msg);
@@ -229,7 +232,8 @@ conn_rttopo_warning (const char *fmt, va_list ap, void *userdata)
       {
 	  if (strlen (msg) > 0)
 	    {
-		spatialite_e ("RTTOPO warning: %s\n", msg);
+		if (cache->silent_mode == 0)
+		    spatialite_e ("RTTOPO warning: %s\n", msg);
 		len = strlen (msg);
 		cache->gaia_rttopo_warning_msg = malloc (len + 1);
 		strcpy (cache->gaia_rttopo_warning_msg, msg);
@@ -371,6 +375,7 @@ spatialite_alloc_reentrant ()
     cache->gaia_geosaux_error_msg = NULL;
     cache->gaia_rttopo_error_msg = NULL;
     cache->gaia_rttopo_warning_msg = NULL;
+    cache->silent_mode = 0;
 /* initializing an empty linked list of Topologies */
     cache->firstTopology = NULL;
     cache->lastTopology = NULL;
@@ -419,7 +424,7 @@ spatialite_alloc_reentrant ()
 /* initializing GEOS and PROJ.4 handles */
 
 #ifndef OMIT_GEOS		/* initializing GEOS */
-    cache->GEOS_handle = initGEOS_r (NULL, NULL);
+    cache->GEOS_handle = GEOS_init_r (NULL, NULL);
     GEOSContext_setNoticeMessageHandler_r (cache->GEOS_handle,
 					   conn_geos_warning, cache);
     GEOSContext_setErrorMessageHandler_r (cache->GEOS_handle, conn_geos_error,
@@ -486,6 +491,7 @@ spatialite_alloc_connection ()
     cache->gaia_geos_error_msg = NULL;
     cache->gaia_geos_warning_msg = NULL;
     cache->gaia_geosaux_error_msg = NULL;
+    cache->silent_mode = 0;
 /* initializing an empty linked list of Topologies */
     cache->firstTopology = NULL;
     cache->lastTopology = NULL;
@@ -620,7 +626,11 @@ free_internal_cache (struct splite_internal_cache *cache)
 #ifndef OMIT_GEOS
     handle = cache->GEOS_handle;
     if (handle != NULL)
+#ifdef GEOS_REENTRANT		/* reentrant (thread-safe) initialization */
+    GEOS_finish_r(handle);
+#else /* end GEOS_REENTRANT */
 	finishGEOS_r (handle);
+#endif
     cache->GEOS_handle = NULL;
     gaiaResetGeosMsg_r (cache);
 #endif
@@ -1042,3 +1052,31 @@ spatialite_shutdown (void)
 
     gaia_already_initialized = 0;
 }
+
+SPATIALITE_DECLARE void
+spatialite_set_silent_mode (const void *p_cache)
+{
+/* setting up the SILENT mode */
+    struct splite_internal_cache *cache =
+	(struct splite_internal_cache *) p_cache;
+    if (cache == NULL)
+	return;
+    if (cache->magic1 != SPATIALITE_CACHE_MAGIC1
+	|| cache->magic2 != SPATIALITE_CACHE_MAGIC2)
+	return;
+    cache->silent_mode = 1;
+}
+
+SPATIALITE_DECLARE void
+spatialite_set_verbose_mode (const void *p_cache)
+{
+/* setting up the VERBOSE mode */
+    struct splite_internal_cache *cache =
+	(struct splite_internal_cache *) p_cache;
+    if (cache == NULL)
+	return;
+    if (cache->magic1 != SPATIALITE_CACHE_MAGIC1
+	|| cache->magic2 != SPATIALITE_CACHE_MAGIC2)
+	return;
+    cache->silent_mode = 0;
+}
diff --git a/src/cutter/gaia_cutter.c b/src/cutter/gaia_cutter.c
index e8bc7d7..b77b2a6 100644
--- a/src/cutter/gaia_cutter.c
+++ b/src/cutter/gaia_cutter.c
@@ -7045,6 +7045,287 @@ do_insert_output_points (struct output_table *tbl, sqlite3 * handle,
     return 0;
 }
 
+static void
+do_finish_output (struct output_table *tbl, sqlite3 * handle,
+		  const char *out_table, const char *geometry,
+		  const char *blade_db_prefix, const char *blade_table,
+		  const char *blade_geom, const char *spatial_index_prefix,
+		  const char *spatial_index)
+{
+/* assigning the BLADE to all uncut elements */
+    int ret;
+    sqlite3_stmt *stmt_in = NULL;
+    sqlite3_stmt *stmt_out = NULL;
+    char *xprefix;
+    char *xtable;
+    char *xcolumn1;
+    char *xcolumn2;
+    char *sql;
+    char *prev;
+    struct output_column *col;
+    int comma = 0;
+
+/* preparing the INPUT statement */
+    sql = sqlite3_mprintf ("SELECT");
+    prev = sql;
+    col = tbl->first;
+    while (col != NULL)
+      {
+	  /* adding the output PK column  */
+	  if (col->role == GAIA_CUTTER_OUTPUT_PK)
+	    {
+		/* output table primary column */
+		xcolumn1 = gaiaDoubleQuotedSql (col->base_name);
+		sql = sqlite3_mprintf ("%s \"%s\"", prev, xcolumn1);
+		sqlite3_free (prev);
+		free (xcolumn1);
+		prev = sql;
+		comma = 1;
+	    }
+	  col = col->next;
+      }
+    col = tbl->first;
+    while (col != NULL)
+      {
+	  /* Blade Primary Key Column(s) */
+	  if (col->role == GAIA_CUTTER_BLADE_PK)
+	    {
+		xcolumn1 = gaiaDoubleQuotedSql (col->base_name);
+		xcolumn2 = gaiaDoubleQuotedSql (col->real_name);
+		if (comma)
+		    sql =
+			sqlite3_mprintf ("%s, b.\"%s\" AS \"%s\"", prev,
+					 xcolumn1, xcolumn2);
+		else
+		    sql =
+			sqlite3_mprintf ("%s b.\"%s\" AS \"%s\"", prev,
+					 xcolumn1, xcolumn2);
+		free (xcolumn1);
+		free (xcolumn2);
+		comma = 1;
+		sqlite3_free (prev);
+		prev = sql;
+	    }
+	  col = col->next;
+      }
+    xtable = gaiaDoubleQuotedSql (out_table);
+    sql = sqlite3_mprintf ("%s FROM MAIN.\"%s\" AS i", prev, xtable);
+    free (xtable);
+    sqlite3_free (prev);
+    prev = sql;
+    xprefix = gaiaDoubleQuotedSql (blade_db_prefix);
+    xtable = gaiaDoubleQuotedSql (blade_table);
+    sql =
+	sqlite3_mprintf ("%s JOIN \"%s\".\"%s\" AS b ON (", prev, xprefix,
+			 xtable);
+    free (xprefix);
+    free (xtable);
+    sqlite3_free (prev);
+    prev = sql;
+    xcolumn1 = gaiaDoubleQuotedSql (geometry);
+    xcolumn2 = gaiaDoubleQuotedSql (blade_geom);
+    sql =
+	sqlite3_mprintf ("%sST_CoveredBy(i.\"%s\", b.\"%s\") = 1 ", prev,
+			 xcolumn1, xcolumn2);
+    free (xcolumn1);
+    free (xcolumn2);
+    sqlite3_free (prev);
+    prev = sql;
+    sql = sqlite3_mprintf ("%s AND b.ROWID IN (SELECT pkid FROM ", prev);
+    sqlite3_free (prev);
+    prev = sql;
+    xprefix = gaiaDoubleQuotedSql (spatial_index_prefix);
+    xtable = gaiaDoubleQuotedSql (spatial_index);
+    sql = sqlite3_mprintf ("%s \"%s\".\"%s\" WHERE", prev, xprefix, xtable);
+    free (xprefix);
+    free (xtable);
+    sqlite3_free (prev);
+    prev = sql;
+    xcolumn1 = gaiaDoubleQuotedSql (geometry);
+    sql =
+	sqlite3_mprintf
+	("%s xmin <= MbrMaxX(i.\"%s\") AND xmax >= MbrMinX(i.\"%s\") ", prev,
+	 xcolumn1, xcolumn1);
+    sqlite3_free (prev);
+    prev = sql;
+    sql =
+	sqlite3_mprintf
+	("%s AND ymin <= MbrMaxY(i.\"%s\") AND ymax >= MbrMinY(i.\"%s\")))",
+	 prev, xcolumn1, xcolumn1);
+    free (xcolumn1);
+    sqlite3_free (prev);
+
+/* creating the OUTPUT prepared statement */
+    ret = sqlite3_prepare_v2 (handle, sql, strlen (sql), &stmt_in, NULL);
+    sqlite3_free (sql);
+    if (ret != SQLITE_OK)
+	goto error;
+
+/* preparing the OUTPUT statement */
+    xtable = gaiaDoubleQuotedSql (out_table);
+    sql = sqlite3_mprintf ("UPDATE MAIN.\"%s\" SET", xtable);
+    free (xtable);
+    prev = sql;
+    col = tbl->first;
+    comma = 0;
+    while (col != NULL)
+      {
+	  /* Blade Primary Key Column(s) */
+	  if (col->role == GAIA_CUTTER_BLADE_PK)
+	    {
+		xcolumn2 = gaiaDoubleQuotedSql (col->real_name);
+		if (comma)
+		    sql = sqlite3_mprintf ("%s, \"%s\" = ?", prev, xcolumn2);
+		else
+		    sql = sqlite3_mprintf ("%s \"%s\" = ?", prev, xcolumn2);
+		free (xcolumn2);
+		comma = 1;
+		sqlite3_free (prev);
+		prev = sql;
+	    }
+	  col = col->next;
+      }
+    sql = sqlite3_mprintf ("%s WHERE ", prev);
+    sqlite3_free (prev);
+    prev = sql;
+    col = tbl->first;
+    while (col != NULL)
+      {
+	  /* adding the output PK column  */
+	  if (col->role == GAIA_CUTTER_OUTPUT_PK)
+	    {
+		/* output table primary column */
+		xcolumn1 = gaiaDoubleQuotedSql (col->base_name);
+		sql = sqlite3_mprintf ("%s \"%s\" = ?", prev, xcolumn1);
+		sqlite3_free (prev);
+		free (xcolumn1);
+		prev = sql;
+		comma = 1;
+	    }
+	  col = col->next;
+      }
+
+/* creating the OUTPUT prepared statement */
+    ret = sqlite3_prepare_v2 (handle, sql, strlen (sql), &stmt_out, NULL);
+    sqlite3_free (sql);
+    if (ret != SQLITE_OK)
+	goto error;
+
+    while (1)
+      {
+	  /* scrolling the result set rows */
+	  ret = sqlite3_step (stmt_in);
+	  if (ret == SQLITE_DONE)
+	      break;		/* end of result set */
+	  if (ret == SQLITE_ROW)
+	    {
+		struct temporary_row row;
+		struct multivar *var;
+		int icol = 1;
+		int icol2 = 0;
+		sqlite3_int64 pk;
+
+		row.first_input = NULL;
+		row.last_input = NULL;
+		row.first_blade = NULL;
+		row.last_blade = NULL;
+
+		pk = sqlite3_column_int64 (stmt_in, 0);
+		icol2 = 0;
+		col = tbl->first;
+		while (col != NULL)
+		  {
+		      /* Blade Primary Key Column(s) */
+		      if (col->role == GAIA_CUTTER_BLADE_PK)
+			{
+			    switch (sqlite3_column_type (stmt_in, icol))
+			      {
+			      case SQLITE_INTEGER:
+				  add_int_pk_value (&row, 'B', icol2,
+						    sqlite3_column_int64
+						    (stmt_in, icol));
+				  break;
+			      case SQLITE_FLOAT:
+				  add_double_pk_value (&row, 'B', icol2,
+						       sqlite3_column_double
+						       (stmt_in, icol));
+				  break;
+			      case SQLITE_TEXT:
+				  add_text_pk_value (&row, 'B', icol2,
+						     (const char *)
+						     sqlite3_column_text
+						     (stmt_in, icol));
+				  break;
+			      default:
+				  add_null_pk_value (&row, 'B', icol2);
+			      };
+			    icol++;
+			    icol2++;
+			}
+		      col = col->next;
+		  }
+
+		sqlite3_reset (stmt_out);
+		sqlite3_clear_bindings (stmt_out);
+		col = tbl->first;
+		icol = 1;
+		icol2 = 0;
+		while (col != NULL)
+		  {
+		      if (col->role == GAIA_CUTTER_BLADE_PK)
+			{
+			    var = find_blade_pk_value (&row, icol2);
+			    if (var == NULL)
+				return;
+			    icol2++;
+			    switch (var->type)
+			      {
+				  /* Blade Primary Key Column(s) */
+			      case SQLITE_INTEGER:
+				  sqlite3_bind_int64 (stmt_out, icol,
+						      var->value.intValue);
+				  break;
+			      case SQLITE_FLOAT:
+				  sqlite3_bind_double (stmt_out, icol,
+						       var->value.doubleValue);
+				  break;
+			      case SQLITE_TEXT:
+				  sqlite3_bind_text (stmt_out, icol,
+						     var->value.textValue,
+						     strlen (var->
+							     value.textValue),
+						     SQLITE_STATIC);
+				  break;
+			      default:
+				  sqlite3_bind_null (stmt_out, icol);
+				  break;
+			      };
+			    icol++;
+			}
+		      col = col->next;
+		  }
+		sqlite3_bind_int64 (stmt_out, icol, pk);
+		ret = sqlite3_step (stmt_out);
+		reset_temporary_row (&row);
+		if (ret == SQLITE_DONE || ret == SQLITE_ROW)
+		    ;
+		else
+		    goto error;
+	    }
+	  else
+	      goto error;
+      }
+    sqlite3_finalize (stmt_in);
+    sqlite3_finalize (stmt_out);
+    return;
+
+  error:
+    if (stmt_in != NULL)
+	sqlite3_finalize (stmt_in);
+    if (stmt_out != NULL)
+	sqlite3_finalize (stmt_out);
+}
+
 static int
 do_cut_points (struct output_table *tbl, sqlite3 * handle, const void *cache,
 	       const char *input_db_prefix, const char *input_table,
@@ -7064,6 +7345,9 @@ do_cut_points (struct output_table *tbl, sqlite3 * handle, const void *cache,
 	(tbl, handle, cache, input_db_prefix, input_table, input_geom,
 	 out_table, *tmp_table, message))
 	return 0;
+    do_finish_output (tbl, handle, out_table, input_geom, blade_db_prefix,
+		      blade_table, blade_geom, spatial_index_prefix,
+		      spatial_index);
 
     *drop_tmp_table = 1;
     return 1;
@@ -7099,6 +7383,9 @@ do_cut_linestrings (struct output_table *tbl, sqlite3 * handle,
 	(tbl, handle, cache, input_db_prefix, input_table, input_geom,
 	 out_table, *tmp_table, message))
 	return 0;
+    do_finish_output (tbl, handle, out_table, input_geom, blade_db_prefix,
+		      blade_table, blade_geom, spatial_index_prefix,
+		      spatial_index);
 
     *drop_tmp_table = 1;
     return 1;
@@ -7132,6 +7419,9 @@ do_cut_polygons (struct output_table *tbl, sqlite3 * handle, const void *cache,
     if (!do_insert_output_polygons
 	(tbl, handle, cache, out_table, *tmp_table, message))
 	return 0;
+    do_finish_output (tbl, handle, out_table, input_geom, blade_db_prefix,
+		      blade_table, blade_geom, spatial_index_prefix,
+		      spatial_index);
 
     *drop_tmp_table = 1;
     return 1;
diff --git a/src/gaiageo/gg_relations.c b/src/gaiageo/gg_relations.c
index cda32b1..b95bbda 100644
--- a/src/gaiageo/gg_relations.c
+++ b/src/gaiageo/gg_relations.c
@@ -2850,7 +2850,7 @@ gaiaIsValidReason_r (const void *p_cache, gaiaGeomCollPtr geom)
 	  strcpy (text, str);
 	  return text;
       }
-    if (gaiaIsToxic (geom))
+    if (gaiaIsToxic_r (cache, geom))
       {
 	  str = "Invalid: Toxic Geometry ... too few points";
 	  len = strlen (str);
@@ -2896,7 +2896,7 @@ gaiaIsValidDetailEx (gaiaGeomCollPtr geom, int esri_flag)
 	return NULL;
     g = gaiaToGeos (geom);
     if (esri_flag)
-	esri_flag = 1;		/* normalizing to exactly 1 */
+	esri_flag = GEOSVALID_ALLOW_SELFTOUCHING_RING_FORMING_HOLE;
     GEOSisValidDetail (g, esri_flag, &reason, &d);
     GEOSGeom_destroy (g);
     if (reason != NULL)
@@ -2947,7 +2947,7 @@ gaiaIsValidDetailEx_r (const void *p_cache, gaiaGeomCollPtr geom, int esri_flag)
 	return NULL;
     g = gaiaToGeos_r (cache, geom);
     if (esri_flag)
-	esri_flag = 1;		/* normalizing to exactly 1 */
+	esri_flag = GEOSVALID_ALLOW_SELFTOUCHING_RING_FORMING_HOLE;
     GEOSisValidDetail_r (handle, g, esri_flag, &reason, &d);
     GEOSGeom_destroy_r (handle, g);
     if (reason != NULL)
diff --git a/src/headers/spatialite.h b/src/headers/spatialite.h
index 46655d3..943a941 100644
--- a/src/headers/spatialite.h
+++ b/src/headers/spatialite.h
@@ -123,6 +123,28 @@ extern "C"
     SPATIALITE_DECLARE void *spatialite_alloc_connection (void);
 
 /**
+ Disables reporting GEOS/RTTOPO error and warnings on stderr
+
+ \param ptr a memory pointer returned by spatialite_alloc_connection()
+
+ \sa spatialite_init_ex, spatialite_cleanup_ex, 
+ spatialite_set_verbose_mode
+
+ */
+    SPATIALITE_DECLARE void spatialite_set_silent_mode (const void *ptr);
+
+/**
+ Enables reporting GEOS/RTTOPO error and warnings on stderr
+
+ \param ptr a memory pointer returned by spatialite_alloc_connection()
+
+ \sa spatialite_init_ex, spatialite_cleanup_ex, 
+ spatialite_set_silent_mode
+
+ */
+    SPATIALITE_DECLARE void spatialite_set_verbode_mode (const void *ptr);
+
+/**
  Initializes a SpatiaLite connection. 
 
  This function is now \b DEPRECATED because is not reentrant (not thread safe);
diff --git a/src/headers/spatialite_private.h b/src/headers/spatialite_private.h
index c220c1d..40a2f34 100644
--- a/src/headers/spatialite_private.h
+++ b/src/headers/spatialite_private.h
@@ -158,6 +158,7 @@ extern "C"
 	char *gaia_geosaux_error_msg;
 	char *gaia_rttopo_error_msg;
 	char *gaia_rttopo_warning_msg;
+	int silent_mode;
 	void *firstTopology;
 	void *lastTopology;
 	void *firstNetwork;
diff --git a/src/spatialite/spatialite.c b/src/spatialite/spatialite.c
index 406b846..3b100c2 100644
--- a/src/spatialite/spatialite.c
+++ b/src/spatialite/spatialite.c
@@ -19102,7 +19102,35 @@ fnct_IsValidReason (sqlite3_context * context, int argc, sqlite3_value ** argv)
 	      detail = gaiaIsValidDetailEx (geom, esri_flag);
 	  if (detail == NULL)
 	    {
-		sqlite3_result_null (context);
+		/* performing extra checks */
+		if (data != NULL)
+		  {
+		      if (gaiaIsToxic_r (data, geom))
+			  sqlite3_result_text (context,
+					       "Invalid: Toxic Geometry ... too few points",
+					       -1, SQLITE_TRANSIENT);
+		      else if (gaiaIsNotClosedGeomColl_r (data, geom))
+			  sqlite3_result_text (context,
+					       "Invalid: Unclosed Rings were detected",
+					       -1, SQLITE_TRANSIENT);
+		      else
+			  sqlite3_result_text (context, "Valid Geometry", -1,
+					       SQLITE_TRANSIENT);
+		  }
+		else
+		  {
+		      if (gaiaIsToxic (geom))
+			  sqlite3_result_text (context,
+					       "Invalid: Toxic Geometry ... too few points",
+					       -1, SQLITE_TRANSIENT);
+		      else if (gaiaIsNotClosedGeomColl (geom))
+			  sqlite3_result_text (context,
+					       "Invalid: Unclosed Rings were detected",
+					       -1, SQLITE_TRANSIENT);
+		      else
+			  sqlite3_result_text (context, "Valid Geometry", -1,
+					       SQLITE_TRANSIENT);
+		  }
 		goto end;
 	    }
 	  else
@@ -19454,7 +19482,28 @@ fnct_IsValid (sqlite3_context * context, int argc, sqlite3_value ** argv)
 		else
 		    detail = gaiaIsValidDetailEx (geo, esri_flag);
 		if (detail == NULL)
-		    sqlite3_result_int (context, 1);
+		  {
+		      /* extra checks */
+		      int extra = 0;
+		      if (data != NULL)
+			{
+			    if (gaiaIsToxic_r (data, geo))
+				extra = 1;
+			    if (gaiaIsNotClosedGeomColl_r (data, geo))
+				extra = 1;
+			}
+		      else
+			{
+			    if (gaiaIsToxic (geo))
+				extra = 1;
+			    if (gaiaIsNotClosedGeomColl (geo))
+				extra = 1;
+			}
+		      if (extra)
+			  sqlite3_result_int (context, 0);
+		      else
+			  sqlite3_result_int (context, 1);
+		  }
 		else
 		  {
 		      gaiaFreeGeomColl (detail);
diff --git a/test/Makefile.am b/test/Makefile.am
index 485f652..3b05c1c 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -204,4 +204,5 @@ SUBDIRS = sql_stmt_geosadvanced_tests sql_stmt_geos_tests \
 	sql_stmt_freexl_tests sql_stmt_cache_tests \
 	sql_stmt_nocache_tests sql_stmt_voronoj1_tests \
 	sql_stmt_voronoj2_tests sql_stmt_gpkg_epsg_tests \
-	sql_stmt_rttopo_tests
+	sql_stmt_rttopo_tests sql_stmt_gpkgcache_tests \
+	sql_stmt_gpkgnocache_tests
diff --git a/test/Makefile.in b/test/Makefile.in
index 2ff343a..f3f6f9b 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1130,7 +1130,8 @@ SUBDIRS = sql_stmt_geosadvanced_tests sql_stmt_geos_tests \
 	sql_stmt_freexl_tests sql_stmt_cache_tests \
 	sql_stmt_nocache_tests sql_stmt_voronoj1_tests \
 	sql_stmt_voronoj2_tests sql_stmt_gpkg_epsg_tests \
-	sql_stmt_rttopo_tests
+	sql_stmt_rttopo_tests sql_stmt_gpkgcache_tests \
+	sql_stmt_gpkgnocache_tests
 
 all: all-recursive
 
diff --git a/test/check_sql_stmt.c b/test/check_sql_stmt.c
index 1963c66..892784e 100644
--- a/test/check_sql_stmt.c
+++ b/test/check_sql_stmt.c
@@ -765,6 +765,28 @@ run_all_testcases (struct db_conn *conn, int load_extension, int legacy)
 		return result;
 	    }
       }
+      
+#ifdef ENABLE_GEOPACKAGE	/* only if GeoPackage support is enabled */
+    if (legacy)
+      {
+	  result =
+	      run_subdir_test ("sql_stmt_gpkgnocache_tests", conn, load_extension,
+			       0);
+	  if (result != 0)
+	    {
+		return result;
+	    }
+      }
+    else
+      {
+	  result =
+	      run_subdir_test ("sql_stmt_gpkgcache_tests", conn, load_extension, 0);
+	  if (result != 0)
+	    {
+		return result;
+	    }
+      }
+#endif /* end GEOPACKAGE conditional */
 
     return result;
 }
diff --git a/test/check_topology2d.c b/test/check_topology2d.c
index 979888f..05fa056 100644
--- a/test/check_topology2d.c
+++ b/test/check_topology2d.c
@@ -1949,7 +1949,6 @@ do_level3_tests (sqlite3 * handle, int *retcode)
       }
 
 /* attempting to add an invalid Edge (closed ring) */
-    fprintf (stderr, "merdalla\n");
     ret =
 	sqlite3_exec (handle,
 		      "SELECT ST_AddIsoEdge('topo', 13, 13, GeomFromText('LINESTRING(178 170, 178 161, 170 161, 178 170)', 4326))",
@@ -1960,7 +1959,6 @@ do_level3_tests (sqlite3 * handle, int *retcode)
 	  *retcode = -128;
 	  return 0;
       }
-    fprintf (stderr, "merdalla 2\n");
     if (strcmp
 	(err_msg,
 	 "Closed edges would not be isolated, try rtt_AddEdgeNewFaces") != 0)
@@ -1971,7 +1969,6 @@ do_level3_tests (sqlite3 * handle, int *retcode)
 	  return 0;
       }
     sqlite3_free (err_msg);
-    fprintf (stderr, "merdalla 3\n");
 
 /* adding an Edge/Face (closed ring) */
     ret =
diff --git a/test/geos-init.supp b/test/geos-init.supp
deleted file mode 100644
index 4cfb302..0000000
--- a/test/geos-init.supp
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-   <geos_init_singleton>
-   Memcheck:Leak
-   fun:_Znwm
-   ...
-   fun:_ZN4geos4geom15GeometryFactory18getDefaultInstanceEv
-   fun:initGEOS_r
-   fun:initGEOS
-   fun:spatialite_init_ex
-   ...
-   fun:main
-}
-
diff --git a/test/shp/ReadMe.txt b/test/shp/ReadMe.txt
deleted file mode 100644
index a9cab1b..0000000
--- a/test/shp/ReadMe.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Open Street Map (srid=4326, 2D)
-- new-caledonia (french: CP1252)
-- gaza (nice arabic and hebrew names: UTF-8)
-- taiwan (even nicer chinese names: UTF-8)
-
-Merano Local Council (Srid=25832, 3D, CP1252)
-
-Foggia (Srid=23032, 2D, CP1252: very complex polygons)
-
-
-
diff --git a/test/sql_stmt_cache_tests/Makefile b/test/sql_stmt_cache_tests/Makefile
deleted file mode 100644
index a9b5bd6..0000000
--- a/test/sql_stmt_cache_tests/Makefile
+++ /dev/null
@@ -1,460 +0,0 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
-# test/sql_stmt_cache_tests/Makefile.  Generated from Makefile.in by configure.
-
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/libspatialite
-pkgincludedir = $(includedir)/libspatialite
-pkglibdir = $(libdir)/libspatialite
-pkglibexecdir = $(libexecdir)/libspatialite
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = x86_64-unknown-linux-gnu
-host_triplet = x86_64-unknown-linux-gnu
-subdir = test/sql_stmt_cache_tests
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_$(V))
-am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY))
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = aclocal-1.15
-AMTAR = $${TAR-tar}
-AM_DEFAULT_VERBOSITY = 1
-AR = ar
-AS = as
-AUTOCONF = autoconf
-AUTOHEADER = autoheader
-AUTOMAKE = automake-1.15
-AWK = gawk
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -Wall -Wextra -Wunused -pedantic -g -O0 -fprofile-arcs -ftest-coverage -g
-CPP = gcc -E
-CPPFLAGS = 
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
-CYGPATH_W = echo
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-DLLTOOL = dlltool
-DSYMUTIL = 
-DUMPBIN = 
-ECHO_C = 
-ECHO_N = -n
-ECHO_T = 
-EGREP = /usr/bin/grep -E
-EXEEXT = 
-FGREP = /usr/bin/grep -F
-GEOSCONFIG = /usr/local/bin/geos-config
-GEOS_CFLAGS = -I/usr/local/include
-GEOS_LDFLAGS = -L/usr/local/lib
-GREP = /usr/bin/grep
-INSTALL = /usr/bin/install -c
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LD = /usr/bin/ld -m elf_x86_64
-LDFLAGS = 
-LIBOBJS = 
-LIBS = -lrttopo -lfreexl -lproj -lsqlite3 -lz -lsqlite3  -L/usr/local/lib -lgeos_c
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LIBXML2_CFLAGS = -I/usr/include/libxml2 
-LIBXML2_LIBS = -lxml2 
-LIPO = 
-LN_S = ln -s
-LTLIBOBJS = 
-MAINT = #
-MAKEINFO = makeinfo
-MANIFEST_TOOL = :
-MKDIR_P = /usr/bin/mkdir -p
-NM = /usr/bin/nm -B
-NMEDIT = 
-OBJDUMP = objdump
-OBJEXT = o
-OTOOL = 
-OTOOL64 = 
-PACKAGE = libspatialite
-PACKAGE_BUGREPORT = a.furieri at lqt.it
-PACKAGE_NAME = libspatialite
-PACKAGE_STRING = libspatialite 4.4.0-RC0
-PACKAGE_TARNAME = libspatialite
-PACKAGE_URL = 
-PACKAGE_VERSION = 4.4.0-RC0
-PATH_SEPARATOR = :
-PKG_CONFIG = /usr/bin/pkg-config
-PKG_CONFIG_LIBDIR = 
-PKG_CONFIG_PATH = /usr/local/lib/pkgconfig
-RANLIB = ranlib
-SED = /usr/bin/sed
-SET_MAKE = 
-SHELL = /bin/sh
-STRIP = strip
-VERSION = 4.4.0-RC0
-abs_builddir = /home/sandro/fossil/libspatialite/test/sql_stmt_cache_tests
-abs_srcdir = /home/sandro/fossil/libspatialite/test/sql_stmt_cache_tests
-abs_top_builddir = /home/sandro/fossil/libspatialite
-abs_top_srcdir = /home/sandro/fossil/libspatialite
-ac_ct_AR = ar
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_DUMPBIN = 
-am__include = include
-am__leading_dot = .
-am__quote = 
-am__tar = $${TAR-tar} chof - "$$tardir"
-am__untar = $${TAR-tar} xf -
-bindir = ${exec_prefix}/bin
-build = x86_64-unknown-linux-gnu
-build_alias = 
-build_cpu = x86_64
-build_os = linux-gnu
-build_vendor = unknown
-builddir = .
-datadir = ${datarootdir}
-datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
-dvidir = ${docdir}
-exec_prefix = ${prefix}
-host = x86_64-unknown-linux-gnu
-host_alias = 
-host_cpu = x86_64
-host_os = linux-gnu
-host_vendor = unknown
-htmldir = ${docdir}
-includedir = ${prefix}/include
-infodir = ${datarootdir}/info
-install_sh = ${SHELL} /home/sandro/fossil/libspatialite/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localedir = ${datarootdir}/locale
-localstatedir = ${prefix}/var
-mandir = ${datarootdir}/man
-mkdir_p = $(MKDIR_P)
-oldincludedir = /usr/include
-pdfdir = ${docdir}
-prefix = /usr/local
-program_transform_name = s,x,x,
-psdir = ${docdir}
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-srcdir = .
-sysconfdir = ${prefix}/etc
-target_alias = 
-top_build_prefix = ../../
-top_builddir = ../..
-top_srcdir = ../..
-EXTRA_DIST = amphibious1.testcase \
-	amphibious2.testcase \
-	precision1.testcase \
-	precision2.testcase \
-	precision3.testcase \
-	precision4.testcase \
-	precision5.testcase \
-	precision6.testcase \
-	precision7.testcase  \
-	gpkg1.testcase \
-	gpkg2.testcase 
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/sql_stmt_cache_tests/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign test/sql_stmt_cache_tests/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: # $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags-am uninstall uninstall-am
-
-.PRECIOUS: Makefile
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/test/sql_stmt_cache_tests/Makefile.am b/test/sql_stmt_cache_tests/Makefile.am
index afd56b8..98747f8 100644
--- a/test/sql_stmt_cache_tests/Makefile.am
+++ b/test/sql_stmt_cache_tests/Makefile.am
@@ -1,13 +1,9 @@
 
-EXTRA_DIST = amphibious1.testcase \
-	amphibious2.testcase \
-	precision1.testcase \
+EXTRA_DIST = precision1.testcase \
 	precision2.testcase \
 	precision3.testcase \
 	precision4.testcase \
 	precision5.testcase \
 	precision6.testcase \
-	precision7.testcase  \
-	gpkg1.testcase \
-	gpkg2.testcase 
+	precision7.testcase 
 	
diff --git a/test/sql_stmt_cache_tests/Makefile.in b/test/sql_stmt_cache_tests/Makefile.in
index 346e8e8..b4c3c0b 100644
--- a/test/sql_stmt_cache_tests/Makefile.in
+++ b/test/sql_stmt_cache_tests/Makefile.in
@@ -251,17 +251,13 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = amphibious1.testcase \
-	amphibious2.testcase \
-	precision1.testcase \
+EXTRA_DIST = precision1.testcase \
 	precision2.testcase \
 	precision3.testcase \
 	precision4.testcase \
 	precision5.testcase \
 	precision6.testcase \
-	precision7.testcase  \
-	gpkg1.testcase \
-	gpkg2.testcase 
+	precision7.testcase 
 
 all: all-am
 
diff --git a/test/sql_stmt_freexl_tests/Makefile b/test/sql_stmt_freexl_tests/Makefile
deleted file mode 100644
index 4b1c1dc..0000000
--- a/test/sql_stmt_freexl_tests/Makefile
+++ /dev/null
@@ -1,456 +0,0 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
-# test/sql_stmt_freexl_tests/Makefile.  Generated from Makefile.in by configure.
-
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/libspatialite
-pkgincludedir = $(includedir)/libspatialite
-pkglibdir = $(libdir)/libspatialite
-pkglibexecdir = $(libexecdir)/libspatialite
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = x86_64-unknown-linux-gnu
-host_triplet = x86_64-unknown-linux-gnu
-subdir = test/sql_stmt_freexl_tests
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_$(V))
-am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY))
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = aclocal-1.15
-AMTAR = $${TAR-tar}
-AM_DEFAULT_VERBOSITY = 1
-AR = ar
-AS = as
-AUTOCONF = autoconf
-AUTOHEADER = autoheader
-AUTOMAKE = automake-1.15
-AWK = gawk
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -Wall -Wextra -Wunused -pedantic -g -O0 -fprofile-arcs -ftest-coverage -g
-CPP = gcc -E
-CPPFLAGS = 
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
-CYGPATH_W = echo
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-DLLTOOL = dlltool
-DSYMUTIL = 
-DUMPBIN = 
-ECHO_C = 
-ECHO_N = -n
-ECHO_T = 
-EGREP = /usr/bin/grep -E
-EXEEXT = 
-FGREP = /usr/bin/grep -F
-GEOSCONFIG = /usr/local/bin/geos-config
-GEOS_CFLAGS = -I/usr/local/include
-GEOS_LDFLAGS = -L/usr/local/lib
-GREP = /usr/bin/grep
-INSTALL = /usr/bin/install -c
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LD = /usr/bin/ld -m elf_x86_64
-LDFLAGS = 
-LIBOBJS = 
-LIBS = -lrttopo -lfreexl -lproj -lsqlite3 -lz -lsqlite3  -L/usr/local/lib -lgeos_c
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LIBXML2_CFLAGS = -I/usr/include/libxml2 
-LIBXML2_LIBS = -lxml2 
-LIPO = 
-LN_S = ln -s
-LTLIBOBJS = 
-MAINT = #
-MAKEINFO = makeinfo
-MANIFEST_TOOL = :
-MKDIR_P = /usr/bin/mkdir -p
-NM = /usr/bin/nm -B
-NMEDIT = 
-OBJDUMP = objdump
-OBJEXT = o
-OTOOL = 
-OTOOL64 = 
-PACKAGE = libspatialite
-PACKAGE_BUGREPORT = a.furieri at lqt.it
-PACKAGE_NAME = libspatialite
-PACKAGE_STRING = libspatialite 4.4.0-RC0
-PACKAGE_TARNAME = libspatialite
-PACKAGE_URL = 
-PACKAGE_VERSION = 4.4.0-RC0
-PATH_SEPARATOR = :
-PKG_CONFIG = /usr/bin/pkg-config
-PKG_CONFIG_LIBDIR = 
-PKG_CONFIG_PATH = /usr/local/lib/pkgconfig
-RANLIB = ranlib
-SED = /usr/bin/sed
-SET_MAKE = 
-SHELL = /bin/sh
-STRIP = strip
-VERSION = 4.4.0-RC0
-abs_builddir = /home/sandro/fossil/libspatialite/test/sql_stmt_freexl_tests
-abs_srcdir = /home/sandro/fossil/libspatialite/test/sql_stmt_freexl_tests
-abs_top_builddir = /home/sandro/fossil/libspatialite
-abs_top_srcdir = /home/sandro/fossil/libspatialite
-ac_ct_AR = ar
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_DUMPBIN = 
-am__include = include
-am__leading_dot = .
-am__quote = 
-am__tar = $${TAR-tar} chof - "$$tardir"
-am__untar = $${TAR-tar} xf -
-bindir = ${exec_prefix}/bin
-build = x86_64-unknown-linux-gnu
-build_alias = 
-build_cpu = x86_64
-build_os = linux-gnu
-build_vendor = unknown
-builddir = .
-datadir = ${datarootdir}
-datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
-dvidir = ${docdir}
-exec_prefix = ${prefix}
-host = x86_64-unknown-linux-gnu
-host_alias = 
-host_cpu = x86_64
-host_os = linux-gnu
-host_vendor = unknown
-htmldir = ${docdir}
-includedir = ${prefix}/include
-infodir = ${datarootdir}/info
-install_sh = ${SHELL} /home/sandro/fossil/libspatialite/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localedir = ${datarootdir}/locale
-localstatedir = ${prefix}/var
-mandir = ${datarootdir}/man
-mkdir_p = $(MKDIR_P)
-oldincludedir = /usr/include
-pdfdir = ${docdir}
-prefix = /usr/local
-program_transform_name = s,x,x,
-psdir = ${docdir}
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-srcdir = .
-sysconfdir = ${prefix}/etc
-target_alias = 
-top_build_prefix = ../../
-top_builddir = ../..
-top_srcdir = ../..
-EXTRA_DIST = loadxls1.testcase \
-	loadxls2.testcase \
-	loadxls3.testcase \
-	loadxls4.testcase \
-	loadxls5.testcase \
-	loadxls6.testcase \
-	loadxls7.testcase
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/sql_stmt_freexl_tests/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign test/sql_stmt_freexl_tests/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: # $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags-am uninstall uninstall-am
-
-.PRECIOUS: Makefile
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/test/sql_stmt_geos_tests/geoserror8.testcase b/test/sql_stmt_geos_tests/geoserror8.testcase
deleted file mode 100644
index 3ea87e1..0000000
--- a/test/sql_stmt_geos_tests/geoserror8.testcase
+++ /dev/null
@@ -1,11 +0,0 @@
-GEOS_Error - topology exception 
-:memory: #use in-memory database
-SELECT ST_Difference(MakePoint(136,-35), GeomFromText('POLYGON((136 -35, 135.2 -34.5, 136 -35.2, 136 -35, 135.2 -34.5))')), GEOS_GetLastWarningMsg(), Length(GEOS_GetLastErrorMsg()) > 1 AS test;
-1 # rows (not including the header row)
-3 # columns
-ST_Difference(MakePoint(136,-35), GeomFromText('POLYGON((136 -35, 135.2 -34.5, 136 -35.2, 136 -35, 135.2 -34.5))'))
-GEOS_GetLastWarningMsg()
-test
-(NULL)
-(NULL)
-1
diff --git a/test/sql_stmt_geosadvanced_tests/Makefile b/test/sql_stmt_geosadvanced_tests/Makefile
deleted file mode 100644
index 9f3f947..0000000
--- a/test/sql_stmt_geosadvanced_tests/Makefile
+++ /dev/null
@@ -1,487 +0,0 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
-# test/sql_stmt_geosadvanced_tests/Makefile.  Generated from Makefile.in by configure.
-
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/libspatialite
-pkgincludedir = $(includedir)/libspatialite
-pkglibdir = $(libdir)/libspatialite
-pkglibexecdir = $(libexecdir)/libspatialite
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = x86_64-unknown-linux-gnu
-host_triplet = x86_64-unknown-linux-gnu
-subdir = test/sql_stmt_geosadvanced_tests
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_$(V))
-am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY))
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = aclocal-1.15
-AMTAR = $${TAR-tar}
-AM_DEFAULT_VERBOSITY = 1
-AR = ar
-AS = as
-AUTOCONF = autoconf
-AUTOHEADER = autoheader
-AUTOMAKE = automake-1.15
-AWK = gawk
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -Wall -Wextra -Wunused -pedantic -g -O0 -fprofile-arcs -ftest-coverage -g
-CPP = gcc -E
-CPPFLAGS = 
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
-CYGPATH_W = echo
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-DLLTOOL = dlltool
-DSYMUTIL = 
-DUMPBIN = 
-ECHO_C = 
-ECHO_N = -n
-ECHO_T = 
-EGREP = /usr/bin/grep -E
-EXEEXT = 
-FGREP = /usr/bin/grep -F
-GEOSCONFIG = /usr/local/bin/geos-config
-GEOS_CFLAGS = -I/usr/local/include
-GEOS_LDFLAGS = -L/usr/local/lib
-GREP = /usr/bin/grep
-INSTALL = /usr/bin/install -c
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LD = /usr/bin/ld -m elf_x86_64
-LDFLAGS = 
-LIBOBJS = 
-LIBS = -lrttopo -lfreexl -lproj -lsqlite3 -lz -lsqlite3  -L/usr/local/lib -lgeos_c
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LIBXML2_CFLAGS = -I/usr/include/libxml2 
-LIBXML2_LIBS = -lxml2 
-LIPO = 
-LN_S = ln -s
-LTLIBOBJS = 
-MAINT = #
-MAKEINFO = makeinfo
-MANIFEST_TOOL = :
-MKDIR_P = /usr/bin/mkdir -p
-NM = /usr/bin/nm -B
-NMEDIT = 
-OBJDUMP = objdump
-OBJEXT = o
-OTOOL = 
-OTOOL64 = 
-PACKAGE = libspatialite
-PACKAGE_BUGREPORT = a.furieri at lqt.it
-PACKAGE_NAME = libspatialite
-PACKAGE_STRING = libspatialite 4.4.0-RC0
-PACKAGE_TARNAME = libspatialite
-PACKAGE_URL = 
-PACKAGE_VERSION = 4.4.0-RC0
-PATH_SEPARATOR = :
-PKG_CONFIG = /usr/bin/pkg-config
-PKG_CONFIG_LIBDIR = 
-PKG_CONFIG_PATH = /usr/local/lib/pkgconfig
-RANLIB = ranlib
-SED = /usr/bin/sed
-SET_MAKE = 
-SHELL = /bin/sh
-STRIP = strip
-VERSION = 4.4.0-RC0
-abs_builddir = /home/sandro/fossil/libspatialite/test/sql_stmt_geosadvanced_tests
-abs_srcdir = /home/sandro/fossil/libspatialite/test/sql_stmt_geosadvanced_tests
-abs_top_builddir = /home/sandro/fossil/libspatialite
-abs_top_srcdir = /home/sandro/fossil/libspatialite
-ac_ct_AR = ar
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_DUMPBIN = 
-am__include = include
-am__leading_dot = .
-am__quote = 
-am__tar = $${TAR-tar} chof - "$$tardir"
-am__untar = $${TAR-tar} xf -
-bindir = ${exec_prefix}/bin
-build = x86_64-unknown-linux-gnu
-build_alias = 
-build_cpu = x86_64
-build_os = linux-gnu
-build_vendor = unknown
-builddir = .
-datadir = ${datarootdir}
-datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
-dvidir = ${docdir}
-exec_prefix = ${prefix}
-host = x86_64-unknown-linux-gnu
-host_alias = 
-host_cpu = x86_64
-host_os = linux-gnu
-host_vendor = unknown
-htmldir = ${docdir}
-includedir = ${prefix}/include
-infodir = ${datarootdir}/info
-install_sh = ${SHELL} /home/sandro/fossil/libspatialite/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localedir = ${datarootdir}/locale
-localstatedir = ${prefix}/var
-mandir = ${datarootdir}/man
-mkdir_p = $(MKDIR_P)
-oldincludedir = /usr/include
-pdfdir = ${docdir}
-prefix = /usr/local
-program_transform_name = s,x,x,
-psdir = ${docdir}
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-srcdir = .
-sysconfdir = ${prefix}/etc
-target_alias = 
-top_build_prefix = ../../
-top_builddir = ../..
-top_srcdir = ../..
-EXTRA_DIST = concave_hull10.testcase \
-	concave_hull11.testcase \
-	concave_hull12.testcase \
-	concave_hull13.testcase \
-	concave_hull14.testcase \
-	concave_hull15.testcase \
-	concave_hull16.testcase \
-	concave_hull17.testcase \
-	concave_hull18.testcase \
-	concave_hull19.testcase \
-	concave_hull1.testcase \
-	concave_hull2.testcase \
-	concave_hull3.testcase \
-	concave_hull4.testcase \
-	concave_hull5.testcase \
-	concave_hull6.testcase \
-	concave_hull7.testcase \
-	concave_hull8.testcase \
-	concave_hull9.testcase \
-	delaunay10.testcase \
-	delaunay11.testcase \
-	delaunay12.testcase \
-	delaunay13.testcase \
-	delaunay14.testcase \
-	delaunay15.testcase \
-	delaunay16.testcase \
-	delaunay17.testcase \
-	delaunay18.testcase \
-	delaunay19.testcase \
-	delaunay1.testcase \
-	delaunay2.testcase \
-	delaunay3.testcase \
-	delaunay4.testcase \
-	delaunay5.testcase \
-	delaunay6.testcase \
-	delaunay7.testcase \
-	delaunay8.testcase \
-	delaunay9.testcase
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/sql_stmt_geosadvanced_tests/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign test/sql_stmt_geosadvanced_tests/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: # $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags-am uninstall uninstall-am
-
-.PRECIOUS: Makefile
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/test/sql_stmt_nocache_tests/Makefile.am b/test/sql_stmt_gpkgcache_tests/Makefile.am
similarity index 67%
copy from test/sql_stmt_nocache_tests/Makefile.am
copy to test/sql_stmt_gpkgcache_tests/Makefile.am
index a616c02..898b1c6 100644
--- a/test/sql_stmt_nocache_tests/Makefile.am
+++ b/test/sql_stmt_gpkgcache_tests/Makefile.am
@@ -1,7 +1,6 @@
 
 EXTRA_DIST = amphibious1.testcase \
 	amphibious2.testcase \
-	precision1.testcase \
-	precision2.testcase \
 	gpkg1.testcase \
 	gpkg2.testcase 
+	
diff --git a/test/sql_stmt_lwgeom_20_tests/Makefile.in b/test/sql_stmt_gpkgcache_tests/Makefile.in
similarity index 98%
rename from test/sql_stmt_lwgeom_20_tests/Makefile.in
rename to test/sql_stmt_gpkgcache_tests/Makefile.in
index f3224a4..8e49600 100644
--- a/test/sql_stmt_lwgeom_20_tests/Makefile.in
+++ b/test/sql_stmt_gpkgcache_tests/Makefile.in
@@ -87,7 +87,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = test/sql_stmt_lwgeom_20_tests
+subdir = test/sql_stmt_gpkgcache_tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -251,10 +251,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = st_asx3d25.testcase \
-	st_asx3d26.testcase \
-	st_asx3d30.testcase \
-	st_split8.testcase
+EXTRA_DIST = amphibious1.testcase \
+	amphibious2.testcase \
+	gpkg1.testcase \
+	gpkg2.testcase 
 
 all: all-am
 
@@ -268,9 +268,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/sql_stmt_lwgeom_20_tests/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/sql_stmt_gpkgcache_tests/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign test/sql_stmt_lwgeom_20_tests/Makefile
+	  $(AUTOMAKE) --foreign test/sql_stmt_gpkgcache_tests/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/test/sql_stmt_cache_tests/amphibious1.testcase b/test/sql_stmt_gpkgcache_tests/amphibious1.testcase
similarity index 100%
rename from test/sql_stmt_cache_tests/amphibious1.testcase
rename to test/sql_stmt_gpkgcache_tests/amphibious1.testcase
diff --git a/test/sql_stmt_cache_tests/amphibious2.testcase b/test/sql_stmt_gpkgcache_tests/amphibious2.testcase
similarity index 100%
rename from test/sql_stmt_cache_tests/amphibious2.testcase
rename to test/sql_stmt_gpkgcache_tests/amphibious2.testcase
diff --git a/test/sql_stmt_cache_tests/gpkg1.testcase b/test/sql_stmt_gpkgcache_tests/gpkg1.testcase
similarity index 100%
rename from test/sql_stmt_cache_tests/gpkg1.testcase
rename to test/sql_stmt_gpkgcache_tests/gpkg1.testcase
diff --git a/test/sql_stmt_cache_tests/gpkg2.testcase b/test/sql_stmt_gpkgcache_tests/gpkg2.testcase
similarity index 100%
rename from test/sql_stmt_cache_tests/gpkg2.testcase
rename to test/sql_stmt_gpkgcache_tests/gpkg2.testcase
diff --git a/test/sql_stmt_nocache_tests/Makefile.am b/test/sql_stmt_gpkgnocache_tests/Makefile.am
similarity index 67%
copy from test/sql_stmt_nocache_tests/Makefile.am
copy to test/sql_stmt_gpkgnocache_tests/Makefile.am
index a616c02..e2e825e 100644
--- a/test/sql_stmt_nocache_tests/Makefile.am
+++ b/test/sql_stmt_gpkgnocache_tests/Makefile.am
@@ -1,7 +1,5 @@
 
 EXTRA_DIST = amphibious1.testcase \
 	amphibious2.testcase \
-	precision1.testcase \
-	precision2.testcase \
 	gpkg1.testcase \
 	gpkg2.testcase 
diff --git a/test/sql_stmt_nocache_tests/Makefile b/test/sql_stmt_gpkgnocache_tests/Makefile.in
similarity index 68%
rename from test/sql_stmt_nocache_tests/Makefile
rename to test/sql_stmt_gpkgnocache_tests/Makefile.in
index 6460803..4ceeb5b 100644
--- a/test/sql_stmt_nocache_tests/Makefile
+++ b/test/sql_stmt_gpkgnocache_tests/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile.in generated by automake 1.15 from Makefile.am.
-# test/sql_stmt_nocache_tests/Makefile.  Generated from Makefile.in by configure.
+# @configure_input@
 
 # Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
@@ -12,8 +12,8 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
-
+ at SET_MAKE@
+VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
     false; \
@@ -69,10 +69,10 @@ am__make_running_with_option = \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/libspatialite
-pkgincludedir = $(includedir)/libspatialite
-pkglibdir = $(libdir)/libspatialite
-pkglibexecdir = $(libexecdir)/libspatialite
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -85,9 +85,9 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = x86_64-unknown-linux-gnu
-host_triplet = x86_64-unknown-linux-gnu
-subdir = test/sql_stmt_nocache_tests
+build_triplet = @build@
+host_triplet = @host@
+subdir = test/sql_stmt_gpkgnocache_tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -100,16 +100,16 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_$(V))
-am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
 am__v_P_0 = false
 am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN     " $@;
 am__v_GEN_1 = 
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
 SOURCES =
@@ -122,146 +122,144 @@ am__can_run_installinfo = \
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = aclocal-1.15
-AMTAR = $${TAR-tar}
-AM_DEFAULT_VERBOSITY = 1
-AR = ar
-AS = as
-AUTOCONF = autoconf
-AUTOHEADER = autoheader
-AUTOMAKE = automake-1.15
-AWK = gawk
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -Wall -Wextra -Wunused -pedantic -g -O0 -fprofile-arcs -ftest-coverage -g
-CPP = gcc -E
-CPPFLAGS = 
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
-CYGPATH_W = echo
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-DLLTOOL = dlltool
-DSYMUTIL = 
-DUMPBIN = 
-ECHO_C = 
-ECHO_N = -n
-ECHO_T = 
-EGREP = /usr/bin/grep -E
-EXEEXT = 
-FGREP = /usr/bin/grep -F
-GEOSCONFIG = /usr/local/bin/geos-config
-GEOS_CFLAGS = -I/usr/local/include
-GEOS_LDFLAGS = -L/usr/local/lib
-GREP = /usr/bin/grep
-INSTALL = /usr/bin/install -c
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LD = /usr/bin/ld -m elf_x86_64
-LDFLAGS = 
-LIBOBJS = 
-LIBS = -lrttopo -lfreexl -lproj -lsqlite3 -lz -lsqlite3  -L/usr/local/lib -lgeos_c
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LIBXML2_CFLAGS = -I/usr/include/libxml2 
-LIBXML2_LIBS = -lxml2 
-LIPO = 
-LN_S = ln -s
-LTLIBOBJS = 
-MAINT = #
-MAKEINFO = makeinfo
-MANIFEST_TOOL = :
-MKDIR_P = /usr/bin/mkdir -p
-NM = /usr/bin/nm -B
-NMEDIT = 
-OBJDUMP = objdump
-OBJEXT = o
-OTOOL = 
-OTOOL64 = 
-PACKAGE = libspatialite
-PACKAGE_BUGREPORT = a.furieri at lqt.it
-PACKAGE_NAME = libspatialite
-PACKAGE_STRING = libspatialite 4.4.0-RC0
-PACKAGE_TARNAME = libspatialite
-PACKAGE_URL = 
-PACKAGE_VERSION = 4.4.0-RC0
-PATH_SEPARATOR = :
-PKG_CONFIG = /usr/bin/pkg-config
-PKG_CONFIG_LIBDIR = 
-PKG_CONFIG_PATH = /usr/local/lib/pkgconfig
-RANLIB = ranlib
-SED = /usr/bin/sed
-SET_MAKE = 
-SHELL = /bin/sh
-STRIP = strip
-VERSION = 4.4.0-RC0
-abs_builddir = /home/sandro/fossil/libspatialite/test/sql_stmt_nocache_tests
-abs_srcdir = /home/sandro/fossil/libspatialite/test/sql_stmt_nocache_tests
-abs_top_builddir = /home/sandro/fossil/libspatialite
-abs_top_srcdir = /home/sandro/fossil/libspatialite
-ac_ct_AR = ar
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_DUMPBIN = 
-am__include = include
-am__leading_dot = .
-am__quote = 
-am__tar = $${TAR-tar} chof - "$$tardir"
-am__untar = $${TAR-tar} xf -
-bindir = ${exec_prefix}/bin
-build = x86_64-unknown-linux-gnu
-build_alias = 
-build_cpu = x86_64
-build_os = linux-gnu
-build_vendor = unknown
-builddir = .
-datadir = ${datarootdir}
-datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
-dvidir = ${docdir}
-exec_prefix = ${prefix}
-host = x86_64-unknown-linux-gnu
-host_alias = 
-host_cpu = x86_64
-host_os = linux-gnu
-host_vendor = unknown
-htmldir = ${docdir}
-includedir = ${prefix}/include
-infodir = ${datarootdir}/info
-install_sh = ${SHELL} /home/sandro/fossil/libspatialite/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localedir = ${datarootdir}/locale
-localstatedir = ${prefix}/var
-mandir = ${datarootdir}/man
-mkdir_p = $(MKDIR_P)
-oldincludedir = /usr/include
-pdfdir = ${docdir}
-prefix = /usr/local
-program_transform_name = s,x,x,
-psdir = ${docdir}
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-srcdir = .
-sysconfdir = ${prefix}/etc
-target_alias = 
-top_build_prefix = ../../
-top_builddir = ../..
-top_srcdir = ../..
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GEOSCONFIG = @GEOSCONFIG@
+GEOS_CFLAGS = @GEOS_CFLAGS@
+GEOS_LDFLAGS = @GEOS_LDFLAGS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
+LIBXML2_LIBS = @LIBXML2_LIBS@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 EXTRA_DIST = amphibious1.testcase \
 	amphibious2.testcase \
-	precision1.testcase \
-	precision2.testcase \
 	gpkg1.testcase \
 	gpkg2.testcase 
 
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -270,9 +268,9 @@ $(srcdir)/Makefile.in: # $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/sql_stmt_nocache_tests/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/sql_stmt_gpkgnocache_tests/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign test/sql_stmt_nocache_tests/Makefile
+	  $(AUTOMAKE) --foreign test/sql_stmt_gpkgnocache_tests/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -285,9 +283,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure: # $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
diff --git a/test/sql_stmt_nocache_tests/amphibious1.testcase b/test/sql_stmt_gpkgnocache_tests/amphibious1.testcase
similarity index 100%
rename from test/sql_stmt_nocache_tests/amphibious1.testcase
rename to test/sql_stmt_gpkgnocache_tests/amphibious1.testcase
diff --git a/test/sql_stmt_nocache_tests/amphibious2.testcase b/test/sql_stmt_gpkgnocache_tests/amphibious2.testcase
similarity index 100%
rename from test/sql_stmt_nocache_tests/amphibious2.testcase
rename to test/sql_stmt_gpkgnocache_tests/amphibious2.testcase
diff --git a/test/sql_stmt_nocache_tests/gpkg1.testcase b/test/sql_stmt_gpkgnocache_tests/gpkg1.testcase
similarity index 100%
rename from test/sql_stmt_nocache_tests/gpkg1.testcase
rename to test/sql_stmt_gpkgnocache_tests/gpkg1.testcase
diff --git a/test/sql_stmt_nocache_tests/gpkg2.testcase b/test/sql_stmt_gpkgnocache_tests/gpkg2.testcase
similarity index 100%
rename from test/sql_stmt_nocache_tests/gpkg2.testcase
rename to test/sql_stmt_gpkgnocache_tests/gpkg2.testcase
diff --git a/test/sql_stmt_libxml2_tests/registerStllGroupStyle2.testcase b/test/sql_stmt_libxml2_tests/registerStllGroupStyle2.testcase
deleted file mode 100644
index 9d7eaf0..0000000
--- a/test/sql_stmt_libxml2_tests/registerStllGroupStyle2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RegisterStyledGroupStyle - Integer group name
-:memory: #use in-memory database
-SELECT SE_RegisterStyledGroupStyle(1, 1);
-1 # rows (not including the header row)
-1 # columns
-SE_RegisterStyledGroupStyle(1, 1)
--1
diff --git a/test/sql_stmt_libxml2_tests/unregisterStllGroupStyle2.testcase b/test/sql_stmt_libxml2_tests/unregisterStllGroupStyle2.testcase
deleted file mode 100644
index 64122f8..0000000
--- a/test/sql_stmt_libxml2_tests/unregisterStllGroupStyle2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-UnRegisterStyledGroupStyle - Integer group name
-:memory: #use in-memory database
-SELECT SE_UnRegisterStyledGroupStyle(1, 1);
-1 # rows (not including the header row)
-1 # columns
-SE_UnRegisterStyledGroupStyle(1, 1)
--1
diff --git a/test/sql_stmt_lwgeom_20_tests/Makefile.am b/test/sql_stmt_lwgeom_20_tests/Makefile.am
deleted file mode 100644
index 7e3dd1d..0000000
--- a/test/sql_stmt_lwgeom_20_tests/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-
-EXTRA_DIST = st_asx3d25.testcase \
-	st_asx3d26.testcase \
-	st_asx3d30.testcase \
-	st_split8.testcase
diff --git a/test/sql_stmt_lwgeom_20_tests/st_asx3d25.testcase b/test/sql_stmt_lwgeom_20_tests/st_asx3d25.testcase
deleted file mode 100644
index 73e524f..0000000
--- a/test/sql_stmt_lwgeom_20_tests/st_asx3d25.testcase
+++ /dev/null
@@ -1,8 +0,0 @@
-ST_AsX3D - 3D linestring, 6 digit precision, short SRS
-:memory: #use in-memory database
-SELECT ST_AsX3D(GeomFromText('GEOMETRYCOLLECTIONZ(LINESTRINGZ(10.12345678 10.98765432 101.123, 11 10 102, 11.321 11.12 103.6453128), POINTZ(15.1234567 14.7654321 7.654321))', 4326), 6, 0);
-1 # rows (not including the header row)
-1 # columns
-ST_AsX3D(GeomFromText('GEOMETRYCOLLECTIONZ(LINESTRINGZ(10.12345678 10.98765432 101.123, 11 10 102, 11.321 11.12 103.6453128), POINTZ(15.1234567 14.7654321 7.654321))', 4326), 6, 0)
-<Shape>15.123457 14.765432 7.654321<Shape><LineSet  vertexCount='3'><Coordinate point='10.123457 10.987654 101.123 11 10 102 11.321 11.12 103.645313' /></LineSet>
-# <MultiGeometry srsName="epsg:4326"><geometryMember>15.123457 14.765432 7.654321</geometryMember><geometryMember><LineSet  vertexCount='3'><Coordinate point='10.123457 10.987654 101.123 11 10 102 11.321 11.12 103.645313' /></LineSet></geometryMember></MultiGeometry>:0
diff --git a/test/sql_stmt_lwgeom_20_tests/st_asx3d26.testcase b/test/sql_stmt_lwgeom_20_tests/st_asx3d26.testcase
deleted file mode 100644
index e09558d..0000000
--- a/test/sql_stmt_lwgeom_20_tests/st_asx3d26.testcase
+++ /dev/null
@@ -1,8 +0,0 @@
-ST_AsX3D - 3D linestring, 6 digit precision, long SRS
-:memory: #use in-memory database
-SELECT ST_AsX3D(GeomFromText('GEOMETRYCOLLECTIONZ(LINESTRINGZ(10.12345678 10.98765432 101.123, 11 10 102, 11.321 11.12 103.6453128), POINTZ(15.1234567 14.7654321 7.654321))', 4326), 6, 1);
-1 # rows (not including the header row)
-1 # columns
-ST_AsX3D(GeomFromText('GEOMETRYCOLLECTIONZ(LINESTRINGZ(10.12345678 10.98765432 101.123, 11 10 102, 11.321 11.12 103.6453128), POINTZ(15.1234567 14.7654321 7.654321))', 4326), 6, 1)
-<Shape>14.765432 15.123457 7.654321<Shape><LineSet  vertexCount='3'><Coordinate point='10.987654 10.123457 101.123 10 11 102 11.12 11.321 103.645313' /></LineSet>
-# <MultiGeometry srsName="urn:ogc:def:crs:epsg::4326"><geometryMember>15.123457 14.765432 7.654321</geometryMember><geometryMember><LineSet  vertexCount='3'><Coordinate point='10.123457 10.987654 101.123 11 10 102 11.321 11.12 103.645313' /></LineSet></geometryMember></MultiGeometry>:0
diff --git a/test/sql_stmt_lwgeom_20_tests/st_asx3d30.testcase b/test/sql_stmt_lwgeom_20_tests/st_asx3d30.testcase
deleted file mode 100644
index 5cb5225..0000000
--- a/test/sql_stmt_lwgeom_20_tests/st_asx3d30.testcase
+++ /dev/null
@@ -1,8 +0,0 @@
-ST_AsX3D - 3D linestring, 6 digit precision, long SRS, refid
-:memory: #use in-memory database
-SELECT ST_AsX3D(GeomFromText('GEOMETRYCOLLECTIONZ(LINESTRINGZ(10.12345678 10.98765432 101.123, 11 10 102, 11.321 11.12 103.6453128), POINTZ(15.1234567 14.7654321 7.654321))', 4326), 6, 1, 'test_');
-1 # rows (not including the header row)
-1 # columns
-ST_AsX3D(GeomFromText('GEOMETRYCOLLECTIONZ(LINESTRINGZ(10.12345678 10.98765432 101.123, 11 10 102, 11.321 11.12 103.6453128), POINTZ(15.1234567 14.7654321 7.654321))', 4326), 6, 1, 'test_')
-<Shapetest_>14.765432 15.123457 7.654321<Shapetest_><LineSet test_ vertexCount='3'><Coordinate point='10.987654 10.123457 101.123 10 11 102 11.12 11.321 103.645313' /></LineSet>
-# <test_MultiGeometry srsName="urn:ogc:def:crs:epsg::4326"><test_geometryMember>15.123457 14.765432 7.654321</test_geometryMember><test_geometryMember><LineSet test_ vertexCount='3'><Coordinate point='10.123457 10.987654 101.123 11 10 102 11.321 11.12 103.645313' /></LineSet></test_geometryMember></test_MultiGeometry>:0
diff --git a/test/sql_stmt_lwgeom_20_tests/st_split8.testcase b/test/sql_stmt_lwgeom_20_tests/st_split8.testcase
deleted file mode 100644
index 7caa8fd..0000000
--- a/test/sql_stmt_lwgeom_20_tests/st_split8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_Split - Line-Multiline (error)
-:memory: #use in-memory database
-SELECT ST_Split(GeomFromText('LINESTRING(0 1, 10 1)'), GeomFromText('MULTILINESTRING((3 0, 3 3), (5 0, 5 3))'));
-1 # rows (not including the header row)
-1 # columns
-ST_Split(GeomFromText('LINESTRING(0 1, 10 1)'), GeomFromText('MULTILINESTRING((3 0, 3 3), (5 0, 5 3))'))
-(NULL)
diff --git a/test/sql_stmt_lwgeom_22_tests/Makefile.am b/test/sql_stmt_lwgeom_22_tests/Makefile.am
deleted file mode 100644
index f49eb07..0000000
--- a/test/sql_stmt_lwgeom_22_tests/Makefile.am
+++ /dev/null
@@ -1,1019 +0,0 @@
-
-EXTRA_DIST = addedgemodface1.testcase \
-	addedgemodface2.testcase \
-	addedgemodface3.testcase \
-	addedgemodface4.testcase \
-	addedgemodface5.testcase \
-	addedgemodface6.testcase \
-	addedgemodface7.testcase \
-	addedgemodface8.testcase \
-	addedgemodface9.testcase \
-	addedgemodface10.testcase \
-	addedgemodface11.testcase \
-	addedgemodface12.testcase \
-	addedgemodface13.testcase \
-	addedgemodface14.testcase \
-	addedgemodface15.testcase \
-	addedgemodface16.testcase \
-	addedgemodface17.testcase \
-	addedgemodface18.testcase \
-	addedgemodface19.testcase \
-	addedgemodface20.testcase \
-	addedgenewfaces1.testcase \
-	addedgenewfaces2.testcase \
-	addedgenewfaces3.testcase \
-	addedgenewfaces4.testcase \
-	addedgenewfaces5.testcase \
-	addedgenewfaces6.testcase \
-	addedgenewfaces7.testcase \
-	addedgenewfaces8.testcase \
-	addedgenewfaces9.testcase \
-	addedgenewfaces10.testcase \
-	addedgenewfaces11.testcase \
-	addedgenewfaces12.testcase \
-	addedgenewfaces13.testcase \
-	addedgenewfaces14.testcase \
-	addedgenewfaces15.testcase \
-	addedgenewfaces16.testcase \
-	addedgenewfaces17.testcase \
-	addedgenewfaces18.testcase \
-	addedgenewfaces19.testcase \
-	addedgenewfaces20.testcase \
-	addisoedge1.testcase \
-	addisoedge2.testcase \
-	addisoedge3.testcase \
-	addisoedge4.testcase \
-	addisoedge5.testcase \
-	addisoedge6.testcase \
-	addisoedge7.testcase \
-	addisoedge8.testcase \
-	addisoedge9.testcase \
-	addisoedge10.testcase \
-	addisoedge11.testcase \
-	addisoedge12.testcase \
-	addisoedge13.testcase \
-	addisoedge14.testcase \
-	addisoedge15.testcase \
-	addisoedge16.testcase \
-	addisoedge17.testcase \
-	addisoedge18.testcase \
-	addisoedge19.testcase \
-	addisoedge20.testcase \
-	addisonetnode1.testcase \
-	addisonetnode2.testcase \
-	addisonetnode3.testcase \
-	addisonetnode4.testcase \
-	addisonetnode5.testcase \
-	addisonode1.testcase \
-	addisonode2.testcase \
-	addisonode3.testcase \
-	addisonode4.testcase \
-	addisonode5.testcase \
-	addisonode6.testcase \
-	addisonode7.testcase \
-	addisonode8.testcase \
-	addisonode9.testcase \
-	addisonode10.testcase \
-	addisonode11.testcase \
-	addisonode12.testcase \
-	addisonode13.testcase \
-	addisonode14.testcase \
-	addisonode15.testcase \
-	addisonode16.testcase \
-	addisonode17.testcase \
-	addisonode1.testcase \
-	addisonode2.testcase \
-	addisonode3.testcase \
-	addisonode4.testcase \
-	addisonode5.testcase \
-	addisonode6.testcase \
-	addisonode7.testcase \
-	addisonode8.testcase \
-	addisonode9.testcase \
-	addisonode10.testcase \
-	addisonode11.testcase \
-	addisonode12.testcase \
-	addisonode13.testcase \
-	addisonode14.testcase \
-	addisonode15.testcase \
-	addisonode16.testcase \
-	addisonode17.testcase \
-	addlink1.testcase \
-	addlink2.testcase \
-	addlink3.testcase \
-	addlink4.testcase \
-	addlink5.testcase \
-	addlink6.testcase \
-	addlink7.testcase \
-	addlink8.testcase \
-	addlink9.testcase \
-	addlink10.testcase \
-	addlink11.testcase \
-	addlink12.testcase \
-	addlink13.testcase \
-	changeedgegeom1.testcase \
-	changeedgegeom2.testcase \
-	changeedgegeom3.testcase \
-	changeedgegeom4.testcase \
-	changeedgegeom5.testcase \
-	changeedgegeom6.testcase \
-	changeedgegeom7.testcase \
-	changeedgegeom8.testcase \
-	changeedgegeom9.testcase \
-	changeedgegeom10.testcase \
-	changeedgegeom11.testcase \
-	changeedgegeom12.testcase \
-	changeedgegeom13.testcase \
-	changeedgegeom14.testcase \
-	changeedgegeom15.testcase \
-	changeedgegeom16.testcase \
-	changeedgegeom17.testcase \
-	changelinkgeom1.testcase \
-	changelinkgeom2.testcase \
-	changelinkgeom3.testcase \
-	changelinkgeom4.testcase \
-	changelinkgeom5.testcase \
-	changelinkgeom6.testcase \
-	changelinkgeom7.testcase \
-	changelinkgeom8.testcase \
-	createtopogeo1.testcase \
-	createtopogeo2.testcase \
-	createtopogeo3.testcase \
-	createtopogeo4.testcase \
-	createtopogeo5.testcase \
-	createtopogeo6.testcase \
-	createtopogeo7.testcase \
-	createtopogeo8.testcase \
-	createtopogeo9.testcase \
-	createtopogeo10.testcase \
-	createtopolayer1.testcase \
-	createtopolayer2.testcase \
-	createtopolayer3.testcase \
-	createtopolayer4.testcase \
-	createtopolayer5.testcase \
-	createtopolayer6.testcase \
-	createtopolayer7.testcase \
-	createtopolayer8.testcase \
-	createtopolayer9.testcase \
-	createtopolayer10.testcase \
-	createtopolayer11.testcase \
-	createtopolayer12.testcase \
-	createtopolayer13.testcase \
-	createtopolayer14.testcase \
-	createtopolayer15.testcase \
-	createtopolayer16.testcase \
-	createtopolayer17.testcase \
-	createtopolayer18.testcase \
-	createtopolayer19.testcase \
-	createtopolayer20.testcase \
-	createtopolayer21.testcase \
-	createtopolayer22.testcase \
-	createtopolayer23.testcase \
-	createtopolayer24.testcase \
-	createtopolayer25.testcase \
-	createtopolayer26.testcase \
-	createtopology1.testcase \
-	createtopology2.testcase \
-	createtopology3.testcase \
-	createtopology4.testcase \
-	createtopology5.testcase \
-	createtopology6.testcase \
-	createtopology7.testcase \
-	createtopology8.testcase \
-	createtopology9.testcase \
-	createtopology10.testcase \
-	createtopology11.testcase \
-	createtopology12.testcase \
-	createtopology13.testcase \
-	createtopology14.testcase \
-	createtopology15.testcase \
-	createtopology16.testcase \
-	createtopology17.testcase \
-	createtopology18.testcase \
-	createtopology19.testcase \
-	createtopology20.testcase \
-	createnetwork1.testcase \
-	createnetwork2.testcase \
-	createnetwork3.testcase \
-	createnetwork4.testcase \
-	createnetwork5.testcase \
-	createnetwork6.testcase \
-	createnetwork7.testcase \
-	createnetwork8.testcase \
-	createnetwork9.testcase \
-	createnetwork10.testcase \
-	createnetwork11.testcase \
-	createnetwork12.testcase \
-	createnetwork13.testcase \
-	createnetwork14.testcase \
-	createnetwork15.testcase \
-	createnetwork16.testcase \
-	createnetwork17.testcase \
-	createnetwork18.testcase \
-	createnetwork19.testcase \
-	createnetwork20.testcase \
-	createnetwork21.testcase \
-	createnetwork22.testcase \
-	createnetwork23.testcase \
-	createnetwork24.testcase \
-	createnetwork25.testcase \
-	droptopology1.testcase \
-	droptopology2.testcase \
-	droptopology3.testcase \
-	droptopology4.testcase \
-	droptopology5.testcase \
-	dropnetwork1.testcase \
-	dropnetwork2.testcase \
-	dropnetwork3.testcase \
-	dropnetwork4.testcase \
-	dropnetwork5.testcase \
-	exporttopolayer1.testcase \
-	exporttopolayer2.testcase \
-	exporttopolayer3.testcase \
-	exporttopolayer4.testcase \
-	exporttopolayer5.testcase \
-	exporttopolayer6.testcase \
-	exporttopolayer7.testcase \
-	exporttopolayer8.testcase \
-	exporttopolayer9.testcase \
-	exporttopolayer10.testcase \
-	exporttopolayer11.testcase \
-	exporttopolayer12.testcase \
-	exporttopolayer13.testcase \
-	exporttopolayer14.testcase \
-	exporttopolayer15.testcase \
-	exporttopolayer16.testcase \
-	exporttopolayer17.testcase \
-	exporttopolayer18.testcase \
-	exporttopolayer19.testcase \
-	exporttopolayer20.testcase \
-	exporttopolayer21.testcase \
-	exporttopolayer22.testcase \
-	exporttopolayer23.testcase \
-	featuretopolayer1.testcase \
-	featuretopolayer2.testcase \
-	featuretopolayer3.testcase \
-	featuretopolayer4.testcase \
-	featuretopolayer5.testcase \
-	featuretopolayer6.testcase \
-	featuretopolayer7.testcase \
-	featuretopolayer8.testcase \
-	featuretopolayer9.testcase \
-	featuretopolayer10.testcase \
-	featuretopolayer11.testcase \
-	featuretopolayer12.testcase \
-	featuretopolayer13.testcase \
-	featuretopolayer14.testcase \
-	featuretopolayer15.testcase \
-	featuretopolayer16.testcase \
-	featuretopolayer17.testcase \
-	getedgeseed1.testcase \
-	getedgeseed2.testcase \
-	getedgeseed3.testcase \
-	getedgeseed4.testcase \
-	getedgeseed5.testcase \
-	getedgeseed6.testcase \
-	getedgeseed7.testcase \
-	getedgeseed8.testcase \
-	getedgeseed9.testcase \
-	getlinkseed1.testcase \
-	getlinkseed2.testcase \
-	getlinkseed3.testcase \
-	getlinkseed4.testcase \
-	getlinkseed5.testcase \
-	getlinkseed6.testcase \
-	getlinkseed7.testcase \
-	getlinkseed8.testcase \
-	getlinkseed9.testcase \
-	getfaceedges1.testcase \
-	getfaceedges2.testcase \
-	getfaceedges3.testcase \
-	getfaceedges4.testcase \
-	getfaceedges5.testcase \
-	getfaceedges6.testcase \
-	getfaceedges7.testcase \
-	getfaceedges8.testcase \
-	getfaceedges9.testcase \
-	getfacegeometry1.testcase \
-	getfacegeometry2.testcase \
-	getfacegeometry3.testcase \
-	getfacegeometry4.testcase \
-	getfacegeometry5.testcase \
-	getfacegeometry6.testcase \
-	getfacegeometry7.testcase \
-	getfacegeometry8.testcase \
-	getfacegeometry9.testcase \
-	getedgebypoint1.testcase \
-	getedgebypoint2.testcase \
-	getedgebypoint3.testcase \
-	getedgebypoint4.testcase \
-	getedgebypoint5.testcase \
-	getedgebypoint6.testcase \
-	getedgebypoint7.testcase \
-	getedgebypoint8.testcase \
-	getedgebypoint9.testcase \
-	getedgebypoint10.testcase \
-	getedgebypoint11.testcase \
-	getedgebypoint12.testcase \
-	getedgebypoint13.testcase \
-	getedgebypoint14.testcase \
-	getedgebypoint15.testcase \
-	getedgebypoint16.testcase \
-	getedgebypoint17.testcase \
-	getfacegeometry1.testcase \
-	getfacegeometry2.testcase \
-	getfacegeometry3.testcase \
-	getfacegeometry4.testcase \
-	getfacegeometry5.testcase \
-	getfacegeometry6.testcase \
-	getfacegeometry7.testcase \
-	getfacegeometry8.testcase \
-	getfacegeometry9.testcase \
-	getfacebypoint1.testcase \
-	getfacebypoint2.testcase \
-	getfacebypoint3.testcase \
-	getfacebypoint4.testcase \
-	getfacebypoint5.testcase \
-	getfacebypoint6.testcase \
-	getfacebypoint7.testcase \
-	getfacebypoint8.testcase \
-	getfacebypoint9.testcase \
-	getfacebypoint10.testcase \
-	getfacebypoint11.testcase \
-	getfacebypoint12.testcase \
-	getfacebypoint13.testcase \
-	getfacebypoint14.testcase \
-	getfacebypoint15.testcase \
-	getfacebypoint16.testcase \
-	getfacebypoint17.testcase \
-	getfaceseed1.testcase \
-	getfaceseed2.testcase \
-	getfaceseed3.testcase \
-	getfaceseed4.testcase \
-	getfaceseed5.testcase \
-	getfaceseed6.testcase \
-	getfaceseed7.testcase \
-	getfaceseed8.testcase \
-	getfaceseed9.testcase \
-	getlinkbypoint1.testcase \
-	getlinkbypoint2.testcase \
-	getlinkbypoint3.testcase \
-	getlinkbypoint4.testcase \
-	getlinkbypoint5.testcase \
-	getlinkbypoint6.testcase \
-	getlinkbypoint7.testcase \
-	getlinkbypoint8.testcase \
-	getlinkbypoint9.testcase \
-	getlinkbypoint10.testcase \
-	getlinkbypoint11.testcase \
-	getlinkbypoint12.testcase \
-	getlinkbypoint13.testcase \
-	getlinkbypoint14.testcase \
-	getlinkbypoint15.testcase \
-	getlinkbypoint16.testcase \
-	getlinkbypoint17.testcase \
-	getnetnodebypoint1.testcase \
-	getnetnodebypoint2.testcase \
-	getnetnodebypoint3.testcase \
-	getnetnodebypoint4.testcase \
-	getnetnodebypoint5.testcase \
-	getnetnodebypoint6.testcase \
-	getnetnodebypoint7.testcase \
-	getnetnodebypoint8.testcase \
-	getnetnodebypoint9.testcase \
-	getnetnodebypoint10.testcase \
-	getnetnodebypoint11.testcase \
-	getnetnodebypoint12.testcase \
-	getnetnodebypoint13.testcase \
-	getnetnodebypoint14.testcase \
-	getnetnodebypoint15.testcase \
-	getnetnodebypoint16.testcase \
-	getnetnodebypoint17.testcase \
-	getnodebypoint1.testcase \
-	getnodebypoint2.testcase \
-	getnodebypoint3.testcase \
-	getnodebypoint4.testcase \
-	getnodebypoint5.testcase \
-	getnodebypoint6.testcase \
-	getnodebypoint7.testcase \
-	getnodebypoint8.testcase \
-	getnodebypoint9.testcase \
-	getnodebypoint10.testcase \
-	getnodebypoint11.testcase \
-	getnodebypoint12.testcase \
-	getnodebypoint13.testcase \
-	getnodebypoint14.testcase \
-	getnodebypoint15.testcase \
-	getnodebypoint16.testcase \
-	getnodebypoint17.testcase \
-	inittopolayer1.testcase \
-	inittopolayer2.testcase \
-	inittopolayer3.testcase \
-	inittopolayer4.testcase \
-	inittopolayer5.testcase \
-	inittopolayer6.testcase \
-	inittopolayer7.testcase \
-	inittopolayer8.testcase \
-	inittopolayer9.testcase \
-	inittopolayer10.testcase \
-	inittopolayer11.testcase \
-	inittopolayer12.testcase \
-	inittopolayer13.testcase \
-	inittopolayer14.testcase \
-	inittopolayer15.testcase \
-	inittopolayer16.testcase \
-	inittopolayer17.testcase \
-	linesnapseed1.testcase \
-	linesnapseed2.testcase \
-	linesnapseed3.testcase \
-	linesnapseed4.testcase \
-	linesnapseed5.testcase \
-	linesnapseed6.testcase \
-	linesnapseed7.testcase \
-	linesnapseed8.testcase \
-	linesnapseed9.testcase \
-	linesnapseed10.testcase \
-	linesnapseed11.testcase \
-	linesnapseed12.testcase \
-	linesnapseed13.testcase \
-	linesnapseed14.testcase \
-	linesnapseed15.testcase \
-	linesnapseed16.testcase \
-	linesnapseed17.testcase \
-	loginetfromtgeo1.testcase \
-	loginetfromtgeo2.testcase \
-	loginetfromtgeo3.testcase \
-	loginetfromtgeo4.testcase \
-	loginetfromtgeo5.testcase \
-	loginetfromtgeo6.testcase \
-	loginetfromtgeo7.testcase \
-	loginetfromtgeo8.testcase \
-	loginetfromtgeo9.testcase \
-	modedgeheal1.testcase \
-	modedgeheal2.testcase \
-	modedgeheal3.testcase \
-	modedgeheal4.testcase \
-	modedgeheal5.testcase \
-	modedgeheal6.testcase \
-	modedgeheal7.testcase \
-	modedgeheal8.testcase \
-	modedgeheal9.testcase \
-	modedgeheal10.testcase \
-	modedgeheal11.testcase \
-	modedgeheal12.testcase \
-	modedgeheal13.testcase \
-	modedgesplit1.testcase \
-	modedgesplit2.testcase \
-	modedgesplit3.testcase \
-	modedgesplit4.testcase \
-	modedgesplit5.testcase \
-	modedgesplit6.testcase \
-	modedgesplit7.testcase \
-	modedgesplit8.testcase \
-	modedgesplit9.testcase \
-	modedgesplit10.testcase \
-	modedgesplit11.testcase \
-	modedgesplit12.testcase \
-	modedgesplit13.testcase \
-	modedgesplit14.testcase \
-	modedgesplit15.testcase \
-	modedgesplit16.testcase \
-	modgeolinksplit1.testcase \
-	modgeolinksplit2.testcase \
-	modgeolinksplit3.testcase \
-	modgeolinksplit4.testcase \
-	modgeolinksplit5.testcase \
-	modgeolinksplit6.testcase \
-	modgeolinksplit7.testcase \
-	modgeolinksplit8.testcase \
-	modgeolinksplit9.testcase \
-	modlinkheal1.testcase \
-	modlinkheal2.testcase \
-	modlinkheal3.testcase \
-	modlinkheal4.testcase \
-	modlinkheal5.testcase \
-	modlinkheal6.testcase \
-	modlinkheal7.testcase \
-	modlinkheal8.testcase \
-	modlinkheal9.testcase \
-	modlinkheal10.testcase \
-	modlinkheal11.testcase \
-	modlinkheal12.testcase \
-	modlinkheal13.testcase \
-	modloglinksplit1.testcase \
-	modloglinksplit2.testcase \
-	modloglinksplit3.testcase \
-	modloglinksplit4.testcase \
-	modloglinksplit5.testcase \
-	modloglinksplit6.testcase \
-	modloglinksplit7.testcase \
-	modloglinksplit8.testcase \
-	modloglinksplit9.testcase \
-	moveisonetnode1.testcase \
-	moveisonetnode2.testcase \
-	moveisonetnode3.testcase \
-	moveisonetnode4.testcase \
-	moveisonetnode5.testcase \
-	moveisonetnode6.testcase \
-	moveisonetnode7.testcase \
-	moveisonetnode8.testcase \
-	moveisonetnode9.testcase \
-	moveisonode1.testcase \
-	moveisonode2.testcase \
-	moveisonode3.testcase \
-	moveisonode4.testcase \
-	moveisonode5.testcase \
-	moveisonode6.testcase \
-	moveisonode7.testcase \
-	moveisonode8.testcase \
-	moveisonode9.testcase \
-	moveisonode10.testcase \
-	moveisonode11.testcase \
-	moveisonode12.testcase \
-	moveisonode13.testcase \
-	moveisonode14.testcase \
-	moveisonode15.testcase \
-	moveisonode16.testcase \
-	moveisonode17.testcase \
-	netexception1.testcase \
-	netexception2.testcase \
-	newedgeheal1.testcase \
-	newedgeheal2.testcase \
-	newedgeheal3.testcase \
-	newedgeheal4.testcase \
-	newedgeheal5.testcase \
-	newedgeheal6.testcase \
-	newedgeheal7.testcase \
-	newedgeheal8.testcase \
-	newedgeheal9.testcase \
-	newedgeheal10.testcase \
-	newedgeheal11.testcase \
-	newedgeheal12.testcase \
-	newedgeheal13.testcase \
-	newedgessplit1.testcase \
-	newedgessplit2.testcase \
-	newedgessplit3.testcase \
-	newedgessplit4.testcase \
-	newedgessplit5.testcase \
-	newedgessplit6.testcase \
-	newedgessplit7.testcase \
-	newedgessplit8.testcase \
-	newedgessplit9.testcase \
-	newedgessplit10.testcase \
-	newedgessplit11.testcase \
-	newedgessplit12.testcase \
-	newedgessplit13.testcase \
-	newedgessplit14.testcase \
-	newedgessplit15.testcase \
-	newedgessplit16.testcase \
-	newgeolinksplit1.testcase \
-	newgeolinksplit2.testcase \
-	newgeolinksplit3.testcase \
-	newgeolinksplit4.testcase \
-	newgeolinksplit5.testcase \
-	newgeolinksplit6.testcase \
-	newgeolinksplit7.testcase \
-	newgeolinksplit8.testcase \
-	newgeolinksplit9.testcase \
-	newlinkheal1.testcase \
-	newlinkheal2.testcase \
-	newlinkheal3.testcase \
-	newlinkheal4.testcase \
-	newlinkheal5.testcase \
-	newlinkheal6.testcase \
-	newlinkheal7.testcase \
-	newlinkheal8.testcase \
-	newlinkheal9.testcase \
-	newlinkheal10.testcase \
-	newlinkheal11.testcase \
-	newlinkheal12.testcase \
-	newlinkheal13.testcase \
-	newloglinksplit1.testcase \
-	newloglinksplit2.testcase \
-	newloglinksplit3.testcase \
-	newloglinksplit4.testcase \
-	newloglinksplit5.testcase \
-	newloglinksplit6.testcase \
-	newloglinksplit7.testcase \
-	newloglinksplit8.testcase \
-	newloglinksplit9.testcase \
-	pointsnapseed1.testcase \
-	pointsnapseed2.testcase \
-	pointsnapseed3.testcase \
-	pointsnapseed4.testcase \
-	pointsnapseed5.testcase \
-	pointsnapseed6.testcase \
-	pointsnapseed7.testcase \
-	pointsnapseed8.testcase \
-	pointsnapseed9.testcase \
-	pointsnapseed10.testcase \
-	pointsnapseed11.testcase \
-	pointsnapseed12.testcase \
-	pointsnapseed13.testcase \
-	pointsnapseed14.testcase \
-	pointsnapseed15.testcase \
-	pointsnapseed16.testcase \
-	pointsnapseed17.testcase \
-	remedgemodface1.testcase \
-	remedgemodface2.testcase \
-	remedgemodface3.testcase \
-	remedgemodface4.testcase \
-	remedgemodface5.testcase \
-	remedgemodface6.testcase \
-	remedgemodface7.testcase \
-	remedgemodface8.testcase \
-	remedgemodface9.testcase \
-	remedgenewface1.testcase \
-	remedgenewface2.testcase \
-	remedgenewface3.testcase \
-	remedgenewface4.testcase \
-	remedgenewface5.testcase \
-	remedgenewface6.testcase \
-	remedgenewface7.testcase \
-	remedgenewface8.testcase \
-	remedgenewface9.testcase \
-	remisoedge1.testcase \
-	remisoedge2.testcase \
-	remisoedge3.testcase \
-	remisoedge4.testcase \
-	remisoedge5.testcase \
-	remisoedge6.testcase \
-	remisoedge7.testcase \
-	remisoedge8.testcase \
-	remisoedge9.testcase \
-	remisonode1.testcase \
-	remisonode2.testcase \
-	remisonode3.testcase \
-	remisonode4.testcase \
-	remisonode5.testcase \
-	remisonode6.testcase \
-	remisonode7.testcase \
-	remisonode8.testcase \
-	remisonode9.testcase \
-	remisonetnode1.testcase \
-	remisonetnode2.testcase \
-	remisonetnode3.testcase \
-	remisonetnode4.testcase \
-	remisonetnode5.testcase \
-	remisonetnode6.testcase \
-	remisonetnode7.testcase \
-	remisonetnode8.testcase \
-	remisonetnode9.testcase \
-	remlink1.testcase \
-	remlink2.testcase \
-	remlink3.testcase \
-	remlink4.testcase \
-	remlink5.testcase \
-	remlink6.testcase \
-	remlink7.testcase \
-	remlink8.testcase \
-	remlink9.testcase \
-	removetopolayer1.testcase \
-	removetopolayer2.testcase \
-	removetopolayer3.testcase \
-	removetopolayer4.testcase \
-	removetopolayer5.testcase \
-	removetopolayer6.testcase \
-	removetopolayer7.testcase \
-	removetopolayer8.testcase \
-	removetopolayer9.testcase \
-	spatnetfromtgeo1.testcase \
-	spatnetfromtgeo2.testcase \
-	spatnetfromtgeo3.testcase \
-	spatnetfromtgeo4.testcase \
-	spatnetfromtgeo5.testcase \
-	spatnetfromtgeo6.testcase \
-	spatnetfromtgeo7.testcase \
-	spatnetfromtgeo8.testcase \
-	spatnetfromtgeo9.testcase \
-	spatnetfromgeom1.testcase \
-	spatnetfromgeom2.testcase \
-	spatnetfromgeom3.testcase \
-	spatnetfromgeom4.testcase \
-	spatnetfromgeom5.testcase \
-	spatnetfromgeom6.testcase \
-	spatnetfromgeom7.testcase \
-	spatnetfromgeom8.testcase \
-	spatnetfromgeom9.testcase \
-	spatnetfromgeom10.testcase \
-	topoexception1.testcase \
-	topoexception2.testcase \
-	topogeoaddpoint1.testcase \
-	topogeoaddpoint2.testcase \
-	topogeoaddpoint3.testcase \
-	topogeoaddpoint4.testcase \
-	topogeoaddpoint5.testcase \
-	topogeoaddpoint6.testcase \
-	topogeoaddpoint7.testcase \
-	topogeoaddpoint8.testcase \
-	topogeoaddpoint9.testcase \
-	topogeoaddpoint10.testcase \
-	topogeoaddpoint11.testcase \
-	topogeoaddpoint12.testcase \
-	topogeoaddpoint13.testcase \
-	topogeoaddpoint14.testcase \
-	topogeoaddpoint15.testcase \
-	topogeoaddpoint16.testcase \
-	topogeoaddpoint17.testcase \
-	topogeoaddline1.testcase \
-	topogeoaddline2.testcase \
-	topogeoaddline3.testcase \
-	topogeoaddline4.testcase \
-	topogeoaddline5.testcase \
-	topogeoaddline6.testcase \
-	topogeoaddline7.testcase \
-	topogeoaddline8.testcase \
-	topogeoaddline9.testcase \
-	topogeoaddline10.testcase \
-	topogeoaddline11.testcase \
-	topogeoaddline12.testcase \
-	topogeoaddline13.testcase \
-	topogeoaddline14.testcase \
-	topogeoaddline15.testcase \
-	topogeoaddline16.testcase \
-	topogeoaddline17.testcase \
-	topogeoclone1.testcase \
-	topogeoclone2.testcase \
-	topogeoclone3.testcase \
-	topogeoclone4.testcase \
-	topogeoclone5.testcase \
-	topogeoclone6.testcase \
-	topogeoclone7.testcase \
-	topogeoclone8.testcase \
-	topogeoclone9.testcase \
-	topogeoclone10.testcase \
-	topogeoclone11.testcase \
-	topogeoclone12.testcase \
-	topogeofromext1.testcase \
-	topogeofromext2.testcase \
-	topogeofromext3.testcase \
-	topogeofromext4.testcase \
-	topogeofromext5.testcase \
-	topogeofromext6.testcase \
-	topogeofromext7.testcase \
-	topogeofromext8.testcase \
-	topogeofromext9.testcase \
-	topogeofromext10.testcase \
-	topogeofromext11.testcase \
-	topogeofromext12.testcase \
-	topogeofromext13.testcase \
-	topogeofromext14.testcase \
-	topogeofromext15.testcase \
-	topogeofromext16.testcase \
-	topogeofromext17.testcase \
-	topogeofromext18.testcase \
-	topogeofromext19.testcase \
-	topogeofromext20.testcase \
-	topogeofromext21.testcase \
-	topogeofromext22.testcase \
-	topogeofromext23.testcase \
-	topogeofromext24.testcase \
-	topogeofromext25.testcase \
-	topogeofromext26.testcase \
-	topogeofromext27.testcase \
-	topogeofromext28.testcase \
-	topogeofromext29.testcase \
-	topogeofromext30.testcase \
-	topogeofromext31.testcase \
-	topogeofromext32.testcase \
-	topogeofromext33.testcase \
-	topogeofromext34.testcase \
-	topogeofromext35.testcase \
-	topogeofromext36.testcase \
-	topogeofromext37.testcase \
-	topogeofromext38.testcase \
-	topogeofromext39.testcase \
-	topogeofromtable1.testcase \
-	topogeofromtable2.testcase \
-	topogeofromtable3.testcase \
-	topogeofromtable4.testcase \
-	topogeofromtable5.testcase \
-	topogeofromtable6.testcase \
-	topogeofromtable7.testcase \
-	topogeofromtable8.testcase \
-	topogeofromtable9.testcase \
-	topogeofromtable10.testcase \
-	topogeofromtable11.testcase \
-	topogeofromtable12.testcase \
-	topogeofromtable13.testcase \
-	topogeofromtable14.testcase \
-	topogeofromtable15.testcase \
-	topogeofromtable16.testcase \
-	topogeofromtable17.testcase \
-	topogeofromtable18.testcase \
-	topogeofromtable19.testcase \
-	topogeofromtable20.testcase \
-	topogeofromtable21.testcase \
-	topogeofromtable22.testcase \
-	topogeofromtable23.testcase \
-	topogeofromtable24.testcase \
-	topogeofromtable25.testcase \
-	topogeofromtable26.testcase \
-	topogeofromtable27.testcase \
-	topogeofromtable28.testcase \
-	topogeofromtable29.testcase \
-	topogeofromtable30.testcase \
-	topogeosplitline1.testcase \
-	topogeosplitline2.testcase \
-	topogeosplitline3.testcase \
-	topogeosplitline4.testcase \
-	topogeosplitline5.testcase \
-	topogeosplitline6.testcase \
-	topogeosplitline7.testcase \
-	topogeosplitline8.testcase \
-	topogeosplitline9.testcase \
-	topogeosplitline10.testcase \
-	topogeosplitline11.testcase \
-	topogeosplitline12.testcase \
-	topogeosplitline13.testcase \
-	topogeosplitline14.testcase \
-	topogeosplitline15.testcase \
-	topogeosplitline16.testcase \
-	topogeoremovesmall1.testcase \
-	topogeoremovesmall2.testcase \
-	topogeoremovesmall3.testcase \
-	topogeoremovesmall4.testcase \
-	topogeoremovesmall5.testcase \
-	topogeoremovesmall6.testcase \
-	topogeoremovesmall7.testcase \
-	topogeoremovesmall8.testcase \
-	topogeoremovesmall9.testcase \
-	topogeoremoveedges1.testcase \
-	topogeoremoveedges2.testcase \
-	topogeoremoveedges3.testcase \
-	topogeoremoveedges4.testcase \
-	topogeoremoveedges5.testcase \
-	topogeoremovenodes1.testcase \
-	topogeoremovenodes2.testcase \
-	topogeoremovenodes3.testcase \
-	topogeoremovenodes4.testcase \
-	topogeoremovenodes5.testcase \
-	topogeototable1.testcase \
-	topogeototable2.testcase \
-	topogeototable3.testcase \
-	topogeototable4.testcase \
-	topogeototable5.testcase \
-	topogeototable6.testcase \
-	topogeototable7.testcase \
-	topogeototable8.testcase \
-	topogeototable9.testcase \
-	topogeototable10.testcase \
-	topogeototable11.testcase \
-	topogeototable12.testcase \
-	topogeototable13.testcase \
-	topogeototable14.testcase \
-	topogeototable15.testcase \
-	topogeototable16.testcase \
-	topogeototable17.testcase \
-	topogeototable18.testcase \
-	topogeototable19.testcase \
-	topogeototable20.testcase \
-	topogeototable21.testcase \
-	topogeototable22.testcase \
-	topogeototable23.testcase \
-	topogeototable24.testcase \
-	topogeototable25.testcase \
-	topogeototable26.testcase \
-	topogeototablegen1.testcase \
-	topogeototablegen2.testcase \
-	topogeototablegen3.testcase \
-	topogeototablegen4.testcase \
-	topogeototablegen5.testcase \
-	topogeototablegen6.testcase \
-	topogeototablegen7.testcase \
-	topogeototablegen8.testcase \
-	topogeototablegen9.testcase \
-	topogeototablegen10.testcase \
-	topogeototablegen11.testcase \
-	topogeototablegen12.testcase \
-	topogeototablegen13.testcase \
-	topogeototablegen14.testcase \
-	topogeototablegen15.testcase \
-	topogeototablegen16.testcase \
-	topogeototablegen17.testcase \
-	topogeototablegen18.testcase \
-	topogeototablegen19.testcase \
-	topogeototablegen20.testcase \
-	topogeototablegen21.testcase \
-	topogeototablegen22.testcase \
-	topogeototablegen23.testcase \
-	topogeototablegen24.testcase \
-	topogeototablegen25.testcase \
-	topogeototablegen26.testcase \
-	topogeototablegen27.testcase \
-	topogeototablegen28.testcase \
-	topogeototablegen29.testcase \
-	topogeototablegen30.testcase \
-	topogeototablegen31.testcase \
-	topogeoupdateseeds1.testcase \
-	topogeoupdateseeds2.testcase \
-	topogeoupdateseeds3.testcase \
-	topogeoupdateseeds4.testcase \
-	topogeoupdateseeds5.testcase \
-	topogeoupdateseeds6.testcase \
-	topogeoupdateseeds7.testcase \
-	topogeoupdateseeds8.testcase \
-	topogeoupdateseeds9.testcase \
-	topogeoupdateseeds10.testcase \
-	toponetclone1.testcase \
-	toponetclone2.testcase \
-	toponetclone3.testcase \
-	toponetclone4.testcase \
-	toponetclone5.testcase \
-	toponetclone6.testcase \
-	toponetclone7.testcase \
-	toponetclone8.testcase \
-	toponetclone9.testcase \
-	toponetclone10.testcase \
-	toponetclone11.testcase \
-	toponetclone12.testcase \
-	toponetfromtable1.testcase \
-	toponetfromtable2.testcase \
-	toponetfromtable3.testcase \
-	toponetfromtable4.testcase \
-	toponetfromtable5.testcase \
-	toponetfromtable6.testcase \
-	toponetfromtable7.testcase \
-	toponetfromtable8.testcase \
-	toponetfromtable9.testcase \
-	toponetfromtable10.testcase \
-	toponetfromtable11.testcase \
-	toponetfromtable12.testcase \
-	toponetfromtable13.testcase \
-	toponetfromtable14.testcase \
-	toponetfromtable15.testcase \
-	toponetfromtable16.testcase \
-	toponetfromtable17.testcase \
-	toponettotable1.testcase \
-	toponettotable2.testcase \
-	toponettotable3.testcase \
-	toponettotable4.testcase \
-	toponettotable5.testcase \
-	toponettotable6.testcase \
-	toponettotable7.testcase \
-	toponettotable8.testcase \
-	toponettotable9.testcase \
-	toponettotable10.testcase \
-	toponettotable11.testcase \
-	toponettotable12.testcase \
-	toponettotable13.testcase \
-	toponettotable14.testcase \
-	toponettotable15.testcase \
-	toponettotable16.testcase \
-	toponettotable17.testcase \
-	toponettotable18.testcase \
-	toponettotable19.testcase \
-	toponettotable20.testcase \
-	toponettotable21.testcase \
-	toponettotable22.testcase \
-	toponettotable23.testcase \
-	toponettotable24.testcase \
-	toponettotable25.testcase \
-	toponettotable26.testcase \
-	toponettotablegen1.testcase \
-	toponettotablegen2.testcase \
-	toponettotablegen3.testcase \
-	toponettotablegen4.testcase \
-	toponettotablegen5.testcase \
-	toponettotablegen6.testcase \
-	toponettotablegen7.testcase \
-	toponettotablegen8.testcase \
-	toponettotablegen9.testcase \
-	toponettotablegen10.testcase \
-	toponettotablegen11.testcase \
-	toponettotablegen12.testcase \
-	toponettotablegen13.testcase \
-	toponettotablegen14.testcase \
-	toponettotablegen15.testcase \
-	toponettotablegen16.testcase \
-	toponettotablegen17.testcase \
-	toponettotablegen18.testcase \
-	toponettotablegen19.testcase \
-	toponettotablegen20.testcase \
-	toponettotablegen21.testcase \
-	toponettotablegen22.testcase \
-	toponettotablegen23.testcase \
-	toponettotablegen24.testcase \
-	toponettotablegen25.testcase \
-	toponettotablegen26.testcase \
-	toponettotablegen27.testcase \
-	toponettotablegen28.testcase \
-	toponettotablegen29.testcase \
-	toponettotablegen30.testcase \
-	toponettotablegen31.testcase \
-	validatetopogeo1.testcase \
-	validatetopogeo2.testcase \
-	validatetopogeo3.testcase \
-	validatetopogeo4.testcase \
-	validatetopogeo5.testcase \
-	validlogicalnet1.testcase \
-	validlogicalnet2.testcase \
-	validlogicalnet3.testcase \
-	validlogicalnet4.testcase \
-	validlogicalnet5.testcase \
-	validspatialnet1.testcase \
-	validspatialnet2.testcase \
-	validspatialnet3.testcase \
-	validspatialnet4.testcase \
-	validspatialnet5.testcase
-	
diff --git a/test/sql_stmt_lwgeom_22_tests/Makefile.in b/test/sql_stmt_lwgeom_22_tests/Makefile.in
deleted file mode 100644
index 797ccf5..0000000
--- a/test/sql_stmt_lwgeom_22_tests/Makefile.in
+++ /dev/null
@@ -1,1466 +0,0 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
- at SET_MAKE@
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = test/sql_stmt_rttopo_tests
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_ at AM_V@)
-am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_ at AM_V@)
-am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_ at AM_V@)
-am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GEOSCONFIG = @GEOSCONFIG@
-GEOS_CFLAGS = @GEOS_CFLAGS@
-GEOS_LDFLAGS = @GEOS_LDFLAGS@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
-LIBXML2_LIBS = @LIBXML2_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-EXTRA_DIST = addedgemodface1.testcase \
-	addedgemodface2.testcase \
-	addedgemodface3.testcase \
-	addedgemodface4.testcase \
-	addedgemodface5.testcase \
-	addedgemodface6.testcase \
-	addedgemodface7.testcase \
-	addedgemodface8.testcase \
-	addedgemodface9.testcase \
-	addedgemodface10.testcase \
-	addedgemodface11.testcase \
-	addedgemodface12.testcase \
-	addedgemodface13.testcase \
-	addedgemodface14.testcase \
-	addedgemodface15.testcase \
-	addedgemodface16.testcase \
-	addedgemodface17.testcase \
-	addedgemodface18.testcase \
-	addedgemodface19.testcase \
-	addedgemodface20.testcase \
-	addedgenewfaces1.testcase \
-	addedgenewfaces2.testcase \
-	addedgenewfaces3.testcase \
-	addedgenewfaces4.testcase \
-	addedgenewfaces5.testcase \
-	addedgenewfaces6.testcase \
-	addedgenewfaces7.testcase \
-	addedgenewfaces8.testcase \
-	addedgenewfaces9.testcase \
-	addedgenewfaces10.testcase \
-	addedgenewfaces11.testcase \
-	addedgenewfaces12.testcase \
-	addedgenewfaces13.testcase \
-	addedgenewfaces14.testcase \
-	addedgenewfaces15.testcase \
-	addedgenewfaces16.testcase \
-	addedgenewfaces17.testcase \
-	addedgenewfaces18.testcase \
-	addedgenewfaces19.testcase \
-	addedgenewfaces20.testcase \
-	addisoedge1.testcase \
-	addisoedge2.testcase \
-	addisoedge3.testcase \
-	addisoedge4.testcase \
-	addisoedge5.testcase \
-	addisoedge6.testcase \
-	addisoedge7.testcase \
-	addisoedge8.testcase \
-	addisoedge9.testcase \
-	addisoedge10.testcase \
-	addisoedge11.testcase \
-	addisoedge12.testcase \
-	addisoedge13.testcase \
-	addisoedge14.testcase \
-	addisoedge15.testcase \
-	addisoedge16.testcase \
-	addisoedge17.testcase \
-	addisoedge18.testcase \
-	addisoedge19.testcase \
-	addisoedge20.testcase \
-	addisonetnode1.testcase \
-	addisonetnode2.testcase \
-	addisonetnode3.testcase \
-	addisonetnode4.testcase \
-	addisonetnode5.testcase \
-	addisonode1.testcase \
-	addisonode2.testcase \
-	addisonode3.testcase \
-	addisonode4.testcase \
-	addisonode5.testcase \
-	addisonode6.testcase \
-	addisonode7.testcase \
-	addisonode8.testcase \
-	addisonode9.testcase \
-	addisonode10.testcase \
-	addisonode11.testcase \
-	addisonode12.testcase \
-	addisonode13.testcase \
-	addisonode14.testcase \
-	addisonode15.testcase \
-	addisonode16.testcase \
-	addisonode17.testcase \
-	addisonode1.testcase \
-	addisonode2.testcase \
-	addisonode3.testcase \
-	addisonode4.testcase \
-	addisonode5.testcase \
-	addisonode6.testcase \
-	addisonode7.testcase \
-	addisonode8.testcase \
-	addisonode9.testcase \
-	addisonode10.testcase \
-	addisonode11.testcase \
-	addisonode12.testcase \
-	addisonode13.testcase \
-	addisonode14.testcase \
-	addisonode15.testcase \
-	addisonode16.testcase \
-	addisonode17.testcase \
-	addlink1.testcase \
-	addlink2.testcase \
-	addlink3.testcase \
-	addlink4.testcase \
-	addlink5.testcase \
-	addlink6.testcase \
-	addlink7.testcase \
-	addlink8.testcase \
-	addlink9.testcase \
-	addlink10.testcase \
-	addlink11.testcase \
-	addlink12.testcase \
-	addlink13.testcase \
-	changeedgegeom1.testcase \
-	changeedgegeom2.testcase \
-	changeedgegeom3.testcase \
-	changeedgegeom4.testcase \
-	changeedgegeom5.testcase \
-	changeedgegeom6.testcase \
-	changeedgegeom7.testcase \
-	changeedgegeom8.testcase \
-	changeedgegeom9.testcase \
-	changeedgegeom10.testcase \
-	changeedgegeom11.testcase \
-	changeedgegeom12.testcase \
-	changeedgegeom13.testcase \
-	changeedgegeom14.testcase \
-	changeedgegeom15.testcase \
-	changeedgegeom16.testcase \
-	changeedgegeom17.testcase \
-	changelinkgeom1.testcase \
-	changelinkgeom2.testcase \
-	changelinkgeom3.testcase \
-	changelinkgeom4.testcase \
-	changelinkgeom5.testcase \
-	changelinkgeom6.testcase \
-	changelinkgeom7.testcase \
-	changelinkgeom8.testcase \
-	createtopogeo1.testcase \
-	createtopogeo2.testcase \
-	createtopogeo3.testcase \
-	createtopogeo4.testcase \
-	createtopogeo5.testcase \
-	createtopogeo6.testcase \
-	createtopogeo7.testcase \
-	createtopogeo8.testcase \
-	createtopogeo9.testcase \
-	createtopogeo10.testcase \
-	createtopolayer1.testcase \
-	createtopolayer2.testcase \
-	createtopolayer3.testcase \
-	createtopolayer4.testcase \
-	createtopolayer5.testcase \
-	createtopolayer6.testcase \
-	createtopolayer7.testcase \
-	createtopolayer8.testcase \
-	createtopolayer9.testcase \
-	createtopolayer10.testcase \
-	createtopolayer11.testcase \
-	createtopolayer12.testcase \
-	createtopolayer13.testcase \
-	createtopolayer14.testcase \
-	createtopolayer15.testcase \
-	createtopolayer16.testcase \
-	createtopolayer17.testcase \
-	createtopolayer18.testcase \
-	createtopolayer19.testcase \
-	createtopolayer20.testcase \
-	createtopolayer21.testcase \
-	createtopolayer22.testcase \
-	createtopolayer23.testcase \
-	createtopolayer24.testcase \
-	createtopolayer25.testcase \
-	createtopolayer26.testcase \
-	createtopology1.testcase \
-	createtopology2.testcase \
-	createtopology3.testcase \
-	createtopology4.testcase \
-	createtopology5.testcase \
-	createtopology6.testcase \
-	createtopology7.testcase \
-	createtopology8.testcase \
-	createtopology9.testcase \
-	createtopology10.testcase \
-	createtopology11.testcase \
-	createtopology12.testcase \
-	createtopology13.testcase \
-	createtopology14.testcase \
-	createtopology15.testcase \
-	createtopology16.testcase \
-	createtopology17.testcase \
-	createtopology18.testcase \
-	createtopology19.testcase \
-	createtopology20.testcase \
-	createnetwork1.testcase \
-	createnetwork2.testcase \
-	createnetwork3.testcase \
-	createnetwork4.testcase \
-	createnetwork5.testcase \
-	createnetwork6.testcase \
-	createnetwork7.testcase \
-	createnetwork8.testcase \
-	createnetwork9.testcase \
-	createnetwork10.testcase \
-	createnetwork11.testcase \
-	createnetwork12.testcase \
-	createnetwork13.testcase \
-	createnetwork14.testcase \
-	createnetwork15.testcase \
-	createnetwork16.testcase \
-	createnetwork17.testcase \
-	createnetwork18.testcase \
-	createnetwork19.testcase \
-	createnetwork20.testcase \
-	createnetwork21.testcase \
-	createnetwork22.testcase \
-	createnetwork23.testcase \
-	createnetwork24.testcase \
-	createnetwork25.testcase \
-	droptopology1.testcase \
-	droptopology2.testcase \
-	droptopology3.testcase \
-	droptopology4.testcase \
-	droptopology5.testcase \
-	dropnetwork1.testcase \
-	dropnetwork2.testcase \
-	dropnetwork3.testcase \
-	dropnetwork4.testcase \
-	dropnetwork5.testcase \
-	exporttopolayer1.testcase \
-	exporttopolayer2.testcase \
-	exporttopolayer3.testcase \
-	exporttopolayer4.testcase \
-	exporttopolayer5.testcase \
-	exporttopolayer6.testcase \
-	exporttopolayer7.testcase \
-	exporttopolayer8.testcase \
-	exporttopolayer9.testcase \
-	exporttopolayer10.testcase \
-	exporttopolayer11.testcase \
-	exporttopolayer12.testcase \
-	exporttopolayer13.testcase \
-	exporttopolayer14.testcase \
-	exporttopolayer15.testcase \
-	exporttopolayer16.testcase \
-	exporttopolayer17.testcase \
-	exporttopolayer18.testcase \
-	exporttopolayer19.testcase \
-	exporttopolayer20.testcase \
-	exporttopolayer21.testcase \
-	exporttopolayer22.testcase \
-	exporttopolayer23.testcase \
-	featuretopolayer1.testcase \
-	featuretopolayer2.testcase \
-	featuretopolayer3.testcase \
-	featuretopolayer4.testcase \
-	featuretopolayer5.testcase \
-	featuretopolayer6.testcase \
-	featuretopolayer7.testcase \
-	featuretopolayer8.testcase \
-	featuretopolayer9.testcase \
-	featuretopolayer10.testcase \
-	featuretopolayer11.testcase \
-	featuretopolayer12.testcase \
-	featuretopolayer13.testcase \
-	featuretopolayer14.testcase \
-	featuretopolayer15.testcase \
-	featuretopolayer16.testcase \
-	featuretopolayer17.testcase \
-	getedgeseed1.testcase \
-	getedgeseed2.testcase \
-	getedgeseed3.testcase \
-	getedgeseed4.testcase \
-	getedgeseed5.testcase \
-	getedgeseed6.testcase \
-	getedgeseed7.testcase \
-	getedgeseed8.testcase \
-	getedgeseed9.testcase \
-	getlinkseed1.testcase \
-	getlinkseed2.testcase \
-	getlinkseed3.testcase \
-	getlinkseed4.testcase \
-	getlinkseed5.testcase \
-	getlinkseed6.testcase \
-	getlinkseed7.testcase \
-	getlinkseed8.testcase \
-	getlinkseed9.testcase \
-	getfaceedges1.testcase \
-	getfaceedges2.testcase \
-	getfaceedges3.testcase \
-	getfaceedges4.testcase \
-	getfaceedges5.testcase \
-	getfaceedges6.testcase \
-	getfaceedges7.testcase \
-	getfaceedges8.testcase \
-	getfaceedges9.testcase \
-	getfacegeometry1.testcase \
-	getfacegeometry2.testcase \
-	getfacegeometry3.testcase \
-	getfacegeometry4.testcase \
-	getfacegeometry5.testcase \
-	getfacegeometry6.testcase \
-	getfacegeometry7.testcase \
-	getfacegeometry8.testcase \
-	getfacegeometry9.testcase \
-	getedgebypoint1.testcase \
-	getedgebypoint2.testcase \
-	getedgebypoint3.testcase \
-	getedgebypoint4.testcase \
-	getedgebypoint5.testcase \
-	getedgebypoint6.testcase \
-	getedgebypoint7.testcase \
-	getedgebypoint8.testcase \
-	getedgebypoint9.testcase \
-	getedgebypoint10.testcase \
-	getedgebypoint11.testcase \
-	getedgebypoint12.testcase \
-	getedgebypoint13.testcase \
-	getedgebypoint14.testcase \
-	getedgebypoint15.testcase \
-	getedgebypoint16.testcase \
-	getedgebypoint17.testcase \
-	getfacegeometry1.testcase \
-	getfacegeometry2.testcase \
-	getfacegeometry3.testcase \
-	getfacegeometry4.testcase \
-	getfacegeometry5.testcase \
-	getfacegeometry6.testcase \
-	getfacegeometry7.testcase \
-	getfacegeometry8.testcase \
-	getfacegeometry9.testcase \
-	getfacebypoint1.testcase \
-	getfacebypoint2.testcase \
-	getfacebypoint3.testcase \
-	getfacebypoint4.testcase \
-	getfacebypoint5.testcase \
-	getfacebypoint6.testcase \
-	getfacebypoint7.testcase \
-	getfacebypoint8.testcase \
-	getfacebypoint9.testcase \
-	getfacebypoint10.testcase \
-	getfacebypoint11.testcase \
-	getfacebypoint12.testcase \
-	getfacebypoint13.testcase \
-	getfacebypoint14.testcase \
-	getfacebypoint15.testcase \
-	getfacebypoint16.testcase \
-	getfacebypoint17.testcase \
-	getfaceseed1.testcase \
-	getfaceseed2.testcase \
-	getfaceseed3.testcase \
-	getfaceseed4.testcase \
-	getfaceseed5.testcase \
-	getfaceseed6.testcase \
-	getfaceseed7.testcase \
-	getfaceseed8.testcase \
-	getfaceseed9.testcase \
-	getlinkbypoint1.testcase \
-	getlinkbypoint2.testcase \
-	getlinkbypoint3.testcase \
-	getlinkbypoint4.testcase \
-	getlinkbypoint5.testcase \
-	getlinkbypoint6.testcase \
-	getlinkbypoint7.testcase \
-	getlinkbypoint8.testcase \
-	getlinkbypoint9.testcase \
-	getlinkbypoint10.testcase \
-	getlinkbypoint11.testcase \
-	getlinkbypoint12.testcase \
-	getlinkbypoint13.testcase \
-	getlinkbypoint14.testcase \
-	getlinkbypoint15.testcase \
-	getlinkbypoint16.testcase \
-	getlinkbypoint17.testcase \
-	getnetnodebypoint1.testcase \
-	getnetnodebypoint2.testcase \
-	getnetnodebypoint3.testcase \
-	getnetnodebypoint4.testcase \
-	getnetnodebypoint5.testcase \
-	getnetnodebypoint6.testcase \
-	getnetnodebypoint7.testcase \
-	getnetnodebypoint8.testcase \
-	getnetnodebypoint9.testcase \
-	getnetnodebypoint10.testcase \
-	getnetnodebypoint11.testcase \
-	getnetnodebypoint12.testcase \
-	getnetnodebypoint13.testcase \
-	getnetnodebypoint14.testcase \
-	getnetnodebypoint15.testcase \
-	getnetnodebypoint16.testcase \
-	getnetnodebypoint17.testcase \
-	getnodebypoint1.testcase \
-	getnodebypoint2.testcase \
-	getnodebypoint3.testcase \
-	getnodebypoint4.testcase \
-	getnodebypoint5.testcase \
-	getnodebypoint6.testcase \
-	getnodebypoint7.testcase \
-	getnodebypoint8.testcase \
-	getnodebypoint9.testcase \
-	getnodebypoint10.testcase \
-	getnodebypoint11.testcase \
-	getnodebypoint12.testcase \
-	getnodebypoint13.testcase \
-	getnodebypoint14.testcase \
-	getnodebypoint15.testcase \
-	getnodebypoint16.testcase \
-	getnodebypoint17.testcase \
-	inittopolayer1.testcase \
-	inittopolayer2.testcase \
-	inittopolayer3.testcase \
-	inittopolayer4.testcase \
-	inittopolayer5.testcase \
-	inittopolayer6.testcase \
-	inittopolayer7.testcase \
-	inittopolayer8.testcase \
-	inittopolayer9.testcase \
-	inittopolayer10.testcase \
-	inittopolayer11.testcase \
-	inittopolayer12.testcase \
-	inittopolayer13.testcase \
-	inittopolayer14.testcase \
-	inittopolayer15.testcase \
-	inittopolayer16.testcase \
-	inittopolayer17.testcase \
-	linesnapseed1.testcase \
-	linesnapseed2.testcase \
-	linesnapseed3.testcase \
-	linesnapseed4.testcase \
-	linesnapseed5.testcase \
-	linesnapseed6.testcase \
-	linesnapseed7.testcase \
-	linesnapseed8.testcase \
-	linesnapseed9.testcase \
-	linesnapseed10.testcase \
-	linesnapseed11.testcase \
-	linesnapseed12.testcase \
-	linesnapseed13.testcase \
-	linesnapseed14.testcase \
-	linesnapseed15.testcase \
-	linesnapseed16.testcase \
-	linesnapseed17.testcase \
-	loginetfromtgeo1.testcase \
-	loginetfromtgeo2.testcase \
-	loginetfromtgeo3.testcase \
-	loginetfromtgeo4.testcase \
-	loginetfromtgeo5.testcase \
-	loginetfromtgeo6.testcase \
-	loginetfromtgeo7.testcase \
-	loginetfromtgeo8.testcase \
-	loginetfromtgeo9.testcase \
-	modedgeheal1.testcase \
-	modedgeheal2.testcase \
-	modedgeheal3.testcase \
-	modedgeheal4.testcase \
-	modedgeheal5.testcase \
-	modedgeheal6.testcase \
-	modedgeheal7.testcase \
-	modedgeheal8.testcase \
-	modedgeheal9.testcase \
-	modedgeheal10.testcase \
-	modedgeheal11.testcase \
-	modedgeheal12.testcase \
-	modedgeheal13.testcase \
-	modedgesplit1.testcase \
-	modedgesplit2.testcase \
-	modedgesplit3.testcase \
-	modedgesplit4.testcase \
-	modedgesplit5.testcase \
-	modedgesplit6.testcase \
-	modedgesplit7.testcase \
-	modedgesplit8.testcase \
-	modedgesplit9.testcase \
-	modedgesplit10.testcase \
-	modedgesplit11.testcase \
-	modedgesplit12.testcase \
-	modedgesplit13.testcase \
-	modedgesplit14.testcase \
-	modedgesplit15.testcase \
-	modedgesplit16.testcase \
-	modgeolinksplit1.testcase \
-	modgeolinksplit2.testcase \
-	modgeolinksplit3.testcase \
-	modgeolinksplit4.testcase \
-	modgeolinksplit5.testcase \
-	modgeolinksplit6.testcase \
-	modgeolinksplit7.testcase \
-	modgeolinksplit8.testcase \
-	modgeolinksplit9.testcase \
-	modlinkheal1.testcase \
-	modlinkheal2.testcase \
-	modlinkheal3.testcase \
-	modlinkheal4.testcase \
-	modlinkheal5.testcase \
-	modlinkheal6.testcase \
-	modlinkheal7.testcase \
-	modlinkheal8.testcase \
-	modlinkheal9.testcase \
-	modlinkheal10.testcase \
-	modlinkheal11.testcase \
-	modlinkheal12.testcase \
-	modlinkheal13.testcase \
-	modloglinksplit1.testcase \
-	modloglinksplit2.testcase \
-	modloglinksplit3.testcase \
-	modloglinksplit4.testcase \
-	modloglinksplit5.testcase \
-	modloglinksplit6.testcase \
-	modloglinksplit7.testcase \
-	modloglinksplit8.testcase \
-	modloglinksplit9.testcase \
-	moveisonetnode1.testcase \
-	moveisonetnode2.testcase \
-	moveisonetnode3.testcase \
-	moveisonetnode4.testcase \
-	moveisonetnode5.testcase \
-	moveisonetnode6.testcase \
-	moveisonetnode7.testcase \
-	moveisonetnode8.testcase \
-	moveisonetnode9.testcase \
-	moveisonode1.testcase \
-	moveisonode2.testcase \
-	moveisonode3.testcase \
-	moveisonode4.testcase \
-	moveisonode5.testcase \
-	moveisonode6.testcase \
-	moveisonode7.testcase \
-	moveisonode8.testcase \
-	moveisonode9.testcase \
-	moveisonode10.testcase \
-	moveisonode11.testcase \
-	moveisonode12.testcase \
-	moveisonode13.testcase \
-	moveisonode14.testcase \
-	moveisonode15.testcase \
-	moveisonode16.testcase \
-	moveisonode17.testcase \
-	netexception1.testcase \
-	netexception2.testcase \
-	newedgeheal1.testcase \
-	newedgeheal2.testcase \
-	newedgeheal3.testcase \
-	newedgeheal4.testcase \
-	newedgeheal5.testcase \
-	newedgeheal6.testcase \
-	newedgeheal7.testcase \
-	newedgeheal8.testcase \
-	newedgeheal9.testcase \
-	newedgeheal10.testcase \
-	newedgeheal11.testcase \
-	newedgeheal12.testcase \
-	newedgeheal13.testcase \
-	newedgessplit1.testcase \
-	newedgessplit2.testcase \
-	newedgessplit3.testcase \
-	newedgessplit4.testcase \
-	newedgessplit5.testcase \
-	newedgessplit6.testcase \
-	newedgessplit7.testcase \
-	newedgessplit8.testcase \
-	newedgessplit9.testcase \
-	newedgessplit10.testcase \
-	newedgessplit11.testcase \
-	newedgessplit12.testcase \
-	newedgessplit13.testcase \
-	newedgessplit14.testcase \
-	newedgessplit15.testcase \
-	newedgessplit16.testcase \
-	newgeolinksplit1.testcase \
-	newgeolinksplit2.testcase \
-	newgeolinksplit3.testcase \
-	newgeolinksplit4.testcase \
-	newgeolinksplit5.testcase \
-	newgeolinksplit6.testcase \
-	newgeolinksplit7.testcase \
-	newgeolinksplit8.testcase \
-	newgeolinksplit9.testcase \
-	newlinkheal1.testcase \
-	newlinkheal2.testcase \
-	newlinkheal3.testcase \
-	newlinkheal4.testcase \
-	newlinkheal5.testcase \
-	newlinkheal6.testcase \
-	newlinkheal7.testcase \
-	newlinkheal8.testcase \
-	newlinkheal9.testcase \
-	newlinkheal10.testcase \
-	newlinkheal11.testcase \
-	newlinkheal12.testcase \
-	newlinkheal13.testcase \
-	newloglinksplit1.testcase \
-	newloglinksplit2.testcase \
-	newloglinksplit3.testcase \
-	newloglinksplit4.testcase \
-	newloglinksplit5.testcase \
-	newloglinksplit6.testcase \
-	newloglinksplit7.testcase \
-	newloglinksplit8.testcase \
-	newloglinksplit9.testcase \
-	pointsnapseed1.testcase \
-	pointsnapseed2.testcase \
-	pointsnapseed3.testcase \
-	pointsnapseed4.testcase \
-	pointsnapseed5.testcase \
-	pointsnapseed6.testcase \
-	pointsnapseed7.testcase \
-	pointsnapseed8.testcase \
-	pointsnapseed9.testcase \
-	pointsnapseed10.testcase \
-	pointsnapseed11.testcase \
-	pointsnapseed12.testcase \
-	pointsnapseed13.testcase \
-	pointsnapseed14.testcase \
-	pointsnapseed15.testcase \
-	pointsnapseed16.testcase \
-	pointsnapseed17.testcase \
-	remedgemodface1.testcase \
-	remedgemodface2.testcase \
-	remedgemodface3.testcase \
-	remedgemodface4.testcase \
-	remedgemodface5.testcase \
-	remedgemodface6.testcase \
-	remedgemodface7.testcase \
-	remedgemodface8.testcase \
-	remedgemodface9.testcase \
-	remedgenewface1.testcase \
-	remedgenewface2.testcase \
-	remedgenewface3.testcase \
-	remedgenewface4.testcase \
-	remedgenewface5.testcase \
-	remedgenewface6.testcase \
-	remedgenewface7.testcase \
-	remedgenewface8.testcase \
-	remedgenewface9.testcase \
-	remisoedge1.testcase \
-	remisoedge2.testcase \
-	remisoedge3.testcase \
-	remisoedge4.testcase \
-	remisoedge5.testcase \
-	remisoedge6.testcase \
-	remisoedge7.testcase \
-	remisoedge8.testcase \
-	remisoedge9.testcase \
-	remisonode1.testcase \
-	remisonode2.testcase \
-	remisonode3.testcase \
-	remisonode4.testcase \
-	remisonode5.testcase \
-	remisonode6.testcase \
-	remisonode7.testcase \
-	remisonode8.testcase \
-	remisonode9.testcase \
-	remisonetnode1.testcase \
-	remisonetnode2.testcase \
-	remisonetnode3.testcase \
-	remisonetnode4.testcase \
-	remisonetnode5.testcase \
-	remisonetnode6.testcase \
-	remisonetnode7.testcase \
-	remisonetnode8.testcase \
-	remisonetnode9.testcase \
-	remlink1.testcase \
-	remlink2.testcase \
-	remlink3.testcase \
-	remlink4.testcase \
-	remlink5.testcase \
-	remlink6.testcase \
-	remlink7.testcase \
-	remlink8.testcase \
-	remlink9.testcase \
-	removetopolayer1.testcase \
-	removetopolayer2.testcase \
-	removetopolayer3.testcase \
-	removetopolayer4.testcase \
-	removetopolayer5.testcase \
-	removetopolayer6.testcase \
-	removetopolayer7.testcase \
-	removetopolayer8.testcase \
-	removetopolayer9.testcase \
-	spatnetfromtgeo1.testcase \
-	spatnetfromtgeo2.testcase \
-	spatnetfromtgeo3.testcase \
-	spatnetfromtgeo4.testcase \
-	spatnetfromtgeo5.testcase \
-	spatnetfromtgeo6.testcase \
-	spatnetfromtgeo7.testcase \
-	spatnetfromtgeo8.testcase \
-	spatnetfromtgeo9.testcase \
-	spatnetfromgeom1.testcase \
-	spatnetfromgeom2.testcase \
-	spatnetfromgeom3.testcase \
-	spatnetfromgeom4.testcase \
-	spatnetfromgeom5.testcase \
-	spatnetfromgeom6.testcase \
-	spatnetfromgeom7.testcase \
-	spatnetfromgeom8.testcase \
-	spatnetfromgeom9.testcase \
-	spatnetfromgeom10.testcase \
-	topoexception1.testcase \
-	topoexception2.testcase \
-	topogeoaddpoint1.testcase \
-	topogeoaddpoint2.testcase \
-	topogeoaddpoint3.testcase \
-	topogeoaddpoint4.testcase \
-	topogeoaddpoint5.testcase \
-	topogeoaddpoint6.testcase \
-	topogeoaddpoint7.testcase \
-	topogeoaddpoint8.testcase \
-	topogeoaddpoint9.testcase \
-	topogeoaddpoint10.testcase \
-	topogeoaddpoint11.testcase \
-	topogeoaddpoint12.testcase \
-	topogeoaddpoint13.testcase \
-	topogeoaddpoint14.testcase \
-	topogeoaddpoint15.testcase \
-	topogeoaddpoint16.testcase \
-	topogeoaddpoint17.testcase \
-	topogeoaddline1.testcase \
-	topogeoaddline2.testcase \
-	topogeoaddline3.testcase \
-	topogeoaddline4.testcase \
-	topogeoaddline5.testcase \
-	topogeoaddline6.testcase \
-	topogeoaddline7.testcase \
-	topogeoaddline8.testcase \
-	topogeoaddline9.testcase \
-	topogeoaddline10.testcase \
-	topogeoaddline11.testcase \
-	topogeoaddline12.testcase \
-	topogeoaddline13.testcase \
-	topogeoaddline14.testcase \
-	topogeoaddline15.testcase \
-	topogeoaddline16.testcase \
-	topogeoaddline17.testcase \
-	topogeoclone1.testcase \
-	topogeoclone2.testcase \
-	topogeoclone3.testcase \
-	topogeoclone4.testcase \
-	topogeoclone5.testcase \
-	topogeoclone6.testcase \
-	topogeoclone7.testcase \
-	topogeoclone8.testcase \
-	topogeoclone9.testcase \
-	topogeoclone10.testcase \
-	topogeoclone11.testcase \
-	topogeoclone12.testcase \
-	topogeofromext1.testcase \
-	topogeofromext2.testcase \
-	topogeofromext3.testcase \
-	topogeofromext4.testcase \
-	topogeofromext5.testcase \
-	topogeofromext6.testcase \
-	topogeofromext7.testcase \
-	topogeofromext8.testcase \
-	topogeofromext9.testcase \
-	topogeofromext10.testcase \
-	topogeofromext11.testcase \
-	topogeofromext12.testcase \
-	topogeofromext13.testcase \
-	topogeofromext14.testcase \
-	topogeofromext15.testcase \
-	topogeofromext16.testcase \
-	topogeofromext17.testcase \
-	topogeofromext18.testcase \
-	topogeofromext19.testcase \
-	topogeofromext20.testcase \
-	topogeofromext21.testcase \
-	topogeofromext22.testcase \
-	topogeofromext23.testcase \
-	topogeofromext24.testcase \
-	topogeofromext25.testcase \
-	topogeofromext26.testcase \
-	topogeofromext27.testcase \
-	topogeofromext28.testcase \
-	topogeofromext29.testcase \
-	topogeofromext30.testcase \
-	topogeofromext31.testcase \
-	topogeofromext32.testcase \
-	topogeofromext33.testcase \
-	topogeofromext34.testcase \
-	topogeofromext35.testcase \
-	topogeofromext36.testcase \
-	topogeofromext37.testcase \
-	topogeofromext38.testcase \
-	topogeofromext39.testcase \
-	topogeofromtable1.testcase \
-	topogeofromtable2.testcase \
-	topogeofromtable3.testcase \
-	topogeofromtable4.testcase \
-	topogeofromtable5.testcase \
-	topogeofromtable6.testcase \
-	topogeofromtable7.testcase \
-	topogeofromtable8.testcase \
-	topogeofromtable9.testcase \
-	topogeofromtable10.testcase \
-	topogeofromtable11.testcase \
-	topogeofromtable12.testcase \
-	topogeofromtable13.testcase \
-	topogeofromtable14.testcase \
-	topogeofromtable15.testcase \
-	topogeofromtable16.testcase \
-	topogeofromtable17.testcase \
-	topogeofromtable18.testcase \
-	topogeofromtable19.testcase \
-	topogeofromtable20.testcase \
-	topogeofromtable21.testcase \
-	topogeofromtable22.testcase \
-	topogeofromtable23.testcase \
-	topogeofromtable24.testcase \
-	topogeofromtable25.testcase \
-	topogeofromtable26.testcase \
-	topogeofromtable27.testcase \
-	topogeofromtable28.testcase \
-	topogeofromtable29.testcase \
-	topogeofromtable30.testcase \
-	topogeosplitline1.testcase \
-	topogeosplitline2.testcase \
-	topogeosplitline3.testcase \
-	topogeosplitline4.testcase \
-	topogeosplitline5.testcase \
-	topogeosplitline6.testcase \
-	topogeosplitline7.testcase \
-	topogeosplitline8.testcase \
-	topogeosplitline9.testcase \
-	topogeosplitline10.testcase \
-	topogeosplitline11.testcase \
-	topogeosplitline12.testcase \
-	topogeosplitline13.testcase \
-	topogeosplitline14.testcase \
-	topogeosplitline15.testcase \
-	topogeosplitline16.testcase \
-	topogeoremovesmall1.testcase \
-	topogeoremovesmall2.testcase \
-	topogeoremovesmall3.testcase \
-	topogeoremovesmall4.testcase \
-	topogeoremovesmall5.testcase \
-	topogeoremovesmall6.testcase \
-	topogeoremovesmall7.testcase \
-	topogeoremovesmall8.testcase \
-	topogeoremovesmall9.testcase \
-	topogeoremoveedges1.testcase \
-	topogeoremoveedges2.testcase \
-	topogeoremoveedges3.testcase \
-	topogeoremoveedges4.testcase \
-	topogeoremoveedges5.testcase \
-	topogeoremovenodes1.testcase \
-	topogeoremovenodes2.testcase \
-	topogeoremovenodes3.testcase \
-	topogeoremovenodes4.testcase \
-	topogeoremovenodes5.testcase \
-	topogeototable1.testcase \
-	topogeototable2.testcase \
-	topogeototable3.testcase \
-	topogeototable4.testcase \
-	topogeototable5.testcase \
-	topogeototable6.testcase \
-	topogeototable7.testcase \
-	topogeototable8.testcase \
-	topogeototable9.testcase \
-	topogeototable10.testcase \
-	topogeototable11.testcase \
-	topogeototable12.testcase \
-	topogeototable13.testcase \
-	topogeototable14.testcase \
-	topogeototable15.testcase \
-	topogeototable16.testcase \
-	topogeototable17.testcase \
-	topogeototable18.testcase \
-	topogeototable19.testcase \
-	topogeototable20.testcase \
-	topogeototable21.testcase \
-	topogeototable22.testcase \
-	topogeototable23.testcase \
-	topogeototable24.testcase \
-	topogeototable25.testcase \
-	topogeototable26.testcase \
-	topogeototablegen1.testcase \
-	topogeototablegen2.testcase \
-	topogeototablegen3.testcase \
-	topogeototablegen4.testcase \
-	topogeototablegen5.testcase \
-	topogeototablegen6.testcase \
-	topogeototablegen7.testcase \
-	topogeototablegen8.testcase \
-	topogeototablegen9.testcase \
-	topogeototablegen10.testcase \
-	topogeototablegen11.testcase \
-	topogeototablegen12.testcase \
-	topogeototablegen13.testcase \
-	topogeototablegen14.testcase \
-	topogeototablegen15.testcase \
-	topogeototablegen16.testcase \
-	topogeototablegen17.testcase \
-	topogeototablegen18.testcase \
-	topogeototablegen19.testcase \
-	topogeototablegen20.testcase \
-	topogeototablegen21.testcase \
-	topogeototablegen22.testcase \
-	topogeototablegen23.testcase \
-	topogeototablegen24.testcase \
-	topogeototablegen25.testcase \
-	topogeototablegen26.testcase \
-	topogeototablegen27.testcase \
-	topogeototablegen28.testcase \
-	topogeototablegen29.testcase \
-	topogeototablegen30.testcase \
-	topogeototablegen31.testcase \
-	topogeoupdateseeds1.testcase \
-	topogeoupdateseeds2.testcase \
-	topogeoupdateseeds3.testcase \
-	topogeoupdateseeds4.testcase \
-	topogeoupdateseeds5.testcase \
-	topogeoupdateseeds6.testcase \
-	topogeoupdateseeds7.testcase \
-	topogeoupdateseeds8.testcase \
-	topogeoupdateseeds9.testcase \
-	topogeoupdateseeds10.testcase \
-	toponetclone1.testcase \
-	toponetclone2.testcase \
-	toponetclone3.testcase \
-	toponetclone4.testcase \
-	toponetclone5.testcase \
-	toponetclone6.testcase \
-	toponetclone7.testcase \
-	toponetclone8.testcase \
-	toponetclone9.testcase \
-	toponetclone10.testcase \
-	toponetclone11.testcase \
-	toponetclone12.testcase \
-	toponetfromtable1.testcase \
-	toponetfromtable2.testcase \
-	toponetfromtable3.testcase \
-	toponetfromtable4.testcase \
-	toponetfromtable5.testcase \
-	toponetfromtable6.testcase \
-	toponetfromtable7.testcase \
-	toponetfromtable8.testcase \
-	toponetfromtable9.testcase \
-	toponetfromtable10.testcase \
-	toponetfromtable11.testcase \
-	toponetfromtable12.testcase \
-	toponetfromtable13.testcase \
-	toponetfromtable14.testcase \
-	toponetfromtable15.testcase \
-	toponetfromtable16.testcase \
-	toponetfromtable17.testcase \
-	toponettotable1.testcase \
-	toponettotable2.testcase \
-	toponettotable3.testcase \
-	toponettotable4.testcase \
-	toponettotable5.testcase \
-	toponettotable6.testcase \
-	toponettotable7.testcase \
-	toponettotable8.testcase \
-	toponettotable9.testcase \
-	toponettotable10.testcase \
-	toponettotable11.testcase \
-	toponettotable12.testcase \
-	toponettotable13.testcase \
-	toponettotable14.testcase \
-	toponettotable15.testcase \
-	toponettotable16.testcase \
-	toponettotable17.testcase \
-	toponettotable18.testcase \
-	toponettotable19.testcase \
-	toponettotable20.testcase \
-	toponettotable21.testcase \
-	toponettotable22.testcase \
-	toponettotable23.testcase \
-	toponettotable24.testcase \
-	toponettotable25.testcase \
-	toponettotable26.testcase \
-	toponettotablegen1.testcase \
-	toponettotablegen2.testcase \
-	toponettotablegen3.testcase \
-	toponettotablegen4.testcase \
-	toponettotablegen5.testcase \
-	toponettotablegen6.testcase \
-	toponettotablegen7.testcase \
-	toponettotablegen8.testcase \
-	toponettotablegen9.testcase \
-	toponettotablegen10.testcase \
-	toponettotablegen11.testcase \
-	toponettotablegen12.testcase \
-	toponettotablegen13.testcase \
-	toponettotablegen14.testcase \
-	toponettotablegen15.testcase \
-	toponettotablegen16.testcase \
-	toponettotablegen17.testcase \
-	toponettotablegen18.testcase \
-	toponettotablegen19.testcase \
-	toponettotablegen20.testcase \
-	toponettotablegen21.testcase \
-	toponettotablegen22.testcase \
-	toponettotablegen23.testcase \
-	toponettotablegen24.testcase \
-	toponettotablegen25.testcase \
-	toponettotablegen26.testcase \
-	toponettotablegen27.testcase \
-	toponettotablegen28.testcase \
-	toponettotablegen29.testcase \
-	toponettotablegen30.testcase \
-	toponettotablegen31.testcase \
-	validatetopogeo1.testcase \
-	validatetopogeo2.testcase \
-	validatetopogeo3.testcase \
-	validatetopogeo4.testcase \
-	validatetopogeo5.testcase \
-	validlogicalnet1.testcase \
-	validlogicalnet2.testcase \
-	validlogicalnet3.testcase \
-	validlogicalnet4.testcase \
-	validlogicalnet5.testcase \
-	validspatialnet1.testcase \
-	validspatialnet2.testcase \
-	validspatialnet3.testcase \
-	validspatialnet4.testcase \
-	validspatialnet5.testcase
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/sql_stmt_rttopo_tests/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign test/sql_stmt_rttopo_tests/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags-am uninstall uninstall-am
-
-.PRECIOUS: Makefile
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgemodface1.testcase b/test/sql_stmt_lwgeom_22_tests/addedgemodface1.testcase
deleted file mode 100644
index 06136f5..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgemodface1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeModFace - NULL Topology
-:memory: #use in-memory database
-SELECT ST_AddEdgeModFace(NULL, 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeModFace(NULL, 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgemodface10.testcase b/test/sql_stmt_lwgeom_22_tests/addedgemodface10.testcase
deleted file mode 100644
index 92dd107..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgemodface10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeModFace - NULL Node To
-:memory: #use in-memory database
-SELECT ST_AddEdgeModFace('topology', 1, NULL, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeModFace('topology', 1, NULL, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgemodface11.testcase b/test/sql_stmt_lwgeom_22_tests/addedgemodface11.testcase
deleted file mode 100644
index 05591cb..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgemodface11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeModFace - Double Node To
-:memory: #use in-memory database
-SELECT ST_AddEdgeModFace('topology', 1, 2.4, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeModFace('topology', 1, 2.4, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgemodface12.testcase b/test/sql_stmt_lwgeom_22_tests/addedgemodface12.testcase
deleted file mode 100644
index ac329d3..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgemodface12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeModFace - Text Node To
-:memory: #use in-memory database
-SELECT ST_AddEdgeModFace('topology', 1, 'to', GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeModFace('topology', 1, 'to', GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgemodface13.testcase b/test/sql_stmt_lwgeom_22_tests/addedgemodface13.testcase
deleted file mode 100644
index 118c315..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgemodface13.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeModFace - BLOB Node To
-:memory: #use in-memory database
-SELECT ST_AddEdgeModFace('topology', 1, zeroblob(4), GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeModFace('topology', 1, zeroblob(4), GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgemodface14.testcase b/test/sql_stmt_lwgeom_22_tests/addedgemodface14.testcase
deleted file mode 100644
index b06c95e..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgemodface14.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeModFace - Int Geometry
-:memory: #use in-memory database
-SELECT ST_AddEdgeModFace('topology', 1, 2, 1);
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeModFace('topology', 1, 2, 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgemodface15.testcase b/test/sql_stmt_lwgeom_22_tests/addedgemodface15.testcase
deleted file mode 100644
index 9fc3c6d..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgemodface15.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeModFace - Double Geometry
-:memory: #use in-memory database
-SELECT ST_AddEdgeModFace('topology', 1, 2, 1.3);
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeModFace('topology', 1, 2, 1.3)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgemodface16.testcase b/test/sql_stmt_lwgeom_22_tests/addedgemodface16.testcase
deleted file mode 100644
index 3abb727..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgemodface16.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeModFace - NULL Geometry
-:memory: #use in-memory database
-SELECT ST_AddEdgeModFace('topology', 1, 2, NULL);
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeModFace('topology', 1, 2, NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgemodface17.testcase b/test/sql_stmt_lwgeom_22_tests/addedgemodface17.testcase
deleted file mode 100644
index 525c62a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgemodface17.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeModFace - Invalid BLOB Geometry
-:memory: #use in-memory database
-SELECT ST_AddEdgeModFace('topology', 1, 2, zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeModFace('topology', 1, 2, zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgemodface18.testcase b/test/sql_stmt_lwgeom_22_tests/addedgemodface18.testcase
deleted file mode 100644
index 2ec150e..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgemodface18.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeModFace - Point Geometry
-:memory: #use in-memory database
-SELECT ST_AddEdgeModFace('topology', 1, 2, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeModFace('topology', 1, 2, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgemodface19.testcase b/test/sql_stmt_lwgeom_22_tests/addedgemodface19.testcase
deleted file mode 100644
index 4639cee..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgemodface19.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeModFace - Polygon Geometry
-:memory: #use in-memory database
-SELECT ST_AddEdgeModFace('topology', 1, 2, GeomFromText('POLYGON((0 0, 0 1, 1 1, 1 0, 0 0))', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeModFace('topology', 1, 2, GeomFromText('POLYGON((0 0, 0 1, 1 1, 1 0, 0 0))', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgemodface2.testcase b/test/sql_stmt_lwgeom_22_tests/addedgemodface2.testcase
deleted file mode 100644
index 642af10..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgemodface2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeModFace - Int Topology
-:memory: #use in-memory database
-SELECT ST_AddEdgeModFace(1, 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeModFace(1, 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgemodface20.testcase b/test/sql_stmt_lwgeom_22_tests/addedgemodface20.testcase
deleted file mode 100644
index e748670..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgemodface20.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeModFace - MultiLinestring Geometry
-:memory: #use in-memory database
-SELECT ST_AddEdgeModFace('topology', 1, 2, GeomFromText('MULTILINESTRING((0 0, 1 1), (4 4, 5 5))', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeModFace('topology', 1, 2, GeomFromText('MULTILINESTRING((0 0, 1 1), (4 4, 5 5))', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgemodface3.testcase b/test/sql_stmt_lwgeom_22_tests/addedgemodface3.testcase
deleted file mode 100644
index 2b8bf2b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgemodface3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeModFace - Double Topology
-:memory: #use in-memory database
-SELECT ST_AddEdgeModFace(1.2, 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeModFace(1.2, 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgemodface4.testcase b/test/sql_stmt_lwgeom_22_tests/addedgemodface4.testcase
deleted file mode 100644
index dd97a00..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgemodface4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeModFace - BLOB Topology
-:memory: #use in-memory database
-SELECT ST_AddEdgeModFace(zeroblob(4), 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeModFace(zeroblob(4), 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgemodface5.testcase b/test/sql_stmt_lwgeom_22_tests/addedgemodface5.testcase
deleted file mode 100644
index d755050..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgemodface5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeModFace - Text Topology
-:memory: #use in-memory database
-SELECT ST_AddEdgeModFace('topology', 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeModFace('topology', 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgemodface6.testcase b/test/sql_stmt_lwgeom_22_tests/addedgemodface6.testcase
deleted file mode 100644
index 9033151..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgemodface6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeModFace - NULL Node From
-:memory: #use in-memory database
-SELECT ST_AddEdgeModFace('topology', NULL, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeModFace('topology', NULL, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgemodface7.testcase b/test/sql_stmt_lwgeom_22_tests/addedgemodface7.testcase
deleted file mode 100644
index 1c3e429..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgemodface7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeModFace - Double Node From
-:memory: #use in-memory database
-SELECT ST_AddEdgeModFace('topology', 1.3, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeModFace('topology', 1.3, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgemodface8.testcase b/test/sql_stmt_lwgeom_22_tests/addedgemodface8.testcase
deleted file mode 100644
index 168d726..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgemodface8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeModFace - Text Node From
-:memory: #use in-memory database
-SELECT ST_AddEdgeModFace('topology', 'from', 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeModFace('topology', 'from', 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgemodface9.testcase b/test/sql_stmt_lwgeom_22_tests/addedgemodface9.testcase
deleted file mode 100644
index 3904c4d..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgemodface9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeModFace - BLOB Node From
-:memory: #use in-memory database
-SELECT ST_AddEdgeModFace('topology', zeroblob(4), 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeModFace('topology', zeroblob(4), 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces1.testcase b/test/sql_stmt_lwgeom_22_tests/addedgenewfaces1.testcase
deleted file mode 100644
index fafd3dd..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeNewFaces - NULL Topology
-:memory: #use in-memory database
-SELECT ST_AddEdgeNewFaces(NULL, 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeNewFaces(NULL, 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces10.testcase b/test/sql_stmt_lwgeom_22_tests/addedgenewfaces10.testcase
deleted file mode 100644
index 544bcc2..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeNewFaces - NULL Node To
-:memory: #use in-memory database
-SELECT ST_AddEdgeNewFaces('topology', 1, NULL, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeNewFaces('topology', 1, NULL, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces11.testcase b/test/sql_stmt_lwgeom_22_tests/addedgenewfaces11.testcase
deleted file mode 100644
index e2da37b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeNewFaces - Double Node To
-:memory: #use in-memory database
-SELECT ST_AddEdgeNewFaces('topology', 1, 2.4, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeNewFaces('topology', 1, 2.4, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces12.testcase b/test/sql_stmt_lwgeom_22_tests/addedgenewfaces12.testcase
deleted file mode 100644
index c0f80d1..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeNewFaces - Text Node To
-:memory: #use in-memory database
-SELECT ST_AddEdgeNewFaces('topology', 1, 'to', GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeNewFaces('topology', 1, 'to', GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces13.testcase b/test/sql_stmt_lwgeom_22_tests/addedgenewfaces13.testcase
deleted file mode 100644
index 326db12..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces13.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeNewFaces - BLOB Node To
-:memory: #use in-memory database
-SELECT ST_AddEdgeNewFaces('topology', 1, zeroblob(4), GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeNewFaces('topology', 1, zeroblob(4), GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces14.testcase b/test/sql_stmt_lwgeom_22_tests/addedgenewfaces14.testcase
deleted file mode 100644
index 99cc3aa..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces14.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeNewFaces - Int Geometry
-:memory: #use in-memory database
-SELECT ST_AddEdgeNewFaces('topology', 1, 2, 1);
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeNewFaces('topology', 1, 2, 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces15.testcase b/test/sql_stmt_lwgeom_22_tests/addedgenewfaces15.testcase
deleted file mode 100644
index ff6f467..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces15.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeNewFaces - Double Geometry
-:memory: #use in-memory database
-SELECT ST_AddEdgeNewFaces('topology', 1, 2, 1.3);
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeNewFaces('topology', 1, 2, 1.3)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces16.testcase b/test/sql_stmt_lwgeom_22_tests/addedgenewfaces16.testcase
deleted file mode 100644
index 8d433f4..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces16.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeNewFaces - NULL Geometry
-:memory: #use in-memory database
-SELECT ST_AddEdgeNewFaces('topology', 1, 2, NULL);
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeNewFaces('topology', 1, 2, NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces17.testcase b/test/sql_stmt_lwgeom_22_tests/addedgenewfaces17.testcase
deleted file mode 100644
index 2d858d4..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces17.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeNewFaces - Invalid BLOB Geometry
-:memory: #use in-memory database
-SELECT ST_AddEdgeNewFaces('topology', 1, 2, zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeNewFaces('topology', 1, 2, zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces18.testcase b/test/sql_stmt_lwgeom_22_tests/addedgenewfaces18.testcase
deleted file mode 100644
index e2b1a1e..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces18.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeNewFaces - Point Geometry
-:memory: #use in-memory database
-SELECT ST_AddEdgeNewFaces('topology', 1, 2, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeNewFaces('topology', 1, 2, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces19.testcase b/test/sql_stmt_lwgeom_22_tests/addedgenewfaces19.testcase
deleted file mode 100644
index 309a4de..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces19.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeNewFaces - Polygon Geometry
-:memory: #use in-memory database
-SELECT ST_AddEdgeNewFaces('topology', 1, 2, GeomFromText('POLYGON((0 0, 0 1, 1 1, 1 0, 0 0))', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeNewFaces('topology', 1, 2, GeomFromText('POLYGON((0 0, 0 1, 1 1, 1 0, 0 0))', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces2.testcase b/test/sql_stmt_lwgeom_22_tests/addedgenewfaces2.testcase
deleted file mode 100644
index 1ab590a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeNewFaces - Int Topology
-:memory: #use in-memory database
-SELECT ST_AddEdgeNewFaces(1, 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeNewFaces(1, 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces20.testcase b/test/sql_stmt_lwgeom_22_tests/addedgenewfaces20.testcase
deleted file mode 100644
index 5e28039..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces20.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeNewFaces - MultiLinestring Geometry
-:memory: #use in-memory database
-SELECT ST_AddEdgeNewFaces('topology', 1, 2, GeomFromText('MULTILINESTRING((0 0, 1 1), (4 4, 5 5))', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeNewFaces('topology', 1, 2, GeomFromText('MULTILINESTRING((0 0, 1 1), (4 4, 5 5))', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces3.testcase b/test/sql_stmt_lwgeom_22_tests/addedgenewfaces3.testcase
deleted file mode 100644
index 46dfb3d..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeNewFaces - Double Topology
-:memory: #use in-memory database
-SELECT ST_AddEdgeNewFaces(1.2, 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeNewFaces(1.2, 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces4.testcase b/test/sql_stmt_lwgeom_22_tests/addedgenewfaces4.testcase
deleted file mode 100644
index 476feb4..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeNewFaces - BLOB Topology
-:memory: #use in-memory database
-SELECT ST_AddEdgeNewFaces(zeroblob(4), 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeNewFaces(zeroblob(4), 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces5.testcase b/test/sql_stmt_lwgeom_22_tests/addedgenewfaces5.testcase
deleted file mode 100644
index 30f455a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeNewFaces - Text Topology
-:memory: #use in-memory database
-SELECT ST_AddEdgeNewFaces('topology', 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeNewFaces('topology', 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces6.testcase b/test/sql_stmt_lwgeom_22_tests/addedgenewfaces6.testcase
deleted file mode 100644
index 2a0a18b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeNewFaces - NULL Node From
-:memory: #use in-memory database
-SELECT ST_AddEdgeNewFaces('topology', NULL, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeNewFaces('topology', NULL, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces7.testcase b/test/sql_stmt_lwgeom_22_tests/addedgenewfaces7.testcase
deleted file mode 100644
index 983d13a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeNewFaces - Double Node From
-:memory: #use in-memory database
-SELECT ST_AddEdgeNewFaces('topology', 1.3, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeNewFaces('topology', 1.3, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces8.testcase b/test/sql_stmt_lwgeom_22_tests/addedgenewfaces8.testcase
deleted file mode 100644
index a006a32..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeNewFaces - Text Node From
-:memory: #use in-memory database
-SELECT ST_AddEdgeNewFaces('topology', 'from', 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeNewFaces('topology', 'from', 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces9.testcase b/test/sql_stmt_lwgeom_22_tests/addedgenewfaces9.testcase
deleted file mode 100644
index b7452a2..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addedgenewfaces9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddEdgeNewFaces - BLOB Node From
-:memory: #use in-memory database
-SELECT ST_AddEdgeNewFaces('topology', zeroblob(4), 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddEdgeNewFaces('topology', zeroblob(4), 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisoedge1.testcase b/test/sql_stmt_lwgeom_22_tests/addisoedge1.testcase
deleted file mode 100644
index 383f200..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisoedge1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoEdge - NULL Topology
-:memory: #use in-memory database
-SELECT ST_AddIsoEdge(NULL, 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoEdge(NULL, 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisoedge10.testcase b/test/sql_stmt_lwgeom_22_tests/addisoedge10.testcase
deleted file mode 100644
index 80a3249..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisoedge10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoEdge - NULL Node To
-:memory: #use in-memory database
-SELECT ST_AddIsoEdge('topology', 1, NULL, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoEdge('topology', 1, NULL, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisoedge11.testcase b/test/sql_stmt_lwgeom_22_tests/addisoedge11.testcase
deleted file mode 100644
index 0b1bebd..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisoedge11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoEdge - Double Node To
-:memory: #use in-memory database
-SELECT ST_AddIsoEdge('topology', 1, 2.4, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoEdge('topology', 1, 2.4, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisoedge12.testcase b/test/sql_stmt_lwgeom_22_tests/addisoedge12.testcase
deleted file mode 100644
index 2d80fe5..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisoedge12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoEdge - Text Node To
-:memory: #use in-memory database
-SELECT ST_AddIsoEdge('topology', 1, 'to', GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoEdge('topology', 1, 'to', GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisoedge13.testcase b/test/sql_stmt_lwgeom_22_tests/addisoedge13.testcase
deleted file mode 100644
index c5fc479..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisoedge13.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoEdge - BLOB Node To
-:memory: #use in-memory database
-SELECT ST_AddIsoEdge('topology', 1, zeroblob(4), GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoEdge('topology', 1, zeroblob(4), GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisoedge14.testcase b/test/sql_stmt_lwgeom_22_tests/addisoedge14.testcase
deleted file mode 100644
index 24665a6..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisoedge14.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoEdge - Int Geometry
-:memory: #use in-memory database
-SELECT ST_AddIsoEdge('topology', 1, 2, 1);
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoEdge('topology', 1, 2, 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisoedge15.testcase b/test/sql_stmt_lwgeom_22_tests/addisoedge15.testcase
deleted file mode 100644
index 092df75..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisoedge15.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoEdge - Double Geometry
-:memory: #use in-memory database
-SELECT ST_AddIsoEdge('topology', 1, 2, 1.3);
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoEdge('topology', 1, 2, 1.3)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisoedge16.testcase b/test/sql_stmt_lwgeom_22_tests/addisoedge16.testcase
deleted file mode 100644
index 4b18f7a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisoedge16.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoEdge - NULL Geometry
-:memory: #use in-memory database
-SELECT ST_AddIsoEdge('topology', 1, 2, NULL);
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoEdge('topology', 1, 2, NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisoedge17.testcase b/test/sql_stmt_lwgeom_22_tests/addisoedge17.testcase
deleted file mode 100644
index ce31a49..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisoedge17.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoEdge - Invalid BLOB Geometry
-:memory: #use in-memory database
-SELECT ST_AddIsoEdge('topology', 1, 2, zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoEdge('topology', 1, 2, zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisoedge18.testcase b/test/sql_stmt_lwgeom_22_tests/addisoedge18.testcase
deleted file mode 100644
index aff61f7..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisoedge18.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoEdge - Point Geometry
-:memory: #use in-memory database
-SELECT ST_AddIsoEdge('topology', 1, 2, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoEdge('topology', 1, 2, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisoedge19.testcase b/test/sql_stmt_lwgeom_22_tests/addisoedge19.testcase
deleted file mode 100644
index 3b34c77..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisoedge19.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoEdge - Polygon Geometry
-:memory: #use in-memory database
-SELECT ST_AddIsoEdge('topology', 1, 2, GeomFromText('POLYGON((0 0, 0 1, 1 1, 1 0, 0 0))', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoEdge('topology', 1, 2, GeomFromText('POLYGON((0 0, 0 1, 1 1, 1 0, 0 0))', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisoedge2.testcase b/test/sql_stmt_lwgeom_22_tests/addisoedge2.testcase
deleted file mode 100644
index 4228ca1..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisoedge2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoEdge - Int Topology
-:memory: #use in-memory database
-SELECT ST_AddIsoEdge(1, 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoEdge(1, 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisoedge20.testcase b/test/sql_stmt_lwgeom_22_tests/addisoedge20.testcase
deleted file mode 100644
index cd09fc3..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisoedge20.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoEdge - MultiLinestring Geometry
-:memory: #use in-memory database
-SELECT ST_AddIsoEdge('topology', 1, 2, GeomFromText('MULTILINESTRING((0 0, 1 1), (4 4, 5 5))', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoEdge('topology', 1, 2, GeomFromText('MULTILINESTRING((0 0, 1 1), (4 4, 5 5))', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisoedge3.testcase b/test/sql_stmt_lwgeom_22_tests/addisoedge3.testcase
deleted file mode 100644
index 264236c..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisoedge3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoEdge - Double Topology
-:memory: #use in-memory database
-SELECT ST_AddIsoEdge(1.2, 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoEdge(1.2, 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisoedge4.testcase b/test/sql_stmt_lwgeom_22_tests/addisoedge4.testcase
deleted file mode 100644
index 3dbc86c..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisoedge4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoEdge - BLOB Topology
-:memory: #use in-memory database
-SELECT ST_AddIsoEdge(zeroblob(4), 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoEdge(zeroblob(4), 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisoedge5.testcase b/test/sql_stmt_lwgeom_22_tests/addisoedge5.testcase
deleted file mode 100644
index c5b42bc..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisoedge5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoEdge - Text Topology
-:memory: #use in-memory database
-SELECT ST_AddIsoEdge('topology', 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoEdge('topology', 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisoedge6.testcase b/test/sql_stmt_lwgeom_22_tests/addisoedge6.testcase
deleted file mode 100644
index 6f612e0..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisoedge6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoEdge - NULL Node From
-:memory: #use in-memory database
-SELECT ST_AddIsoEdge('topology', NULL, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoEdge('topology', NULL, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisoedge7.testcase b/test/sql_stmt_lwgeom_22_tests/addisoedge7.testcase
deleted file mode 100644
index 00744c9..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisoedge7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoEdge - Double Node From
-:memory: #use in-memory database
-SELECT ST_AddIsoEdge('topology', 1.3, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoEdge('topology', 1.3, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisoedge8.testcase b/test/sql_stmt_lwgeom_22_tests/addisoedge8.testcase
deleted file mode 100644
index 5a91da8..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisoedge8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoEdge - Text Node From
-:memory: #use in-memory database
-SELECT ST_AddIsoEdge('topology', 'from', 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoEdge('topology', 'from', 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisoedge9.testcase b/test/sql_stmt_lwgeom_22_tests/addisoedge9.testcase
deleted file mode 100644
index b1fab8f..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisoedge9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoEdge - BLOB Node From
-:memory: #use in-memory database
-SELECT ST_AddIsoEdge('topology', zeroblob(4), 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoEdge('topology', zeroblob(4), 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisonetnode1.testcase b/test/sql_stmt_lwgeom_22_tests/addisonetnode1.testcase
deleted file mode 100644
index 38cba50..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisonetnode1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoNetNode - NULL Network
-:memory: #use in-memory database
-SELECT ST_AddIsoNetNode(NULL, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoNetNode(NULL, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisonetnode2.testcase b/test/sql_stmt_lwgeom_22_tests/addisonetnode2.testcase
deleted file mode 100644
index 98e446a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisonetnode2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoNetNode - Int Network
-:memory: #use in-memory database
-SELECT ST_AddIsoNetNode(1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoNetNode(1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisonetnode3.testcase b/test/sql_stmt_lwgeom_22_tests/addisonetnode3.testcase
deleted file mode 100644
index ca1bee5..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisonetnode3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoNetNode - Double Network
-:memory: #use in-memory database
-SELECT ST_AddIsoNetNode(1.5, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoNetNode(1.5, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisonetnode4.testcase b/test/sql_stmt_lwgeom_22_tests/addisonetnode4.testcase
deleted file mode 100644
index acaa22f..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisonetnode4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoNetNode - BLOB Network
-:memory: #use in-memory database
-SELECT ST_AddIsoNetNode(zeroblob(9), MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoNetNode(zeroblob(9), MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisonetnode5.testcase b/test/sql_stmt_lwgeom_22_tests/addisonetnode5.testcase
deleted file mode 100644
index d75d0b6..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisonetnode5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoNetNode - NULL Point
-:memory: #use in-memory database
-SELECT ST_AddIsoNetNode('roads', NULL);
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoNetNode('roads', NULL)
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisonode1.testcase b/test/sql_stmt_lwgeom_22_tests/addisonode1.testcase
deleted file mode 100644
index 51c0ca6..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisonode1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoNode - NULL Topology
-:memory: #use in-memory database
-SELECT ST_AddIsoNode(NULL, -1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoNode(NULL, -1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisonode10.testcase b/test/sql_stmt_lwgeom_22_tests/addisonode10.testcase
deleted file mode 100644
index 932a689..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisonode10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoNode - Double Geometry
-:memory: #use in-memory database
-SELECT ST_AddIsoNode('topology', -1, 1.1);
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoNode('topology', -1, 1.1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisonode11.testcase b/test/sql_stmt_lwgeom_22_tests/addisonode11.testcase
deleted file mode 100644
index f7e8537..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisonode11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoNode - NULL Geometry
-:memory: #use in-memory database
-SELECT ST_AddIsoNode('topology', -1, NULL);
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoNode('topology', -1, NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisonode12.testcase b/test/sql_stmt_lwgeom_22_tests/addisonode12.testcase
deleted file mode 100644
index 0d00a71..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisonode12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoNode - Text Geometry
-:memory: #use in-memory database
-SELECT ST_AddIsoNode('topology', 'face', 'geom');
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoNode('topology', 'face', 'geom')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisonode13.testcase b/test/sql_stmt_lwgeom_22_tests/addisonode13.testcase
deleted file mode 100644
index 2a24fa3..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisonode13.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoNode - Invalid BLOB Geometry
-:memory: #use in-memory database
-SELECT ST_AddIsoNode('topology', 'face', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoNode('topology', 'face', zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisonode14.testcase b/test/sql_stmt_lwgeom_22_tests/addisonode14.testcase
deleted file mode 100644
index 800c855..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisonode14.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoNode - Linestring Geometry
-:memory: #use in-memory database
-SELECT ST_AddIsoNode('topology', -1, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoNode('topology', -1, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisonode15.testcase b/test/sql_stmt_lwgeom_22_tests/addisonode15.testcase
deleted file mode 100644
index 533b229..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisonode15.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoNode - Polygon Geometry
-:memory: #use in-memory database
-SELECT ST_AddIsoNode('topology', -1, GeomFromText('POLYGON((0 0, 0 1, 1 1, 1 0, 0 0))', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoNode('topology', -1, GeomFromText('POLYGON((0 0, 0 1, 1 1, 1 0, 0 0))', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisonode16.testcase b/test/sql_stmt_lwgeom_22_tests/addisonode16.testcase
deleted file mode 100644
index 3225af1..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisonode16.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoNode - MULTIPOINT Geometry
-:memory: #use in-memory database
-SELECT ST_AddIsoNode('topology', -1, GeomFromText('MULTIPOINT(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoNode('topology', -1, GeomFromText('MULTIPOINT(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisonode17.testcase b/test/sql_stmt_lwgeom_22_tests/addisonode17.testcase
deleted file mode 100644
index 7e88102..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisonode17.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoNode - NULL Face
-:memory: #use in-memory database
-SELECT ST_AddIsoNode('topology', NULL, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoNode('topology', NULL, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisonode2.testcase b/test/sql_stmt_lwgeom_22_tests/addisonode2.testcase
deleted file mode 100644
index 9b0f802..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisonode2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoNode - Int Topology
-:memory: #use in-memory database
-SELECT ST_AddIsoNode(1, -1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoNode(1, -1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisonode3.testcase b/test/sql_stmt_lwgeom_22_tests/addisonode3.testcase
deleted file mode 100644
index ed02d46..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisonode3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoNode - Double Topology
-:memory: #use in-memory database
-SELECT ST_AddIsoNode(1.5, -1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoNode(1.5, -1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisonode4.testcase b/test/sql_stmt_lwgeom_22_tests/addisonode4.testcase
deleted file mode 100644
index 4f87681..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisonode4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoNode - Blob Topology
-:memory: #use in-memory database
-SELECT ST_AddIsoNode(zeroblob(4), -1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoNode(zeroblob(4), -1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisonode5.testcase b/test/sql_stmt_lwgeom_22_tests/addisonode5.testcase
deleted file mode 100644
index ea99873..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisonode5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoNode - Text Topology
-:memory: #use in-memory database
-SELECT ST_AddIsoNode('topology', -1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoNode('topology', -1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisonode6.testcase b/test/sql_stmt_lwgeom_22_tests/addisonode6.testcase
deleted file mode 100644
index a3cb94d..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisonode6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoNode - Double Face
-:memory: #use in-memory database
-SELECT ST_AddIsoNode('topology', 2.0, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoNode('topology', 2.0, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisonode7.testcase b/test/sql_stmt_lwgeom_22_tests/addisonode7.testcase
deleted file mode 100644
index 329037d..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisonode7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoNode - BLOB Face
-:memory: #use in-memory database
-SELECT ST_AddIsoNode('topology', zeroblob(4), MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoNode('topology', zeroblob(4), MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisonode8.testcase b/test/sql_stmt_lwgeom_22_tests/addisonode8.testcase
deleted file mode 100644
index 96046f6..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisonode8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoNode - Text Face
-:memory: #use in-memory database
-SELECT ST_AddIsoNode('topology', 'face', MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoNode('topology', 'face', MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addisonode9.testcase b/test/sql_stmt_lwgeom_22_tests/addisonode9.testcase
deleted file mode 100644
index d686d3a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addisonode9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddIsoNode - Int Geometry
-:memory: #use in-memory database
-SELECT ST_AddIsoNode('topology', -1, 1);
-1 # rows (not including the header row)
-1 # columns
-ST_AddIsoNode('topology', -1, 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addlink1.testcase b/test/sql_stmt_lwgeom_22_tests/addlink1.testcase
deleted file mode 100644
index facb486..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addlink1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddLink - NULL Network
-:memory: #use in-memory database
-SELECT ST_AddLink(NULL, 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddLink(NULL, 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addlink10.testcase b/test/sql_stmt_lwgeom_22_tests/addlink10.testcase
deleted file mode 100644
index 7287543..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addlink10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddLink - NULL Node To
-:memory: #use in-memory database
-SELECT ST_AddLink('net', 1, NULL, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddLink('net', 1, NULL, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addlink11.testcase b/test/sql_stmt_lwgeom_22_tests/addlink11.testcase
deleted file mode 100644
index 9b4e49f..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addlink11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddLink - Double Node To
-:memory: #use in-memory database
-SELECT ST_AddLink('net', 1, 2.4, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddLink('net', 1, 2.4, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addlink12.testcase b/test/sql_stmt_lwgeom_22_tests/addlink12.testcase
deleted file mode 100644
index 296ac50..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addlink12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddLink - Text Node To
-:memory: #use in-memory database
-SELECT ST_AddLink('net', 1, 'to', GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddLink('net', 1, 'to', GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addlink13.testcase b/test/sql_stmt_lwgeom_22_tests/addlink13.testcase
deleted file mode 100644
index 4597bb2..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addlink13.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddLink - BLOB Node To
-:memory: #use in-memory database
-SELECT ST_AddLink('net', 1, zeroblob(4), GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddLink('net', 1, zeroblob(4), GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addlink2.testcase b/test/sql_stmt_lwgeom_22_tests/addlink2.testcase
deleted file mode 100644
index b57f378..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addlink2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddLink - Int Network
-:memory: #use in-memory database
-SELECT ST_AddLink(1, 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddLink(1, 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addlink3.testcase b/test/sql_stmt_lwgeom_22_tests/addlink3.testcase
deleted file mode 100644
index 9ee2c4c..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addlink3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddLink - Double Network
-:memory: #use in-memory database
-SELECT ST_AddLink(1.2, 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddLink(1.2, 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addlink4.testcase b/test/sql_stmt_lwgeom_22_tests/addlink4.testcase
deleted file mode 100644
index cf9003c..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addlink4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddLink - BLOB Network
-:memory: #use in-memory database
-SELECT ST_AddLink(zeroblob(4), 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddLink(zeroblob(4), 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addlink5.testcase b/test/sql_stmt_lwgeom_22_tests/addlink5.testcase
deleted file mode 100644
index 80f21b7..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addlink5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddLink - Text Network
-:memory: #use in-memory database
-SELECT ST_AddLink('net', 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddLink('net', 1, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/addlink6.testcase b/test/sql_stmt_lwgeom_22_tests/addlink6.testcase
deleted file mode 100644
index 5c28f49..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addlink6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddLink - NULL Node From
-:memory: #use in-memory database
-SELECT ST_AddLink('net', NULL, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddLink('net', NULL, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addlink7.testcase b/test/sql_stmt_lwgeom_22_tests/addlink7.testcase
deleted file mode 100644
index 936a5ad..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addlink7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddLink - Double Node From
-:memory: #use in-memory database
-SELECT ST_AddLink('net', 1.3, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddLink('net', 1.3, 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addlink8.testcase b/test/sql_stmt_lwgeom_22_tests/addlink8.testcase
deleted file mode 100644
index a7eed8d..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addlink8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddLink - Text Node From
-:memory: #use in-memory database
-SELECT ST_AddLink('net', 'from', 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddLink('net', 'from', 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/addlink9.testcase b/test/sql_stmt_lwgeom_22_tests/addlink9.testcase
deleted file mode 100644
index 5065cb4..0000000
--- a/test/sql_stmt_lwgeom_22_tests/addlink9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-AddLink - BLOB Node From
-:memory: #use in-memory database
-SELECT ST_AddLink('net', zeroblob(4), 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_AddLink('net', zeroblob(4), 2, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/changeedgegeom1.testcase b/test/sql_stmt_lwgeom_22_tests/changeedgegeom1.testcase
deleted file mode 100644
index 9a6f9dc..0000000
--- a/test/sql_stmt_lwgeom_22_tests/changeedgegeom1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ChangeEdgeGeom - NULL Topology
-:memory: #use in-memory database
-SELECT ST_ChangeEdgeGeom(NULL, -1, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ChangeEdgeGeom(NULL, -1, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/changeedgegeom10.testcase b/test/sql_stmt_lwgeom_22_tests/changeedgegeom10.testcase
deleted file mode 100644
index c892586..0000000
--- a/test/sql_stmt_lwgeom_22_tests/changeedgegeom10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ChangeEdgeGeom - Double Geometry
-:memory: #use in-memory database
-SELECT ST_ChangeEdgeGeom('topology', -1, 1.1);
-1 # rows (not including the header row)
-1 # columns
-ST_ChangeEdgeGeom('topology', -1, 1.1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/changeedgegeom11.testcase b/test/sql_stmt_lwgeom_22_tests/changeedgegeom11.testcase
deleted file mode 100644
index f11f581..0000000
--- a/test/sql_stmt_lwgeom_22_tests/changeedgegeom11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ChangeEdgeGeom - NULL Geometry
-:memory: #use in-memory database
-SELECT ST_ChangeEdgeGeom('topology', -1, NULL);
-1 # rows (not including the header row)
-1 # columns
-ST_ChangeEdgeGeom('topology', -1, NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/changeedgegeom12.testcase b/test/sql_stmt_lwgeom_22_tests/changeedgegeom12.testcase
deleted file mode 100644
index 008e8ae..0000000
--- a/test/sql_stmt_lwgeom_22_tests/changeedgegeom12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ChangeEdgeGeom - Text Geometry
-:memory: #use in-memory database
-SELECT ST_ChangeEdgeGeom('topology', 'edge', 'geom');
-1 # rows (not including the header row)
-1 # columns
-ST_ChangeEdgeGeom('topology', 'edge', 'geom')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/changeedgegeom13.testcase b/test/sql_stmt_lwgeom_22_tests/changeedgegeom13.testcase
deleted file mode 100644
index ab9b9b1..0000000
--- a/test/sql_stmt_lwgeom_22_tests/changeedgegeom13.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ChangeEdgeGeom - Invalid BLOB Geometry
-:memory: #use in-memory database
-SELECT ST_ChangeEdgeGeom('topology', 'edge', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-ST_ChangeEdgeGeom('topology', 'edge', zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/changeedgegeom14.testcase b/test/sql_stmt_lwgeom_22_tests/changeedgegeom14.testcase
deleted file mode 100644
index ccd4617..0000000
--- a/test/sql_stmt_lwgeom_22_tests/changeedgegeom14.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ChangeEdgeGeom - Point Geometry
-:memory: #use in-memory database
-SELECT ST_ChangeEdgeGeom('topology', -1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ChangeEdgeGeom('topology', -1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/changeedgegeom15.testcase b/test/sql_stmt_lwgeom_22_tests/changeedgegeom15.testcase
deleted file mode 100644
index 10bd960..0000000
--- a/test/sql_stmt_lwgeom_22_tests/changeedgegeom15.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ChangeEdgeGeom - Polygon Geometry
-:memory: #use in-memory database
-SELECT ST_ChangeEdgeGeom('topology', -1, GeomFromText('POLYGON((0 0, 0 1, 1 1, 1 0, 0 0))', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ChangeEdgeGeom('topology', -1, GeomFromText('POLYGON((0 0, 0 1, 1 1, 1 0, 0 0))', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/changeedgegeom16.testcase b/test/sql_stmt_lwgeom_22_tests/changeedgegeom16.testcase
deleted file mode 100644
index b677cb9..0000000
--- a/test/sql_stmt_lwgeom_22_tests/changeedgegeom16.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ChangeEdgeGeom - MultiLinestring Geometry
-:memory: #use in-memory database
-SELECT ST_ChangeEdgeGeom('topology', -1, GeomFromText('MULTILINESTRING((0 0, 1 1), (4 4, 5 5))', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ChangeEdgeGeom('topology', -1, GeomFromText('MULTILINESTRING((0 0, 1 1), (4 4, 5 5))', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/changeedgegeom17.testcase b/test/sql_stmt_lwgeom_22_tests/changeedgegeom17.testcase
deleted file mode 100644
index 61d97cd..0000000
--- a/test/sql_stmt_lwgeom_22_tests/changeedgegeom17.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ChangeEdgeGeom - NULL Edge
-:memory: #use in-memory database
-SELECT ST_ChangeEdgeGeom('topology', NULL, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ChangeEdgeGeom('topology', NULL, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/changeedgegeom2.testcase b/test/sql_stmt_lwgeom_22_tests/changeedgegeom2.testcase
deleted file mode 100644
index 3c72c09..0000000
--- a/test/sql_stmt_lwgeom_22_tests/changeedgegeom2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ChangeEdgeGeom - Int Topology
-:memory: #use in-memory database
-SELECT ST_ChangeEdgeGeom(1, -1, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ChangeEdgeGeom(1, -1, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/changeedgegeom3.testcase b/test/sql_stmt_lwgeom_22_tests/changeedgegeom3.testcase
deleted file mode 100644
index 1ee36e0..0000000
--- a/test/sql_stmt_lwgeom_22_tests/changeedgegeom3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ChangeEdgeGeom - Double Topology
-:memory: #use in-memory database
-SELECT ST_ChangeEdgeGeom(1.5, -1, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ChangeEdgeGeom(1.5, -1, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/changeedgegeom4.testcase b/test/sql_stmt_lwgeom_22_tests/changeedgegeom4.testcase
deleted file mode 100644
index 63b1281..0000000
--- a/test/sql_stmt_lwgeom_22_tests/changeedgegeom4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ChangeEdgeGeom - Blob Topology
-:memory: #use in-memory database
-SELECT ST_ChangeEdgeGeom(zeroblob(4), -1, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ChangeEdgeGeom(zeroblob(4), -1, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/changeedgegeom5.testcase b/test/sql_stmt_lwgeom_22_tests/changeedgegeom5.testcase
deleted file mode 100644
index f785044..0000000
--- a/test/sql_stmt_lwgeom_22_tests/changeedgegeom5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ChangeEdgeGeom - Text Topology
-:memory: #use in-memory database
-SELECT ST_ChangeEdgeGeom('topology', -1, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ChangeEdgeGeom('topology', -1, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/changeedgegeom6.testcase b/test/sql_stmt_lwgeom_22_tests/changeedgegeom6.testcase
deleted file mode 100644
index 13fa149..0000000
--- a/test/sql_stmt_lwgeom_22_tests/changeedgegeom6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ChangeEdgeGeom - Double Edge
-:memory: #use in-memory database
-SELECT ST_ChangeEdgeGeom('topology', 2.0, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ChangeEdgeGeom('topology', 2.0, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/changeedgegeom7.testcase b/test/sql_stmt_lwgeom_22_tests/changeedgegeom7.testcase
deleted file mode 100644
index 0e07bfc..0000000
--- a/test/sql_stmt_lwgeom_22_tests/changeedgegeom7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ChangeEdgeGeom - BLOB Edge
-:memory: #use in-memory database
-SELECT ST_ChangeEdgeGeom('topology', zeroblob(4), GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ChangeEdgeGeom('topology', zeroblob(4), GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/changeedgegeom8.testcase b/test/sql_stmt_lwgeom_22_tests/changeedgegeom8.testcase
deleted file mode 100644
index 2b174d3..0000000
--- a/test/sql_stmt_lwgeom_22_tests/changeedgegeom8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ChangeEdgeGeom - Text Edge
-:memory: #use in-memory database
-SELECT ST_ChangeEdgeGeom('topology', 'edge', GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ChangeEdgeGeom('topology', 'Edge', GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/changeedgegeom9.testcase b/test/sql_stmt_lwgeom_22_tests/changeedgegeom9.testcase
deleted file mode 100644
index bd61821..0000000
--- a/test/sql_stmt_lwgeom_22_tests/changeedgegeom9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ChangeEdgeGeom - Int Geometry
-:memory: #use in-memory database
-SELECT ST_ChangeEdgeGeom('topology', -1, 1);
-1 # rows (not including the header row)
-1 # columns
-ST_ChangeEdgeGeom('topology', -1, 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/changelinkgeom1.testcase b/test/sql_stmt_lwgeom_22_tests/changelinkgeom1.testcase
deleted file mode 100644
index 0420868..0000000
--- a/test/sql_stmt_lwgeom_22_tests/changelinkgeom1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ChangeLinkGeom - NULL Network
-:memory: #use in-memory database
-SELECT ST_ChangeLinkGeom(NULL, -1, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ChangeLinkGeom(NULL, -1, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/changelinkgeom2.testcase b/test/sql_stmt_lwgeom_22_tests/changelinkgeom2.testcase
deleted file mode 100644
index baebe25..0000000
--- a/test/sql_stmt_lwgeom_22_tests/changelinkgeom2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ChangeLinkGeom - Int Network
-:memory: #use in-memory database
-SELECT ST_ChangeLinkGeom(1, -1, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ChangeLinkGeom(1, -1, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/changelinkgeom3.testcase b/test/sql_stmt_lwgeom_22_tests/changelinkgeom3.testcase
deleted file mode 100644
index b495f33..0000000
--- a/test/sql_stmt_lwgeom_22_tests/changelinkgeom3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ChangeLinkGeom - Double Network
-:memory: #use in-memory database
-SELECT ST_ChangeLinkGeom(1.5, -1, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ChangeLinkGeom(1.5, -1, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/changelinkgeom4.testcase b/test/sql_stmt_lwgeom_22_tests/changelinkgeom4.testcase
deleted file mode 100644
index 8cc5c41..0000000
--- a/test/sql_stmt_lwgeom_22_tests/changelinkgeom4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ChangeLinkGeom - Blob Network
-:memory: #use in-memory database
-SELECT ST_ChangeLinkGeom(zeroblob(4), -1, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ChangeLinkGeom(zeroblob(4), -1, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/changelinkgeom5.testcase b/test/sql_stmt_lwgeom_22_tests/changelinkgeom5.testcase
deleted file mode 100644
index 754599c..0000000
--- a/test/sql_stmt_lwgeom_22_tests/changelinkgeom5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ChangeLinkGeom - Text Network
-:memory: #use in-memory database
-SELECT ST_ChangeLinkGeom('topology', -1, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ChangeLinkGeom('topology', -1, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/changelinkgeom6.testcase b/test/sql_stmt_lwgeom_22_tests/changelinkgeom6.testcase
deleted file mode 100644
index de70006..0000000
--- a/test/sql_stmt_lwgeom_22_tests/changelinkgeom6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ChangeLinkGeom - Double Link
-:memory: #use in-memory database
-SELECT ST_ChangeLinkGeom('topology', 2.0, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ChangeLinkGeom('topology', 2.0, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/changelinkgeom7.testcase b/test/sql_stmt_lwgeom_22_tests/changelinkgeom7.testcase
deleted file mode 100644
index bd108f2..0000000
--- a/test/sql_stmt_lwgeom_22_tests/changelinkgeom7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ChangeLinkGeom - BLOB Link
-:memory: #use in-memory database
-SELECT ST_ChangeLinkGeom('topology', zeroblob(4), GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ChangeLinkGeom('topology', zeroblob(4), GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/changelinkgeom8.testcase b/test/sql_stmt_lwgeom_22_tests/changelinkgeom8.testcase
deleted file mode 100644
index f92e8b3..0000000
--- a/test/sql_stmt_lwgeom_22_tests/changelinkgeom8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ChangeLinkGeom - Text Link
-:memory: #use in-memory database
-SELECT ST_ChangeLinkGeom('topology', 'Link', GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ChangeLinkGeom('topology', 'Link', GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/createnetwork1.testcase b/test/sql_stmt_lwgeom_22_tests/createnetwork1.testcase
deleted file mode 100644
index d1d0cc9..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createnetwork1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateNetwork - NULL Network
-:memory: #use in-memory database
-SELECT CreateNetwork(NULL);
-1 # rows (not including the header row)
-1 # columns
-CreateNetwork(NULL)
--1
diff --git a/test/sql_stmt_lwgeom_22_tests/createnetwork10.testcase b/test/sql_stmt_lwgeom_22_tests/createnetwork10.testcase
deleted file mode 100644
index 1a0c9c2..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createnetwork10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateNetwork - Int Spatial
-:memory: #use in-memory database
-SELECT CreateNetwork('roads2', 1);
-1 # rows (not including the header row)
-1 # columns
-CreateNetwork('roads2', 1)
-1
diff --git a/test/sql_stmt_lwgeom_22_tests/createnetwork11.testcase b/test/sql_stmt_lwgeom_22_tests/createnetwork11.testcase
deleted file mode 100644
index 6c63a0e..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createnetwork11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateNetwork - NULL Srid
-:memory: #use in-memory database
-SELECT CreateNetwork('roadsB', 1, NULL);
-1 # rows (not including the header row)
-1 # columns
-CreateNetwork('roadsB', 1, NULL);
-1
diff --git a/test/sql_stmt_lwgeom_22_tests/createnetwork12.testcase b/test/sql_stmt_lwgeom_22_tests/createnetwork12.testcase
deleted file mode 100644
index 64292c2..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createnetwork12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateNetwork - Int Srid
-:memory: #use in-memory database
-SELECT CreateNetwork('roadsC', 1, 4326);
-1 # rows (not including the header row)
-1 # columns
-CreateNetwork('roadsC', 1, 4326);
-1
diff --git a/test/sql_stmt_lwgeom_22_tests/createnetwork13.testcase b/test/sql_stmt_lwgeom_22_tests/createnetwork13.testcase
deleted file mode 100644
index b47780f..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createnetwork13.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateNetwork - Double Srid
-:memory: #use in-memory database
-SELECT CreateNetwork('roadsD', 1, 1.5);
-1 # rows (not including the header row)
-1 # columns
-CreateNetwork('roadsD', 1, 1.5);
--1
diff --git a/test/sql_stmt_lwgeom_22_tests/createnetwork14.testcase b/test/sql_stmt_lwgeom_22_tests/createnetwork14.testcase
deleted file mode 100644
index 7bf1f92..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createnetwork14.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateNetwork - Text Srid
-:memory: #use in-memory database
-SELECT CreateNetwork('roads', 1, 'alpha');
-1 # rows (not including the header row)
-1 # columns
-CreateNetwork('roads', 1, 'alpha');
--1
diff --git a/test/sql_stmt_lwgeom_22_tests/createnetwork15.testcase b/test/sql_stmt_lwgeom_22_tests/createnetwork15.testcase
deleted file mode 100644
index 2d8b57c..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createnetwork15.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateNetwork - Blob Srid
-:memory: #use in-memory database
-SELECT CreateNetwork('roads', 1, zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-CreateNetwork('roads', 1, zeroblob(4));
--1
diff --git a/test/sql_stmt_lwgeom_22_tests/createnetwork16.testcase b/test/sql_stmt_lwgeom_22_tests/createnetwork16.testcase
deleted file mode 100644
index ddfbc4a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createnetwork16.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateNetwork - NULL hasZ
-:memory: #use in-memory database
-SELECT CreateNetwork('roadsZ', 1, 4326, NULL);
-1 # rows (not including the header row)
-1 # columns
-CreateNetwork('roadsZ', 1, 4326, NULL);
-1
diff --git a/test/sql_stmt_lwgeom_22_tests/createnetwork17.testcase b/test/sql_stmt_lwgeom_22_tests/createnetwork17.testcase
deleted file mode 100644
index e81f47b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createnetwork17.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateNetwork - Int hasZ
-:memory: #use in-memory database
-SELECT CreateNetwork('roadsX', 1, 4326, 1);
-1 # rows (not including the header row)
-1 # columns
-CreateNetwork('roadsX', 1, 4326, 1);
-1
diff --git a/test/sql_stmt_lwgeom_22_tests/createnetwork18.testcase b/test/sql_stmt_lwgeom_22_tests/createnetwork18.testcase
deleted file mode 100644
index 6ced7e8..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createnetwork18.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateNetwork - Double hasZ
-:memory: #use in-memory database
-SELECT CreateNetwork('roadsD', 1, 4326, 1.5);
-1 # rows (not including the header row)
-1 # columns
-CreateNetwork('roadsD', 1, 4326, 1.5);
--1
diff --git a/test/sql_stmt_lwgeom_22_tests/createnetwork19.testcase b/test/sql_stmt_lwgeom_22_tests/createnetwork19.testcase
deleted file mode 100644
index 08c9f1b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createnetwork19.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateNetwork - Text hasZ
-:memory: #use in-memory database
-SELECT CreateNetwork('roads', 1, 4326, 'alpha');
-1 # rows (not including the header row)
-1 # columns
-CreateNetwork('roads', 1, 4326, 'alpha');
--1
diff --git a/test/sql_stmt_lwgeom_22_tests/createnetwork2.testcase b/test/sql_stmt_lwgeom_22_tests/createnetwork2.testcase
deleted file mode 100644
index 785a873..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createnetwork2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateNetwork - Int Network
-:memory: #use in-memory database
-SELECT CreateNetwork(1);
-1 # rows (not including the header row)
-1 # columns
-CreateNetwork(1)
--1
diff --git a/test/sql_stmt_lwgeom_22_tests/createnetwork20.testcase b/test/sql_stmt_lwgeom_22_tests/createnetwork20.testcase
deleted file mode 100644
index bea4295..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createnetwork20.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateNetwork - Blob hasZ
-:memory: #use in-memory database
-SELECT CreateNetwork('roads', 1, 4326, zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-CreateNetwork('roads', 1, 4326, zeroblob(4));
--1
diff --git a/test/sql_stmt_lwgeom_22_tests/createnetwork21.testcase b/test/sql_stmt_lwgeom_22_tests/createnetwork21.testcase
deleted file mode 100644
index 9262d79..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createnetwork21.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateNetwork - NULL allow-coincident
-:memory: #use in-memory database
-SELECT CreateNetwork('roadsW', 1, 4326, 1, NULL);
-1 # rows (not including the header row)
-1 # columns
-CreateNetwork('roadsW', 1, 4326, 1, NULL);
-1
diff --git a/test/sql_stmt_lwgeom_22_tests/createnetwork22.testcase b/test/sql_stmt_lwgeom_22_tests/createnetwork22.testcase
deleted file mode 100644
index 6db911a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createnetwork22.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateNetwork - Int allow-coincident
-:memory: #use in-memory database
-SELECT CreateNetwork('roadsY', 1, 4326, 1, 1);
-1 # rows (not including the header row)
-1 # columns
-CreateNetwork('roadsY', 1, 4326, 1, 1);
-1
diff --git a/test/sql_stmt_lwgeom_22_tests/createnetwork23.testcase b/test/sql_stmt_lwgeom_22_tests/createnetwork23.testcase
deleted file mode 100644
index 3c52dc2..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createnetwork23.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateNetwork - Double allow-coincident
-:memory: #use in-memory database
-SELECT CreateNetwork('roadsE', 1, 4326, 1, 1.5);
-1 # rows (not including the header row)
-1 # columns
-CreateNetwork('roadsE', 1, 4326, 1, 1.5);
--1
diff --git a/test/sql_stmt_lwgeom_22_tests/createnetwork24.testcase b/test/sql_stmt_lwgeom_22_tests/createnetwork24.testcase
deleted file mode 100644
index 224c5f9..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createnetwork24.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateNetwork - Text allow-coincident
-:memory: #use in-memory database
-SELECT CreateNetwork('roads', 1, 4326, 1, 'alpha');
-1 # rows (not including the header row)
-1 # columns
-CreateNetwork('roads', 1, 4326, 1, 'alpha');
--1
diff --git a/test/sql_stmt_lwgeom_22_tests/createnetwork25.testcase b/test/sql_stmt_lwgeom_22_tests/createnetwork25.testcase
deleted file mode 100644
index 67ec3b1..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createnetwork25.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateNetwork - Blob allow-coincident
-:memory: #use in-memory database
-SELECT CreateNetwork('roads', 1, 4326, 1, zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-CreateNetwork('roads', 1, 4326, 1, zeroblob(4));
--1
diff --git a/test/sql_stmt_lwgeom_22_tests/createnetwork3.testcase b/test/sql_stmt_lwgeom_22_tests/createnetwork3.testcase
deleted file mode 100644
index f414966..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createnetwork3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateNetwork - Double Network
-:memory: #use in-memory database
-SELECT CreateNetwork(1.1);
-1 # rows (not including the header row)
-1 # columns
-CreateNetwork(1.1)
--1
diff --git a/test/sql_stmt_lwgeom_22_tests/createnetwork4.testcase b/test/sql_stmt_lwgeom_22_tests/createnetwork4.testcase
deleted file mode 100644
index 5c7f423..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createnetwork4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateNetwork - BLOB Network
-:memory: #use in-memory database
-SELECT CreateNetwork(zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-CreateNetwork(zeroblob(4))
--1
diff --git a/test/sql_stmt_lwgeom_22_tests/createnetwork5.testcase b/test/sql_stmt_lwgeom_22_tests/createnetwork5.testcase
deleted file mode 100644
index 7de4803..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createnetwork5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateNetwork - Text Network
-:memory: #use in-memory database
-SELECT CreateNetwork('roads');
-1 # rows (not including the header row)
-1 # columns
-CreateNetwork('roads')
-1
diff --git a/test/sql_stmt_lwgeom_22_tests/createnetwork6.testcase b/test/sql_stmt_lwgeom_22_tests/createnetwork6.testcase
deleted file mode 100644
index 17b60d7..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createnetwork6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateNetwork - NULL Spatial
-:memory: #use in-memory database
-SELECT CreateNetwork('roadsA', NULL);
-1 # rows (not including the header row)
-1 # columns
-CreateNetwork('roadsA', NULL)
-1
diff --git a/test/sql_stmt_lwgeom_22_tests/createnetwork7.testcase b/test/sql_stmt_lwgeom_22_tests/createnetwork7.testcase
deleted file mode 100644
index e6593f7..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createnetwork7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateNetwork - BLOB Spatial
-:memory: #use in-memory database
-SELECT CreateNetwork('roads', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-CreateNetwork('roads', zeroblob(4))
--1
diff --git a/test/sql_stmt_lwgeom_22_tests/createnetwork8.testcase b/test/sql_stmt_lwgeom_22_tests/createnetwork8.testcase
deleted file mode 100644
index 811e2d0..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createnetwork8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateNetwork - TEXT Spatial
-:memory: #use in-memory database
-SELECT CreateNetwork('roads', 'beta');
-1 # rows (not including the header row)
-1 # columns
-CreateNetwork('roads', 'beta')
--1
diff --git a/test/sql_stmt_lwgeom_22_tests/createnetwork9.testcase b/test/sql_stmt_lwgeom_22_tests/createnetwork9.testcase
deleted file mode 100644
index 2d35364..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createnetwork9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateNetwork - Double Spatial
-:memory: #use in-memory database
-SELECT CreateNetwork('roads', 3.1);
-1 # rows (not including the header row)
-1 # columns
-CreateNetwork('roads', 3.1)
--1
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopogeo1.testcase b/test/sql_stmt_lwgeom_22_tests/createtopogeo1.testcase
deleted file mode 100644
index 5d494ea..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopogeo1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_CreateTopoGeo - NULL Topology
-:memory: #use in-memory database
-SELECT ST_CreateTopoGeo(NULL, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_CreateTopoGeo(NULL, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopogeo10.testcase b/test/sql_stmt_lwgeom_22_tests/createtopogeo10.testcase
deleted file mode 100644
index 41be5b8..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopogeo10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_CreateTopoGeo - non existing Topology
-:memory: #use in-memory database
-SELECT ST_CreateTopoGeo('topology', MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_CreateTopoGeo('topology', MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopogeo2.testcase b/test/sql_stmt_lwgeom_22_tests/createtopogeo2.testcase
deleted file mode 100644
index a446b76..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopogeo2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_CreateTopoGeo - Int Topology
-:memory: #use in-memory database
-SELECT ST_CreateTopoGeo(1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_CreateTopoGeo(1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopogeo3.testcase b/test/sql_stmt_lwgeom_22_tests/createtopogeo3.testcase
deleted file mode 100644
index 37a0d91..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopogeo3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_CreateTopoGeo - Double Topology
-:memory: #use in-memory database
-SELECT ST_CreateTopoGeo(1.5, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_CreateTopoGeo(1.5, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopogeo4.testcase b/test/sql_stmt_lwgeom_22_tests/createtopogeo4.testcase
deleted file mode 100644
index 7d55abe..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopogeo4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_CreateTopoGeo - BLOB Topology
-:memory: #use in-memory database
-SELECT ST_CreateTopoGeo(zeroblob(4), MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_CreateTopoGeo(zeroblob(4), MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopogeo5.testcase b/test/sql_stmt_lwgeom_22_tests/createtopogeo5.testcase
deleted file mode 100644
index 1c013c0..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopogeo5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_CreateTopoGeo - NULL GeomCollection
-:memory: #use in-memory database
-SELECT ST_CreateTopoGeo('topology', NULL);
-1 # rows (not including the header row)
-1 # columns
-ST_CreateTopoGeo('topology', NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopogeo6.testcase b/test/sql_stmt_lwgeom_22_tests/createtopogeo6.testcase
deleted file mode 100644
index 7bd1c72..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopogeo6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_CreateTopoGeo - Int GeomCollection
-:memory: #use in-memory database
-SELECT ST_CreateTopoGeo('topology', 1);
-1 # rows (not including the header row)
-1 # columns
-ST_CreateTopoGeo('topology', 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopogeo7.testcase b/test/sql_stmt_lwgeom_22_tests/createtopogeo7.testcase
deleted file mode 100644
index 9266e2e..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopogeo7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_CreateTopoGeo - Double GeomCollection
-:memory: #use in-memory database
-SELECT ST_CreateTopoGeo('topology', 1.4);
-1 # rows (not including the header row)
-1 # columns
-ST_CreateTopoGeo('topology', 1.4)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopogeo8.testcase b/test/sql_stmt_lwgeom_22_tests/createtopogeo8.testcase
deleted file mode 100644
index c4d7bdc..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopogeo8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_CreateTopoGeo - Text GeomCollection
-:memory: #use in-memory database
-SELECT ST_CreateTopoGeo('topology', 'geom');
-1 # rows (not including the header row)
-1 # columns
-ST_CreateTopoGeo('topology', 'geom')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopogeo9.testcase b/test/sql_stmt_lwgeom_22_tests/createtopogeo9.testcase
deleted file mode 100644
index c38551a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopogeo9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_CreateTopoGeo - Invalid BLOB GeomCollection
-:memory: #use in-memory database
-SELECT ST_CreateTopoGeo('topology', zeroblob(100));
-1 # rows (not including the header row)
-1 # columns
-ST_CreateTopoGeo('topology', zeroblob(100))
-SQL/MM Spatial exception - not a Geometry.
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopolayer1.testcase b/test/sql_stmt_lwgeom_22_tests/createtopolayer1.testcase
deleted file mode 100644
index be2127d..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopolayer1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_CreateTopoLayer - NULL Topology
-:memory: #use in-memory database
-SELECT TopoGeo_CreateTopoLayer(NULL, NULL, 'table', NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_CreateTopoLayer(NULL, NULL, 'table', NULL, 'out')
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopolayer10.testcase b/test/sql_stmt_lwgeom_22_tests/createtopolayer10.testcase
deleted file mode 100644
index 40e965c..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopolayer10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_CreateTopoLayer - NULL ref-table
-:memory: #use in-memory database
-SELECT TopoGeo_CreateTopoLayer('topology', NULL, NULL, NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_CreateTopoLayer('topology', NULL, NULL, NULL, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopolayer11.testcase b/test/sql_stmt_lwgeom_22_tests/createtopolayer11.testcase
deleted file mode 100644
index 966a218..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopolayer11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_CreateTopoLayer - INT ref-table
-:memory: #use in-memory database
-SELECT TopoGeo_CreateTopoLayer('topology', NULL, 1, NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_CreateTopoLayer('topology', NULL, 1, NULL, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopolayer12.testcase b/test/sql_stmt_lwgeom_22_tests/createtopolayer12.testcase
deleted file mode 100644
index ede6cc7..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopolayer12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_CreateTopoLayer - Double ref-table
-:memory: #use in-memory database
-SELECT TopoGeo_CreateTopoLayer('topology', NULL, 1.2, NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_CreateTopoLayer('topology', NULL, 1.2, NULL, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopolayer13.testcase b/test/sql_stmt_lwgeom_22_tests/createtopolayer13.testcase
deleted file mode 100644
index 6c09289..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopolayer13.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_CreateTopoLayer - BLOB ref-table
-:memory: #use in-memory database
-SELECT TopoGeo_CreateTopoLayer('topology', NULL, zeroblob(4), NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_CreateTopoLayer('topology', NULL, zeroblob(4), NULL, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopolayer14.testcase b/test/sql_stmt_lwgeom_22_tests/createtopolayer14.testcase
deleted file mode 100644
index acc786a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopolayer14.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_CreateTopoLayer - Text Column
-:memory: #use in-memory database
-SELECT TopoGeo_CreateTopoLayer('topology', NULL, 'table', 'column', 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_CreateTopoLayer('topology', NULL, 'table', 'column', 'out')
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopolayer15.testcase b/test/sql_stmt_lwgeom_22_tests/createtopolayer15.testcase
deleted file mode 100644
index 48e33fc..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopolayer15.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_CreateTopoLayer - Int Column
-:memory: #use in-memory database
-SELECT TopoGeo_CreateTopoLayer('topology', NULL, 'table', 1, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_CreateTopoLayer('topology', NULL, 'table', 1, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopolayer16.testcase b/test/sql_stmt_lwgeom_22_tests/createtopolayer16.testcase
deleted file mode 100644
index 8fadd6f..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopolayer16.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_CreateTopoLayer - Double Column
-:memory: #use in-memory database
-SELECT TopoGeo_CreateTopoLayer('topology', NULL, 'table', 1.2, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_CreateTopoLayer('topology', NULL, 'table', 1.2, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopolayer17.testcase b/test/sql_stmt_lwgeom_22_tests/createtopolayer17.testcase
deleted file mode 100644
index f4c06e0..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopolayer17.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_CreateTopoLayer - BLOB Column
-:memory: #use in-memory database
-SELECT TopoGeo_CreateTopoLayer('topology', NULL, 'table', zeroblob(4), 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_CreateTopoLayer('topology', NULL, 'table', zeroblob(4), 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopolayer18.testcase b/test/sql_stmt_lwgeom_22_tests/createtopolayer18.testcase
deleted file mode 100644
index 7f1c70c..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopolayer18.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_CreateTopoLayer - NULL TopoLayer
-:memory: #use in-memory database
-SELECT TopoGeo_CreateTopoLayer('topology', NULL, 'table', NULL, NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_CreateTopoLayer('topology', NULL, 'table', NULL, NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopolayer19.testcase b/test/sql_stmt_lwgeom_22_tests/createtopolayer19.testcase
deleted file mode 100644
index d6d6936..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopolayer19.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_CreateTopoLayer - Double TopoLayer
-:memory: #use in-memory database
-SELECT TopoGeo_CreateTopoLayer('topology', NULL, 'table', NULL, 1.2);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_CreateTopoLayer('topology', NULL, 'table', NULL, 1.2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopolayer2.testcase b/test/sql_stmt_lwgeom_22_tests/createtopolayer2.testcase
deleted file mode 100644
index 8b9515a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopolayer2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_CreateTopoLayer - Int Topology
-:memory: #use in-memory database
-SELECT TopoGeo_CreateTopoLayer(1, NULL, 'table', NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_CreateTopoLayer(1, NULL, 'table', NULL, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopolayer20.testcase b/test/sql_stmt_lwgeom_22_tests/createtopolayer20.testcase
deleted file mode 100644
index 1ecd25a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopolayer20.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_CreateTopoLayer - BLOB TopoLayer
-:memory: #use in-memory database
-SELECT TopoGeo_CreateTopoLayer('topology', NULL, 'table', NULL, zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_CreateTopoLayer('topology', NULL, 'table', NULL, zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopolayer21.testcase b/test/sql_stmt_lwgeom_22_tests/createtopolayer21.testcase
deleted file mode 100644
index 11e4064..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopolayer21.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_CreateTopoLayer - Text TopoLayer
-:memory: #use in-memory database
-SELECT TopoGeo_CreateTopoLayer('topology', NULL, 'table', NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_CreateTopoLayer('topology', NULL, 'table', NULL, 'out')
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopolayer22.testcase b/test/sql_stmt_lwgeom_22_tests/createtopolayer22.testcase
deleted file mode 100644
index 3e23ac2..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopolayer22.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_CreateTopoLayer - BLOB is-view
-:memory: #use in-memory database
-SELECT TopoGeo_CreateTopoLayer('topology', NULL, 'table', 'geometry', 'out', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_CreateTopoLayer('topology', NULL, 'table', zeroblob(4), 'out', zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopolayer23.testcase b/test/sql_stmt_lwgeom_22_tests/createtopolayer23.testcase
deleted file mode 100644
index 7c06bc5..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopolayer23.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_CreateTopoLayer - TEXT is-view
-:memory: #use in-memory database
-SELECT TopoGeo_CreateTopoLayer('topology', NULL, 'table', 'geometry', 'out', 'no');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_CreateTopoLayer('topology', NULL, 'table', zeroblob(4), 'out', 'no')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopolayer24.testcase b/test/sql_stmt_lwgeom_22_tests/createtopolayer24.testcase
deleted file mode 100644
index a6c9417..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopolayer24.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_CreateTopoLayer - Double is-view
-:memory: #use in-memory database
-SELECT TopoGeo_CreateTopoLayer('topology', NULL, 'table', 'geometry', 'out', 1.5);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_CreateTopoLayer('topology', NULL, 'table', zeroblob(4), 'out', 1.5)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopolayer25.testcase b/test/sql_stmt_lwgeom_22_tests/createtopolayer25.testcase
deleted file mode 100644
index b3076b9..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopolayer25.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_CreateTopoLayer - NULL is-view
-:memory: #use in-memory database
-SELECT TopoGeo_CreateTopoLayer('topology', NULL, 'table', 'geometry', 'out', NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_CreateTopoLayer('topology', NULL, 'table', zeroblob(4), 'out', NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopolayer26.testcase b/test/sql_stmt_lwgeom_22_tests/createtopolayer26.testcase
deleted file mode 100644
index 66f8bfc..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopolayer26.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_CreateTopoLayer - Integer is-view
-:memory: #use in-memory database
-SELECT TopoGeo_CreateTopoLayer('topology', NULL, 'table', 'geometry', 'out', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_CreateTopoLayer('topology', NULL, 'table', zeroblob(4), 'out', 1)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopolayer3.testcase b/test/sql_stmt_lwgeom_22_tests/createtopolayer3.testcase
deleted file mode 100644
index b8fd433..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopolayer3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_CreateTopoLayer - Double Topology
-:memory: #use in-memory database
-SELECT TopoGeo_CreateTopoLayer(1.5, NULL, 'table', NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_CreateTopoLayer(1.5, NULL, 'table', NULL, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopolayer4.testcase b/test/sql_stmt_lwgeom_22_tests/createtopolayer4.testcase
deleted file mode 100644
index 8a7d8d8..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopolayer4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_CreateTopoLayer - Blob Topology
-:memory: #use in-memory database
-SELECT TopoGeo_CreateTopoLayer(zeroblob(4), NULL, 'table', NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_CreateTopoLayer(zeroblob(4), NULL, 'table', NULL, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopolayer5.testcase b/test/sql_stmt_lwgeom_22_tests/createtopolayer5.testcase
deleted file mode 100644
index b16a7ac..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopolayer5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_CreateTopoLayer - Text Topology
-:memory: #use in-memory database
-SELECT TopoGeo_CreateTopoLayer('topology', NULL, 'table', NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_CreateTopoLayer('topology', NULL, 'table', NULL, 'out')
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopolayer6.testcase b/test/sql_stmt_lwgeom_22_tests/createtopolayer6.testcase
deleted file mode 100644
index 397ebd4..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopolayer6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_CreateTopoLayer - TEXT prefix
-:memory: #use in-memory database
-SELECT TopoGeo_CreateTopoLayer('topology', 'a', 'table', NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_CreateTopoLayer('topology', 'a', 'table', NULL, 'out')
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopolayer7.testcase b/test/sql_stmt_lwgeom_22_tests/createtopolayer7.testcase
deleted file mode 100644
index fa778b3..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopolayer7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_CreateTopoLayer - INT prefix
-:memory: #use in-memory database
-SELECT TopoGeo_CreateTopoLayer('topology', 1, 'table', NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_CreateTopoLayer('topology', 1, 'table', NULL, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopolayer8.testcase b/test/sql_stmt_lwgeom_22_tests/createtopolayer8.testcase
deleted file mode 100644
index c0d5e65..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopolayer8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_CreateTopoLayer - Double prefix
-:memory: #use in-memory database
-SELECT TopoGeo_CreateTopoLayer('topology', 1.2, 'table', NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_CreateTopoLayer('topology', 1.2, 'table', NULL, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopolayer9.testcase b/test/sql_stmt_lwgeom_22_tests/createtopolayer9.testcase
deleted file mode 100644
index 84e5cf2..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopolayer9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_CreateTopoLayer - BLOB prefix
-:memory: #use in-memory database
-SELECT TopoGeo_CreateTopoLayer('topology', zeroblob(4), 'table', NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_CreateTopoLayer('topology', zeroblob(4), 'table', NULL, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopology1.testcase b/test/sql_stmt_lwgeom_22_tests/createtopology1.testcase
deleted file mode 100644
index 8c9ffbd..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopology1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateTopology - NULL Topology
-:memory: #use in-memory database
-SELECT CreateTopology(NULL);
-1 # rows (not including the header row)
-1 # columns
-CreateTopology(NULL)
--1
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopology10.testcase b/test/sql_stmt_lwgeom_22_tests/createtopology10.testcase
deleted file mode 100644
index b49cb34..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopology10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateTopology - Int Srid
-:memory: #use in-memory database
-SELECT CreateTopology('topo2', 4326);
-1 # rows (not including the header row)
-1 # columns
-CreateTopology('topo2', 4326)
-1
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopology11.testcase b/test/sql_stmt_lwgeom_22_tests/createtopology11.testcase
deleted file mode 100644
index bbd8e59..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopology11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateTopology - NULL tolerance
-:memory: #use in-memory database
-SELECT CreateTopology('topoB', 4326, NULL);
-1 # rows (not including the header row)
-1 # columns
-CreateTopology('topoB', 4326, NULL);
-1
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopology12.testcase b/test/sql_stmt_lwgeom_22_tests/createtopology12.testcase
deleted file mode 100644
index a18a690..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopology12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateTopology - Int tolerance
-:memory: #use in-memory database
-SELECT CreateTopology('topoC', 4326, 1);
-1 # rows (not including the header row)
-1 # columns
-CreateTopology('topoC', 4326, 1);
-1
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopology13.testcase b/test/sql_stmt_lwgeom_22_tests/createtopology13.testcase
deleted file mode 100644
index 72819c9..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopology13.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateTopology - Double tolerance
-:memory: #use in-memory database
-SELECT CreateTopology('topoD', 4326, 1.5);
-1 # rows (not including the header row)
-1 # columns
-CreateTopology('topoD', 4326, 1.5);
-1
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopology14.testcase b/test/sql_stmt_lwgeom_22_tests/createtopology14.testcase
deleted file mode 100644
index 07d78f6..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopology14.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateTopology - Text tolerance
-:memory: #use in-memory database
-SELECT CreateTopology('topo', 4326, 'alpha');
-1 # rows (not including the header row)
-1 # columns
-CreateTopology('topo', 4326, 'alpha');
--1
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopology15.testcase b/test/sql_stmt_lwgeom_22_tests/createtopology15.testcase
deleted file mode 100644
index 97b2430..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopology15.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateTopology - Blob tolerance
-:memory: #use in-memory database
-SELECT CreateTopology('topo', 4326, zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-CreateTopology('topo', 4326, zeroblob(4));
--1
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopology16.testcase b/test/sql_stmt_lwgeom_22_tests/createtopology16.testcase
deleted file mode 100644
index 941889f..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopology16.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateTopology - NULL hasZ
-:memory: #use in-memory database
-SELECT CreateTopology('topoZ', 4326, 1, NULL);
-1 # rows (not including the header row)
-1 # columns
-CreateTopology('topoZ', 4326, 1, NULL);
-1
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopology17.testcase b/test/sql_stmt_lwgeom_22_tests/createtopology17.testcase
deleted file mode 100644
index e0d3002..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopology17.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateTopology - Int hasZ
-:memory: #use in-memory database
-SELECT CreateTopology('topoX', 4326, 1, 1);
-1 # rows (not including the header row)
-1 # columns
-CreateTopology('topoX', 4326, 1, 1);
-1
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopology18.testcase b/test/sql_stmt_lwgeom_22_tests/createtopology18.testcase
deleted file mode 100644
index a520799..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopology18.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateTopology - Double hasZ
-:memory: #use in-memory database
-SELECT CreateTopology('topoD', 4326, 1, 1.5);
-1 # rows (not including the header row)
-1 # columns
-CreateTopology('topoD', 4326, 1, 1.5);
--1
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopology19.testcase b/test/sql_stmt_lwgeom_22_tests/createtopology19.testcase
deleted file mode 100644
index 4fc32bb..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopology19.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateTopology - Text hasZ
-:memory: #use in-memory database
-SELECT CreateTopology('topo', 4326, 1, 'alpha');
-1 # rows (not including the header row)
-1 # columns
-CreateTopology('topo', 4326, 1, 'alpha');
--1
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopology2.testcase b/test/sql_stmt_lwgeom_22_tests/createtopology2.testcase
deleted file mode 100644
index f94663f..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopology2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateTopology - Int Topology
-:memory: #use in-memory database
-SELECT CreateTopology(1);
-1 # rows (not including the header row)
-1 # columns
-CreateTopology(1)
--1
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopology20.testcase b/test/sql_stmt_lwgeom_22_tests/createtopology20.testcase
deleted file mode 100644
index cc799e0..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopology20.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateTopology - Blob hasZ
-:memory: #use in-memory database
-SELECT CreateTopology('topo', 4326, 1, zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-CreateTopology('topo', 4326, 1, zeroblob(4));
--1
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopology3.testcase b/test/sql_stmt_lwgeom_22_tests/createtopology3.testcase
deleted file mode 100644
index 573737d..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopology3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateTopology - Double Topology
-:memory: #use in-memory database
-SELECT CreateTopology(1.1);
-1 # rows (not including the header row)
-1 # columns
-CreateTopology(1.1)
--1
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopology4.testcase b/test/sql_stmt_lwgeom_22_tests/createtopology4.testcase
deleted file mode 100644
index 8c26ccb..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopology4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateTopology - BLOB Topology
-:memory: #use in-memory database
-SELECT CreateTopology(zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-CreateTopology(zeroblob(4))
--1
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopology5.testcase b/test/sql_stmt_lwgeom_22_tests/createtopology5.testcase
deleted file mode 100644
index eb29185..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopology5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateTopology - Text Topology
-:memory: #use in-memory database
-SELECT CreateTopology('topo1');
-1 # rows (not including the header row)
-1 # columns
-CreateTopology('topo1')
-1
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopology6.testcase b/test/sql_stmt_lwgeom_22_tests/createtopology6.testcase
deleted file mode 100644
index 4414e05..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopology6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateTopology - NULL Srid
-:memory: #use in-memory database
-SELECT CreateTopology('topoA', NULL);
-1 # rows (not including the header row)
-1 # columns
-CreateTopology('topoA', NULL)
-1
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopology7.testcase b/test/sql_stmt_lwgeom_22_tests/createtopology7.testcase
deleted file mode 100644
index 07ea13b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopology7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateTopology - BLOB Srid
-:memory: #use in-memory database
-SELECT CreateTopology('topo', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-CreateTopology('topo', zeroblob(4))
--1
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopology8.testcase b/test/sql_stmt_lwgeom_22_tests/createtopology8.testcase
deleted file mode 100644
index f3ab7e9..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopology8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateTopology - TEXT Srid
-:memory: #use in-memory database
-SELECT CreateTopology('topo', 'alpha');
-1 # rows (not including the header row)
-1 # columns
-CreateTopology('topo', 'alpha')
--1
diff --git a/test/sql_stmt_lwgeom_22_tests/createtopology9.testcase b/test/sql_stmt_lwgeom_22_tests/createtopology9.testcase
deleted file mode 100644
index b614557..0000000
--- a/test/sql_stmt_lwgeom_22_tests/createtopology9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-CreateTopology - Double Srid
-:memory: #use in-memory database
-SELECT CreateTopology('topo', 4326.1);
-1 # rows (not including the header row)
-1 # columns
-CreateTopology('topo', 4326.1)
--1
diff --git a/test/sql_stmt_lwgeom_22_tests/dropnetwork1.testcase b/test/sql_stmt_lwgeom_22_tests/dropnetwork1.testcase
deleted file mode 100644
index a7bfe72..0000000
--- a/test/sql_stmt_lwgeom_22_tests/dropnetwork1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-DropNetwork - NULL Network
-:memory: #use in-memory database
-SELECT DropNetwork(NULL);
-1 # rows (not including the header row)
-1 # columns
-DropNetwork(NULL)
--1
diff --git a/test/sql_stmt_lwgeom_22_tests/dropnetwork2.testcase b/test/sql_stmt_lwgeom_22_tests/dropnetwork2.testcase
deleted file mode 100644
index a0e4f3e..0000000
--- a/test/sql_stmt_lwgeom_22_tests/dropnetwork2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-DropNetwork - Int Network
-:memory: #use in-memory database
-SELECT DropNetwork(1);
-1 # rows (not including the header row)
-1 # columns
-DropNetwork(1)
--1
diff --git a/test/sql_stmt_lwgeom_22_tests/dropnetwork3.testcase b/test/sql_stmt_lwgeom_22_tests/dropnetwork3.testcase
deleted file mode 100644
index 6434d9c..0000000
--- a/test/sql_stmt_lwgeom_22_tests/dropnetwork3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-DropNetwork - Double Network
-:memory: #use in-memory database
-SELECT DropNetwork(1.1);
-1 # rows (not including the header row)
-1 # columns
-DropNetwork(1.1)
--1
diff --git a/test/sql_stmt_lwgeom_22_tests/dropnetwork4.testcase b/test/sql_stmt_lwgeom_22_tests/dropnetwork4.testcase
deleted file mode 100644
index 3ea2de0..0000000
--- a/test/sql_stmt_lwgeom_22_tests/dropnetwork4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-DropNetwork - BLOB Network
-:memory: #use in-memory database
-SELECT DropNetwork(zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-DropNetwork(zeroblob(4))
--1
diff --git a/test/sql_stmt_lwgeom_22_tests/dropnetwork5.testcase b/test/sql_stmt_lwgeom_22_tests/dropnetwork5.testcase
deleted file mode 100644
index c4a12e4..0000000
--- a/test/sql_stmt_lwgeom_22_tests/dropnetwork5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-DropNetwork - Text Network
-:memory: #use in-memory database
-SELECT DropNetwork('topoW');
-1 # rows (not including the header row)
-1 # columns
-DropNetwork('topoW')
-0
diff --git a/test/sql_stmt_lwgeom_22_tests/droptopology1.testcase b/test/sql_stmt_lwgeom_22_tests/droptopology1.testcase
deleted file mode 100644
index 3fe0c8b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/droptopology1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-DropTopology - NULL Topology
-:memory: #use in-memory database
-SELECT DropTopology(NULL);
-1 # rows (not including the header row)
-1 # columns
-DropTopology(NULL)
--1
diff --git a/test/sql_stmt_lwgeom_22_tests/droptopology2.testcase b/test/sql_stmt_lwgeom_22_tests/droptopology2.testcase
deleted file mode 100644
index 2b02c9a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/droptopology2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-DropTopology - Int Topology
-:memory: #use in-memory database
-SELECT DropTopology(1);
-1 # rows (not including the header row)
-1 # columns
-DropTopology(1)
--1
diff --git a/test/sql_stmt_lwgeom_22_tests/droptopology3.testcase b/test/sql_stmt_lwgeom_22_tests/droptopology3.testcase
deleted file mode 100644
index 808df47..0000000
--- a/test/sql_stmt_lwgeom_22_tests/droptopology3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-DropTopology - Double Topology
-:memory: #use in-memory database
-SELECT DropTopology(1.1);
-1 # rows (not including the header row)
-1 # columns
-DropTopology(1.1)
--1
diff --git a/test/sql_stmt_lwgeom_22_tests/droptopology4.testcase b/test/sql_stmt_lwgeom_22_tests/droptopology4.testcase
deleted file mode 100644
index bee35df..0000000
--- a/test/sql_stmt_lwgeom_22_tests/droptopology4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-DropTopology - BLOB Topology
-:memory: #use in-memory database
-SELECT DropTopology(zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-DropTopology(zeroblob(4))
--1
diff --git a/test/sql_stmt_lwgeom_22_tests/droptopology5.testcase b/test/sql_stmt_lwgeom_22_tests/droptopology5.testcase
deleted file mode 100644
index 2270e0c..0000000
--- a/test/sql_stmt_lwgeom_22_tests/droptopology5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-DropTopology - Text Topology
-:memory: #use in-memory database
-SELECT DropTopology('topoW');
-1 # rows (not including the header row)
-1 # columns
-DropTopology('topoW')
-0
diff --git a/test/sql_stmt_lwgeom_22_tests/exporttopolayer1.testcase b/test/sql_stmt_lwgeom_22_tests/exporttopolayer1.testcase
deleted file mode 100644
index 74ad9a4..0000000
--- a/test/sql_stmt_lwgeom_22_tests/exporttopolayer1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ExportTopoLayer - NULL Topology
-:memory: #use in-memory database
-SELECT TopoGeo_ExportTopoLayer(NULL, 'topolayer', 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ExportTopoLayer(NULL, 'topolayer', 'out')
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/exporttopolayer10.testcase b/test/sql_stmt_lwgeom_22_tests/exporttopolayer10.testcase
deleted file mode 100644
index c034c39..0000000
--- a/test/sql_stmt_lwgeom_22_tests/exporttopolayer10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ExportTopoLayer - Integer output
-:memory: #use in-memory database
-SELECT TopoGeo_ExportTopoLayer('topology', 'topolayer', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ExportTopoLayer(topology, 'topolayer', 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/exporttopolayer11.testcase b/test/sql_stmt_lwgeom_22_tests/exporttopolayer11.testcase
deleted file mode 100644
index e518de0..0000000
--- a/test/sql_stmt_lwgeom_22_tests/exporttopolayer11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ExportTopoLayer - Double output
-:memory: #use in-memory database
-SELECT TopoGeo_ExportTopoLayer('topology', 'topolayer', 1.2);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ExportTopoLayer(topology, 'topolayer', 1.2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/exporttopolayer12.testcase b/test/sql_stmt_lwgeom_22_tests/exporttopolayer12.testcase
deleted file mode 100644
index c34934b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/exporttopolayer12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ExportTopoLayer - BLOB output
-:memory: #use in-memory database
-SELECT TopoGeo_ExportTopoLayer('topology', 'topolayer', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ExportTopoLayer(topology, 'topolayer', zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/exporttopolayer13.testcase b/test/sql_stmt_lwgeom_22_tests/exporttopolayer13.testcase
deleted file mode 100644
index 6718d07..0000000
--- a/test/sql_stmt_lwgeom_22_tests/exporttopolayer13.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ExportTopoLayer - Text output
-:memory: #use in-memory database
-SELECT TopoGeo_ExportTopoLayer('topology', 'topolayer', 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ExportTopoLayer(topology, 'topolayer', 'out')
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/exporttopolayer14.testcase b/test/sql_stmt_lwgeom_22_tests/exporttopolayer14.testcase
deleted file mode 100644
index 1b3c991..0000000
--- a/test/sql_stmt_lwgeom_22_tests/exporttopolayer14.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ExportTopoLayer - NULL create-only
-:memory: #use in-memory database
-SELECT TopoGeo_ExportTopoLayer('topology', 'topolayer', 'out', 1, NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ExportTopoLayer(topology, 'topolayer', 'out', 1, NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/exporttopolayer15.testcase b/test/sql_stmt_lwgeom_22_tests/exporttopolayer15.testcase
deleted file mode 100644
index 6884d13..0000000
--- a/test/sql_stmt_lwgeom_22_tests/exporttopolayer15.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ExportTopoLayer - Text create-only
-:memory: #use in-memory database
-SELECT TopoGeo_ExportTopoLayer('topology', 'topolayer', 'out', 1, 'no');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ExportTopoLayer(topology, 'topolayer', 'out', 1, 'no')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/exporttopolayer16.testcase b/test/sql_stmt_lwgeom_22_tests/exporttopolayer16.testcase
deleted file mode 100644
index fb642c4..0000000
--- a/test/sql_stmt_lwgeom_22_tests/exporttopolayer16.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ExportTopoLayer - BLOB create-only
-:memory: #use in-memory database
-SELECT TopoGeo_ExportTopoLayer('topology', 'topolayer', 'out', 1, zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ExportTopoLayer(topology, 'topolayer', 'out', 1, zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/exporttopolayer17.testcase b/test/sql_stmt_lwgeom_22_tests/exporttopolayer17.testcase
deleted file mode 100644
index c413ed3..0000000
--- a/test/sql_stmt_lwgeom_22_tests/exporttopolayer17.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ExportTopoLayer - Double create-only
-:memory: #use in-memory database
-SELECT TopoGeo_ExportTopoLayer('topology', 'topolayer', 'out', 1, 1.1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ExportTopoLayer(topology, 'topolayer', 'out', 1, 1.1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/exporttopolayer18.testcase b/test/sql_stmt_lwgeom_22_tests/exporttopolayer18.testcase
deleted file mode 100644
index e8e66ff..0000000
--- a/test/sql_stmt_lwgeom_22_tests/exporttopolayer18.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ExportTopoLayer - Integer create-only
-:memory: #use in-memory database
-SELECT TopoGeo_ExportTopoLayer('topology', 'topolayer', 'out', 1, 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ExportTopoLayer(topology, 'topolayer', 'out', 1, 1)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/exporttopolayer19.testcase b/test/sql_stmt_lwgeom_22_tests/exporttopolayer19.testcase
deleted file mode 100644
index 93b2319..0000000
--- a/test/sql_stmt_lwgeom_22_tests/exporttopolayer19.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ExportTopoLayer - NULL with-spatial-index
-:memory: #use in-memory database
-SELECT TopoGeo_ExportTopoLayer('topology', 'topolayer', 'out', 1, NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ExportTopoLayer(topology, 'topolayer', 'out', 1, NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/exporttopolayer2.testcase b/test/sql_stmt_lwgeom_22_tests/exporttopolayer2.testcase
deleted file mode 100644
index 10d3da5..0000000
--- a/test/sql_stmt_lwgeom_22_tests/exporttopolayer2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ExportTopoLayer - Integer Topology
-:memory: #use in-memory database
-SELECT TopoGeo_ExportTopoLayer(1, 'topolayer', 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ExportTopoLayer(1, 'topolayer', 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/exporttopolayer20.testcase b/test/sql_stmt_lwgeom_22_tests/exporttopolayer20.testcase
deleted file mode 100644
index bf7d655..0000000
--- a/test/sql_stmt_lwgeom_22_tests/exporttopolayer20.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ExportTopoLayer - BLOB with-spatial-index
-:memory: #use in-memory database
-SELECT TopoGeo_ExportTopoLayer('topology', 'topolayer', 'out', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ExportTopoLayer(topology, 'topolayer', 'out', zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/exporttopolayer21.testcase b/test/sql_stmt_lwgeom_22_tests/exporttopolayer21.testcase
deleted file mode 100644
index 331db80..0000000
--- a/test/sql_stmt_lwgeom_22_tests/exporttopolayer21.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ExportTopoLayer - Text with-spatial-index
-:memory: #use in-memory database
-SELECT TopoGeo_ExportTopoLayer('topology', 'topolayer', 'out', 'no');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ExportTopoLayer(topology, 'topolayer', 'out', 'no')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/exporttopolayer22.testcase b/test/sql_stmt_lwgeom_22_tests/exporttopolayer22.testcase
deleted file mode 100644
index 79478eb..0000000
--- a/test/sql_stmt_lwgeom_22_tests/exporttopolayer22.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ExportTopoLayer - Double with-spatial-index
-:memory: #use in-memory database
-SELECT TopoGeo_ExportTopoLayer('topology', 'topolayer', 'out', 1.5);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ExportTopoLayer(topology, 'topolayer', 'out', 1.5)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/exporttopolayer23.testcase b/test/sql_stmt_lwgeom_22_tests/exporttopolayer23.testcase
deleted file mode 100644
index ae6bf9d..0000000
--- a/test/sql_stmt_lwgeom_22_tests/exporttopolayer23.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ExportTopoLayer - Integer with-spatial-index
-:memory: #use in-memory database
-SELECT TopoGeo_ExportTopoLayer('topology', 'topolayer', 'out', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ExportTopoLayer(topology, 'topolayer', 'out', 1)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/exporttopolayer3.testcase b/test/sql_stmt_lwgeom_22_tests/exporttopolayer3.testcase
deleted file mode 100644
index 9204970..0000000
--- a/test/sql_stmt_lwgeom_22_tests/exporttopolayer3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ExportTopoLayer - Double Topology
-:memory: #use in-memory database
-SELECT TopoGeo_ExportTopoLayer(1.5, 'topolayer', 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ExportTopoLayer(1.5, 'topolayer', 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/exporttopolayer4.testcase b/test/sql_stmt_lwgeom_22_tests/exporttopolayer4.testcase
deleted file mode 100644
index 4182aa1..0000000
--- a/test/sql_stmt_lwgeom_22_tests/exporttopolayer4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ExportTopoLayer - Blob Topology
-:memory: #use in-memory database
-SELECT TopoGeo_ExportTopoLayer(zeroblob(5), 'topolayer', 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ExportTopoLayer(zeroblob(5), 'topolayer', 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/exporttopolayer5.testcase b/test/sql_stmt_lwgeom_22_tests/exporttopolayer5.testcase
deleted file mode 100644
index 0303d59..0000000
--- a/test/sql_stmt_lwgeom_22_tests/exporttopolayer5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ExportTopoLayer - NULL TopoLayer
-:memory: #use in-memory database
-SELECT TopoGeo_ExportTopoLayer('topology', NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ExportTopoLayer(topology, NULL, 'out')
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/exporttopolayer6.testcase b/test/sql_stmt_lwgeom_22_tests/exporttopolayer6.testcase
deleted file mode 100644
index c56fcf1..0000000
--- a/test/sql_stmt_lwgeom_22_tests/exporttopolayer6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ExportTopoLayer - Integer TopoLayer
-:memory: #use in-memory database
-SELECT TopoGeo_ExportTopoLayer('topology', 1, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ExportTopoLayer(topology, 1, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/exporttopolayer7.testcase b/test/sql_stmt_lwgeom_22_tests/exporttopolayer7.testcase
deleted file mode 100644
index 128b9f5..0000000
--- a/test/sql_stmt_lwgeom_22_tests/exporttopolayer7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ExportTopoLayer - Double TopoLayer
-:memory: #use in-memory database
-SELECT TopoGeo_ExportTopoLayer('topology', 1.5, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ExportTopoLayer(topology, 1.5, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/exporttopolayer8.testcase b/test/sql_stmt_lwgeom_22_tests/exporttopolayer8.testcase
deleted file mode 100644
index 7d3400b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/exporttopolayer8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ExportTopoLayer - BLOB TopoLayer
-:memory: #use in-memory database
-SELECT TopoGeo_ExportTopoLayer('topology', zeroblob(4), 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ExportTopoLayer(topology, zeroblob(4), 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/exporttopolayer9.testcase b/test/sql_stmt_lwgeom_22_tests/exporttopolayer9.testcase
deleted file mode 100644
index 61e3dfb..0000000
--- a/test/sql_stmt_lwgeom_22_tests/exporttopolayer9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ExportTopoLayer - NULL output
-:memory: #use in-memory database
-SELECT TopoGeo_ExportTopoLayer('topology', 'topolayer', NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ExportTopoLayer(topology, 'topolayer', NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/featuretopolayer1.testcase b/test/sql_stmt_lwgeom_22_tests/featuretopolayer1.testcase
deleted file mode 100644
index 128a042..0000000
--- a/test/sql_stmt_lwgeom_22_tests/featuretopolayer1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_InsertFeatureFromTopoLayer - NULL Topology
-:memory: #use in-memory database
-SELECT TopoGeo_InsertFeatureFromTopoLayer(NULL, 'topolayer', 'out', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_InsertFeatureFromTopoLayer(NULL, 'topolayer', 'out', 1)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/featuretopolayer10.testcase b/test/sql_stmt_lwgeom_22_tests/featuretopolayer10.testcase
deleted file mode 100644
index fcfb12f..0000000
--- a/test/sql_stmt_lwgeom_22_tests/featuretopolayer10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_InsertFeatureFromTopoLayer - Integer output
-:memory: #use in-memory database
-SELECT TopoGeo_InsertFeatureFromTopoLayer('topology', 'topolayer', 1, 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_InsertFeatureFromTopoLayer(topology, 'topolayer', 1, 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/featuretopolayer11.testcase b/test/sql_stmt_lwgeom_22_tests/featuretopolayer11.testcase
deleted file mode 100644
index 5bb7905..0000000
--- a/test/sql_stmt_lwgeom_22_tests/featuretopolayer11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_InsertFeatureFromTopoLayer - Double output
-:memory: #use in-memory database
-SELECT TopoGeo_InsertFeatureFromTopoLayer('topology', 'topolayer', 1.2, 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_InsertFeatureFromTopoLayer(topology, 'topolayer', 1.2, 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/featuretopolayer12.testcase b/test/sql_stmt_lwgeom_22_tests/featuretopolayer12.testcase
deleted file mode 100644
index 1f90bda..0000000
--- a/test/sql_stmt_lwgeom_22_tests/featuretopolayer12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_InsertFeatureFromTopoLayer - BLOB output
-:memory: #use in-memory database
-SELECT TopoGeo_InsertFeatureFromTopoLayer('topology', 'topolayer', zeroblob(4), 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_InsertFeatureFromTopoLayer(topology, 'topolayer', zeroblob(4), 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/featuretopolayer13.testcase b/test/sql_stmt_lwgeom_22_tests/featuretopolayer13.testcase
deleted file mode 100644
index 7fbea35..0000000
--- a/test/sql_stmt_lwgeom_22_tests/featuretopolayer13.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_InsertFeatureFromTopoLayer - Text output
-:memory: #use in-memory database
-SELECT TopoGeo_InsertFeatureFromTopoLayer('topology', 'topolayer', 'out', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_InsertFeatureFromTopoLayer(topology, 'topolayer', 'out', 1)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/featuretopolayer14.testcase b/test/sql_stmt_lwgeom_22_tests/featuretopolayer14.testcase
deleted file mode 100644
index 5ce72b1..0000000
--- a/test/sql_stmt_lwgeom_22_tests/featuretopolayer14.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_InsertFeatureFromTopoLayer - Double FID
-:memory: #use in-memory database
-SELECT TopoGeo_InsertFeatureFromTopoLayer('topology', 'topolayer', 'out', 1.2);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_InsertFeatureFromTopoLayer(topology, 'topolayer', 'out', 1.2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/featuretopolayer15.testcase b/test/sql_stmt_lwgeom_22_tests/featuretopolayer15.testcase
deleted file mode 100644
index 79441f8..0000000
--- a/test/sql_stmt_lwgeom_22_tests/featuretopolayer15.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ExportTopoLayer - Text FID
-:memory: #use in-memory database
-SELECT TopoGeo_ExportTopoLayer('topology', 'topolayer', 'out', 'fid');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ExportTopoLayer(topology, 'topolayer', 'out', 'fid')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/featuretopolayer16.testcase b/test/sql_stmt_lwgeom_22_tests/featuretopolayer16.testcase
deleted file mode 100644
index a2cef7b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/featuretopolayer16.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_InsertFeatureFromTopoLayer - BLOB FID
-:memory: #use in-memory database
-SELECT TopoGeo_InsertFeatureFromTopoLayer('topology', 'topolayer', 'out', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_InsertFeatureFromTopoLayer(topology, 'topolayer', 'out', zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/featuretopolayer17.testcase b/test/sql_stmt_lwgeom_22_tests/featuretopolayer17.testcase
deleted file mode 100644
index f987653..0000000
--- a/test/sql_stmt_lwgeom_22_tests/featuretopolayer17.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_InsertFeatureFromTopoLayer - NULL output
-:memory: #use in-memory database
-SELECT TopoGeo_InsertFeatureFromTopoLayer('topology', 'topolayer', NULL, 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_InsertFeatureFromTopoLayer(topology, 'topolayer', NULL, 1)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/featuretopolayer2.testcase b/test/sql_stmt_lwgeom_22_tests/featuretopolayer2.testcase
deleted file mode 100644
index 35e847f..0000000
--- a/test/sql_stmt_lwgeom_22_tests/featuretopolayer2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_InsertFeatureFromTopoLayer - Integer Topology
-:memory: #use in-memory database
-SELECT TopoGeo_InsertFeatureFromTopoLayer(1, 'topolayer', 'out', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_InsertFeatureFromTopoLayer(1, 'topolayer', 'out', 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/featuretopolayer3.testcase b/test/sql_stmt_lwgeom_22_tests/featuretopolayer3.testcase
deleted file mode 100644
index 98afe3b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/featuretopolayer3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_InsertFeatureFromTopoLayer - Double Topology
-:memory: #use in-memory database
-SELECT TopoGeo_InsertFeatureFromTopoLayer(1.5, 'topolayer', 'out', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_InsertFeatureFromTopoLayer(1.5, 'topolayer', 'out', 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/featuretopolayer4.testcase b/test/sql_stmt_lwgeom_22_tests/featuretopolayer4.testcase
deleted file mode 100644
index 7e7b1ba..0000000
--- a/test/sql_stmt_lwgeom_22_tests/featuretopolayer4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_InsertFeatureFromTopoLayer - Blob Topology
-:memory: #use in-memory database
-SELECT TopoGeo_InsertFeatureFromTopoLayer(zeroblob(5), 'topolayer', 'out', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_InsertFeatureFromTopoLayer(zeroblob(5), 'topolayer', 'out', 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/featuretopolayer5.testcase b/test/sql_stmt_lwgeom_22_tests/featuretopolayer5.testcase
deleted file mode 100644
index 7bfd0fb..0000000
--- a/test/sql_stmt_lwgeom_22_tests/featuretopolayer5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_InsertFeatureFromTopoLayer - NULL TopoLayer
-:memory: #use in-memory database
-SELECT TopoGeo_InsertFeatureFromTopoLayer('topology', NULL, 'out', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_InsertFeatureFromTopoLayer(topology, NULL, 'out', 1)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/featuretopolayer6.testcase b/test/sql_stmt_lwgeom_22_tests/featuretopolayer6.testcase
deleted file mode 100644
index 4bc905a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/featuretopolayer6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_InsertFeatureFromTopoLayer - Integer TopoLayer
-:memory: #use in-memory database
-SELECT TopoGeo_InsertFeatureFromTopoLayer('topology', 1, 'out', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_InsertFeatureFromTopoLayer(topology, 1, 'out', 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/featuretopolayer7.testcase b/test/sql_stmt_lwgeom_22_tests/featuretopolayer7.testcase
deleted file mode 100644
index aa90a8d..0000000
--- a/test/sql_stmt_lwgeom_22_tests/featuretopolayer7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_InsertFeatureFromTopoLayer - Double TopoLayer
-:memory: #use in-memory database
-SELECT TopoGeo_InsertFeatureFromTopoLayer('topology', 1.5, 'out', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_InsertFeatureFromTopoLayer(topology, 1.5, 'out', 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/featuretopolayer8.testcase b/test/sql_stmt_lwgeom_22_tests/featuretopolayer8.testcase
deleted file mode 100644
index 5b1ad0d..0000000
--- a/test/sql_stmt_lwgeom_22_tests/featuretopolayer8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_InsertFeatureFromTopoLayer - BLOB TopoLayer
-:memory: #use in-memory database
-SELECT TopoGeo_InsertFeatureFromTopoLayer('topology', zeroblob(4), 'out', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_InsertFeatureFromTopoLayer(topology, zeroblob(4), 'out', 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/featuretopolayer9.testcase b/test/sql_stmt_lwgeom_22_tests/featuretopolayer9.testcase
deleted file mode 100644
index f987653..0000000
--- a/test/sql_stmt_lwgeom_22_tests/featuretopolayer9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_InsertFeatureFromTopoLayer - NULL output
-:memory: #use in-memory database
-SELECT TopoGeo_InsertFeatureFromTopoLayer('topology', 'topolayer', NULL, 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_InsertFeatureFromTopoLayer(topology, 'topolayer', NULL, 1)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getedgebypoint1.testcase b/test/sql_stmt_lwgeom_22_tests/getedgebypoint1.testcase
deleted file mode 100644
index 793fd71..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getedgebypoint1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetEdgeByPoint - NULL Topology
-:memory: #use in-memory database
-SELECT GetEdgeByPoint(NULL, MakePoint(1, 2, 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetEdgeByPoint(NULL, MakePoint(1, 2, 4326), 0)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getedgebypoint10.testcase b/test/sql_stmt_lwgeom_22_tests/getedgebypoint10.testcase
deleted file mode 100644
index 971f661..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getedgebypoint10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetEdgeByPoint - Double Geometry
-:memory: #use in-memory database
-SELECT GetEdgeByPoint('topology', 1.1, 0);
-1 # rows (not including the header row)
-1 # columns
-GetEdgeByPoint('topology', 1.1, 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getedgebypoint11.testcase b/test/sql_stmt_lwgeom_22_tests/getedgebypoint11.testcase
deleted file mode 100644
index 4dc5a45..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getedgebypoint11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetEdgeByPoint - NULL Geometry
-:memory: #use in-memory database
-SELECT GetEdgeByPoint('topology', NULL, 0);
-1 # rows (not including the header row)
-1 # columns
-GetEdgeByPoint('topology', NULL, 0)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getedgebypoint12.testcase b/test/sql_stmt_lwgeom_22_tests/getedgebypoint12.testcase
deleted file mode 100644
index 2691961..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getedgebypoint12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetEdgeByPoint - Text Geometry
-:memory: #use in-memory database
-SELECT GetEdgeByPoint('topology', 'geom', 0);
-1 # rows (not including the header row)
-1 # columns
-GetEdgeByPoint('topology', 'geom', 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getedgebypoint13.testcase b/test/sql_stmt_lwgeom_22_tests/getedgebypoint13.testcase
deleted file mode 100644
index 238b7b7..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getedgebypoint13.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetEdgeByPoint - Invalid BLOB Geometry
-:memory: #use in-memory database
-SELECT GetEdgeByPoint('topology', zeroblob(4), 0);
-1 # rows (not including the header row)
-1 # columns
-GetEdgeByPoint('topology', zeroblob(4), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getedgebypoint14.testcase b/test/sql_stmt_lwgeom_22_tests/getedgebypoint14.testcase
deleted file mode 100644
index 7203aad..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getedgebypoint14.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetEdgeByPoint - Linestring Geometry
-:memory: #use in-memory database
-SELECT GetEdgeByPoint('topology', GeomFromText('LINESTRING(0 0, 1 1)', 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetEdgeByPoint('topology', GeomFromText('LINESTRING(0 0, 1 1)', 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getedgebypoint15.testcase b/test/sql_stmt_lwgeom_22_tests/getedgebypoint15.testcase
deleted file mode 100644
index ce4a659..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getedgebypoint15.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetEdgeByPoint - Polygon Geometry
-:memory: #use in-memory database
-SELECT GetEdgeByPoint('topology', GeomFromText('POLYGON((0 0, 0 1, 1 1, 1 0, 0 0))', 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetEdgeByPoint('topology', GeomFromText('POLYGON((0 0, 0 1, 1 1, 1 0, 0 0))', 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getedgebypoint16.testcase b/test/sql_stmt_lwgeom_22_tests/getedgebypoint16.testcase
deleted file mode 100644
index 15436ea..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getedgebypoint16.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetEdgeByPoint - MULTIPOINT Geometry
-:memory: #use in-memory database
-SELECT GetEdgeByPoint('topology', GeomFromText('MULTIPOINT(0 0, 1 1)', 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetEdgeByPoint('topology', GeomFromText('MULTIPOINT(0 0, 1 1)', 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getedgebypoint17.testcase b/test/sql_stmt_lwgeom_22_tests/getedgebypoint17.testcase
deleted file mode 100644
index 3150d2d..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getedgebypoint17.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetEdgeByPoint - NULL Tolerance
-:memory: #use in-memory database
-SELECT GetEdgeByPoint('topology', MakePoint(1, 2, 4326), NULL);
-1 # rows (not including the header row)
-1 # columns
-GetEdgeByPoint('topology', MakePoint(1, 2, 4326), NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getedgebypoint2.testcase b/test/sql_stmt_lwgeom_22_tests/getedgebypoint2.testcase
deleted file mode 100644
index 8e2205f..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getedgebypoint2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetEdgeByPoint - Int Topology
-:memory: #use in-memory database
-SELECT GetEdgeByPoint(1, MakePoint(1, 2, 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetEdgeByPoint(1, MakePoint(1, 2, 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getedgebypoint3.testcase b/test/sql_stmt_lwgeom_22_tests/getedgebypoint3.testcase
deleted file mode 100644
index 29e8e09..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getedgebypoint3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetEdgeByPoint - Double Topology
-:memory: #use in-memory database
-SELECT GetEdgeByPoint(1.5, MakePoint(1, 2, 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetEdgeByPoint(1.5, MakePoint(1, 2, 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getedgebypoint4.testcase b/test/sql_stmt_lwgeom_22_tests/getedgebypoint4.testcase
deleted file mode 100644
index 1e1e788..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getedgebypoint4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetEdgeByPoint - Blob Topology
-:memory: #use in-memory database
-SELECT GetEdgeByPoint(zeroblob(4), MakePoint(1, 2, 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetEdgeByPoint(zeroblob(4),MakePoint(1, 2, 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getedgebypoint5.testcase b/test/sql_stmt_lwgeom_22_tests/getedgebypoint5.testcase
deleted file mode 100644
index c0177f4..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getedgebypoint5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetEdgeByPoint - Text Topology
-:memory: #use in-memory database
-SELECT GetEdgeByPoint('topology', MakePoint(1, 2, 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetEdgeByPoint('topology', MakePoint(1, 2, 4326), 0)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/getedgebypoint6.testcase b/test/sql_stmt_lwgeom_22_tests/getedgebypoint6.testcase
deleted file mode 100644
index d5c266a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getedgebypoint6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetEdgeByPoint - Double Tolerance
-:memory: #use in-memory database
-SELECT GetEdgeByPoint('topology', MakePoint(1, 2, 4326), 0.0);
-1 # rows (not including the header row)
-1 # columns
-GetEdgeByPoint('topology', MakePoint(1, 2, 4326), 0.0)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/getedgebypoint7.testcase b/test/sql_stmt_lwgeom_22_tests/getedgebypoint7.testcase
deleted file mode 100644
index 9873e20..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getedgebypoint7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetEdgeByPoint - BLOB Tolerance
-:memory: #use in-memory database
-SELECT GetEdgeByPoint('topology', MakePoint(1, 2, 4326), zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-GetEdgeByPoint('topology', MakePoint(1, 2, 4326), zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getedgebypoint8.testcase b/test/sql_stmt_lwgeom_22_tests/getedgebypoint8.testcase
deleted file mode 100644
index 5fa0cd9..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getedgebypoint8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetEdgeByPoint - Text Tolerance
-:memory: #use in-memory database
-SELECT GetEdgeByPoint('topology', MakePoint(1, 2, 4326), 'tol');
-1 # rows (not including the header row)
-1 # columns
-GetEdgeByPoint('topology', MakePoint(1, 2, 4326), 'tol')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getedgebypoint9.testcase b/test/sql_stmt_lwgeom_22_tests/getedgebypoint9.testcase
deleted file mode 100644
index a13a55d..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getedgebypoint9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetEdgeByPoint - Int Geometry
-:memory: #use in-memory database
-SELECT GetEdgeByPoint('topology', -1, 1);
-1 # rows (not including the header row)
-1 # columns
-GetEdgeByPoint('topology', -1, 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getedgeseed1.testcase b/test/sql_stmt_lwgeom_22_tests/getedgeseed1.testcase
deleted file mode 100644
index f2156db..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getedgeseed1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetEdgeSeed - NULL Topology
-:memory: #use in-memory database
-SELECT TopoGeo_GetEdgeSeed(NULL, 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_GetEdgeSeed(NULL, 1)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getedgeseed2.testcase b/test/sql_stmt_lwgeom_22_tests/getedgeseed2.testcase
deleted file mode 100644
index 2877bd4..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getedgeseed2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetEdgeSeed - Int Topology
-:memory: #use in-memory database
-SELECT TopoGeo_GetEdgeSeed(1, 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_GetEdgeSeed(1, 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getedgeseed3.testcase b/test/sql_stmt_lwgeom_22_tests/getedgeseed3.testcase
deleted file mode 100644
index 10bc2fa..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getedgeseed3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetEdgeSeed - Double Topology
-:memory: #use in-memory database
-SELECT TopoGeo_GetEdgeSeed(1.2, 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_GetEdgeSeed(1.2, 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getedgeseed4.testcase b/test/sql_stmt_lwgeom_22_tests/getedgeseed4.testcase
deleted file mode 100644
index 7e09be7..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getedgeseed4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetEdgeSeed - BLOB Topology
-:memory: #use in-memory database
-SELECT TopoGeo_GetEdgeSeed(zeroblob(4), 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_GetEdgeSeed(zeroblob(4), 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getedgeseed5.testcase b/test/sql_stmt_lwgeom_22_tests/getedgeseed5.testcase
deleted file mode 100644
index 1d40827..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getedgeseed5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetEdgeSeed - Text Topology
-:memory: #use in-memory database
-SELECT TopoGeo_GetEdgeSeed('topology', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_GetEdgeSeed('topology', 1)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/getedgeseed6.testcase b/test/sql_stmt_lwgeom_22_tests/getedgeseed6.testcase
deleted file mode 100644
index 0a114d6..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getedgeseed6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetEdgeSeed - NULL Face
-:memory: #use in-memory database
-SELECT TopoGeo_GetEdgeSeed('topology', NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_GetEdgeSeed('topology', NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getedgeseed7.testcase b/test/sql_stmt_lwgeom_22_tests/getedgeseed7.testcase
deleted file mode 100644
index befa7bc..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getedgeseed7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetEdgeSeed - Double Face
-:memory: #use in-memory database
-SELECT TopoGeo_GetEdgeSeed('topology', 1.3);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_GetEdgeSeed('topology', 1.3)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getedgeseed8.testcase b/test/sql_stmt_lwgeom_22_tests/getedgeseed8.testcase
deleted file mode 100644
index dc0e923..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getedgeseed8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetEdgeSeed - Text Face
-:memory: #use in-memory database
-SELECT TopoGeo_GetEdgeSeed('topology', 'face');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_GetEdgeSeed('topology', 'face')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getedgeseed9.testcase b/test/sql_stmt_lwgeom_22_tests/getedgeseed9.testcase
deleted file mode 100644
index 61beabf..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getedgeseed9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetEdgeSeed - BLOB Face
-:memory: #use in-memory database
-SELECT TopoGeo_GetEdgeSeed('topology', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_GetEdgeSeed('topology', zeroblob(4), 2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfacebypoint1.testcase b/test/sql_stmt_lwgeom_22_tests/getfacebypoint1.testcase
deleted file mode 100644
index d18f4f2..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfacebypoint1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceByPoint - NULL Topology
-:memory: #use in-memory database
-SELECT GetFaceByPoint(NULL, MakePoint(1, 2, 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetFaceByPoint(NULL, MakePoint(1, 2, 4326), 0)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfacebypoint10.testcase b/test/sql_stmt_lwgeom_22_tests/getfacebypoint10.testcase
deleted file mode 100644
index 7dd7424..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfacebypoint10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceByPoint - Double Geometry
-:memory: #use in-memory database
-SELECT GetFaceByPoint('topology', 1.1, 0);
-1 # rows (not including the header row)
-1 # columns
-GetFaceByPoint('topology', 1.1, 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfacebypoint11.testcase b/test/sql_stmt_lwgeom_22_tests/getfacebypoint11.testcase
deleted file mode 100644
index 04e7ce8..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfacebypoint11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceByPoint - NULL Geometry
-:memory: #use in-memory database
-SELECT GetFaceByPoint('topology', NULL, 0);
-1 # rows (not including the header row)
-1 # columns
-GetFaceByPoint('topology', NULL, 0)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfacebypoint12.testcase b/test/sql_stmt_lwgeom_22_tests/getfacebypoint12.testcase
deleted file mode 100644
index 0364e22..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfacebypoint12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceByPoint - Text Geometry
-:memory: #use in-memory database
-SELECT GetFaceByPoint('topology', 'geom', 0);
-1 # rows (not including the header row)
-1 # columns
-GetFaceByPoint('topology', 'geom', 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfacebypoint13.testcase b/test/sql_stmt_lwgeom_22_tests/getfacebypoint13.testcase
deleted file mode 100644
index 6ffa3bc..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfacebypoint13.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceByPoint - Invalid BLOB Geometry
-:memory: #use in-memory database
-SELECT GetFaceByPoint('topology', zeroblob(4), 0);
-1 # rows (not including the header row)
-1 # columns
-GetFaceByPoint('topology', zeroblob(4), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfacebypoint14.testcase b/test/sql_stmt_lwgeom_22_tests/getfacebypoint14.testcase
deleted file mode 100644
index 9238daf..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfacebypoint14.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceByPoint - Linestring Geometry
-:memory: #use in-memory database
-SELECT GetFaceByPoint('topology', GeomFromText('LINESTRING(0 0, 1 1)', 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetFaceByPoint('topology', GeomFromText('LINESTRING(0 0, 1 1)', 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfacebypoint15.testcase b/test/sql_stmt_lwgeom_22_tests/getfacebypoint15.testcase
deleted file mode 100644
index 6fe9b87..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfacebypoint15.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceByPoint - Polygon Geometry
-:memory: #use in-memory database
-SELECT GetFaceByPoint('topology', GeomFromText('POLYGON((0 0, 0 1, 1 1, 1 0, 0 0))', 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetFaceByPoint('topology', GeomFromText('POLYGON((0 0, 0 1, 1 1, 1 0, 0 0))', 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfacebypoint16.testcase b/test/sql_stmt_lwgeom_22_tests/getfacebypoint16.testcase
deleted file mode 100644
index 643e913..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfacebypoint16.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceByPoint - MULTIPOINT Geometry
-:memory: #use in-memory database
-SELECT GetFaceByPoint('topology', GeomFromText('MULTIPOINT(0 0, 1 1)', 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetFaceByPoint('topology', GeomFromText('MULTIPOINT(0 0, 1 1)', 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfacebypoint17.testcase b/test/sql_stmt_lwgeom_22_tests/getfacebypoint17.testcase
deleted file mode 100644
index 9caacc6..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfacebypoint17.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceByPoint - NULL Tolerance
-:memory: #use in-memory database
-SELECT GetFaceByPoint('topology', MakePoint(1, 2, 4326), NULL);
-1 # rows (not including the header row)
-1 # columns
-GetFaceByPoint('topology', MakePoint(1, 2, 4326), NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfacebypoint2.testcase b/test/sql_stmt_lwgeom_22_tests/getfacebypoint2.testcase
deleted file mode 100644
index f71797b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfacebypoint2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceByPoint - Int Topology
-:memory: #use in-memory database
-SELECT GetFaceByPoint(1, MakePoint(1, 2, 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetFaceByPoint(1, MakePoint(1, 2, 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfacebypoint3.testcase b/test/sql_stmt_lwgeom_22_tests/getfacebypoint3.testcase
deleted file mode 100644
index c8393dd..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfacebypoint3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceByPoint - Double Topology
-:memory: #use in-memory database
-SELECT GetFaceByPoint(1.5, MakePoint(1, 2, 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetFaceByPoint(1.5, MakePoint(1, 2, 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfacebypoint4.testcase b/test/sql_stmt_lwgeom_22_tests/getfacebypoint4.testcase
deleted file mode 100644
index 860e0d9..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfacebypoint4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceByPoint - Blob Topology
-:memory: #use in-memory database
-SELECT GetFaceByPoint(zeroblob(4), MakePoint(1, 2, 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetFaceByPoint(zeroblob(4),MakePoint(1, 2, 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfacebypoint5.testcase b/test/sql_stmt_lwgeom_22_tests/getfacebypoint5.testcase
deleted file mode 100644
index 7dae2d9..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfacebypoint5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceByPoint - Text Topology
-:memory: #use in-memory database
-SELECT GetFaceByPoint('topology', MakePoint(1, 2, 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetFaceByPoint('topology', MakePoint(1, 2, 4326), 0)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfacebypoint6.testcase b/test/sql_stmt_lwgeom_22_tests/getfacebypoint6.testcase
deleted file mode 100644
index cb67632..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfacebypoint6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceByPoint - Double Tolerance
-:memory: #use in-memory database
-SELECT GetFaceByPoint('topology', MakePoint(1, 2, 4326), 0.0);
-1 # rows (not including the header row)
-1 # columns
-GetFaceByPoint('topology', MakePoint(1, 2, 4326), 0.0)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfacebypoint7.testcase b/test/sql_stmt_lwgeom_22_tests/getfacebypoint7.testcase
deleted file mode 100644
index cf1c691..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfacebypoint7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceByPoint - BLOB Tolerance
-:memory: #use in-memory database
-SELECT GetFaceByPoint('topology', MakePoint(1, 2, 4326), zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-GetFaceByPoint('topology', MakePoint(1, 2, 4326), zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfacebypoint8.testcase b/test/sql_stmt_lwgeom_22_tests/getfacebypoint8.testcase
deleted file mode 100644
index 39f9cc8..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfacebypoint8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceByPoint - Text Tolerance
-:memory: #use in-memory database
-SELECT GetFaceByPoint('topology', MakePoint(1, 2, 4326), 'tol');
-1 # rows (not including the header row)
-1 # columns
-GetFaceByPoint('topology', MakePoint(1, 2, 4326), 'tol')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfacebypoint9.testcase b/test/sql_stmt_lwgeom_22_tests/getfacebypoint9.testcase
deleted file mode 100644
index ecb695e..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfacebypoint9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceByPoint - Int Geometry
-:memory: #use in-memory database
-SELECT GetFaceByPoint('topology', -1, 1);
-1 # rows (not including the header row)
-1 # columns
-GetFaceByPoint('topology', -1, 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfaceedges1.testcase b/test/sql_stmt_lwgeom_22_tests/getfaceedges1.testcase
deleted file mode 100644
index 1a89ad1..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfaceedges1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceEdges - NULL Topology
-:memory: #use in-memory database
-SELECT ST_GetFaceEdges(NULL, -1);
-1 # rows (not including the header row)
-1 # columns
-ST_GetFaceEdges(NULL, -1)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfaceedges2.testcase b/test/sql_stmt_lwgeom_22_tests/getfaceedges2.testcase
deleted file mode 100644
index fffaad7..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfaceedges2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceEdges - Int Topology
-:memory: #use in-memory database
-SELECT ST_GetFaceEdges(1, -1);
-1 # rows (not including the header row)
-1 # columns
-ST_GetFaceEdges(1, -1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfaceedges3.testcase b/test/sql_stmt_lwgeom_22_tests/getfaceedges3.testcase
deleted file mode 100644
index 779dc1f..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfaceedges3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceEdges - Double Topology
-:memory: #use in-memory database
-SELECT ST_GetFaceEdges(1.5, -1);
-1 # rows (not including the header row)
-1 # columns
-ST_GetFaceEdges(1.5, -1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfaceedges4.testcase b/test/sql_stmt_lwgeom_22_tests/getfaceedges4.testcase
deleted file mode 100644
index 2835a5b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfaceedges4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceEdges - Blob Topology
-:memory: #use in-memory database
-SELECT ST_GetFaceEdges(zeroblob(4), -1);
-1 # rows (not including the header row)
-1 # columns
-ST_GetFaceEdges(zeroblob(4), -1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfaceedges5.testcase b/test/sql_stmt_lwgeom_22_tests/getfaceedges5.testcase
deleted file mode 100644
index e719de5..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfaceedges5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceEdges - Text Topology
-:memory: #use in-memory database
-SELECT ST_GetFaceEdges('topology', -1);
-1 # rows (not including the header row)
-1 # columns
-ST_GetFaceEdges('topology', -1)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfaceedges6.testcase b/test/sql_stmt_lwgeom_22_tests/getfaceedges6.testcase
deleted file mode 100644
index 0927c11..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfaceedges6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceEdges - Double Face
-:memory: #use in-memory database
-SELECT ST_GetFaceEdges('topology', 2.0);
-1 # rows (not including the header row)
-1 # columns
-ST_GetFaceEdges('topology', 2.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfaceedges7.testcase b/test/sql_stmt_lwgeom_22_tests/getfaceedges7.testcase
deleted file mode 100644
index 02cb214..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfaceedges7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceEdges - BLOB Face
-:memory: #use in-memory database
-SELECT ST_GetFaceEdges('topology', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-ST_GetFaceEdges('topology', zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfaceedges8.testcase b/test/sql_stmt_lwgeom_22_tests/getfaceedges8.testcase
deleted file mode 100644
index 56f8127..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfaceedges8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceEdges - Text Face
-:memory: #use in-memory database
-SELECT ST_GetFaceEdges('topology', 'node');
-1 # rows (not including the header row)
-1 # columns
-ST_GetFaceEdges('topology', 'node')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfaceedges9.testcase b/test/sql_stmt_lwgeom_22_tests/getfaceedges9.testcase
deleted file mode 100644
index 06571fb..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfaceedges9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceEdges - NULL Face
-:memory: #use in-memory database
-SELECT ST_GetFaceEdges('topology', NULL);
-1 # rows (not including the header row)
-1 # columns
-ST_GetFaceEdges('topology', NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfacegeometry1.testcase b/test/sql_stmt_lwgeom_22_tests/getfacegeometry1.testcase
deleted file mode 100644
index 2cca200..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfacegeometry1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceGeometry - NULL Topology
-:memory: #use in-memory database
-SELECT ST_GetFaceGeometry(NULL, 1);
-1 # rows (not including the header row)
-1 # columns
-ST_GetFaceGeometry(NULL, 1)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfacegeometry2.testcase b/test/sql_stmt_lwgeom_22_tests/getfacegeometry2.testcase
deleted file mode 100644
index b987572..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfacegeometry2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceGeometry - Int Topology
-:memory: #use in-memory database
-SELECT ST_GetFaceGeometry(1, 1);
-1 # rows (not including the header row)
-1 # columns
-ST_GetFaceGeometry(1, 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfacegeometry3.testcase b/test/sql_stmt_lwgeom_22_tests/getfacegeometry3.testcase
deleted file mode 100644
index fd3e155..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfacegeometry3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceGeometry - Double Topology
-:memory: #use in-memory database
-SELECT ST_GetFaceGeometry(1.2, 1);
-1 # rows (not including the header row)
-1 # columns
-ST_GetFaceGeometry(1.2, 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfacegeometry4.testcase b/test/sql_stmt_lwgeom_22_tests/getfacegeometry4.testcase
deleted file mode 100644
index ee7251a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfacegeometry4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceGeometry - BLOB Topology
-:memory: #use in-memory database
-SELECT ST_GetFaceGeometry(zeroblob(4), 1);
-1 # rows (not including the header row)
-1 # columns
-ST_GetFaceGeometry(zeroblob(4), 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfacegeometry5.testcase b/test/sql_stmt_lwgeom_22_tests/getfacegeometry5.testcase
deleted file mode 100644
index 075190e..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfacegeometry5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceGeometry - Text Topology
-:memory: #use in-memory database
-SELECT ST_GetFaceGeometry('topology', 1);
-1 # rows (not including the header row)
-1 # columns
-ST_GetFaceGeometry('topology', 1)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfacegeometry6.testcase b/test/sql_stmt_lwgeom_22_tests/getfacegeometry6.testcase
deleted file mode 100644
index 3885216..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfacegeometry6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceGeometry - NULL Face
-:memory: #use in-memory database
-SELECT ST_GetFaceGeometry('topology', NULL);
-1 # rows (not including the header row)
-1 # columns
-ST_GetFaceGeometry('topology', NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfacegeometry7.testcase b/test/sql_stmt_lwgeom_22_tests/getfacegeometry7.testcase
deleted file mode 100644
index 4cf161c..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfacegeometry7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceGeometry - Double Face
-:memory: #use in-memory database
-SELECT ST_GetFaceGeometry('topology', 1.3);
-1 # rows (not including the header row)
-1 # columns
-ST_GetFaceGeometry('topology', 1.3)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfacegeometry8.testcase b/test/sql_stmt_lwgeom_22_tests/getfacegeometry8.testcase
deleted file mode 100644
index 4894004..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfacegeometry8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceGeometry - Text Face
-:memory: #use in-memory database
-SELECT ST_GetFaceGeometry('topology', 'face');
-1 # rows (not including the header row)
-1 # columns
-ST_GetFaceGeometry('topology', 'face')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfacegeometry9.testcase b/test/sql_stmt_lwgeom_22_tests/getfacegeometry9.testcase
deleted file mode 100644
index 6d0a868..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfacegeometry9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceGeometry - BLOB Face
-:memory: #use in-memory database
-SELECT ST_GetFaceGeometry('topology', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-ST_GetFaceGeometry('topology', zeroblob(4), 2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfaceseed1.testcase b/test/sql_stmt_lwgeom_22_tests/getfaceseed1.testcase
deleted file mode 100644
index bfd1ccf..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfaceseed1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceSeed - NULL Topology
-:memory: #use in-memory database
-SELECT TopoGeo_GetFaceSeed(NULL, 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_GetFaceSeed(NULL, 1)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfaceseed2.testcase b/test/sql_stmt_lwgeom_22_tests/getfaceseed2.testcase
deleted file mode 100644
index 04be969..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfaceseed2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceSeed - Int Topology
-:memory: #use in-memory database
-SELECT TopoGeo_GetFaceSeed(1, 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_GetFaceSeed(1, 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfaceseed3.testcase b/test/sql_stmt_lwgeom_22_tests/getfaceseed3.testcase
deleted file mode 100644
index fa51133..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfaceseed3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceSeed - Double Topology
-:memory: #use in-memory database
-SELECT TopoGeo_GetFaceSeed(1.2, 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_GetFaceSeed(1.2, 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfaceseed4.testcase b/test/sql_stmt_lwgeom_22_tests/getfaceseed4.testcase
deleted file mode 100644
index 5ca52b4..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfaceseed4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceSeed - BLOB Topology
-:memory: #use in-memory database
-SELECT TopoGeo_GetFaceSeed(zeroblob(4), 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_GetFaceSeed(zeroblob(4), 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfaceseed5.testcase b/test/sql_stmt_lwgeom_22_tests/getfaceseed5.testcase
deleted file mode 100644
index 6f5b2d5..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfaceseed5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceSeed - Text Topology
-:memory: #use in-memory database
-SELECT TopoGeo_GetFaceSeed('topology', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_GetFaceSeed('topology', 1)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfaceseed6.testcase b/test/sql_stmt_lwgeom_22_tests/getfaceseed6.testcase
deleted file mode 100644
index bb7c3a0..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfaceseed6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceSeed - NULL Face
-:memory: #use in-memory database
-SELECT TopoGeo_GetFaceSeed('topology', NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_GetFaceSeed('topology', NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfaceseed7.testcase b/test/sql_stmt_lwgeom_22_tests/getfaceseed7.testcase
deleted file mode 100644
index 80989d5..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfaceseed7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceSeed - Double Face
-:memory: #use in-memory database
-SELECT TopoGeo_GetFaceSeed('topology', 1.3);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_GetFaceSeed('topology', 1.3)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfaceseed8.testcase b/test/sql_stmt_lwgeom_22_tests/getfaceseed8.testcase
deleted file mode 100644
index cdd2ae9..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfaceseed8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_GetFaceSeed - Text Face
-:memory: #use in-memory database
-SELECT TopoGeo_GetFaceSeed('topology', 'face');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_GetFaceSeed('topology', 'face')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getfaceseed9.testcase b/test/sql_stmt_lwgeom_22_tests/getfaceseed9.testcase
deleted file mode 100644
index d7817d8..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getfaceseed9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetFaceSeed - BLOB Face
-:memory: #use in-memory database
-SELECT TopoGeo_GetFaceSeed('topology', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_GetFaceSeed('topology', zeroblob(4), 2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getlinkbypoint1.testcase b/test/sql_stmt_lwgeom_22_tests/getlinkbypoint1.testcase
deleted file mode 100644
index 5fbab44..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getlinkbypoint1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetLinkByPoint - NULL Network
-:memory: #use in-memory database
-SELECT GetLinkByPoint(NULL, MakePoint(1, 2, 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetLinkByPoint(NULL, MakePoint(1, 2, 4326), 0)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getlinkbypoint10.testcase b/test/sql_stmt_lwgeom_22_tests/getlinkbypoint10.testcase
deleted file mode 100644
index 3918993..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getlinkbypoint10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetLinkByPoint - Double Geometry
-:memory: #use in-memory database
-SELECT GetLinkByPoint('network', 1.1, 0);
-1 # rows (not including the header row)
-1 # columns
-GetLinkByPoint('network', 1.1, 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getlinkbypoint11.testcase b/test/sql_stmt_lwgeom_22_tests/getlinkbypoint11.testcase
deleted file mode 100644
index 4bfd475..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getlinkbypoint11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetLinkByPoint - NULL Geometry
-:memory: #use in-memory database
-SELECT GetLinkByPoint('network', NULL, 0);
-1 # rows (not including the header row)
-1 # columns
-GetLinkByPoint('network', NULL, 0)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getlinkbypoint12.testcase b/test/sql_stmt_lwgeom_22_tests/getlinkbypoint12.testcase
deleted file mode 100644
index 78c6713..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getlinkbypoint12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetLinkByPoint - Text Geometry
-:memory: #use in-memory database
-SELECT GetLinkByPoint('network', 'geom', 0);
-1 # rows (not including the header row)
-1 # columns
-GetLinkByPoint('network', 'geom', 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getlinkbypoint13.testcase b/test/sql_stmt_lwgeom_22_tests/getlinkbypoint13.testcase
deleted file mode 100644
index b0f2c93..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getlinkbypoint13.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetLinkByPoint - Invalid BLOB Geometry
-:memory: #use in-memory database
-SELECT GetLinkByPoint('network', zeroblob(4), 0);
-1 # rows (not including the header row)
-1 # columns
-GetLinkByPoint('network', zeroblob(4), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getlinkbypoint14.testcase b/test/sql_stmt_lwgeom_22_tests/getlinkbypoint14.testcase
deleted file mode 100644
index 756e6b5..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getlinkbypoint14.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetLinkByPoint - Linestring Geometry
-:memory: #use in-memory database
-SELECT GetLinkByPoint('network', GeomFromText('LINESTRING(0 0, 1 1)', 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetLinkByPoint('network', GeomFromText('LINESTRING(0 0, 1 1)', 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getlinkbypoint15.testcase b/test/sql_stmt_lwgeom_22_tests/getlinkbypoint15.testcase
deleted file mode 100644
index 1f985f5..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getlinkbypoint15.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetLinkByPoint - Polygon Geometry
-:memory: #use in-memory database
-SELECT GetLinkByPoint('network', GeomFromText('POLYGON((0 0, 0 1, 1 1, 1 0, 0 0))', 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetLinkByPoint('network', GeomFromText('POLYGON((0 0, 0 1, 1 1, 1 0, 0 0))', 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getlinkbypoint16.testcase b/test/sql_stmt_lwgeom_22_tests/getlinkbypoint16.testcase
deleted file mode 100644
index 90b49ab..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getlinkbypoint16.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetLinkByPoint - MULTIPOINT Geometry
-:memory: #use in-memory database
-SELECT GetLinkByPoint('network', GeomFromText('MULTIPOINT(0 0, 1 1)', 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetLinkByPoint('network', GeomFromText('MULTIPOINT(0 0, 1 1)', 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getlinkbypoint17.testcase b/test/sql_stmt_lwgeom_22_tests/getlinkbypoint17.testcase
deleted file mode 100644
index 78b9346..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getlinkbypoint17.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetLinkByPoint - NULL Tolerance
-:memory: #use in-memory database
-SELECT GetLinkByPoint('network', MakePoint(1, 2, 4326), NULL);
-1 # rows (not including the header row)
-1 # columns
-GetLinkByPoint('network', MakePoint(1, 2, 4326), NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getlinkbypoint2.testcase b/test/sql_stmt_lwgeom_22_tests/getlinkbypoint2.testcase
deleted file mode 100644
index 995c3d4..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getlinkbypoint2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetLinkByPoint - Int Network
-:memory: #use in-memory database
-SELECT GetLinkByPoint(1, MakePoint(1, 2, 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetLinkByPoint(1, MakePoint(1, 2, 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getlinkbypoint3.testcase b/test/sql_stmt_lwgeom_22_tests/getlinkbypoint3.testcase
deleted file mode 100644
index 2696613..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getlinkbypoint3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetLinkByPoint - Double Network
-:memory: #use in-memory database
-SELECT GetLinkByPoint(1.5, MakePoint(1, 2, 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetLinkByPoint(1.5, MakePoint(1, 2, 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getlinkbypoint4.testcase b/test/sql_stmt_lwgeom_22_tests/getlinkbypoint4.testcase
deleted file mode 100644
index d25ad90..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getlinkbypoint4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetLinkByPoint - Blob Network
-:memory: #use in-memory database
-SELECT GetLinkByPoint(zeroblob(4), MakePoint(1, 2, 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetLinkByPoint(zeroblob(4),MakePoint(1, 2, 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getlinkbypoint5.testcase b/test/sql_stmt_lwgeom_22_tests/getlinkbypoint5.testcase
deleted file mode 100644
index c0388c7..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getlinkbypoint5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetLinkByPoint - Text Network
-:memory: #use in-memory database
-SELECT GetLinkByPoint('network', MakePoint(1, 2, 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetLinkByPoint('network', MakePoint(1, 2, 4326), 0)
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/getlinkbypoint6.testcase b/test/sql_stmt_lwgeom_22_tests/getlinkbypoint6.testcase
deleted file mode 100644
index a7a0c4e..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getlinkbypoint6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetLinkByPoint - Double Tolerance
-:memory: #use in-memory database
-SELECT GetLinkByPoint('network', MakePoint(1, 2, 4326), 0.0);
-1 # rows (not including the header row)
-1 # columns
-GetLinkByPoint('network', MakePoint(1, 2, 4326), 0.0)
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/getlinkbypoint7.testcase b/test/sql_stmt_lwgeom_22_tests/getlinkbypoint7.testcase
deleted file mode 100644
index 0b6b5ef..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getlinkbypoint7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetLinkByPoint - BLOB Tolerance
-:memory: #use in-memory database
-SELECT GetLinkByPoint('network', MakePoint(1, 2, 4326), zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-GetLinkByPoint('network', MakePoint(1, 2, 4326), zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getlinkbypoint8.testcase b/test/sql_stmt_lwgeom_22_tests/getlinkbypoint8.testcase
deleted file mode 100644
index b5a4958..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getlinkbypoint8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetLinkByPoint - Text Tolerance
-:memory: #use in-memory database
-SELECT GetLinkByPoint('network', MakePoint(1, 2, 4326), 'tol');
-1 # rows (not including the header row)
-1 # columns
-GetLinkByPoint('network', MakePoint(1, 2, 4326), 'tol')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getlinkbypoint9.testcase b/test/sql_stmt_lwgeom_22_tests/getlinkbypoint9.testcase
deleted file mode 100644
index feb3276..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getlinkbypoint9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetLinkByPoint - Int Geometry
-:memory: #use in-memory database
-SELECT GetLinkByPoint('network', -1, 1);
-1 # rows (not including the header row)
-1 # columns
-GetLinkByPoint('network', -1, 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getlinkseed1.testcase b/test/sql_stmt_lwgeom_22_tests/getlinkseed1.testcase
deleted file mode 100644
index 4deb2bd..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getlinkseed1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetLinkSeed - NULL Topology
-:memory: #use in-memory database
-SELECT TopoNet_GetLinkSeed(NULL, 1);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_GetLinkSeed(NULL, 1)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getlinkseed2.testcase b/test/sql_stmt_lwgeom_22_tests/getlinkseed2.testcase
deleted file mode 100644
index 65fb4c2..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getlinkseed2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetLinkSeed - Int Topology
-:memory: #use in-memory database
-SELECT TopoNet_GetLinkSeed(1, 1);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_GetLinkSeed(1, 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getlinkseed3.testcase b/test/sql_stmt_lwgeom_22_tests/getlinkseed3.testcase
deleted file mode 100644
index 4f31243..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getlinkseed3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetLinkSeed - Double Topology
-:memory: #use in-memory database
-SELECT TopoNet_GetLinkSeed(1.2, 1);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_GetLinkSeed(1.2, 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getlinkseed4.testcase b/test/sql_stmt_lwgeom_22_tests/getlinkseed4.testcase
deleted file mode 100644
index 8616520..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getlinkseed4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetLinkSeed - BLOB Topology
-:memory: #use in-memory database
-SELECT TopoNet_GetLinkSeed(zeroblob(4), 1);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_GetLinkSeed(zeroblob(4), 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getlinkseed5.testcase b/test/sql_stmt_lwgeom_22_tests/getlinkseed5.testcase
deleted file mode 100644
index 0b7e222..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getlinkseed5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetLinkSeed - Text Topology
-:memory: #use in-memory database
-SELECT TopoNet_GetLinkSeed('network', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_GetLinkSeed('network', 1)
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/getlinkseed6.testcase b/test/sql_stmt_lwgeom_22_tests/getlinkseed6.testcase
deleted file mode 100644
index 363e03e..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getlinkseed6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetLinkSeed - NULL Face
-:memory: #use in-memory database
-SELECT TopoNet_GetLinkSeed('network', NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_GetLinkSeed('network', NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getlinkseed7.testcase b/test/sql_stmt_lwgeom_22_tests/getlinkseed7.testcase
deleted file mode 100644
index 9ce573b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getlinkseed7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetLinkSeed - Double Face
-:memory: #use in-memory database
-SELECT TopoNet_GetLinkSeed('network', 1.3);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_GetLinkSeed('network', 1.3)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getlinkseed8.testcase b/test/sql_stmt_lwgeom_22_tests/getlinkseed8.testcase
deleted file mode 100644
index 3988766..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getlinkseed8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_GetLinkSeed - Text Face
-:memory: #use in-memory database
-SELECT TopoNet_GetLinkSeed('network', 'face');
-1 # rows (not including the header row)
-1 # columns
-TopoNet_GetLinkSeed('network', 'face')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getlinkseed9.testcase b/test/sql_stmt_lwgeom_22_tests/getlinkseed9.testcase
deleted file mode 100644
index 2ff90d8..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getlinkseed9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetLinkSeed - BLOB Face
-:memory: #use in-memory database
-SELECT TopoNet_GetLinkSeed('network', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoNet_GetLinkSeed('network', zeroblob(4), 2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint1.testcase b/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint1.testcase
deleted file mode 100644
index 070fa68..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetNetNodeByPoint - NULL Network
-:memory: #use in-memory database
-SELECT GetNetNodeByPoint(NULL, MakePoint(1, 2, 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetNetNodeByPoint(NULL, MakePoint(1, 2, 4326), 0)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint10.testcase b/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint10.testcase
deleted file mode 100644
index 9513327..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetNetNodeByPoint - Double Geometry
-:memory: #use in-memory database
-SELECT GetNetNodeByPoint('network', 1.1, 0);
-1 # rows (not including the header row)
-1 # columns
-GetNetNodeByPoint('network', 1.1, 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint11.testcase b/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint11.testcase
deleted file mode 100644
index 924b3f9..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetNetNodeByPoint - NULL Geometry
-:memory: #use in-memory database
-SELECT GetNetNodeByPoint('network', NULL, 0);
-1 # rows (not including the header row)
-1 # columns
-GetNetNodeByPoint('network', NULL, 0)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint12.testcase b/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint12.testcase
deleted file mode 100644
index fb28715..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetNetNodeByPoint - Text Geometry
-:memory: #use in-memory database
-SELECT GetNetNodeByPoint('network', 'geom', 0);
-1 # rows (not including the header row)
-1 # columns
-GetNetNodeByPoint('network', 'geom', 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint13.testcase b/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint13.testcase
deleted file mode 100644
index ac76331..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint13.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetNetNodeByPoint - Invalid BLOB Geometry
-:memory: #use in-memory database
-SELECT GetNetNodeByPoint('network', zeroblob(4), 0);
-1 # rows (not including the header row)
-1 # columns
-GetNetNodeByPoint('network', zeroblob(4), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint14.testcase b/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint14.testcase
deleted file mode 100644
index 11f5104..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint14.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetNetNodeByPoint - Linestring Geometry
-:memory: #use in-memory database
-SELECT GetNetNodeByPoint('network', GeomFromText('LINESTRING(0 0, 1 1)', 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetNetNodeByPoint('network', GeomFromText('LINESTRING(0 0, 1 1)', 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint15.testcase b/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint15.testcase
deleted file mode 100644
index 485c5ae..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint15.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetNetNodeByPoint - Polygon Geometry
-:memory: #use in-memory database
-SELECT GetNetNodeByPoint('network', GeomFromText('POLYGON((0 0, 0 1, 1 1, 1 0, 0 0))', 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetNetNodeByPoint('network', GeomFromText('POLYGON((0 0, 0 1, 1 1, 1 0, 0 0))', 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint16.testcase b/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint16.testcase
deleted file mode 100644
index 0532618..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint16.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetNetNodeByPoint - MULTIPOINT Geometry
-:memory: #use in-memory database
-SELECT GetNetNodeByPoint('network', GeomFromText('MULTIPOINT(0 0, 1 1)', 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetNetNodeByPoint('network', GeomFromText('MULTIPOINT(0 0, 1 1)', 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint17.testcase b/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint17.testcase
deleted file mode 100644
index b650cfb..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint17.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetNetNodeByPoint - NULL Tolerance
-:memory: #use in-memory database
-SELECT GetNetNodeByPoint('network', MakePoint(1, 2, 4326), NULL);
-1 # rows (not including the header row)
-1 # columns
-GetNetNodeByPoint('network', MakePoint(1, 2, 4326), NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint2.testcase b/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint2.testcase
deleted file mode 100644
index d9f3757..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetNetNodeByPoint - Int Network
-:memory: #use in-memory database
-SELECT GetNetNodeByPoint(1, MakePoint(1, 2, 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetNetNodeByPoint(1, MakePoint(1, 2, 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint3.testcase b/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint3.testcase
deleted file mode 100644
index 8378281..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetNetNodeByPoint - Double Network
-:memory: #use in-memory database
-SELECT GetNetNodeByPoint(1.5, MakePoint(1, 2, 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetNetNodeByPoint(1.5, MakePoint(1, 2, 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint4.testcase b/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint4.testcase
deleted file mode 100644
index 6839add..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetNetNodeByPoint - Blob Network
-:memory: #use in-memory database
-SELECT GetNetNodeByPoint(zeroblob(4), MakePoint(1, 2, 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetNetNodeByPoint(zeroblob(4),MakePoint(1, 2, 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint5.testcase b/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint5.testcase
deleted file mode 100644
index 76ff112..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetNetNodeByPoint - Text Network
-:memory: #use in-memory database
-SELECT GetNetNodeByPoint('network', MakePoint(1, 2, 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetNetNodeByPoint('network', MakePoint(1, 2, 4326), 0)
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint6.testcase b/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint6.testcase
deleted file mode 100644
index 748a5d0..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetNetNodeByPoint - Double Tolerance
-:memory: #use in-memory database
-SELECT GetNetNodeByPoint('network', MakePoint(1, 2, 4326), 0.0);
-1 # rows (not including the header row)
-1 # columns
-GetNetNodeByPoint('network', MakePoint(1, 2, 4326), 0.0)
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint7.testcase b/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint7.testcase
deleted file mode 100644
index bb7f01f..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetNetNodeByPoint - BLOB Tolerance
-:memory: #use in-memory database
-SELECT GetNetNodeByPoint('network', MakePoint(1, 2, 4326), zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-GetNetNodeByPoint('network', MakePoint(1, 2, 4326), zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint8.testcase b/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint8.testcase
deleted file mode 100644
index d78e20b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetNetNodeByPoint - Text Tolerance
-:memory: #use in-memory database
-SELECT GetNetNodeByPoint('network', MakePoint(1, 2, 4326), 'tol');
-1 # rows (not including the header row)
-1 # columns
-GetNetNodeByPoint('network', MakePoint(1, 2, 4326), 'tol')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint9.testcase b/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint9.testcase
deleted file mode 100644
index 4f833aa..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getnetnodebypoint9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetNetNodeByPoint - Int Geometry
-:memory: #use in-memory database
-SELECT GetNetNodeByPoint('network', -1, 1);
-1 # rows (not including the header row)
-1 # columns
-GetNetNodeByPoint('network', -1, 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getnodebypoint1.testcase b/test/sql_stmt_lwgeom_22_tests/getnodebypoint1.testcase
deleted file mode 100644
index 4950207..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getnodebypoint1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetNodeByPoint - NULL Topology
-:memory: #use in-memory database
-SELECT GetNodeByPoint(NULL, MakePoint(1, 2, 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetNodeByPoint(NULL, MakePoint(1, 2, 4326), 0)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getnodebypoint10.testcase b/test/sql_stmt_lwgeom_22_tests/getnodebypoint10.testcase
deleted file mode 100644
index 7662fce..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getnodebypoint10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetNodeByPoint - Double Geometry
-:memory: #use in-memory database
-SELECT GetNodeByPoint('topology', 1.1, 0);
-1 # rows (not including the header row)
-1 # columns
-GetNodeByPoint('topology', 1.1, 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getnodebypoint11.testcase b/test/sql_stmt_lwgeom_22_tests/getnodebypoint11.testcase
deleted file mode 100644
index ee6eae1..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getnodebypoint11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetNodeByPoint - NULL Geometry
-:memory: #use in-memory database
-SELECT GetNodeByPoint('topology', NULL, 0);
-1 # rows (not including the header row)
-1 # columns
-GetNodeByPoint('topology', NULL, 0)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getnodebypoint12.testcase b/test/sql_stmt_lwgeom_22_tests/getnodebypoint12.testcase
deleted file mode 100644
index dcaa861..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getnodebypoint12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetNodeByPoint - Text Geometry
-:memory: #use in-memory database
-SELECT GetNodeByPoint('topology', 'geom', 0);
-1 # rows (not including the header row)
-1 # columns
-GetNodeByPoint('topology', 'geom', 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getnodebypoint13.testcase b/test/sql_stmt_lwgeom_22_tests/getnodebypoint13.testcase
deleted file mode 100644
index ae93c82..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getnodebypoint13.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetNodeByPoint - Invalid BLOB Geometry
-:memory: #use in-memory database
-SELECT GetNodeByPoint('topology', zeroblob(4), 0);
-1 # rows (not including the header row)
-1 # columns
-GetNodeByPoint('topology', zeroblob(4), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getnodebypoint14.testcase b/test/sql_stmt_lwgeom_22_tests/getnodebypoint14.testcase
deleted file mode 100644
index 44fdb55..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getnodebypoint14.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetNodeByPoint - Linestring Geometry
-:memory: #use in-memory database
-SELECT GetNodeByPoint('topology', GeomFromText('LINESTRING(0 0, 1 1)', 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetNodeByPoint('topology', GeomFromText('LINESTRING(0 0, 1 1)', 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getnodebypoint15.testcase b/test/sql_stmt_lwgeom_22_tests/getnodebypoint15.testcase
deleted file mode 100644
index 97e35f3..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getnodebypoint15.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetNodeByPoint - Polygon Geometry
-:memory: #use in-memory database
-SELECT GetNodeByPoint('topology', GeomFromText('POLYGON((0 0, 0 1, 1 1, 1 0, 0 0))', 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetNodeByPoint('topology', GeomFromText('POLYGON((0 0, 0 1, 1 1, 1 0, 0 0))', 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getnodebypoint16.testcase b/test/sql_stmt_lwgeom_22_tests/getnodebypoint16.testcase
deleted file mode 100644
index c7cd209..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getnodebypoint16.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetNodeByPoint - MULTIPOINT Geometry
-:memory: #use in-memory database
-SELECT GetNodeByPoint('topology', GeomFromText('MULTIPOINT(0 0, 1 1)', 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetNodeByPoint('topology', GeomFromText('MULTIPOINT(0 0, 1 1)', 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getnodebypoint17.testcase b/test/sql_stmt_lwgeom_22_tests/getnodebypoint17.testcase
deleted file mode 100644
index 7446066..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getnodebypoint17.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetNodeByPoint - NULL Tolerance
-:memory: #use in-memory database
-SELECT GetNodeByPoint('topology', MakePoint(1, 2, 4326), NULL);
-1 # rows (not including the header row)
-1 # columns
-GetNodeByPoint('topology', MakePoint(1, 2, 4326), NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getnodebypoint2.testcase b/test/sql_stmt_lwgeom_22_tests/getnodebypoint2.testcase
deleted file mode 100644
index 6e4445f..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getnodebypoint2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetNodeByPoint - Int Topology
-:memory: #use in-memory database
-SELECT GetNodeByPoint(1, MakePoint(1, 2, 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetNodeByPoint(1, MakePoint(1, 2, 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getnodebypoint3.testcase b/test/sql_stmt_lwgeom_22_tests/getnodebypoint3.testcase
deleted file mode 100644
index 0c5e72f..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getnodebypoint3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetNodeByPoint - Double Topology
-:memory: #use in-memory database
-SELECT GetNodeByPoint(1.5, MakePoint(1, 2, 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetNodeByPoint(1.5, MakePoint(1, 2, 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getnodebypoint4.testcase b/test/sql_stmt_lwgeom_22_tests/getnodebypoint4.testcase
deleted file mode 100644
index 90623bd..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getnodebypoint4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetNodeByPoint - Blob Topology
-:memory: #use in-memory database
-SELECT GetNodeByPoint(zeroblob(4), MakePoint(1, 2, 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetNodeByPoint(zeroblob(4),MakePoint(1, 2, 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getnodebypoint5.testcase b/test/sql_stmt_lwgeom_22_tests/getnodebypoint5.testcase
deleted file mode 100644
index d178ea6..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getnodebypoint5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetNodeByPoint - Text Topology
-:memory: #use in-memory database
-SELECT GetNodeByPoint('topology', MakePoint(1, 2, 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-GetNodeByPoint('topology', MakePoint(1, 2, 4326), 0)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/getnodebypoint6.testcase b/test/sql_stmt_lwgeom_22_tests/getnodebypoint6.testcase
deleted file mode 100644
index 04ab5f6..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getnodebypoint6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetNodeByPoint - Double Tolerance
-:memory: #use in-memory database
-SELECT GetNodeByPoint('topology', MakePoint(1, 2, 4326), 0.0);
-1 # rows (not including the header row)
-1 # columns
-GetNodeByPoint('topology', MakePoint(1, 2, 4326), 0.0)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/getnodebypoint7.testcase b/test/sql_stmt_lwgeom_22_tests/getnodebypoint7.testcase
deleted file mode 100644
index 86bf2ec..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getnodebypoint7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetNodeByPoint - BLOB Tolerance
-:memory: #use in-memory database
-SELECT GetNodeByPoint('topology', MakePoint(1, 2, 4326), zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-GetNodeByPoint('topology', MakePoint(1, 2, 4326), zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getnodebypoint8.testcase b/test/sql_stmt_lwgeom_22_tests/getnodebypoint8.testcase
deleted file mode 100644
index 7399c4d..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getnodebypoint8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetNodeByPoint - Text Tolerance
-:memory: #use in-memory database
-SELECT GetNodeByPoint('topology', MakePoint(1, 2, 4326), 'tol');
-1 # rows (not including the header row)
-1 # columns
-GetNodeByPoint('topology', MakePoint(1, 2, 4326), 'tol')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/getnodebypoint9.testcase b/test/sql_stmt_lwgeom_22_tests/getnodebypoint9.testcase
deleted file mode 100644
index ceae0c3..0000000
--- a/test/sql_stmt_lwgeom_22_tests/getnodebypoint9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetNodeByPoint - Int Geometry
-:memory: #use in-memory database
-SELECT GetNodeByPoint('topology', -1, 1);
-1 # rows (not including the header row)
-1 # columns
-GetNodeByPoint('topology', -1, 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/inittopolayer1.testcase b/test/sql_stmt_lwgeom_22_tests/inittopolayer1.testcase
deleted file mode 100644
index 8135c59..0000000
--- a/test/sql_stmt_lwgeom_22_tests/inittopolayer1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_InitTopoLayer - NULL Topology
-:memory: #use in-memory database
-SELECT TopoGeo_InitTopoLayer(NULL, NULL, 'table', 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_InitTopoLayer(NULL, NULL, 'table', 'out')
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/inittopolayer10.testcase b/test/sql_stmt_lwgeom_22_tests/inittopolayer10.testcase
deleted file mode 100644
index 7a1790f..0000000
--- a/test/sql_stmt_lwgeom_22_tests/inittopolayer10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_InitTopoLayer - NULL ref-table
-:memory: #use in-memory database
-SELECT TopoGeo_InitTopoLayer('topology', NULL, NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_InitTopoLayer('topology', NULL, NULL, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/inittopolayer11.testcase b/test/sql_stmt_lwgeom_22_tests/inittopolayer11.testcase
deleted file mode 100644
index 8fb55aa..0000000
--- a/test/sql_stmt_lwgeom_22_tests/inittopolayer11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_InitTopoLayer - INT ref-table
-:memory: #use in-memory database
-SELECT TopoGeo_InitTopoLayer('topology', NULL, 1, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_InitTopoLayer('topology', NULL, 1, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/inittopolayer12.testcase b/test/sql_stmt_lwgeom_22_tests/inittopolayer12.testcase
deleted file mode 100644
index f64d3b4..0000000
--- a/test/sql_stmt_lwgeom_22_tests/inittopolayer12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_InitTopoLayer - Double ref-table
-:memory: #use in-memory database
-SELECT TopoGeo_InitTopoLayer('topology', NULL, 1.2, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_InitTopoLayer('topology', NULL, 1.2, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/inittopolayer13.testcase b/test/sql_stmt_lwgeom_22_tests/inittopolayer13.testcase
deleted file mode 100644
index 1eccbfa..0000000
--- a/test/sql_stmt_lwgeom_22_tests/inittopolayer13.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_InitTopoLayer - BLOB ref-table
-:memory: #use in-memory database
-SELECT TopoGeo_InitTopoLayer('topology', NULL, zeroblob(4), 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_InitTopoLayer('topology', NULL, zeroblob(4), 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/inittopolayer14.testcase b/test/sql_stmt_lwgeom_22_tests/inittopolayer14.testcase
deleted file mode 100644
index aaadc7e..0000000
--- a/test/sql_stmt_lwgeom_22_tests/inittopolayer14.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_InitTopoLayer - NULL TopoLayer
-:memory: #use in-memory database
-SELECT TopoGeo_InitTopoLayer('topology', NULL, 'table', NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_InitTopoLayer('topology', NULL, 'table', NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/inittopolayer15.testcase b/test/sql_stmt_lwgeom_22_tests/inittopolayer15.testcase
deleted file mode 100644
index 3cb580b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/inittopolayer15.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_InitTopoLayer - Double TopoLayer
-:memory: #use in-memory database
-SELECT TopoGeo_InitTopoLayer('topology', NULL, 'table', 1.2);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_InitTopoLayer('topology', NULL, 'table', 1.2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/inittopolayer16.testcase b/test/sql_stmt_lwgeom_22_tests/inittopolayer16.testcase
deleted file mode 100644
index d3b0631..0000000
--- a/test/sql_stmt_lwgeom_22_tests/inittopolayer16.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_InitTopoLayer - BLOB TopoLayer
-:memory: #use in-memory database
-SELECT TopoGeo_InitTopoLayer('topology', NULL, 'table', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_InitTopoLayer('topology', NULL, 'table', zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/inittopolayer17.testcase b/test/sql_stmt_lwgeom_22_tests/inittopolayer17.testcase
deleted file mode 100644
index c84f10d..0000000
--- a/test/sql_stmt_lwgeom_22_tests/inittopolayer17.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_InitTopoLayer - Text TopoLayer
-:memory: #use in-memory database
-SELECT TopoGeo_InitTopoLayer('topology', NULL, 'table', 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_InitTopoLayer('topology', NULL, 'table', 'out')
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/inittopolayer2.testcase b/test/sql_stmt_lwgeom_22_tests/inittopolayer2.testcase
deleted file mode 100644
index e88bb6c..0000000
--- a/test/sql_stmt_lwgeom_22_tests/inittopolayer2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_InitTopoLayer - Int Topology
-:memory: #use in-memory database
-SELECT TopoGeo_InitTopoLayer(1, NULL, 'table', 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_InitTopoLayer(1, NULL, 'table', 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/inittopolayer3.testcase b/test/sql_stmt_lwgeom_22_tests/inittopolayer3.testcase
deleted file mode 100644
index 7a01852..0000000
--- a/test/sql_stmt_lwgeom_22_tests/inittopolayer3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_InitTopoLayer - Double Topology
-:memory: #use in-memory database
-SELECT TopoGeo_InitTopoLayer(1.5, NULL, 'table', 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_InitTopoLayer(1.5, NULL, 'table', 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/inittopolayer4.testcase b/test/sql_stmt_lwgeom_22_tests/inittopolayer4.testcase
deleted file mode 100644
index feed6d5..0000000
--- a/test/sql_stmt_lwgeom_22_tests/inittopolayer4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_InitTopoLayer - Blob Topology
-:memory: #use in-memory database
-SELECT TopoGeo_InitTopoLayer(zeroblob(4), NULL, 'table', 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_InitTopoLayer(zeroblob(4), NULL, 'table', 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/inittopolayer5.testcase b/test/sql_stmt_lwgeom_22_tests/inittopolayer5.testcase
deleted file mode 100644
index 2cd9e5d..0000000
--- a/test/sql_stmt_lwgeom_22_tests/inittopolayer5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_InitTopoLayer - Text Topology
-:memory: #use in-memory database
-SELECT TopoGeo_InitTopoLayer('topology', NULL, 'table', 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_InitTopoLayer('topology', NULL, 'table', 'out')
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/inittopolayer6.testcase b/test/sql_stmt_lwgeom_22_tests/inittopolayer6.testcase
deleted file mode 100644
index ea181cc..0000000
--- a/test/sql_stmt_lwgeom_22_tests/inittopolayer6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_InitTopoLayer - TEXT prefix
-:memory: #use in-memory database
-SELECT TopoGeo_InitTopoLayer('topology', 'a', 'table', 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_InitTopoLayer('topology', 'a', 'table', 'out')
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/inittopolayer7.testcase b/test/sql_stmt_lwgeom_22_tests/inittopolayer7.testcase
deleted file mode 100644
index 7ca3f00..0000000
--- a/test/sql_stmt_lwgeom_22_tests/inittopolayer7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_InitTopoLayer - INT prefix
-:memory: #use in-memory database
-SELECT TopoGeo_InitTopoLayer('topology', 1, 'table', 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_InitTopoLayer('topology', 1, 'table', 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/inittopolayer8.testcase b/test/sql_stmt_lwgeom_22_tests/inittopolayer8.testcase
deleted file mode 100644
index 6fe7872..0000000
--- a/test/sql_stmt_lwgeom_22_tests/inittopolayer8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_InitTopoLayer - Double prefix
-:memory: #use in-memory database
-SELECT TopoGeo_InitTopoLayer('topology', 1.2, 'table', 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_InitTopoLayer('topology', 1.2, 'table', 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/inittopolayer9.testcase b/test/sql_stmt_lwgeom_22_tests/inittopolayer9.testcase
deleted file mode 100644
index 7618cd0..0000000
--- a/test/sql_stmt_lwgeom_22_tests/inittopolayer9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_InitTopoLayer - BLOB prefix
-:memory: #use in-memory database
-SELECT TopoGeo_InitTopoLayer('topology', zeroblob(4), 'table', 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_InitTopoLayer('topology', zeroblob(4), 'table', 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/linesnapseed1.testcase b/test/sql_stmt_lwgeom_22_tests/linesnapseed1.testcase
deleted file mode 100644
index 551fa38..0000000
--- a/test/sql_stmt_lwgeom_22_tests/linesnapseed1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SnapLineToSeed - NULL Topology
-:memory: #use in-memory database
-SELECT TopoGeo_SnapLineToSeed(ST_GeomFromText('LINESTRING(1 1, 1 2)'), NULL, 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SnapLineToSeed(ST_GeomFromText('LINESTRING(1 1, 1 2)'), NULL, 1)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/linesnapseed10.testcase b/test/sql_stmt_lwgeom_22_tests/linesnapseed10.testcase
deleted file mode 100644
index 4bcb69f..0000000
--- a/test/sql_stmt_lwgeom_22_tests/linesnapseed10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SnapLineToSeed - NULL distance
-:memory: #use in-memory database
-SELECT TopoGeo_SnapLineToSeed(ST_GeomFromText('LINESTRING(1 1, 1 2)'), 'topo', NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SnapLineToSeed(ST_GeomFromText('LINESTRING(1 1, 1 2)'), 'topo', NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/linesnapseed11.testcase b/test/sql_stmt_lwgeom_22_tests/linesnapseed11.testcase
deleted file mode 100644
index 7132e95..0000000
--- a/test/sql_stmt_lwgeom_22_tests/linesnapseed11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SnapLineToSeed - TEXT distance
-:memory: #use in-memory database
-SELECT TopoGeo_SnapLineToSeed(ST_GeomFromText('LINESTRING(1 1, 1 2)'), 'topo', 'dist');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SnapLineToSeed(ST_GeomFromText('LINESTRING(1 1, 1 2)'), 'topo', 'dist')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/linesnapseed12.testcase b/test/sql_stmt_lwgeom_22_tests/linesnapseed12.testcase
deleted file mode 100644
index 083766c..0000000
--- a/test/sql_stmt_lwgeom_22_tests/linesnapseed12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SnapLineToSeed - BLOB distance
-:memory: #use in-memory database
-SELECT TopoGeo_SnapLineToSeed(ST_GeomFromText('LINESTRING(1 1, 1 2)'), 'topo', zeroblob(5));
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SnapLineToSeed(ST_GeomFromText('LINESTRING(1 1, 1 2)'), 'topo', zeroblob(5))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/linesnapseed13.testcase b/test/sql_stmt_lwgeom_22_tests/linesnapseed13.testcase
deleted file mode 100644
index 6e22eea..0000000
--- a/test/sql_stmt_lwgeom_22_tests/linesnapseed13.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SnapLineToSeed - INT distance
-:memory: #use in-memory database
-SELECT TopoGeo_SnapLineToSeed(ST_GeomFromText('LINESTRING(1 1, 1 2)'), 'topo', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SnapLineToSeed(ST_GeomFromText('LINESTRING(1 1, 1 2)'), 'topo', 1)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/linesnapseed14.testcase b/test/sql_stmt_lwgeom_22_tests/linesnapseed14.testcase
deleted file mode 100644
index b422891..0000000
--- a/test/sql_stmt_lwgeom_22_tests/linesnapseed14.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SnapLineToSeed - DOUBLE distance
-:memory: #use in-memory database
-SELECT TopoGeo_SnapLineToSeed(ST_GeomFromText('LINESTRING(1 1, 1 2)'), 'topo', 1.0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SnapLineToSeed(ST_GeomFromText('LINESTRING(1 1, 1 2)'), 'topo', 1.0)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/linesnapseed15.testcase b/test/sql_stmt_lwgeom_22_tests/linesnapseed15.testcase
deleted file mode 100644
index ba269c2..0000000
--- a/test/sql_stmt_lwgeom_22_tests/linesnapseed15.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SnapLineToSeed - point instead of line
-:memory: #use in-memory database
-SELECT TopoGeo_SnapLineToSeed(ST_GeomFromText('POINT(1 1)'), 'topo', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SnapLineToSeed(ST_GeomFromText('POINT((1 1)'), 'topo', 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/linesnapseed16.testcase b/test/sql_stmt_lwgeom_22_tests/linesnapseed16.testcase
deleted file mode 100644
index 8fe522d..0000000
--- a/test/sql_stmt_lwgeom_22_tests/linesnapseed16.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SnapLineToSeed - multilinestring instead of linestring
-:memory: #use in-memory database
-SELECT TopoGeo_SnapLineToSeed(ST_GeomFromText('MULTILINESTRING((1 1, 1 2), (2 2, 3 3))'), 'topo', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SnapLineToSeed(ST_GeomFromText('MULTILINESTRING((1 1, 1 2), (2 2, 3 3))'), 'topo', 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/linesnapseed17.testcase b/test/sql_stmt_lwgeom_22_tests/linesnapseed17.testcase
deleted file mode 100644
index d725c00..0000000
--- a/test/sql_stmt_lwgeom_22_tests/linesnapseed17.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SnapLineToSeed - polygon instead of line
-:memory: #use in-memory database
-SELECT TopoGeo_SnapLineToSeed(ST_GeomFromText('POLYGON((1 1, 1 2, 2 2, 2 1, 1 1))'), 'topo', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SnapLineToSeed(ST_GeomFromText('POLYGON((1 1, 1 2, 2 2, 2 1, 1 1))'), 'topo', 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/linesnapseed2.testcase b/test/sql_stmt_lwgeom_22_tests/linesnapseed2.testcase
deleted file mode 100644
index 014a974..0000000
--- a/test/sql_stmt_lwgeom_22_tests/linesnapseed2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SnapLineToSeed - INT Topology
-:memory: #use in-memory database
-SELECT TopoGeo_SnapLineToSeed(ST_GeomFromText('LINESTRING(1 1, 1 2)'), 1, 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SnapLineToSeed(ST_GeomFromText('LINESTRING(1 1, 1 2)'), 1, 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/linesnapseed3.testcase b/test/sql_stmt_lwgeom_22_tests/linesnapseed3.testcase
deleted file mode 100644
index cf22970..0000000
--- a/test/sql_stmt_lwgeom_22_tests/linesnapseed3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SnapLineToSeed - DOUBLE Topology
-:memory: #use in-memory database
-SELECT TopoGeo_SnapLineToSeed(ST_GeomFromText('LINESTRING(1 1, 1 2)'), 1.1, 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SnapLineToSeed(ST_GeomFromText('LINESTRING(1 1, 1 2)'), 1.1, 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/linesnapseed4.testcase b/test/sql_stmt_lwgeom_22_tests/linesnapseed4.testcase
deleted file mode 100644
index b56b301..0000000
--- a/test/sql_stmt_lwgeom_22_tests/linesnapseed4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SnapLineToSeed - BLOB Topology
-:memory: #use in-memory database
-SELECT TopoGeo_SnapLineToSeed(ST_GeomFromText('LINESTRING(1 1, 1 2)'), zeroblob(4), 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SnapLineToSeed(ST_GeomFromText('LINESTRING(1 1, 1 2)'), zeroblob(4), 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/linesnapseed5.testcase b/test/sql_stmt_lwgeom_22_tests/linesnapseed5.testcase
deleted file mode 100644
index 4a4a5fc..0000000
--- a/test/sql_stmt_lwgeom_22_tests/linesnapseed5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SnapLineToSeed - NULL line
-:memory: #use in-memory database
-SELECT TopoGeo_SnapLineToSeed(NULL, 'topo', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SnapLineToSeed(NULL, 'topo', 1)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/linesnapseed6.testcase b/test/sql_stmt_lwgeom_22_tests/linesnapseed6.testcase
deleted file mode 100644
index 90d8cb1..0000000
--- a/test/sql_stmt_lwgeom_22_tests/linesnapseed6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SnapLineToSeed - INT line
-:memory: #use in-memory database
-SELECT TopoGeo_SnapLineToSeed(1, 'topo', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SnapLineToSeed(1, 'topo', 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/linesnapseed7.testcase b/test/sql_stmt_lwgeom_22_tests/linesnapseed7.testcase
deleted file mode 100644
index 4dc6eee..0000000
--- a/test/sql_stmt_lwgeom_22_tests/linesnapseed7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SnapLineToSeed - DOUBLE line
-:memory: #use in-memory database
-SELECT TopoGeo_SnapLineToSeed(1.1, 'topo', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SnapLineToSeed(1.1, 'topo', 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/linesnapseed8.testcase b/test/sql_stmt_lwgeom_22_tests/linesnapseed8.testcase
deleted file mode 100644
index 03115fd..0000000
--- a/test/sql_stmt_lwgeom_22_tests/linesnapseed8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SnapLineToSeed - TEXT line
-:memory: #use in-memory database
-SELECT TopoGeo_SnapLineToSeed('line', 'topo', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SnapLineToSeed('line', 'topo', 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/linesnapseed9.testcase b/test/sql_stmt_lwgeom_22_tests/linesnapseed9.testcase
deleted file mode 100644
index 40de20c..0000000
--- a/test/sql_stmt_lwgeom_22_tests/linesnapseed9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SnapLineToSeed - invalid BLOB line
-:memory: #use in-memory database
-SELECT TopoGeo_SnapLineToSeed(zeroblob(100), 'topo', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SnapLineToSeed(zeroblob(100), 'topo', 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/loginetfromtgeo1.testcase b/test/sql_stmt_lwgeom_22_tests/loginetfromtgeo1.testcase
deleted file mode 100644
index c95a27b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/loginetfromtgeo1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_LogiNetFromTGeo - NULL Network
-:memory: #use in-memory database
-SELECT ST_LogiNetFromTGeo(NULL, 'topology');
-1 # rows (not including the header row)
-1 # columns
-ST_LogiNetFromTGeo(NULL, 'topology')
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/loginetfromtgeo2.testcase b/test/sql_stmt_lwgeom_22_tests/loginetfromtgeo2.testcase
deleted file mode 100644
index e20461b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/loginetfromtgeo2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_LogiNetFromTGeo - Int Network
-:memory: #use in-memory database
-SELECT ST_LogiNetFromTGeo(1, 'topology');
-1 # rows (not including the header row)
-1 # columns
-ST_LogiNetFromTGeo(1, 'topology')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/loginetfromtgeo3.testcase b/test/sql_stmt_lwgeom_22_tests/loginetfromtgeo3.testcase
deleted file mode 100644
index bb6bd55..0000000
--- a/test/sql_stmt_lwgeom_22_tests/loginetfromtgeo3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_LogiNetFromTGeo - Double Network
-:memory: #use in-memory database
-SELECT ST_LogiNetFromTGeo(1.5, 'topology');
-1 # rows (not including the header row)
-1 # columns
-ST_LogiNetFromTGeo(1.5, 'topology')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/loginetfromtgeo4.testcase b/test/sql_stmt_lwgeom_22_tests/loginetfromtgeo4.testcase
deleted file mode 100644
index 311fd93..0000000
--- a/test/sql_stmt_lwgeom_22_tests/loginetfromtgeo4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_LogiNetFromTGeo - Blob Network
-:memory: #use in-memory database
-SELECT ST_LogiNetFromTGeo(zeroblob(4), 'topology');
-1 # rows (not including the header row)
-1 # columns
-ST_LogiNetFromTGeo(zeroblob(4), 'topology')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/loginetfromtgeo5.testcase b/test/sql_stmt_lwgeom_22_tests/loginetfromtgeo5.testcase
deleted file mode 100644
index 77ea01c..0000000
--- a/test/sql_stmt_lwgeom_22_tests/loginetfromtgeo5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_LogiNetFromTGeo - Text Network
-:memory: #use in-memory database
-SELECT ST_LogiNetFromTGeo('network', 'topology');
-1 # rows (not including the header row)
-1 # columns
-ST_LogiNetFromTGeo('network', 'topology')
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/loginetfromtgeo6.testcase b/test/sql_stmt_lwgeom_22_tests/loginetfromtgeo6.testcase
deleted file mode 100644
index be84039..0000000
--- a/test/sql_stmt_lwgeom_22_tests/loginetfromtgeo6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_LogiNetFromTGeo - NULL Topology
-:memory: #use in-memory database
-SELECT ST_LogiNetFromTGeo('network', NULL);
-1 # rows (not including the header row)
-1 # columns
-ST_LogiNetFromTGeo('network', NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/loginetfromtgeo7.testcase b/test/sql_stmt_lwgeom_22_tests/loginetfromtgeo7.testcase
deleted file mode 100644
index 077e891..0000000
--- a/test/sql_stmt_lwgeom_22_tests/loginetfromtgeo7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_LogiNetFromTGeo - INT Topology
-:memory: #use in-memory database
-SELECT ST_LogiNetFromTGeo('network', 1);
-1 # rows (not including the header row)
-1 # columns
-ST_LogiNetFromTGeo('network', 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/loginetfromtgeo8.testcase b/test/sql_stmt_lwgeom_22_tests/loginetfromtgeo8.testcase
deleted file mode 100644
index 3b664c6..0000000
--- a/test/sql_stmt_lwgeom_22_tests/loginetfromtgeo8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_LogiNetFromTGeo - Double Topology
-:memory: #use in-memory database
-SELECT ST_LogiNetFromTGeo('network', 1.2);
-1 # rows (not including the header row)
-1 # columns
-ST_LogiNetFromTGeo('network', 1.2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/loginetfromtgeo9.testcase b/test/sql_stmt_lwgeom_22_tests/loginetfromtgeo9.testcase
deleted file mode 100644
index 3e201ce..0000000
--- a/test/sql_stmt_lwgeom_22_tests/loginetfromtgeo9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_LogiNetFromTGeo - BLOB Topology
-:memory: #use in-memory database
-SELECT ST_LogiNetFromTGeo('network', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-ST_LogiNetFromTGeo('network', zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modedgeheal1.testcase b/test/sql_stmt_lwgeom_22_tests/modedgeheal1.testcase
deleted file mode 100644
index eb891ad..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modedgeheal1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModEdgeHeal - NULL Topology
-:memory: #use in-memory database
-SELECT ST_ModEdgeHeal(NULL, 1, 2);
-1 # rows (not including the header row)
-1 # columns
-ST_ModEdgeHeal(NULL, 1, 2)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modedgeheal10.testcase b/test/sql_stmt_lwgeom_22_tests/modedgeheal10.testcase
deleted file mode 100644
index 1ed6227..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modedgeheal10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModEdgeHeal - NULL Edge #2
-:memory: #use in-memory database
-SELECT ST_ModEdgeHeal('topology', 1, NULL);
-1 # rows (not including the header row)
-1 # columns
-ST_ModEdgeHeal('topology', 1, NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modedgeheal11.testcase b/test/sql_stmt_lwgeom_22_tests/modedgeheal11.testcase
deleted file mode 100644
index 5edb338..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modedgeheal11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModEdgeHeal - Double Edge #2
-:memory: #use in-memory database
-SELECT ST_ModEdgeHeal('topology', 1, 2.4);
-1 # rows (not including the header row)
-1 # columns
-ST_ModEdgeHeal('topology', 1, 2.4)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modedgeheal12.testcase b/test/sql_stmt_lwgeom_22_tests/modedgeheal12.testcase
deleted file mode 100644
index 0fffaaa..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modedgeheal12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModEdgeHeal - Text Edge #2
-:memory: #use in-memory database
-SELECT ST_ModEdgeHeal('topology', 1, 'to');
-1 # rows (not including the header row)
-1 # columns
-ST_ModEdgeHeal('topology', 1, 'to')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modedgeheal13.testcase b/test/sql_stmt_lwgeom_22_tests/modedgeheal13.testcase
deleted file mode 100644
index 3a1227f..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modedgeheal13.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModEdgeHeal - BLOB Edge #2
-:memory: #use in-memory database
-SELECT ST_ModEdgeHeal('topology', 1, zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-ST_ModEdgeHeal('topology', 1, zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modedgeheal2.testcase b/test/sql_stmt_lwgeom_22_tests/modedgeheal2.testcase
deleted file mode 100644
index 8aae8cc..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modedgeheal2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModEdgeHeal - Int Topology
-:memory: #use in-memory database
-SELECT ST_ModEdgeHeal(1, 1, 2);
-1 # rows (not including the header row)
-1 # columns
-ST_ModEdgeHeal(1, 1, 2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modedgeheal3.testcase b/test/sql_stmt_lwgeom_22_tests/modedgeheal3.testcase
deleted file mode 100644
index e077bc8..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modedgeheal3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModEdgeHeal - Double Topology
-:memory: #use in-memory database
-SELECT ST_ModEdgeHeal(1.2, 1, 2);
-1 # rows (not including the header row)
-1 # columns
-ST_ModEdgeHeal(1.2, 1, 2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modedgeheal4.testcase b/test/sql_stmt_lwgeom_22_tests/modedgeheal4.testcase
deleted file mode 100644
index f35a324..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modedgeheal4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModEdgeHeal - BLOB Topology
-:memory: #use in-memory database
-SELECT ST_ModEdgeHeal(zeroblob(4), 1, 2);
-1 # rows (not including the header row)
-1 # columns
-ST_ModEdgeHeal(zeroblob(4), 1, 2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modedgeheal5.testcase b/test/sql_stmt_lwgeom_22_tests/modedgeheal5.testcase
deleted file mode 100644
index 35803cb..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modedgeheal5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModEdgeHeal - Text Topology
-:memory: #use in-memory database
-SELECT ST_ModEdgeHeal('topology', 1, 2);
-1 # rows (not including the header row)
-1 # columns
-ST_ModEdgeHeal('topology', 1, 2)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/modedgeheal6.testcase b/test/sql_stmt_lwgeom_22_tests/modedgeheal6.testcase
deleted file mode 100644
index 26671ba..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modedgeheal6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModEdgeHeal - NULL Edge #1
-:memory: #use in-memory database
-SELECT ST_ModEdgeHeal('topology', NULL, 2);
-1 # rows (not including the header row)
-1 # columns
-ST_ModEdgeHeal('topology', NULL, 2)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modedgeheal7.testcase b/test/sql_stmt_lwgeom_22_tests/modedgeheal7.testcase
deleted file mode 100644
index a283ff1..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modedgeheal7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModEdgeHeal - Double Edge #1
-:memory: #use in-memory database
-SELECT ST_ModEdgeHeal('topology', 1.3, 2);
-1 # rows (not including the header row)
-1 # columns
-ST_ModEdgeHeal('topology', 1.3, 2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modedgeheal8.testcase b/test/sql_stmt_lwgeom_22_tests/modedgeheal8.testcase
deleted file mode 100644
index 59873b0..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modedgeheal8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModEdgeHeal - Text Edge #1
-:memory: #use in-memory database
-SELECT ST_ModEdgeHeal('topology', 'from', 2);
-1 # rows (not including the header row)
-1 # columns
-ST_ModEdgeHeal('topology', 'from', 2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modedgeheal9.testcase b/test/sql_stmt_lwgeom_22_tests/modedgeheal9.testcase
deleted file mode 100644
index 2361b34..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modedgeheal9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModEdgeHeal - BLOB Edge #1
-:memory: #use in-memory database
-SELECT ST_ModEdgeHeal('topology', zeroblob(4), 2);
-1 # rows (not including the header row)
-1 # columns
-ST_ModEdgeHeal('topology', zeroblob(4), 2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modedgesplit1.testcase b/test/sql_stmt_lwgeom_22_tests/modedgesplit1.testcase
deleted file mode 100644
index aaa1635..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modedgesplit1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModEdgeSplit - NULL Topology
-:memory: #use in-memory database
-SELECT ST_ModEdgeSplit(NULL, -1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ModEdgeSplit(NULL, -1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modedgesplit10.testcase b/test/sql_stmt_lwgeom_22_tests/modedgesplit10.testcase
deleted file mode 100644
index fd54863..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modedgesplit10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModEdgeSplit - Double Geometry
-:memory: #use in-memory database
-SELECT ST_ModEdgeSplit('topology', -1, 1.1);
-1 # rows (not including the header row)
-1 # columns
-ST_ModEdgeSplit('topology', -1, 1.1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modedgesplit11.testcase b/test/sql_stmt_lwgeom_22_tests/modedgesplit11.testcase
deleted file mode 100644
index 64e8fcc..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modedgesplit11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModEdgeSplit - NULL Geometry
-:memory: #use in-memory database
-SELECT ST_ModEdgeSplit('topology', -1, NULL);
-1 # rows (not including the header row)
-1 # columns
-ST_ModEdgeSplit('topology', -1, NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modedgesplit12.testcase b/test/sql_stmt_lwgeom_22_tests/modedgesplit12.testcase
deleted file mode 100644
index 9031702..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modedgesplit12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModEdgeSplit - Text Geometry
-:memory: #use in-memory database
-SELECT ST_ModEdgeSplit('topology', 'face', 'geom');
-1 # rows (not including the header row)
-1 # columns
-ST_ModEdgeSplit('topology', 'face', 'geom')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modedgesplit13.testcase b/test/sql_stmt_lwgeom_22_tests/modedgesplit13.testcase
deleted file mode 100644
index e57d1b4..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modedgesplit13.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModEdgeSplit - Invalid BLOB Geometry
-:memory: #use in-memory database
-SELECT ST_ModEdgeSplit('topology', 'face', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-ST_ModEdgeSplit('topology', 'face', zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modedgesplit14.testcase b/test/sql_stmt_lwgeom_22_tests/modedgesplit14.testcase
deleted file mode 100644
index 7e2f92a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modedgesplit14.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModEdgeSplit - Linestring Geometry
-:memory: #use in-memory database
-SELECT ST_ModEdgeSplit('topology', -1, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ModEdgeSplit('topology', -1, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modedgesplit15.testcase b/test/sql_stmt_lwgeom_22_tests/modedgesplit15.testcase
deleted file mode 100644
index 3e6d98a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modedgesplit15.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModEdgeSplit - Polygon Geometry
-:memory: #use in-memory database
-SELECT ST_ModEdgeSplit('topology', -1, GeomFromText('POLYGON((0 0, 0 1, 1 1, 1 0, 0 0))', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ModEdgeSplit('topology', -1, GeomFromText('POLYGON((0 0, 0 1, 1 1, 1 0, 0 0))', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modedgesplit16.testcase b/test/sql_stmt_lwgeom_22_tests/modedgesplit16.testcase
deleted file mode 100644
index 49ac09f..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modedgesplit16.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModEdgeSplit - MULTIPOINT Geometry
-:memory: #use in-memory database
-SELECT ST_ModEdgeSplit('topology', -1, GeomFromText('MULTIPOINT(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ModEdgeSplit('topology', -1, GeomFromText('MULTIPOINT(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modedgesplit2.testcase b/test/sql_stmt_lwgeom_22_tests/modedgesplit2.testcase
deleted file mode 100644
index 61dc9ff..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modedgesplit2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModEdgeSplit - Int Topology
-:memory: #use in-memory database
-SELECT ST_ModEdgeSplit(1, -1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ModEdgeSplit(1, -1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modedgesplit3.testcase b/test/sql_stmt_lwgeom_22_tests/modedgesplit3.testcase
deleted file mode 100644
index 102facf..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modedgesplit3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModEdgeSplit - Double Topology
-:memory: #use in-memory database
-SELECT ST_ModEdgeSplit(1.5, -1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ModEdgeSplit(1.5, -1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modedgesplit4.testcase b/test/sql_stmt_lwgeom_22_tests/modedgesplit4.testcase
deleted file mode 100644
index ee952c5..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modedgesplit4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModEdgeSplit - Blob Topology
-:memory: #use in-memory database
-SELECT ST_ModEdgeSplit(zeroblob(4), -1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ModEdgeSplit(zeroblob(4), -1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modedgesplit5.testcase b/test/sql_stmt_lwgeom_22_tests/modedgesplit5.testcase
deleted file mode 100644
index 6e7aa58..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modedgesplit5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModEdgeSplit - Text Topology
-:memory: #use in-memory database
-SELECT ST_ModEdgeSplit('topology', -1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ModEdgeSplit('topology', -1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/modedgesplit6.testcase b/test/sql_stmt_lwgeom_22_tests/modedgesplit6.testcase
deleted file mode 100644
index c872950..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modedgesplit6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModEdgeSplit - Double Face
-:memory: #use in-memory database
-SELECT ST_ModEdgeSplit('topology', 2.0, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ModEdgeSplit('topology', 2.0, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modedgesplit7.testcase b/test/sql_stmt_lwgeom_22_tests/modedgesplit7.testcase
deleted file mode 100644
index 319313c..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modedgesplit7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModEdgeSplit - BLOB Face
-:memory: #use in-memory database
-SELECT ST_ModEdgeSplit('topology', zeroblob(4), MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ModEdgeSplit('topology', zeroblob(4), MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modedgesplit8.testcase b/test/sql_stmt_lwgeom_22_tests/modedgesplit8.testcase
deleted file mode 100644
index a2760c4..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modedgesplit8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModEdgeSplit - Text Face
-:memory: #use in-memory database
-SELECT ST_ModEdgeSplit('topology', 'face', MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ModEdgeSplit('topology', 'face', MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modedgesplit9.testcase b/test/sql_stmt_lwgeom_22_tests/modedgesplit9.testcase
deleted file mode 100644
index a64fab2..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modedgesplit9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModEdgeSplit - Int Geometry
-:memory: #use in-memory database
-SELECT ST_ModEdgeSplit('topology', -1, 1);
-1 # rows (not including the header row)
-1 # columns
-ST_ModEdgeSplit('topology', -1, 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modgeolinksplit1.testcase b/test/sql_stmt_lwgeom_22_tests/modgeolinksplit1.testcase
deleted file mode 100644
index dcbf2c4..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modgeolinksplit1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModGeoLinkSplit - NULL Network
-:memory: #use in-memory database
-SELECT ST_ModGeoLinkSplit(NULL, -1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ModGeoLinkSplit(NULL, -1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modgeolinksplit2.testcase b/test/sql_stmt_lwgeom_22_tests/modgeolinksplit2.testcase
deleted file mode 100644
index 91f8d00..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modgeolinksplit2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModGeoLinkSplit - Int Network
-:memory: #use in-memory database
-SELECT ST_ModGeoLinkSplit(1, -1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ModGeoLinkSplit(1, -1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modgeolinksplit3.testcase b/test/sql_stmt_lwgeom_22_tests/modgeolinksplit3.testcase
deleted file mode 100644
index 3cb14f6..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modgeolinksplit3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModGeoLinkSplit - Double Network
-:memory: #use in-memory database
-SELECT ST_ModGeoLinkSplit(1.5, -1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ModGeoLinkSplit(1.5, -1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modgeolinksplit4.testcase b/test/sql_stmt_lwgeom_22_tests/modgeolinksplit4.testcase
deleted file mode 100644
index 1df3abd..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modgeolinksplit4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModGeoLinkSplit - Blob Network
-:memory: #use in-memory database
-SELECT ST_ModGeoLinkSplit(zeroblob(4), -1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ModGeoLinkSplit(zeroblob(4), -1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modgeolinksplit5.testcase b/test/sql_stmt_lwgeom_22_tests/modgeolinksplit5.testcase
deleted file mode 100644
index 3e8f46b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modgeolinksplit5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModGeoLinkSplit - Text Network
-:memory: #use in-memory database
-SELECT ST_ModGeoLinkSplit('net', -1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ModGeoLinkSplit('net', -1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/modgeolinksplit6.testcase b/test/sql_stmt_lwgeom_22_tests/modgeolinksplit6.testcase
deleted file mode 100644
index b304424..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modgeolinksplit6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModGeoLinkSplit - Double Link
-:memory: #use in-memory database
-SELECT ST_ModGeoLinkSplit('net', 2.0, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ModGeoLinkSplit('net', 2.0, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modgeolinksplit7.testcase b/test/sql_stmt_lwgeom_22_tests/modgeolinksplit7.testcase
deleted file mode 100644
index e92ebee..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modgeolinksplit7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModGeoLinkSplit - BLOB Link
-:memory: #use in-memory database
-SELECT ST_ModGeoLinkSplit('net', zeroblob(4), MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ModGeoLinkSplit('net', zeroblob(4), MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modgeolinksplit8.testcase b/test/sql_stmt_lwgeom_22_tests/modgeolinksplit8.testcase
deleted file mode 100644
index 8c50735..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modgeolinksplit8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModGeoLinkSplit - Text Link
-:memory: #use in-memory database
-SELECT ST_ModGeoLinkSplit('net', 'link', MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_ModGeoLinkSplit('net', 'link', MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modgeolinksplit9.testcase b/test/sql_stmt_lwgeom_22_tests/modgeolinksplit9.testcase
deleted file mode 100644
index 726196e..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modgeolinksplit9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModGeoLinkSplit - Int Geometry
-:memory: #use in-memory database
-SELECT ST_ModGeoLinkSplit('net', -1, 1);
-1 # rows (not including the header row)
-1 # columns
-ST_ModGeoLinkSplit('net', -1, 1)
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/modlinkheal1.testcase b/test/sql_stmt_lwgeom_22_tests/modlinkheal1.testcase
deleted file mode 100644
index 2d7f465..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modlinkheal1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModLinkHeal - NULL Network
-:memory: #use in-memory database
-SELECT ST_ModLinkHeal(NULL, 1, 2);
-1 # rows (not including the header row)
-1 # columns
-ST_ModLinkHeal(NULL, 1, 2)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modlinkheal10.testcase b/test/sql_stmt_lwgeom_22_tests/modlinkheal10.testcase
deleted file mode 100644
index b6ee63b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modlinkheal10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModLinkHeal - NULL Link #2
-:memory: #use in-memory database
-SELECT ST_ModLinkHeal('net', 1, NULL);
-1 # rows (not including the header row)
-1 # columns
-ST_ModLinkHeal('net', 1, NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modlinkheal11.testcase b/test/sql_stmt_lwgeom_22_tests/modlinkheal11.testcase
deleted file mode 100644
index cbcc4d7..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modlinkheal11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModLinkHeal - Double Link #2
-:memory: #use in-memory database
-SELECT ST_ModLinkHeal('net', 1, 2.4);
-1 # rows (not including the header row)
-1 # columns
-ST_ModLinkHeal('net', 1, 2.4)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modlinkheal12.testcase b/test/sql_stmt_lwgeom_22_tests/modlinkheal12.testcase
deleted file mode 100644
index 82c0ebd..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modlinkheal12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModLinkHeal - Text Link #2
-:memory: #use in-memory database
-SELECT ST_ModLinkHeal('net', 1, 'to');
-1 # rows (not including the header row)
-1 # columns
-ST_ModLinkHeal('net', 1, 'to')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modlinkheal13.testcase b/test/sql_stmt_lwgeom_22_tests/modlinkheal13.testcase
deleted file mode 100644
index d9ca1bb..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modlinkheal13.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModLinkHeal - BLOB Link #2
-:memory: #use in-memory database
-SELECT ST_ModLinkHeal('net', 1, zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-ST_ModLinkHeal('net', 1, zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modlinkheal2.testcase b/test/sql_stmt_lwgeom_22_tests/modlinkheal2.testcase
deleted file mode 100644
index dec1347..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modlinkheal2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModLinkHeal - Int Network
-:memory: #use in-memory database
-SELECT ST_ModLinkHeal(1, 1, 2);
-1 # rows (not including the header row)
-1 # columns
-ST_ModLinkHeal(1, 1, 2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modlinkheal3.testcase b/test/sql_stmt_lwgeom_22_tests/modlinkheal3.testcase
deleted file mode 100644
index 8bccbae..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modlinkheal3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModLinkHeal - Double Network
-:memory: #use in-memory database
-SELECT ST_ModLinkHeal(1.2, 1, 2);
-1 # rows (not including the header row)
-1 # columns
-ST_ModLinkHeal(1.2, 1, 2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modlinkheal4.testcase b/test/sql_stmt_lwgeom_22_tests/modlinkheal4.testcase
deleted file mode 100644
index 3957a1c..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modlinkheal4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModLinkHeal - BLOB Network
-:memory: #use in-memory database
-SELECT ST_ModLinkHeal(zeroblob(4), 1, 2);
-1 # rows (not including the header row)
-1 # columns
-ST_ModLinkHeal(zeroblob(4), 1, 2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modlinkheal5.testcase b/test/sql_stmt_lwgeom_22_tests/modlinkheal5.testcase
deleted file mode 100644
index 7388e41..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modlinkheal5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModLinkHeal - Text Network
-:memory: #use in-memory database
-SELECT ST_ModLinkHeal('topology', 1, 2);
-1 # rows (not including the header row)
-1 # columns
-ST_ModLinkHeal('topology', 1, 2)
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/modlinkheal6.testcase b/test/sql_stmt_lwgeom_22_tests/modlinkheal6.testcase
deleted file mode 100644
index 36b10ac..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modlinkheal6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModLinkHeal - NULL Link #1
-:memory: #use in-memory database
-SELECT ST_ModLinkHeal('net', NULL, 2);
-1 # rows (not including the header row)
-1 # columns
-ST_ModLinkHeal('net', NULL, 2)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modlinkheal7.testcase b/test/sql_stmt_lwgeom_22_tests/modlinkheal7.testcase
deleted file mode 100644
index 3b3e712..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modlinkheal7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModLinkHeal - Double Link #1
-:memory: #use in-memory database
-SELECT ST_ModLinkHeal('net', 1.3, 2);
-1 # rows (not including the header row)
-1 # columns
-ST_ModLinkHeal('net', 1.3, 2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modlinkheal8.testcase b/test/sql_stmt_lwgeom_22_tests/modlinkheal8.testcase
deleted file mode 100644
index b41c5fb..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modlinkheal8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModLinkHeal - Text Link #1
-:memory: #use in-memory database
-SELECT ST_ModLinkHeal('net', 'from', 2);
-1 # rows (not including the header row)
-1 # columns
-ST_ModLinkHeal('net', 'from', 2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modlinkheal9.testcase b/test/sql_stmt_lwgeom_22_tests/modlinkheal9.testcase
deleted file mode 100644
index a5fa15e..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modlinkheal9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModLinkHeal - BLOB Link #1
-:memory: #use in-memory database
-SELECT ST_ModLinkHeal('net', zeroblob(4), 2);
-1 # rows (not including the header row)
-1 # columns
-ST_ModLinkHeal('net', zeroblob(4), 2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modloglinksplit1.testcase b/test/sql_stmt_lwgeom_22_tests/modloglinksplit1.testcase
deleted file mode 100644
index 1b94a61..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modloglinksplit1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModLogLinkSplit - NULL Network
-:memory: #use in-memory database
-SELECT ST_ModLogLinkSplit(NULL, -1);
-1 # rows (not including the header row)
-1 # columns
-ST_ModLogLinkSplit(NULL, -1)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modloglinksplit2.testcase b/test/sql_stmt_lwgeom_22_tests/modloglinksplit2.testcase
deleted file mode 100644
index 7dbe0b9..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modloglinksplit2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModLogLinkSplit - Int Network
-:memory: #use in-memory database
-SELECT ST_ModLogLinkSplit(1, -1);
-1 # rows (not including the header row)
-1 # columns
-ST_ModLogLinkSplit(1, -1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modloglinksplit3.testcase b/test/sql_stmt_lwgeom_22_tests/modloglinksplit3.testcase
deleted file mode 100644
index b486d16..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modloglinksplit3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModLogLinkSplit - Double Network
-:memory: #use in-memory database
-SELECT ST_ModLogLinkSplit(1.5, -1);
-1 # rows (not including the header row)
-1 # columns
-ST_ModLogLinkSplit(1.5, -1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modloglinksplit4.testcase b/test/sql_stmt_lwgeom_22_tests/modloglinksplit4.testcase
deleted file mode 100644
index 6bf1b03..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modloglinksplit4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModLogLinkSplit - Blob Network
-:memory: #use in-memory database
-SELECT ST_ModLogLinkSplit(zeroblob(4), -1);
-1 # rows (not including the header row)
-1 # columns
-ST_ModLogLinkSplit(zeroblob(4), -1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modloglinksplit5.testcase b/test/sql_stmt_lwgeom_22_tests/modloglinksplit5.testcase
deleted file mode 100644
index 7245920..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modloglinksplit5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModLogLinkSplit - Text Network
-:memory: #use in-memory database
-SELECT ST_ModLogLinkSplit('net', -1);
-1 # rows (not including the header row)
-1 # columns
-ST_ModLogLinkSplit('net', -1)
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/modloglinksplit6.testcase b/test/sql_stmt_lwgeom_22_tests/modloglinksplit6.testcase
deleted file mode 100644
index 1ffc813..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modloglinksplit6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModLogLinkSplit - Double Link
-:memory: #use in-memory database
-SELECT ST_ModLogLinkSplit('net', 2.0);
-1 # rows (not including the header row)
-1 # columns
-ST_ModLogLinkSplit('net', 2.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modloglinksplit7.testcase b/test/sql_stmt_lwgeom_22_tests/modloglinksplit7.testcase
deleted file mode 100644
index 414cdb7..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modloglinksplit7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModLogLinkSplit - BLOB Link
-:memory: #use in-memory database
-SELECT ST_ModLogLinkSplit('net', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-ST_ModLogLinkSplit('net', zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modloglinksplit8.testcase b/test/sql_stmt_lwgeom_22_tests/modloglinksplit8.testcase
deleted file mode 100644
index c45c900..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modloglinksplit8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModLogLinkSplit - Text Link
-:memory: #use in-memory database
-SELECT ST_ModLogLinkSplit('net', 'node');
-1 # rows (not including the header row)
-1 # columns
-ST_ModLogLinkSplit('net', 'node')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/modloglinksplit9.testcase b/test/sql_stmt_lwgeom_22_tests/modloglinksplit9.testcase
deleted file mode 100644
index 0c7e453..0000000
--- a/test/sql_stmt_lwgeom_22_tests/modloglinksplit9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ModLogLinkSplit - NULL Link
-:memory: #use in-memory database
-SELECT ST_ModLogLinkSplit('net', NULL);
-1 # rows (not including the header row)
-1 # columns
-ST_ModLogLinkSplit('net', NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/moveisonetnode1.testcase b/test/sql_stmt_lwgeom_22_tests/moveisonetnode1.testcase
deleted file mode 100644
index f7c1b0e..0000000
--- a/test/sql_stmt_lwgeom_22_tests/moveisonetnode1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-MoveIsoNetNode - NULL Network
-:memory: #use in-memory database
-SELECT ST_MoveIsoNetNode(NULL, -1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_MoveIsoNetNode(NULL, -1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/moveisonetnode2.testcase b/test/sql_stmt_lwgeom_22_tests/moveisonetnode2.testcase
deleted file mode 100644
index 1042f8b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/moveisonetnode2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-MoveIsoNetNode - Int Network
-:memory: #use in-memory database
-SELECT ST_MoveIsoNetNode(1, -1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_MoveIsoNetNode(1, -1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/moveisonetnode3.testcase b/test/sql_stmt_lwgeom_22_tests/moveisonetnode3.testcase
deleted file mode 100644
index fbf03db..0000000
--- a/test/sql_stmt_lwgeom_22_tests/moveisonetnode3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-MoveIsoNetNode - Double Network
-:memory: #use in-memory database
-SELECT ST_MoveIsoNetNode(1.5, -1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_MoveIsoNetNode(1.5, -1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/moveisonetnode4.testcase b/test/sql_stmt_lwgeom_22_tests/moveisonetnode4.testcase
deleted file mode 100644
index 30808e6..0000000
--- a/test/sql_stmt_lwgeom_22_tests/moveisonetnode4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-MoveIsoNetNode - Blob Network
-:memory: #use in-memory database
-SELECT ST_MoveIsoNetNode(zeroblob(4), -1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_MoveIsoNetNode(zeroblob(4), -1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/moveisonetnode5.testcase b/test/sql_stmt_lwgeom_22_tests/moveisonetnode5.testcase
deleted file mode 100644
index cb2f1a7..0000000
--- a/test/sql_stmt_lwgeom_22_tests/moveisonetnode5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-MoveIsoNetNode - Double Node
-:memory: #use in-memory database
-SELECT ST_MoveIsoNetNode('net', 2.0, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_MoveIsoNetNode('net', 2.0, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/moveisonetnode6.testcase b/test/sql_stmt_lwgeom_22_tests/moveisonetnode6.testcase
deleted file mode 100644
index c835c93..0000000
--- a/test/sql_stmt_lwgeom_22_tests/moveisonetnode6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-MoveIsoNetNode - BLOB Node
-:memory: #use in-memory database
-SELECT ST_MoveIsoNetNode('net', zeroblob(4), MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_MoveIsoNetNode('net', zeroblob(4), MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/moveisonetnode7.testcase b/test/sql_stmt_lwgeom_22_tests/moveisonetnode7.testcase
deleted file mode 100644
index be88dc1..0000000
--- a/test/sql_stmt_lwgeom_22_tests/moveisonetnode7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-MoveIsoNetNode - Text Node
-:memory: #use in-memory database
-SELECT ST_MoveIsoNetNode('net', 'node', MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_MoveIsoNetNode('net', 'node', MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/moveisonetnode8.testcase b/test/sql_stmt_lwgeom_22_tests/moveisonetnode8.testcase
deleted file mode 100644
index 585a484..0000000
--- a/test/sql_stmt_lwgeom_22_tests/moveisonetnode8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-MoveIsoNetNode - NULL Node
-:memory: #use in-memory database
-SELECT ST_MoveIsoNetNode('net', NULL, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_MoveIsoNetNode('net', NULL, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/moveisonetnode9.testcase b/test/sql_stmt_lwgeom_22_tests/moveisonetnode9.testcase
deleted file mode 100644
index 865eea0..0000000
--- a/test/sql_stmt_lwgeom_22_tests/moveisonetnode9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-MoveIsoNetNode - invalid network
-:memory: #use in-memory database
-SELECT ST_MoveIsoNetNode('net', 1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_MoveIsoNetNetNode('net', 1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/moveisonode1.testcase b/test/sql_stmt_lwgeom_22_tests/moveisonode1.testcase
deleted file mode 100644
index 0842635..0000000
--- a/test/sql_stmt_lwgeom_22_tests/moveisonode1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-MoveIsoNode - NULL Topology
-:memory: #use in-memory database
-SELECT ST_MoveIsoNode(NULL, -1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_MoveIsoNode(NULL, -1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/moveisonode10.testcase b/test/sql_stmt_lwgeom_22_tests/moveisonode10.testcase
deleted file mode 100644
index a1b38da..0000000
--- a/test/sql_stmt_lwgeom_22_tests/moveisonode10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-MoveIsoNode - Double Geometry
-:memory: #use in-memory database
-SELECT ST_MoveIsoNode('topology', -1, 1.1);
-1 # rows (not including the header row)
-1 # columns
-ST_MoveIsoNode('topology', -1, 1.1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/moveisonode11.testcase b/test/sql_stmt_lwgeom_22_tests/moveisonode11.testcase
deleted file mode 100644
index 46908c4..0000000
--- a/test/sql_stmt_lwgeom_22_tests/moveisonode11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-MoveIsoNode - NULL Geometry
-:memory: #use in-memory database
-SELECT ST_MoveIsoNode('topology', -1, NULL);
-1 # rows (not including the header row)
-1 # columns
-ST_MoveIsoNode('topology', -1, NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/moveisonode12.testcase b/test/sql_stmt_lwgeom_22_tests/moveisonode12.testcase
deleted file mode 100644
index 1f22339..0000000
--- a/test/sql_stmt_lwgeom_22_tests/moveisonode12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-MoveIsoNode - Text Geometry
-:memory: #use in-memory database
-SELECT ST_MoveIsoNode('topology', 'face', 'geom');
-1 # rows (not including the header row)
-1 # columns
-ST_MoveIsoNode('topology', 'face', 'geom')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/moveisonode13.testcase b/test/sql_stmt_lwgeom_22_tests/moveisonode13.testcase
deleted file mode 100644
index 8ed06c0..0000000
--- a/test/sql_stmt_lwgeom_22_tests/moveisonode13.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-MoveIsoNode - Invalid BLOB Geometry
-:memory: #use in-memory database
-SELECT ST_MoveIsoNode('topology', 'face', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-ST_MoveIsoNode('topology', 'face', zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/moveisonode14.testcase b/test/sql_stmt_lwgeom_22_tests/moveisonode14.testcase
deleted file mode 100644
index 44f29c9..0000000
--- a/test/sql_stmt_lwgeom_22_tests/moveisonode14.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-MoveIsoNode - Linestring Geometry
-:memory: #use in-memory database
-SELECT ST_MoveIsoNode('topology', -1, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_MoveIsoNode('topology', -1, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/moveisonode15.testcase b/test/sql_stmt_lwgeom_22_tests/moveisonode15.testcase
deleted file mode 100644
index 031a66b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/moveisonode15.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-MoveIsoNode - Polygon Geometry
-:memory: #use in-memory database
-SELECT ST_MoveIsoNode('topology', -1, GeomFromText('POLYGON((0 0, 0 1, 1 1, 1 0, 0 0))', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_MoveIsoNode('topology', -1, GeomFromText('POLYGON((0 0, 0 1, 1 1, 1 0, 0 0))', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/moveisonode16.testcase b/test/sql_stmt_lwgeom_22_tests/moveisonode16.testcase
deleted file mode 100644
index e3a061b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/moveisonode16.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-MoveIsoNode - MULTIPOINT Geometry
-:memory: #use in-memory database
-SELECT ST_MoveIsoNode('topology', -1, GeomFromText('MULTIPOINT(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_MoveIsoNode('topology', -1, GeomFromText('MULTIPOINT(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/moveisonode17.testcase b/test/sql_stmt_lwgeom_22_tests/moveisonode17.testcase
deleted file mode 100644
index 10b3b5f..0000000
--- a/test/sql_stmt_lwgeom_22_tests/moveisonode17.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-MoveIsoNode - NULL Node
-:memory: #use in-memory database
-SELECT ST_MoveIsoNode('topology', NULL, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_MoveIsoNode('topology', NULL, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/moveisonode2.testcase b/test/sql_stmt_lwgeom_22_tests/moveisonode2.testcase
deleted file mode 100644
index 50ad7cc..0000000
--- a/test/sql_stmt_lwgeom_22_tests/moveisonode2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-MoveIsoNode - Int Topology
-:memory: #use in-memory database
-SELECT ST_MoveIsoNode(1, -1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_MoveIsoNode(1, -1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/moveisonode3.testcase b/test/sql_stmt_lwgeom_22_tests/moveisonode3.testcase
deleted file mode 100644
index f7c1a38..0000000
--- a/test/sql_stmt_lwgeom_22_tests/moveisonode3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-MoveIsoNode - Double Topology
-:memory: #use in-memory database
-SELECT ST_MoveIsoNode(1.5, -1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_MoveIsoNode(1.5, -1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/moveisonode4.testcase b/test/sql_stmt_lwgeom_22_tests/moveisonode4.testcase
deleted file mode 100644
index 50e816e..0000000
--- a/test/sql_stmt_lwgeom_22_tests/moveisonode4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-MoveIsoNode - Blob Topology
-:memory: #use in-memory database
-SELECT ST_MoveIsoNode(zeroblob(4), -1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_MoveIsoNode(zeroblob(4), -1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/moveisonode5.testcase b/test/sql_stmt_lwgeom_22_tests/moveisonode5.testcase
deleted file mode 100644
index 00b59c4..0000000
--- a/test/sql_stmt_lwgeom_22_tests/moveisonode5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-MoveIsoNode - Text Topology
-:memory: #use in-memory database
-SELECT ST_MoveIsoNode('topology', -1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_MoveIsoNode('topology', -1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/moveisonode6.testcase b/test/sql_stmt_lwgeom_22_tests/moveisonode6.testcase
deleted file mode 100644
index 4fbac34..0000000
--- a/test/sql_stmt_lwgeom_22_tests/moveisonode6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-MoveIsoNode - Double Node
-:memory: #use in-memory database
-SELECT ST_MoveIsoNode('topology', 2.0, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_MoveIsoNode('topology', 2.0, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/moveisonode7.testcase b/test/sql_stmt_lwgeom_22_tests/moveisonode7.testcase
deleted file mode 100644
index 25b761b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/moveisonode7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-MoveIsoNode - BLOB Node
-:memory: #use in-memory database
-SELECT ST_MoveIsoNode('topology', zeroblob(4), MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_MoveIsoNode('topology', zeroblob(4), MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/moveisonode8.testcase b/test/sql_stmt_lwgeom_22_tests/moveisonode8.testcase
deleted file mode 100644
index e90ac08..0000000
--- a/test/sql_stmt_lwgeom_22_tests/moveisonode8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-MoveIsoNode - Text Node
-:memory: #use in-memory database
-SELECT ST_MoveIsoNode('topology', 'node', MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_MoveIsoNode('topology', 'node', MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/moveisonode9.testcase b/test/sql_stmt_lwgeom_22_tests/moveisonode9.testcase
deleted file mode 100644
index 02e4276..0000000
--- a/test/sql_stmt_lwgeom_22_tests/moveisonode9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-MoveIsoNode - Int Geometry
-:memory: #use in-memory database
-SELECT ST_MoveIsoNode('topology', -1, 1);
-1 # rows (not including the header row)
-1 # columns
-ST_MoveIsoNode('topology', -1, 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/netexception1.testcase b/test/sql_stmt_lwgeom_22_tests/netexception1.testcase
deleted file mode 100644
index 03e0e1b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/netexception1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetLastNetworkException - NULL Network
-:memory: #use in-memory database
-SELECT GetLastNetworkException(NULL);
-1 # rows (not including the header row)
-1 # columns
-GetLastNetworkException(NULL)
-(NULL)
diff --git a/test/sql_stmt_lwgeom_22_tests/netexception2.testcase b/test/sql_stmt_lwgeom_22_tests/netexception2.testcase
deleted file mode 100644
index 3040e15..0000000
--- a/test/sql_stmt_lwgeom_22_tests/netexception2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetLastNetworkException - Undefined Network
-:memory: #use in-memory database
-SELECT GetLastNetworkException('net');
-1 # rows (not including the header row)
-1 # columns
-GetLastNetworkException('net')
-(NULL)
diff --git a/test/sql_stmt_lwgeom_22_tests/newedgeheal1.testcase b/test/sql_stmt_lwgeom_22_tests/newedgeheal1.testcase
deleted file mode 100644
index 41f166b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newedgeheal1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewEdgeHeal - NULL Topology
-:memory: #use in-memory database
-SELECT ST_NewEdgeHeal(NULL, 1, 2);
-1 # rows (not including the header row)
-1 # columns
-ST_NewEdgeHeal(NULL, 1, 2)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newedgeheal10.testcase b/test/sql_stmt_lwgeom_22_tests/newedgeheal10.testcase
deleted file mode 100644
index bf4e84a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newedgeheal10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewEdgeHeal - NULL Edge #2
-:memory: #use in-memory database
-SELECT ST_NewEdgeHeal('topology', 1, NULL);
-1 # rows (not including the header row)
-1 # columns
-ST_NewEdgeHeal('topology', 1, NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newedgeheal11.testcase b/test/sql_stmt_lwgeom_22_tests/newedgeheal11.testcase
deleted file mode 100644
index 767f0a2..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newedgeheal11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewEdgeHeal - Double Edge #2
-:memory: #use in-memory database
-SELECT ST_NewEdgeHeal('topology', 1, 2.4);
-1 # rows (not including the header row)
-1 # columns
-ST_NewEdgeHeal('topology', 1, 2.4)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newedgeheal12.testcase b/test/sql_stmt_lwgeom_22_tests/newedgeheal12.testcase
deleted file mode 100644
index aee15fc..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newedgeheal12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewEdgeHeal - Text Edge #2
-:memory: #use in-memory database
-SELECT ST_NewEdgeHeal('topology', 1, 'to');
-1 # rows (not including the header row)
-1 # columns
-ST_NewEdgeHeal('topology', 1, 'to')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newedgeheal13.testcase b/test/sql_stmt_lwgeom_22_tests/newedgeheal13.testcase
deleted file mode 100644
index 4724897..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newedgeheal13.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewEdgeHeal - BLOB Edge #2
-:memory: #use in-memory database
-SELECT ST_NewEdgeHeal('topology', 1, zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-ST_NewEdgeHeal('topology', 1, zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newedgeheal2.testcase b/test/sql_stmt_lwgeom_22_tests/newedgeheal2.testcase
deleted file mode 100644
index fdc57b5..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newedgeheal2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewEdgeHeal - Int Topology
-:memory: #use in-memory database
-SELECT ST_NewEdgeHeal(1, 1, 2);
-1 # rows (not including the header row)
-1 # columns
-ST_NewEdgeHeal(1, 1, 2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newedgeheal3.testcase b/test/sql_stmt_lwgeom_22_tests/newedgeheal3.testcase
deleted file mode 100644
index 56a64b2..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newedgeheal3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewEdgeHeal - Double Topology
-:memory: #use in-memory database
-SELECT ST_NewEdgeHeal(1.2, 1, 2);
-1 # rows (not including the header row)
-1 # columns
-ST_NewEdgeHeal(1.2, 1, 2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newedgeheal4.testcase b/test/sql_stmt_lwgeom_22_tests/newedgeheal4.testcase
deleted file mode 100644
index a3fcffe..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newedgeheal4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewEdgeHeal - BLOB Topology
-:memory: #use in-memory database
-SELECT ST_NewEdgeHeal(zeroblob(4), 1, 2);
-1 # rows (not including the header row)
-1 # columns
-ST_NewEdgeHeal(zeroblob(4), 1, 2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newedgeheal5.testcase b/test/sql_stmt_lwgeom_22_tests/newedgeheal5.testcase
deleted file mode 100644
index 7556a03..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newedgeheal5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewEdgeHeal - Text Topology
-:memory: #use in-memory database
-SELECT ST_NewEdgeHeal('topology', 1, 2);
-1 # rows (not including the header row)
-1 # columns
-ST_NewEdgeHeal('topology', 1, 2)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/newedgeheal6.testcase b/test/sql_stmt_lwgeom_22_tests/newedgeheal6.testcase
deleted file mode 100644
index bb6ea7d..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newedgeheal6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewEdgeHeal - NULL Edge #1
-:memory: #use in-memory database
-SELECT ST_NewEdgeHeal('topology', NULL, 2);
-1 # rows (not including the header row)
-1 # columns
-ST_NewEdgeHeal('topology', NULL, 2)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newedgeheal7.testcase b/test/sql_stmt_lwgeom_22_tests/newedgeheal7.testcase
deleted file mode 100644
index 31d4f9d..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newedgeheal7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewEdgeHeal - Double Edge #1
-:memory: #use in-memory database
-SELECT ST_NewEdgeHeal('topology', 1.3, 2);
-1 # rows (not including the header row)
-1 # columns
-ST_NewEdgeHeal('topology', 1.3, 2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newedgeheal8.testcase b/test/sql_stmt_lwgeom_22_tests/newedgeheal8.testcase
deleted file mode 100644
index f26aa50..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newedgeheal8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewEdgeHeal - Text Edge #1
-:memory: #use in-memory database
-SELECT ST_NewEdgeHeal('topology', 'from', 2);
-1 # rows (not including the header row)
-1 # columns
-ST_NewEdgeHeal('topology', 'from', 2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newedgeheal9.testcase b/test/sql_stmt_lwgeom_22_tests/newedgeheal9.testcase
deleted file mode 100644
index 77b6146..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newedgeheal9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewEdgeHeal - BLOB Edge #1
-:memory: #use in-memory database
-SELECT ST_NewEdgeHeal('topology', zeroblob(4), 2);
-1 # rows (not including the header row)
-1 # columns
-ST_NewEdgeHeal('topology', zeroblob(4), 2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newedgessplit1.testcase b/test/sql_stmt_lwgeom_22_tests/newedgessplit1.testcase
deleted file mode 100644
index 124f61e..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newedgessplit1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewEdgesSplit - NULL Topology
-:memory: #use in-memory database
-SELECT ST_NewEdgesSplit(NULL, -1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_NewEdgesSplit(NULL, -1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newedgessplit10.testcase b/test/sql_stmt_lwgeom_22_tests/newedgessplit10.testcase
deleted file mode 100644
index fb7ba59..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newedgessplit10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewEdgesSplit - Double Geometry
-:memory: #use in-memory database
-SELECT ST_NewEdgesSplit('topology', -1, 1.1);
-1 # rows (not including the header row)
-1 # columns
-ST_NewEdgesSplit('topology', -1, 1.1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newedgessplit11.testcase b/test/sql_stmt_lwgeom_22_tests/newedgessplit11.testcase
deleted file mode 100644
index 8eda94e..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newedgessplit11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewEdgesSplit - NULL Geometry
-:memory: #use in-memory database
-SELECT ST_NewEdgesSplit('topology', -1, NULL);
-1 # rows (not including the header row)
-1 # columns
-ST_NewEdgesSplit('topology', -1, NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newedgessplit12.testcase b/test/sql_stmt_lwgeom_22_tests/newedgessplit12.testcase
deleted file mode 100644
index e3ba519..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newedgessplit12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewEdgesSplit - Text Geometry
-:memory: #use in-memory database
-SELECT ST_NewEdgesSplit('topology', 'face', 'geom');
-1 # rows (not including the header row)
-1 # columns
-ST_NewEdgesSplit('topology', 'face', 'geom')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newedgessplit13.testcase b/test/sql_stmt_lwgeom_22_tests/newedgessplit13.testcase
deleted file mode 100644
index 4ecb492..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newedgessplit13.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewEdgesSplit - Invalid BLOB Geometry
-:memory: #use in-memory database
-SELECT ST_NewEdgesSplit('topology', 'face', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-ST_NewEdgesSplit('topology', 'face', zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newedgessplit14.testcase b/test/sql_stmt_lwgeom_22_tests/newedgessplit14.testcase
deleted file mode 100644
index 2b84bcb..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newedgessplit14.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewEdgesSplit - Linestring Geometry
-:memory: #use in-memory database
-SELECT ST_NewEdgesSplit('topology', -1, GeomFromText('LINESTRING(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_NewEdgesSplit('topology', -1, GeomFromText('LINESTRING(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newedgessplit15.testcase b/test/sql_stmt_lwgeom_22_tests/newedgessplit15.testcase
deleted file mode 100644
index 48ae346..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newedgessplit15.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewEdgesSplit - Polygon Geometry
-:memory: #use in-memory database
-SELECT ST_NewEdgesSplit('topology', -1, GeomFromText('POLYGON((0 0, 0 1, 1 1, 1 0, 0 0))', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_NewEdgesSplit('topology', -1, GeomFromText('POLYGON((0 0, 0 1, 1 1, 1 0, 0 0))', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newedgessplit16.testcase b/test/sql_stmt_lwgeom_22_tests/newedgessplit16.testcase
deleted file mode 100644
index a3590d9..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newedgessplit16.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewEdgesSplit - MULTIPOINT Geometry
-:memory: #use in-memory database
-SELECT ST_NewEdgesSplit('topology', -1, GeomFromText('MULTIPOINT(0 0, 1 1)', 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_NewEdgesSplit('topology', -1, GeomFromText('MULTIPOINT(0 0, 1 1)', 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newedgessplit2.testcase b/test/sql_stmt_lwgeom_22_tests/newedgessplit2.testcase
deleted file mode 100644
index f711312..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newedgessplit2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewEdgesSplit - Int Topology
-:memory: #use in-memory database
-SELECT ST_NewEdgesSplit(1, -1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_NewEdgesSplit(1, -1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newedgessplit3.testcase b/test/sql_stmt_lwgeom_22_tests/newedgessplit3.testcase
deleted file mode 100644
index 5ed4e63..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newedgessplit3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewEdgesSplit - Double Topology
-:memory: #use in-memory database
-SELECT ST_NewEdgesSplit(1.5, -1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_NewEdgesSplit(1.5, -1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newedgessplit4.testcase b/test/sql_stmt_lwgeom_22_tests/newedgessplit4.testcase
deleted file mode 100644
index 6244de5..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newedgessplit4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewEdgesSplit - Blob Topology
-:memory: #use in-memory database
-SELECT ST_NewEdgesSplit(zeroblob(4), -1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_NewEdgesSplit(zeroblob(4), -1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newedgessplit5.testcase b/test/sql_stmt_lwgeom_22_tests/newedgessplit5.testcase
deleted file mode 100644
index 5d247df..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newedgessplit5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewEdgesSplit - Text Topology
-:memory: #use in-memory database
-SELECT ST_NewEdgesSplit('topology', -1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_NewEdgesSplit('topology', -1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/newedgessplit6.testcase b/test/sql_stmt_lwgeom_22_tests/newedgessplit6.testcase
deleted file mode 100644
index a6517ab..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newedgessplit6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewEdgesSplit - Double Face
-:memory: #use in-memory database
-SELECT ST_NewEdgesSplit('topology', 2.0, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_NewEdgesSplit('topology', 2.0, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newedgessplit7.testcase b/test/sql_stmt_lwgeom_22_tests/newedgessplit7.testcase
deleted file mode 100644
index 7e0d355..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newedgessplit7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewEdgesSplit - BLOB Face
-:memory: #use in-memory database
-SELECT ST_NewEdgesSplit('topology', zeroblob(4), MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_NewEdgesSplit('topology', zeroblob(4), MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newedgessplit8.testcase b/test/sql_stmt_lwgeom_22_tests/newedgessplit8.testcase
deleted file mode 100644
index 122f2f5..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newedgessplit8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewEdgesSplit - Text Face
-:memory: #use in-memory database
-SELECT ST_NewEdgesSplit('topology', 'face', MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_NewEdgesSplit('topology', 'face', MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newedgessplit9.testcase b/test/sql_stmt_lwgeom_22_tests/newedgessplit9.testcase
deleted file mode 100644
index b74e3d3..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newedgessplit9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewEdgesSplit - Int Geometry
-:memory: #use in-memory database
-SELECT ST_NewEdgesSplit('topology', -1, 1);
-1 # rows (not including the header row)
-1 # columns
-ST_NewEdgesSplit('topology', -1, 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newgeolinksplit1.testcase b/test/sql_stmt_lwgeom_22_tests/newgeolinksplit1.testcase
deleted file mode 100644
index a391f88..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newgeolinksplit1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewGeoLinkSplit - NULL Network
-:memory: #use in-memory database
-SELECT ST_NewGeoLinkSplit(NULL, -1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_NewGeoLinkSplit(NULL, -1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newgeolinksplit2.testcase b/test/sql_stmt_lwgeom_22_tests/newgeolinksplit2.testcase
deleted file mode 100644
index 230bb22..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newgeolinksplit2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewGeoLinkSplit - Int Network
-:memory: #use in-memory database
-SELECT ST_NewGeoLinkSplit(1, -1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_NewGeoLinkSplit(1, -1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newgeolinksplit3.testcase b/test/sql_stmt_lwgeom_22_tests/newgeolinksplit3.testcase
deleted file mode 100644
index 1c0493e..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newgeolinksplit3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewGeoLinkSplit - Double Network
-:memory: #use in-memory database
-SELECT ST_NewGeoLinkSplit(1.5, -1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_NewGeoLinkSplit(1.5, -1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newgeolinksplit4.testcase b/test/sql_stmt_lwgeom_22_tests/newgeolinksplit4.testcase
deleted file mode 100644
index 14d0527..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newgeolinksplit4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewGeoLinkSplit - Blob Network
-:memory: #use in-memory database
-SELECT ST_NewGeoLinkSplit(zeroblob(4), -1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_NewGeoLinkSplit(zeroblob(4), -1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newgeolinksplit5.testcase b/test/sql_stmt_lwgeom_22_tests/newgeolinksplit5.testcase
deleted file mode 100644
index 705f797..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newgeolinksplit5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewGeoLinkSplit - Text Network
-:memory: #use in-memory database
-SELECT ST_NewGeoLinkSplit('net', -1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_NewGeoLinkSplit('net', -1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/newgeolinksplit6.testcase b/test/sql_stmt_lwgeom_22_tests/newgeolinksplit6.testcase
deleted file mode 100644
index 2c07e09..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newgeolinksplit6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewGeoLinkSplit - Double Link
-:memory: #use in-memory database
-SELECT ST_NewGeoLinkSplit('net', 2.0, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_NewGeoLinkSplit('net', 2.0, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newgeolinksplit7.testcase b/test/sql_stmt_lwgeom_22_tests/newgeolinksplit7.testcase
deleted file mode 100644
index 433fb36..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newgeolinksplit7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewGeoLinkSplit - BLOB Link
-:memory: #use in-memory database
-SELECT ST_NewGeoLinkSplit('net', zeroblob(4), MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_NewGeoLinkSplit('net', zeroblob(4), MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newgeolinksplit8.testcase b/test/sql_stmt_lwgeom_22_tests/newgeolinksplit8.testcase
deleted file mode 100644
index 4370bd7..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newgeolinksplit8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewGeoLinkSplit - Text Link
-:memory: #use in-memory database
-SELECT ST_NewGeoLinkSplit('net', 'link', MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_NewGeoLinkSplit('net', 'link', MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newgeolinksplit9.testcase b/test/sql_stmt_lwgeom_22_tests/newgeolinksplit9.testcase
deleted file mode 100644
index 355e003..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newgeolinksplit9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewGeoLinkSplit - Int Geometry
-:memory: #use in-memory database
-SELECT ST_NewGeoLinkSplit('net', -1, 1);
-1 # rows (not including the header row)
-1 # columns
-ST_NewGeoLinkSplit('net', -1, 1)
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/newlinkheal1.testcase b/test/sql_stmt_lwgeom_22_tests/newlinkheal1.testcase
deleted file mode 100644
index 8b2a0f1..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newlinkheal1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewLinkHeal - NULL Network
-:memory: #use in-memory database
-SELECT ST_NewLinkHeal(NULL, 1, 2);
-1 # rows (not including the header row)
-1 # columns
-ST_NewLinkHeal(NULL, 1, 2)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newlinkheal10.testcase b/test/sql_stmt_lwgeom_22_tests/newlinkheal10.testcase
deleted file mode 100644
index 0c144ae..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newlinkheal10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewLinkHeal - NULL Link #2
-:memory: #use in-memory database
-SELECT ST_NewLinkHeal('net', 1, NULL);
-1 # rows (not including the header row)
-1 # columns
-ST_NewLinkHeal('net', 1, NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newlinkheal11.testcase b/test/sql_stmt_lwgeom_22_tests/newlinkheal11.testcase
deleted file mode 100644
index 550a0e8..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newlinkheal11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewLinkHeal - Double Link #2
-:memory: #use in-memory database
-SELECT ST_NewLinkHeal('net', 1, 2.4);
-1 # rows (not including the header row)
-1 # columns
-ST_NewLinkHeal('net', 1, 2.4)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newlinkheal12.testcase b/test/sql_stmt_lwgeom_22_tests/newlinkheal12.testcase
deleted file mode 100644
index 03660a7..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newlinkheal12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewLinkHeal - Text Link #2
-:memory: #use in-memory database
-SELECT ST_NewLinkHeal('net', 1, 'to');
-1 # rows (not including the header row)
-1 # columns
-ST_NewLinkHeal('net', 1, 'to')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newlinkheal13.testcase b/test/sql_stmt_lwgeom_22_tests/newlinkheal13.testcase
deleted file mode 100644
index a666582..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newlinkheal13.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewLinkHeal - BLOB Link #2
-:memory: #use in-memory database
-SELECT ST_NewLinkHeal('net', 1, zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-ST_NewLinkHeal('net', 1, zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newlinkheal2.testcase b/test/sql_stmt_lwgeom_22_tests/newlinkheal2.testcase
deleted file mode 100644
index 480baa9..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newlinkheal2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewLinkHeal - Int Network
-:memory: #use in-memory database
-SELECT ST_NewLinkHeal(1, 1, 2);
-1 # rows (not including the header row)
-1 # columns
-ST_NewLinkHeal(1, 1, 2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newlinkheal3.testcase b/test/sql_stmt_lwgeom_22_tests/newlinkheal3.testcase
deleted file mode 100644
index aba6ff0..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newlinkheal3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewLinkHeal - Double Network
-:memory: #use in-memory database
-SELECT ST_NewLinkHeal(1.2, 1, 2);
-1 # rows (not including the header row)
-1 # columns
-ST_NewLinkHeal(1.2, 1, 2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newlinkheal4.testcase b/test/sql_stmt_lwgeom_22_tests/newlinkheal4.testcase
deleted file mode 100644
index aaf77d3..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newlinkheal4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewLinkHeal - BLOB Network
-:memory: #use in-memory database
-SELECT ST_NewLinkHeal(zeroblob(4), 1, 2);
-1 # rows (not including the header row)
-1 # columns
-ST_NewLinkHeal(zeroblob(4), 1, 2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newlinkheal5.testcase b/test/sql_stmt_lwgeom_22_tests/newlinkheal5.testcase
deleted file mode 100644
index 603fffb..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newlinkheal5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewLinkHeal - Text Network
-:memory: #use in-memory database
-SELECT ST_NewLinkHeal('topology', 1, 2);
-1 # rows (not including the header row)
-1 # columns
-ST_NewLinkHeal('topology', 1, 2)
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/newlinkheal6.testcase b/test/sql_stmt_lwgeom_22_tests/newlinkheal6.testcase
deleted file mode 100644
index 01d0f59..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newlinkheal6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewLinkHeal - NULL Link #1
-:memory: #use in-memory database
-SELECT ST_NewLinkHeal('net', NULL, 2);
-1 # rows (not including the header row)
-1 # columns
-ST_NewLinkHeal('net', NULL, 2)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newlinkheal7.testcase b/test/sql_stmt_lwgeom_22_tests/newlinkheal7.testcase
deleted file mode 100644
index 5cd9836..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newlinkheal7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewLinkHeal - Double Link #1
-:memory: #use in-memory database
-SELECT ST_NewLinkHeal('net', 1.3, 2);
-1 # rows (not including the header row)
-1 # columns
-ST_NewLinkHeal('net', 1.3, 2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newlinkheal8.testcase b/test/sql_stmt_lwgeom_22_tests/newlinkheal8.testcase
deleted file mode 100644
index 4ecdadc..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newlinkheal8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewLinkHeal - Text Link #1
-:memory: #use in-memory database
-SELECT ST_NewLinkHeal('net', 'from', 2);
-1 # rows (not including the header row)
-1 # columns
-ST_NewLinkHeal('net', 'from', 2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newlinkheal9.testcase b/test/sql_stmt_lwgeom_22_tests/newlinkheal9.testcase
deleted file mode 100644
index 1db15ab..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newlinkheal9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewLinkHeal - BLOB Link #1
-:memory: #use in-memory database
-SELECT ST_NewLinkHeal('net', zeroblob(4), 2);
-1 # rows (not including the header row)
-1 # columns
-ST_NewLinkHeal('net', zeroblob(4), 2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newloglinksplit1.testcase b/test/sql_stmt_lwgeom_22_tests/newloglinksplit1.testcase
deleted file mode 100644
index 8989063..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newloglinksplit1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewLogLinkSplit - NULL Network
-:memory: #use in-memory database
-SELECT ST_NewLogLinkSplit(NULL, -1);
-1 # rows (not including the header row)
-1 # columns
-ST_NewLogLinkSplit(NULL, -1)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newloglinksplit2.testcase b/test/sql_stmt_lwgeom_22_tests/newloglinksplit2.testcase
deleted file mode 100644
index e37e27a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newloglinksplit2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewLogLinkSplit - Int Network
-:memory: #use in-memory database
-SELECT ST_NewLogLinkSplit(1, -1);
-1 # rows (not including the header row)
-1 # columns
-ST_NewLogLinkSplit(1, -1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newloglinksplit3.testcase b/test/sql_stmt_lwgeom_22_tests/newloglinksplit3.testcase
deleted file mode 100644
index 4c71376..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newloglinksplit3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewLogLinkSplit - Double Network
-:memory: #use in-memory database
-SELECT ST_NewLogLinkSplit(1.5, -1);
-1 # rows (not including the header row)
-1 # columns
-ST_NewLogLinkSplit(1.5, -1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newloglinksplit4.testcase b/test/sql_stmt_lwgeom_22_tests/newloglinksplit4.testcase
deleted file mode 100644
index cc81428..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newloglinksplit4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewLogLinkSplit - Blob Network
-:memory: #use in-memory database
-SELECT ST_NewLogLinkSplit(zeroblob(4), -1);
-1 # rows (not including the header row)
-1 # columns
-ST_NewLogLinkSplit(zeroblob(4), -1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newloglinksplit5.testcase b/test/sql_stmt_lwgeom_22_tests/newloglinksplit5.testcase
deleted file mode 100644
index eee079c..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newloglinksplit5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewLogLinkSplit - Text Network
-:memory: #use in-memory database
-SELECT ST_NewLogLinkSplit('net', -1);
-1 # rows (not including the header row)
-1 # columns
-ST_NewLogLinkSplit('net', -1)
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/newloglinksplit6.testcase b/test/sql_stmt_lwgeom_22_tests/newloglinksplit6.testcase
deleted file mode 100644
index 6f31832..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newloglinksplit6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewLogLinkSplit - Double Link
-:memory: #use in-memory database
-SELECT ST_NewLogLinkSplit('net', 2.0);
-1 # rows (not including the header row)
-1 # columns
-ST_NewLogLinkSplit('net', 2.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newloglinksplit7.testcase b/test/sql_stmt_lwgeom_22_tests/newloglinksplit7.testcase
deleted file mode 100644
index df05330..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newloglinksplit7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewLogLinkSplit - BLOB Link
-:memory: #use in-memory database
-SELECT ST_NewLogLinkSplit('net', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-ST_NewLogLinkSplit('net', zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newloglinksplit8.testcase b/test/sql_stmt_lwgeom_22_tests/newloglinksplit8.testcase
deleted file mode 100644
index 1bf00b0..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newloglinksplit8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewLogLinkSplit - Text Link
-:memory: #use in-memory database
-SELECT ST_NewLogLinkSplit('net', 'node');
-1 # rows (not including the header row)
-1 # columns
-ST_NewLogLinkSplit('net', 'node')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/newloglinksplit9.testcase b/test/sql_stmt_lwgeom_22_tests/newloglinksplit9.testcase
deleted file mode 100644
index 7beedcc..0000000
--- a/test/sql_stmt_lwgeom_22_tests/newloglinksplit9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-NewLogLinkSplit - NULL Link
-:memory: #use in-memory database
-SELECT ST_NewLogLinkSplit('net', NULL);
-1 # rows (not including the header row)
-1 # columns
-ST_NewLogLinkSplit('net', NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/pointsnapseed1.testcase b/test/sql_stmt_lwgeom_22_tests/pointsnapseed1.testcase
deleted file mode 100644
index 507a209..0000000
--- a/test/sql_stmt_lwgeom_22_tests/pointsnapseed1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SnapPointToSeed - NULL Topology
-:memory: #use in-memory database
-SELECT TopoGeo_SnapPointToSeed(MakePoint(1, 2), NULL, 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SnapPointToSeed(MakePoint(1, 2), NULL, 1)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/pointsnapseed10.testcase b/test/sql_stmt_lwgeom_22_tests/pointsnapseed10.testcase
deleted file mode 100644
index eba2400..0000000
--- a/test/sql_stmt_lwgeom_22_tests/pointsnapseed10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SnapPointToSeed - NULL distance
-:memory: #use in-memory database
-SELECT TopoGeo_SnapPointToSeed(MakePoint(1, 2), 'topo', NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SnapPointToSeed(MakePoint(1, 2), 'topo', NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/pointsnapseed11.testcase b/test/sql_stmt_lwgeom_22_tests/pointsnapseed11.testcase
deleted file mode 100644
index bd87270..0000000
--- a/test/sql_stmt_lwgeom_22_tests/pointsnapseed11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SnapPointToSeed - TEXT distance
-:memory: #use in-memory database
-SELECT TopoGeo_SnapPointToSeed(MakePoint(1, 2), 'topo', 'dist');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SnapPointToSeed(MakePoint(1, 2), 'topo', 'dist')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/pointsnapseed12.testcase b/test/sql_stmt_lwgeom_22_tests/pointsnapseed12.testcase
deleted file mode 100644
index 1539d13..0000000
--- a/test/sql_stmt_lwgeom_22_tests/pointsnapseed12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SnapPointToSeed - BLOB distance
-:memory: #use in-memory database
-SELECT TopoGeo_SnapPointToSeed(MakePoint(1, 2), 'topo', zeroblob(5));
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SnapPointToSeed(MakePoint(1, 2), 'topo', zeroblob(5))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/pointsnapseed13.testcase b/test/sql_stmt_lwgeom_22_tests/pointsnapseed13.testcase
deleted file mode 100644
index bca060d..0000000
--- a/test/sql_stmt_lwgeom_22_tests/pointsnapseed13.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SnapPointToSeed - INT distance
-:memory: #use in-memory database
-SELECT TopoGeo_SnapPointToSeed(MakePoint(1, 2), 'topo', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SnapPointToSeed(MakePoint(1, 2), 'topo', 1)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/pointsnapseed14.testcase b/test/sql_stmt_lwgeom_22_tests/pointsnapseed14.testcase
deleted file mode 100644
index 74c3ac9..0000000
--- a/test/sql_stmt_lwgeom_22_tests/pointsnapseed14.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SnapPointToSeed - DOUBLE distance
-:memory: #use in-memory database
-SELECT TopoGeo_SnapPointToSeed(MakePoint(1, 2), 'topo', 1.0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SnapPointToSeed(MakePoint(1, 2), 'topo', 1.0)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/pointsnapseed15.testcase b/test/sql_stmt_lwgeom_22_tests/pointsnapseed15.testcase
deleted file mode 100644
index 23cf1e8..0000000
--- a/test/sql_stmt_lwgeom_22_tests/pointsnapseed15.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SnapPointToSeed - linestring instead of point
-:memory: #use in-memory database
-SELECT TopoGeo_SnapPointToSeed(ST_GeomFromText('LINESTRING(1 1, 2 2)'), 'topo', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SnapPointToSeed(ST_GeomFromText('LINESTRING(1 1, 2 2)'), 'topo', 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/pointsnapseed16.testcase b/test/sql_stmt_lwgeom_22_tests/pointsnapseed16.testcase
deleted file mode 100644
index c9fb959..0000000
--- a/test/sql_stmt_lwgeom_22_tests/pointsnapseed16.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SnapPointToSeed - multipoint instead of point
-:memory: #use in-memory database
-SELECT TopoGeo_SnapPointToSeed(ST_GeomFromText('MULTIPOINT(1 1, 1 2)'), 'topo', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SnapPointToSeed(ST_GeomFromText('MULTIPOINT(1 1, 1 2)'), 'topo', 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/pointsnapseed17.testcase b/test/sql_stmt_lwgeom_22_tests/pointsnapseed17.testcase
deleted file mode 100644
index c0d376c..0000000
--- a/test/sql_stmt_lwgeom_22_tests/pointsnapseed17.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SnapPointToSeed - polygon instead of point
-:memory: #use in-memory database
-SELECT TopoGeo_SnapPointToSeed(ST_GeomFromText('POLYGON((1 1, 1 2, 2 2, 2 1, 1 1))'), 'topo', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SnapPointToSeed(ST_GeomFromText('POLYGON((1 1, 1 2, 2 2, 2 1, 1 1))'), 'topo', 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/pointsnapseed2.testcase b/test/sql_stmt_lwgeom_22_tests/pointsnapseed2.testcase
deleted file mode 100644
index 00f04c9..0000000
--- a/test/sql_stmt_lwgeom_22_tests/pointsnapseed2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SnapPointToSeed - INT Topology
-:memory: #use in-memory database
-SELECT TopoGeo_SnapPointToSeed(MakePoint(1, 2), 1, 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SnapPointToSeed(MakePoint(1, 2), 1, 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/pointsnapseed3.testcase b/test/sql_stmt_lwgeom_22_tests/pointsnapseed3.testcase
deleted file mode 100644
index c3d9f74..0000000
--- a/test/sql_stmt_lwgeom_22_tests/pointsnapseed3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SnapPointToSeed - DOUBLE Topology
-:memory: #use in-memory database
-SELECT TopoGeo_SnapPointToSeed(MakePoint(1, 2), 1.1, 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SnapPointToSeed(MakePoint(1, 2), 1.1, 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/pointsnapseed4.testcase b/test/sql_stmt_lwgeom_22_tests/pointsnapseed4.testcase
deleted file mode 100644
index f410c7f..0000000
--- a/test/sql_stmt_lwgeom_22_tests/pointsnapseed4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SnapPointToSeed - BLOB Topology
-:memory: #use in-memory database
-SELECT TopoGeo_SnapPointToSeed(MakePoint(1, 2), zeroblob(4), 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SnapPointToSeed(MakePoint(1, 2), zeroblob(4), 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/pointsnapseed5.testcase b/test/sql_stmt_lwgeom_22_tests/pointsnapseed5.testcase
deleted file mode 100644
index cd8e949..0000000
--- a/test/sql_stmt_lwgeom_22_tests/pointsnapseed5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SnapPointToSeed - NULL point
-:memory: #use in-memory database
-SELECT TopoGeo_SnapPointToSeed(NULL, 'topo', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SnapPointToSeed(NULL, 'topo', 1)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/pointsnapseed6.testcase b/test/sql_stmt_lwgeom_22_tests/pointsnapseed6.testcase
deleted file mode 100644
index ea3a364..0000000
--- a/test/sql_stmt_lwgeom_22_tests/pointsnapseed6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SnapPointToSeed - INT point
-:memory: #use in-memory database
-SELECT TopoGeo_SnapPointToSeed(1, 'topo', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SnapPointToSeed(1, 'topo', 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/pointsnapseed7.testcase b/test/sql_stmt_lwgeom_22_tests/pointsnapseed7.testcase
deleted file mode 100644
index 5c68795..0000000
--- a/test/sql_stmt_lwgeom_22_tests/pointsnapseed7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SnapPointToSeed - DOUBLE point
-:memory: #use in-memory database
-SELECT TopoGeo_SnapPointToSeed(1.1, 'topo', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SnapPointToSeed(1.1, 'topo', 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/pointsnapseed8.testcase b/test/sql_stmt_lwgeom_22_tests/pointsnapseed8.testcase
deleted file mode 100644
index 8f55f9c..0000000
--- a/test/sql_stmt_lwgeom_22_tests/pointsnapseed8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SnapPointToSeed - TEXT point
-:memory: #use in-memory database
-SELECT TopoGeo_SnapPointToSeed('point', 'topo', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SnapPointToSeed('point', 'topo', 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/pointsnapseed9.testcase b/test/sql_stmt_lwgeom_22_tests/pointsnapseed9.testcase
deleted file mode 100644
index d2dafc1..0000000
--- a/test/sql_stmt_lwgeom_22_tests/pointsnapseed9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SnapPointToSeed - invalid BLOB point
-:memory: #use in-memory database
-SELECT TopoGeo_SnapPointToSeed(zeroblob(100), 'topo', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SnapPointToSeed(zeroblob(100), 'topo', 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remedgemodface1.testcase b/test/sql_stmt_lwgeom_22_tests/remedgemodface1.testcase
deleted file mode 100644
index b3eeac2..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remedgemodface1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemEdgeModFace - NULL Topology
-:memory: #use in-memory database
-SELECT ST_RemEdgeModFace(NULL, -1);
-1 # rows (not including the header row)
-1 # columns
-ST_RemEdgeModFace(NULL, -1)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remedgemodface2.testcase b/test/sql_stmt_lwgeom_22_tests/remedgemodface2.testcase
deleted file mode 100644
index dccb6a3..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remedgemodface2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemEdgeModFace - Int Topology
-:memory: #use in-memory database
-SELECT ST_RemEdgeModFace(1, -1);
-1 # rows (not including the header row)
-1 # columns
-ST_RemEdgeModFace(1, -1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remedgemodface3.testcase b/test/sql_stmt_lwgeom_22_tests/remedgemodface3.testcase
deleted file mode 100644
index a5858c1..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remedgemodface3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemEdgeModFace - Double Topology
-:memory: #use in-memory database
-SELECT ST_RemEdgeModFace(1.5, -1);
-1 # rows (not including the header row)
-1 # columns
-ST_RemEdgeModFace(1.5, -1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remedgemodface4.testcase b/test/sql_stmt_lwgeom_22_tests/remedgemodface4.testcase
deleted file mode 100644
index 9cbf9e3..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remedgemodface4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemEdgeModFace - Blob Topology
-:memory: #use in-memory database
-SELECT ST_RemEdgeModFace(zeroblob(4), -1);
-1 # rows (not including the header row)
-1 # columns
-ST_RemEdgeModFace(zeroblob(4), -1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remedgemodface5.testcase b/test/sql_stmt_lwgeom_22_tests/remedgemodface5.testcase
deleted file mode 100644
index 2556f97..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remedgemodface5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemEdgeModFace - Text Topology
-:memory: #use in-memory database
-SELECT ST_RemEdgeModFace('topology', -1);
-1 # rows (not including the header row)
-1 # columns
-ST_RemEdgeModFace('topology', -1)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/remedgemodface6.testcase b/test/sql_stmt_lwgeom_22_tests/remedgemodface6.testcase
deleted file mode 100644
index 8ab6394..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remedgemodface6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemEdgeModFace - Double Edge
-:memory: #use in-memory database
-SELECT ST_RemEdgeModFace('topology', 2.0);
-1 # rows (not including the header row)
-1 # columns
-ST_RemEdgeModFace('topology', 2.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remedgemodface7.testcase b/test/sql_stmt_lwgeom_22_tests/remedgemodface7.testcase
deleted file mode 100644
index 71d0500..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remedgemodface7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemEdgeModFace - BLOB Edge
-:memory: #use in-memory database
-SELECT ST_RemEdgeModFace('topology', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-ST_RemEdgeModFace('topology', zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remedgemodface8.testcase b/test/sql_stmt_lwgeom_22_tests/remedgemodface8.testcase
deleted file mode 100644
index 04328ce..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remedgemodface8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemEdgeModFace - Text Edge
-:memory: #use in-memory database
-SELECT ST_RemEdgeModFace('topology', 'edge');
-1 # rows (not including the header row)
-1 # columns
-ST_RemEdgeModFace('topology', 'edge')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remedgemodface9.testcase b/test/sql_stmt_lwgeom_22_tests/remedgemodface9.testcase
deleted file mode 100644
index 6390b52..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remedgemodface9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemEdgeModFace - NULL Edge
-:memory: #use in-memory database
-SELECT ST_RemEdgeModFace('topology', NULL);
-1 # rows (not including the header row)
-1 # columns
-ST_RemEdgeModFace('topology', NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remedgenewface1.testcase b/test/sql_stmt_lwgeom_22_tests/remedgenewface1.testcase
deleted file mode 100644
index 17b1300..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remedgenewface1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemEdgeNewFace - NULL Topology
-:memory: #use in-memory database
-SELECT ST_RemEdgeNewFace(NULL, -1);
-1 # rows (not including the header row)
-1 # columns
-ST_RemEdgeNewFace(NULL, -1)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remedgenewface2.testcase b/test/sql_stmt_lwgeom_22_tests/remedgenewface2.testcase
deleted file mode 100644
index a065541..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remedgenewface2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemEdgeNewFace - Int Topology
-:memory: #use in-memory database
-SELECT ST_RemEdgeNewFace(1, -1);
-1 # rows (not including the header row)
-1 # columns
-ST_RemEdgeNewFace(1, -1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remedgenewface3.testcase b/test/sql_stmt_lwgeom_22_tests/remedgenewface3.testcase
deleted file mode 100644
index 767e48a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remedgenewface3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemEdgeNewFace - Double Topology
-:memory: #use in-memory database
-SELECT ST_RemEdgeNewFace(1.5, -1);
-1 # rows (not including the header row)
-1 # columns
-ST_RemEdgeNewFace(1.5, -1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remedgenewface4.testcase b/test/sql_stmt_lwgeom_22_tests/remedgenewface4.testcase
deleted file mode 100644
index 492e936..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remedgenewface4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemEdgeNewFace - Blob Topology
-:memory: #use in-memory database
-SELECT ST_RemEdgeNewFace(zeroblob(4), -1);
-1 # rows (not including the header row)
-1 # columns
-ST_RemEdgeNewFace(zeroblob(4), -1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remedgenewface5.testcase b/test/sql_stmt_lwgeom_22_tests/remedgenewface5.testcase
deleted file mode 100644
index b268527..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remedgenewface5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemEdgeNewFace - Text Topology
-:memory: #use in-memory database
-SELECT ST_RemEdgeNewFace('topology', -1);
-1 # rows (not including the header row)
-1 # columns
-ST_RemEdgeNewFace('topology', -1)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/remedgenewface6.testcase b/test/sql_stmt_lwgeom_22_tests/remedgenewface6.testcase
deleted file mode 100644
index d596e79..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remedgenewface6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemEdgeNewFace - Double Edge
-:memory: #use in-memory database
-SELECT ST_RemEdgeNewFace('topology', 2.0);
-1 # rows (not including the header row)
-1 # columns
-ST_RemEdgeNewFace('topology', 2.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remedgenewface7.testcase b/test/sql_stmt_lwgeom_22_tests/remedgenewface7.testcase
deleted file mode 100644
index 913a44e..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remedgenewface7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemEdgeNewFace - BLOB Edge
-:memory: #use in-memory database
-SELECT ST_RemEdgeNewFace('topology', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-ST_RemEdgeNewFace('topology', zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remedgenewface8.testcase b/test/sql_stmt_lwgeom_22_tests/remedgenewface8.testcase
deleted file mode 100644
index b80b42d..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remedgenewface8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemEdgeNewFace - Text Edge
-:memory: #use in-memory database
-SELECT ST_RemEdgeNewFace('topology', 'edge');
-1 # rows (not including the header row)
-1 # columns
-ST_RemEdgeNewFace('topology', 'edge')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remedgenewface9.testcase b/test/sql_stmt_lwgeom_22_tests/remedgenewface9.testcase
deleted file mode 100644
index a964533..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remedgenewface9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemEdgeNewFace - NULL Edge
-:memory: #use in-memory database
-SELECT ST_RemEdgeNewFace('topology', NULL);
-1 # rows (not including the header row)
-1 # columns
-ST_RemEdgeNewFace('topology', NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remisoedge1.testcase b/test/sql_stmt_lwgeom_22_tests/remisoedge1.testcase
deleted file mode 100644
index ad8da8f..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remisoedge1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemIsoEdge - NULL Topology
-:memory: #use in-memory database
-SELECT ST_RemIsoEdge(NULL, -1);
-1 # rows (not including the header row)
-1 # columns
-ST_RemIsoEdge(NULL, -1)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remisoedge2.testcase b/test/sql_stmt_lwgeom_22_tests/remisoedge2.testcase
deleted file mode 100644
index 82aa5ef..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remisoedge2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemIsoEdge - Int Topology
-:memory: #use in-memory database
-SELECT ST_RemIsoEdge(1, -1);
-1 # rows (not including the header row)
-1 # columns
-ST_RemIsoEdge(1, -1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remisoedge3.testcase b/test/sql_stmt_lwgeom_22_tests/remisoedge3.testcase
deleted file mode 100644
index c0b1ccf..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remisoedge3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemIsoEdge - Double Topology
-:memory: #use in-memory database
-SELECT ST_RemIsoEdge(1.5, -1);
-1 # rows (not including the header row)
-1 # columns
-ST_RemIsoEdge(1.5, -1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remisoedge4.testcase b/test/sql_stmt_lwgeom_22_tests/remisoedge4.testcase
deleted file mode 100644
index ddfd736..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remisoedge4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemIsoEdge - Blob Topology
-:memory: #use in-memory database
-SELECT ST_RemIsoEdge(zeroblob(4), -1);
-1 # rows (not including the header row)
-1 # columns
-ST_RemIsoEdge(zeroblob(4), -1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remisoedge5.testcase b/test/sql_stmt_lwgeom_22_tests/remisoedge5.testcase
deleted file mode 100644
index b8ff5b2..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remisoedge5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemIsoEdge - Text Topology
-:memory: #use in-memory database
-SELECT ST_RemIsoEdge('topology', -1);
-1 # rows (not including the header row)
-1 # columns
-ST_RemIsoEdge('topology', -1)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/remisoedge6.testcase b/test/sql_stmt_lwgeom_22_tests/remisoedge6.testcase
deleted file mode 100644
index 5b658ab..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remisoedge6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemIsoEdge - Double Edge
-:memory: #use in-memory database
-SELECT ST_RemIsoEdge('topology', 2.0);
-1 # rows (not including the header row)
-1 # columns
-ST_RemIsoEdge('topology', 2.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remisoedge7.testcase b/test/sql_stmt_lwgeom_22_tests/remisoedge7.testcase
deleted file mode 100644
index 9820468..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remisoedge7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemIsoNode - BLOB RemIsoEdge
-:memory: #use in-memory database
-SELECT ST_RemIsoNode('topology', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-ST_RemIsoNode('topology', zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remisoedge8.testcase b/test/sql_stmt_lwgeom_22_tests/remisoedge8.testcase
deleted file mode 100644
index 682345a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remisoedge8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemIsoEdge - Text Edge
-:memory: #use in-memory database
-SELECT ST_RemIsoEdge('topology', 'node');
-1 # rows (not including the header row)
-1 # columns
-ST_RemIsoEdge('topology', 'node')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remisoedge9.testcase b/test/sql_stmt_lwgeom_22_tests/remisoedge9.testcase
deleted file mode 100644
index 02b650a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remisoedge9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemIsoEdge - NULL Edge
-:memory: #use in-memory database
-SELECT ST_RemIsoEdge('topology', NULL);
-1 # rows (not including the header row)
-1 # columns
-ST_RemIsoEdge('topology', NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remisonetnode1.testcase b/test/sql_stmt_lwgeom_22_tests/remisonetnode1.testcase
deleted file mode 100644
index 85372d5..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remisonetnode1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemIsoNetNode - NULL Network
-:memory: #use in-memory database
-SELECT ST_RemIsoNetNode(NULL, -1);
-1 # rows (not including the header row)
-1 # columns
-ST_RemIsoNetNode(NULL, -1)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remisonetnode2.testcase b/test/sql_stmt_lwgeom_22_tests/remisonetnode2.testcase
deleted file mode 100644
index 6ede979..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remisonetnode2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemIsoNetNode - Int Network
-:memory: #use in-memory database
-SELECT ST_RemIsoNetNode(1, -1);
-1 # rows (not including the header row)
-1 # columns
-ST_RemIsoNetNode(1, -1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remisonetnode3.testcase b/test/sql_stmt_lwgeom_22_tests/remisonetnode3.testcase
deleted file mode 100644
index 5e97f6e..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remisonetnode3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemIsoNetNode - Double Network
-:memory: #use in-memory database
-SELECT ST_RemIsoNetNode(1.5, -1);
-1 # rows (not including the header row)
-1 # columns
-ST_RemIsoNetNode(1.5, -1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remisonetnode4.testcase b/test/sql_stmt_lwgeom_22_tests/remisonetnode4.testcase
deleted file mode 100644
index 6eeeb9e..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remisonetnode4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemIsoNetNode - Blob Network
-:memory: #use in-memory database
-SELECT ST_RemIsoNetNode(zeroblob(4), -1);
-1 # rows (not including the header row)
-1 # columns
-ST_RemIsoNetNode(zeroblob(4), -1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remisonetnode5.testcase b/test/sql_stmt_lwgeom_22_tests/remisonetnode5.testcase
deleted file mode 100644
index 770504c..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remisonetnode5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemIsoNetNode - Text Network
-:memory: #use in-memory database
-SELECT ST_RemIsoNetNode('net', -1);
-1 # rows (not including the header row)
-1 # columns
-ST_RemIsoNetNode('net', -1)
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/remisonetnode6.testcase b/test/sql_stmt_lwgeom_22_tests/remisonetnode6.testcase
deleted file mode 100644
index f4fed59..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remisonetnode6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemIsoNetNode - Double Node
-:memory: #use in-memory database
-SELECT ST_RemIsoNetNode('net', 2.0);
-1 # rows (not including the header row)
-1 # columns
-ST_RemIsoNetNode('net', 2.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remisonetnode7.testcase b/test/sql_stmt_lwgeom_22_tests/remisonetnode7.testcase
deleted file mode 100644
index af024b5..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remisonetnode7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemIsoNetNode - BLOB Node
-:memory: #use in-memory database
-SELECT ST_RemIsoNetNode('net', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-ST_RemIsoNetNode('net', zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remisonetnode8.testcase b/test/sql_stmt_lwgeom_22_tests/remisonetnode8.testcase
deleted file mode 100644
index a50ce79..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remisonetnode8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemIsoNetNode - Text Node
-:memory: #use in-memory database
-SELECT ST_RemIsoNetNode('net', 'node');
-1 # rows (not including the header row)
-1 # columns
-ST_RemIsoNetNode('net', 'node')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remisonetnode9.testcase b/test/sql_stmt_lwgeom_22_tests/remisonetnode9.testcase
deleted file mode 100644
index cd06989..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remisonetnode9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemIsoNetNode - NULL Node
-:memory: #use in-memory database
-SELECT ST_RemIsoNetNode('net', NULL);
-1 # rows (not including the header row)
-1 # columns
-ST_RemIsoNetNode('net', NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remisonode1.testcase b/test/sql_stmt_lwgeom_22_tests/remisonode1.testcase
deleted file mode 100644
index d20b34d..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remisonode1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemIsoNode - NULL Topology
-:memory: #use in-memory database
-SELECT ST_RemIsoNode(NULL, -1);
-1 # rows (not including the header row)
-1 # columns
-ST_RemIsoNode(NULL, -1)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remisonode2.testcase b/test/sql_stmt_lwgeom_22_tests/remisonode2.testcase
deleted file mode 100644
index 6a4fe5e..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remisonode2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemIsoNode - Int Topology
-:memory: #use in-memory database
-SELECT ST_RemIsoNode(1, -1);
-1 # rows (not including the header row)
-1 # columns
-ST_RemIsoNode(1, -1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remisonode3.testcase b/test/sql_stmt_lwgeom_22_tests/remisonode3.testcase
deleted file mode 100644
index b8ff5c8..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remisonode3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemIsoNode - Double Topology
-:memory: #use in-memory database
-SELECT ST_RemIsoNode(1.5, -1);
-1 # rows (not including the header row)
-1 # columns
-ST_RemIsoNode(1.5, -1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remisonode4.testcase b/test/sql_stmt_lwgeom_22_tests/remisonode4.testcase
deleted file mode 100644
index 76a69f1..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remisonode4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemIsoNode - Blob Topology
-:memory: #use in-memory database
-SELECT ST_RemIsoNode(zeroblob(4), -1);
-1 # rows (not including the header row)
-1 # columns
-ST_RemIsoNode(zeroblob(4), -1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remisonode5.testcase b/test/sql_stmt_lwgeom_22_tests/remisonode5.testcase
deleted file mode 100644
index 80bc722..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remisonode5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemIsoNode - Text Topology
-:memory: #use in-memory database
-SELECT ST_RemIsoNode('topology', -1);
-1 # rows (not including the header row)
-1 # columns
-ST_RemIsoNode('topology', -1)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/remisonode6.testcase b/test/sql_stmt_lwgeom_22_tests/remisonode6.testcase
deleted file mode 100644
index 1c09b86..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remisonode6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemIsoNode - Double Node
-:memory: #use in-memory database
-SELECT ST_RemIsoNode('topology', 2.0);
-1 # rows (not including the header row)
-1 # columns
-ST_RemIsoNode('topology', 2.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remisonode7.testcase b/test/sql_stmt_lwgeom_22_tests/remisonode7.testcase
deleted file mode 100644
index 990d91a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remisonode7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemIsoNode - BLOB Node
-:memory: #use in-memory database
-SELECT ST_RemIsoNode('topology', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-ST_RemIsoNode('topology', zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remisonode8.testcase b/test/sql_stmt_lwgeom_22_tests/remisonode8.testcase
deleted file mode 100644
index baac281..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remisonode8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemIsoNode - Text Node
-:memory: #use in-memory database
-SELECT ST_RemIsoNode('topology', 'node');
-1 # rows (not including the header row)
-1 # columns
-ST_RemIsoNode('topology', 'node')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remisonode9.testcase b/test/sql_stmt_lwgeom_22_tests/remisonode9.testcase
deleted file mode 100644
index 3d2debb..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remisonode9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemIsoNode - NULL Node
-:memory: #use in-memory database
-SELECT ST_RemIsoNode('topology', NULL);
-1 # rows (not including the header row)
-1 # columns
-ST_RemIsoNode('topology', NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remlink1.testcase b/test/sql_stmt_lwgeom_22_tests/remlink1.testcase
deleted file mode 100644
index 41c9c53..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remlink1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemoveLink - NULL Network
-:memory: #use in-memory database
-SELECT ST_RemoveLink(NULL, -1);
-1 # rows (not including the header row)
-1 # columns
-ST_RemoveLink(NULL, -1)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remlink2.testcase b/test/sql_stmt_lwgeom_22_tests/remlink2.testcase
deleted file mode 100644
index 459897d..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remlink2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemoveLink - Int Network
-:memory: #use in-memory database
-SELECT ST_RemoveLink(1, -1);
-1 # rows (not including the header row)
-1 # columns
-ST_RemoveLink(1, -1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remlink3.testcase b/test/sql_stmt_lwgeom_22_tests/remlink3.testcase
deleted file mode 100644
index 363e373..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remlink3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemoveLink - Double Network
-:memory: #use in-memory database
-SELECT ST_RemoveLink(1.5, -1);
-1 # rows (not including the header row)
-1 # columns
-ST_RemoveLink(1.5, -1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remlink4.testcase b/test/sql_stmt_lwgeom_22_tests/remlink4.testcase
deleted file mode 100644
index a741deb..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remlink4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemoveLink - Blob Network
-:memory: #use in-memory database
-SELECT ST_RemoveLink(zeroblob(4), -1);
-1 # rows (not including the header row)
-1 # columns
-ST_RemoveLink(zeroblob(4), -1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remlink5.testcase b/test/sql_stmt_lwgeom_22_tests/remlink5.testcase
deleted file mode 100644
index dcbb9f9..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remlink5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemoveLink - Text Network
-:memory: #use in-memory database
-SELECT ST_RemoveLink('net', -1);
-1 # rows (not including the header row)
-1 # columns
-ST_RemoveLink('net', -1)
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/remlink6.testcase b/test/sql_stmt_lwgeom_22_tests/remlink6.testcase
deleted file mode 100644
index 5dde887..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remlink6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemoveLink - Double Link
-:memory: #use in-memory database
-SELECT ST_RemoveLink('net', 2.0);
-1 # rows (not including the header row)
-1 # columns
-ST_RemoveLink('net', 2.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remlink7.testcase b/test/sql_stmt_lwgeom_22_tests/remlink7.testcase
deleted file mode 100644
index e4bc021..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remlink7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemoveLink - BLOB Link
-:memory: #use in-memory database
-SELECT ST_RemoveLink('net', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-ST_RemoveLink('net', zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remlink8.testcase b/test/sql_stmt_lwgeom_22_tests/remlink8.testcase
deleted file mode 100644
index fc515be..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remlink8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemoveLink - Text Link
-:memory: #use in-memory database
-SELECT ST_RemoveLink('net', 'node');
-1 # rows (not including the header row)
-1 # columns
-ST_RemoveLink('net', 'link')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/remlink9.testcase b/test/sql_stmt_lwgeom_22_tests/remlink9.testcase
deleted file mode 100644
index e3acb93..0000000
--- a/test/sql_stmt_lwgeom_22_tests/remlink9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-RemoveLink - NULL Link
-:memory: #use in-memory database
-SELECT ST_RemoveLink('net', NULL);
-1 # rows (not including the header row)
-1 # columns
-ST_RemoveLink('net', NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/removetopolayer1.testcase b/test/sql_stmt_lwgeom_22_tests/removetopolayer1.testcase
deleted file mode 100644
index 7b9ffc0..0000000
--- a/test/sql_stmt_lwgeom_22_tests/removetopolayer1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_RemoveTopoLayer - NULL Topology
-:memory: #use in-memory database
-SELECT TopoGeo_RemoveTopoLayer(NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_RemoveTopoLayer(NULL, 'out')
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/removetopolayer2.testcase b/test/sql_stmt_lwgeom_22_tests/removetopolayer2.testcase
deleted file mode 100644
index a2e83c7..0000000
--- a/test/sql_stmt_lwgeom_22_tests/removetopolayer2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_RemoveTopoLayer - Int Topology
-:memory: #use in-memory database
-SELECT TopoGeo_RemoveTopoLayer(1, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_RemoveTopoLayer(1, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/removetopolayer3.testcase b/test/sql_stmt_lwgeom_22_tests/removetopolayer3.testcase
deleted file mode 100644
index 708234f..0000000
--- a/test/sql_stmt_lwgeom_22_tests/removetopolayer3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_RemoveTopoLayer - Double Topology
-:memory: #use in-memory database
-SELECT TopoGeo_RemoveTopoLayer(1.5, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_RemoveTopoLayer(1.5, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/removetopolayer4.testcase b/test/sql_stmt_lwgeom_22_tests/removetopolayer4.testcase
deleted file mode 100644
index 1cad3b3..0000000
--- a/test/sql_stmt_lwgeom_22_tests/removetopolayer4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_RemoveTopoLayer - Blob Topology
-:memory: #use in-memory database
-SELECT TopoGeo_RemoveTopoLayer(zeroblob(4), 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_RemoveTopoLayer(zeroblob(4), 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/removetopolayer5.testcase b/test/sql_stmt_lwgeom_22_tests/removetopolayer5.testcase
deleted file mode 100644
index 4aa0521..0000000
--- a/test/sql_stmt_lwgeom_22_tests/removetopolayer5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_RemoveTopoLayer - Text Topology
-:memory: #use in-memory database
-SELECT TopoGeo_RemoveTopoLayer('topology', NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_RemoveTopoLayer('topology', NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/removetopolayer6.testcase b/test/sql_stmt_lwgeom_22_tests/removetopolayer6.testcase
deleted file mode 100644
index 5b2fd17..0000000
--- a/test/sql_stmt_lwgeom_22_tests/removetopolayer6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_RemoveTopoLayer - TEXT TopoLayer
-:memory: #use in-memory database
-SELECT TopoGeo_RemoveTopoLayer('topology', 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_RemoveTopoLayer('topology', 'out')
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/removetopolayer7.testcase b/test/sql_stmt_lwgeom_22_tests/removetopolayer7.testcase
deleted file mode 100644
index b8d42a5..0000000
--- a/test/sql_stmt_lwgeom_22_tests/removetopolayer7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_RemoveTopoLayer - INT TopoLayer
-:memory: #use in-memory database
-SELECT TopoGeo_RemoveTopoLayer('topology', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_RemoveTopoLayer('topology', 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/removetopolayer8.testcase b/test/sql_stmt_lwgeom_22_tests/removetopolayer8.testcase
deleted file mode 100644
index cd7ac72..0000000
--- a/test/sql_stmt_lwgeom_22_tests/removetopolayer8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_RemoveTopoLayer - Double TopoLayer
-:memory: #use in-memory database
-SELECT TopoGeo_RemoveTopoLayer('topology', 1.2);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_RemoveTopoLayer('topology', 1.2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/removetopolayer9.testcase b/test/sql_stmt_lwgeom_22_tests/removetopolayer9.testcase
deleted file mode 100644
index 6ba9aa3..0000000
--- a/test/sql_stmt_lwgeom_22_tests/removetopolayer9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_RemoveTopoLayer - BLOB TopoLayer
-:memory: #use in-memory database
-SELECT TopoGeo_RemoveTopoLayer('topology', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_RemoveTopoLayer('topology', zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/spatnetfromgeom1.testcase b/test/sql_stmt_lwgeom_22_tests/spatnetfromgeom1.testcase
deleted file mode 100644
index 7ed93db..0000000
--- a/test/sql_stmt_lwgeom_22_tests/spatnetfromgeom1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_SpatNetFromGeom - NULL Network
-:memory: #use in-memory database
-SELECT ST_SpatNetFromGeom(NULL, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_SpatNetFromGeom(NULL, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/spatnetfromgeom10.testcase b/test/sql_stmt_lwgeom_22_tests/spatnetfromgeom10.testcase
deleted file mode 100644
index de21dcf..0000000
--- a/test/sql_stmt_lwgeom_22_tests/spatnetfromgeom10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_SpatNetFromGeom - non existing Network
-:memory: #use in-memory database
-SELECT ST_SpatNetFromGeom('network', MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_SpatNetFromGeom('network', MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/spatnetfromgeom2.testcase b/test/sql_stmt_lwgeom_22_tests/spatnetfromgeom2.testcase
deleted file mode 100644
index 5aa2b53..0000000
--- a/test/sql_stmt_lwgeom_22_tests/spatnetfromgeom2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_SpatNetFromGeom - Int Network
-:memory: #use in-memory database
-SELECT ST_SpatNetFromGeom(1, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_SpatNetFromGeom(1, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/spatnetfromgeom3.testcase b/test/sql_stmt_lwgeom_22_tests/spatnetfromgeom3.testcase
deleted file mode 100644
index c0cf1f7..0000000
--- a/test/sql_stmt_lwgeom_22_tests/spatnetfromgeom3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_SpatNetFromGeom - Double Network
-:memory: #use in-memory database
-SELECT ST_SpatNetFromGeom(1.5, MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_SpatNetFromGeom(1.5, MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/spatnetfromgeom4.testcase b/test/sql_stmt_lwgeom_22_tests/spatnetfromgeom4.testcase
deleted file mode 100644
index 26be2d3..0000000
--- a/test/sql_stmt_lwgeom_22_tests/spatnetfromgeom4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_SpatNetFromGeom - BLOB Network
-:memory: #use in-memory database
-SELECT ST_SpatNetFromGeom(zeroblob(4), MakePoint(1, 2, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_SpatNetFromGeom(zeroblob(4), MakePoint(1, 2, 4326))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/spatnetfromgeom5.testcase b/test/sql_stmt_lwgeom_22_tests/spatnetfromgeom5.testcase
deleted file mode 100644
index 3479c68..0000000
--- a/test/sql_stmt_lwgeom_22_tests/spatnetfromgeom5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_SpatNetFromGeom - NULL GeomCollection
-:memory: #use in-memory database
-SELECT ST_SpatNetFromGeom('network', NULL);
-1 # rows (not including the header row)
-1 # columns
-ST_SpatNetFromGeom('network', NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/spatnetfromgeom6.testcase b/test/sql_stmt_lwgeom_22_tests/spatnetfromgeom6.testcase
deleted file mode 100644
index fdbba22..0000000
--- a/test/sql_stmt_lwgeom_22_tests/spatnetfromgeom6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_SpatNetFromGeom - Int GeomCollection
-:memory: #use in-memory database
-SELECT ST_SpatNetFromGeom('network', 1);
-1 # rows (not including the header row)
-1 # columns
-ST_SpatNetFromGeom('network', 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/spatnetfromgeom7.testcase b/test/sql_stmt_lwgeom_22_tests/spatnetfromgeom7.testcase
deleted file mode 100644
index 8c07947..0000000
--- a/test/sql_stmt_lwgeom_22_tests/spatnetfromgeom7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_SpatNetFromGeom - Double GeomCollection
-:memory: #use in-memory database
-SELECT ST_SpatNetFromGeom('network', 1.4);
-1 # rows (not including the header row)
-1 # columns
-ST_SpatNetFromGeom('network', 1.4)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/spatnetfromgeom8.testcase b/test/sql_stmt_lwgeom_22_tests/spatnetfromgeom8.testcase
deleted file mode 100644
index b6071eb..0000000
--- a/test/sql_stmt_lwgeom_22_tests/spatnetfromgeom8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_SpatNetFromGeom - Text GeomCollection
-:memory: #use in-memory database
-SELECT ST_SpatNetFromGeom('network', 'geom');
-1 # rows (not including the header row)
-1 # columns
-ST_SpatNetFromGeom('network', 'geom')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/spatnetfromgeom9.testcase b/test/sql_stmt_lwgeom_22_tests/spatnetfromgeom9.testcase
deleted file mode 100644
index 5c3aa37..0000000
--- a/test/sql_stmt_lwgeom_22_tests/spatnetfromgeom9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_SpatNetFromGeom - Invalid BLOB GeomCollection
-:memory: #use in-memory database
-SELECT ST_SpatNetFromGeom('network', zeroblob(100));
-1 # rows (not including the header row)
-1 # columns
-ST_SpatNetFromGeom('network', zeroblob(100))
-SQL/MM Spatial exception - not a Geometry.
diff --git a/test/sql_stmt_lwgeom_22_tests/spatnetfromtgeo1.testcase b/test/sql_stmt_lwgeom_22_tests/spatnetfromtgeo1.testcase
deleted file mode 100644
index 82b07f7..0000000
--- a/test/sql_stmt_lwgeom_22_tests/spatnetfromtgeo1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_SpatNetFromTGeo - NULL Network
-:memory: #use in-memory database
-SELECT ST_SpatNetFromTGeo(NULL, 'topology');
-1 # rows (not including the header row)
-1 # columns
-ST_SpatNetFromTGeo(NULL, 'topology')
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/spatnetfromtgeo2.testcase b/test/sql_stmt_lwgeom_22_tests/spatnetfromtgeo2.testcase
deleted file mode 100644
index 722d125..0000000
--- a/test/sql_stmt_lwgeom_22_tests/spatnetfromtgeo2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_SpatNetFromTGeo - Int Network
-:memory: #use in-memory database
-SELECT ST_SpatNetFromTGeo(1, 'topology');
-1 # rows (not including the header row)
-1 # columns
-ST_SpatNetFromTGeo(1, 'topology')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/spatnetfromtgeo3.testcase b/test/sql_stmt_lwgeom_22_tests/spatnetfromtgeo3.testcase
deleted file mode 100644
index 65494d0..0000000
--- a/test/sql_stmt_lwgeom_22_tests/spatnetfromtgeo3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_SpatNetFromTGeo - Double Network
-:memory: #use in-memory database
-SELECT ST_SpatNetFromTGeo(1.5, 'topology');
-1 # rows (not including the header row)
-1 # columns
-ST_SpatNetFromTGeo(1.5, 'topology')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/spatnetfromtgeo4.testcase b/test/sql_stmt_lwgeom_22_tests/spatnetfromtgeo4.testcase
deleted file mode 100644
index 00d4f65..0000000
--- a/test/sql_stmt_lwgeom_22_tests/spatnetfromtgeo4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_SpatNetFromTGeo - Blob Network
-:memory: #use in-memory database
-SELECT ST_SpatNetFromTGeo(zeroblob(4), 'topology');
-1 # rows (not including the header row)
-1 # columns
-ST_SpatNetFromTGeo(zeroblob(4), 'topology')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/spatnetfromtgeo5.testcase b/test/sql_stmt_lwgeom_22_tests/spatnetfromtgeo5.testcase
deleted file mode 100644
index f14f158..0000000
--- a/test/sql_stmt_lwgeom_22_tests/spatnetfromtgeo5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_SpatNetFromTGeo - Text Network
-:memory: #use in-memory database
-SELECT ST_SpatNetFromTGeo('network', 'topology');
-1 # rows (not including the header row)
-1 # columns
-ST_SpatNetFromTGeo('network', 'topology')
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/spatnetfromtgeo6.testcase b/test/sql_stmt_lwgeom_22_tests/spatnetfromtgeo6.testcase
deleted file mode 100644
index 739504f..0000000
--- a/test/sql_stmt_lwgeom_22_tests/spatnetfromtgeo6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_SpatNetFromTGeo - NULL Topology
-:memory: #use in-memory database
-SELECT ST_SpatNetFromTGeo('network', NULL);
-1 # rows (not including the header row)
-1 # columns
-ST_SpatNetFromTGeo('network', NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/spatnetfromtgeo7.testcase b/test/sql_stmt_lwgeom_22_tests/spatnetfromtgeo7.testcase
deleted file mode 100644
index 100f6df..0000000
--- a/test/sql_stmt_lwgeom_22_tests/spatnetfromtgeo7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_SpatNetFromTGeo - INT Topology
-:memory: #use in-memory database
-SELECT ST_SpatNetFromTGeo('network', 1);
-1 # rows (not including the header row)
-1 # columns
-ST_SpatNetFromTGeo('network', 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/spatnetfromtgeo8.testcase b/test/sql_stmt_lwgeom_22_tests/spatnetfromtgeo8.testcase
deleted file mode 100644
index 1fec323..0000000
--- a/test/sql_stmt_lwgeom_22_tests/spatnetfromtgeo8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_SpatNetFromTGeo - Double Topology
-:memory: #use in-memory database
-SELECT ST_SpatNetFromTGeo('network', 1.2);
-1 # rows (not including the header row)
-1 # columns
-ST_SpatNetFromTGeo('network', 1.2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/spatnetfromtgeo9.testcase b/test/sql_stmt_lwgeom_22_tests/spatnetfromtgeo9.testcase
deleted file mode 100644
index 44aaaa3..0000000
--- a/test/sql_stmt_lwgeom_22_tests/spatnetfromtgeo9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_SpatNetFromTGeo - BLOB Topology
-:memory: #use in-memory database
-SELECT ST_SpatNetFromTGeo('network', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-ST_SpatNetFromTGeo('network', zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topoexception1.testcase b/test/sql_stmt_lwgeom_22_tests/topoexception1.testcase
deleted file mode 100644
index a2976e5..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topoexception1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetLastTopologyException - NULL Topology
-:memory: #use in-memory database
-SELECT GetLastTopologyException(NULL);
-1 # rows (not including the header row)
-1 # columns
-GetLastTopologyException(NULL)
-(NULL)
diff --git a/test/sql_stmt_lwgeom_22_tests/topoexception2.testcase b/test/sql_stmt_lwgeom_22_tests/topoexception2.testcase
deleted file mode 100644
index e69c4df..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topoexception2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-GetLastTopologyException - Undefined Topology
-:memory: #use in-memory database
-SELECT GetLastTopologyException('topo');
-1 # rows (not including the header row)
-1 # columns
-GetLastTopologyException('topo')
-(NULL)
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoaddline1.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoaddline1.testcase
deleted file mode 100644
index b6da0cf..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoaddline1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_AddLineString - NULL Topology
-:memory: #use in-memory database
-SELECT TopoGeo_AddLineString(NULL, GeomFromText('LINESTRING(0 0, 1 1)', 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_AddLineString(NULL, GeomFromText('LINESTRING(0 0, 1 1)', 4326), 0)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoaddline10.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoaddline10.testcase
deleted file mode 100644
index b9e1915..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoaddline10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_AddLineString - Double Geometry
-:memory: #use in-memory database
-SELECT TopoGeo_AddLineString('topology', 1.1, 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_AddLineString('topology', 1.1, 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoaddline11.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoaddline11.testcase
deleted file mode 100644
index 67eb924..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoaddline11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_AddLineString - NULL Geometry
-:memory: #use in-memory database
-SELECT TopoGeo_AddLineString('topology', NULL, 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_AddLineString('topology', NULL, 0)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoaddline12.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoaddline12.testcase
deleted file mode 100644
index 934408c..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoaddline12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_AddLineString - Text Geometry
-:memory: #use in-memory database
-SELECT TopoGeo_AddLineString('topology', 'geom', 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_AddLineString('topology', 'geom', 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoaddline13.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoaddline13.testcase
deleted file mode 100644
index e83dd61..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoaddline13.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_AddLineString - Invalid BLOB Geometry
-:memory: #use in-memory database
-SELECT TopoGeo_AddLineString('topology', zeroblob(4), 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_AddLineString('topology', zeroblob(4), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoaddline14.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoaddline14.testcase
deleted file mode 100644
index bc81b54..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoaddline14.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_AddLineString - Point Geometry
-:memory: #use in-memory database
-SELECT TopoGeo_AddLineString('topology', MakePoint(0, 1, 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_AddLineString('topology', MakePoint(0, 1, 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoaddline15.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoaddline15.testcase
deleted file mode 100644
index ea910a1..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoaddline15.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_AddLineString - Polygon Geometry
-:memory: #use in-memory database
-SELECT TopoGeo_AddLineString('topology', GeomFromText('POLYGON((0 0, 0 1, 1 1, 1 0, 0 0))', 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_AddLineString('topology', GeomFromText('POLYGON((0 0, 0 1, 1 1, 1 0, 0 0))', 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoaddline16.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoaddline16.testcase
deleted file mode 100644
index ca97b7e..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoaddline16.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_AddLineString - MULTILINESTRING Geometry
-:memory: #use in-memory database
-SELECT TopoGeo_AddLineString('topology', GeomFromText('MULTILINESTRING((0 0, 1 1), (2 2, 3 3))', 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_AddLineString('topology', GeomFromText('MULTILINESTRING((0 0, 1 1), (2 2, 3 3))', 4326), 0)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoaddline17.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoaddline17.testcase
deleted file mode 100644
index bb4b904..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoaddline17.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_AddLineString - NULL Tolerance
-:memory: #use in-memory database
-SELECT TopoGeo_AddLineString('topology', MakePoint(1, 2, 4326), NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_AddLineString('topology', MakePoint(1, 2, 4326), NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoaddline2.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoaddline2.testcase
deleted file mode 100644
index 4526320..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoaddline2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_AddLineString - Int Topology
-:memory: #use in-memory database
-SELECT TopoGeo_AddLineString(1, GeomFromText('LINESTRING(0 0, 1 1)', 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_AddLineString(1, GeomFromText('LINESTRING(0 0, 1 1)', 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoaddline3.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoaddline3.testcase
deleted file mode 100644
index b4ebf7b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoaddline3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_AddLineString - Double Topology
-:memory: #use in-memory database
-SELECT TopoGeo_AddLineString(1.5, GeomFromText('LINESTRING(0 0, 1 1)', 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_AddLineString(1.5, GeomFromText('LINESTRING(0 0, 1 1)', 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoaddline4.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoaddline4.testcase
deleted file mode 100644
index a86106a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoaddline4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_AddLineString - Blob Topology
-:memory: #use in-memory database
-SELECT TopoGeo_AddLineString(zeroblob(4), GeomFromText('LINESTRING(0 0, 1 1)', 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_AddLineString(zeroblob(4), GeomFromText('LINESTRING(0 0, 1 1)', 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoaddline5.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoaddline5.testcase
deleted file mode 100644
index 4cd0506..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoaddline5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_AddLineString - Text Topology
-:memory: #use in-memory database
-SELECT TopoGeo_AddLineString('topology', GeomFromText('LINESTRING(0 0, 1 1)', 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_AddLineString('topology', GeomFromText('LINESTRING(0 0, 1 1)', 4326), 0)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoaddline6.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoaddline6.testcase
deleted file mode 100644
index 7cf1dc9..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoaddline6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_AddLineString - Double Tolerance
-:memory: #use in-memory database
-SELECT TopoGeo_AddLineString('topology', GeomFromText('LINESTRING(0 0, 1 1)', 4326), 0.0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_AddLineString('topology', GeomFromText('LINESTRING(0 0, 1 1)', 4326), 0.0)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoaddline7.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoaddline7.testcase
deleted file mode 100644
index 2a66724..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoaddline7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_AddLineString - BLOB Tolerance
-:memory: #use in-memory database
-SELECT TopoGeo_AddLineString('topology', GeomFromText('LINESTRING(0 0, 1 1)', 4326), zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_AddLineString('topology', GeomFromText('LINESTRING(0 0, 1 1)', 4326), zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoaddline8.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoaddline8.testcase
deleted file mode 100644
index 8fbc554..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoaddline8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_AddLineString - Text Tolerance
-:memory: #use in-memory database
-SELECT TopoGeo_AddLineString('topology', GeomFromText('LINESTRING(0 0, 1 1)', 4326), 'tol');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_AddLineString('topology', GeomFromText('LINESTRING(0 0, 1 1)', 4326), 'tol')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoaddline9.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoaddline9.testcase
deleted file mode 100644
index e5b4568..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoaddline9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_AddLineString - Int Geometry
-:memory: #use in-memory database
-SELECT TopoGeo_AddLineString('topology', -1, 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_AddLineString('topology', -1, 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint1.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint1.testcase
deleted file mode 100644
index d5bcaa3..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_AddPoint - NULL Topology
-:memory: #use in-memory database
-SELECT TopoGeo_AddPoint(NULL, MakePoint(1, 2, 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_AddPoint(NULL, MakePoint(1, 2, 4326), 0)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint10.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint10.testcase
deleted file mode 100644
index 6d50a0c..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_AddPoint - Double Geometry
-:memory: #use in-memory database
-SELECT TopoGeo_AddPoint('topology', 1.1, 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_AddPoint('topology', 1.1, 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint11.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint11.testcase
deleted file mode 100644
index 8e016e2..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_AddPoint - NULL Geometry
-:memory: #use in-memory database
-SELECT TopoGeo_AddPoint('topology', NULL, 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_AddPoint('topology', NULL, 0)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint12.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint12.testcase
deleted file mode 100644
index 1d821fb..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_AddPoint - Text Geometry
-:memory: #use in-memory database
-SELECT TopoGeo_AddPoint('topology', 'geom', 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_AddPoint('topology', 'geom', 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint13.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint13.testcase
deleted file mode 100644
index 08f2709..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint13.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_AddPoint - Invalid BLOB Geometry
-:memory: #use in-memory database
-SELECT TopoGeo_AddPoint('topology', zeroblob(4), 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_AddPoint('topology', zeroblob(4), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint14.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint14.testcase
deleted file mode 100644
index 4e19c85..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint14.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_AddPoint - Linestring Geometry
-:memory: #use in-memory database
-SELECT TopoGeo_AddPoint('topology', GeomFromText('LINESTRING(0 0, 1 1)', 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_AddPoint('topology', GeomFromText('LINESTRING(0 0, 1 1)', 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint15.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint15.testcase
deleted file mode 100644
index 900cee5..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint15.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_AddPoint - Polygon Geometry
-:memory: #use in-memory database
-SELECT TopoGeo_AddPoint('topology', GeomFromText('POLYGON((0 0, 0 1, 1 1, 1 0, 0 0))', 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_AddPoint('topology', GeomFromText('POLYGON((0 0, 0 1, 1 1, 1 0, 0 0))', 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint16.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint16.testcase
deleted file mode 100644
index 26c064b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint16.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_AddPoint - MULTIPOINT Geometry
-:memory: #use in-memory database
-SELECT TopoGeo_AddPoint('topology', GeomFromText('MULTIPOINT(0 0, 1 1)', 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_AddPoint('topology', GeomFromText('MULTIPOINT(0 0, 1 1)', 4326), 0)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint17.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint17.testcase
deleted file mode 100644
index c80d7e1..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint17.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_AddPoint - NULL Tolerance
-:memory: #use in-memory database
-SELECT TopoGeo_AddPoint('topology', MakePoint(1, 2, 4326), NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_AddPoint('topology', MakePoint(1, 2, 4326), NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint2.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint2.testcase
deleted file mode 100644
index f79b317..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_AddPoint - Int Topology
-:memory: #use in-memory database
-SELECT TopoGeo_AddPoint(1, MakePoint(1, 2, 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_AddPoint(1, MakePoint(1, 2, 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint3.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint3.testcase
deleted file mode 100644
index 758497f..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_AddPoint - Double Topology
-:memory: #use in-memory database
-SELECT TopoGeo_AddPoint(1.5, MakePoint(1, 2, 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_AddPoint(1.5, MakePoint(1, 2, 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint4.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint4.testcase
deleted file mode 100644
index 3fdfc99..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_AddPoint - Blob Topology
-:memory: #use in-memory database
-SELECT TopoGeo_AddPoint(zeroblob(4), MakePoint(1, 2, 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_AddPoint(zeroblob(4),MakePoint(1, 2, 4326), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint5.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint5.testcase
deleted file mode 100644
index ca42c35..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_AddPoint - Text Topology
-:memory: #use in-memory database
-SELECT TopoGeo_AddPoint('topology', MakePoint(1, 2, 4326), 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_AddPoint('topology', MakePoint(1, 2, 4326), 0)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint6.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint6.testcase
deleted file mode 100644
index a1a3e27..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_AddPoint - Double Tolerance
-:memory: #use in-memory database
-SELECT TopoGeo_AddPoint('topology', MakePoint(1, 2, 4326), 0.0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_AddPoint('topology', MakePoint(1, 2, 4326), 0.0)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint7.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint7.testcase
deleted file mode 100644
index 1433bd5..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_AddPoint - BLOB Tolerance
-:memory: #use in-memory database
-SELECT TopoGeo_AddPoint('topology', MakePoint(1, 2, 4326), zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_AddPoint('topology', MakePoint(1, 2, 4326), zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint8.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint8.testcase
deleted file mode 100644
index 313e59a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_AddPoint - Text Tolerance
-:memory: #use in-memory database
-SELECT TopoGeo_AddPoint('topology', MakePoint(1, 2, 4326), 'tol');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_AddPoint('topology', MakePoint(1, 2, 4326), 'tol')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint9.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint9.testcase
deleted file mode 100644
index 44c659b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoaddpoint9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_AddPoint - Int Geometry
-:memory: #use in-memory database
-SELECT TopoGeo_AddPoint('topology', -1, 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_AddPoint('topology', -1, 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoclone1.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoclone1.testcase
deleted file mode 100644
index f498e9d..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoclone1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_Clone - NULL Topology (origin)
-:memory: #use in-memory database
-SELECT TopoGeo_Clone('a', NULL, 'destination');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_Clone('a', NULL, 'destination')
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoclone10.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoclone10.testcase
deleted file mode 100644
index 8c1983f..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoclone10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_Clone - Double db-prefix
-:memory: #use in-memory database
-SELECT TopoGeo_Clone(1.5, 'origin', 'destination');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_Clone(NULL, 'origin', 'destination')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoclone11.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoclone11.testcase
deleted file mode 100644
index 1371a6d..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoclone11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_Clone - BLOB db-prefix
-:memory: #use in-memory database
-SELECT TopoGeo_Clone(zeroblob(4), 'origin', 'destination');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_Clone(zeroblob(4), 'origin', 'destination')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoclone12.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoclone12.testcase
deleted file mode 100644
index d3d0060..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoclone12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_Clone - Integer db-prefix
-:memory: #use in-memory database
-SELECT TopoGeo_Clone(1, 'origin', 'destination');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_Clone(1, 'origin', 'destination')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoclone2.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoclone2.testcase
deleted file mode 100644
index 9375da1..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoclone2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_Clone - Int Topology (origin)
-:memory: #use in-memory database
-SELECT TopoGeo_Clone('a', 1, 'destination');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_Clone('a', 1, 'destination')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoclone3.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoclone3.testcase
deleted file mode 100644
index 034ba4d..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoclone3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_Clone - Double Topology (origin)
-:memory: #use in-memory database
-SELECT TopoGeo_Clone(NULL, 1.5, 'destination');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_Clone(NULL, 1.5, 'destination')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoclone4.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoclone4.testcase
deleted file mode 100644
index 1aca175..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoclone4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_Clone - Blob Topology (origin)
-:memory: #use in-memory database
-SELECT TopoGeo_Clone(NULL, zeroblob(4), 'destination');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_Clone(NULL, zeroblob(4), 'destination')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoclone5.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoclone5.testcase
deleted file mode 100644
index 43f3ff2..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoclone5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_Clone - Text Topology (origin)
-:memory: #use in-memory database
-SELECT TopoGeo_Clone(NULL, 'topology', 'destination');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_Clone(NULL, 'topology', 'destination')
-SQL/MM Spatial exception - invalid topology name (origin).
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoclone6.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoclone6.testcase
deleted file mode 100644
index 04530ad..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoclone6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_Clone - NULL Topology (destination)
-:memory: #use in-memory database
-SELECT TopoGeo_Clone(NULL, 'origin', NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_Clone(NULL, 'origin', NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoclone7.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoclone7.testcase
deleted file mode 100644
index e5125d0..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoclone7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_Clone - INT Topology (destination)
-:memory: #use in-memory database
-SELECT TopoGeo_Clone(NULL, 'origin', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_Clone(NULL, 'origin', 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoclone8.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoclone8.testcase
deleted file mode 100644
index 309920b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoclone8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_Clone - Double Topology (destination)
-:memory: #use in-memory database
-SELECT TopoGeo_Clone(NULL, 'origin', 1.2);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_Clone(NULL, 'origin', 1.2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoclone9.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoclone9.testcase
deleted file mode 100644
index b791857..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoclone9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_Clone - BLOB Topology (destination)
-:memory: #use in-memory database
-SELECT TopoGeo_Clone(NULL, 'origin', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_Clone(NULL, 'origin', zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext1.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext1.testcase
deleted file mode 100644
index 04d3919..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - NULL Topology
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt(NULL, NULL, 'table', NULL, 0, 'dustbin', 'dustbinview');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt(NULL, NULL, 'table', NULL, 0, 'dustbin', 'dustbinview')
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext10.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext10.testcase
deleted file mode 100644
index 14805d9..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - NULL table
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt('topology', NULL, NULL, NULL, 0, 'dustbin', 'dustbinview');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt('topology', NULL, NULL, NULL, 0, 'dustbin', 'dustbinview')
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext11.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext11.testcase
deleted file mode 100644
index 508cdd2..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - INT table
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt('topology', NULL, 1, NULL, 0, 'dustbin', 'dustbinview');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt('topology', NULL, 1, NULL, 0, 'dustbin', 'dustbinview')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext12.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext12.testcase
deleted file mode 100644
index c036c67..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - Double table
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt('topology', NULL, 1.2, NULL, 0, 'dustbin', 'dustbinview');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt('topology', NULL, 1.2, NULL, 0, 'dustbin', 'dustbinview')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext13.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext13.testcase
deleted file mode 100644
index d71c6f3..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext13.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - BLOB table
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt('topology', NULL, zeroblob(4), NULL, 0, 'dustbin', 'dustbinview');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt('topology', NULL, zeroblob(4), NULL, 0, 'dustbin', 'dustbinview')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext14.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext14.testcase
deleted file mode 100644
index f95af26..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext14.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - Text Column
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt('topology', NULL, 'table', 'column', 0, 'dustbin', 'dustbinview');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt('topology', NULL, 'table', 'column', 0, 'dustbin', 'dustbinview')
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext15.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext15.testcase
deleted file mode 100644
index 06dd6c9..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext15.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - Int Column
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt('topology', NULL, 'table', 1, 0, 'dustbin', 'dustbinview');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt('topology', NULL, 'table', 1, 0, 'dustbin', 'dustbinview')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext16.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext16.testcase
deleted file mode 100644
index a16c09b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext16.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - Double Column
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt('topology', NULL, 'table', 1.2, 0, 'dustbin', 'dustbinview');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt('topology', NULL, 'table', 1.2, 0, 'dustbin', 'dustbinview')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext17.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext17.testcase
deleted file mode 100644
index 79f383a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext17.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - BLOB Column
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt('topology', NULL, 'table', zeroblob(4), 0, 'dustbin', 'dustbinview');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt('topology', NULL, 'table', zeroblob(4), 0, 'dustbin', 'dustbinview')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext18.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext18.testcase
deleted file mode 100644
index 0283e4b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext18.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - NULL tolerance
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, NULL, 'dustbin', 'dustbinview');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, NULL, 'dustbin', 'dustbinview')
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext19.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext19.testcase
deleted file mode 100644
index bcc8d1a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext19.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - Text tolerance
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 'zero', 'dustbin', 'dustbinview');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 'zero', 'dustbin', 'dustbinview')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext2.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext2.testcase
deleted file mode 100644
index 939e2e5..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - Int Topology
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt(1, NULL, 'table', NULL, 0, 'dustbin', 'dustbinview');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt(1, NULL, 'table', NULL, 0, 'dustbin', 'dustbinview')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext20.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext20.testcase
deleted file mode 100644
index 830c9cf..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext20.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - BLOB tolerance
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, zeroblob(4), 'dustbin', 'dustbinview');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, zeroblob(4), 'dustbin', 'dustbinview')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext21.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext21.testcase
deleted file mode 100644
index 82e6984..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext21.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - Double tolerance
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0.001, 'dustbin', 'dustbinview');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0.001, 'dustbin', 'dustbinview')
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext22.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext22.testcase
deleted file mode 100644
index a85143d..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext22.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - NULL line-max-points
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0, 'dustbin', 'dustbinview', NULL, -1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0, 'dustbin', 'dustbinview', NULL, -1)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext23.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext23.testcase
deleted file mode 100644
index 4acb649..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext23.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - Double line-max-points
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0, 'dustbin', 'dustbinview', 1.5, -1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0, 'dustbin', 'dustbinview', 1.5, -1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext24.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext24.testcase
deleted file mode 100644
index 701166c..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext24.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - Text line-max-points
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0, 'dustbin', 'dustbinview', 'abc', -1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0, 'dustbin', 'dustbinview', 'abc', -1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext25.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext25.testcase
deleted file mode 100644
index 3c9841c..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext25.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - BLOB line-max-points
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0, 'dustbin', 'dustbinview', zeroblob(4), -1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0, 'dustbin', 'dustbinview', zeroblob(4), -1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext26.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext26.testcase
deleted file mode 100644
index 4d36cf3..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext26.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - Integer line-max-points / Integer max-length
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0, 'dustbin', 'dustbinview', -1, -1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0, 'dustbin', 'dustbinview', -1, -1)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext27.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext27.testcase
deleted file mode 100644
index c7c668b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext27.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - NULL max-length
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0, 'dustbin', 'dustbinview', -1, NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0, 'dustbin', 'dustbinview', -1, NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext28.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext28.testcase
deleted file mode 100644
index a5b3005..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext28.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - BLOB max-length
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0, 'dustbin', 'dustbinview', -1, zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0, 'dustbin', 'dustbinview', -1, zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext29.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext29.testcase
deleted file mode 100644
index d82f47d..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext29.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - Text max-length
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0, 'dustbin', 'dustbinview', -1, 'abc');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0, 'dustbin', 'dustbinview', -1, 'abc')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext3.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext3.testcase
deleted file mode 100644
index 57fde09..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - Double Topology
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt(1.5, NULL, 'table', NULL, 0, 'dustbin', 'dustbinview');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt(1.5, NULL, 'table', NULL, 0, 'dustbin', 'dustbinview')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext30.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext30.testcase
deleted file mode 100644
index 539ffb4..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext30.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - Double max-length
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0, 'dustbin', 'dustbinview', -1, 5000.0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0, 'dustbin', 'dustbinview', -1, 5000.0)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext31.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext31.testcase
deleted file mode 100644
index 2bd77a9..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext31.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - NULL dustbin-table
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0.001, NULL, 'dustbinview');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0.001, NULL, 'dustbinview')
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext32.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext32.testcase
deleted file mode 100644
index ab999bd..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext32.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - INT dustbin-table
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0.001, 1, 'dustbinview');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0.001, 1, 'dustbinview')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext33.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext33.testcase
deleted file mode 100644
index 44faf67..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext33.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - DOUBLE dustbin-table
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0.001, 1.2, 'dustbinview');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0.001, 1.2, 'dustbinview')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext34.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext34.testcase
deleted file mode 100644
index 44faf67..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext34.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - DOUBLE dustbin-table
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0.001, 1.2, 'dustbinview');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0.001, 1.2, 'dustbinview')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext35.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext35.testcase
deleted file mode 100644
index df9b7e5..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext35.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - BLOB dustbin-table
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0.001, zeroblob(5), 'dustbinview');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0.001, zeroblob(5), 'dustbinview')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext36.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext36.testcase
deleted file mode 100644
index 13cff06..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext36.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - NULL dustbin-view
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0.001, 'dustbin', NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0.001, NULL, 'dustbin')
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext37.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext37.testcase
deleted file mode 100644
index 41b5cb8..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext37.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - INT dustbin-view
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0.001, 'dustbin', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0.001, 1, 'dustbin')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext38.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext38.testcase
deleted file mode 100644
index 9fe19b4..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext38.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - DOUBLE dustbin-view
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0.001, 'dustbin', 1.2);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0.001, 1.2, 'dustbin')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext39.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext39.testcase
deleted file mode 100644
index 444f207..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext39.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - BLOB dustbin-view
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0.001, 'dustbin', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0.001, 'dustbin', zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext4.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext4.testcase
deleted file mode 100644
index 6b7e4ec..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - Blob Topology
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt(zeroblob(4), NULL, 'table', NULL, 0, 'dustbin', 'dustbinview');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt(zeroblob(4), NULL, 'table', NULL, 0, 'dustbin', 'dustbinview')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext5.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext5.testcase
deleted file mode 100644
index 296e6bc..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - Text Topology
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0, 'dustbin', 'dustbinview');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt('topology', NULL, 'table', NULL, 0, 'dustbin', 'dustbinview')
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext6.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext6.testcase
deleted file mode 100644
index c6ec216..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - TEXT prefix
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt('topology', 'a', 'table', NULL, 0, 'dustbin', 'dustbinview');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt('topology', 'a', 'table', NULL, 0, 'dustbin', 'dustbinview')
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext7.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext7.testcase
deleted file mode 100644
index 05633fa..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - INT prefix
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt('topology', 1, 'table', NULL, 0, 'dustbin', 'dustbinview');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt('topology', 1, 'table', NULL, 0, 'dustbin', 'dustbinview')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext8.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext8.testcase
deleted file mode 100644
index f31fb11..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - Double prefix
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt('topology', 1.2, 'table', NULL, 0, 'dustbin', 'dustbinview');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt('topology', 1.2, 'table', NULL, 0, 'dustbin', 'dustbinview')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromext9.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromext9.testcase
deleted file mode 100644
index 00003f1..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromext9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTableExt - BLOB prefix
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTableExt('topology', zeroblob(4), 'table', NULL, 0, 'dustbin', 'dustbinview');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTableExt('topology', zeroblob(4), 'table', NULL, 0, 'dustbin', 'dustbinview')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromtable1.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromtable1.testcase
deleted file mode 100644
index ea4bea7..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromtable1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTable - NULL Topology
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTable(NULL, NULL, 'table', NULL, 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTable(NULL, NULL, 'table', NULL, 0)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromtable10.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromtable10.testcase
deleted file mode 100644
index 1017f3f..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromtable10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTable - NULL table
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTable('topology', NULL, NULL, NULL, 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTable('topology', NULL, NULL, NULL, 0)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromtable11.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromtable11.testcase
deleted file mode 100644
index a91cc93..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromtable11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTable - INT table
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTable('topology', NULL, 1, NULL, 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTable('topology', NULL, 1, NULL, 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromtable12.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromtable12.testcase
deleted file mode 100644
index a1ccbb8..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromtable12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTable - Double table
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTable('topology', NULL, 1.2, NULL, 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTable('topology', NULL, 1.2, NULL, 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromtable13.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromtable13.testcase
deleted file mode 100644
index 94118b5..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromtable13.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTable - BLOB table
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTable('topology', NULL, zeroblob(4), NULL, 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTable('topology', NULL, zeroblob(4), NULL, 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromtable14.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromtable14.testcase
deleted file mode 100644
index e7991de..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromtable14.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTable - Text Column
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTable('topology', NULL, 'table', 'column', 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTable('topology', NULL, 'table', 'column', 0)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromtable15.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromtable15.testcase
deleted file mode 100644
index bf0d69c..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromtable15.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTable - Int Column
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTable('topology', NULL, 'table', 1, 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTable('topology', NULL, 'table', 1, 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromtable16.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromtable16.testcase
deleted file mode 100644
index 1ea21ac..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromtable16.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTable - Double Column
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTable('topology', NULL, 'table', 1.2, 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTable('topology', NULL, 'table', 1.2, 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromtable17.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromtable17.testcase
deleted file mode 100644
index 6a60bca..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromtable17.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTable - BLOB Column
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTable('topology', NULL, 'table', zeroblob(4), 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTable('topology', NULL, 'table', zeroblob(4), 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromtable18.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromtable18.testcase
deleted file mode 100644
index e4074c4..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromtable18.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTable - NULL tolerance
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTable('topology', NULL, 'table', NULL, NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTable('topology', NULL, 'table', NULL, NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromtable19.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromtable19.testcase
deleted file mode 100644
index 38dc5cc..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromtable19.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTable - Text tolerance
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTable('topology', NULL, 'table', NULL, 'zero');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTable('topology', NULL, 'table', NULL, 'zero')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromtable2.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromtable2.testcase
deleted file mode 100644
index 8828f3c..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromtable2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTable - Int Topology
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTable(1, NULL, 'table', NULL, 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTable(1, NULL, 'table', NULL, 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromtable20.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromtable20.testcase
deleted file mode 100644
index 3347c0b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromtable20.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTable - BLOB tolerance
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTable('topology', NULL, 'table', NULL, zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTable('topology', NULL, 'table', NULL, zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromtable21.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromtable21.testcase
deleted file mode 100644
index 70cb5b6..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromtable21.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTable - Double tolerance
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTable('topology', NULL, 'table', NULL, 0.001);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTable('topology', NULL, 'table', NULL, 0.001)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromtable22.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromtable22.testcase
deleted file mode 100644
index 59076ac..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromtable22.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTable - NULL line-max-points
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTable('topology', NULL, 'table', NULL, 0, NULL, -1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTable('topology', NULL, 'table', NULL, 0, NULL, -1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromtable23.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromtable23.testcase
deleted file mode 100644
index d7b7e6b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromtable23.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTable - Double line-max-points
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTable('topology', NULL, 'table', NULL, 0, 1.5, -1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTable('topology', NULL, 'table', NULL, 0, 1.5, -1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromtable24.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromtable24.testcase
deleted file mode 100644
index 4bce35b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromtable24.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTable - Text line-max-points
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTable('topology', NULL, 'table', NULL, 0, 'abc', -1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTable('topology', NULL, 'table', NULL, 0, 'abc', -1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromtable25.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromtable25.testcase
deleted file mode 100644
index 2bfb9cd..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromtable25.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTable - BLOB line-max-points
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTable('topology', NULL, 'table', NULL, 0, zeroblob(4), -1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTable('topology', NULL, 'table', NULL, 0, zeroblob(4), -1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromtable26.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromtable26.testcase
deleted file mode 100644
index 0a441e6..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromtable26.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTable - Integer line-max-points / Integer max-length
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTable('topology', NULL, 'table', NULL, 0, -1, -1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTable('topology', NULL, 'table', NULL, 0, -1, -1)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromtable27.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromtable27.testcase
deleted file mode 100644
index 4b247f9..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromtable27.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTable - NULL max-length
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTable('topology', NULL, 'table', NULL, 0, -1, NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTable('topology', NULL, 'table', NULL, 0, -1, NULL)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromtable28.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromtable28.testcase
deleted file mode 100644
index 6bdea96..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromtable28.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTable - BLOB max-length
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTable('topology', NULL, 'table', NULL, 0, -1, zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTable('topology', NULL, 'table', NULL, 0, -1, zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromtable29.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromtable29.testcase
deleted file mode 100644
index 58e3652..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromtable29.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTable - Text max-length
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTable('topology', NULL, 'table', NULL, 0, -1, 'abc');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTable('topology', NULL, 'table', NULL, 0, -1, 'abc')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromtable3.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromtable3.testcase
deleted file mode 100644
index dddf22f..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromtable3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTable - Double Topology
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTable(1.5, NULL, 'table', NULL, 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTable(1.5, NULL, 'table', NULL, 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromtable30.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromtable30.testcase
deleted file mode 100644
index 7cfbd47..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromtable30.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTable - Double max-length
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTable('topology', NULL, 'table', NULL, 0, -1, 5000.0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTable('topology', NULL, 'table', NULL, 0, -1, 5000.0)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromtable4.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromtable4.testcase
deleted file mode 100644
index 7e463bb..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromtable4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTable - Blob Topology
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTable(zeroblob(4), NULL, 'table', NULL, 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTable(zeroblob(4), NULL, 'table', NULL, 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromtable5.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromtable5.testcase
deleted file mode 100644
index caca4ab..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromtable5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTable - Text Topology
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTable('topology', NULL, 'table', NULL, 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTable('topology', NULL, 'table', NULL, 0)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromtable6.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromtable6.testcase
deleted file mode 100644
index 5fdcf7c..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromtable6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTable - TEXT prefix
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTable('topology', 'a', 'table', NULL, 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTable('topology', 'a', 'table', NULL, 0)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromtable7.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromtable7.testcase
deleted file mode 100644
index c07275a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromtable7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTable - INT prefix
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTable('topology', 1, 'table', NULL, 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTable('topology', 1, 'table', NULL, 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromtable8.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromtable8.testcase
deleted file mode 100644
index 2ad854a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromtable8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTable - Double prefix
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTable('topology', 1.2, 'table', NULL, 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTable('topology', 1.2, 'table', NULL, 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeofromtable9.testcase b/test/sql_stmt_lwgeom_22_tests/topogeofromtable9.testcase
deleted file mode 100644
index 41332ce..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeofromtable9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_FromGeoTable - BLOB prefix
-:memory: #use in-memory database
-SELECT TopoGeo_FromGeoTable('topology', zeroblob(4), 'table', NULL, 0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_FromGeoTable('topology', zeroblob(4), 'table', NULL, 0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoremoveedges1.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoremoveedges1.testcase
deleted file mode 100644
index fdf8ff2..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoremoveedges1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_RemoveDanglingEdges - NULL Topology
-:memory: #use in-memory database
-SELECT TopoGeo_RemoveDanglingEdges (NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_RemoveDanglingEdges (NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoremoveedges2.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoremoveedges2.testcase
deleted file mode 100644
index 8a93453..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoremoveedges2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_RemoveDanglingEdges - Int Topology
-:memory: #use in-memory database
-SELECT TopoGeo_RemoveDanglingEdges(1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_RemoveDanglingEdges(1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoremoveedges3.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoremoveedges3.testcase
deleted file mode 100644
index 70abd5b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoremoveedges3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_RemoveDanglingEdges - Double Topology
-:memory: #use in-memory database
-SELECT TopoGeo_RemoveDanglingEdges(1.5);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_RemoveDanglingEdges(1.5)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoremoveedges4.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoremoveedges4.testcase
deleted file mode 100644
index a23acfe..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoremoveedges4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_RemoveDanglingEdges - Blob Topology
-:memory: #use in-memory database
-SELECT TopoGeo_RemoveDanglingEdges(zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_RemoveDanglingEdges(zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoremoveedges5.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoremoveedges5.testcase
deleted file mode 100644
index 04c8421..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoremoveedges5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_RemoveDanglingEdges - Text Topology
-:memory: #use in-memory database
-SELECT TopoGeo_RemoveDanglingEdges('topology');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_RemoveDanglingEdges('topology')
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoremovenodes1.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoremovenodes1.testcase
deleted file mode 100644
index 82d7324..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoremovenodes1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_RemoveDanglingNodes - NULL Topology
-:memory: #use in-memory database
-SELECT TopoGeo_RemoveDanglingNodes (NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_RemoveDanglingNodes (NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoremovenodes2.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoremovenodes2.testcase
deleted file mode 100644
index 4df1972..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoremovenodes2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_RemoveDanglingNodes - Int Topology
-:memory: #use in-memory database
-SELECT TopoGeo_RemoveDanglingNodes(1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_RemoveDanglingNodes(1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoremovenodes3.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoremovenodes3.testcase
deleted file mode 100644
index 91e3269..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoremovenodes3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_RemoveDanglingNodes - Double Topology
-:memory: #use in-memory database
-SELECT TopoGeo_RemoveDanglingNodes(1.5);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_RemoveDanglingNodes(1.5)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoremovenodes4.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoremovenodes4.testcase
deleted file mode 100644
index 5c05d7e..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoremovenodes4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_RemoveDanglingNodes - Blob Topology
-:memory: #use in-memory database
-SELECT TopoGeo_RemoveDanglingNodes(zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_RemoveDanglingNodes(zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoremovenodes5.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoremovenodes5.testcase
deleted file mode 100644
index 025d426..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoremovenodes5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_RemoveDanglingNodes - Text Topology
-:memory: #use in-memory database
-SELECT TopoGeo_RemoveDanglingNodes('topology');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_RemoveDanglingNodes('topology')
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoremovesmall1.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoremovesmall1.testcase
deleted file mode 100644
index be44fa1..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoremovesmall1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_RemoveSmallFaces - NULL Topology
-:memory: #use in-memory database
-SELECT TopoGeo_RemoveSmallFaces (NULL, 0.1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_RemoveSmallFaces (NULL, 0.1)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoremovesmall2.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoremovesmall2.testcase
deleted file mode 100644
index bb53191..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoremovesmall2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_RemoveSmallFaces - Int Topology
-:memory: #use in-memory database
-SELECT TopoGeo_RemoveSmallFaces(1, 0.1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_RemoveSmallFaces(1, NULL, 0.1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoremovesmall3.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoremovesmall3.testcase
deleted file mode 100644
index 32fc4a3..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoremovesmall3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_RemoveSmallFaces - Double Topology
-:memory: #use in-memory database
-SELECT TopoGeo_RemoveSmallFaces(1.5, 0.1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_RemoveSmallFaces(1.5, 0.1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoremovesmall4.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoremovesmall4.testcase
deleted file mode 100644
index 6491ed4..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoremovesmall4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_RemoveSmallFaces - Blob Topology
-:memory: #use in-memory database
-SELECT TopoGeo_RemoveSmallFaces(zeroblob(4), 0.1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_RemoveSmallFaces(zeroblob(4), 0.1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoremovesmall5.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoremovesmall5.testcase
deleted file mode 100644
index 2888d1d..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoremovesmall5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_RemoveSmallFaces - Text Topology
-:memory: #use in-memory database
-SELECT TopoGeo_RemoveSmallFaces('topology', 0.1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_RemoveSmallFaces('topology', 0.1)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoremovesmall6.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoremovesmall6.testcase
deleted file mode 100644
index a0cc081..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoremovesmall6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_RemoveSmallFaces - TEXT min-area
-:memory: #use in-memory database
-SELECT TopoGeo_RemoveSmallFaces('topology', 'a');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_RemoveSmallFaces('topology', 'a')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoremovesmall7.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoremovesmall7.testcase
deleted file mode 100644
index 1f7b146..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoremovesmall7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_RemoveSmallFaces - INT min-area
-:memory: #use in-memory database
-SELECT TopoGeo_RemoveSmallFaces('topology', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_RemoveSmallFaces('topology', 1)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoremovesmall8.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoremovesmall8.testcase
deleted file mode 100644
index d3da8a6..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoremovesmall8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_RemoveSmallFaces - NULL min-area
-:memory: #use in-memory database
-SELECT TopoGeo_RemoveSmallFaces('topology', NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_RemoveSmallFaces('topology', NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoremovesmall9.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoremovesmall9.testcase
deleted file mode 100644
index faad353..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoremovesmall9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_RemoveSmallFaces - BLOB prefix
-:memory: #use in-memory database
-SELECT TopoGeo_RemoveSmallFaces('topology', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_RemoveSmallFaces('topology', zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeosplitline1.testcase b/test/sql_stmt_lwgeom_22_tests/topogeosplitline1.testcase
deleted file mode 100644
index 72731ab..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeosplitline1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SubdivideLines - Ok #1
-:memory: #use in-memory database
-SELECT AsText(TopoGeo_SubdivideLines(GeomFromText('LINESTRING(0 1, 2 3)', 4326), 512, -1));
-1 # rows (not including the header row)
-1 # columns
-AsText(TopoGeo_SubdivideLines(GeomFromText('LINESTRING(0 1, 2 3)', 4326), 512, -1))
-MULTILINESTRING((0 1, 2 3))
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeosplitline10.testcase b/test/sql_stmt_lwgeom_22_tests/topogeosplitline10.testcase
deleted file mode 100644
index 48b1b6e..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeosplitline10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SubdivideLines - Text max points
-:memory: #use in-memory database
-SELECT TopoGeo_SubdivideLines(GeomFromText('LINESTRING(0 0, 1 1)', 4326), 'alpha', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SubdivideLines(GeomFromText('LINESTRING(0 0, 1 1)', 4326), 'alpha', 1)
-(NULL)
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeosplitline11.testcase b/test/sql_stmt_lwgeom_22_tests/topogeosplitline11.testcase
deleted file mode 100644
index fd0c2bf..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeosplitline11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SubdivideLines - BLOB max points
-:memory: #use in-memory database
-SELECT TopoGeo_SubdivideLines(GeomFromText('LINESTRING(0 0, 1 1)', 4326), zeroblob(4), -1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SubdivideLines(GeomFromText('LINESTRING(0 0, 1 1)', 4326), zeroblob(4), -1)
-(NULL)
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeosplitline12.testcase b/test/sql_stmt_lwgeom_22_tests/topogeosplitline12.testcase
deleted file mode 100644
index 5709b22..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeosplitline12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SubdivideLines - NULL max-length
-:memory: #use in-memory database
-SELECT TopoGeo_SubdivideLines(GeomFromText('LINESTRING(0 0, 1 1)', 4326), -1, NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SubdivideLines(GeomFromText('LINESTRING(0 0, 1 1)', 4326), -1, NULL)
-(NULL)
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeosplitline13.testcase b/test/sql_stmt_lwgeom_22_tests/topogeosplitline13.testcase
deleted file mode 100644
index 13ef75d..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeosplitline13.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SubdivideLines - TEXT max-length
-:memory: #use in-memory database
-SELECT TopoGeo_SubdivideLines(GeomFromText('LINESTRING(0 0, 1 1)', 4326), -1, 'abc');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SubdivideLines(GeomFromText('LINESTRING(0 0, 1 1)', 4326), -1, 'abc')
-(NULL)
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeosplitline14.testcase b/test/sql_stmt_lwgeom_22_tests/topogeosplitline14.testcase
deleted file mode 100644
index 3a62028..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeosplitline14.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SubdivideLines - BLOB max-length
-:memory: #use in-memory database
-SELECT TopoGeo_SubdivideLines(GeomFromText('LINESTRING(0 0, 1 1)', 4326), -1, zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SubdivideLines(GeomFromText('LINESTRING(0 0, 1 1)', 4326), -1, zeroblob(4))
-(NULL)
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeosplitline15.testcase b/test/sql_stmt_lwgeom_22_tests/topogeosplitline15.testcase
deleted file mode 100644
index e2c781c..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeosplitline15.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SubdivideLines - Int max-length
-:memory: #use in-memory database
-SELECT AsText(TopoGeo_SubdivideLines(GeomFromText('LINESTRINGM(1 2 3, 4 5 6)', 4326), -1, 1000));
-1 # rows (not including the header row)
-1 # columns
-AsText(TopoGeo_SubdivideLines(GeomFromText('LINESTRINGM(1 2 3, 4 5 6)', 4326), -1, 1000))
-MULTILINESTRING M((1 2 3, 4 5 6))
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeosplitline16.testcase b/test/sql_stmt_lwgeom_22_tests/topogeosplitline16.testcase
deleted file mode 100644
index 072c581..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeosplitline16.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SubdivideLines - Double max-length
-:memory: #use in-memory database
-SELECT AsText(TopoGeo_SubdivideLines(GeomFromText('LINESTRINGZM(1 2 3 4, 5 6 7 8)', 4326), -1, 1000.0));
-1 # rows (not including the header row)
-1 # columns
-AsText(TopoGeo_SubdivideLines(GeomFromText('LINESTRINGZM(1 2 3 4, 5 6 7 8)', 4326), -1, 1000.0))
-MULTILINESTRING ZM((1 2 3 4, 5 6 7 8))
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeosplitline2.testcase b/test/sql_stmt_lwgeom_22_tests/topogeosplitline2.testcase
deleted file mode 100644
index aed6875..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeosplitline2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SubdivideLines - Ok #2
-:memory: #use in-memory database
-SELECT AsText(TopoGeo_SubdivideLines(GeomFromText('LINESTRINGZ(1 2 3, 4 5 6)', 4326), -1, -1));
-1 # rows (not including the header row)
-1 # columns
-AsText(TopoGeo_SubdivideLines(GeomFromText('LINESTRINGZ(1 2 3, 4 5 6)', 4326), -1, -1))
-MULTILINESTRING Z((1 2 3, 4 5 6))
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeosplitline3.testcase b/test/sql_stmt_lwgeom_22_tests/topogeosplitline3.testcase
deleted file mode 100644
index 1661aa3..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeosplitline3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SubdivideLines - NULL Geometry
-:memory: #use in-memory database
-SELECT TopoGeo_SubdivideLines(NULL, -1, -1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SubdivideLines(NULL, -1, -1)
-(NULL)
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeosplitline4.testcase b/test/sql_stmt_lwgeom_22_tests/topogeosplitline4.testcase
deleted file mode 100644
index a52a879..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeosplitline4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SubdivideLines - Integer Geometry
-:memory: #use in-memory database
-SELECT TopoGeo_SubdivideLines(1, -1, -1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SubdivideLines(1, -1, -1)
-(NULL)
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeosplitline5.testcase b/test/sql_stmt_lwgeom_22_tests/topogeosplitline5.testcase
deleted file mode 100644
index b49eb92..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeosplitline5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SubdivideLines - Double Geometry
-:memory: #use in-memory database
-SELECT TopoGeo_SubdivideLines(1.2, -1, -1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SubdivideLines(1.2, -1, -1)
-(NULL)
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeosplitline6.testcase b/test/sql_stmt_lwgeom_22_tests/topogeosplitline6.testcase
deleted file mode 100644
index 82678d5..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeosplitline6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SubdivideLines - Text Geometry
-:memory: #use in-memory database
-SELECT TopoGeo_SubdivideLines('alpha', -1, -1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SubdivideLines('alpha', -1, -1)
-(NULL)
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeosplitline7.testcase b/test/sql_stmt_lwgeom_22_tests/topogeosplitline7.testcase
deleted file mode 100644
index af3730b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeosplitline7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SubdivideLines - invalid BLOB Geometry
-:memory: #use in-memory database
-SELECT TopoGeo_SubdivideLines(zeroblob(100), -1, -1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SubdivideLines(zeroblob(100), -1, -1)
-(NULL)
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeosplitline8.testcase b/test/sql_stmt_lwgeom_22_tests/topogeosplitline8.testcase
deleted file mode 100644
index 33b93ef..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeosplitline8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SubdivideLines - NULL max points
-:memory: #use in-memory database
-SELECT TopoGeo_SubdivideLines(GeomFromText('LINESTRING(0 0, 1 1)', 4326), NULL, -1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SubdivideLines(GeomFromText('LINESTRING(0 0, 1 1)', 4326), NULL, -1)
-(NULL)
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeosplitline9.testcase b/test/sql_stmt_lwgeom_22_tests/topogeosplitline9.testcase
deleted file mode 100644
index a97d19d..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeosplitline9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_SubdivideLines - Double max points
-:memory: #use in-memory database
-SELECT TopoGeo_SubdivideLines(GeomFromText('LINESTRING(0 0, 1 1)', 4326), 1.5, -1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_SubdivideLines(GeomFromText('LINESTRING(0 0, 1 1)', 4326), 1.5, -1)
-(NULL)
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototable1.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototable1.testcase
deleted file mode 100644
index 60b4495..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototable1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTable - NULL Topology
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTable(NULL, NULL, 'table', NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTable(NULL, NULL, 'table', NULL, 'out')
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototable10.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototable10.testcase
deleted file mode 100644
index d8b6229..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototable10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTable - NULL ref-table
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTable('topology', NULL, NULL, NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTable('topology', NULL, NULL, NULL, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototable11.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototable11.testcase
deleted file mode 100644
index 1245ca7..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototable11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTable - INT ref-table
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTable('topology', NULL, 1, NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTable('topology', NULL, 1, NULL, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototable12.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototable12.testcase
deleted file mode 100644
index 5361297..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototable12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTable - Double ref-table
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTable('topology', NULL, 1.2, NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTable('topology', NULL, 1.2, NULL, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototable13.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototable13.testcase
deleted file mode 100644
index 1a16772..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototable13.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTable - BLOB ref-table
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTable('topology', NULL, zeroblob(4), NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTable('topology', NULL, zeroblob(4), NULL, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototable14.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototable14.testcase
deleted file mode 100644
index 132507c..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototable14.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTable - Text Column
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTable('topology', NULL, 'table', 'column', 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTable('topology', NULL, 'table', 'column', 'out')
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototable15.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototable15.testcase
deleted file mode 100644
index 981413a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototable15.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTable - Int Column
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTable('topology', NULL, 'table', 1, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTable('topology', NULL, 'table', 1, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototable16.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototable16.testcase
deleted file mode 100644
index 31aeadf..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototable16.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTable - Double Column
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTable('topology', NULL, 'table', 1.2, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTable('topology', NULL, 'table', 1.2, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototable17.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototable17.testcase
deleted file mode 100644
index f9322e0..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototable17.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTable - BLOB Column
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTable('topology', NULL, 'table', zeroblob(4), 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTable('topology', NULL, 'table', zeroblob(4), 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototable18.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototable18.testcase
deleted file mode 100644
index 8c834e6..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototable18.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTable - NULL out-table
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTable('topology', NULL, 'table', NULL, NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTable('topology', NULL, 'table', NULL, NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototable19.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototable19.testcase
deleted file mode 100644
index 54d9890..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototable19.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTable - Double out-table
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTable('topology', NULL, 'table', NULL, 1.2);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTable('topology', NULL, 'table', NULL, 1.2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototable2.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototable2.testcase
deleted file mode 100644
index 09af1db..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototable2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTable - Int Topology
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTable(1, NULL, 'table', NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTable(1, NULL, 'table', NULL, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototable20.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototable20.testcase
deleted file mode 100644
index 3982876..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototable20.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTable - BLOB out-table
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTable('topology', NULL, 'table', NULL, zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTable('topology', NULL, 'table', NULL, zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototable21.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototable21.testcase
deleted file mode 100644
index 5e5a17d..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototable21.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTable - Text out-table
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTable('topology', NULL, 'table', NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTable('topology', NULL, 'table', NULL, 'out')
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototable22.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototable22.testcase
deleted file mode 100644
index 1d3cc5a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototable22.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTable - Text with-spatial-index
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTable('topology', NULL, 'table', NULL, 'out', 'tol');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTable('topology', NULL, 'table', NULL, 'out', 'tol')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototable23.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototable23.testcase
deleted file mode 100644
index a4ce09f..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototable23.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTable - BLOB with-spatial-inxed
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTable('topology', NULL, 'table', NULL, 'out', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTable('topology', NULL, 'table', NULL, 'out', zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototable24.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototable24.testcase
deleted file mode 100644
index 0b86fc5..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototable24.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTable - Double with-spatial-inxed
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTable('topology', NULL, 'table', NULL, 'out', 1.1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTable('topology', NULL, 'table', NULL, 'out', 1.1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototable25.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototable25.testcase
deleted file mode 100644
index a20cb4a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototable25.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTable - NULL with-spatial-inxed
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTable('topology', NULL, 'table', NULL, 'out', NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTable('topology', NULL, 'table', NULL, 'out', NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototable26.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototable26.testcase
deleted file mode 100644
index 627ffde..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototable26.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTable - Integer with-spatial-inxed
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTable('topology', NULL, 'table', NULL, 'out', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTable('topology', NULL, 'table', NULL, 'out', 1)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototable3.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototable3.testcase
deleted file mode 100644
index 9a9e8ba..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototable3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTable - Double Topology
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTable(1.5, NULL, 'table', NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTable(1.5, NULL, 'table', NULL, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototable4.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototable4.testcase
deleted file mode 100644
index 55ff8f7..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototable4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTable - Blob Topology
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTable(zeroblob(4), NULL, 'table', NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTable(zeroblob(4), NULL, 'table', NULL, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototable5.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototable5.testcase
deleted file mode 100644
index b690195..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototable5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTable - Text Topology
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTable('topology', NULL, 'table', NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTable('topology', NULL, 'table', NULL, 'out')
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototable6.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototable6.testcase
deleted file mode 100644
index e1c3d1f..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototable6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTable - TEXT prefix
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTable('topology', 'a', 'table', NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTable('topology', 'a', 'table', NULL, 'out')
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototable7.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototable7.testcase
deleted file mode 100644
index 2b7481e..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototable7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTable - INT prefix
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTable('topology', 1, 'table', NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTable('topology', 1, 'table', NULL, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototable8.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototable8.testcase
deleted file mode 100644
index 3b45f2b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototable8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTable - Double prefix
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTable('topology', 1.2, 'table', NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTable('topology', 1.2, 'table', NULL, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototable9.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototable9.testcase
deleted file mode 100644
index cdd6ea5..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototable9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTable - BLOB prefix
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTable('topology', zeroblob(4), 'table', NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTable('topology', zeroblob(4), 'table', NULL, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototablegen1.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototablegen1.testcase
deleted file mode 100644
index 252bc45..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototablegen1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTableGeneralize - NULL Topology
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTableGeneralize(NULL, NULL, 'table', NULL, 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTableGeneralize(NULL, NULL, 'table', NULL, 'out', 10.0)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototablegen10.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototablegen10.testcase
deleted file mode 100644
index 0cbf2ad..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototablegen10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTableGeneralize - NULL ref-table
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTableGeneralize('topology', NULL, NULL, NULL, 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTableGeneralize('topology', NULL, NULL, NULL, 'out', 10.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototablegen11.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototablegen11.testcase
deleted file mode 100644
index 3dcb763..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototablegen11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTableGeneralize - INT ref-table
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTableGeneralize('topology', NULL, 1, NULL, 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTableGeneralize('topology', NULL, 1, NULL, 'out', 10.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototablegen12.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototablegen12.testcase
deleted file mode 100644
index a2267fd..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototablegen12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTableGeneralize - Double ref-table
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTableGeneralize('topology', NULL, 1.2, NULL, 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTableGeneralize('topology', NULL, 1.2, NULL, 'out', 10.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototablegen13.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototablegen13.testcase
deleted file mode 100644
index 8f91e47..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototablegen13.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTableGeneralize - BLOB ref-table
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTableGeneralize('topology', NULL, zeroblob(4), NULL, 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTableGeneralize('topology', NULL, zeroblob(4), NULL, 'out', 10.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototablegen14.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototablegen14.testcase
deleted file mode 100644
index 8092da4..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototablegen14.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTableGeneralize - Text Column
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', 'column', 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', 'column', 'out', 10.0)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototablegen15.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototablegen15.testcase
deleted file mode 100644
index 7b2a10c..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototablegen15.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTableGeneralize - Int Column
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', 1, 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', 1, 'out', 10.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototablegen16.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototablegen16.testcase
deleted file mode 100644
index fd2d4ba..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototablegen16.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTableGeneralize - Double Column
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', 1.2, 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', 1.2, 'out', 10.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototablegen17.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototablegen17.testcase
deleted file mode 100644
index 1ace95c..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototablegen17.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTableGeneralize - BLOB Column
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', zeroblob(4), 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', zeroblob(4), 'out', 10.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototablegen18.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototablegen18.testcase
deleted file mode 100644
index b4c884e..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototablegen18.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTableGeneralize - NULL out-table
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', NULL, NULL, 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', NULL, NULL, 10.0)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototablegen19.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototablegen19.testcase
deleted file mode 100644
index fd5bd99..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototablegen19.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTableGeneralize - Double out-table
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', NULL, 1.2, 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', NULL, 1.2, 10.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototablegen2.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototablegen2.testcase
deleted file mode 100644
index 160a29e..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototablegen2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTableGeneralize - Int Topology
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTableGeneralize(1, NULL, 'table', NULL, 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTableGeneralize(1, NULL, 'table', NULL, 'out', 10.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototablegen20.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototablegen20.testcase
deleted file mode 100644
index 4c33efe..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototablegen20.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTableGeneralize - BLOB out-table
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', NULL, zeroblob(4), 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', NULL, zeroblob(4), 10.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototablegen21.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototablegen21.testcase
deleted file mode 100644
index 35883b4..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototablegen21.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTableGeneralize - Text out-table
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', NULL, 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', NULL, 'out', 10.0)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototablegen22.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototablegen22.testcase
deleted file mode 100644
index d96d166..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototablegen22.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTableGeneralize - Text tolerance
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', NULL, 'out', 'no', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', NULL, 'out', 'no', 10.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototablegen23.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototablegen23.testcase
deleted file mode 100644
index 1aa5729..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototablegen23.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTableGeneralize - BLOB toleramce
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', NULL, 'out', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', NULL, 'out', zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototablegen24.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototablegen24.testcase
deleted file mode 100644
index 50fe582..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototablegen24.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTableGeneralize - Double toleramce
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', NULL, 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', NULL, 'out', 10.0)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototablegen25.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototablegen25.testcase
deleted file mode 100644
index 9a1a387..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototablegen25.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTableGeneralize - NULL toleramce
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', NULL, 'out', NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', NULL, 'out', NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototablegen26.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototablegen26.testcase
deleted file mode 100644
index c11a0c7..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototablegen26.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTableGeneralize - Integer tolerance
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', NULL, 'out', 10);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', NULL, 'out', 10)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototablegen27.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototablegen27.testcase
deleted file mode 100644
index 1047d47..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototablegen27.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTableGeneralize - Text with-spatial-inxed
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', NULL, 'out', 10.0, 'no');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', NULL, 'out', 10.0, 'no')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototablegen28.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototablegen28.testcase
deleted file mode 100644
index 6fea726..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototablegen28.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTableGeneralize - BLOB with-spatial-inxed
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', NULL, 'out', 10.0, zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', NULL, 'out', 10.0, zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototablegen29.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototablegen29.testcase
deleted file mode 100644
index 877b421..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototablegen29.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTableGeneralize - Double with-spatial-inxed
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', NULL, 'out', 10.0, 1.1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', NULL, 'out', 10.0, 1.1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototablegen3.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototablegen3.testcase
deleted file mode 100644
index 55f02a8..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototablegen3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTableGeneralize - Double Topology
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTableGeneralize(1.5, NULL, 'table', NULL, 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTableGeneralize(1.5, NULL, 'table', NULL, 'out', 10.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototablegen30.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototablegen30.testcase
deleted file mode 100644
index 339faf6..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototablegen30.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTableGeneralize - NULL with-spatial-inxed
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', NULL, 'out', 10.0, NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', NULL, 'out', 10.0, NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototablegen31.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototablegen31.testcase
deleted file mode 100644
index 6514231..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototablegen31.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTableGeneralize - Integer with-spatial-inxed
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', NULL, 'out', 10.0, 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', NULL, 'out', 10.0, 1)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototablegen4.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototablegen4.testcase
deleted file mode 100644
index fe2cb70..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototablegen4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTableGeneralize - Blob Topology
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTableGeneralize(zeroblob(4), NULL, 'table', NULL, 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTableGeneralize(zeroblob(4), NULL, 'table', NULL, 'out', 10.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototablegen5.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototablegen5.testcase
deleted file mode 100644
index b7e9aff..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototablegen5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTableGeneralize - Text Topology
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', NULL, 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTableGeneralize('topology', NULL, 'table', NULL, 'out', 10.0)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototablegen6.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototablegen6.testcase
deleted file mode 100644
index a6199ee..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototablegen6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTableGeneralize - TEXT prefix
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTableGeneralize('topology', 'a', 'table', NULL, 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTableGeneralize('topology', 'a', 'table', NULL, 'out', 10.0)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototablegen7.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototablegen7.testcase
deleted file mode 100644
index d49056b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototablegen7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTableGeneralize - INT prefix
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTableGeneralize('topology', 1, 'table', NULL, 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTableGeneralize('topology', 1, 'table', NULL, 'out', 10.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototablegen8.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototablegen8.testcase
deleted file mode 100644
index 851d114..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototablegen8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTableGeneralize - Double prefix
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTableGeneralize('topology', 1.2, 'table', NULL, 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTableGeneralize('topology', 1.2, 'table', NULL, 'out', 10.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeototablegen9.testcase b/test/sql_stmt_lwgeom_22_tests/topogeototablegen9.testcase
deleted file mode 100644
index df7dc73..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeototablegen9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_ToGeoTableGeneralize - BLOB prefix
-:memory: #use in-memory database
-SELECT TopoGeo_ToGeoTableGeneralize('topology', zeroblob(4), 'table', NULL, 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_ToGeoTableGeneralize('topology', zeroblob(4), 'table', NULL, 'out', 10.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoupdateseeds1.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoupdateseeds1.testcase
deleted file mode 100644
index 203927e..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoupdateseeds1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_UpdateSeeds - NULL Topology 
-:memory: #use in-memory database
-SELECT TopoGeo_UpdateSeeds(NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_UpdateSeeds(NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoupdateseeds10.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoupdateseeds10.testcase
deleted file mode 100644
index 33719b7..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoupdateseeds10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_UpdateSeeds - Text mode
-:memory: #use in-memory database
-SELECT TopoGeo_UpdateSeeds('topology', 'mode');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_UpdateSeeds('topology', 'mode')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoupdateseeds2.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoupdateseeds2.testcase
deleted file mode 100644
index 4a557ef..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoupdateseeds2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_UpdateSeeds - Int Topology 
-:memory: #use in-memory database
-SELECT TopoGeo_UpdateSeeds(1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_UpdateSeeds(1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoupdateseeds3.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoupdateseeds3.testcase
deleted file mode 100644
index fafb139..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoupdateseeds3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_UpdateSeeds - Double Topology 
-:memory: #use in-memory database
-SELECT TopoGeo_UpdateSeeds(1.5);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_UpdateSeeds(1.5)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoupdateseeds4.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoupdateseeds4.testcase
deleted file mode 100644
index 509d030..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoupdateseeds4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_UpdateSeeds - Blob Topology 
-:memory: #use in-memory database
-SELECT TopoGeo_UpdateSeeds(zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_UpdateSeeds(zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoupdateseeds5.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoupdateseeds5.testcase
deleted file mode 100644
index 86b59b6..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoupdateseeds5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_UpdateSeeds - Text Topology 
-:memory: #use in-memory database
-SELECT TopoGeo_UpdateSeeds('topology');
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_UpdateSeeds('topology')
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoupdateseeds6.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoupdateseeds6.testcase
deleted file mode 100644
index c5e6f7e..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoupdateseeds6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_UpdateSeeds - NULL mode
-:memory: #use in-memory database
-SELECT TopoGeo_UpdateSeeds('topology', NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_UpdateSeeds('topology', NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoupdateseeds7.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoupdateseeds7.testcase
deleted file mode 100644
index 12af1d7..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoupdateseeds7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_UpdateSeeds - Int mode
-:memory: #use in-memory database
-SELECT TopoGeo_UpdateSeeds('topology', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_UpdateSeeds('topology', 1)
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoupdateseeds8.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoupdateseeds8.testcase
deleted file mode 100644
index 65fff87..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoupdateseeds8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_UpdateSeeds - Double mode
-:memory: #use in-memory database
-SELECT TopoGeo_UpdateSeeds('topology', 1.5);
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_UpdateSeeds('topology', 1.5)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topogeoupdateseeds9.testcase b/test/sql_stmt_lwgeom_22_tests/topogeoupdateseeds9.testcase
deleted file mode 100644
index 7d6035e..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topogeoupdateseeds9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoGeo_UpdateSeeds - Blob mode
-:memory: #use in-memory database
-SELECT TopoGeo_UpdateSeeds('topology', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoGeo_UpdateSeeds('topology', zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/topomettotable25.testcase b/test/sql_stmt_lwgeom_22_tests/topomettotable25.testcase
deleted file mode 100644
index 7c08529..0000000
--- a/test/sql_stmt_lwgeom_22_tests/topomettotable25.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTable - NULL with-spatial-inxed
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTable('network', NULL, 'table', NULL, 'out', NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTable('network', NULL, 'table', NULL, 'out', NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetclone1.testcase b/test/sql_stmt_lwgeom_22_tests/toponetclone1.testcase
deleted file mode 100644
index f49d6b9..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetclone1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_Clone - NULL Network (origin)
-:memory: #use in-memory database
-SELECT TopoNet_Clone(NULL, NULL, 'destination');
-1 # rows (not including the header row)
-1 # columns
-TopoNet_Clone(NULL, NULL, 'destination')
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetclone10.testcase b/test/sql_stmt_lwgeom_22_tests/toponetclone10.testcase
deleted file mode 100644
index e6c730f..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetclone10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_Clone - Double db-prefix
-:memory: #use in-memory database
-SELECT TopoNet_Clone(1.5, 'origin', 'destination');
-1 # rows (not including the header row)
-1 # columns
-TopoNet_Clone(1.5, 'origin', 'destination')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetclone11.testcase b/test/sql_stmt_lwgeom_22_tests/toponetclone11.testcase
deleted file mode 100644
index ae7d778..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetclone11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_Clone - Integer db-prefix
-:memory: #use in-memory database
-SELECT TopoNet_Clone(1, 'origin', 'destination');
-1 # rows (not including the header row)
-1 # columns
-TopoNet_Clone(1, 'origin', 'destination')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetclone12.testcase b/test/sql_stmt_lwgeom_22_tests/toponetclone12.testcase
deleted file mode 100644
index b5262fb..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetclone12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_Clone - BLOB db-prefix
-:memory: #use in-memory database
-SELECT TopoNet_Clone(zeroblob(4), 'origin', 'destination');
-1 # rows (not including the header row)
-1 # columns
-TopoNet_Clone(zeroblob(4), 'origin', 'destination')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetclone2.testcase b/test/sql_stmt_lwgeom_22_tests/toponetclone2.testcase
deleted file mode 100644
index 0b52f15..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetclone2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_Clone - Int Network (origin)
-:memory: #use in-memory database
-SELECT TopoNet_Clone("a", 1, 'destination');
-1 # rows (not including the header row)
-1 # columns
-TopoNet_Clone("a", 1, 'destination')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetclone3.testcase b/test/sql_stmt_lwgeom_22_tests/toponetclone3.testcase
deleted file mode 100644
index 71f38a1..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetclone3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_Clone - Double Network (origin)
-:memory: #use in-memory database
-SELECT TopoNet_Clone("a", 1.5, 'destination');
-1 # rows (not including the header row)
-1 # columns
-TopoNet_Clone("a", 1.5, 'destination')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetclone4.testcase b/test/sql_stmt_lwgeom_22_tests/toponetclone4.testcase
deleted file mode 100644
index 1856c72..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetclone4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_Clone - Blob Network (origin)
-:memory: #use in-memory database
-SELECT TopoNet_Clone(NULL, zeroblob(4), 'destination');
-1 # rows (not including the header row)
-1 # columns
-TopoNet_Clone(NULL, zeroblob(4), 'destination')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetclone5.testcase b/test/sql_stmt_lwgeom_22_tests/toponetclone5.testcase
deleted file mode 100644
index b6ba2c3..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetclone5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_Clone - Text Network (origin)
-:memory: #use in-memory database
-SELECT TopoNet_Clone(NULL, 'topology', 'destination');
-1 # rows (not including the header row)
-1 # columns
-TopoNet_Clone(NULL, 'topology', 'destination')
-SQL/MM Spatial exception - invalid network name (origin).
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetclone6.testcase b/test/sql_stmt_lwgeom_22_tests/toponetclone6.testcase
deleted file mode 100644
index 451cbb9..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetclone6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_Clone - NULL Network (destination)
-:memory: #use in-memory database
-SELECT TopoNet_Clone(NULL, 'origin', NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_Clone(NULL, 'origin', NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetclone7.testcase b/test/sql_stmt_lwgeom_22_tests/toponetclone7.testcase
deleted file mode 100644
index 38cae34..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetclone7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_Clone - INT Network (destination)
-:memory: #use in-memory database
-SELECT TopoNet_Clone(NULL, 'origin', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_Clone(NULL, 'origin', 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetclone8.testcase b/test/sql_stmt_lwgeom_22_tests/toponetclone8.testcase
deleted file mode 100644
index 94cf346..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetclone8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_Clone - Double Network (destination)
-:memory: #use in-memory database
-SELECT TopoNet_Clone(NULL, 'origin', 1.2);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_Clone(NULL, 'origin', 1.2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetclone9.testcase b/test/sql_stmt_lwgeom_22_tests/toponetclone9.testcase
deleted file mode 100644
index b07e124..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetclone9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_Clone - BLOB Network (destination)
-:memory: #use in-memory database
-SELECT TopoNet_Clone(NULL, 'origin', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoNet_Clone(NULL, 'origin', zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetfromtable1.testcase b/test/sql_stmt_lwgeom_22_tests/toponetfromtable1.testcase
deleted file mode 100644
index e0d6e1c..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetfromtable1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_FromGeoTable - NULL Network
-:memory: #use in-memory database
-SELECT TopoNet_FromGeoTable(NULL, NULL, 'table', NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_FromGeoTable(NULL, NULL, 'table', NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetfromtable10.testcase b/test/sql_stmt_lwgeom_22_tests/toponetfromtable10.testcase
deleted file mode 100644
index 209a13a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetfromtable10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_FromGeoTable - NULL table
-:memory: #use in-memory database
-SELECT TopoNet_FromGeoTable('network', NULL, NULL, NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_FromGeoTable('network', NULL, NULL, NULL)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetfromtable11.testcase b/test/sql_stmt_lwgeom_22_tests/toponetfromtable11.testcase
deleted file mode 100644
index 6c392f4..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetfromtable11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_FromGeoTable - INT table
-:memory: #use in-memory database
-SELECT TopoNet_FromGeoTable('network', NULL, 1, NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_FromGeoTable('network', NULL, 1, NULL)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetfromtable12.testcase b/test/sql_stmt_lwgeom_22_tests/toponetfromtable12.testcase
deleted file mode 100644
index 06f1e4b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetfromtable12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_FromGeoTable - Double table
-:memory: #use in-memory database
-SELECT TopoNet_FromGeoTable('network', NULL, 1.2, NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_FromGeoTable('network', NULL, 1.2, NULL)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetfromtable13.testcase b/test/sql_stmt_lwgeom_22_tests/toponetfromtable13.testcase
deleted file mode 100644
index e5b614e..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetfromtable13.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_FromGeoTable - BLOB table
-:memory: #use in-memory database
-SELECT TopoNet_FromGeoTable('network', NULL, zeroblob(4), NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_FromGeoTable('network', NULL, zeroblob(4), NULL)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetfromtable14.testcase b/test/sql_stmt_lwgeom_22_tests/toponetfromtable14.testcase
deleted file mode 100644
index 2ad8b75..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetfromtable14.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_FromGeoTable - Text Column
-:memory: #use in-memory database
-SELECT TopoNet_FromGeoTable('network', NULL, 'table', 'column');
-1 # rows (not including the header row)
-1 # columns
-TopoNet_FromGeoTable('network', NULL, 'table', 'column')
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetfromtable15.testcase b/test/sql_stmt_lwgeom_22_tests/toponetfromtable15.testcase
deleted file mode 100644
index 8df3cd6..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetfromtable15.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_FromGeoTable - Int Column
-:memory: #use in-memory database
-SELECT TopoNet_FromGeoTable('network', NULL, 'table', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_FromGeoTable('network', NULL, 'table', 1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetfromtable16.testcase b/test/sql_stmt_lwgeom_22_tests/toponetfromtable16.testcase
deleted file mode 100644
index 6d1b014..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetfromtable16.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_FromGeoTable - Double Column
-:memory: #use in-memory database
-SELECT TopoNet_FromGeoTable('network', NULL, 'table', 1.2);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_FromGeoTable('network', NULL, 'table', 1.2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetfromtable17.testcase b/test/sql_stmt_lwgeom_22_tests/toponetfromtable17.testcase
deleted file mode 100644
index 6c9196b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetfromtable17.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_FromGeoTable - BLOB Column
-:memory: #use in-memory database
-SELECT TopoNet_FromGeoTable('network', NULL, 'table', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoNet_FromGeoTable('network', NULL, 'table', zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetfromtable2.testcase b/test/sql_stmt_lwgeom_22_tests/toponetfromtable2.testcase
deleted file mode 100644
index e628315..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetfromtable2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_FromGeoTable - Int Network
-:memory: #use in-memory database
-SELECT TopoNet_FromGeoTable(1, NULL, 'table', NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_FromGeoTable(1, NULL, 'table', NULL)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetfromtable3.testcase b/test/sql_stmt_lwgeom_22_tests/toponetfromtable3.testcase
deleted file mode 100644
index 8cb16cf..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetfromtable3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_FromGeoTable - Double Network
-:memory: #use in-memory database
-SELECT TopoNet_FromGeoTable(1.5, NULL, 'table', NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_FromGeoTable(1.5, NULL, 'table', NULL)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetfromtable4.testcase b/test/sql_stmt_lwgeom_22_tests/toponetfromtable4.testcase
deleted file mode 100644
index c6c4554..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetfromtable4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_FromGeoTable - Blob Network
-:memory: #use in-memory database
-SELECT TopoNet_FromGeoTable(zeroblob(4), NULL, 'table', NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_FromGeoTable(zeroblob(4), NULL, 'table', NULL)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetfromtable5.testcase b/test/sql_stmt_lwgeom_22_tests/toponetfromtable5.testcase
deleted file mode 100644
index 38b1055..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetfromtable5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_FromGeoTable - Text Network
-:memory: #use in-memory database
-SELECT TopoNet_FromGeoTable('network', NULL, 'table', NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_FromGeoTable('network', NULL, 'table', NULL)
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetfromtable6.testcase b/test/sql_stmt_lwgeom_22_tests/toponetfromtable6.testcase
deleted file mode 100644
index d127d9a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetfromtable6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_FromGeoTable - TEXT prefix
-:memory: #use in-memory database
-SELECT TopoNet_FromGeoTable('network', 'a', 'table', NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_FromGeoTable('network', 'a', 'table', NULL)
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetfromtable7.testcase b/test/sql_stmt_lwgeom_22_tests/toponetfromtable7.testcase
deleted file mode 100644
index 950d49f..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetfromtable7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_FromGeoTable - INT prefix
-:memory: #use in-memory database
-SELECT TopoNet_FromGeoTable('network', 1, 'table', NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_FromGeoTable('network', 1, 'table', NULL)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetfromtable8.testcase b/test/sql_stmt_lwgeom_22_tests/toponetfromtable8.testcase
deleted file mode 100644
index f621d03..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetfromtable8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_FromGeoTable - Double prefix
-:memory: #use in-memory database
-SELECT TopoNet_FromGeoTable('network', 1.2, 'table', NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_FromGeoTable('network', 1.2, 'table', NULL)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetfromtable9.testcase b/test/sql_stmt_lwgeom_22_tests/toponetfromtable9.testcase
deleted file mode 100644
index 2c3661f..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetfromtable9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_FromGeoTable - BLOB prefix
-:memory: #use in-memory database
-SELECT TopoNet_FromGeoTable('network', zeroblob(4), 'table', NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_FromGeoTable('network', zeroblob(4), 'table', NULL)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotable1.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotable1.testcase
deleted file mode 100644
index b4353dc..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotable1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTable - NULL Network
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTable(NULL, NULL, 'table', NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTable(NULL, NULL, 'table', NULL, 'out')
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotable10.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotable10.testcase
deleted file mode 100644
index 5f592b8..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotable10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTable - NULL ref-table
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTable('network', NULL, NULL, NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTable('network', NULL, NULL, NULL, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotable11.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotable11.testcase
deleted file mode 100644
index c7fb39e..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotable11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTable - INT ref-table
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTable('network', NULL, 1, NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTable('network', NULL, 1, NULL, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotable12.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotable12.testcase
deleted file mode 100644
index 766e211..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotable12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTable - Double ref-table
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTable('network', NULL, 1.2, NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTable('network', NULL, 1.2, NULL, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotable13.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotable13.testcase
deleted file mode 100644
index b400604..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotable13.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTable - BLOB table
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTable('network', NULL, zeroblob(4), NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTable('network', NULL, zeroblob(4), NULL, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotable14.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotable14.testcase
deleted file mode 100644
index c98d582..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotable14.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTable - Text Column
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTable('network', NULL, 'table', 'column', 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTable('network', NULL, 'table', 'column', 'out')
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotable15.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotable15.testcase
deleted file mode 100644
index af3680c..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotable15.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTable - Int Column
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTable('network', NULL, 'table', 1, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTable('network', NULL, 'table', 1, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotable16.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotable16.testcase
deleted file mode 100644
index 4940282..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotable16.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTable - Double Column
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTable('network', NULL, 'table', 1.2, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTable('network', NULL, 'table', 1.2, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotable17.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotable17.testcase
deleted file mode 100644
index f322e21..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotable17.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTable - BLOB Column
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTable('network', NULL, 'table', zeroblob(4), 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTable('network', NULL, 'table', zeroblob(4), 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotable18.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotable18.testcase
deleted file mode 100644
index 289a5a4..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotable18.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTable - NULL out-table
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTable('topology', NULL, 'table', NULL, NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTable('topology', NULL, 'table', NULL, NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotable19.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotable19.testcase
deleted file mode 100644
index cf53e38..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotable19.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTable - Double out-table
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTable('topology', NULL, 'table', NULL, 1.2);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTable('topology', NULL, 'table', NULL, 1.2)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotable2.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotable2.testcase
deleted file mode 100644
index 4ff910e..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotable2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTable - Int Network
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTable(1, NULL, 'table', NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTable(1, NULL, 'table', NULL, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotable20.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotable20.testcase
deleted file mode 100644
index f9c8376..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotable20.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTable - BLOB out-table
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTable('topology', NULL, 'table', NULL, zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTable('topology', NULL, 'table', NULL, zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotable21.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotable21.testcase
deleted file mode 100644
index fed7ebb..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotable21.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTable - Text out-table
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTable('network', NULL, 'table', NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTable('network', NULL, 'table', NULL, 'out')
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotable22.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotable22.testcase
deleted file mode 100644
index b71ab30..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotable22.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTable - Text with-spatial-inxed
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTable('network', NULL, 'table', NULL, 'out', 'no');
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTable('network', NULL, 'table', NULL, 'out', 'no')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotable23.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotable23.testcase
deleted file mode 100644
index 4f61322..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotable23.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTable - BLOB with-spatial-inxed
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTable('network', NULL, 'table', NULL, 'out', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTable('network', NULL, 'table', NULL, 'out', zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotable24.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotable24.testcase
deleted file mode 100644
index 67bfc92..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotable24.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTable - Double with-spatial-inxed
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTable('network', NULL, 'table', NULL, 'out', 1.1);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTable('network', NULL, 'table', NULL, 'out', 1.1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotable25.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotable25.testcase
deleted file mode 100644
index 11dd2e9..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotable25.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTableGeneralize - NULL with-spatial-index
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTableGeneralize('network', NULL, 'table', NULL, 'out', NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTableGeneralize('network', NULL, 'table', NULL, 'out', NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotable26.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotable26.testcase
deleted file mode 100644
index 3cd3858..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotable26.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTable - Integer with-spatial-inxed
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTable('network', NULL, 'table', NULL, 'out', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTable('network', NULL, 'table', NULL, 'out', 1)
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotable3.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotable3.testcase
deleted file mode 100644
index 54fd361..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotable3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTable - Double Network
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTable(1.5, NULL, 'table', NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTable(1.5, NULL, 'table', NULL, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotable4.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotable4.testcase
deleted file mode 100644
index 421f9c7..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotable4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTable - Blob Network
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTable(zeroblob(4), NULL, 'table', NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTable(zeroblob(4), NULL, 'table', NULL, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotable5.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotable5.testcase
deleted file mode 100644
index cd6386a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotable5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTable - Text Network
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTable('network', NULL, 'table', NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTable('network', NULL, 'table', NULL, 'out')
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotable6.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotable6.testcase
deleted file mode 100644
index 79656f3..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotable6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTable - TEXT prefix
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTable('network', 'a', 'table', NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTable('network', 'a', 'table', NULL, 'out')
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotable7.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotable7.testcase
deleted file mode 100644
index 18af3a1..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotable7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTable - INT prefix
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTable('network', 1, 'table', NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTable('network', 1, 'table', NULL, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotable8.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotable8.testcase
deleted file mode 100644
index 58b2bdf..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotable8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTable - Double prefix
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTable('network', 1.2, 'table', NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTable('network', 1.2, 'table', NULL, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotable9.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotable9.testcase
deleted file mode 100644
index 5a21c54..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotable9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTable - BLOB prefix
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTable('network', zeroblob(4), 'table', NULL, 'out');
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTable('network', zeroblob(4), 'table', NULL, 'out')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotablegen1.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotablegen1.testcase
deleted file mode 100644
index f5abafb..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotablegen1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTableGeneralize - NULL Network
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTableGeneralize(NULL, NULL, 'table', NULL, 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTableGeneralize(NULL, NULL, 'table', NULL, 'out', 10.0)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotablegen10.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotablegen10.testcase
deleted file mode 100644
index 3ff2992..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotablegen10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTableGeneralize - NULL ref-table
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTableGeneralize('network', NULL, NULL, NULL, 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTableGeneralize('network', NULL, NULL, NULL, 'out', 10.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotablegen11.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotablegen11.testcase
deleted file mode 100644
index 6a149d1..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotablegen11.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTableGeneralize - INT ref-table
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTableGeneralize('network', NULL, 1, NULL, 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTableGeneralize('network', NULL, 1, NULL, 'out', 10.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotablegen12.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotablegen12.testcase
deleted file mode 100644
index fe3a22e..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotablegen12.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTableGeneralize - Double ref-table
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTableGeneralize('network', NULL, 1.2, NULL, 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTableGeneralize('network', NULL, 1.2, NULL, 'out', 10.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotablegen13.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotablegen13.testcase
deleted file mode 100644
index 61545dd..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotablegen13.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTableGeneralize - BLOB table
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTableGeneralize('network', NULL, zeroblob(4), NULL, 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTableGeneralize('network', NULL, zeroblob(4), NULL, 'out', 10.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotablegen14.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotablegen14.testcase
deleted file mode 100644
index 05f2b03..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotablegen14.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTableGeneralize - Text Column
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTableGeneralize('network', NULL, 'table', 'column', 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTableGeneralize('network', NULL, 'table', 'column', 'out', 10.0)
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotablegen15.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotablegen15.testcase
deleted file mode 100644
index c5ba512..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotablegen15.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTableGeneralize - Int Column
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTableGeneralize('network', NULL, 'table', 1, 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTableGeneralize('network', NULL, 'table', 1, 'out', 10.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotablegen16.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotablegen16.testcase
deleted file mode 100644
index b9dbb5b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotablegen16.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTableGeneralize - Double Column
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTableGeneralize('network', NULL, 'table', 1.2, 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTableGeneralize('network', NULL, 'table', 1.2, 'out', 10.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotablegen17.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotablegen17.testcase
deleted file mode 100644
index c105792..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotablegen17.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTableGeneralize - BLOB Column
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTableGeneralize('network', NULL, 'table', zeroblob(4), 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTableGeneralize('network', NULL, 'table', zeroblob(4), 'out', 10.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotablegen18.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotablegen18.testcase
deleted file mode 100644
index da8cb3b..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotablegen18.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTableGeneralize - NULL out-table
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTableGeneralize('topology', NULL, 'table', NULL, NULL, 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTableGeneralize('topology', NULL, 'table', NULL, NULL, 10.0)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotablegen19.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotablegen19.testcase
deleted file mode 100644
index 592d050..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotablegen19.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTableGeneralize - Double out-table
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTableGeneralize('topology', NULL, 'table', NULL, 1.2, 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTableGeneralize('topology', NULL, 'table', NULL, 1.2, 10.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotablegen2.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotablegen2.testcase
deleted file mode 100644
index 024a5c2..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotablegen2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTableGeneralize - Int Network
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTableGeneralize(1, NULL, 'table', NULL, 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTableGeneralize(1, NULL, 'table', NULL, 'out', 10.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotablegen20.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotablegen20.testcase
deleted file mode 100644
index a72a9c1..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotablegen20.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTableGeneralize - BLOB out-table
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTableGeneralize('topology', NULL, 'table', NULL, zeroblob(4), 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTableGeneralize('topology', NULL, 'table', NULL, zeroblob(4), 10.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotablegen21.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotablegen21.testcase
deleted file mode 100644
index 8ae8e47..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotablegen21.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTableGeneralize - Text out-table
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTableGeneralize('network', NULL, 'table', NULL, 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTableGeneralize('network', NULL, 'table', NULL, 'out', 10.0)
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotablegen22.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotablegen22.testcase
deleted file mode 100644
index 6854830..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotablegen22.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTableGeneralize - Text tolerance
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTableGeneralize('network', NULL, 'table', NULL, 'out', 'tol');
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTableGeneralize('network', NULL, 'table', NULL, 'out', 'tol')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotablegen23.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotablegen23.testcase
deleted file mode 100644
index 24a5da8..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotablegen23.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTableGeneralize - BLOB tolerance
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTableGeneralize('network', NULL, 'table', NULL, 'out', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTableGeneralize('network', NULL, 'table', NULL, 'out', zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotablegen24.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotablegen24.testcase
deleted file mode 100644
index c319b08..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotablegen24.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTableGeneralize - Double tolerance
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTableGeneralize('network', NULL, 'table', NULL, 'out', 1.1);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTableGeneralize('network', NULL, 'table', NULL, 'out', 1.1)
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotablegen25.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotablegen25.testcase
deleted file mode 100644
index c21ef06..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotablegen25.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTableGeneralize - NULL tolerance
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTableGeneralize('network', NULL, 'table', NULL, 'out', NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTableGeneralize('network', NULL, 'table', NULL, 'out', NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotablegen26.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotablegen26.testcase
deleted file mode 100644
index 85c576a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotablegen26.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTableGeneralize - Integer tolerance
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTableGeneralize('network', NULL, 'table', NULL, 'out', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTableGeneralize('network', NULL, 'table', NULL, 'out', 1)
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotablegen27.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotablegen27.testcase
deleted file mode 100644
index 67d3610..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotablegen27.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTableGeneralize - Text with-spatial-inxed
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTableGeneralize('network', NULL, 'table', NULL, 'out', 10.0, 'no');
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTableGeneralize('network', NULL, 'table', NULL, 'out', 10.0, 'no')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotablegen28.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotablegen28.testcase
deleted file mode 100644
index 01da82f..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotablegen28.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTableGeneralize - BLOB with-spatial-inxed
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTableGeneralize('network', NULL, 'table', NULL, 'out', 10.0, zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTableGeneralize('network', NULL, 'table', NULL, 'out', 10.0, zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotablegen29.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotablegen29.testcase
deleted file mode 100644
index 000e4d9..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotablegen29.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTableGeneralize - Double with-spatial-inxed
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTableGeneralize('network', NULL, 'table', NULL, 'out', 10.0, 1.1);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTableGeneralize('network', NULL, 'table', NULL, 'out', 10.0, 1.1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotablegen3.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotablegen3.testcase
deleted file mode 100644
index 977bd56..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotablegen3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTableGeneralize - Double Network
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTableGeneralize(1.5, NULL, 'table', NULL, 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTableGeneralize(1.5, NULL, 'table', NULL, 'out', 10.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotablegen30.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotablegen30.testcase
deleted file mode 100644
index b972b01..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotablegen30.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTableGeneralize - Integer with-spatial-inxed
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTableGeneralize('network', NULL, 'table', NULL, 'out', 10.0, 1);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTableGeneralize('network', NULL, 'table', NULL, 'out', 10.0, 1)
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotablegen31.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotablegen31.testcase
deleted file mode 100644
index e19ce4d..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotablegen31.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTableGeneralize - NULL with-spatial-inxed
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTableGeneralize('network', NULL, 'table', NULL, 'out', 10.0, NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTableGeneralize('network', NULL, 'table', NULL, 'out', 10.0, NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotablegen4.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotablegen4.testcase
deleted file mode 100644
index a05733a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotablegen4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTableGeneralize - Blob Network
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTableGeneralize(zeroblob(4), NULL, 'table', NULL, 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTableGeneralize(zeroblob(4), NULL, 'table', NULL, 'out', 10.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotablegen5.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotablegen5.testcase
deleted file mode 100644
index 58cfe5e..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotablegen5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTableGeneralize - Text Network
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTableGeneralize('network', NULL, 'table', NULL, 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTableGeneralize('network', NULL, 'table', NULL, 'out', 10.0)
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotablegen6.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotablegen6.testcase
deleted file mode 100644
index 857af60..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotablegen6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTableGeneralize - TEXT prefix
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTableGeneralize('network', 'a', 'table', NULL, 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTableGeneralize('network', 'a', 'table', NULL, 'out', 10.0)
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotablegen7.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotablegen7.testcase
deleted file mode 100644
index a528d56..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotablegen7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTableGeneralize - INT prefix
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTableGeneralize('network', 1, 'table', NULL, 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTableGeneralize('network', 1, 'table', NULL, 'out', 10.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotablegen8.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotablegen8.testcase
deleted file mode 100644
index 510e1e4..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotablegen8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTableGeneralize - Double prefix
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTableGeneralize('network', 1.2, 'table', NULL, 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTableGeneralize('network', 1.2, 'table', NULL, 'out', 10.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponettotablegen9.testcase b/test/sql_stmt_lwgeom_22_tests/toponettotablegen9.testcase
deleted file mode 100644
index e0cc314..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponettotablegen9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTableGeneralize - BLOB prefix
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTableGeneralize('network', zeroblob(4), 'table', NULL, 'out', 10.0);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTableGeneralize('network', zeroblob(4), 'table', NULL, 'out', 10.0)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetupdateseeds1.testcase b/test/sql_stmt_lwgeom_22_tests/toponetupdateseeds1.testcase
deleted file mode 100644
index 1afb288..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetupdateseeds1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_UpdateSeeds - NULL Network
-:memory: #use in-memory database
-SELECT TopoNet_UpdateSeeds(NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_UpdateSeeds(NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetupdateseeds10.testcase b/test/sql_stmt_lwgeom_22_tests/toponetupdateseeds10.testcase
deleted file mode 100644
index ea72c22..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetupdateseeds10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_UpdateSeeds - Text mode
-:memory: #use in-memory database
-SELECT TopoNet_UpdateSeeds('network', 'mode');
-1 # rows (not including the header row)
-1 # columns
-TopoNet_UpdateSeeds('network', 'mode')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetupdateseeds2.testcase b/test/sql_stmt_lwgeom_22_tests/toponetupdateseeds2.testcase
deleted file mode 100644
index e4f4ae1..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetupdateseeds2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_UpdateSeeds - Int Network
-:memory: #use in-memory database
-SELECT TopoNet_UpdateSeeds(1);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_UpdateSeeds(1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetupdateseeds3.testcase b/test/sql_stmt_lwgeom_22_tests/toponetupdateseeds3.testcase
deleted file mode 100644
index 913c437..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetupdateseeds3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_UpdateSeeds - Double Network
-:memory: #use in-memory database
-SELECT TopoNet_UpdateSeeds(1.5);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_UpdateSeeds(1.5)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetupdateseeds4.testcase b/test/sql_stmt_lwgeom_22_tests/toponetupdateseeds4.testcase
deleted file mode 100644
index d58f2f4..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetupdateseeds4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_UpdateSeeds - Blob Network 
-:memory: #use in-memory database
-SELECT TopoNet_UpdateSeeds(zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoNet_UpdateSeeds(zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetupdateseeds5.testcase b/test/sql_stmt_lwgeom_22_tests/toponetupdateseeds5.testcase
deleted file mode 100644
index 866d9c7..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetupdateseeds5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_UpdateSeeds - Text Network 
-:memory: #use in-memory database
-SELECT TopoNet_UpdateSeeds('network');
-1 # rows (not including the header row)
-1 # columns
-TopoNet_UpdateSeeds('network')
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetupdateseeds6.testcase b/test/sql_stmt_lwgeom_22_tests/toponetupdateseeds6.testcase
deleted file mode 100644
index 0fa98fb..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetupdateseeds6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_UpdateSeeds - NULL mode
-:memory: #use in-memory database
-SELECT TopoNet_UpdateSeeds('network', NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_UpdateSeeds('network', NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetupdateseeds7.testcase b/test/sql_stmt_lwgeom_22_tests/toponetupdateseeds7.testcase
deleted file mode 100644
index 8f06aad..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetupdateseeds7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_UpdateSeeds - Int mode
-:memory: #use in-memory database
-SELECT TopoNet_UpdateSeeds('network', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_UpdateSeeds('network', 1)
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetupdateseeds8.testcase b/test/sql_stmt_lwgeom_22_tests/toponetupdateseeds8.testcase
deleted file mode 100644
index d2fdc3a..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetupdateseeds8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_UpdateSeeds - Double mode
-:memory: #use in-memory database
-SELECT TopoNet_UpdateSeeds('network', 1.5);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_UpdateSeeds('network', 1.5)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/toponetupdateseeds9.testcase b/test/sql_stmt_lwgeom_22_tests/toponetupdateseeds9.testcase
deleted file mode 100644
index 856e2ea..0000000
--- a/test/sql_stmt_lwgeom_22_tests/toponetupdateseeds9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_UpdateSeeds - Blob mode
-:memory: #use in-memory database
-SELECT TopoNet_UpdateSeeds('network', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoNet_UpdateSeeds('network', zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/validatetopogeo1.testcase b/test/sql_stmt_lwgeom_22_tests/validatetopogeo1.testcase
deleted file mode 100644
index 633bef2..0000000
--- a/test/sql_stmt_lwgeom_22_tests/validatetopogeo1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_ValidateTopoGeo - NULL Topology
-:memory: #use in-memory database
-SELECT ST_ValidateTopoGeo(NULL);
-1 # rows (not including the header row)
-1 # columns
-ST_ValidateTopoGeo(NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/validatetopogeo2.testcase b/test/sql_stmt_lwgeom_22_tests/validatetopogeo2.testcase
deleted file mode 100644
index 8c426fc..0000000
--- a/test/sql_stmt_lwgeom_22_tests/validatetopogeo2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_ValidateTopoGeo - Int Topology
-:memory: #use in-memory database
-SELECT ST_ValidateTopoGeo(1);
-1 # rows (not including the header row)
-1 # columns
-ST_ValidateTopoGeo(1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/validatetopogeo3.testcase b/test/sql_stmt_lwgeom_22_tests/validatetopogeo3.testcase
deleted file mode 100644
index fb9a6c9..0000000
--- a/test/sql_stmt_lwgeom_22_tests/validatetopogeo3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_ValidateTopoGeo - Double Topology
-:memory: #use in-memory database
-SELECT ST_ValidateTopoGeo(1.5);
-1 # rows (not including the header row)
-1 # columns
-ST_ValidateTopoGeo(1.5)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/validatetopogeo4.testcase b/test/sql_stmt_lwgeom_22_tests/validatetopogeo4.testcase
deleted file mode 100644
index 32aa6dc..0000000
--- a/test/sql_stmt_lwgeom_22_tests/validatetopogeo4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_ValidateTopoGeo - Blob Topology
-:memory: #use in-memory database
-SELECT ST_ValidateTopoGeo(zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-ST_ValidateTopoGeo(zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/validatetopogeo5.testcase b/test/sql_stmt_lwgeom_22_tests/validatetopogeo5.testcase
deleted file mode 100644
index 03dc517..0000000
--- a/test/sql_stmt_lwgeom_22_tests/validatetopogeo5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_ValidateTopoGeo - Text Topology
-:memory: #use in-memory database
-SELECT ST_ValidateTopoGeo('topology');
-1 # rows (not including the header row)
-1 # columns
-ST_ValidateTopoGeo('topology')
-SQL/MM Spatial exception - invalid topology name.
diff --git a/test/sql_stmt_lwgeom_22_tests/validlogicalnet1.testcase b/test/sql_stmt_lwgeom_22_tests/validlogicalnet1.testcase
deleted file mode 100644
index 3c84be4..0000000
--- a/test/sql_stmt_lwgeom_22_tests/validlogicalnet1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_ValidLogicalNet - NULL Network
-:memory: #use in-memory database
-SELECT ST_ValidLogicalNet(NULL);
-1 # rows (not including the header row)
-1 # columns
-ST_ValidLogicalNet(NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/validlogicalnet2.testcase b/test/sql_stmt_lwgeom_22_tests/validlogicalnet2.testcase
deleted file mode 100644
index 3f0647d..0000000
--- a/test/sql_stmt_lwgeom_22_tests/validlogicalnet2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_ValidLogicalNet - Int Network
-:memory: #use in-memory database
-SELECT ST_ValidLogicalNet(1);
-1 # rows (not including the header row)
-1 # columns
-ST_ValidLogicalNet(1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/validlogicalnet3.testcase b/test/sql_stmt_lwgeom_22_tests/validlogicalnet3.testcase
deleted file mode 100644
index f0a0183..0000000
--- a/test/sql_stmt_lwgeom_22_tests/validlogicalnet3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_ValidLogicalNet - Double Network
-:memory: #use in-memory database
-SELECT ST_ValidLogicalNet(1.5);
-1 # rows (not including the header row)
-1 # columns
-ST_ValidLogicalNet(1.5)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/validlogicalnet4.testcase b/test/sql_stmt_lwgeom_22_tests/validlogicalnet4.testcase
deleted file mode 100644
index 67afea7..0000000
--- a/test/sql_stmt_lwgeom_22_tests/validlogicalnet4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_ValidLogicalNet - Blob Network
-:memory: #use in-memory database
-SELECT ST_ValidLogicalNet(zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-ST_ValidLogicalNet(zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/validlogicalnet5.testcase b/test/sql_stmt_lwgeom_22_tests/validlogicalnet5.testcase
deleted file mode 100644
index cbdf692..0000000
--- a/test/sql_stmt_lwgeom_22_tests/validlogicalnet5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_ValidLogicalNet - Text Network
-:memory: #use in-memory database
-SELECT ST_ValidLogicalNet('network');
-1 # rows (not including the header row)
-1 # columns
-ST_ValidLogicalNet('network')
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_lwgeom_22_tests/validspatialnet1.testcase b/test/sql_stmt_lwgeom_22_tests/validspatialnet1.testcase
deleted file mode 100644
index f9b23e0..0000000
--- a/test/sql_stmt_lwgeom_22_tests/validspatialnet1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_ValidSpatialNet - NULL Network
-:memory: #use in-memory database
-SELECT ST_ValidSpatialNet(NULL);
-1 # rows (not including the header row)
-1 # columns
-ST_ValidSpatialNet(NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/validspatialnet2.testcase b/test/sql_stmt_lwgeom_22_tests/validspatialnet2.testcase
deleted file mode 100644
index e2dd299..0000000
--- a/test/sql_stmt_lwgeom_22_tests/validspatialnet2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_ValidSpatialNet - Int Network
-:memory: #use in-memory database
-SELECT ST_ValidSpatialNet(1);
-1 # rows (not including the header row)
-1 # columns
-ST_ValidSpatialNet(1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/validspatialnet3.testcase b/test/sql_stmt_lwgeom_22_tests/validspatialnet3.testcase
deleted file mode 100644
index 981eb2d..0000000
--- a/test/sql_stmt_lwgeom_22_tests/validspatialnet3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_ValidSpatialNet - Double Network
-:memory: #use in-memory database
-SELECT ST_ValidSpatialNet(1.5);
-1 # rows (not including the header row)
-1 # columns
-ST_ValidSpatialNet(1.5)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/validspatialnet4.testcase b/test/sql_stmt_lwgeom_22_tests/validspatialnet4.testcase
deleted file mode 100644
index 9c1bb57..0000000
--- a/test/sql_stmt_lwgeom_22_tests/validspatialnet4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_ValidSpatialNet - Blob Network
-:memory: #use in-memory database
-SELECT ST_ValidSpatialNet(zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-ST_ValidSpatialNet(zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_lwgeom_22_tests/validspatialnet5.testcase b/test/sql_stmt_lwgeom_22_tests/validspatialnet5.testcase
deleted file mode 100644
index f83be65..0000000
--- a/test/sql_stmt_lwgeom_22_tests/validspatialnet5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_ValidSpatialNet - Text Network
-:memory: #use in-memory database
-SELECT ST_ValidSpatialNet('network');
-1 # rows (not including the header row)
-1 # columns
-ST_ValidSpatialNet('network')
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_nocache_tests/Makefile.am b/test/sql_stmt_nocache_tests/Makefile.am
index a616c02..1ad68a0 100644
--- a/test/sql_stmt_nocache_tests/Makefile.am
+++ b/test/sql_stmt_nocache_tests/Makefile.am
@@ -1,7 +1,3 @@
 
-EXTRA_DIST = amphibious1.testcase \
-	amphibious2.testcase \
-	precision1.testcase \
-	precision2.testcase \
-	gpkg1.testcase \
-	gpkg2.testcase 
+EXTRA_DIST = precision1.testcase \
+	precision2.testcase 
diff --git a/test/sql_stmt_nocache_tests/Makefile.in b/test/sql_stmt_nocache_tests/Makefile.in
index 9cca168..33bbb62 100644
--- a/test/sql_stmt_nocache_tests/Makefile.in
+++ b/test/sql_stmt_nocache_tests/Makefile.in
@@ -251,12 +251,8 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = amphibious1.testcase \
-	amphibious2.testcase \
-	precision1.testcase \
-	precision2.testcase \
-	gpkg1.testcase \
-	gpkg2.testcase 
+EXTRA_DIST = precision1.testcase \
+	precision2.testcase 
 
 all: all-am
 
diff --git a/test/sql_stmt_rtgeom_tests/st_azimuth10.testcase b/test/sql_stmt_rtgeom_tests/st_azimuth10.testcase
deleted file mode 100644
index 1fbae7f..0000000
--- a/test/sql_stmt_rtgeom_tests/st_azimuth10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ST_Azimuth - text PointA (error)
-:memory: #use in-memory database
-SELECT ST_Azimuth('alpha', MakePoint(10, 10, 4326));
-1 # rows (not including the header row)
-1 # columns
-ST_Azimuth('alpha', MakePoint(10, 10, 4326))
-(NULL)
diff --git a/test/sql_stmt_rttopo_tests/topomettotable25.testcase b/test/sql_stmt_rttopo_tests/topomettotable25.testcase
deleted file mode 100644
index 7c08529..0000000
--- a/test/sql_stmt_rttopo_tests/topomettotable25.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_ToGeoTable - NULL with-spatial-inxed
-:memory: #use in-memory database
-SELECT TopoNet_ToGeoTable('network', NULL, 'table', NULL, 'out', NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_ToGeoTable('network', NULL, 'table', NULL, 'out', NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_rttopo_tests/toponetupdateseeds1.testcase b/test/sql_stmt_rttopo_tests/toponetupdateseeds1.testcase
deleted file mode 100644
index 1afb288..0000000
--- a/test/sql_stmt_rttopo_tests/toponetupdateseeds1.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_UpdateSeeds - NULL Network
-:memory: #use in-memory database
-SELECT TopoNet_UpdateSeeds(NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_UpdateSeeds(NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_rttopo_tests/toponetupdateseeds10.testcase b/test/sql_stmt_rttopo_tests/toponetupdateseeds10.testcase
deleted file mode 100644
index ea72c22..0000000
--- a/test/sql_stmt_rttopo_tests/toponetupdateseeds10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_UpdateSeeds - Text mode
-:memory: #use in-memory database
-SELECT TopoNet_UpdateSeeds('network', 'mode');
-1 # rows (not including the header row)
-1 # columns
-TopoNet_UpdateSeeds('network', 'mode')
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_rttopo_tests/toponetupdateseeds2.testcase b/test/sql_stmt_rttopo_tests/toponetupdateseeds2.testcase
deleted file mode 100644
index e4f4ae1..0000000
--- a/test/sql_stmt_rttopo_tests/toponetupdateseeds2.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_UpdateSeeds - Int Network
-:memory: #use in-memory database
-SELECT TopoNet_UpdateSeeds(1);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_UpdateSeeds(1)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_rttopo_tests/toponetupdateseeds3.testcase b/test/sql_stmt_rttopo_tests/toponetupdateseeds3.testcase
deleted file mode 100644
index 913c437..0000000
--- a/test/sql_stmt_rttopo_tests/toponetupdateseeds3.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_UpdateSeeds - Double Network
-:memory: #use in-memory database
-SELECT TopoNet_UpdateSeeds(1.5);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_UpdateSeeds(1.5)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_rttopo_tests/toponetupdateseeds4.testcase b/test/sql_stmt_rttopo_tests/toponetupdateseeds4.testcase
deleted file mode 100644
index d58f2f4..0000000
--- a/test/sql_stmt_rttopo_tests/toponetupdateseeds4.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_UpdateSeeds - Blob Network 
-:memory: #use in-memory database
-SELECT TopoNet_UpdateSeeds(zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoNet_UpdateSeeds(zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_rttopo_tests/toponetupdateseeds5.testcase b/test/sql_stmt_rttopo_tests/toponetupdateseeds5.testcase
deleted file mode 100644
index 866d9c7..0000000
--- a/test/sql_stmt_rttopo_tests/toponetupdateseeds5.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_UpdateSeeds - Text Network 
-:memory: #use in-memory database
-SELECT TopoNet_UpdateSeeds('network');
-1 # rows (not including the header row)
-1 # columns
-TopoNet_UpdateSeeds('network')
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_rttopo_tests/toponetupdateseeds6.testcase b/test/sql_stmt_rttopo_tests/toponetupdateseeds6.testcase
deleted file mode 100644
index 0fa98fb..0000000
--- a/test/sql_stmt_rttopo_tests/toponetupdateseeds6.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_UpdateSeeds - NULL mode
-:memory: #use in-memory database
-SELECT TopoNet_UpdateSeeds('network', NULL);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_UpdateSeeds('network', NULL)
-SQL/MM Spatial exception - null argument.
diff --git a/test/sql_stmt_rttopo_tests/toponetupdateseeds7.testcase b/test/sql_stmt_rttopo_tests/toponetupdateseeds7.testcase
deleted file mode 100644
index 8f06aad..0000000
--- a/test/sql_stmt_rttopo_tests/toponetupdateseeds7.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_UpdateSeeds - Int mode
-:memory: #use in-memory database
-SELECT TopoNet_UpdateSeeds('network', 1);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_UpdateSeeds('network', 1)
-SQL/MM Spatial exception - invalid network name.
diff --git a/test/sql_stmt_rttopo_tests/toponetupdateseeds8.testcase b/test/sql_stmt_rttopo_tests/toponetupdateseeds8.testcase
deleted file mode 100644
index d2fdc3a..0000000
--- a/test/sql_stmt_rttopo_tests/toponetupdateseeds8.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_UpdateSeeds - Double mode
-:memory: #use in-memory database
-SELECT TopoNet_UpdateSeeds('network', 1.5);
-1 # rows (not including the header row)
-1 # columns
-TopoNet_UpdateSeeds('network', 1.5)
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_rttopo_tests/toponetupdateseeds9.testcase b/test/sql_stmt_rttopo_tests/toponetupdateseeds9.testcase
deleted file mode 100644
index 856e2ea..0000000
--- a/test/sql_stmt_rttopo_tests/toponetupdateseeds9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-TopoNet_UpdateSeeds - Blob mode
-:memory: #use in-memory database
-SELECT TopoNet_UpdateSeeds('network', zeroblob(4));
-1 # rows (not including the header row)
-1 # columns
-TopoNet_UpdateSeeds('network', zeroblob(4))
-SQL/MM Spatial exception - invalid argument.
diff --git a/test/sql_stmt_tests/atmtransform10.testcase b/test/sql_stmt_tests/atmtransform10.testcase
deleted file mode 100644
index f9b9d90..0000000
--- a/test/sql_stmt_tests/atmtransform10.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ATM_Transform() - invalid Srid
-:memory: #use in-memory database
-SELECT AsEWKT(ATM_Transform(GeomFromText('POINT(0 0)', 32632), ATM_Create(), 32633.0));
-1 # rows (not including the header row)
-1 # columns
-AsEWKT(ATM_Transform(GeomFromText('POINT(0 0)', 32632), ATM_Create(), 32633.0));
-(NULL)
diff --git a/test/sql_stmt_tests/atmtransform9.testcase b/test/sql_stmt_tests/atmtransform9.testcase
deleted file mode 100644
index 89eb870..0000000
--- a/test/sql_stmt_tests/atmtransform9.testcase
+++ /dev/null
@@ -1,7 +0,0 @@
-ATM_Transform() - 4326 Srid
-:memory: #use in-memory database
-SELECT AsEWKT(ATM_Transform(GeomFromText('POINT(0 0)', 32632), ATM_Create(), 32633));
-1 # rows (not including the header row)
-1 # columns
-AsEWKT(ATM_Transform(GeomFromText('POINT(0 0)', 32632), ATM_Create(), 32633));
-SRID=32633;POINT(0 0)
diff --git a/test/sql_stmt_voronoj1_tests/Makefile b/test/sql_stmt_voronoj1_tests/Makefile
deleted file mode 100644
index 961f961..0000000
--- a/test/sql_stmt_voronoj1_tests/Makefile
+++ /dev/null
@@ -1,468 +0,0 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
-# test/sql_stmt_voronoj1_tests/Makefile.  Generated from Makefile.in by configure.
-
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/libspatialite
-pkgincludedir = $(includedir)/libspatialite
-pkglibdir = $(libdir)/libspatialite
-pkglibexecdir = $(libexecdir)/libspatialite
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = x86_64-unknown-linux-gnu
-host_triplet = x86_64-unknown-linux-gnu
-subdir = test/sql_stmt_voronoj1_tests
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_$(V))
-am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY))
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = aclocal-1.15
-AMTAR = $${TAR-tar}
-AM_DEFAULT_VERBOSITY = 1
-AR = ar
-AS = as
-AUTOCONF = autoconf
-AUTOHEADER = autoheader
-AUTOMAKE = automake-1.15
-AWK = gawk
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -Wall -Wextra -Wunused -pedantic -g -O0 -fprofile-arcs -ftest-coverage -g
-CPP = gcc -E
-CPPFLAGS = 
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
-CYGPATH_W = echo
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-DLLTOOL = dlltool
-DSYMUTIL = 
-DUMPBIN = 
-ECHO_C = 
-ECHO_N = -n
-ECHO_T = 
-EGREP = /usr/bin/grep -E
-EXEEXT = 
-FGREP = /usr/bin/grep -F
-GEOSCONFIG = /usr/local/bin/geos-config
-GEOS_CFLAGS = -I/usr/local/include
-GEOS_LDFLAGS = -L/usr/local/lib
-GREP = /usr/bin/grep
-INSTALL = /usr/bin/install -c
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LD = /usr/bin/ld -m elf_x86_64
-LDFLAGS = 
-LIBOBJS = 
-LIBS = -lrttopo -lfreexl -lproj -lsqlite3 -lz -lsqlite3  -L/usr/local/lib -lgeos_c
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LIBXML2_CFLAGS = -I/usr/include/libxml2 
-LIBXML2_LIBS = -lxml2 
-LIPO = 
-LN_S = ln -s
-LTLIBOBJS = 
-MAINT = #
-MAKEINFO = makeinfo
-MANIFEST_TOOL = :
-MKDIR_P = /usr/bin/mkdir -p
-NM = /usr/bin/nm -B
-NMEDIT = 
-OBJDUMP = objdump
-OBJEXT = o
-OTOOL = 
-OTOOL64 = 
-PACKAGE = libspatialite
-PACKAGE_BUGREPORT = a.furieri at lqt.it
-PACKAGE_NAME = libspatialite
-PACKAGE_STRING = libspatialite 4.4.0-RC0
-PACKAGE_TARNAME = libspatialite
-PACKAGE_URL = 
-PACKAGE_VERSION = 4.4.0-RC0
-PATH_SEPARATOR = :
-PKG_CONFIG = /usr/bin/pkg-config
-PKG_CONFIG_LIBDIR = 
-PKG_CONFIG_PATH = /usr/local/lib/pkgconfig
-RANLIB = ranlib
-SED = /usr/bin/sed
-SET_MAKE = 
-SHELL = /bin/sh
-STRIP = strip
-VERSION = 4.4.0-RC0
-abs_builddir = /home/sandro/fossil/libspatialite/test/sql_stmt_voronoj1_tests
-abs_srcdir = /home/sandro/fossil/libspatialite/test/sql_stmt_voronoj1_tests
-abs_top_builddir = /home/sandro/fossil/libspatialite
-abs_top_srcdir = /home/sandro/fossil/libspatialite
-ac_ct_AR = ar
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_DUMPBIN = 
-am__include = include
-am__leading_dot = .
-am__quote = 
-am__tar = $${TAR-tar} chof - "$$tardir"
-am__untar = $${TAR-tar} xf -
-bindir = ${exec_prefix}/bin
-build = x86_64-unknown-linux-gnu
-build_alias = 
-build_cpu = x86_64
-build_os = linux-gnu
-build_vendor = unknown
-builddir = .
-datadir = ${datarootdir}
-datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
-dvidir = ${docdir}
-exec_prefix = ${prefix}
-host = x86_64-unknown-linux-gnu
-host_alias = 
-host_cpu = x86_64
-host_os = linux-gnu
-host_vendor = unknown
-htmldir = ${docdir}
-includedir = ${prefix}/include
-infodir = ${datarootdir}/info
-install_sh = ${SHELL} /home/sandro/fossil/libspatialite/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localedir = ${datarootdir}/locale
-localstatedir = ${prefix}/var
-mandir = ${datarootdir}/man
-mkdir_p = $(MKDIR_P)
-oldincludedir = /usr/include
-pdfdir = ${docdir}
-prefix = /usr/local
-program_transform_name = s,x,x,
-psdir = ${docdir}
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-srcdir = .
-sysconfdir = ${prefix}/etc
-target_alias = 
-top_build_prefix = ../../
-top_builddir = ../..
-top_srcdir = ../..
-EXTRA_DIST = voronoj10.testcase \
-	voronoj11.testcase \
-	voronoj12.testcase \
-	voronoj13.testcase \
-	voronoj14.testcase \
-	voronoj15.testcase \
-	voronoj16.testcase \
-	voronoj17.testcase \
-	voronoj18.testcase \
-	voronoj19.testcase \
-	voronoj1.testcase \
-	voronoj20.testcase \
-	voronoj2.testcase \
-	voronoj3.testcase \
-	voronoj4.testcase \
-	voronoj5.testcase \
-	voronoj6.testcase \
-	voronoj8.testcase \
-	voronoj9.testcase 
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/sql_stmt_voronoj1_tests/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign test/sql_stmt_voronoj1_tests/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: # $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags-am uninstall uninstall-am
-
-.PRECIOUS: Makefile
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/test/sql_stmt_voronoj2_tests/Makefile b/test/sql_stmt_voronoj2_tests/Makefile
deleted file mode 100644
index 5281c72..0000000
--- a/test/sql_stmt_voronoj2_tests/Makefile
+++ /dev/null
@@ -1,468 +0,0 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
-# test/sql_stmt_voronoj2_tests/Makefile.  Generated from Makefile.in by configure.
-
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/libspatialite
-pkgincludedir = $(includedir)/libspatialite
-pkglibdir = $(libdir)/libspatialite
-pkglibexecdir = $(libexecdir)/libspatialite
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = x86_64-unknown-linux-gnu
-host_triplet = x86_64-unknown-linux-gnu
-subdir = test/sql_stmt_voronoj2_tests
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_$(V))
-am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY))
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = aclocal-1.15
-AMTAR = $${TAR-tar}
-AM_DEFAULT_VERBOSITY = 1
-AR = ar
-AS = as
-AUTOCONF = autoconf
-AUTOHEADER = autoheader
-AUTOMAKE = automake-1.15
-AWK = gawk
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -Wall -Wextra -Wunused -pedantic -g -O0 -fprofile-arcs -ftest-coverage -g
-CPP = gcc -E
-CPPFLAGS = 
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
-CYGPATH_W = echo
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-DLLTOOL = dlltool
-DSYMUTIL = 
-DUMPBIN = 
-ECHO_C = 
-ECHO_N = -n
-ECHO_T = 
-EGREP = /usr/bin/grep -E
-EXEEXT = 
-FGREP = /usr/bin/grep -F
-GEOSCONFIG = /usr/local/bin/geos-config
-GEOS_CFLAGS = -I/usr/local/include
-GEOS_LDFLAGS = -L/usr/local/lib
-GREP = /usr/bin/grep
-INSTALL = /usr/bin/install -c
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LD = /usr/bin/ld -m elf_x86_64
-LDFLAGS = 
-LIBOBJS = 
-LIBS = -lrttopo -lfreexl -lproj -lsqlite3 -lz -lsqlite3  -L/usr/local/lib -lgeos_c
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LIBXML2_CFLAGS = -I/usr/include/libxml2 
-LIBXML2_LIBS = -lxml2 
-LIPO = 
-LN_S = ln -s
-LTLIBOBJS = 
-MAINT = #
-MAKEINFO = makeinfo
-MANIFEST_TOOL = :
-MKDIR_P = /usr/bin/mkdir -p
-NM = /usr/bin/nm -B
-NMEDIT = 
-OBJDUMP = objdump
-OBJEXT = o
-OTOOL = 
-OTOOL64 = 
-PACKAGE = libspatialite
-PACKAGE_BUGREPORT = a.furieri at lqt.it
-PACKAGE_NAME = libspatialite
-PACKAGE_STRING = libspatialite 4.4.0-RC0
-PACKAGE_TARNAME = libspatialite
-PACKAGE_URL = 
-PACKAGE_VERSION = 4.4.0-RC0
-PATH_SEPARATOR = :
-PKG_CONFIG = /usr/bin/pkg-config
-PKG_CONFIG_LIBDIR = 
-PKG_CONFIG_PATH = /usr/local/lib/pkgconfig
-RANLIB = ranlib
-SED = /usr/bin/sed
-SET_MAKE = 
-SHELL = /bin/sh
-STRIP = strip
-VERSION = 4.4.0-RC0
-abs_builddir = /home/sandro/fossil/libspatialite/test/sql_stmt_voronoj2_tests
-abs_srcdir = /home/sandro/fossil/libspatialite/test/sql_stmt_voronoj2_tests
-abs_top_builddir = /home/sandro/fossil/libspatialite
-abs_top_srcdir = /home/sandro/fossil/libspatialite
-ac_ct_AR = ar
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_DUMPBIN = 
-am__include = include
-am__leading_dot = .
-am__quote = 
-am__tar = $${TAR-tar} chof - "$$tardir"
-am__untar = $${TAR-tar} xf -
-bindir = ${exec_prefix}/bin
-build = x86_64-unknown-linux-gnu
-build_alias = 
-build_cpu = x86_64
-build_os = linux-gnu
-build_vendor = unknown
-builddir = .
-datadir = ${datarootdir}
-datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
-dvidir = ${docdir}
-exec_prefix = ${prefix}
-host = x86_64-unknown-linux-gnu
-host_alias = 
-host_cpu = x86_64
-host_os = linux-gnu
-host_vendor = unknown
-htmldir = ${docdir}
-includedir = ${prefix}/include
-infodir = ${datarootdir}/info
-install_sh = ${SHELL} /home/sandro/fossil/libspatialite/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localedir = ${datarootdir}/locale
-localstatedir = ${prefix}/var
-mandir = ${datarootdir}/man
-mkdir_p = $(MKDIR_P)
-oldincludedir = /usr/include
-pdfdir = ${docdir}
-prefix = /usr/local
-program_transform_name = s,x,x,
-psdir = ${docdir}
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-srcdir = .
-sysconfdir = ${prefix}/etc
-target_alias = 
-top_build_prefix = ../../
-top_builddir = ../..
-top_srcdir = ../..
-EXTRA_DIST = voronoj10.testcase \
-	voronoj11.testcase \
-	voronoj12.testcase \
-	voronoj13.testcase \
-	voronoj14.testcase \
-	voronoj15.testcase \
-	voronoj16.testcase \
-	voronoj17.testcase \
-	voronoj18.testcase \
-	voronoj19.testcase \
-	voronoj1.testcase \
-	voronoj20.testcase \
-	voronoj2.testcase \
-	voronoj3.testcase \
-	voronoj4.testcase \
-	voronoj5.testcase \
-	voronoj6.testcase \
-	voronoj8.testcase \
-	voronoj9.testcase 
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/sql_stmt_voronoj2_tests/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign test/sql_stmt_voronoj2_tests/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: # $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags-am uninstall uninstall-am
-
-.PRECIOUS: Makefile
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/spatialite.git



More information about the Pkg-grass-devel mailing list