From b2765aca4a272b2fd015f299c0557c22b86d2555 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 3 Nov 2025 09:31:11 +0100
Subject: [PATCH 1/9] introduce osm2pgsql-test-style for BDD testing

---
 scripts/osm2pgsql-test-style                  | 835 ++++++++++++++++++
 tests/bdd/command-line/invalid.feature        |   6 +-
 tests/bdd/command-line/replication.feature    |  26 +-
 .../command-line/replication_legacy.feature   |  17 +-
 tests/bdd/flex/area.feature                   |   6 +-
 tests/bdd/flex/bbox.feature                   |  18 +-
 tests/bdd/flex/delete-callbacks.feature       |   6 +-
 tests/bdd/flex/empty-insert.feature           |   4 +-
 tests/bdd/flex/geometry-collection.feature    |   4 +-
 tests/bdd/flex/geometry-function-area.feature |   6 +-
 tests/bdd/flex/geometry-iteration.feature     |  16 +-
 tests/bdd/flex/geometry-linestring.feature    |   9 +-
 .../bdd/flex/geometry-multilinestring.feature |   8 +-
 tests/bdd/flex/geometry-multipoint.feature    |  10 +-
 tests/bdd/flex/geometry-null.feature          |  18 +-
 tests/bdd/flex/geometry-point.feature         |  44 +-
 tests/bdd/flex/geometry-processing.feature    |  22 +-
 tests/bdd/flex/invalid-geometries.feature     |  10 +-
 tests/bdd/flex/invalid-lua.feature            |   3 +-
 tests/bdd/flex/line-splitting.feature         |   8 +-
 tests/bdd/flex/locator.feature                |  36 +-
 .../lua-expire-output-definitions.feature     |  27 +-
 tests/bdd/flex/lua-expire.feature             |  18 +-
 tests/bdd/flex/lua-index-definitions.feature  |  61 +-
 tests/bdd/flex/lua-table-definitions.feature  |  21 +-
 tests/bdd/flex/multigeom.feature              |   2 +-
 tests/bdd/flex/relation-changes.feature       |   2 +-
 tests/bdd/flex/way-change.feature             |   2 +-
 tests/bdd/regression/import.feature           |  55 +-
 tests/bdd/regression/input.feature            |   2 +-
 tests/bdd/regression/multipolygon.feature     | 266 ++++--
 tests/bdd/regression/properties.feature       |  14 +-
 tests/bdd/regression/update.feature           |   4 +-
 33 files changed, 1314 insertions(+), 272 deletions(-)
 create mode 100755 scripts/osm2pgsql-test-style

diff --git a/scripts/osm2pgsql-test-style b/scripts/osm2pgsql-test-style
new file mode 100755
index 000000000..0cdb8bdd9
--- /dev/null
+++ b/scripts/osm2pgsql-test-style
@@ -0,0 +1,835 @@
+#!/usr/bin/env python3
+
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# This file is part of osm2pgsql (https://osm2pgsql.org/).
+#
+# Copyright (C) 2025 by the osm2pgsql developer community.
+# For a full list of authors see the git log.
+"""
+Test runner for BDD-style integration tests.
+
+See osm2pgsql manual for more information on osm2pgsql style testing.
+"""
+import logging
+import sys
+import tempfile
+import math
+import re
+import contextlib
+import json
+import datetime as dt
+from decimal import Decimal
+from subprocess import Popen, PIPE
+from argparse import ArgumentParser, RawDescriptionHelpFormatter
+from pathlib import Path
+import importlib.util
+import io
+from importlib.machinery import SourceFileLoader
+
+from behave import given, when, then, use_step_matcher, use_fixture, fixture
+from behave.runner import ModelRunner, Context
+from behave.formatter.base import StreamOpener
+from behave.formatter.pretty import PrettyFormatter
+from behave import runner_util
+from behave.configuration import Configuration
+
+LOG = logging.getLogger()
+
+import psycopg
+from psycopg import sql
+
+use_step_matcher('re')
+
+OBJECT_ORDER = {'n': 1, 'w': 2, 'r': 3}
+
+def opl_sort(line):
+    oid = line.split(' ', 1)[0]
+    return OBJECT_ORDER[oid[0]], int(oid[1:])
+
+#################### Replication mock ##############################
+
+class ReplicationServerMock:
+
+    def __init__(self, base_url, state_infos):
+        self.expected_base_url = base_url
+        self.state_infos = state_infos
+
+    def __call__(self, base_url):
+        assert base_url == self.expected_base_url,\
+               f"Wrong replication service called. Expected '{self.expected_base_url}', got '{base_url}'"
+        return self
+
+    def get_state_info(self, seq=None, retries=2):
+        assert self.state_infos, 'Replication mock not properly set up'
+        if seq is None:
+            return self.state_infos[-1]
+
+        for info in self.state_infos:
+            if info.sequence == seq:
+                return info
+
+        return None
+
+    def timestamp_to_sequence(self, timestamp, balanced_search=False):
+        assert self.state_infos, 'Replication mock not properly set up'
+
+        if timestamp < self.state_infos[0].timestamp:
+            return self.state_infos[0].sequence
+
+        prev = self.state_infos[0]
+        for info in self.state_infos:
+            if timestamp >= prev.timestamp and timestamp < info.timestamp:
+                return prev.sequence
+            prev = info
+
+        return prev.sequence
+
+    def apply_diffs(self, handler, start_id, max_size=1024, idx="", simplify=True):
+        if start_id > self.state_infos[-1].sequence:
+            return None
+
+        numdiffs = int((max_size + 1023)/1024)
+        return min(self.state_infos[-1].sequence, start_id + numdiffs - 1)
+
+
+# Replication module is optional
+_repfl_spec = importlib.util.spec_from_loader(
+    'osm2pgsql_replication',
+    SourceFileLoader('osm2pgsql_replication',
+                     str(Path(__file__, '..', 'osm2pgsql-replication').resolve())))
+
+if _repfl_spec:
+    osm2pgsql_replication = importlib.util.module_from_spec(_repfl_spec)
+    _repfl_spec.loader.exec_module(osm2pgsql_replication)
+
+    from osmium.replication.server import OsmosisState
+else:
+    osm2pgsql_replication = None
+
+#################### hooks #########################################
+
+def hook_before_all(context):
+    context.config.setup_logging(logging.INFO)
+
+    # Feature check: table spaces
+    if context.user_args.test_tablespace == 'auto':
+        with context.connect_db('postgres') as conn:
+            with conn.cursor() as cur:
+                cur.execute("""SELECT spcname FROM pg_tablespace
+                                WHERE spcname = 'tablespacetest'""")
+                context.user_args.test_tablespace = cur.rowcount > 0
+        LOG.info('Check if tablespaces are available: %s',
+                 'yes' if context.user_args.test_tablespace else 'no')
+    else:
+        context.user_args.test_tablespace = context.user_args.test_tablespace == 'yes'
+
+    # Test that osm2pgsql works.
+    proc = Popen([context.user_args.osm2pgsql_binary, '--version'],
+                 stdout=PIPE, stderr=PIPE)
+    _, serr = proc.communicate()
+    osm2pgsql_version = serr.decode('utf-8')
+    if proc.returncode != 0:
+        LOG.critical("Could not run osm2pgsql. Error:\n%s", serr)
+        LOG.critical("osm2pgsql binary used: %s", context.user_args.osm2pgsql_binary)
+        raise RuntimeError('Error running osm2pgsql')
+
+        LOG.info('Check if proj is available: %s',
+                 'yes' if context.user_args.test_proj else 'no')
+
+    # Feature check: proj
+    if context.user_args.test_proj == 'auto':
+        context.user_args.test_proj = 'Proj [disabled]' not in osm2pgsql_version
+    else:
+        context.user_args.test_proj = context.user_args.test_proj == 'yes'
+
+    use_fixture(template_test_db, context)
+
+
+
+def hook_before_scenario(context, scenario):
+    if 'config.have_proj' in scenario.tags and not context.user_args.test_proj:
+        scenario.skip("Generic proj library not configured.")
+
+    context.db = use_fixture(test_db, context)
+    context.import_file = None
+    context.import_data = None
+    context.osm2pgsql_params = {'-d': context.user_args.test_db}
+    context.osm2pgsql_returncode = None
+    context.workdir = use_fixture(working_directory, context)
+    context.nodes = NodeStore()
+    context.sql_statements = {}
+    context.urlrequest_responses = {}
+    osm2pgsql_replication.ReplicationServer = None
+
+    def _mock_urlopen(request):
+        if not request.full_url in context.urlrequest_responses:
+            raise urllib.error.URLError('Unknown URL')
+
+        return contextlib.closing(io.BytesIO(context.urlrequest_responses[request.full_url].encode('utf-8')))
+
+    osm2pgsql_replication.urlrequest.urlopen = _mock_urlopen
+
+
+
+#################### fixtures ######################################
+
+@fixture
+def template_test_db(context, **kwargs):
+    context.drop_db(context.user_args.template_test_db, recreate_template='default')
+
+    with context.connect_db(context.user_args.template_test_db) as conn:
+        conn.execute('CREATE EXTENSION postgis')
+        conn.execute('CREATE EXTENSION hstore')
+
+    yield context.user_args.template_test_db
+
+    context.drop_db(context.user_args.template_test_db)
+
+
+@fixture
+def test_db(context, **kwargs):
+    context.drop_db(recreate_template=context.user_args.template_test_db)
+
+    with context.connect_db() as conn:
+        yield conn
+
+    if not context.user_args.keep_test_db:
+        context.drop_db()
+
+
+@fixture
+def working_directory(context, **kwargs):
+    with tempfile.TemporaryDirectory() as tmpdir:
+        yield Path(tmpdir)
+
+################### Node location creation #########################
+
+class NodeStore:
+    grid = {}
+
+    def set_grid(self, lines, grid_step, origin_x, origin_y):
+        self.grid = {}
+        origin_y -= grid_step * (len(lines) - 1)
+
+        ndigits = 1
+        step = grid_step
+        while step < 0:
+            ndigits += 1
+            step /= 10
+
+        for y, line in enumerate(lines):
+            for x, pt in enumerate(line):
+                if pt.isdigit():
+                    self.grid[int(pt)] = (round(origin_x + x * grid_step, ndigits),
+                                          round(origin_y + y * grid_step, ndigits))
+
+    def get_as_opl(self):
+        return [f"n{i} x{x} y{y}" for i, (x, y) in self.grid.items()]
+
+    def add_coordinates(self, lines):
+        for line in lines:
+            if line.startswith('n') and ' x' not in line:
+                nid = int(line.split(' ', 1)[0][1:])
+                assert nid in self.grid, \
+                    f"OPL error. Node {nid} has no coordinates and is not in grid."
+                x, y = self.grid[nid]
+                yield f"{line} x{x} y{y}"
+            else:
+                yield line
+
+    def parse_point(self, pt):
+        pt = pt.strip()
+        if ' ' in pt:
+            return list(map(float, pt.split(' ', 1)))
+        return self.grid[int(pt)]
+
+
+################### ResultComparison ###############################
+
+class ResultCompare:
+
+    def __init__(self, heading, nodes):
+        self.nodes = nodes
+        if '!' in heading:
+            self.name, self.fmt = heading.rsplit('!', 1)
+            if self.fmt.startswith(':'):
+                self.compare = self._intcompare_fmt
+            elif self.fmt.startswith('~'):
+                if self.fmt.endswith('%'):
+                    rel_tol = float(self.fmt[1:-1]) / 100
+                    self.compare = lambda exp, val: math.isclose(float(exp), val, rel_tol=rel_tol)
+                else:
+                    abs_tol = float(self.fmt[1:])
+                    self.compare = lambda exp, val: math.isclose(float(exp), val, abs_tol=abs_tol)
+            else:
+                self.compare = getattr(self, f"_compare_{self.fmt}", None)
+            assert self.compare is not None, f"Unknown formatter {self.fmt}"
+        else:
+            self.name = heading
+            self.fmt = None
+            self.compare = lambda exp, val: str(val) == exp
+
+    def as_select(self):
+        if self.fmt == 'geo':
+            return f"ST_AsText({self.name})"
+
+        return self.name
+
+    def equals(self, expected, value):
+        if expected == 'NULL':
+            return value is None
+
+        return self.compare(expected, value)
+
+    def _intcompare_fmt(self, expected, value):
+        return expected == f"{{{self.fmt}}}".format(value)
+
+    def _compare_i(self, expected, value):
+        return expected.lower() == str(value).lower()
+
+    def _compare_re(self, expected, value):
+        return re.fullmatch(expected, str(value)) is not None
+
+    def _compare_substr(self, expected, value):
+        return expected in str(value)
+
+    def _compare_json(self, expected, value):
+        return json.loads(expected) == value
+
+    def _compare_geo(self, expected, value):
+        m = re.fullmatch(r'([A-Z]+)\((.*)\)', value)
+
+        return self._eq_geom(expected, m[1], m[2]) if m else False
+
+    def _eq_geom(self, bdd_geom, pg_type, pg_coords):
+        # MULTI* geometries
+        if bdd_geom.startswith('[') and bdd_geom.endswith(']'):
+            bdd_parts = bdd_geom[1:-1].split(';')
+            pg_parts = pg_coords[1:-1].split('),(')
+            return pg_type.startswith('MULTI') \
+                    and len(bdd_parts) == len(pg_parts) \
+                    and all(self._eq_geom(b.strip(), pg_type[5:], g.strip())
+                            for b, g in zip(bdd_parts, pg_parts))
+
+        # GEOMETRYCOLLECTIONS
+        if bdd_geom.startswith('{') and bdd_geom.endswith('}'):
+            bdd_parts = bdd_geom[1:-1].split(';')
+            pg_parts = list(map(lambda s: re.fullmatch(r'([A-Z]+)\(([^A-Z]*)\)', s),
+                                re.findall('[A-Z]+[^A-Z]+[^,A-Z]', pg_coords)))
+            return pg_type.startswith('GEOMETRYCOLLECTION')\
+                    and len(bdd_parts) == len(pg_parts)\
+                    and all(g is not None and self._eq_geom(b.strip(), g[1], g[2])
+                            for b, g in zip(bdd_parts, pg_parts))
+
+        # POINT
+        if ',' not in bdd_geom:
+            return pg_type == 'POINT' and self._eq_point(bdd_geom, pg_coords)
+
+        # LINESTRING
+        if '(' not in bdd_geom:
+            return pg_type == 'LINESTRING' \
+                    and all(self._eq_point(b, p) for b, p
+                            in zip((g.strip() for g in bdd_geom.split(',')),
+                                   (g.strip() for g in pg_coords.split(','))))
+
+        # POLYGON
+        if pg_type != 'POLYGON':
+            return False
+        # Polygon comparison is tricky because the polygons don't necessarily
+        # end at the same point or have the same winding order.
+        # Brute force all possible variants of the expected polygon
+        bdd_parts = re.findall(r'\([^)]+\)', bdd_geom)
+        pg_parts = [g.strip() for g in pg_coords[1:-1].split('),(')]
+        return len(bdd_parts) == len(pg_parts) \
+                and all(self._eq_ring(*parts) for parts in zip(bdd_parts, pg_parts))
+
+    def _eq_point(self, bdd_pt, pg_pt):
+        exp_geom = self.nodes.parse_point(bdd_pt)
+        pg_geom = list(map(float, pg_pt.split(' ')))
+        return len(exp_geom) == len(pg_geom) \
+                and all(math.isclose(e, p, rel_tol=0.000001) for e, p in zip(exp_geom, pg_geom))
+
+    def _eq_ring(self, bdd_ring, pg_ring):
+        bdd_pts = [g.strip() for g in bdd_ring[1:-1].split(',')]
+        pg_pts = [g.strip() for g in pg_ring.split(',')]
+        if bdd_pts[0] != bdd_pts[-1]:
+            raise RuntimeError(f"Invalid polygon {bdd_geom}. "
+                                "First and last point need to be the same")
+        if len(bdd_pts) != len(pg_pts):
+            return False
+
+        for line in (bdd_pts[:-1], bdd_pts[-1:0:-1]):
+            for i in range(len(line)):
+                if all(self._eq_point(p1, p2) for p1, p2 in
+                       zip(line[i:] + line[:i], pg_pts)):
+                    return True
+
+        return False
+
+################### Steps: Database setup ##########################
+
+@given("the database schema (?P<schema>.+)")
+def create_db_schema(context, schema):
+    with context.db.cursor() as cur:
+        cur.execute("CREATE SCHEMA " + schema)
+
+
+@when("deleting table (?P<table>.+)")
+def delete_table(context, table):
+    with context.db.cursor() as cur:
+        cur.execute("DROP TABLE " + table)
+
+
+################### Steps: OSM data ################################
+
+@given("the input file '(?P<osm_file>.+)'")
+def osm_set_import_file(context, osm_file):
+    assert context.import_data is None, \
+        "Import file cannot be used together with inline data."
+    pfile = Path(osm_file)
+    if pfile.is_absolute():
+        context.import_file = pfile
+    else:
+        basedir = context.user_args.test_data_dir or Path(context.feature.filename).parent
+        context.import_file = (basedir / osm_file).resolve()
+
+
+@given("the OSM data")
+def osm_define_data(context):
+    assert context.import_file is None, \
+        "Inline data cannot be used together with an import file."
+    if context.text.strip():
+        context.append_osm_data(context.nodes.add_coordinates(context.text.split('\n')))
+    else:
+        context.append_osm_data([])
+
+
+@given("the OSM data format string")
+def osm_define_data(context):
+    assert context.import_file is None, \
+        "Inline data cannot be used together with an import file."
+    data = eval('f"""' + context.text + '"""')
+
+    context.append_osm_data(context.nodes.add_coordinates(data.split('\n')))
+
+
+@given("the (?P<step>[0-9.]+ )?grid(?: with origin (?P<origin_x>[0-9.-]+) (?P<origin_y>[0-9.-]+))?")
+def osm_define_node_grid(context, step, origin_x, origin_y):
+    step = float(step.strip()) if step else 0.1
+    x = float(origin_x) if origin_x else 20.0
+    y = float(origin_y) if origin_y else 20.0
+
+    assert x > -180.0 and x < 180.0
+    assert y > -90.0 and y < 90.0
+
+    context.nodes.set_grid([context.table.headings] + [list(h) for h in context.table], step, x, y)
+    context.append_osm_data(context.nodes.get_as_opl())
+
+################### Steps: Style file ##############################
+
+@given("the style file '(?P<style>.+)'")
+def setup_style_file(context, style):
+    sfile = Path(style)
+
+    if sfile.is_absolute():
+        assert sfile.is_file()
+    elif context.user_args.style_data_dir is not None \
+        and (context.user_args.style_data_dir / sfile).is_file():
+            sfile = context.user_args.style_data_dir / sfile
+    elif context.user_args.test_data_dir is not None \
+        and (context.user_args.test_data_dir / sfile).is_file():
+            sfile = context.user_args.test_data_dir / sfile
+    else:
+        sfile = Path(context.feature.filename).parent / sfile
+        assert sfile.is_file()
+    context.osm2pgsql_params['-S'] = str(sfile.resolve())
+
+
+@given("the lua style")
+def setup_style_inline(context):
+    outfile = context.workdir / 'inline_style.lua'
+    outfile.write_text(context.text)
+
+    context.osm2pgsql_params['-S'] = str(outfile)
+
+
+################### Steps: Running osm2pgsql #######################
+
+@when(r"running osm2pgsql(?P<output> \w+)?(?: with parameters)?")
+def execute_osm2pgsql(context, output):
+    assert output in (' flex', ' pgsql', ' null', None)
+
+    if output is not None:
+        context.osm2pgsql_params['-O'] = output.strip()
+    if output == ' pgsql' and '-S' not in context.osm2pgsql_params:
+        context.osm2pgsql_params['-S'] = '{STYLE_DATA_DIR}/default.style'
+
+    cmdline = [context.user_args.osm2pgsql_binary]
+
+    test_dir = (context.user_args.test_data_dir or Path('.')).resolve()
+    style_dir = (context.user_args.style_data_dir or Path('.')).resolve()
+    def _template(param):
+        return param.replace('{TEST_DATA_DIR}', str(test_dir))\
+                    .replace('{STYLE_DATA_DIR}', str(style_dir))\
+                    .replace('{TEST_DB}', context.user_args.test_db)
+
+    if context.table:
+        assert not any('<' in h for h in context.table.headings), \
+            "Substition in the first line of a table are not supported."
+        cmdline.extend(_template(h) for h in context.table.headings if h)
+        for row in context.table:
+            cmdline.extend(_template(c) for c in row if c)
+
+    for k, v in context.osm2pgsql_params.items():
+        if k not in cmdline:
+            cmdline.extend((k, _template(v)))
+
+    if not context.user_args.test_tablespace\
+        and any(p.startswith('--tablespace') for p in cmdline):
+        context.scenario.skip('tablespace tablespacetest not available')
+        return
+
+    if context.import_data is not None:
+        data_stdin = '\n'.join(sorted(context.import_data.values(), key=opl_sort)).encode('utf-8')
+        context.import_data = None
+        cmdline.extend(('-r', 'opl', '-'))
+    else:
+        assert context.import_file is not None, "No input data given."
+        cmdline.append(str(context.import_file))
+        context.import_file = None
+        data_stdin = None
+
+    env = {}
+
+    proc = Popen(cmdline, cwd=str(context.workdir),
+                 stdin=PIPE, stdout=PIPE, stderr=PIPE, env=env)
+
+    outdata = proc.communicate(input=data_stdin)
+    context.osm2pgsql_cmdline = ' '.join(cmdline)
+    context.osm2pgsql_outdata = [d.decode('utf-8').replace('\\n', '\n') for d in outdata]
+    context.osm2pgsql_returncode = proc.returncode
+    context.osm2pgsql_params = {'-d': context.user_args.test_db}
+
+@then("execution is successful")
+def osm2pgsql_check_success(context):
+    assert context.osm2pgsql_returncode == 0, \
+        f"osm2pgsql failed with error code {context.osm2pgsql_returncode}.\n"\
+        f"Command line: {context.osm2pgsql_cmdline}\n"\
+        f"Output:\n{context.osm2pgsql_outdata[0]}\n{context.osm2pgsql_outdata[1]}\n"
+
+@then(r"execution fails(?: with return code (?P<expected>\d+))?")
+def osm2pgsql_check_failure(context, expected):
+    retcode = context.osm2pgsql_returncode
+    assert retcode != 0, "osm2pgsql unexpectedly succeeded"
+
+    if expected:
+        assert retcode == int(expected), \
+            f"osm2pgsql failed with return code {retcode} instead of {expected}\n"\
+            f"Output:\n{context.osm2pgsql_outdata[0]}\n{context.osm2pgsql_outdata[1]}\n"
+
+@then(r"the (?P<kind>\w+) output contains")
+def check_program_output(context, kind):
+    if kind == 'error':
+        s = context.osm2pgsql_outdata[1]
+    elif kind == 'standard':
+        s = context.osm2pgsql_outdata[0]
+    else:
+        assert not "Expect one of error, standard"
+
+    for line in context.text.split('\n'):
+        line = line.strip()
+        assert line in s,\
+               f"Output '{line}' not found in {kind} output:\n{s}\n"
+
+################### Steps: Running Replication #####################
+
+@given("the replication service at (?P<base_url>.*)")
+def setup_replication_mock(context, base_url):
+    if osm2pgsql_replication is None:
+        context.scenario.skip("Replication binary not available. Skip.")
+        return
+
+    if context.table:
+        state_infos = \
+            [OsmosisState(int(row[0]),
+             dt.datetime.strptime(row[1], '%Y-%m-%dT%H:%M:%SZ').replace(tzinfo=dt.timezone.utc))
+             for row in context.table]
+    else:
+        state_infos = []
+    osm2pgsql_replication.ReplicationServer = ReplicationServerMock(base_url, state_infos)
+
+
+@given("the URL (?P<base_url>.*) returns")
+def mock_url_response(context, base_url):
+    context.urlrequest_responses[base_url] = context.text
+
+
+@when("running osm2pgsql-replication")
+def execute_osm2pgsql_replication(context):
+    assert osm2pgsql_replication is not None
+    assert osm2pgsql_replication.ReplicationServer is not None
+
+    cmdline = []
+
+    test_dir = (context.user_args.test_data_dir or Path('.')).resolve()
+    style_dir = (context.user_args.style_data_dir or Path('.')).resolve()
+    def _template(param):
+        return param.replace('{TEST_DATA_DIR}', str(test_dir))\
+                    .replace('{STYLE_DATA_DIR}', str(style_dir))\
+                    .replace('{TEST_DB}', context.user_args.test_db)
+
+    if context.table:
+        assert not any('<' in h for h in context.table.headings), \
+            "Substition in the first line of a table are not supported."
+        cmdline.extend(_template(h) for h in context.table.headings if h)
+        for row in context.table:
+            cmdline.extend(_template(c) for c in row if c)
+
+    if '-d' not in cmdline and '--database' not in cmdline:
+        cmdline.extend(('-d', context.user_args.test_db))
+
+    if cmdline[0] == 'update':
+        cmdline.extend(('--osm2pgsql-cmd', context.user_args.osm2pgsql_binary))
+
+        if '--' not in cmdline:
+            cmdline.extend(('--', '-S', str(style_dir / 'default.style')))
+
+    serr = io.StringIO()
+    log_handler = logging.StreamHandler(serr)
+    osm2pgsql_replication.LOG.addHandler(log_handler)
+    with contextlib.redirect_stdout(io.StringIO()) as sout:
+        context.osm2pgsql_returncode = osm2pgsql_replication.main(cmdline)
+    osm2pgsql_replication.LOG.removeHandler(log_handler)
+    context.osm2pgsql_outdata = [sout.getvalue(), serr.getvalue()]
+
+
+################### Steps: Inspect database ########################
+
+@given("the SQL statement (?P<sql>.+)")
+def db_define_sql_statement(context, sql):
+    context.sql_statements[sql] = context.text
+
+
+@then("there are (?P<exists>no )?tables (?P<tables>.+)")
+def db_table_existance(context, exists, tables):
+    for table in tables.split(','):
+        table = table.strip()
+        if exists == 'no ':
+            assert not context.table_exists(table), f"Table '{table}' unexpectedly found"
+        else:
+            assert context.table_exists(table), f"Table '{table}' not found"
+
+
+@then("table (?P<table>.+) contains(?P<exact> exactly)?")
+def db_check_table_content(context, table, exact):
+    context.execute_steps("Then execution is successful")
+    assert context.table_exists(table), f"Table {table} not found in database."
+    context.check_select(sql.Identifier(*table.split('.', 1)), exact is not None)
+
+
+@then("table (?P<table>.+) doesn't contain")
+def db_check_table_content_negative(context, table):
+    context.execute_steps("Then execution is successful")
+    assert context.table_exists(table), f"Table {table} not found in database."
+    context.check_select_not_contained(sql.Identifier(*table.split('.', 1)))
+
+
+@then(r"table (?P<table>.+) has (?P<row_num>\d+) rows?")
+def db_table_row_count(context, table, row_num):
+    context.execute_steps("Then execution is successful")
+    assert context.table_exists(table), f"Table {table} not found in database."
+
+    query = sql.SQL("SELECT count(*) FROM {}").format(sql.Identifier(*table.split('.', 2)))
+    for res in context.db.execute(query):
+        assert res[0] == int(row_num),\
+           f"Table {table}: expected {row_num} rows, got {res[0]}"
+
+
+@then("statement (?P<stmt>.+) returns(?P<exact> exactly)?")
+def db_check_table_content(context, stmt, exact):
+    context.execute_steps("Then execution is successful")
+    assert stmt in context.sql_statements
+    context.check_select(sql.SQL(f"({context.sql_statements[stmt]}) _statement_sql"),
+                         exact is not None)
+
+################### Context ########################################
+
+class Osm2pgsqlContext(Context):
+
+    def __init__(self, runner, args):
+        super().__init__(runner)
+        self.user_args = args
+
+    def connect_db(self, name=None):
+        dbname = name or self.user_args.test_db
+        return psycopg.connect(dbname=dbname, autocommit=True)
+
+    def drop_db(self, name=None, recreate_template=None):
+        db = sql.Identifier(name or self.user_args.test_db)
+        with self.connect_db('postgres') as conn:
+            conn.execute(sql.SQL('DROP DATABASE IF EXISTS {}').format(db))
+            if recreate_template == 'default':
+                conn.execute(sql.SQL('CREATE DATABASE {}').format(db))
+            elif recreate_template:
+                conn.execute(sql.SQL('CREATE DATABASE {} WITH TEMPLATE {}')
+                                .format(db, sql.Identifier(recreate_template)))
+
+    def append_osm_data(self, lines, include_untagged=None):
+        if self.import_data is None:
+            self.import_data = {}
+        for line in lines:
+            if (l := line.strip()):
+                self.import_data[l.split(' ', 1)[0]] = l
+
+    def table_exists(self, table):
+        sql_params = table.split('.', 1) if '.' in table else ('public', table)
+        sql = 'SELECT count(*) FROM {} WHERE schemaname = %s AND tablename = %s'
+
+        for look_in in ('pg_tables', 'pg_views'):
+            for res in self.db.execute(sql.format('pg_tables'), sql_params):
+                if res[0] == 1:
+                    return True
+        return False
+
+    def check_select(self, from_clause, exact):
+        rows = [ResultCompare(h, self.nodes) for h in self.table.headings]
+        lines = set(range(0, len(self.table.rows)))
+
+        query = sql.SQL('SELECT {} FROM {}').format(
+                sql.SQL(', '.join(f"({r.as_select()}) as c{i}" for i, r in enumerate(rows))),
+                from_clause)
+
+        table_content = ''
+        unexpected_rows = []
+        for row in self.db.execute(query):
+            table_content += f"\n{row}"
+            for i in lines:
+                for attr, expected, value in zip(rows, self.table[i], row):
+                    if not attr.equals(expected, value):
+                        break
+                else:
+                    lines.remove(i)
+                    break
+            else:
+                if exact:
+                    unexpected_rows.append(str(row))
+
+        assert not lines, \
+               "Rows not found:\n" \
+               + '\n'.join(str(self.table[i]) for i in lines) \
+               + "\nTable content:\n" \
+               + table_content
+
+        assert not unexpected_rows, \
+            "Unexpected rows found:\n" + '\n'.join(unexpected_rows)\
+               + "\nTable content:\n" \
+               + table_content
+
+    def check_select_not_contained(self, from_clause):
+        rows = [ResultCompare(h, self.nodes) for h in self.table.headings]
+        lines = set(range(0, len(self.table.rows)))
+
+        query = sql.SQL('SELECT {} FROM {}').format(
+                sql.SQL(', '.join(f"({r.as_select()}) as c{i}" for i, r in enumerate(rows))),
+                from_clause)
+
+        table_content = ''
+        matching_rows = []
+        for row in self.db.execute(query):
+            table_content += f"\n{row}"
+            for i in lines:
+                for attr, expected, value in zip(rows, self.table[i], row):
+                    if not attr.equals(expected, value):
+                        break
+                else:
+                    matching_rows.append(str(row))
+                    break
+
+        assert not matching_rows, \
+            "Matching rows found:\n" + '\n'.join(matching_rows)\
+               + "\nFull table content:\n" \
+               + table_content
+
+
+#################### runner and main ###############################
+
+class Osm2pgsqlRunner(ModelRunner):
+
+    def __init__(self, config, args):
+        super().__init__(config)
+        self.feature_locations = runner_util.collect_feature_locations(args.features)
+        self.hooks = {
+          'before_all' : hook_before_all,
+          'before_scenario': hook_before_scenario
+        }
+        self.context = Osm2pgsqlContext(self, args)
+
+    def run(self):
+        features = runner_util.parse_features(self.feature_locations)
+        self.features.extend(features)
+
+        stream_opener = StreamOpener(stream=sys.stdout)
+        self.formatters = [PrettyFormatter(stream_opener, self.config)]
+        return self.run_model()
+
+
+def get_parser():
+    parser = ArgumentParser(description=__doc__,
+                            prog='osm2pgsql-test-style',
+                            formatter_class=RawDescriptionHelpFormatter)
+    parser.add_argument('features', nargs='+',
+                        help='Feature files or paths')
+    parser.add_argument('--osm2pgsql-binary',
+                        help='osm2pgsql binary to use for testing (default: osm2pgsql)')
+    parser.add_argument('--test-data-dir', type=Path,
+                        help='(optional) directory to search for test data')
+    parser.add_argument('--style-data-dir', type=Path,
+                        help='(optional) directory to search for style files')
+    parser.add_argument('--test-db', default='osm2pgsql-test',
+                        help='Name of database to use for testing (default: osm2pgsql-test)')
+    parser.add_argument('--template-test-db', default='osm2pgsql-test-template',
+                        help='Name of database to use for creating the template db '
+                             '(default: osm2pgsql-test-template)')
+    parser.add_argument('--keep-test-db', action='store_true',
+                        help='Keep the test database around after tests are done')
+    parser.add_argument('--test-tablespace', default='auto', choices=['yes', 'no', 'auto'],
+                        help='Include tests requiring a tablespace')
+    parser.add_argument('--test-proj', default='auto', choices=['yes', 'no', 'auto'],
+                        help='Include tests requiring the proj library')
+
+    return parser
+
+def main(prog_args=None):
+    parser = get_parser()
+    try:
+        args = parser.parse_args(args=prog_args)
+    except SystemExit:
+        return 1
+
+    if args.osm2pgsql_binary is None:
+        args.osm2pgsql_binary = 'osm2pgsql'
+    else:
+        args.osm2pgsql_binary = str(Path(args.osm2pgsql_binary).resolve())
+
+    config = Configuration(command_args=[])
+    config.show_skipped = False
+    runner = Osm2pgsqlRunner(config, args)
+
+    failed = runner.run()
+
+    if runner.undefined_steps:
+        LOG.error('Error in feature definition. The following steps are unknown:\n - '
+                  + '\n - '.join(f"{s.keyword} {s.name}" for s in runner.undefined_steps))
+
+    return int(failed)
+
+if __name__ == '__main__':
+    retcode = main()
+    try:
+        pass
+    except Exception as ex:
+        LOG.fatal("Exception during execution: %s", ex)
+        retcode = 3
+
+    sys.exit(retcode)
diff --git a/tests/bdd/command-line/invalid.feature b/tests/bdd/command-line/invalid.feature
index edcce7376..54e9393dd 100644
--- a/tests/bdd/command-line/invalid.feature
+++ b/tests/bdd/command-line/invalid.feature
@@ -7,16 +7,18 @@ Feature: Errors for invalid command line parameter combinations
             """
 
     Scenario: create and append cannot be used together
-        Then running osm2pgsql pgsql with parameters fails
+        When running osm2pgsql pgsql with parameters
             | -c | -a |
+        Then execution fails
         And the error output contains
             """
             --append and --create options can not be used at the same time
             """
 
     Scenario: append can only be used with slim mode
-        Then running osm2pgsql pgsql with parameters fails
+        When running osm2pgsql pgsql with parameters
             | -a |
+        Then execution fails
         And the error output contains
             """
             --append can only be used with slim mode
diff --git a/tests/bdd/command-line/replication.feature b/tests/bdd/command-line/replication.feature
index 7329bee41..8567b1e0c 100644
--- a/tests/bdd/command-line/replication.feature
+++ b/tests/bdd/command-line/replication.feature
@@ -44,11 +44,13 @@ Feature: Tests for the osm2pgsql-replication script with property table
             """
             n34 Tamenity=restaurant x77 y45.3
             """
+        And the replication service at http://example.com/europe/liechtenstein-updates
         When running osm2pgsql pgsql with parameters
             | --slim |
 
-        Then running osm2pgsql-replication fails with returncode 1
+        When running osm2pgsql-replication
             | init |
+        Then execution fails with return code 1
         And the error output contains
             """
             Cannot get timestamp from database.
@@ -56,10 +58,12 @@ Feature: Tests for the osm2pgsql-replication script with property table
 
     Scenario: Replication cannot initialised on non-updatable database
         Given the input file 'liechtenstein-2013-08-03.osm.pbf'
+        And the replication service at http://example.com/europe/liechtenstein-updates
         When running osm2pgsql pgsql
 
-        Then running osm2pgsql-replication fails with returncode 1
+        When running osm2pgsql-replication
             | init |
+        Then execution fails with return code 1
         And the error output contains
             """
             Database needs to be imported in --slim mode.
@@ -130,8 +134,9 @@ Feature: Tests for the osm2pgsql-replication script with property table
         When running osm2pgsql pgsql with parameters
             | --slim |
 
-        Then running osm2pgsql-replication fails with returncode 1
+        When running osm2pgsql-replication
             | init | --middle-schema=foobar |
+        Then execution fails with return code 1
         And the error output contains
             """
             Database needs to be imported in --slim mode.
@@ -275,8 +280,9 @@ Feature: Tests for the osm2pgsql-replication script with property table
         When running osm2pgsql pgsql with parameters
             | --slim |
 
-        Then running osm2pgsql-replication fails with returncode 1
+        When running osm2pgsql-replication
             | update |
+        Then execution fails with return code 1
         And the error output contains
             """
             Updates not set up correctly.
@@ -354,8 +360,9 @@ Feature: Tests for the osm2pgsql-replication script with property table
         When running osm2pgsql pgsql with parameters
             | --slim |
 
-        Then running osm2pgsql-replication fails with returncode 2
+        When running osm2pgsql-replication
             | status | --json |
+        Then execution fails with return code 2
         And the standard output contains
             """
             "status": 2
@@ -374,7 +381,8 @@ Feature: Tests for the osm2pgsql-replication script with property table
 
         And running osm2pgsql-replication
             | status | --json |
-        Then the standard output contains
+        Then execution is successful
+        And the standard output contains
             """
             "status": 0
             "server": {"base_url": "http://example.com/europe/liechtenstein-updates", "sequence": 10000001, "timestamp": "2013-10-01T01:00:00Z"
@@ -391,8 +399,9 @@ Feature: Tests for the osm2pgsql-replication script with property table
         When running osm2pgsql pgsql with parameters
             | --slim |
 
-        Then running osm2pgsql-replication fails with returncode 1
+        When running osm2pgsql-replication
             | init | --server | http://example.com/europe/liechtenstein-updates |
+        Then execution fails with return code 1
         And the error output contains
             """
             The replication service does not have diff files for the requested date.
@@ -408,8 +417,9 @@ Feature: Tests for the osm2pgsql-replication script with property table
         When running osm2pgsql pgsql with parameters
             | --slim |
 
-        Then running osm2pgsql-replication fails with returncode 1
+        When running osm2pgsql-replication
             | init |
+        Then execution fails with return code 1
         And the error output contains
             """
             Cannot load state information for 9999999 from replication service http://example.com/europe/liechtenstein-updates.
diff --git a/tests/bdd/command-line/replication_legacy.feature b/tests/bdd/command-line/replication_legacy.feature
index de7db6248..e89932b5a 100644
--- a/tests/bdd/command-line/replication_legacy.feature
+++ b/tests/bdd/command-line/replication_legacy.feature
@@ -30,8 +30,9 @@ Feature: Tests for the osm2pgsql-replication script without property table
             | --slim |
         And deleting table osm2pgsql_properties
 
-        Then running osm2pgsql-replication fails with returncode 1
+        When running osm2pgsql-replication
             | init | --osm-file={TEST_DATA_DIR}/008-ch.osc.gz |
+        Then execution fails with return code 1
         And the error output contains
             """
             has no usable replication headers
@@ -66,10 +67,11 @@ Feature: Tests for the osm2pgsql-replication script without property table
 
         And deleting table foobar.osm2pgsql_properties
 
-        Then running osm2pgsql-replication fails with returncode 1
+        When running osm2pgsql-replication
             | init |
             | --osm-file={TEST_DATA_DIR}/liechtenstein-2013-08-03.osm.pbf |
-         And the error output contains
+        Then execution fails with return code 1
+        And the error output contains
             """
             Database needs to be imported in --slim mode.
             """
@@ -141,8 +143,9 @@ Feature: Tests for the osm2pgsql-replication script without property table
         When running osm2pgsql pgsql with parameters
             | --slim |
 
-        Then running osm2pgsql-replication fails with returncode 1
+        When running osm2pgsql-replication
             | update |
+        Then execution fails with return code 1
         And the error output contains
             """
             Updates not set up correctly.
@@ -215,8 +218,9 @@ Feature: Tests for the osm2pgsql-replication script without property table
             | --slim |
         And deleting table osm2pgsql_properties
 
-        Then running osm2pgsql-replication fails with returncode 1
+        When running osm2pgsql-replication
             | status | --json |
+        Then execution fails with return code 1
         And the standard output contains
             """
             "status": 1
@@ -238,7 +242,8 @@ Feature: Tests for the osm2pgsql-replication script without property table
 
         And running osm2pgsql-replication
             | status | --json |
-        Then the standard output contains
+        Then execution is successful
+        And the standard output contains
             """
             "status": 0
             "server": {"base_url": "https://planet.openstreetmap.org/replication/minute", "sequence": 347, "timestamp": "2020-10-24T03:00:00Z"
diff --git a/tests/bdd/flex/area.feature b/tests/bdd/flex/area.feature
index bc6d7a5ba..fb38dffe4 100644
--- a/tests/bdd/flex/area.feature
+++ b/tests/bdd/flex/area.feature
@@ -46,9 +46,9 @@ Feature: Tests for area column type
             """
         When running osm2pgsql flex
         Then table osm2pgsql_test_polygon contains
-            | name  | ST_Area(geom)  | area         | ST_Area(ST_Transform(geom, 4326)) |
-            | poly  | <st_area poly> | <area poly>  | 0.01 |
-            | multi | <st_area multi>| <area multi> | 0.08 |
+            | name  | ST_Area(geom)!~1%  | area!~1%     | ST_Area(ST_Transform(geom, 4326))!~0.01% |
+            | poly  | <st_area poly>     | <area poly>  | 0.01 |
+            | multi | <st_area multi>    | <area multi> | 0.08 |
 
         Examples:
             | geom proj | area proj | st_area poly | area poly    | st_area multi | area multi    |
diff --git a/tests/bdd/flex/bbox.feature b/tests/bdd/flex/bbox.feature
index 6daadbd9e..e777b1843 100644
--- a/tests/bdd/flex/bbox.feature
+++ b/tests/bdd/flex/bbox.feature
@@ -29,8 +29,8 @@ Feature: Test get_bbox() function
         When running osm2pgsql flex
 
         Then table osm2pgsql_test_points contains exactly
-            | node_id | min_x | max_x | min_y | max_y | ST_AsText(geom) |
-            | 10      | 20.0  | 20.0  | 10.1  | 10.1  | <geometry>      |
+            | node_id | min_x | max_x | min_y | max_y | geom!geo   |
+            | 10      | 20.0  | 20.0  | 10.1  | 10.1  | <geometry> |
 
         Examples:
             | projection | geometry            |
@@ -39,8 +39,8 @@ Feature: Test get_bbox() function
 
     Scenario Outline: for ways
         Given the 0.1 grid with origin 20.0 10.1
-            | 10 | 11 |
             |    | 12 |
+            | 10 | 11 |
         And the OSM data
             """
             w20 v1 dV Thighway=primary Nn10,n11,n12
@@ -69,8 +69,8 @@ Feature: Test get_bbox() function
         When running osm2pgsql flex
 
         Then table osm2pgsql_test_highways contains exactly
-            | way_id | min_x | max_x | min_y | max_y | ST_AsText(geom) |
-            | 20     | 20.0  | 20.1  | 10.0  | 10.1  | <geometry>      |
+            | way_id | min_x | max_x | min_y | max_y | geom!geo   |
+            | 20     | 20.0  | 20.1  | 10.0  | 10.1  | <geometry> |
 
         Examples:
             | projection | geometry                                                    |
@@ -79,8 +79,8 @@ Feature: Test get_bbox() function
 
     Scenario Outline: for relations with way members only
         Given the 0.1 grid with origin 20.0 10.1
-            | 10 | 11 |
             |    | 12 |
+            | 10 | 11 |
         And the OSM data
             """
             w20 v1 dV Nn10,n11
@@ -115,9 +115,9 @@ Feature: Test get_bbox() function
         When running osm2pgsql flex
 
         Then table osm2pgsql_test_routes contains exactly
-            | relation_id | min_x | max_x | min_y | max_y | ST_AsText(geom) |
-            | 30          | 20.0  | 20.1  | 10.1  | 10.1  | <geom30>        |
-            | 31          | 20.0  | 20.1  | 10.0  | 10.1  | <geom31>        |
+            | relation_id | min_x | max_x | min_y | max_y | geom!geo |
+            | 30          | 20.0  | 20.1  | 10.1  | 10.1  | <geom30> |
+            | 31          | 20.0  | 20.1  | 10.0  | 10.1  | <geom31> |
 
         Examples:
             | projection | geom30                                  | geom31                                                      |
diff --git a/tests/bdd/flex/delete-callbacks.feature b/tests/bdd/flex/delete-callbacks.feature
index 773c521db..8bf9b8f89 100644
--- a/tests/bdd/flex/delete-callbacks.feature
+++ b/tests/bdd/flex/delete-callbacks.feature
@@ -25,8 +25,6 @@ Feature: Test for delete callbacks
         Then table change contains exactly
             | osm_type | osm_id |
 
-        Given the input file '008-ch.osc.gz'
-
         Given the SQL statement grouped_counts
             """
             SELECT osm_type,
@@ -38,6 +36,7 @@ Feature: Test for delete callbacks
             """
 
     Scenario: Delete callbacks are called
+        Given the input file '008-ch.osc.gz'
         When running osm2pgsql flex with parameters
             | --slim | -a |
         Then statement grouped_counts returns exactly
@@ -46,6 +45,7 @@ Feature: Test for delete callbacks
             | W        | 4     | 9         |
             | R        | 1     | 3         |
 
+        Given the input file '008-ch.osc.gz'
         When running osm2pgsql flex with parameters
             | --slim | -a |
         Then statement grouped_counts returns exactly
@@ -78,6 +78,7 @@ Feature: Test for delete callbacks
 
 
             """
+        Given the input file '008-ch.osc.gz'
         When running osm2pgsql flex with parameters
             | --slim | -a |
         Then statement grouped_counts returns exactly
@@ -111,6 +112,7 @@ Feature: Test for delete callbacks
 
 
             """
+        Given the input file '008-ch.osc.gz'
         When running osm2pgsql flex with parameters
             | --slim | -a |
         Then statement grouped_counts returns exactly
diff --git a/tests/bdd/flex/empty-insert.feature b/tests/bdd/flex/empty-insert.feature
index 7e032c5b4..7209e4c68 100644
--- a/tests/bdd/flex/empty-insert.feature
+++ b/tests/bdd/flex/empty-insert.feature
@@ -20,8 +20,8 @@ Feature: Tests that empty insert command does something
             end
             """
 
-        Then running osm2pgsql flex fails
-
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Need two parameters
diff --git a/tests/bdd/flex/geometry-collection.feature b/tests/bdd/flex/geometry-collection.feature
index ff3704365..8a5b71d10 100644
--- a/tests/bdd/flex/geometry-collection.feature
+++ b/tests/bdd/flex/geometry-collection.feature
@@ -45,7 +45,7 @@ Feature: Create geometry collections from relations
             | 33     | node   | ST_GeometryCollection | 1                      | ST_Point                               |
 
         And table osm2pgsql_test_collection contains exactly
-            | osm_id | ST_AsText(geom)                    |
+            | osm_id | geom!geo                           |
             | 30     | { 10, 11, 12, 13, 10 }             |
             | 31     | { 10, 11, 12, 13, 10; 14, 15, 16 } |
             | 32     | { 17; 14, 15, 16 }                 |
@@ -105,6 +105,6 @@ Feature: Create geometry collections from relations
         When running osm2pgsql flex
 
         Then table osm2pgsql_test_collection contains exactly
-            | osm_id | name  | ST_AsText(geom)                    |
+            | osm_id | name  | geom!geo                           |
             | 30     | three | { 10, 11, 12, 13, 10; 10, 11, 13 } |
 
diff --git a/tests/bdd/flex/geometry-function-area.feature b/tests/bdd/flex/geometry-function-area.feature
index ba8f5a040..40efc7da0 100644
--- a/tests/bdd/flex/geometry-function-area.feature
+++ b/tests/bdd/flex/geometry-function-area.feature
@@ -45,9 +45,9 @@ Feature: Tests for area() function
             """
         When running osm2pgsql flex
         Then table osm2pgsql_test_polygon contains
-            | name  | ST_Area(geom)  | area         | ST_Area(ST_Transform(geom, 4326)) |
-            | poly  | <st_area poly> | <area poly>  | 0.01 |
-            | multi | <st_area multi>| <area multi> | 0.08 |
+            | name  | ST_Area(geom)!~1%  | area!~1%     | ST_Area(ST_Transform(geom, 4326))!~1% |
+            | poly  | <st_area poly>     | <area poly>  | 0.01 |
+            | multi | <st_area multi>    | <area multi> | 0.08 |
 
         Examples:
             | geom proj | area proj | st_area poly | area poly    | st_area multi | area multi    |
diff --git a/tests/bdd/flex/geometry-iteration.feature b/tests/bdd/flex/geometry-iteration.feature
index 8ff2fc46f..ebe5abdb6 100644
--- a/tests/bdd/flex/geometry-iteration.feature
+++ b/tests/bdd/flex/geometry-iteration.feature
@@ -44,13 +44,13 @@ Feature: Tests for iterating over a (multi)geometry
             """
         When running osm2pgsql flex
         Then table osm2pgsql_test_routes contains exactly
-            | relation_id | ST_AsText(geom) | num_all | num_one |
-            | 30          | 1, 2, 3         | 2       | 1       |
-            | 30          | 4, 5, 6         | 2       | 1       |
-            | 31          | 1, 2, 3         | 1       | 1       |
+            | relation_id | geom!geo | num_all | num_one |
+            | 30          | 1, 2, 3  | 2       | 1       |
+            | 30          | 4, 5, 6  | 2       | 1       |
+            | 31          | 1, 2, 3  | 1       | 1       |
         And table osm2pgsql_test_firsts contains exactly
-            | relation_id | ST_AsText(geom) |
-            | 30          | 1, 2, 3         |
-            | 31          | 1, 2, 3         |
-            | 33          | NULL            |
+            | relation_id | geom!geo |
+            | 30          | 1, 2, 3  |
+            | 31          | 1, 2, 3  |
+            | 33          | NULL     |
 
diff --git a/tests/bdd/flex/geometry-linestring.feature b/tests/bdd/flex/geometry-linestring.feature
index af4039f88..6bd2f0d5e 100644
--- a/tests/bdd/flex/geometry-linestring.feature
+++ b/tests/bdd/flex/geometry-linestring.feature
@@ -32,9 +32,9 @@ Feature: Creating linestring features from way
         When running osm2pgsql flex
 
         Then table osm2pgsql_test_lines contains exactly
-            | way_id | ST_AsText(sgeom) | ST_AsText(mgeom) | ST_AsText(xgeom) |
-            | 20     | 1, 2, 3          | [ 1, 2, 3 ]      | [ 1, 2, 3 ]      |
-            | 21     | 4, 5             | [ 4, 5 ]         | [ 4, 5 ]         |
+            | way_id | sgeom!geo | mgeom!geo   | xgeom!geo   |
+            | 20     | 1, 2, 3   | [ 1, 2, 3 ] | [ 1, 2, 3 ] |
+            | 21     | 4, 5      | [ 4, 5 ]    | [ 4, 5 ]    |
 
     Scenario:
         Given the grid
@@ -58,7 +58,8 @@ Feature: Creating linestring features from way
             end
 
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
 
         And the error output contains
             """
diff --git a/tests/bdd/flex/geometry-multilinestring.feature b/tests/bdd/flex/geometry-multilinestring.feature
index 6b06aa8d0..f0daa7e8b 100644
--- a/tests/bdd/flex/geometry-multilinestring.feature
+++ b/tests/bdd/flex/geometry-multilinestring.feature
@@ -41,7 +41,7 @@ Feature: Creating (multi)linestring features from way and relations
         When running osm2pgsql flex
 
         Then table osm2pgsql_test_lines contains exactly
-            | osm_type | osm_id | ST_AsText(geom)      |
+            | osm_type | osm_id | geom!geo             |
             | W        | 20     | 1, 2, 3              |
             | W        | 21     | 4, 5, 6              |
             | R        | 30     | 1, 2, 3              |
@@ -77,7 +77,7 @@ Feature: Creating (multi)linestring features from way and relations
         When running osm2pgsql flex
 
         Then table osm2pgsql_test_roads contains exactly
-            | relation_id | ST_GeometryType(geom) |  ST_AsText(merged) |
-            | 30          | ST_MultiLineString    |  [ 1, 2, 3 ]       |
-            | 31          | ST_MultiLineString    |  [ 1, 2; 3, 4 ]    |
+            | relation_id | ST_GeometryType(geom) |  merged!geo     |
+            | 30          | ST_MultiLineString    |  [ 1, 2, 3 ]    |
+            | 31          | ST_MultiLineString    |  [ 1, 2; 3, 4 ] |
 
diff --git a/tests/bdd/flex/geometry-multipoint.feature b/tests/bdd/flex/geometry-multipoint.feature
index 3e98852c0..f6eb11c1e 100644
--- a/tests/bdd/flex/geometry-multipoint.feature
+++ b/tests/bdd/flex/geometry-multipoint.feature
@@ -43,9 +43,9 @@ Feature: Creating (multi)point features from nodes and relations
         When running osm2pgsql flex
 
         Then table osm2pgsql_test_points contains exactly
-            | osm_type | osm_id | ST_AsText(geom) |
-            | N        | 1      | 1               |
-            | N        | 5      | 5               |
-            | R        | 30     | 1               |
-            | R        | 31     | [ 5; 1 ]        |
+            | osm_type | osm_id | geom!geo |
+            | N        | 1      | 1        |
+            | N        | 5      | 5        |
+            | R        | 30     | 1        |
+            | R        | 31     | [ 5; 1 ] |
 
diff --git a/tests/bdd/flex/geometry-null.feature b/tests/bdd/flex/geometry-null.feature
index cd338864b..27ad74f2d 100644
--- a/tests/bdd/flex/geometry-null.feature
+++ b/tests/bdd/flex/geometry-null.feature
@@ -75,15 +75,15 @@ Feature: Null geometry handling
         When running osm2pgsql flex
 
         Then table osm2pgsql_test_null contains exactly
-            | osm_type | osm_id | ST_AsText(geom) | num |
-            | N        | 12     | 3.4 5.6         | 1   |
-            | W        | 20     | 10, 11          | 1   |
-            | W        | 21     | NULL            | 0   |
-            | W        | 22     | NULL            | 0   |
-            | W        | 23     | NULL            | 0   |
+            | osm_type | osm_id | geom!geo | num |
+            | N        | 12     | 3.4 5.6  | 1   |
+            | W        | 20     | 10, 11   | 1   |
+            | W        | 21     | NULL     | 0   |
+            | W        | 22     | NULL     | 0   |
+            | W        | 23     | NULL     | 0   |
 
         And table osm2pgsql_test_not_null contains exactly
-            | osm_type | osm_id | ST_AsText(geom) | num |
-            | N        | 12     | 3.4 5.6         | 1   |
-            | W        | 20     | 10, 11          | 1   |
+            | osm_type | osm_id | geom!geo | num |
+            | N        | 12     | 3.4 5.6  | 1   |
+            | W        | 20     | 10, 11   | 1   |
 
diff --git a/tests/bdd/flex/geometry-point.feature b/tests/bdd/flex/geometry-point.feature
index 493c246b6..cdd75b323 100644
--- a/tests/bdd/flex/geometry-point.feature
+++ b/tests/bdd/flex/geometry-point.feature
@@ -34,25 +34,25 @@ Feature: Creating point features from way
         When running osm2pgsql flex
 
         Then table osm2pgsql_test_points contains exactly
-            | way_id | n    | ST_AsText(geom) |
-            | 20     | NULL | 1               |
-            | 20     | 0    | NULL            |
-            | 20     | 1    | 1               |
-            | 20     | 2    | 2               |
-            | 20     | 3    | 3               |
-            | 20     | 4    | NULL            |
-            | 20     | -1   | 3               |
-            | 20     | -2   | 2               |
-            | 20     | -3   | 1               |
-            | 21     | NULL | 4               |
-            | 21     | 0    | NULL            |
-            | 21     | 1    | 4               |
-            | 21     | 2    | 5               |
-            | 21     | 3    | NULL            |
-            | 21     | 4    | NULL            |
-            | 21     | -1   | 5               |
-            | 21     | -2   | 4               |
-            | 21     | -3   | NULL            |
+            | way_id | n    | geom!geo |
+            | 20     | NULL | 1        |
+            | 20     | 0    | NULL     |
+            | 20     | 1    | 1        |
+            | 20     | 2    | 2        |
+            | 20     | 3    | 3        |
+            | 20     | 4    | NULL     |
+            | 20     | -1   | 3        |
+            | 20     | -2   | 2        |
+            | 20     | -3   | 1        |
+            | 21     | NULL | 4        |
+            | 21     | 0    | NULL     |
+            | 21     | 1    | 4        |
+            | 21     | 2    | 5        |
+            | 21     | 3    | NULL     |
+            | 21     | 4    | NULL     |
+            | 21     | -1   | 5        |
+            | 21     | -2   | 4        |
+            | 21     | -3   | NULL     |
 
     Scenario:
         Given the grid
@@ -67,7 +67,8 @@ Feature: Creating point features from way
                 local geom = object:as_point('foo')
             end
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
 
         And the error output contains
             """
@@ -87,7 +88,8 @@ Feature: Creating point features from way
                 local geom = object:as_point(1, 'foo')
             end
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
 
         And the error output contains
             """
diff --git a/tests/bdd/flex/geometry-processing.feature b/tests/bdd/flex/geometry-processing.feature
index 4d01fd20d..8dcb3f0b8 100644
--- a/tests/bdd/flex/geometry-processing.feature
+++ b/tests/bdd/flex/geometry-processing.feature
@@ -26,15 +26,15 @@ Feature: Tests for Lua geometry processing functions
             """
         When running osm2pgsql flex
         Then table osm2pgsql_test_points contains
-            | node_id | name  | ST_AsText(geom4326) | geom3857 = geomauto |
-            | 1       | point | 1.1 1.2             | True                |
+            | node_id | name  | geom4326!geo | geom3857 = geomauto |
+            | 1       | point | 1.1 1.2      | True                |
 
     Scenario:
         Given the 0.1 grid with origin 9.0 50.3
-            |    |    |  7 |    |    |  8 |
-            |    |    |    | 11 | 12 |    |
-            |  3 |  4 |    |  9 | 10 |    |
             |  1 |  2 |  5 |    |    |  6 |
+            |  3 |  4 |    |  9 | 10 |    |
+            |    |    |    | 11 | 12 |    |
+            |    |    |  7 |    |    |  8 |
         And the OSM data
             """
             w1 Tnatural=water,name=poly Nn1,n2,n4,n3,n1
@@ -94,12 +94,12 @@ Feature: Tests for Lua geometry processing functions
             """
         When running osm2pgsql flex
         Then table osm2pgsql_test_ways contains
-            | way_id | name  | ST_AsText(geom) | ST_AsText(geomsimple) |
-            | 1      | poly  | 1, 2, 4, 3, 1   | 1, 4, 1               |
+            | way_id | name  | geom!geo      | geomsimple!geo |
+            | 1      | poly  | 1, 2, 4, 3, 1 | 1, 4, 1               |
         And table osm2pgsql_test_polygons contains
-            | area_id | name  | ST_AsText(geom)                    | ST_AsText(center) | type    |
-            | 1       | poly  | (1, 2, 4, 3, 1)                    | 9.05 50.05        | POLYGON |
-            | -1      | multi | (5, 6, 8, 7, 5),(9, 11, 12, 10, 9) | NULL              | POLYGON |
+            | area_id | name  | geom!geo                           | center!geo | type    |
+            | 1       | poly  | (1, 2, 4, 3, 1)                    | 9.05 50.05 | POLYGON |
+            | -1      | multi | (5, 6, 8, 7, 5),(9, 11, 12, 10, 9) | NULL       | POLYGON |
 
     Scenario:
         Given the grid
@@ -131,7 +131,7 @@ Feature: Tests for Lua geometry processing functions
             """
         When running osm2pgsql flex
         Then table osm2pgsql_test_roads contains
-            | way_id | n | ST_AsText(geom)      |
+            | way_id | n | geom!geo             |
             | 1      | 1 | 1, 2                 |
             | 1      | 2 | 2, 3                 |
             | 1      | 3 | 3, 20.2 19.9         |
diff --git a/tests/bdd/flex/invalid-geometries.feature b/tests/bdd/flex/invalid-geometries.feature
index c9c47421d..fd5f56144 100644
--- a/tests/bdd/flex/invalid-geometries.feature
+++ b/tests/bdd/flex/invalid-geometries.feature
@@ -50,8 +50,8 @@ Feature: Test handling of invalid geometries
 
     Scenario: Invalid way geometry should be ignored
         Given the grid with origin 10.0 10.0
-            | 10 | 11 |
             |    | 12 |
+            | 10 | 11 |
         And the OSM data
             """
             n14 v1 dV x10.0 y10.0
@@ -66,9 +66,9 @@ Feature: Test handling of invalid geometries
 
         Then table osm2pgsql_test_polygon has 0 rows
         Then table osm2pgsql_test_line contains exactly
-            | osm_id | ST_AsText(geom) |
-            | 20     | 10, 12          |
-            | 21     | 10, 12          |
+            | osm_id | geom!geo |
+            | 20     | 10, 12   |
+            | 21     | 10, 12   |
 
 
     Scenario: Invalid area geometry from way should be ignored
@@ -86,7 +86,7 @@ Feature: Test handling of invalid geometries
 
         Then table osm2pgsql_test_line has 0 rows
         Then table osm2pgsql_test_polygon contains exactly
-            | osm_id | ST_AsText(geom)  |
+            | osm_id | geom!geo         |
             | 20     | (10, 12, 11, 10) |
             | 21     | (10, 12, 11, 10) |
 
diff --git a/tests/bdd/flex/invalid-lua.feature b/tests/bdd/flex/invalid-lua.feature
index 36309b172..55589fc3d 100644
--- a/tests/bdd/flex/invalid-lua.feature
+++ b/tests/bdd/flex/invalid-lua.feature
@@ -9,4 +9,5 @@ Feature: Tests for basic Lua functions
             """
             this-is-not-valid-lua
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
diff --git a/tests/bdd/flex/line-splitting.feature b/tests/bdd/flex/line-splitting.feature
index 48fdfdcae..a73db7bb0 100644
--- a/tests/bdd/flex/line-splitting.feature
+++ b/tests/bdd/flex/line-splitting.feature
@@ -40,12 +40,12 @@ Feature: Test splitting of lines
         When running osm2pgsql flex
 
         Then table osm2pgsql_test_line contains exactly
-            | way_id | ST_Length(geom) | ST_AsText(geom) |
-            | 20     | 1.0             | 10, 11          |
-            | 21     | 2.5             | 10, 12          |
+            | way_id | ST_Length(geom) | geom!geo |
+            | 20     | 1.0             | 10, 11   |
+            | 21     | 2.5             | 10, 12   |
 
         And table osm2pgsql_test_split contains exactly
-            | way_id | ST_Length(geom) | ST_AsText(geom)      |
+            | way_id | ST_Length(geom) | geom!geo             |
             | 20     | 1.0             | 10, 11               |
             | 21     | 1.0             | 20.0 20.0, 21.0 20.0 |
             | 21     | 1.0             | 21.0 20.0, 22.0 20.0 |
diff --git a/tests/bdd/flex/locator.feature b/tests/bdd/flex/locator.feature
index 1e1bf9aec..cadaaa2ef 100644
--- a/tests/bdd/flex/locator.feature
+++ b/tests/bdd/flex/locator.feature
@@ -9,7 +9,8 @@ Feature: Locators
             local regions = osm2pgsql.define_locator()
             print(regions:name())
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Argument #1 to 'define_locator' must be a Lua table.
@@ -54,7 +55,8 @@ Feature: Locators
             local regions = osm2pgsql.define_locator({ name = 'test' })
             print(regions.name())
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Argument #1 has to be of type osm2pgsql.Locator.
@@ -74,7 +76,8 @@ Feature: Locators
                 local r = regions:first_intersecting()
             end
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Error in 'first_intersecting': Need locator and geometry arguments
@@ -94,7 +97,8 @@ Feature: Locators
                 local r = regions:all_intersecting()
             end
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Error in 'all_intersecting': Need locator and geometry arguments
@@ -131,9 +135,9 @@ Feature: Locators
             """
         When running osm2pgsql flex
         Then table osm2pgsql_test_points contains exactly
-            | node_id | region | ST_AsText(geom) |
-            | 10      | B1     | 0.5 0.5         |
-            | 12      | B2     | 1.5 1.5         |
+            | node_id | region | geom!geo |
+            | 10      | B1     | 0.5 0.5  |
+            | 12      | B2     | 1.5 1.5  |
 
     Scenario: Define and use a locator with all_intersecting
         Given the OSM data
@@ -167,15 +171,15 @@ Feature: Locators
             """
         When running osm2pgsql flex
         Then table osm2pgsql_test_points contains exactly
-            | node_id | num_regions | ST_AsText(geom) |
-            | 10      | 1           | 0.5 0.5         |
-            | 12      | 1           | 1.5 1.5         |
-            | 13      | 2           | 1 1             |
+            | node_id | num_regions | geom!geo |
+            | 10      | 1           | 0.5 0.5  |
+            | 12      | 1           | 1.5 1.5  |
+            | 13      | 2           | 1 1      |
 
     Scenario: Define and use a locator with polygon from db
         Given the 10.0 grid with origin 10.0 10.0
-            | 10 | 11 |
             | 12 |    |
+            | 10 | 11 |
         And the OSM data
             """
             w20 v1 dV Tsome=boundary Nn10,n11,n12,n10
@@ -196,7 +200,7 @@ Feature: Locators
             """
         When running osm2pgsql flex
         Then table osm2pgsql_test_regions contains exactly
-            | way_id | region | ST_AsText(geom)         |
+            | way_id | region | geom!geo                |
             | 20     | P1     | (10 0,20 10,10 10,10 0) |
 
         Given the OSM data
@@ -227,8 +231,8 @@ Feature: Locators
             """
         When running osm2pgsql flex
         Then table osm2pgsql_test_points contains exactly
-            | node_id | region | ST_AsText(geom) |
-            | 10      | P1     | 15 8            |
+            | node_id | region | geom!geo |
+            | 10      | P1     | 15 8     |
 
     Scenario: Define and use a locator with relation from db
         Given the 10.0 grid with origin 10.0 10.0
@@ -254,7 +258,7 @@ Feature: Locators
             """
         When running osm2pgsql flex
         Then table osm2pgsql_test_regions contains exactly
-            | way_id | region | ST_AsText(geom)               |
+            | way_id | region | geom!geo                      |
             | 29     | P1     | (10 0,20 0,20 10,10 10, 10 0) |
 
         Given the 10.0 grid with origin 10.0 10.0
diff --git a/tests/bdd/flex/lua-expire-output-definitions.feature b/tests/bdd/flex/lua-expire-output-definitions.feature
index bb1c74c6b..500328c72 100644
--- a/tests/bdd/flex/lua-expire-output-definitions.feature
+++ b/tests/bdd/flex/lua-expire-output-definitions.feature
@@ -6,7 +6,8 @@ Feature: Expire output definitions in Lua file
             """
             osm2pgsql.define_expire_output()
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Argument #1 to 'define_expire_output' must be a Lua table.
@@ -20,7 +21,8 @@ Feature: Expire output definitions in Lua file
                 filename = false
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             The expire output field must contain a 'filename' string field (or nil for default: '').
@@ -35,7 +37,8 @@ Feature: Expire output definitions in Lua file
                 schema = false
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             The expire output field must contain a 'schema' string field (or nil for default: 'public').
@@ -49,7 +52,8 @@ Feature: Expire output definitions in Lua file
                 table = false
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             The expire output field must contain a 'table' string field (or nil for default: '').
@@ -64,7 +68,8 @@ Feature: Expire output definitions in Lua file
                 filename = 'somewhere'
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             The 'maxzoom' field in a expire output must contain an integer.
@@ -80,7 +85,8 @@ Feature: Expire output definitions in Lua file
                 filename = 'somewhere'
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             The 'minzoom' field in a expire output must contain an integer.
@@ -95,7 +101,8 @@ Feature: Expire output definitions in Lua file
                 filename = 'somewhere'
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             The 'maxzoom' field in a expire output must be between 1 and 20.
@@ -111,7 +118,8 @@ Feature: Expire output definitions in Lua file
                 filename = 'somewhere'
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             The 'minzoom' field in a expire output must be between 1 and 'maxzoom'.
@@ -127,7 +135,8 @@ Feature: Expire output definitions in Lua file
                 filename = 'somewhere'
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             The 'minzoom' field in a expire output must be between 1 and 'maxzoom'.
diff --git a/tests/bdd/flex/lua-expire.feature b/tests/bdd/flex/lua-expire.feature
index d24fc0bfd..fbff960ba 100644
--- a/tests/bdd/flex/lua-expire.feature
+++ b/tests/bdd/flex/lua-expire.feature
@@ -12,7 +12,8 @@ Feature: Expire configuration in Lua file
                 { column = 'some', expire = {{ output = eo }} }
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Expire only allowed for geometry columns in Web Mercator projection.
@@ -33,7 +34,8 @@ Feature: Expire configuration in Lua file
                   expire = {{ output = eo }} }
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Expire only allowed for geometry columns in Web Mercator projection.
@@ -51,7 +53,8 @@ Feature: Expire configuration in Lua file
                 { column = 'some', type = 'geometry', expire = {{ output = 'abc' }} }
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Expire output must be of type ExpireOutput.
@@ -115,7 +118,8 @@ Feature: Expire configuration in Lua file
                 }}
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Optional expire field 'buffer' must contain a number.
@@ -139,7 +143,8 @@ Feature: Expire configuration in Lua file
                 t:insert({ some = object:as_point() })
             end
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Unknown expire mode 'foo'.
@@ -161,7 +166,8 @@ Feature: Expire configuration in Lua file
                 }}
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Optional expire field 'full_area_limit' must contain a number.
diff --git a/tests/bdd/flex/lua-index-definitions.feature b/tests/bdd/flex/lua-index-definitions.feature
index 1400a7809..de97fcbb7 100644
--- a/tests/bdd/flex/lua-index-definitions.feature
+++ b/tests/bdd/flex/lua-index-definitions.feature
@@ -26,7 +26,8 @@ Feature: Index definitions in Lua file
                 indexes = true
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             The 'indexes' field in definition of table 'mytable' is not an array.
@@ -48,7 +49,7 @@ Feature: Index definitions in Lua file
             """
         When running osm2pgsql flex
         Then statement mytable_indexes returns
-            | indexdef@substr |
+            | indexdef!substr |
             | USING gist (geom) |
 
     Scenario: Empty indexes field in table definition gets you no index
@@ -89,7 +90,7 @@ Feature: Index definitions in Lua file
             """
         When running osm2pgsql flex
         Then statement mytable_indexes returns
-            | indexdef@substr |
+            | indexdef!substr |
             | USING btree (name) |
 
     Scenario: Explicitly setting multiple indexes
@@ -113,7 +114,7 @@ Feature: Index definitions in Lua file
             """
         When running osm2pgsql flex
         Then statement mytable_indexes returns exactly
-            | indexdef@substr |
+            | indexdef!substr |
             | USING btree (name) |
             | USING gist (geom) |
             | USING btree (name, tags) |
@@ -135,7 +136,8 @@ Feature: Index definitions in Lua file
                 }
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Index definition must contain a 'method' string field.
@@ -158,7 +160,8 @@ Feature: Index definitions in Lua file
                 }
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Unknown index method 'ERROR'.
@@ -181,7 +184,8 @@ Feature: Index definitions in Lua file
                 }
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             You must set either the 'column' or the 'expression' field in index definition.
@@ -204,7 +208,8 @@ Feature: Index definitions in Lua file
                 }
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Unknown column 'foo' in table 'mytable'.
@@ -227,7 +232,8 @@ Feature: Index definitions in Lua file
                 }
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             You must set either the 'column' or the 'expression' field in index definition.
@@ -252,7 +258,7 @@ Feature: Index definitions in Lua file
             """
         When running osm2pgsql flex
         Then statement mytable_indexes returns
-            | indexdef@substr |
+            | indexdef!substr |
             | USING btree (lower(name)) |
 
     Scenario: Include field must be a string or array
@@ -272,7 +278,8 @@ Feature: Index definitions in Lua file
                 }
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             The 'include' field in an index definition must contain a string or an array.
@@ -295,7 +302,8 @@ Feature: Index definitions in Lua file
                 }
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Unknown column 'foo' in table 'mytable'.
@@ -320,7 +328,7 @@ Feature: Index definitions in Lua file
             """
         When running osm2pgsql flex
         Then statement mytable_indexes returns
-            | indexdef@substr |
+            | indexdef!substr |
             | USING btree (name) INCLUDE (tags) |
 
     Scenario: Include field works with array
@@ -342,7 +350,7 @@ Feature: Index definitions in Lua file
             """
         When running osm2pgsql flex
         Then statement mytable_indexes returns
-            | indexdef@substr |
+            | indexdef!substr |
             | USING btree (name) INCLUDE (tags) |
 
     Scenario: Tablespace needs a string
@@ -362,7 +370,8 @@ Feature: Index definitions in Lua file
                 }
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Index definition field must contain a 'tablespace' string field (or nil for default: '').
@@ -387,7 +396,7 @@ Feature: Index definitions in Lua file
             """
         When running osm2pgsql flex
         Then statement mytable_indexes returns
-            | indexdef@substr |
+            | indexdef!substr |
             | USING btree (name) |
 
     Scenario: Unique needs a boolean
@@ -407,7 +416,8 @@ Feature: Index definitions in Lua file
                 }
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Index definition field 'unique' must be a boolean field.
@@ -432,7 +442,7 @@ Feature: Index definitions in Lua file
             """
         When running osm2pgsql flex
         Then statement mytable_indexes returns
-            | indexdef@fullmatch |
+            | indexdef!re |
             | .*UNIQUE.*USING btree \(name\).* |
 
     Scenario: Where condition needs a string
@@ -452,7 +462,8 @@ Feature: Index definitions in Lua file
                 }
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Index definition field must contain a 'where' string field (or nil for default: '').
@@ -477,7 +488,7 @@ Feature: Index definitions in Lua file
             """
         When running osm2pgsql flex
         Then statement mytable_indexes returns
-            | indexdef@substr |
+            | indexdef!substr |
             | USING btree (name) WHERE (name = lower(name)) |
 
 
@@ -497,7 +508,7 @@ Feature: Index definitions in Lua file
             """
         When running osm2pgsql flex
         Then statement mytable_indexes returns exactly
-            | indexdef@substr  |
+            | indexdef!substr |
             | USING gist (geom) |
 
     Scenario: Don't create id index if the configuration doesn't says so
@@ -516,7 +527,7 @@ Feature: Index definitions in Lua file
             """
         When running osm2pgsql flex
         Then statement mytable_indexes returns exactly
-            | indexdef@substr  |
+            | indexdef!substr |
             | USING gist (geom) |
 
     Scenario: Always create id index if the configuration says so
@@ -535,7 +546,7 @@ Feature: Index definitions in Lua file
             """
         When running osm2pgsql flex
         Then statement mytable_indexes returns
-            | indexdef@substr      |
+            | indexdef!substr |
             | USING btree (node_id) |
 
     Scenario: Create a unique id index when requested
@@ -555,7 +566,7 @@ Feature: Index definitions in Lua file
         When running osm2pgsql flex
         Then table mytable has 1562 rows
         Then statement mytable_indexes returns
-            | indexdef@fullmatch                           | is_primary |
+            | indexdef!re                                  | is_primary |
             | CREATE UNIQUE INDEX .* USING .*\(node_id\).* | False      |
 
     Scenario: Create a primary key id index when requested
@@ -575,5 +586,5 @@ Feature: Index definitions in Lua file
         When running osm2pgsql flex
         Then table mytable has 1562 rows
         Then statement mytable_indexes returns
-            | indexdef@fullmatch                         | is_primary |
+            | indexdef!re                                | is_primary |
             | CREATE UNIQUE INDEX .* USING .*\(node_id\) | True       |
diff --git a/tests/bdd/flex/lua-table-definitions.feature b/tests/bdd/flex/lua-table-definitions.feature
index a061b1b28..070a8257e 100644
--- a/tests/bdd/flex/lua-table-definitions.feature
+++ b/tests/bdd/flex/lua-table-definitions.feature
@@ -6,7 +6,8 @@ Feature: Table definitions in Lua file
             """
             local t = osm2pgsql.define_table()
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Argument #1 to 'define_table' must be a table.
@@ -18,7 +19,8 @@ Feature: Table definitions in Lua file
             """
             local t = osm2pgsql.define_table({})
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             The table must contain a 'name' string field.
@@ -32,7 +34,8 @@ Feature: Table definitions in Lua file
                 name = false
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             The table must contain a 'name' string field.
@@ -46,7 +49,8 @@ Feature: Table definitions in Lua file
                 name = 'foo'
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             No 'columns' field (or not an array) in table 'foo'.
@@ -61,7 +65,8 @@ Feature: Table definitions in Lua file
                 columns = 123
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             No 'columns' field (or not an array) in table 'foo'.
@@ -76,7 +81,8 @@ Feature: Table definitions in Lua file
                 columns = {}
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             No columns defined for table 'foo'.
@@ -110,7 +116,8 @@ Feature: Table definitions in Lua file
                 { column = 'baz' }
             })
             """
-        Then running osm2pgsql flex fails
+        When running osm2pgsql flex
+        Then execution fails
         And the error output contains
             """
             Table with name 'foo' already exists.
diff --git a/tests/bdd/flex/multigeom.feature b/tests/bdd/flex/multigeom.feature
index c5083729d..4858fcdd7 100644
--- a/tests/bdd/flex/multigeom.feature
+++ b/tests/bdd/flex/multigeom.feature
@@ -79,7 +79,7 @@ Feature: Handling of multiple geometries
         When running osm2pgsql flex
 
         Then table osm2pgsql_test_polygon contains exactly
-            | osm_id | ST_GeometryType(geom) | ST_AsText(geom)      |
+            | osm_id | ST_GeometryType(geom) | geom!geo             |
             | 20     | ST_Polygon            | (10, 11, 12, 13, 10) |
             | -30    | ST_Polygon            | (10, 11, 12, 13, 10) |
             | -31    | ST_Polygon            | (10, 11, 12, 13, 10) |
diff --git a/tests/bdd/flex/relation-changes.feature b/tests/bdd/flex/relation-changes.feature
index 4f16d6c65..51a10c199 100644
--- a/tests/bdd/flex/relation-changes.feature
+++ b/tests/bdd/flex/relation-changes.feature
@@ -162,8 +162,8 @@ Feature: Handling changes to relations
 
     Scenario Outline: Changing nodes in a valid relation
         Given the 0.1 grid with origin 10.0 10.0
-            | 10 | 11 |
             |    | 12 |
+            | 10 | 11 |
         And the OSM data
             """
             w20 v1 dV Nn10,n11,n12
diff --git a/tests/bdd/flex/way-change.feature b/tests/bdd/flex/way-change.feature
index 28c73d448..514cc055d 100644
--- a/tests/bdd/flex/way-change.feature
+++ b/tests/bdd/flex/way-change.feature
@@ -4,8 +4,8 @@ Feature: Changing ways in a flex database
         Given the style file 'test_output_flex_way.lua'
 
         Given the 0.1 grid with origin 10.0 10.1
-            | 11 | 13 | 15 | 17 | 19 |
             | 10 | 12 | 14 | 16 | 18 |
+            | 11 | 13 | 15 | 17 | 19 |
 
     Scenario Outline:
         Given the OSM data
diff --git a/tests/bdd/regression/import.feature b/tests/bdd/regression/import.feature
index 4cd4760d6..b94a016be 100644
--- a/tests/bdd/regression/import.feature
+++ b/tests/bdd/regression/import.feature
@@ -8,14 +8,14 @@ Feature: Imports of the test database
 
         Then table planet_osm_point has 1342 rows
         And table planet_osm_polygon contains
-            | count(*) | round(sum(ST_Area(way))) | round(sum(way_area)) |
-            | 4130     | 1247245186               | 1247245413           |
+            | count(*) | sum(ST_Area(way))::int | sum(way_area)::int |
+            | 4130     | 1247245186             | 1247243136         |
         And table planet_osm_line contains
-            | count(*) | round(sum(ST_Length(way))) |
-            | 3231     | 4211350                    |
+            | count(*) | sum(ST_Length(way))::int |
+            | 3231     | 4211350                  |
         And table planet_osm_roads contains
-            | count(*) | round(sum(ST_Length(way))) |
-            | 375      | 2032023                    |
+            | count(*) | sum(ST_Length(way))::int |
+            | 375      | 2032023                  |
 
         And there are no tables planet_osm_nodes, planet_osm_ways, planet_osm_rels
 
@@ -39,14 +39,14 @@ Feature: Imports of the test database
 
         Then table planet_osm_point has 1342 rows
         And table planet_osm_polygon contains
-            | count(*) | round(sum(ST_Area(way))) | round(sum(way_area)) |
-            | 4130     | 1247245186               | 1247245413           |
+            | count(*) | sum(ST_Area(way))::int | sum(way_area)::int |
+            | 4130     | 1247245186             | 1247243136         |
         And table planet_osm_line contains
-            | count(*) | round(sum(ST_Length(way))) |
-            | 3231     | 4211350                    |
+            | count(*) | sum(ST_Length(way))::int |
+            | 3231     | 4211350                  |
         And table planet_osm_roads contains
-            | count(*) | round(sum(ST_Length(way))) |
-            | 375      | 2032023                    |
+            | count(*) | sum(ST_Length(way))::int |
+            | 375      | 2032023                  |
 
         And there are <have table> planet_osm_nodes, planet_osm_ways, planet_osm_rels
 
@@ -57,21 +57,22 @@ Feature: Imports of the test database
 
 
     Scenario Outline: Import with Lua tagtransform
-        Given the default lua tagtransform
         When running osm2pgsql pgsql
-            | --create |
-            | <slim> |
+            | --create                   |
+            | <slim>                     |
+            | --tag-transform-script     |
+            | {STYLE_DATA_DIR}/style.lua |
 
         Then table planet_osm_point has 1342 rows
         And table planet_osm_polygon contains
-            | count(*) | round(sum(ST_Area(way))) | round(sum(way_area)) |
-            | 4136     | 1272140688               | 1272140891           |
+            | count(*) | sum(ST_Area(way))::int | sum(way_area)::int |
+            | 4136     | 1272140688             | 1272138496         |
         And table planet_osm_line contains
-            | count(*) | round(sum(ST_Length(way))) |
-            | 3231     | 4211350                    |
+            | count(*) | sum(ST_Length(way))::int |
+            | 3231     | 4211350                  |
         And table planet_osm_roads contains
-            | count(*) | round(sum(ST_Length(way))) |
-            | 375      | 2032023                    |
+            | count(*) | sum(ST_Length(way))::int |
+            | 375      | 2032023                  |
 
         And there are <have table> planet_osm_nodes, planet_osm_ways, planet_osm_rels
 
@@ -128,14 +129,14 @@ Feature: Imports of the test database
 
         Then table planet_osm_point has 1342 rows
         And table planet_osm_polygon contains
-            | count(*) | round(sum(ST_Area(way))) | round(sum(way_area)) |
-            | 4130     | 1247245186               | 1247245413           |
+            | count(*) | sum(ST_Area(way))::int | sum(way_area)::int |
+            | 4130     | 1247245186             | 1247243136         |
         And table planet_osm_line contains
-            | count(*) | round(sum(ST_Length(way))) |
-            | 3231     | 4211350                    |
+            | count(*) | sum(ST_Length(way))::int |
+            | 3231     | 4211350                  |
         And table planet_osm_roads contains
-            | count(*) | round(sum(ST_Length(way))) |
-            | 375      | 2032023                    |
+            | count(*) | sum(ST_Length(way))::int |
+            | 375      | 2032023                  |
 
         And there are tables planet_osm_nodes, planet_osm_ways, planet_osm_rels
 
diff --git a/tests/bdd/regression/input.feature b/tests/bdd/regression/input.feature
index 2071c2fa9..f247488b4 100644
--- a/tests/bdd/regression/input.feature
+++ b/tests/bdd/regression/input.feature
@@ -1,7 +1,7 @@
 Feature: Tests for bad input data
 
     Scenario: Overly large relations are ignored
-        Given the python-formatted OSM data
+        Given the OSM data format string
             """
             n1 x45 y34
             r1 Ttype=multipolygon M{','.join('n' + str(i) + '@' for i in range(33000))}
diff --git a/tests/bdd/regression/multipolygon.feature b/tests/bdd/regression/multipolygon.feature
index 4f5d7af91..21983c8e9 100644
--- a/tests/bdd/regression/multipolygon.feature
+++ b/tests/bdd/regression/multipolygon.feature
@@ -7,14 +7,13 @@ Feature: Import and update of multipolygon areas
             """
             SELECT osm_id,
                    count(*) AS count,
-                   round(sum(ST_Area(way))) AS area,
-                   round(sum(way_area::numeric)) AS way_area
+                   sum(ST_Area(way))::int AS area,
+                   sum(way_area)::int AS way_area
             FROM planet_osm_polygon
             GROUP BY osm_id
             """
 
     Scenario Outline: Import and update slim
-        Given <lua> lua tagtransform
         When running osm2pgsql pgsql with parameters
             | --slim   |
             | <param1> |
@@ -22,24 +21,24 @@ Feature: Import and update of multipolygon areas
         Then there are tables planet_osm_nodes
 
         Then table planet_osm_polygon contains
-            | osm_id | landuse     | name      | round(ST_Area(way)) |
-            | -1     | residential | Name_rel  | 12895               |
-            | 4      | farmland    | Name_way3 | 3144                |
-            | -8     | residential | Name_rel2 | 12894               |
-            | 5      | farmland    | Name_way4 | 3144                |
-            | -14    | residential | Name_way5 | 12894               |
-            | -11    | residential | Name_rel6 | 11529               |
-            | -3     | residential | Name_rel11| 9286                |
-            | 83     | farmland    | NULL      | 24859               |
+            | osm_id | landuse     | name      | ST_Area(way)::int |
+            | -1     | residential | Name_rel  | 12895             |
+            | 4      | farmland    | Name_way3 | 3144              |
+            | -8     | residential | Name_rel2 | 12894             |
+            | 5      | farmland    | Name_way4 | 3144              |
+            | -14    | residential | Name_way5 | 12894             |
+            | -11    | residential | Name_rel6 | 11529             |
+            | -3     | residential | Name_rel11| 9286              |
+            | 83     | farmland    | NULL      | 24859             |
 
         Then table planet_osm_polygon contains
-            | osm_id | "natural" | round(ST_Area(way)) |
-            | -24    | water     | 18501               |
-            | 102    | water     | 12994               |
+            | osm_id | "natural" | ST_Area(way)::int |
+            | -24    | water     | 18501             |
+            | 102    | water     | 12994             |
 
         Then table planet_osm_line contains
-            | osm_id | highway     | name      | round(ST_Length(way)) |
-            | 6      | residential | Name_way6 | 228                   |
+            | osm_id | highway     | name      | ST_Length(way)::int |
+            | 6      | residential | Name_way6 | 228                 |
 
         Then table planet_osm_polygon contains
             | osm_id | landuse     | name       | ST_NumInteriorRing(way) |
@@ -94,24 +93,24 @@ Feature: Import and update of multipolygon areas
             | <param1> |
 
         Then table planet_osm_polygon contains
-            | osm_id | landuse     | name      | round(ST_Area(way)) |
-            | -1     | residential | Name_rel  | 13949               |
-            | 4      | farmland    | Name_way3 | 3144                |
-            | -8     | residential | Name_rel2 | 12894               |
-            | 5      | farmland    | Name_way4 | 3144                |
-            | -14    | residential | Name_way5 | 12894               |
-            | -11    | residential | Name_rel6 | 11529               |
-            | -3     | residential | Name_rel11| 9286                |
-            | 83     | farmland    | NULL      | 24859               |
+            | osm_id | landuse     | name      | ST_Area(way)::int |
+            | -1     | residential | Name_rel  | 13949             |
+            | 4      | farmland    | Name_way3 | 3144              |
+            | -8     | residential | Name_rel2 | 12894             |
+            | 5      | farmland    | Name_way4 | 3144              |
+            | -14    | residential | Name_way5 | 12894             |
+            | -11    | residential | Name_rel6 | 11529             |
+            | -3     | residential | Name_rel11| 9286              |
+            | 83     | farmland    | NULL      | 24859             |
 
         Then table planet_osm_polygon contains
-            | osm_id | "natural" | round(ST_Area(way)) |
-            | -24    | water     | 18501               |
-            | 102    | water     | 12994               |
+            | osm_id | "natural" | ST_Area(way)::int |
+            | -24    | water     | 18501             |
+            | 102    | water     | 12994             |
 
         Then table planet_osm_line contains
-            | osm_id | highway     | name      | round(ST_Length(way)) |
-            | 6      | residential | Name_way6 | 228                   |
+            | osm_id | highway     | name      | ST_Length(way)::int |
+            | 6      | residential | Name_way6 | 228                 |
 
         Then table planet_osm_polygon contains
             | osm_id | landuse     | name       | ST_NumInteriorRing(way) |
@@ -146,12 +145,151 @@ Feature: Import and update of multipolygon areas
             | -33    | water     |
 
         Examples:
-            | param1 | lua         |
-            |        | no          |
-            | -G     | no          |
-            | -k     | no          |
-            |        | the default |
-            | -k     | the default |
+            | param1 |
+            |        |
+            | -G     |
+            | -k     |
+
+
+    Scenario Outline: Import and update slim
+        When running osm2pgsql pgsql with parameters
+            | --slim                     |
+            | <param1>                   |
+            | --tag-transform-script     |
+            | {STYLE_DATA_DIR}/style.lua |
+
+        Then there are tables planet_osm_nodes
+
+        Then table planet_osm_polygon contains
+            | osm_id | landuse     | name      | ST_Area(way)::int |
+            | -1     | residential | Name_rel  | 12895             |
+            | 4      | farmland    | Name_way3 | 3144              |
+            | -8     | residential | Name_rel2 | 12894             |
+            | 5      | farmland    | Name_way4 | 3144              |
+            | -14    | residential | Name_way5 | 12894             |
+            | -11    | residential | Name_rel6 | 11529             |
+            | -3     | residential | Name_rel11| 9286              |
+            | 83     | farmland    | NULL      | 24859             |
+
+        Then table planet_osm_polygon contains
+            | osm_id | "natural" | ST_Area(way)::int |
+            | -24    | water     | 18501             |
+            | 102    | water     | 12994             |
+
+        Then table planet_osm_line contains
+            | osm_id | highway     | name      | ST_Length(way)::int |
+            | 6      | residential | Name_way6 | 228                 |
+
+        Then table planet_osm_polygon contains
+            | osm_id | landuse     | name       | ST_NumInteriorRing(way) |
+            | -3     | residential | Name_rel11 | 2                       |
+
+        Then statement grouped_polygons returns
+            | osm_id | area  | way_area |
+            | -13    | 17581 | 17581    |
+            | -7     | 16169 | 16169    |
+            | -29    | 68494 | 68494    |
+            | -39    | 10377 | 10378    |
+            | -40    | 12397 | 12397    |
+
+        Then statement grouped_polygons returns
+            | osm_id | count |
+            | -25    | 1     |
+            | 113    | 1     |
+            | 118    | 1     |
+            | 114    | 1     |
+            | 107    | 1     |
+            | 102    | 1     |
+            | 138    | 1     |
+            | 140    | 1     |
+
+        Then table planet_osm_polygon doesn't contain
+            | osm_id |
+            | 109    |
+            | 104    |
+
+        Then table planet_osm_polygon doesn't contain
+            | osm_id | "natural" |
+            | -33    | water     |
+
+        Given the SQL statement geometries_polygon
+            """
+            SELECT osm_id,
+                   CASE WHEN '<param1>' = '-G' THEN min(ST_NumGeometries(way))
+                   ELSE count(*) END AS count
+            FROM planet_osm_polygon
+            GROUP BY osm_id
+            """
+        Then statement geometries_polygon returns
+           | osm_id | count |
+           | -13    | 2     |
+           | -7     | 2     |
+
+
+        Given the input file 'test_multipolygon_diff.osc'
+        When running osm2pgsql pgsql with parameters
+            | --slim                     |
+            | -a                         |
+            | <param1>                   |
+            | --tag-transform-script     |
+            | {STYLE_DATA_DIR}/style.lua |
+
+        Then table planet_osm_polygon contains
+            | osm_id | landuse     | name      | ST_Area(way)::int |
+            | -1     | residential | Name_rel  | 13949             |
+            | 4      | farmland    | Name_way3 | 3144              |
+            | -8     | residential | Name_rel2 | 12894             |
+            | 5      | farmland    | Name_way4 | 3144              |
+            | -14    | residential | Name_way5 | 12894             |
+            | -11    | residential | Name_rel6 | 11529             |
+            | -3     | residential | Name_rel11| 9286              |
+            | 83     | farmland    | NULL      | 24859             |
+
+        Then table planet_osm_polygon contains
+            | osm_id | "natural" | ST_Area(way)::int |
+            | -24    | water     | 18501             |
+            | 102    | water     | 12994             |
+
+        Then table planet_osm_line contains
+            | osm_id | highway     | name      | ST_Length(way)::int |
+            | 6      | residential | Name_way6 | 228                 |
+
+        Then table planet_osm_polygon contains
+            | osm_id | landuse     | name       | ST_NumInteriorRing(way) |
+            | -3     | residential | Name_rel11 | 2                       |
+
+        Then statement grouped_polygons returns
+            | osm_id | area  | way_area |
+            | -13    | 17581 | 17581    |
+            | -7     | 16169 | 16169    |
+            | -29    | 29155 | 29155    |
+            | -39    | 10377 | 10378    |
+            | -40    | 12397 | 12397    |
+
+        Then statement grouped_polygons returns
+            | osm_id | count |
+            | 113    | 1     |
+            | 118    | 1     |
+            | 114    | 1     |
+            | 107    | 1     |
+            | 102    | 1     |
+            | 138    | 1     |
+            | 140    | 1     |
+
+        Then table planet_osm_polygon doesn't contain
+            | osm_id |
+            | -25    |
+            | 109    |
+            | 104    |
+
+        Then table planet_osm_polygon doesn't contain
+            | osm_id | "natural" |
+            | -33    | water     |
+
+        Examples:
+            | param1 |
+            |        |
+            | -k     |
 
 
      Scenario: Import with flat-node option
@@ -159,15 +297,15 @@ Feature: Import and update of multipolygon areas
             | -F | flat.store | --drop |
 
         Then table planet_osm_polygon contains
-            | osm_id | landuse     | name      | round(ST_Area(way)) |
-            | -1     | residential | Name_rel  | 12895               |
-            | 4      | farmland    | Name_way3 | 3144                |
-            | -8     | residential | Name_rel2 | 12894               |
-            | 5      | farmland    | Name_way4 | 3144                |
-            | -14    | residential | Name_way5 | 12894               |
-            | -11    | residential | Name_rel6 | 11529               |
-            | -3     | residential | Name_rel11| 9286                |
-            | 83     | farmland    | NULL      | 24859               |
+            | osm_id | landuse     | name      | ST_Area(way)::int |
+            | -1     | residential | Name_rel  | 12895             |
+            | 4      | farmland    | Name_way3 | 3144              |
+            | -8     | residential | Name_rel2 | 12894             |
+            | 5      | farmland    | Name_way4 | 3144              |
+            | -14    | residential | Name_way5 | 12894             |
+            | -11    | residential | Name_rel6 | 11529             |
+            | -3     | residential | Name_rel11| 9286              |
+            | 83     | farmland    | NULL      | 24859             |
 
 
      Scenario: Import and update with flat-node option
@@ -175,15 +313,15 @@ Feature: Import and update of multipolygon areas
             | --slim | -F | flat.store |
 
         Then table planet_osm_polygon contains
-            | osm_id | landuse     | name      | round(ST_Area(way)) |
-            | -1     | residential | Name_rel  | 12895               |
-            | 4      | farmland    | Name_way3 | 3144                |
-            | -8     | residential | Name_rel2 | 12894               |
-            | 5      | farmland    | Name_way4 | 3144                |
-            | -14    | residential | Name_way5 | 12894               |
-            | -11    | residential | Name_rel6 | 11529               |
-            | -3     | residential | Name_rel11| 9286                |
-            | 83     | farmland    | NULL      | 24859               |
+            | osm_id | landuse     | name      | ST_Area(way)::int |
+            | -1     | residential | Name_rel  | 12895             |
+            | 4      | farmland    | Name_way3 | 3144              |
+            | -8     | residential | Name_rel2 | 12894             |
+            | 5      | farmland    | Name_way4 | 3144              |
+            | -14    | residential | Name_way5 | 12894             |
+            | -11    | residential | Name_rel6 | 11529             |
+            | -3     | residential | Name_rel11| 9286              |
+            | 83     | farmland    | NULL      | 24859             |
 
 
         Given the input file 'test_multipolygon_diff.osc'
@@ -191,13 +329,13 @@ Feature: Import and update of multipolygon areas
             | --slim | -a | -F | flat.store |
 
         Then table planet_osm_polygon contains
-            | osm_id | landuse     | name      | round(ST_Area(way)) |
-            | -1     | residential | Name_rel  | 13949               |
-            | 4      | farmland    | Name_way3 | 3144                |
-            | -8     | residential | Name_rel2 | 12894               |
-            | 5      | farmland    | Name_way4 | 3144                |
-            | -14    | residential | Name_way5 | 12894               |
-            | -11    | residential | Name_rel6 | 11529               |
-            | -3     | residential | Name_rel11| 9286                |
-            | 83     | farmland    | NULL      | 24859               |
+            | osm_id | landuse     | name      | ST_Area(way)::int |
+            | -1     | residential | Name_rel  | 13949             |
+            | 4      | farmland    | Name_way3 | 3144              |
+            | -8     | residential | Name_rel2 | 12894             |
+            | 5      | farmland    | Name_way4 | 3144              |
+            | -14    | residential | Name_way5 | 12894             |
+            | -11    | residential | Name_rel6 | 11529             |
+            | -3     | residential | Name_rel11| 9286              |
+            | 83     | farmland    | NULL      | 24859             |
 
diff --git a/tests/bdd/regression/properties.feature b/tests/bdd/regression/properties.feature
index e22e299d4..6cd822846 100644
--- a/tests/bdd/regression/properties.feature
+++ b/tests/bdd/regression/properties.feature
@@ -7,12 +7,14 @@ Feature: Updates to the test database with properties check
         When running osm2pgsql pgsql with parameters
             | -c             |
             | <param_create> |
+        Then execution is successful
 
         Given the input file '000466354.osc.gz'
-        Then running osm2pgsql pgsql with parameters fails
+        When running osm2pgsql pgsql with parameters
             | -a             |
             | --slim         |
             | <param_append> |
+        Then execution fails
         And the error output contains
             """
             <message>
@@ -30,11 +32,13 @@ Feature: Updates to the test database with properties check
         When running osm2pgsql null with parameters
             | -c     |
             | --slim |
+        Then execution is successful
 
         Given the input file '000466354.osc.gz'
-        When running osm2pgsql nooutput with parameters
+        When running osm2pgsql with parameters
             | -a     |
             | --slim |
+        Then execution is successful
         Then the error output contains
             """
             Using output 'null' (same as on import).
@@ -71,10 +75,11 @@ Feature: Updates to the test database with properties check
             | --flat-nodes=x |
 
         Given the input file '000466354.osc.gz'
-        Then running osm2pgsql pgsql with parameters fails
+        When running osm2pgsql pgsql with parameters
             | -a             |
             | --slim         |
             | --flat-nodes=y |
+        Then execution fails
         And the error output contains
             """
             Unable to open flatnode file
@@ -86,9 +91,10 @@ Feature: Updates to the test database with properties check
             | --slim |
 
         Given the input file '000466354.osc.gz'
-        Then running osm2pgsql null with parameters fails
+        When running osm2pgsql null with parameters
             | -a     |
             | --slim |
+        Then execution fails
         And the error output contains
             """
             Different output specified on command line
diff --git a/tests/bdd/regression/update.feature b/tests/bdd/regression/update.feature
index 57a9c5d39..ce1abaf18 100644
--- a/tests/bdd/regression/update.feature
+++ b/tests/bdd/regression/update.feature
@@ -69,9 +69,11 @@ Feature: Updates to the test database
 
 
     Scenario: Simple updates with lua tagtransform
-        Given the default lua tagtransform
         When running osm2pgsql pgsql with parameters
             | --slim   |
+            | --tag-transform-script     |
+            | {STYLE_DATA_DIR}/style.lua |
+
 
         Given the input file '000466354.osc.gz'
         When running osm2pgsql pgsql with parameters

From 195529a29f02d48b1bdd8ee7623a6020a1fe8ce9 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 1 Dec 2025 08:47:43 +0100
Subject: [PATCH 2/9] add parameters for lua and themepark path

---
 scripts/osm2pgsql-test-style | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/scripts/osm2pgsql-test-style b/scripts/osm2pgsql-test-style
index 0cdb8bdd9..d0bfbc18e 100755
--- a/scripts/osm2pgsql-test-style
+++ b/scripts/osm2pgsql-test-style
@@ -501,6 +501,10 @@ def execute_osm2pgsql(context, output):
         data_stdin = None
 
     env = {}
+    if context.user_args.lua_path:
+        env['LUA_PATH'] = context.user_args.lua_path
+    if context.user_args.themepark_path:
+        env['THEMEPARK_PATH'] = context.user_args.themepark_path
 
     proc = Popen(cmdline, cwd=str(context.workdir),
                  stdin=PIPE, stdout=PIPE, stderr=PIPE, env=env)
@@ -786,6 +790,10 @@ def get_parser():
                         help='(optional) directory to search for test data')
     parser.add_argument('--style-data-dir', type=Path,
                         help='(optional) directory to search for style files')
+    parser.add_argument('--lua-path',
+                        help='Additional paths to take into account for finding lua modules')
+    parser.add_argument('--themepark-path',
+                        help='Additional paths to take into account for finding themepark themes')
     parser.add_argument('--test-db', default='osm2pgsql-test',
                         help='Name of database to use for testing (default: osm2pgsql-test)')
     parser.add_argument('--template-test-db', default='osm2pgsql-test-template',

From 6d7d1e8d863a51c8f81e7239c33075ed503cae44 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 1 Dec 2025 09:08:00 +0100
Subject: [PATCH 3/9] change BDD run script to new style tester

---
 CMakeLists.txt         |  4 ----
 tests/CMakeLists.txt   |  5 +++--
 tests/run-bdd-tests.in |  3 +++
 tests/run-behave.in    | 10 ----------
 4 files changed, 6 insertions(+), 16 deletions(-)
 create mode 100755 tests/run-bdd-tests.in
 delete mode 100755 tests/run-behave.in

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 968fc797c..566d8b79b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -308,10 +308,6 @@ if (BUILD_TESTS)
         set(TESTING_TIMEOUT 1200)
     endif()
     add_subdirectory(tests)
-    configure_file(
-        ${PROJECT_SOURCE_DIR}/tests/run-behave.in
-        ${PROJECT_BINARY_DIR}/run-behave
-    )
 else()
     message(STATUS "Tests disabled. Set BUILD_TESTS=ON to enable tests.")
 endif()
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 14f312cd2..8558da81f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -118,14 +118,15 @@ if (NOT WIN32)
     set_tests_properties(FixtureTablespaceCleanup PROPERTIES FIXTURES_CLEANUP Tablespace)
 endif()
 
+configure_file(run-bdd-tests.in ${PROJECT_BINARY_DIR}/run-bdd-tests)
 
 find_program(BEHAVE_BIN NAMES behave)
 
 if (BEHAVE_BIN)
     foreach(BDD_TEST IN ITEMS command-line flex regression)
         add_test(NAME bdd-${BDD_TEST}
-                 COMMAND behave -DBINARY=$<TARGET_FILE:osm2pgsql> ${BDD_TEST}
-                 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bdd)
+                 COMMAND ./run-bdd-tests ${CMAKE_CURRENT_SOURCE_DIR}/bdd/${BDD_TEST}
+                 WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
         message(STATUS "Added test: bdd-${BDD_TEST}")
     endforeach(BDD_TEST)
 
diff --git a/tests/run-bdd-tests.in b/tests/run-bdd-tests.in
new file mode 100755
index 000000000..cd9709b51
--- /dev/null
+++ b/tests/run-bdd-tests.in
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+@PROJECT_SOURCE_DIR@/scripts/osm2pgsql-test-style --style-data-dir @PROJECT_SOURCE_DIR@ --test-data-dir @CMAKE_CURRENT_SOURCE_DIR@/data/ --osm2pgsql-binary @PROJECT_BINARY_DIR@/osm2pgsql "$@"
diff --git a/tests/run-behave.in b/tests/run-behave.in
deleted file mode 100755
index c82be884c..000000000
--- a/tests/run-behave.in
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "-p" ]; then
-    pgv=pg_virtualenv
-    shift
-fi
-
-cd @PROJECT_SOURCE_DIR@/tests/bdd
-exec $pgv behave -DBINARY=@PROJECT_BINARY_DIR@/osm2pgsql "$@"
-

From 88e263ebf3d1249f65a4feaf48747a5eedac1d4f Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 1 Dec 2025 09:34:47 +0100
Subject: [PATCH 4/9] allow selected PG* env variables so that pg_virtualenv
 works

---
 scripts/osm2pgsql-test-style | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/osm2pgsql-test-style b/scripts/osm2pgsql-test-style
index d0bfbc18e..d54f515f5 100755
--- a/scripts/osm2pgsql-test-style
+++ b/scripts/osm2pgsql-test-style
@@ -16,6 +16,7 @@ import sys
 import tempfile
 import math
 import re
+import os
 import contextlib
 import json
 import datetime as dt
@@ -505,6 +506,9 @@ def execute_osm2pgsql(context, output):
         env['LUA_PATH'] = context.user_args.lua_path
     if context.user_args.themepark_path:
         env['THEMEPARK_PATH'] = context.user_args.themepark_path
+    for k in ['PGPORT', 'PGPASSWORD', 'PGUSER', 'PGHOST']:
+        if k in os.environ:
+            env[k] = os.environ[k]
 
     proc = Popen(cmdline, cwd=str(context.workdir),
                  stdin=PIPE, stdout=PIPE, stderr=PIPE, env=env)

From 9a00f332088145f0af115a2d5507239dad9f1b0b Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 1 Dec 2025 09:37:19 +0100
Subject: [PATCH 5/9] remove old behave harness

---
 tests/bdd/.behaverc                        |   3 -
 tests/bdd/environment.py                   | 156 ----------
 tests/bdd/steps/geometry_factory.py        | 104 -------
 tests/bdd/steps/replication_server_mock.py |  53 ----
 tests/bdd/steps/steps_db.py                | 340 ---------------------
 tests/bdd/steps/steps_execute.py           | 212 -------------
 tests/bdd/steps/steps_osm_data.py          |  54 ----
 7 files changed, 922 deletions(-)
 delete mode 100644 tests/bdd/.behaverc
 delete mode 100644 tests/bdd/environment.py
 delete mode 100644 tests/bdd/steps/geometry_factory.py
 delete mode 100644 tests/bdd/steps/replication_server_mock.py
 delete mode 100644 tests/bdd/steps/steps_db.py
 delete mode 100644 tests/bdd/steps/steps_execute.py
 delete mode 100644 tests/bdd/steps/steps_osm_data.py

diff --git a/tests/bdd/.behaverc b/tests/bdd/.behaverc
deleted file mode 100644
index 1b426ec94..000000000
--- a/tests/bdd/.behaverc
+++ /dev/null
@@ -1,3 +0,0 @@
-[behave]
-show_skipped=False
-default_tags=~@Fail
diff --git a/tests/bdd/environment.py b/tests/bdd/environment.py
deleted file mode 100644
index 16afeeae4..000000000
--- a/tests/bdd/environment.py
+++ /dev/null
@@ -1,156 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-#
-# This file is part of osm2pgsql (https://osm2pgsql.org/).
-#
-# Copyright (C) 2006-2025 by the osm2pgsql developer community.
-# For a full list of authors see the git log.
-from contextlib import closing
-from pathlib import Path
-import subprocess
-import tempfile
-import importlib.util
-import io
-from importlib.machinery import SourceFileLoader
-
-from behave import *
-try:
-    import psycopg2 as psycopg
-    from psycopg2 import sql
-except ImportError:
-    import psycopg
-    from psycopg import sql
-
-
-from steps.geometry_factory import GeometryFactory
-from steps.replication_server_mock import ReplicationServerMock
-
-TEST_BASE_DIR = (Path(__file__) / '..' / '..').resolve()
-
-# The following parameters can be changed on the command line using
-# the -D parameter. Example:
-#
-#    behave -DBINARY=/tmp/my-builddir/osm2pgsql -DKEEP_TEST_DB
-USER_CONFIG = {
-    'BINARY': (TEST_BASE_DIR / '..' / 'build' / 'osm2pgsql').resolve(),
-    'REPLICATION_SCRIPT': (TEST_BASE_DIR / '..' / 'scripts' / 'osm2pgsql-replication').resolve(),
-    'TEST_DATA_DIR': TEST_BASE_DIR / 'data',
-    'SRC_DIR': (TEST_BASE_DIR / '..').resolve(),
-    'KEEP_TEST_DB': False,
-    'TEST_DB': 'osm2pgsql-test',
-    'HAVE_TABLESPACE': True,
-    'HAVE_PROJ': True
-}
-
-use_step_matcher('re')
-
-def _connect_db(context, dbname):
-    """ Connect to the given database and return the connection
-        object as a context manager that automatically closes.
-        Note that the connection does not commit automatically.
-    """
-    if psycopg.__version__.startswith('2'):
-        conn = psycopg.connect(dbname=dbname)
-        conn.autocommit = True
-        return closing(conn)
-
-    return psycopg.connect(dbname=dbname, autocommit=True)
-
-
-def _drop_db(context, dbname, recreate_immediately=False):
-    """ Drop the database with the given name if it exists.
-    """
-    with _connect_db(context, 'postgres') as conn:
-        with conn.cursor() as cur:
-            db = sql.Identifier(dbname)
-            cur.execute(sql.SQL('DROP DATABASE IF EXISTS {}').format(db))
-            if recreate_immediately:
-                cur.execute(sql.SQL('CREATE DATABASE {}').format(db))
-
-
-def before_all(context):
-    # logging setup
-    context.config.setup_logging()
-    # set up -D options
-    for k,v in USER_CONFIG.items():
-        context.config.userdata.setdefault(k, v)
-
-    if context.config.userdata['HAVE_TABLESPACE']:
-        with _connect_db(context, 'postgres') as conn:
-            with conn.cursor() as cur:
-                cur.execute("""SELECT spcname FROM pg_tablespace
-                               WHERE spcname = 'tablespacetest'""")
-                context.config.userdata['HAVE_TABLESPACE'] = cur.rowcount > 0
-                cur.execute("""SELECT setting FROM pg_settings
-                               WHERE name = 'server_version_num'""")
-                context.config.userdata['PG_VERSION'] = int(cur.fetchone()[0])
-
-    # Get the osm2pgsql configuration
-    proc = subprocess.Popen([str(context.config.userdata['BINARY']), '--version'],
-                            stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    _, serr = proc.communicate()
-    ver_info = serr.decode('utf-8')
-    if proc.returncode != 0:
-        raise RuntimeError('Cannot run osm2pgsql')
-
-    if context.config.userdata['HAVE_PROJ']:
-        context.config.userdata['HAVE_PROJ'] = 'Proj [disabled]' not in ver_info
-
-    context.test_data_dir = Path(context.config.userdata['TEST_DATA_DIR']).resolve()
-    context.default_data_dir = Path(context.config.userdata['SRC_DIR']).resolve()
-
-    # Set up replication script.
-    replicationfile = str(Path(context.config.userdata['REPLICATION_SCRIPT']).resolve())
-    spec = importlib.util.spec_from_loader('osm2pgsql_replication',
-                                           SourceFileLoader('osm2pgsql_replication',
-                                                            replicationfile))
-    assert spec, f"File not found: {replicationfile}"
-    context.osm2pgsql_replication = importlib.util.module_from_spec(spec)
-    spec.loader.exec_module(context.osm2pgsql_replication)
-
-
-def before_scenario(context, scenario):
-    """ Set up a fresh, empty test database.
-    """
-    if 'config.have_proj' in scenario.tags and not context.config.userdata['HAVE_PROJ']:
-        scenario.skip("Generic proj library not configured.")
-
-    context.db = use_fixture(test_db, context)
-    context.import_file = None
-    context.import_data = {'n': [], 'w': [], 'r': []}
-    context.osm2pgsql_params = []
-    context.workdir = use_fixture(working_directory, context)
-    context.geometry_factory = GeometryFactory()
-    context.osm2pgsql_replication.ReplicationServer = ReplicationServerMock()
-    context.urlrequest_responses = {}
-    context.sql_statements = {}
-
-    def _mock_urlopen(request):
-        if not request.full_url in context.urlrequest_responses:
-            raise urllib.error.URLError('Unknown URL')
-
-        return closing(io.BytesIO(context.urlrequest_responses[request.full_url].encode('utf-8')))
-
-    context.osm2pgsql_replication.urlrequest.urlopen = _mock_urlopen
-
-
-@fixture
-def test_db(context, **kwargs):
-    dbname = context.config.userdata['TEST_DB']
-    _drop_db(context, dbname, recreate_immediately=True)
-
-    with _connect_db(context, dbname) as conn:
-
-        with conn.cursor() as cur:
-            cur.execute('CREATE EXTENSION postgis')
-            cur.execute('CREATE EXTENSION hstore')
-
-        yield conn
-
-    if not context.config.userdata['KEEP_TEST_DB']:
-        _drop_db(context, dbname)
-
-
-@fixture
-def working_directory(context, **kwargs):
-    with tempfile.TemporaryDirectory() as tmpdir:
-        yield Path(tmpdir)
diff --git a/tests/bdd/steps/geometry_factory.py b/tests/bdd/steps/geometry_factory.py
deleted file mode 100644
index b56361da6..000000000
--- a/tests/bdd/steps/geometry_factory.py
+++ /dev/null
@@ -1,104 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-#
-# This file is part of osm2pgsql (https://osm2pgsql.org/).
-#
-# Copyright (C) 2006-2025 by the osm2pgsql developer community.
-# For a full list of authors see the git log.
-
-class GeometryFactory:
-    """ Provides functions to create geometries from data grids.
-    """
-
-    def __init__(self):
-        self.grid = {}
-
-
-    def parse_geometry(self, geom, scene):
-        """ Create a WKT SQL term for the given geometry.
-            The function understands the following formats:
-
-              <P>
-                 Point geometry
-              <P>,...,<P>
-                 Line geometry
-              (<P>,...,<P>)
-                 Polygon geometry
-
-           <P> may either be a coordinate of the form '<x> <y>' or a single
-           number. In the latter case it must refer to a point in
-           a previously defined grid.
-        """
-        if geom.find(',') < 0:
-            out = "POINT({})".format(self.mk_wkt_point(geom))
-        elif geom.find('(') < 0:
-            out = "LINESTRING({})".format(self.mk_wkt_points(geom))
-        else:
-            out = "POLYGON(({}))".format(self.mk_wkt_points(geom.strip('() ')))
-
-        return f"'SRID=4326;{out}'::geometry"
-
-
-    def mk_wkt_point(self, point):
-        """ Parse a point description.
-            The point may either consist of 'x y' cooordinates or a number
-            that refers to a grid setup.
-        """
-        geom = point.strip()
-        if geom.find(' ') >= 0:
-            return geom
-
-        try:
-            pt = self.grid_node(int(geom))
-        except ValueError:
-            assert False, "Scenario error: Point '{}' is not a number".format(geom)
-
-        assert pt is not None, "Scenario error: Point '{}' not found in grid".format(geom)
-        return "{} {}".format(*pt)
-
-
-    def mk_wkt_points(self, geom):
-        """ Parse a list of points.
-            The list must be a comma-separated list of points. Points
-            in coordinate and grid format may be mixed.
-        """
-        return ','.join([self.mk_wkt_point(x) for x in geom.split(',')])
-
-
-    def set_grid(self, lines, grid_step, origin_x, origin_y):
-        """ Replace the grid with one from the given lines.
-        """
-        self.grid = {}
-        y = origin_y
-        for line in lines:
-            x = origin_x
-            for pt_id in line:
-                if pt_id.isdigit():
-                    self.grid[int(pt_id)] = (x, y)
-                x += grid_step
-            y -= grid_step
-
-        self.grid_precision = 1
-        while grid_step < 0:
-            self.grid_precision += 1
-            grid_step /= 10
-
-
-    def grid_node(self, nodeid):
-        """ Get the coordinates for the given grid node.
-        """
-        return self.grid.get(nodeid)
-
-    def as_opl_lines(self):
-        return [f"n{nid} x{c[0]:.{self.grid_precision}f} y{c[1]:.{self.grid_precision}f}"
-                for nid, c in self.grid.items()]
-
-    def complete_opl(self, opl):
-        if opl[0] != 'n' or ' x' in opl:
-            return opl
-
-        nid = int(opl.split(' ', 1)[0][1:])
-
-        coords = self.grid_node(nid)
-        assert coords is not None, f"Coordinates missing for node {nid}"
-
-        return f"{opl} x{coords[0]:.{self.grid_precision}f} y{coords[1]:.{self.grid_precision}f}"
diff --git a/tests/bdd/steps/replication_server_mock.py b/tests/bdd/steps/replication_server_mock.py
deleted file mode 100644
index cf6387066..000000000
--- a/tests/bdd/steps/replication_server_mock.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-#
-# This file is part of osm2pgsql (https://osm2pgsql.org/).
-#
-# Copyright (C) 2006-2025 by the osm2pgsql developer community.
-# For a full list of authors see the git log.
-
-
-class ReplicationServerMock:
-
-    def __init__(self):
-        self.expected_base_url = None
-        self.state_infos = []
-
-
-    def __call__(self, base_url):
-        assert self.expected_base_url is not None and base_url == self.expected_base_url,\
-               f"Wrong replication service called. Expected '{self.expected_base_url}', got '{base_url}'"
-        return self
-
-
-    def get_state_info(self, seq=None, retries=2):
-        assert self.state_infos, 'Replication mock not properly set up'
-        if seq is None:
-            return self.state_infos[-1]
-
-        for info in self.state_infos:
-            if info.sequence == seq:
-                return info
-
-        return None
-
-    def timestamp_to_sequence(self, timestamp, balanced_search=False):
-        assert self.state_infos, 'Replication mock not properly set up'
-
-        if timestamp < self.state_infos[0].timestamp:
-            return self.state_infos[0].sequence
-
-        prev = self.state_infos[0]
-        for info in self.state_infos:
-            if timestamp >= prev.timestamp and timestamp < info.timestamp:
-                return prev.sequence
-            prev = info
-
-        return prev.sequence
-
-    def apply_diffs(self, handler, start_id, max_size=1024, idx="", simplify=True):
-        if start_id > self.state_infos[-1].sequence:
-            return None
-
-        numdiffs = int((max_size + 1023)/1024)
-        return min(self.state_infos[-1].sequence, start_id + numdiffs - 1)
-
diff --git a/tests/bdd/steps/steps_db.py b/tests/bdd/steps/steps_db.py
deleted file mode 100644
index 681b0635d..000000000
--- a/tests/bdd/steps/steps_db.py
+++ /dev/null
@@ -1,340 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-#
-# This file is part of osm2pgsql (https://osm2pgsql.org/).
-#
-# Copyright (C) 2006-2025 by the osm2pgsql developer community.
-# For a full list of authors see the git log.
-"""
-Steps that query the database.
-"""
-import math
-import re
-from typing import Iterable
-
-try:
-    from psycopg2 import sql
-except ImportError:
-    from psycopg import sql
-
-
-@given("the database schema (?P<schema>.+)")
-def create_db_schema(context, schema):
-    with context.db.cursor() as cur:
-        cur.execute("CREATE SCHEMA " + schema)
-
-
-@when("deleting table (?P<table>.+)")
-def delete_table(context, table):
-    with context.db.cursor() as cur:
-        cur.execute("DROP TABLE " + table)
-
-
-@then(r"table (?P<table>.+) has (?P<row_num>\d+) rows?")
-def db_table_row_count(context, table, row_num):
-    assert table_exists(context.db, table)
-
-    query = sql.SQL("SELECT count(*) FROM {}").format(sql.Identifier(*table.split('.', 2)))
-
-    actual = scalar(context.db, query)
-
-    assert actual == int(row_num),\
-           f"Table {table}: expected {row_num} rows, got {actual}"
-
-
-@then("there (?:is|are) (?P<exists>no )?tables? (?P<tables>.+)")
-def db_table_existance(context, exists, tables):
-    for table in tables.split(','):
-        table = table.strip()
-        if exists == 'no ':
-            assert not table_exists(context.db, table), f"Table '{table}' unexpectedly found"
-        else:
-            assert table_exists(context.db, table), f"Table '{table}' not found"
-
-
-@then("table (?P<table>.+) contains(?P<exact> exactly)?")
-def db_check_table_content(context, table, exact):
-    assert table_exists(context.db, table)
-
-    rows = sql.SQL(', '.join(h.rsplit('@')[0] for h in context.table.headings))
-
-    with context.db.cursor() as cur:
-        cur.execute(sql.SQL("SELECT {} FROM {}")
-                       .format(rows, sql.Identifier(*table.split('.', 2))))
-
-        actuals = list(DBRow(r, context.table.headings, context.geometry_factory) for r in cur)
-
-    linenr = 1
-    for row in context.table.rows:
-        try:
-            actuals.remove(row)
-        except ValueError:
-            assert False,\
-                   f"{linenr}. entry not found in table. Full content:\n{actuals}"
-        linenr += 1
-
-    assert not exact or not actuals,\
-           f"Unexpected lines in row:\n{actuals}"
-
-
-@then("table (?P<table>.+) doesn't contain")
-def db_check_table_absence(context, table):
-    assert table_exists(context.db, table)
-
-    rows = sql.SQL(', '.join(h.rsplit('@')[0] for h in context.table.headings))
-
-    with context.db.cursor() as cur:
-        cur.execute(sql.SQL("SELECT {} FROM {}")
-                       .format(rows, sql.Identifier(*table.split('.', 2))))
-
-        actuals = list(DBRow(r, context.table.headings, context.geometry_factory) for r in cur)
-
-    for row in context.table.rows:
-        assert not row in actuals, f"Row unexpectedly found: {row}. Full content:\n{actuals}"
-
-
-@given("the SQL statement (?P<sql>.+)")
-def db_define_sql_statement(context, sql):
-    context.sql_statements[sql] = context.text
-
-@then("statement (?P<stmt>.+) returns(?P<exact> exactly)?")
-def db_check_sql_statement(context, stmt, exact):
-    assert stmt in context.sql_statements
-    rows = sql.SQL(', '.join(h.rsplit('@')[0] for h in context.table.headings))
-
-    with context.db.cursor() as cur:
-        cur.execute(sql.SQL("SELECT {} FROM ({}) _sql_statement")
-                       .format(rows, sql.SQL(context.sql_statements[stmt])))
-
-        actuals = list(DBRow(r, context.table.headings, context.geometry_factory) for r in cur)
-
-    linenr = 1
-    for row in context.table.rows:
-        try:
-            actuals.remove(row)
-        except ValueError:
-            assert False,\
-                   f"{linenr}. entry not found in result. Full response:\n{actuals}"
-        linenr += 1
-
-    assert not exact or not actuals,\
-           f"Unexpected lines in result:\n{actuals}"
-
-
-### Helper functions and classes
-
-def scalar(conn, sql, args=None):
-    with conn.cursor() as cur:
-        cur.execute(sql, args)
-
-        assert cur.rowcount == 1
-        return cur.fetchone()[0]
-
-def table_exists(conn, table):
-    if '.' in table:
-        schema, tablename = table.split('.', 2)
-    else:
-        schema = 'public'
-        tablename = table
-
-    num = scalar(conn, """SELECT count(*) FROM pg_tables
-                          WHERE tablename = %s AND schemaname = %s""",
-                (tablename, schema))
-    if num == 1:
-        return True
-
-    num = scalar(conn, """SELECT count(*) FROM pg_views
-                          WHERE viewname = %s AND schemaname = %s""",
-                (tablename, schema))
-    return num == 1
-
-
-class DBRow:
-
-    def __init__(self, row, headings, factory):
-        self.data = []
-        for value, head in zip(row, headings):
-            if '@' in head:
-                _, props = head.rsplit('@', 2)
-            else:
-                props = None
-
-            if isinstance(value, float):
-                self.data.append(DBValueFloat(value, props))
-            elif value is None:
-                self.data.append(None)
-            elif head.lower().startswith('st_astext('):
-                self.data.append(DBValueGeometry(value, props, factory))
-            elif props == 'fullmatch':
-                self.data.append(DBValueRegex(value))
-            elif props == 'substr':
-                self.data.append(DBValueSubString(value))
-            else:
-                self.data.append(str(value))
-
-    def __eq__(self, other):
-        if not isinstance(other, Iterable):
-            return False
-
-        return all((a is None) if b == 'NULL' else (a == b)
-                   for a, b in zip(self.data, other))
-
-    def __repr__(self):
-        return '\n[' + ', '.join(str(s) for s in self.data) + ']'
-
-
-class DBValueGeometry:
-
-    def __init__(self, value, props, factory):
-        self.precision = float(props) if props else 0.0001
-        self.orig_value = value
-        self.set_coordinates(value)
-        self.factory = factory
-
-    def set_coordinates(self, value):
-        if value.startswith('GEOMETRYCOLLECTION('):
-            geoms = []
-            remain = value[19:-1]
-            while remain:
-                _, value, remain = self._parse_simple_wkt(remain)
-                remain = remain[1:] # delete comma
-                geoms.append(value)
-            self.geom_type = 'GEOMETRYCOLLECTION'
-            self.value = geoms
-        else:
-            self.geom_type, self.value, remain = self._parse_simple_wkt(value)
-            if remain:
-                raise RuntimeError('trailing content for geometry: ' + value)
-
-    def _parse_simple_wkt(self, value):
-        m = re.fullmatch(r'(MULTI)?(POINT|LINESTRING|POLYGON)\(([^A-Z]*)\)(.*)', value)
-        if not m:
-            raise RuntimeError(f'Unparsable WKT: {value}')
-        geom_type = (m[1] or '') + m[2]
-        if m[1] == 'MULTI':
-            splitup = m[3][1:-1].split('),(')
-            if m[2] == 'POINT':
-                value = [self._parse_wkt_coord(c) for c in splitup]
-            elif m[2] == 'LINESTRING':
-                value = [self._parse_wkt_line(c) for c in splitup]
-            elif m[2] == 'POLYGON':
-                value = [[self._parse_wkt_line(ln) for ln in poly[1:-1].split('),(')]
-                         for poly in splitup]
-        else:
-            if m[2] == 'POINT':
-                value = self._parse_wkt_coord(m[3])
-            elif m[2] == 'LINESTRING':
-                value = self._parse_wkt_line(m[3])
-            elif m[2] == 'POLYGON':
-                value = [self._parse_wkt_line(ln) for ln in m[3][1:-1].split('),(')]
-
-        return geom_type, value, m[4]
-
-    def _parse_wkt_coord(self, coord):
-        return tuple(DBValueFloat(float(f.strip()), self.precision) for f in coord.split())
-
-    def _parse_wkt_line(self, coords):
-        return [self._parse_wkt_coord(pt) for pt in coords.split(',')]
-
-    def __eq__(self, other):
-        if other.startswith('[') and other.endswith(']'):
-            gtype = 'MULTI'
-            toparse = other[1:-1].split(';')
-        elif other.startswith('{') and other.endswith('}'):
-            gtype = 'GEOMETRYCOLLECTION'
-            toparse = other[1:-1].split(';')
-        else:
-            gtype = None
-            toparse = [other]
-
-        geoms = []
-        for sub in toparse:
-            sub = sub.strip()
-            if sub.find(',') < 0:
-                geoms.append(self._parse_input_coord(sub))
-                if gtype is None:
-                    gtype = 'POINT'
-                elif gtype.startswith('MULTI'):
-                    if gtype == 'MULTI':
-                        gtype = 'MULTIPOINT'
-                    elif gtype != 'MULTIPOINT':
-                        raise RuntimeError('MULTI* geometry with different geometry types is not supported.')
-            elif sub.find('(') < 0:
-                geoms.append(self._parse_input_line(sub))
-                if gtype is None:
-                    gtype = 'LINESTRING'
-                elif gtype.startswith('MULTI'):
-                    if gtype == 'MULTI':
-                        gtype = 'MULTILINESTRING'
-                    elif gtype != 'MULTILINESTRING':
-                        raise RuntimeError('MULTI* geometry with different geometry types is not supported.')
-            else:
-                geoms.append([self._parse_input_line(ln) for ln in sub.strip()[1:-1].split('),(')])
-                if gtype is None:
-                    gtype = 'POLYGON'
-                elif gtype.startswith('MULTI'):
-                    if gtype == 'MULTI':
-                        gtype = 'MULTIPOLYGON'
-                    elif gtype != 'MULTIPOLYGON':
-                        raise RuntimeError('MULTI* geometry with different geometry types is not supported.')
-
-        if not gtype.startswith('MULTI') and gtype != 'GEOMETRYCOLLECTION':
-            geoms = geoms[0]
-
-        return gtype == self.geom_type and self.value == geoms
-
-    def _parse_input_coord(self, other):
-        coords = other.split(' ')
-        if len(coords) == 1:
-            return self.factory.grid_node(int(coords[0]))
-        if len(coords) == 2:
-            return tuple(float(c.strip()) for c in coords)
-
-        raise RuntimeError(f'Bad coordinate: {other}')
-
-    def _parse_input_line(self, other):
-        return [self._parse_input_coord(pt.strip()) for pt in other.split(',')]
-
-    def __repr__(self):
-        return self.orig_value
-
-
-class DBValueFloat:
-
-    def __init__(self, value, props):
-        self.precision = float(props) if props else 0.0001
-        self.value = value
-
-    def __eq__(self, other):
-        try:
-            fother = float(other)
-        except:
-            return False
-
-        return math.isclose(self.value, fother, rel_tol=self.precision)
-
-    def __repr__(self):
-        return repr(self.value)
-
-
-class DBValueRegex:
-
-    def __init__(self, value):
-        self.value = str(value)
-
-    def __eq__(self, other):
-        return re.fullmatch(str(other), self.value) is not None
-
-    def __repr__(self):
-        return repr(self.value)
-
-
-class DBValueSubString:
-
-    def __init__(self, value):
-        self.value = str(value)
-
-    def __eq__(self, other):
-        return str(other) in self.value
-
-    def __repr__(self):
-        return repr(self.value)
diff --git a/tests/bdd/steps/steps_execute.py b/tests/bdd/steps/steps_execute.py
deleted file mode 100644
index d8dea1a82..000000000
--- a/tests/bdd/steps/steps_execute.py
+++ /dev/null
@@ -1,212 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-#
-# This file is part of osm2pgsql (https://osm2pgsql.org/).
-#
-# Copyright (C) 2006-2025 by the osm2pgsql developer community.
-# For a full list of authors see the git log.
-"""
-Steps for executing osm2pgsql.
-"""
-from io import StringIO
-from pathlib import Path
-import sys
-import subprocess
-import contextlib
-import logging
-import datetime as dt
-
-from osmium.replication.server import OsmosisState
-
-def get_import_file(context):
-    if context.import_file is not None:
-        return str(context.import_file), None
-
-    # sort by OSM id
-    for obj in context.import_data.values():
-        obj.sort(key=lambda l: int(l.split(' ')[0][1:]))
-
-    fd = StringIO()
-    for typ in ('n', 'w', 'r'):
-        for line in context.import_data[typ]:
-            fd.write(line)
-            fd.write('\n')
-        context.import_data[typ].clear()
-
-    return '-', fd.getvalue()
-
-
-def run_osm2pgsql(context, output):
-    assert output in ('flex', 'pgsql', 'null', 'nooutput')
-
-    cmdline = [str(Path(context.config.userdata['BINARY']).resolve())]
-
-    if output != 'nooutput':
-        cmdline.extend(('-O', output))
-
-    cmdline.extend(context.osm2pgsql_params)
-
-    # convert table items to CLI arguments and inject constants to placeholders
-    if context.table:
-        cmdline.extend(f.format(**context.config.userdata) for f in context.table.headings if f)
-        for row in context.table:
-            cmdline.extend(f.format(**context.config.userdata) for f in row if f)
-
-    if '-d' not in cmdline and '--database' not in cmdline:
-        cmdline.extend(('-d', context.config.userdata['TEST_DB']))
-
-    if 'tablespacetest' in cmdline and not context.config.userdata['HAVE_TABLESPACE']:
-       context.scenario.skip('tablespace tablespacetest not available')
-       return
-
-    if output == 'pgsql':
-        if '-S' not in cmdline:
-            cmdline.extend(('-S', str(context.default_data_dir / 'default.style')))
-
-    data_file, data_stdin = get_import_file(context)
-
-    if data_stdin is not None:
-        data_stdin = data_stdin.encode('utf-8')
-        cmdline.extend(('-r', 'opl'))
-
-    cmdline.append(data_file)
-
-    proc = subprocess.Popen(cmdline, cwd=str(context.workdir),
-                            stdin=subprocess.PIPE,
-                            stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-
-    outdata = proc.communicate(input=data_stdin)
-
-    context.osm2pgsql_outdata = [d.decode('utf-8').replace('\\n', '\n') for d in outdata]
-
-    return proc.returncode
-
-
-def run_osm2pgsql_replication(context):
-    cmdline = []
-    # convert table items to CLI arguments and inject constants to placeholders
-    if context.table:
-        cmdline.extend(f.format(**context.config.userdata) for f in context.table.headings if f)
-        for row in context.table:
-            cmdline.extend(f.format(**context.config.userdata) for f in row if f)
-
-    if '-d' not in cmdline and '--database' not in cmdline:
-        cmdline.extend(('-d', context.config.userdata['TEST_DB']))
-
-    if cmdline[0] == 'update':
-        cmdline.extend(('--osm2pgsql-cmd',
-                        str(Path(context.config.userdata['BINARY']).resolve())))
-
-        if '--' not in cmdline:
-            cmdline.extend(('--', '-S', str(context.default_data_dir / 'default.style')))
-
-
-    serr = StringIO()
-    log_handler = logging.StreamHandler(serr)
-    context.osm2pgsql_replication.LOG.addHandler(log_handler)
-    with contextlib.redirect_stdout(StringIO()) as sout:
-        retval = context.osm2pgsql_replication.main(cmdline)
-    context.osm2pgsql_replication.LOG.removeHandler(log_handler)
-
-    context.osm2pgsql_outdata = [sout.getvalue(), serr.getvalue()]
-    print(context.osm2pgsql_outdata)
-
-    return retval
-
-
-@given("no lua tagtransform")
-def do_not_setup_tagtransform(context):
-    pass
-
-@given("the default lua tagtransform")
-def setup_lua_tagtransform(context):
-    context.osm2pgsql_params.extend(('--tag-transform-script',
-                                    str(context.default_data_dir / 'style.lua')))
-
-@given("the lua style")
-def setup_inline_lua_style(context):
-    outfile = context.workdir / 'inline_style.lua'
-    outfile.write_text(context.text)
-    if '-S' in context.osm2pgsql_params:
-        context.osm2pgsql_params[context.osm2pgsql_params.index('-S') + 1] = str(outfile)
-    else:
-        context.osm2pgsql_params.extend(('-S', str(outfile)))
-
-@given("the style file '(?P<style>.+)'")
-def setup_style_file(context, style):
-    if '-S' in context.osm2pgsql_params:
-        context.osm2pgsql_params[context.osm2pgsql_params.index('-S') + 1] = str(context.test_data_dir / style)
-    else:
-        context.osm2pgsql_params.extend(('-S', str(context.test_data_dir / style)))
-
-
-@when(r"running osm2pgsql (?P<output>\w+)(?: with parameters)?")
-def execute_osm2pgsql_successfully(context, output):
-    returncode = run_osm2pgsql(context, output)
-
-    if context.scenario.status == "skipped":
-        return
-
-    assert returncode == 0,\
-           f"osm2pgsql failed with error code {returncode}.\n"\
-           f"Output:\n{context.osm2pgsql_outdata[0]}\n{context.osm2pgsql_outdata[1]}\n"
-
-
-@then(r"running osm2pgsql (?P<output>\w+)(?: with parameters)? fails")
-def execute_osm2pgsql_with_failure(context, output):
-    returncode = run_osm2pgsql(context, output)
-
-    if context.scenario.status == "skipped":
-        return
-
-    assert returncode != 0, "osm2pgsql unexpectedly succeeded"
-
-
-@when("running osm2pgsql-replication")
-def execute_osm2pgsql_replication_successfully(context):
-    returncode = run_osm2pgsql_replication(context)
-
-    assert returncode == 0,\
-           f"osm2pgsql-replication failed with error code {returncode}.\n"\
-           f"Output:\n{context.osm2pgsql_outdata[0]}\n{context.osm2pgsql_outdata[1]}\n"
-
-
-@then(r"running osm2pgsql-replication fails(?: with returncode (?P<expected>\d+))?")
-def execute_osm2pgsql_replication_successfully(context, expected):
-    returncode = run_osm2pgsql_replication(context)
-
-    assert returncode != 0, "osm2pgsql-replication unexpectedly succeeded"
-    if expected:
-        assert returncode == int(expected), \
-               f"osm2pgsql-replication failed with returncode {returncode} instead of {expected}."\
-               f"Output:\n{context.osm2pgsql_outdata[0]}\n{context.osm2pgsql_outdata[1]}\n"
-
-
-@then(r"the (?P<kind>\w+) output contains")
-def check_program_output(context, kind):
-    if kind == 'error':
-        s = context.osm2pgsql_outdata[1]
-    elif kind == 'standard':
-        s = context.osm2pgsql_outdata[0]
-    else:
-        assert not "Expect one of error, standard"
-
-    for line in context.text.split('\n'):
-        line = line.strip()
-        if line:
-            assert line in s,\
-                   f"Output '{line}' not found in {kind} output:\n{s}\n"
-
-
-@given("the replication service at (?P<base_url>.*)")
-def setup_replication_mock(context, base_url):
-    context.osm2pgsql_replication.ReplicationServer.expected_base_url = base_url
-    if context.table:
-        context.osm2pgsql_replication.ReplicationServer.state_infos =\
-          [OsmosisState(int(row[0]),
-                        dt.datetime.strptime(row[1], '%Y-%m-%dT%H:%M:%SZ').replace(tzinfo=dt.timezone.utc))
-           for row in context.table]
-
-
-@given("the URL (?P<base_url>.*) returns")
-def mock_url_response(context, base_url):
-    context.urlrequest_responses[base_url] = context.text
diff --git a/tests/bdd/steps/steps_osm_data.py b/tests/bdd/steps/steps_osm_data.py
deleted file mode 100644
index 9dc27e771..000000000
--- a/tests/bdd/steps/steps_osm_data.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-#
-# This file is part of osm2pgsql (https://osm2pgsql.org/).
-#
-# Copyright (C) 2006-2025 by the osm2pgsql developer community.
-# For a full list of authors see the git log.
-"""
-Steps for creating the OSM import file.
-"""
-
-def add_opl_lines(context, lines):
-    for line in lines:
-        if (oplobj := line.strip()):
-            assert oplobj[0] in ('n', 'w', 'r')
-            oplobj = context.geometry_factory.complete_opl(oplobj)
-            data = context.import_data[oplobj[0]]
-            objid = oplobj.split(' ', 1)[0] + ' '
-            for i, existing in enumerate(data):
-                if existing.startswith(objid):
-                    data[i] = oplobj
-                    break
-            else:
-                data.append(oplobj)
-
-
-@given("the input file '(?P<osm_file>.+)'")
-def osm_set_import_file(context, osm_file):
-    """ Use an OSM file from the test directory for the import.
-    """
-    context.import_file = context.test_data_dir / osm_file
-
-
-@given("the (?P<step>[0-9.]+ )?grid(?: with origin (?P<origin_x>[0-9.-]+) (?P<origin_y>[0-9.-]+))?")
-def osm_define_node_grid(context, step, origin_x, origin_y):
-    step = float(step.strip()) if step else 0.1
-    x = float(origin_x) if origin_x else 20.0
-    y = float(origin_y) if origin_y else 20.0
-
-    assert x >= -180.0 and x <= 180.0
-    assert y >= -90.0 and y <= 90.0
-
-    context.geometry_factory.set_grid([context.table.headings] + [list(h) for h in context.table],
-                                      step, x, y)
-    add_opl_lines(context, context.geometry_factory.as_opl_lines())
-
-
-@given("the (?P<formatted>python-formatted )?OSM data")
-def osm_define_data(context, formatted):
-    context.import_file = None
-    data = context.text
-    if formatted:
-        data = eval('f"""' + data + '"""')
-
-    add_opl_lines(context, data.split('\n'))

From c342e13a396d04f352cdbc43bc9245e3edc5bdca Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 1 Dec 2025 10:32:26 +0100
Subject: [PATCH 6/9] avoid run-test-bdd script in ctest

Windows can't handle the paths properly.
---
 .github/actions/win-install/action.yml | 4 ++--
 scripts/osm2pgsql-test-style           | 4 ++--
 tests/CMakeLists.txt                   | 4 ++--
 tests/run-bdd-tests.in                 | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/actions/win-install/action.yml b/.github/actions/win-install/action.yml
index a31825a95..e00163d91 100644
--- a/.github/actions/win-install/action.yml
+++ b/.github/actions/win-install/action.yml
@@ -16,6 +16,6 @@ runs:
           proj[core]:x64-windows \
           zlib:x64-windows
       shell: bash
-    - name: Install psycopg2 and behave
-      run: python -m pip install psycopg2 behave osmium
+    - name: Install psycopg and behave
+      run: python -m pip install psycopg behave osmium
       shell: bash
diff --git a/scripts/osm2pgsql-test-style b/scripts/osm2pgsql-test-style
index d54f515f5..f14e00eba 100755
--- a/scripts/osm2pgsql-test-style
+++ b/scripts/osm2pgsql-test-style
@@ -135,8 +135,8 @@ def hook_before_all(context):
         LOG.critical("osm2pgsql binary used: %s", context.user_args.osm2pgsql_binary)
         raise RuntimeError('Error running osm2pgsql')
 
-        LOG.info('Check if proj is available: %s',
-                 'yes' if context.user_args.test_proj else 'no')
+    LOG.info('Check if proj is available: %s',
+             'yes' if context.user_args.test_proj else 'no')
 
     # Feature check: proj
     if context.user_args.test_proj == 'auto':
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 8558da81f..93f022e7a 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -125,8 +125,8 @@ find_program(BEHAVE_BIN NAMES behave)
 if (BEHAVE_BIN)
     foreach(BDD_TEST IN ITEMS command-line flex regression)
         add_test(NAME bdd-${BDD_TEST}
-                 COMMAND ./run-bdd-tests ${CMAKE_CURRENT_SOURCE_DIR}/bdd/${BDD_TEST}
-                 WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
+                 COMMAND python3 scripts/osm2pgsql-test-style --style-data-dir ${PROJECT_SOURCE_DIR} --test-data-dir ${CMAKE_CURRENT_SOURCE_DIR}/data/ --osm2pgsql-binary $<TARGET_FILE:osm2pgsql> ${CMAKE_CURRENT_SOURCE_DIR}/bdd/${BDD_TEST}
+                 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
         message(STATUS "Added test: bdd-${BDD_TEST}")
     endforeach(BDD_TEST)
 
diff --git a/tests/run-bdd-tests.in b/tests/run-bdd-tests.in
index cd9709b51..a4f1c97ee 100755
--- a/tests/run-bdd-tests.in
+++ b/tests/run-bdd-tests.in
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-@PROJECT_SOURCE_DIR@/scripts/osm2pgsql-test-style --style-data-dir @PROJECT_SOURCE_DIR@ --test-data-dir @CMAKE_CURRENT_SOURCE_DIR@/data/ --osm2pgsql-binary @PROJECT_BINARY_DIR@/osm2pgsql "$@"
+python3 @PROJECT_SOURCE_DIR@/scripts/osm2pgsql-test-style --style-data-dir @PROJECT_SOURCE_DIR@ --test-data-dir @CMAKE_CURRENT_SOURCE_DIR@/data/ --osm2pgsql-binary @PROJECT_BINARY_DIR@/osm2pgsql "$@"

From cc98e6aab66015d0eeb6f819462bab553eaa4ebe Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 2 Dec 2025 18:29:38 +0100
Subject: [PATCH 7/9] forward environment variables to osm2pgsql in test

Windows needs external setup to function properly.
---
 scripts/osm2pgsql-test-style | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/scripts/osm2pgsql-test-style b/scripts/osm2pgsql-test-style
index f14e00eba..3dea64198 100755
--- a/scripts/osm2pgsql-test-style
+++ b/scripts/osm2pgsql-test-style
@@ -501,17 +501,8 @@ def execute_osm2pgsql(context, output):
         context.import_file = None
         data_stdin = None
 
-    env = {}
-    if context.user_args.lua_path:
-        env['LUA_PATH'] = context.user_args.lua_path
-    if context.user_args.themepark_path:
-        env['THEMEPARK_PATH'] = context.user_args.themepark_path
-    for k in ['PGPORT', 'PGPASSWORD', 'PGUSER', 'PGHOST']:
-        if k in os.environ:
-            env[k] = os.environ[k]
-
     proc = Popen(cmdline, cwd=str(context.workdir),
-                 stdin=PIPE, stdout=PIPE, stderr=PIPE, env=env)
+                 stdin=PIPE, stdout=PIPE, stderr=PIPE)
 
     outdata = proc.communicate(input=data_stdin)
     context.osm2pgsql_cmdline = ' '.join(cmdline)
@@ -794,10 +785,6 @@ def get_parser():
                         help='(optional) directory to search for test data')
     parser.add_argument('--style-data-dir', type=Path,
                         help='(optional) directory to search for style files')
-    parser.add_argument('--lua-path',
-                        help='Additional paths to take into account for finding lua modules')
-    parser.add_argument('--themepark-path',
-                        help='Additional paths to take into account for finding themepark themes')
     parser.add_argument('--test-db', default='osm2pgsql-test',
                         help='Name of database to use for testing (default: osm2pgsql-test)')
     parser.add_argument('--template-test-db', default='osm2pgsql-test-template',

From b545d3c814d5621e2c9a0f622e6fd43442576400 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 3 Dec 2025 13:22:35 +0100
Subject: [PATCH 8/9] adapt contributing documentation for new runner

---
 CONTRIBUTING.md | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9f1e51e01..f830a4ceb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -143,48 +143,48 @@ BDD tests you need to have behave and psycopg installed. On Ubuntu run:
 sudo apt-get install python3-psycopg python3-behave
 ```
 
+The BDD tests are run through the osm2pgsql-test-style tester. See the
+[section on testing](https://osm2pgsql.org/doc/manual.html#style-testing)
+in the manual for details.
+
 There are ctest directives to run the tests. If you want to run the tests
 manually, for example to run single tests during development, you can
-switch to the bdd test directory and run behave directly from there:
+use the `run-bdd-tests` script in the build directory. It is a thin
+wrapper around osm2pgsql-test-style which properly sets up the paths
+for the osm2pgsql binary and test data paths:
 
 ```sh
-cd osm2pgsql/tests/bdd
-behave -DBINARY=<your build directory>/osm2pgsql
+cd build
+./run-bdd-tests ../tests/bdd/regression/
 ```
 
-Per default, behave assumes that the build directory is under `osm2pgsql/build`.
-If your setup works like that, you can leave out the `-D` parameter.
-
-To make this a bit easier a shell script `run-behave` is provided in your
-build directory which sets those correct paths and calls `behave`. If run
-with `-p` as first option it will wrap the call to `behave` in a call to
-`pg_virtualenv` for your convenience. All other command line parameters of
-`run-behave` will be passed through to behave.
-
 To run a single test, simply add the name of the test file, followed by a
 column and the line number of the test:
 
 ```sh
-behave flex/area.feature:71
+./run-bdd-tests ../tests/bdd/flex/area.feature:71
 ```
 
-If you need to inspect the database that a test produces, you can add
-`-DKEEP_TEST_DB` and behave won't remove the database after the test is
-finished. This makes of course only sense, when running a single test.
+You can pass any additional parameters to the script that osm2pgsql-test-style
+would take. If you need to inspect the database that a test produces, you add
+`--keep-test-db` and behave won't remove the database after the test is
+finished. This makes only sense, when running a single test.
 When running under pg_virtualenv, don't forget to keep the virtual environment
 as well. You can use the handy `-s` switch:
 
 ```sh
-pg_virtualenv -s behave -DKEEP_TEST_DB flex/area.feature:71
+pg_virtualenv -s ./run-bdd-tests ../tests/bdd/flex/area.feature:71
 ```
 
 It drops you into a shell when the behave test fails, where you can use
 psql to look at the database. Or start a shell in the virtual environment
 with `pg_virtualenv bash` and run behave from there.
 
-The BDDs automatically detect if osm2pgsql was compiled with Lua and
+The BDDs automatically detect if osm2pgsql was compiled with
 proj support and skip tests accordingly. They also check for the test
-tablespace `tablespacetest` for tests that need tablespaces.
+tablespace `tablespacetest` for tests that need tablespaces. To force
+running the proj and tablespace tests use `--test-proj yes` and
+`--test-tablespace yes` respectively.
 
 BDD tests hide print statements by default. For development purposes they
 can be shown by adding these lines to `tests/bdd/.behaverc`:

From 65da6819135ab88b2ccf84901e2e283d124120f1 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 3 Dec 2025 13:54:47 +0100
Subject: [PATCH 9/9] add test for style test matcher

---
 tests/bdd/command-line/test_style.feature | 68 +++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 tests/bdd/command-line/test_style.feature

diff --git a/tests/bdd/command-line/test_style.feature b/tests/bdd/command-line/test_style.feature
new file mode 100644
index 000000000..315bf0c18
--- /dev/null
+++ b/tests/bdd/command-line/test_style.feature
@@ -0,0 +1,68 @@
+Feature: Writing tests for lua styles
+    This feature exercises the different steps and matcher
+    of the osm2pgsql-test-style script.
+
+    Background:
+        Given the OSM data
+            """
+            n10 Tname=Afeat,access=yes x1 y4
+            n11 Tname=B-feat-Ö,access=no x34.5 y-1.5
+            """
+        And the style file 'flex-config/generic.lua'
+        When running osm2pgsql flex
+
+    Scenario: Fields can be matched case-insensitive
+        Then table points contains
+            | node_id | tags->'name'!i |
+            | 10      | AFEAT          |
+            | 11      | b-feat-ö       |
+        And table points doesn't contain
+            | node_id | tags->'name' |
+            | 10      | AFEAT        |
+
+
+    Scenario: Fields can be match with a regular expression
+        Then table points contains
+            | node_id | tags!re |
+            | 10      | .*access.*   |
+            | 11      | .*-[a-z]+-.* |
+
+
+    Scenario: Fields can be matched as a substring
+        Then table points contains
+            | node_id | tags->'name'!substr |
+            | 10      | feat                |
+            | 11      | feat                |
+        And table points doesn't contain
+            | node_id | tags->'name' |
+            | 10      | ?            |
+
+
+    Scenario: Fields can be matched as a json expression
+        Then table points contains
+            | node_id | tags!json |
+            | 10      | {"name": "Afeat", "access": "yes"} |
+        Then table points contains
+            | node_id | tags!json |
+            | 10      | {"access": "yes", "name": "Afeat"} |
+
+
+    Scenario: Floating fields can be matched with different precision
+        Then table points contains
+            | node_id | ST_X(geom)!~0.5 |
+            | 11      | 3840522.0 |
+        Then table points doesn't contain
+            | node_id | ST_X(geom)!~0.1 |
+            | 11      | 3840522.0 |
+        Then table points contains
+            | node_id | ST_X(geom)!~1% |
+            | 11      | 3840000.0 |
+        Then table points doesn't contain
+            | node_id | ST_X(geom)!~0.01% |
+            | 11      | 3840000.0 |
+
+
+    Scenario: Fields can be formatted arbitrarily for comparison
+        Then table points contains
+            | node_id!:03d | ST_X(geom)!:.1f |
+            | 010          | 111319.5             |